From 30658924a80434e6a2bceb61267b911ea8d37898 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 28 Mar 2022 12:43:58 +0200
Subject: Fix test-related issues (#17888)

* Remove obsolete RSS::Serializer test

Since #17828, RSS::Serializer no longer has specific code for deleted statuses,
but it is never called on deleted statuses anyway.

* Rename erroneously-named test files

* Fix failing test

* Fix test deprecation warnings

* Update CircleCI Ruby orb

1.4.0 has a bug that does not match all the test files due to incorrect
globbing
---
 spec/lib/html_aware_formatter.rb      | 44 -----------------------------------
 spec/lib/html_aware_formatter_spec.rb | 44 +++++++++++++++++++++++++++++++++++
 spec/lib/rss/serializer_spec.rb       |  7 ------
 3 files changed, 44 insertions(+), 51 deletions(-)
 delete mode 100644 spec/lib/html_aware_formatter.rb
 create mode 100644 spec/lib/html_aware_formatter_spec.rb

(limited to 'spec/lib')

diff --git a/spec/lib/html_aware_formatter.rb b/spec/lib/html_aware_formatter.rb
deleted file mode 100644
index 18d23abf5..000000000
--- a/spec/lib/html_aware_formatter.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe HtmlAwareFormatter do
-  describe '#to_s' do
-    subject { described_class.new(text, local).to_s }
-
-    context 'when local' do
-      let(:local) { true }
-      let(:text) { 'Foo bar' }
-
-      it 'returns formatted text' do
-        is_expected.to eq '<p>Foo bar</p>'
-      end
-    end
-
-    context 'when remote' do
-      let(:local) { false }
-
-      context 'given plain text' do
-        let(:text) { 'Beep boop' }
-
-        it 'keeps the plain text' do
-          is_expected.to include 'Beep boop'
-        end
-      end
-
-      context 'given text containing script tags' do
-        let(:text) { '<script>alert("Hello")</script>' }
-
-        it 'strips the scripts' do
-          is_expected.to_not include '<script>alert("Hello")</script>'
-        end
-      end
-
-      context 'given text containing malicious classes' do
-        let(:text) { '<span class="mention  status__content__spoiler-link">Show more</span>' }
-
-        it 'strips the malicious classes' do
-          is_expected.to_not include 'status__content__spoiler-link'
-        end
-      end
-    end
-  end
-end
diff --git a/spec/lib/html_aware_formatter_spec.rb b/spec/lib/html_aware_formatter_spec.rb
new file mode 100644
index 000000000..18d23abf5
--- /dev/null
+++ b/spec/lib/html_aware_formatter_spec.rb
@@ -0,0 +1,44 @@
+require 'rails_helper'
+
+RSpec.describe HtmlAwareFormatter do
+  describe '#to_s' do
+    subject { described_class.new(text, local).to_s }
+
+    context 'when local' do
+      let(:local) { true }
+      let(:text) { 'Foo bar' }
+
+      it 'returns formatted text' do
+        is_expected.to eq '<p>Foo bar</p>'
+      end
+    end
+
+    context 'when remote' do
+      let(:local) { false }
+
+      context 'given plain text' do
+        let(:text) { 'Beep boop' }
+
+        it 'keeps the plain text' do
+          is_expected.to include 'Beep boop'
+        end
+      end
+
+      context 'given text containing script tags' do
+        let(:text) { '<script>alert("Hello")</script>' }
+
+        it 'strips the scripts' do
+          is_expected.to_not include '<script>alert("Hello")</script>'
+        end
+      end
+
+      context 'given text containing malicious classes' do
+        let(:text) { '<span class="mention  status__content__spoiler-link">Show more</span>' }
+
+        it 'strips the malicious classes' do
+          is_expected.to_not include 'status__content__spoiler-link'
+        end
+      end
+    end
+  end
+end
diff --git a/spec/lib/rss/serializer_spec.rb b/spec/lib/rss/serializer_spec.rb
index 0364d13de..1da45d302 100644
--- a/spec/lib/rss/serializer_spec.rb
+++ b/spec/lib/rss/serializer_spec.rb
@@ -13,13 +13,6 @@ describe RSS::Serializer do
 
     subject { RSS::Serializer.new.send(:status_title, status) }
 
-    context 'if destroyed?' do
-      it 'returns "#{account.acct} deleted status"' do
-        status.destroy!
-        expect(subject).to eq "#{account.acct} deleted status"
-      end
-    end
-
     context 'on a toot with long text' do
       let(:text) { "This toot's text is longer than the allowed number of characters" }
 
-- 
cgit