" do
@@ -276,26 +303,50 @@ RSpec.describe HtmlToMarkdown do
it "supports " do
expect(html_to_markdown("var foo = 'bar'; ")).to eq("```\nvar foo = 'bar';\n```")
- expect(html_to_markdown("var foo = 'bar';var foo = 'bar'; function f() {\n console.log('Hello world!');\n } ")).to eq("```\n function f() {\n console.log('Hello world!');\n }\n```")
+ expect(html_to_markdown("var foo = 'bar';var foo = 'bar'; function f() {\n console.log('Hello world!');\n } ",
+ ),
+ ).to eq("```\n function f() {\n console.log('Hello world!');\n }\n```")
end
it "supports inside " do
- expect(html_to_markdown("var foo = 'bar';var foo = 'bar';World
")).to eq("Hello\nWorld")
+ expect(html_to_markdown("HelloWorld
")).to eq(
+ "Hello\nWorld",
+ )
end
it "handles " do
- expect(html_to_markdown("
1st paragraph
2nd paragraph
")).to eq("1st paragraph\n\n2nd paragraph")
- expect(html_to_markdown("1st paragraph
\n 2nd paragraph\n 2nd paragraph
\n3rd paragraph
")).to eq("1st paragraph\n\n2nd paragraph 2nd paragraph\n\n3rd paragraph")
+ expect(html_to_markdown("1st paragraph
2nd paragraph
")).to eq(
+ "1st paragraph\n\n2nd paragraph",
+ )
+ expect(
+ html_to_markdown(
+ "1st paragraph
\n 2nd paragraph\n 2nd paragraph
\n3rd paragraph
",
+ ),
+ ).to eq("1st paragraph\n\n2nd paragraph 2nd paragraph\n\n3rd paragraph")
end
it "handles " do
@@ -324,32 +375,42 @@ RSpec.describe HtmlToMarkdown do
end
it "handles
and
within
" do
- html = "1st paragraph2nd paragraph 3rd paragraph
4th paragraph
"
- expect(html_to_markdown(html)).to eq("1st paragraph\n2nd paragraph\n3rd paragraph\n\n4th paragraph")
+ html =
+ "1st paragraph2nd paragraph 3rd paragraph
4th paragraph
"
+ expect(html_to_markdown(html)).to eq(
+ "1st paragraph\n2nd paragraph\n3rd paragraph\n\n4th paragraph",
+ )
end
context "with an oddly placed " do
- expect(html_to_markdown("Hello Bold World")).to eq("Hello **Bold**\nWorld")
- expect(html_to_markdown("Hello Bold World")).to eq("Hello **Bold**\n**text** World")
+ expect(html_to_markdown("Hello Bold World")).to eq(
+ "Hello **Bold**\nWorld",
+ )
+ expect(html_to_markdown("Hello Bold World")).to eq(
+ "Hello **Bold**\n**text** World",
+ )
end
it "handles " do
expect(html_to_markdown("Hello Italic World")).to eq("Hello *Italic*\nWorld")
- expect(html_to_markdown("Hello Italic World")).to eq("Hello *Italic*\n*text* World")
+ expect(html_to_markdown("Hello Italic World")).to eq(
+ "Hello *Italic*\n*text* World",
+ )
end
it "works" do
- expect(html_to_markdown("A B C E G
")).to eq("A __B *C*__\n__*D* E__\n**F** G")
+ expect(html_to_markdown("A B C E G
")).to eq(
+ "A __B *C*__\n__*D* E__\n**F** G",
+ )
end
-
end
context "with an empty tag" do
-
it "handles " do
expect(html_to_markdown(" ")).to eq("")
@@ -363,11 +424,9 @@ RSpec.describe HtmlToMarkdown do
expect(html_to_markdown("Some text")).to eq("Some text")
expect(html_to_markdown("Some text")).to eq("Some text")
end
-
end
context "with spaces around text" do
-
it "handles " do
expect(html_to_markdown(" Bold ")).to eq("**Bold**")
expect(html_to_markdown(" Bold ")).to eq("**Bold**")
@@ -389,7 +448,6 @@ RSpec.describe HtmlToMarkdown do
expect(html_to_markdown("Some italic text")).to eq("Some *italic* text")
expect(html_to_markdown("Some italic text")).to eq("Some *italic* text")
end
-
end
it "supports " do
@@ -429,7 +487,9 @@ RSpec.describe HtmlToMarkdown do
expect(html_to_markdown(html)).to eq(markdown.strip)
- expect(html_to_markdown("")).to eq("| Hello | World |\n| - | - |")
+ expect(html_to_markdown("")).to eq(
+ "| Hello | World |\n| - | - |",
+ )
end
it "doesn't swallow badly formatted " do
@@ -451,5 +511,4 @@ RSpec.describe HtmlToMarkdown do
expect(html_to_markdown(html)).to eq("1 2 3 4 \nOne Two Three")
end
-
end
diff --git a/spec/lib/i18n/discourse_i18n_spec.rb b/spec/lib/i18n/discourse_i18n_spec.rb
index f0bb9f44c90..cd990834e91 100644
--- a/spec/lib/i18n/discourse_i18n_spec.rb
+++ b/spec/lib/i18n/discourse_i18n_spec.rb
@@ -1,121 +1,137 @@
# frozen_string_literal: true
-require 'i18n/backend/discourse_i18n'
-require 'translation_override'
+require "i18n/backend/discourse_i18n"
+require "translation_override"
RSpec.describe I18n::Backend::DiscourseI18n do
-
let(:backend) { I18n::Backend::DiscourseI18n.new }
before do
backend.reload!
- backend.store_translations(:en, foo: 'Foo in :en', bar: 'Bar in :en', wat: 'Hello %{count}')
- backend.store_translations(:en, items: { one: 'one item', other: '%{count} items' })
- backend.store_translations(:de, bar: 'Bar in :de')
- backend.store_translations(:en, link: '[text](url)')
+ backend.store_translations(:en, foo: "Foo in :en", bar: "Bar in :en", wat: "Hello %{count}")
+ backend.store_translations(:en, items: { one: "one item", other: "%{count} items" })
+ backend.store_translations(:de, bar: "Bar in :de")
+ backend.store_translations(:en, link: "[text](url)")
end
- after do
- backend.reload!
+ after { backend.reload! }
+
+ it "translates the basics as expected" do
+ expect(backend.translate(:en, "foo")).to eq("Foo in :en")
+ expect(backend.translate(:en, "items", count: 1)).to eq("one item")
+ expect(backend.translate(:en, "items", count: 3)).to eq("3 items")
+ expect(backend.translate(:en, "wat", count: 3)).to eq("Hello 3")
end
- it 'translates the basics as expected' do
- expect(backend.translate(:en, 'foo')).to eq('Foo in :en')
- expect(backend.translate(:en, 'items', count: 1)).to eq('one item')
- expect(backend.translate(:en, 'items', count: 3)).to eq('3 items')
- expect(backend.translate(:en, 'wat', count: 3)).to eq('Hello 3')
+ it "can be searched by key or value" do
+ expect(backend.search(:en, "fo")).to eq("foo" => "Foo in :en")
+ expect(backend.search(:en, "foo")).to eq("foo" => "Foo in :en")
+ expect(backend.search(:en, "Foo")).to eq("foo" => "Foo in :en")
+ expect(backend.search(:en, "hello")).to eq("wat" => "Hello %{count}")
+ expect(backend.search(:en, "items.one")).to eq("items.one" => "one item")
+ expect(backend.search(:en, "](")).to eq("link" => "[text](url)")
end
- it 'can be searched by key or value' do
- expect(backend.search(:en, 'fo')).to eq('foo' => 'Foo in :en')
- expect(backend.search(:en, 'foo')).to eq('foo' => 'Foo in :en')
- expect(backend.search(:en, 'Foo')).to eq('foo' => 'Foo in :en')
- expect(backend.search(:en, 'hello')).to eq('wat' => 'Hello %{count}')
- expect(backend.search(:en, 'items.one')).to eq('items.one' => 'one item')
- expect(backend.search(:en, '](')).to eq('link' => '[text](url)')
+ it "can return multiple results" do
+ results = backend.search(:en, "item")
+
+ expect(results["items.one"]).to eq("one item")
+ expect(results["items.other"]).to eq("%{count} items")
end
- it 'can return multiple results' do
- results = backend.search(:en, 'item')
-
- expect(results['items.one']).to eq('one item')
- expect(results['items.other']).to eq('%{count} items')
- end
-
- describe 'fallbacks' do
- it 'uses fallback locales for translating' do
- expect(backend.translate(:de, 'bar')).to eq('Bar in :de')
- expect(backend.translate(:de, 'foo')).to eq('Foo in :en')
+ describe "fallbacks" do
+ it "uses fallback locales for translating" do
+ expect(backend.translate(:de, "bar")).to eq("Bar in :de")
+ expect(backend.translate(:de, "foo")).to eq("Foo in :en")
end
end
- describe '#exists?' do
- it 'returns true when a key is given that exists' do
+ describe "#exists?" do
+ it "returns true when a key is given that exists" do
expect(backend.exists?(:de, :bar)).to eq(true)
end
- it 'returns true when a key is given that exists in a fallback locale of the locale' do
+ it "returns true when a key is given that exists in a fallback locale of the locale" do
expect(backend.exists?(:de, :foo)).to eq(true)
end
- it 'returns true when an existing key and an existing locale is given' do
+ it "returns true when an existing key and an existing locale is given" do
expect(backend.exists?(:en, :foo)).to eq(true)
expect(backend.exists?(:de, :bar)).to eq(true)
end
- it 'returns false when a non-existing key and an existing locale is given' do
+ it "returns false when a non-existing key and an existing locale is given" do
expect(backend.exists?(:en, :bogus)).to eq(false)
expect(backend.exists?(:de, :bogus)).to eq(false)
expect(backend.exists?(:ru, :bogus)).to eq(false)
end
- it 'returns true when a key is given which is missing from the given locale and exists in a fallback locale' do
+ it "returns true when a key is given which is missing from the given locale and exists in a fallback locale" do
expect(backend.exists?(:de, :foo)).to eq(true)
expect(backend.exists?(:ru, :foo)).to eq(true)
end
- it 'returns true when a key is given which is missing from the given locale and all its fallback locales' do
+ it "returns true when a key is given which is missing from the given locale and all its fallback locales" do
expect(backend.exists?(:de, :baz)).to eq(false)
expect(backend.exists?(:ru, :bogus)).to eq(false)
end
end
- describe '#pluralize' do
- it 'uses fallback locales when a pluralization key is missing' do
- SiteSetting.default_locale = 'ru'
+ describe "#pluralize" do
+ it "uses fallback locales when a pluralization key is missing" do
+ SiteSetting.default_locale = "ru"
- backend.store_translations(:ru, items: { one: '%{count} Russian item', many: '%{count} Russian items are many', other: '%{count} Russian items' })
+ backend.store_translations(
+ :ru,
+ items: {
+ one: "%{count} Russian item",
+ many: "%{count} Russian items are many",
+ other: "%{count} Russian items",
+ },
+ )
- expect(backend.translate(:ru, :items, count: 1)).to eq('1 Russian item')
- expect(backend.translate(:ru, :items, count: 2)).to eq('2 items')
- expect(backend.translate(:ru, :items, count: 5)).to eq('5 Russian items are many')
- expect(backend.translate(:ru, :items, count: 10.2)).to eq('10.2 Russian items')
+ expect(backend.translate(:ru, :items, count: 1)).to eq("1 Russian item")
+ expect(backend.translate(:ru, :items, count: 2)).to eq("2 items")
+ expect(backend.translate(:ru, :items, count: 5)).to eq("5 Russian items are many")
+ expect(backend.translate(:ru, :items, count: 10.2)).to eq("10.2 Russian items")
- backend.store_translations(:ru, items: { one: '%{count} Russian item', few: '%{count} Russian items are a few', many: '%{count} Russian items are many', other: '%{count} Russian items' })
- expect(backend.translate(:ru, :items, count: 2)).to eq('2 Russian items are a few')
+ backend.store_translations(
+ :ru,
+ items: {
+ one: "%{count} Russian item",
+ few: "%{count} Russian items are a few",
+ many: "%{count} Russian items are many",
+ other: "%{count} Russian items",
+ },
+ )
+ expect(backend.translate(:ru, :items, count: 2)).to eq("2 Russian items are a few")
- backend.store_translations(:en, airplanes: { one: '%{count} airplane' })
- expect(backend.translate(:ru, :airplanes, count: 1)).to eq('1 airplane')
- expect { backend.translate(:ru, :airplanes, count: 2) }.to raise_error(I18n::InvalidPluralizationData)
+ backend.store_translations(:en, airplanes: { one: "%{count} airplane" })
+ expect(backend.translate(:ru, :airplanes, count: 1)).to eq("1 airplane")
+ expect { backend.translate(:ru, :airplanes, count: 2) }.to raise_error(
+ I18n::InvalidPluralizationData,
+ )
end
end
describe ".sort_local_files" do
it "sorts an array of client ymls with '-(highest-number)' being last" do
- expect(I18n::Backend::DiscourseI18n.sort_locale_files(
- [
- 'discourse/plugins/discourse-second/config/locales/client-99.es.yml',
- 'discourse/plugins/discourse-first/config/locales/client.es.yml',
- 'discourse/plugins/discourse-third/config/locales/client-2.es.yml',
- 'discourse/plugins/discourse-third/config/locales/client-3.bs_BA.yml',
- ]
- )).to eq(
- [
- 'discourse/plugins/discourse-first/config/locales/client.es.yml',
- 'discourse/plugins/discourse-third/config/locales/client-2.es.yml',
- 'discourse/plugins/discourse-third/config/locales/client-3.bs_BA.yml',
- 'discourse/plugins/discourse-second/config/locales/client-99.es.yml',
- ]
+ expect(
+ I18n::Backend::DiscourseI18n.sort_locale_files(
+ %w[
+ discourse/plugins/discourse-second/config/locales/client-99.es.yml
+ discourse/plugins/discourse-first/config/locales/client.es.yml
+ discourse/plugins/discourse-third/config/locales/client-2.es.yml
+ discourse/plugins/discourse-third/config/locales/client-3.bs_BA.yml
+ ],
+ ),
+ ).to eq(
+ %w[
+ discourse/plugins/discourse-first/config/locales/client.es.yml
+ discourse/plugins/discourse-third/config/locales/client-2.es.yml
+ discourse/plugins/discourse-third/config/locales/client-3.bs_BA.yml
+ discourse/plugins/discourse-second/config/locales/client-99.es.yml
+ ],
)
end
end
diff --git a/spec/lib/i18n/fallback_locale_list_spec.rb b/spec/lib/i18n/fallback_locale_list_spec.rb
index 900bf370252..62471e312b0 100644
--- a/spec/lib/i18n/fallback_locale_list_spec.rb
+++ b/spec/lib/i18n/fallback_locale_list_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-require 'i18n/backend/fallback_locale_list'
+require "i18n/backend/fallback_locale_list"
RSpec.describe I18n::Backend::FallbackLocaleList do
let(:list) { I18n::Backend::FallbackLocaleList.new }
@@ -8,25 +8,25 @@ RSpec.describe I18n::Backend::FallbackLocaleList do
it "works when default_locale is English" do
SiteSetting.default_locale = :en
- expect(list[:ru]).to eq([:ru, :en])
+ expect(list[:ru]).to eq(%i[ru en])
expect(list[:en]).to eq([:en])
end
it "works when default_locale is English (UK)" do
SiteSetting.default_locale = :en_GB
- expect(list[:ru]).to eq([:ru, :en])
- expect(list[:en_GB]).to eq([:en_GB, :en])
+ expect(list[:ru]).to eq(%i[ru en])
+ expect(list[:en_GB]).to eq(%i[en_GB en])
expect(list[:en]).to eq([:en])
end
it "works when default_locale is not English" do
SiteSetting.default_locale = :de
- expect(list[:ru]).to eq([:ru, :en])
- expect(list[:de]).to eq([:de, :en])
+ expect(list[:ru]).to eq(%i[ru en])
+ expect(list[:de]).to eq(%i[de en])
expect(list[:en]).to eq([:en])
- expect(list[:en_GB]).to eq([:en_GB, :en])
+ expect(list[:en_GB]).to eq(%i[en_GB en])
end
context "when plugin registered fallback locale" do
@@ -36,35 +36,33 @@ RSpec.describe I18n::Backend::FallbackLocaleList do
DiscoursePluginRegistry.register_locale("de_AT-formal", fallbackLocale: "de_AT")
end
- after do
- DiscoursePluginRegistry.reset!
- end
+ after { DiscoursePluginRegistry.reset! }
it "works when default_locale is English" do
SiteSetting.default_locale = :en
- expect(list[:de_AT]).to eq([:de_AT, :de, :en])
+ expect(list[:de_AT]).to eq(%i[de_AT de en])
expect(list[:"de_AT-formal"]).to eq([:"de_AT-formal", :de_AT, :de, :en])
- expect(list[:de]).to eq([:de, :en])
+ expect(list[:de]).to eq(%i[de en])
expect(list[:en]).to eq([:en])
end
it "works when default_locale is English (UK)" do
SiteSetting.default_locale = :en_GB
- expect(list[:de_AT]).to eq([:de_AT, :de, :en])
+ expect(list[:de_AT]).to eq(%i[de_AT de en])
expect(list[:"de_AT-formal"]).to eq([:"de_AT-formal", :de_AT, :de, :en])
- expect(list[:de]).to eq([:de, :en])
+ expect(list[:de]).to eq(%i[de en])
expect(list[:en]).to eq([:en])
- expect(list[:en_GB]).to eq([:en_GB, :en])
+ expect(list[:en_GB]).to eq(%i[en_GB en])
end
it "works when default_locale is not English" do
SiteSetting.default_locale = :de
- expect(list[:es_MX]).to eq([:es_MX, :es, :en])
+ expect(list[:es_MX]).to eq(%i[es_MX es en])
expect(list[:"de_AT-formal"]).to eq([:"de_AT-formal", :de_AT, :de, :en])
- expect(list[:es]).to eq([:es, :en])
+ expect(list[:es]).to eq(%i[es en])
expect(list[:en]).to eq([:en])
end
end
diff --git a/spec/lib/i18n/i18n_interpolation_keys_finder_spec.rb b/spec/lib/i18n/i18n_interpolation_keys_finder_spec.rb
index 2fd987bee52..970b223984b 100644
--- a/spec/lib/i18n/i18n_interpolation_keys_finder_spec.rb
+++ b/spec/lib/i18n/i18n_interpolation_keys_finder_spec.rb
@@ -1,10 +1,9 @@
# frozen_string_literal: true
RSpec.describe I18nInterpolationKeysFinder do
- describe '#find' do
- it 'should return the right keys' do
- expect(described_class.find('%{first} %{second} {{third}}'))
- .to eq(['first', 'second', 'third'])
+ describe "#find" do
+ it "should return the right keys" do
+ expect(described_class.find("%{first} %{second} {{third}}")).to eq(%w[first second third])
end
end
end
diff --git a/spec/lib/image_sizer_spec.rb b/spec/lib/image_sizer_spec.rb
index 483177d32f2..0e18546606b 100644
--- a/spec/lib/image_sizer_spec.rb
+++ b/spec/lib/image_sizer_spec.rb
@@ -1,73 +1,59 @@
# frozen_string_literal: true
-require 'image_sizer'
+require "image_sizer"
RSpec.describe ImageSizer do
-
before do
SiteSetting.max_image_width = 500
SiteSetting.max_image_height = 500
end
- it 'returns the same dimensions when smaller than the maximums' do
+ it "returns the same dimensions when smaller than the maximums" do
expect(ImageSizer.resize(400, 200)).to eq([400, 200])
end
- it 'returns nil if the width is nil' do
+ it "returns nil if the width is nil" do
expect(ImageSizer.resize(nil, 100)).to eq(nil)
end
- it 'returns nil if the height is nil' do
+ it "returns nil if the height is nil" do
expect(ImageSizer.resize(100, nil)).to eq(nil)
end
- it 'works with string parameters' do
- expect(ImageSizer.resize('100', '101')).to eq([100, 101])
+ it "works with string parameters" do
+ expect(ImageSizer.resize("100", "101")).to eq([100, 101])
end
- describe 'when larger than the maximum width' do
+ describe "when larger than the maximum width" do
+ before { @w, @h = ImageSizer.resize(600, 123) }
- before do
- @w, @h = ImageSizer.resize(600, 123)
- end
-
- it 'returns the maximum width if larger than the maximum' do
+ it "returns the maximum width if larger than the maximum" do
expect(@w).to eq(500)
end
- it 'resizes the height retaining the aspect ratio' do
+ it "resizes the height retaining the aspect ratio" do
expect(@h).to eq(102)
end
-
end
- describe 'when larger than the maximum height' do
+ describe "when larger than the maximum height" do
+ before { @w, @h = ImageSizer.resize(123, 600) }
- before do
- @w, @h = ImageSizer.resize(123, 600)
- end
-
- it 'returns the maximum height if larger than the maximum' do
+ it "returns the maximum height if larger than the maximum" do
expect(@h).to eq(500)
end
- it 'resizes the width retaining the aspect ratio' do
+ it "resizes the width retaining the aspect ratio" do
expect(@w).to eq(102)
end
-
end
- describe 'when larger than the maximums' do
+ describe "when larger than the maximums" do
+ before { @w, @h = ImageSizer.resize(533, 800) }
- before do
- @w, @h = ImageSizer.resize(533, 800)
- end
-
- it 'resizes both dimensions retaining the aspect ratio' do
+ it "resizes both dimensions retaining the aspect ratio" do
expect(@h).to eq(500)
expect(@w).to eq(333)
end
-
end
-
end
diff --git a/spec/lib/imap/providers/detector_spec.rb b/spec/lib/imap/providers/detector_spec.rb
index e4cac7ecdce..17b0c6cc519 100644
--- a/spec/lib/imap/providers/detector_spec.rb
+++ b/spec/lib/imap/providers/detector_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe Imap::Providers::Detector do
port: 993,
ssl: true,
username: "test@gmail.com",
- password: "testpassword1"
+ password: "testpassword1",
}
expect(described_class.init_with_detected_provider(config)).to be_a(Imap::Providers::Gmail)
end
@@ -18,7 +18,7 @@ RSpec.describe Imap::Providers::Detector do
port: 993,
ssl: true,
username: "test@yo.com",
- password: "testpassword1"
+ password: "testpassword1",
}
expect(described_class.init_with_detected_provider(config)).to be_a(Imap::Providers::Generic)
end
diff --git a/spec/lib/imap/providers/generic_spec.rb b/spec/lib/imap/providers/generic_spec.rb
index 0a5a60a8b66..4d8226b40a6 100644
--- a/spec/lib/imap/providers/generic_spec.rb
+++ b/spec/lib/imap/providers/generic_spec.rb
@@ -6,26 +6,19 @@ RSpec.describe Imap::Providers::Generic do
fab!(:provider) do
described_class.new(
"imap.generic.com",
- {
- port: 993,
- ssl: true,
- username: username,
- password: password
- }
+ { port: 993, ssl: true, username: username, password: password },
)
end
let(:dummy_mailboxes) do
[
Net::IMAP::MailboxList.new([], "/", "All Mail"),
Net::IMAP::MailboxList.new([:Noselect], "/", "Other"),
- Net::IMAP::MailboxList.new([:Trash], "/", "Bin")
+ Net::IMAP::MailboxList.new([:Trash], "/", "Bin"),
]
end
let(:imap_stub) { stub }
- before do
- described_class.any_instance.stubs(:imap).returns(imap_stub)
- end
+ before { described_class.any_instance.stubs(:imap).returns(imap_stub) }
describe "#connect!" do
it "calls login with the provided username and password on the imap client" do
@@ -35,9 +28,7 @@ RSpec.describe Imap::Providers::Generic do
end
describe "#list_mailboxes" do
- before do
- imap_stub.expects(:list).with('', '*').returns(dummy_mailboxes)
- end
+ before { imap_stub.expects(:list).with("", "*").returns(dummy_mailboxes) }
it "does not return any mailboxes with the Noselect attribute" do
expect(provider.list_mailboxes).not_to include("Other")
@@ -53,9 +44,8 @@ RSpec.describe Imap::Providers::Generic do
end
describe "#trash_mailbox" do
-
before do
- imap_stub.expects(:list).with('', '*').returns(dummy_mailboxes)
+ imap_stub.expects(:list).with("", "*").returns(dummy_mailboxes)
Discourse.cache.delete("imap_trash_mailbox_#{provider.account_digest}")
end
@@ -74,55 +64,50 @@ RSpec.describe Imap::Providers::Generic do
before do
provider.stubs(:trash_mailbox).returns("Bin")
imap_stub.stubs(:examine).with("Inbox").twice
- imap_stub.stubs(:responses).returns({ 'UIDVALIDITY' => [1] })
+ imap_stub.stubs(:responses).returns({ "UIDVALIDITY" => [1] })
imap_stub.stubs(:examine).with("Bin")
- imap_stub.stubs(:responses).returns({ 'UIDVALIDITY' => [9] })
- provider.expects(:emails).with([4, 6], ['UID', 'ENVELOPE']).returns(
- [
- {
- 'ENVELOPE' => stub(message_id: ""),
- 'UID' => 4
- },
- {
- 'ENVELOPE' => stub(message_id: ""),
- 'UID' => 6
- }
- ]
- )
+ imap_stub.stubs(:responses).returns({ "UIDVALIDITY" => [9] })
+ provider
+ .expects(:emails)
+ .with([4, 6], %w[UID ENVELOPE])
+ .returns(
+ [
+ { "ENVELOPE" => stub(message_id: ""), "UID" => 4 },
+ { "ENVELOPE" => stub(message_id: ""), "UID" => 6 },
+ ],
+ )
end
- let(:message_ids) do
- [
- "h4786x34@test.com",
- "dvsfuf39@test.com",
- "f349xj84@test.com"
- ]
- end
+ let(:message_ids) { %w[h4786x34@test.com dvsfuf39@test.com f349xj84@test.com] }
it "sends the message-id search in the correct format and returns the trashed emails and UIDVALIDITY" do
provider.open_mailbox("Inbox")
- imap_stub.expects(:uid_search).with(
- "OR OR HEADER Message-ID '' HEADER Message-ID '' HEADER Message-ID ''"
-
- ).returns([4, 6])
+ imap_stub
+ .expects(:uid_search)
+ .with(
+ "OR OR HEADER Message-ID '' HEADER Message-ID '' HEADER Message-ID ''",
+ )
+ .returns([4, 6])
resp = provider.find_trashed_by_message_ids(message_ids)
- expect(resp.trashed_emails.map(&:message_id)).to match_array(['h4786x34@test.com', 'f349xj84@test.com'])
+ expect(resp.trashed_emails.map(&:message_id)).to match_array(
+ %w[h4786x34@test.com f349xj84@test.com],
+ )
expect(resp.trash_uid_validity).to eq(9)
end
end
describe "#trash" do
it "stores the \Deleted flag on the UID and expunges" do
- provider.stubs(:can?).with('MOVE').returns(false)
- provider.expects(:store).with(78, 'FLAGS', [], ['\Deleted'])
+ provider.stubs(:can?).with("MOVE").returns(false)
+ provider.expects(:store).with(78, "FLAGS", [], ['\Deleted'])
imap_stub.expects(:expunge)
provider.trash(78)
end
context "if the server supports MOVE" do
it "calls trash_move which is implemented by the provider" do
- provider.stubs(:can?).with('MOVE').returns(true)
+ provider.stubs(:can?).with("MOVE").returns(true)
provider.expects(:trash_move).with(78)
provider.trash(78)
end
@@ -154,7 +139,7 @@ RSpec.describe Imap::Providers::Generic do
describe "#open_mailbox" do
it "uses examine to get a readonly version of the mailbox" do
imap_stub.expects(:examine).with("Inbox")
- imap_stub.expects(:responses).returns({ 'UIDVALIDITY' => [1] })
+ imap_stub.expects(:responses).returns({ "UIDVALIDITY" => [1] })
provider.open_mailbox("Inbox")
end
@@ -164,7 +149,7 @@ RSpec.describe Imap::Providers::Generic do
it "raises an error" do
expect { provider.open_mailbox("Inbox", write: true) }.to raise_error(
- Imap::Providers::WriteDisabledError
+ Imap::Providers::WriteDisabledError,
)
end
end
@@ -174,7 +159,7 @@ RSpec.describe Imap::Providers::Generic do
it "does not raise an error and calls imap.select" do
imap_stub.expects(:select).with("Inbox")
- imap_stub.expects(:responses).returns({ 'UIDVALIDITY' => [1] })
+ imap_stub.expects(:responses).returns({ "UIDVALIDITY" => [1] })
expect { provider.open_mailbox("Inbox", write: true) }.not_to raise_error
end
end
@@ -182,7 +167,7 @@ RSpec.describe Imap::Providers::Generic do
end
describe "#emails" do
- let(:fields) { ['UID'] }
+ let(:fields) { ["UID"] }
let(:uids) { [99, 106] }
it "returns empty array if uid_fetch does not find any matching emails by uid" do
@@ -191,10 +176,15 @@ RSpec.describe Imap::Providers::Generic do
end
it "returns an array of attributes" do
- imap_stub.expects(:uid_fetch).with(uids, fields).returns([
- Net::IMAP::FetchData.new(1, { "UID" => 99 }),
- Net::IMAP::FetchData.new(1, { "UID" => 106 })
- ])
+ imap_stub
+ .expects(:uid_fetch)
+ .with(uids, fields)
+ .returns(
+ [
+ Net::IMAP::FetchData.new(1, { "UID" => 99 }),
+ Net::IMAP::FetchData.new(1, { "UID" => 106 }),
+ ],
+ )
expect(provider.emails(uids, fields)).to eq([{ "UID" => 99 }, { "UID" => 106 }])
end
end
diff --git a/spec/lib/imap/providers/gmail_spec.rb b/spec/lib/imap/providers/gmail_spec.rb
index bdf049acf4d..9ce1f9dad2a 100644
--- a/spec/lib/imap/providers/gmail_spec.rb
+++ b/spec/lib/imap/providers/gmail_spec.rb
@@ -1,4 +1,3 @@
-
# frozen_string_literal: true
RSpec.describe Imap::Providers::Gmail do
@@ -7,27 +6,21 @@ RSpec.describe Imap::Providers::Gmail do
fab!(:provider) do
described_class.new(
"imap.generic.com",
- {
- port: 993,
- ssl: true,
- username: username,
- password: password
- }
+ { port: 993, ssl: true, username: username, password: password },
)
end
let(:imap_stub) { stub }
let(:x_gm_thrid) { Imap::Providers::Gmail::X_GM_THRID }
let(:x_gm_labels) { Imap::Providers::Gmail::X_GM_LABELS }
- before do
- described_class.any_instance.stubs(:imap).returns(imap_stub)
- end
+ before { described_class.any_instance.stubs(:imap).returns(imap_stub) }
describe "#store" do
it "converts LABELS store to special X-GM-LABELS" do
- Imap::Providers::Generic.any_instance.expects(:store).with(
- 63, x_gm_labels, ["\\Inbox"], ["\\Inbox", "test"]
- )
+ Imap::Providers::Generic
+ .any_instance
+ .expects(:store)
+ .with(63, x_gm_labels, ["\\Inbox"], ["\\Inbox", "test"])
provider.store(63, "LABELS", ["\\Inbox"], ["\\Inbox", "test"])
end
end
@@ -45,23 +38,21 @@ RSpec.describe Imap::Providers::Gmail do
describe "#archive" do
it "gets the thread ID for the UID, and removes the Inbox label from all UIDs in the thread" do
main_uid = 78
- fake_thrid = '4398634986239754'
- imap_stub.expects(:uid_fetch).with(main_uid, [x_gm_thrid]).returns(
- [stub(attr: { x_gm_thrid => fake_thrid })]
- )
+ fake_thrid = "4398634986239754"
+ imap_stub
+ .expects(:uid_fetch)
+ .with(main_uid, [x_gm_thrid])
+ .returns([stub(attr: { x_gm_thrid => fake_thrid })])
imap_stub.expects(:uid_search).with("#{x_gm_thrid} #{fake_thrid}").returns([79, 80])
- provider.expects(:emails).with([79, 80], ["UID", "LABELS"]).returns(
- [
- {
- "UID" => 79,
- "LABELS" => ["\\Inbox", "seen"]
- },
- {
- "UID" => 80,
- "LABELS" => ["\\Inbox", "seen"]
- }
- ]
- )
+ provider
+ .expects(:emails)
+ .with([79, 80], %w[UID LABELS])
+ .returns(
+ [
+ { "UID" => 79, "LABELS" => ["\\Inbox", "seen"] },
+ { "UID" => 80, "LABELS" => ["\\Inbox", "seen"] },
+ ],
+ )
provider.expects(:store).with(79, "LABELS", ["\\Inbox", "seen"], ["seen"])
provider.expects(:store).with(80, "LABELS", ["\\Inbox", "seen"], ["seen"])
@@ -73,18 +64,18 @@ RSpec.describe Imap::Providers::Gmail do
it "filters down the gmail mailboxes to only show the relevant ones" do
mailboxes_with_attr = [
Net::IMAP::MailboxList.new([:Hasnochildren], "/", "INBOX"),
- Net::IMAP::MailboxList.new([:All, :Hasnochildren], "/", "[Gmail]/All Mail"),
- Net::IMAP::MailboxList.new([:Drafts, :Hasnochildren], "/", "[Gmail]/Drafts"),
- Net::IMAP::MailboxList.new([:Hasnochildren, :Important], "/", "[Gmail]/Important"),
- Net::IMAP::MailboxList.new([:Hasnochildren, :Sent], "/", "[Gmail]/Sent Mail"),
- Net::IMAP::MailboxList.new([:Hasnochildren, :Junk], "/", "[Gmail]/Spam"),
- Net::IMAP::MailboxList.new([:Flagged, :Hasnochildren], "/", "[Gmail]/Starred"),
- Net::IMAP::MailboxList.new([:Hasnochildren, :Trash], "/", "[Gmail]/Trash")
+ Net::IMAP::MailboxList.new(%i[All Hasnochildren], "/", "[Gmail]/All Mail"),
+ Net::IMAP::MailboxList.new(%i[Drafts Hasnochildren], "/", "[Gmail]/Drafts"),
+ Net::IMAP::MailboxList.new(%i[Hasnochildren Important], "/", "[Gmail]/Important"),
+ Net::IMAP::MailboxList.new(%i[Hasnochildren Sent], "/", "[Gmail]/Sent Mail"),
+ Net::IMAP::MailboxList.new(%i[Hasnochildren Junk], "/", "[Gmail]/Spam"),
+ Net::IMAP::MailboxList.new(%i[Flagged Hasnochildren], "/", "[Gmail]/Starred"),
+ Net::IMAP::MailboxList.new(%i[Hasnochildren Trash], "/", "[Gmail]/Trash"),
]
- expect(provider.filter_mailboxes(mailboxes_with_attr)).to match_array([
- "INBOX", "[Gmail]/All Mail", "[Gmail]/Important"
- ])
+ expect(provider.filter_mailboxes(mailboxes_with_attr)).to match_array(
+ ["INBOX", "[Gmail]/All Mail", "[Gmail]/Important"],
+ )
end
end
end
diff --git a/spec/lib/imap/sync_spec.rb b/spec/lib/imap/sync_spec.rb
index e68ba4a6818..991ab4c38f4 100644
--- a/spec/lib/imap/sync_spec.rb
+++ b/spec/lib/imap/sync_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-require 'imap/sync'
+require "imap/sync"
RSpec.describe Imap::Sync do
before do
@@ -15,32 +15,31 @@ RSpec.describe Imap::Sync do
let(:group) do
Fabricate(
:group,
- imap_server: 'imap.gmail.com',
+ imap_server: "imap.gmail.com",
imap_port: 993,
- email_username: 'groupemailusername@example.com',
- email_password: 'password',
- imap_mailbox_name: '[Gmail]/All Mail'
+ email_username: "groupemailusername@example.com",
+ email_password: "password",
+ imap_mailbox_name: "[Gmail]/All Mail",
)
end
let(:sync_handler) { Imap::Sync.new(group) }
before do
- mocked_imap_provider = MockedImapProvider.new(
- group.imap_server,
- port: group.imap_port,
- ssl: group.imap_ssl,
- username: group.email_username,
- password: group.email_password
- )
- Imap::Providers::Detector.stubs(:init_with_detected_provider).returns(
- mocked_imap_provider
- )
+ mocked_imap_provider =
+ MockedImapProvider.new(
+ group.imap_server,
+ port: group.imap_port,
+ ssl: group.imap_ssl,
+ username: group.email_username,
+ password: group.email_password,
+ )
+ Imap::Providers::Detector.stubs(:init_with_detected_provider).returns(mocked_imap_provider)
end
- describe 'no previous sync' do
- let(:from) { 'john@free.fr' }
- let(:subject) { 'Testing email post' }
+ describe "no previous sync" do
+ let(:from) { "john@free.fr" }
+ let(:subject) { "Testing email post" }
let(:message_id) { "#{SecureRandom.hex}@example.com" }
let(:email) do
@@ -48,7 +47,8 @@ RSpec.describe Imap::Sync do
from: from,
to: group.email_username,
subject: subject,
- message_id: message_id)
+ message_id: message_id,
+ )
end
before do
@@ -60,20 +60,19 @@ RSpec.describe Imap::Sync do
provider.stubs(:emails).returns(
[
{
- 'UID' => 100,
- 'LABELS' => %w[\\Important test-label],
- 'FLAGS' => %i[Seen],
- 'RFC822' => email
- }
- ]
+ "UID" => 100,
+ "LABELS" => %w[\\Important test-label],
+ "FLAGS" => %i[Seen],
+ "RFC822" => email,
+ },
+ ],
)
end
- it 'creates a topic from an incoming email' do
- expect { sync_handler.process }
- .to change { Topic.count }.by(1)
- .and change { Post.where(post_type: Post.types[:regular]).count }.by(1)
- .and change { IncomingEmail.count }.by(1)
+ it "creates a topic from an incoming email" do
+ expect { sync_handler.process }.to change { Topic.count }.by(1).and change {
+ Post.where(post_type: Post.types[:regular]).count
+ }.by(1).and change { IncomingEmail.count }.by(1)
expect(IncomingEmail.last.created_via).to eq(IncomingEmail.created_via_types[:imap])
@@ -86,7 +85,7 @@ RSpec.describe Imap::Sync do
expect(topic.tags.pluck(:name)).to contain_exactly("seen", "important", "test-label")
post = topic.first_post
- expect(post.raw).to eq('This is an email *body*. :smile:')
+ expect(post.raw).to eq("This is an email *body*. :smile:")
incoming_email = post.incoming_email
expect(incoming_email.raw.lines.map(&:strip)).to eq(email.lines.map(&:strip))
@@ -100,15 +99,12 @@ RSpec.describe Imap::Sync do
end
context "when tagging not enabled" do
- before do
- SiteSetting.tagging_enabled = false
- end
+ before { SiteSetting.tagging_enabled = false }
it "creates a topic from an incoming email but with no tags added" do
- expect { sync_handler.process }
- .to change { Topic.count }.by(1)
- .and change { Post.where(post_type: Post.types[:regular]).count }.by(1)
- .and change { IncomingEmail.count }.by(1)
+ expect { sync_handler.process }.to change { Topic.count }.by(1).and change {
+ Post.where(post_type: Post.types[:regular]).count
+ }.by(1).and change { IncomingEmail.count }.by(1)
expect(group.imap_uid_validity).to eq(1)
expect(group.imap_last_uid).to eq(100)
@@ -120,25 +116,22 @@ RSpec.describe Imap::Sync do
end
end
- it 'does not duplicate topics' do
- expect { sync_handler.process }
- .to change { Topic.count }.by(1)
- .and change { Post.where(post_type: Post.types[:regular]).count }.by(1)
- .and change { IncomingEmail.count }.by(1)
+ it "does not duplicate topics" do
+ expect { sync_handler.process }.to change { Topic.count }.by(1).and change {
+ Post.where(post_type: Post.types[:regular]).count
+ }.by(1).and change { IncomingEmail.count }.by(1)
- expect { sync_handler.process }
- .to not_change { Topic.count }
- .and not_change { Post.where(post_type: Post.types[:regular]).count }
- .and not_change { IncomingEmail.count }
+ expect { sync_handler.process }.to not_change { Topic.count }.and not_change {
+ Post.where(post_type: Post.types[:regular]).count
+ }.and not_change { IncomingEmail.count }
end
- it 'creates a new incoming email if the message ID does not match the receiver post id regex' do
+ it "creates a new incoming email if the message ID does not match the receiver post id regex" do
incoming_email = Fabricate(:incoming_email, message_id: message_id)
- expect { sync_handler.process }
- .to change { Topic.count }.by(1)
- .and change { Post.where(post_type: Post.types[:regular]).count }.by(1)
- .and change { IncomingEmail.count }.by(1)
+ expect { sync_handler.process }.to change { Topic.count }.by(1).and change {
+ Post.where(post_type: Post.types[:regular]).count
+ }.by(1).and change { IncomingEmail.count }.by(1)
last_incoming = IncomingEmail.where(message_id: message_id).last
expect(last_incoming.message_id).to eq(message_id)
@@ -150,13 +143,12 @@ RSpec.describe Imap::Sync do
context "when the message id matches the receiver post id regex" do
let(:message_id) { "topic/999/324@test.localhost" }
- it 'does not duplicate incoming email' do
+ it "does not duplicate incoming email" do
incoming_email = Fabricate(:incoming_email, message_id: message_id)
- expect { sync_handler.process }
- .to not_change { Topic.count }
- .and not_change { Post.where(post_type: Post.types[:regular]).count }
- .and not_change { IncomingEmail.count }
+ expect { sync_handler.process }.to not_change { Topic.count }.and not_change {
+ Post.where(post_type: Post.types[:regular]).count
+ }.and not_change { IncomingEmail.count }
incoming_email.reload
expect(incoming_email.message_id).to eq(message_id)
@@ -168,44 +160,47 @@ RSpec.describe Imap::Sync do
end
end
- describe 'previous sync' do
- let(:subject) { 'Testing email post' }
+ describe "previous sync" do
+ let(:subject) { "Testing email post" }
- let(:first_from) { 'john@free.fr' }
+ let(:first_from) { "john@free.fr" }
let(:first_message_id) { SecureRandom.hex }
- let(:first_body) { 'This is the first message of this exchange.' }
+ let(:first_body) { "This is the first message of this exchange." }
- let(:second_from) { 'sam@free.fr' }
+ let(:second_from) { "sam@free.fr" }
let(:second_message_id) { SecureRandom.hex }
- let(:second_body) { 'This is an answer to this message.
' }
+ let(:second_body) { "This is an answer to this message.
" }
- it 'continues with new emails' do
+ it "continues with new emails" do
provider = MockedImapProvider.any_instance
provider.stubs(:open_mailbox).returns(uid_validity: 1)
provider.stubs(:uids).with.returns([100])
- provider.stubs(:emails).with([100], ['UID', 'FLAGS', 'LABELS', 'RFC822'], anything).returns(
- [
- {
- 'UID' => 100,
- 'LABELS' => %w[\\Inbox],
- 'FLAGS' => %i[Seen],
- 'RFC822' => EmailFabricator(
- message_id: first_message_id,
- from: first_from,
- to: group.email_username,
- cc: second_from,
- subject: subject,
- body: first_body
- )
- }
- ]
- )
+ provider
+ .stubs(:emails)
+ .with([100], %w[UID FLAGS LABELS RFC822], anything)
+ .returns(
+ [
+ {
+ "UID" => 100,
+ "LABELS" => %w[\\Inbox],
+ "FLAGS" => %i[Seen],
+ "RFC822" =>
+ EmailFabricator(
+ message_id: first_message_id,
+ from: first_from,
+ to: group.email_username,
+ cc: second_from,
+ subject: subject,
+ body: first_body,
+ ),
+ },
+ ],
+ )
- expect { sync_handler.process }
- .to change { Topic.count }.by(1)
- .and change { Post.where(post_type: Post.types[:regular]).count }.by(1)
- .and change { IncomingEmail.count }.by(1)
+ expect { sync_handler.process }.to change { Topic.count }.by(1).and change {
+ Post.where(post_type: Post.types[:regular]).count
+ }.by(1).and change { IncomingEmail.count }.by(1)
topic = Topic.last
expect(topic.title).to eq(subject)
@@ -219,37 +214,35 @@ RSpec.describe Imap::Sync do
provider.stubs(:uids).with(to: 100).returns([100])
provider.stubs(:uids).with(from: 101).returns([200])
- provider.stubs(:emails).with([100], ['UID', 'FLAGS', 'LABELS', 'ENVELOPE'], anything).returns(
- [
- {
- 'UID' => 100,
- 'LABELS' => %w[\\Inbox],
- 'FLAGS' => %i[Seen]
- }
- ]
- )
- provider.stubs(:emails).with([200], ['UID', 'FLAGS', 'LABELS', 'RFC822'], anything).returns(
- [
- {
- 'UID' => 200,
- 'LABELS' => %w[\\Inbox],
- 'FLAGS' => %i[Recent],
- 'RFC822' => EmailFabricator(
- message_id: SecureRandom.hex,
- in_reply_to: first_message_id,
- from: second_from,
- to: group.email_username,
- subject: "Re: #{subject}",
- body: second_body
- )
- }
- ]
- )
+ provider
+ .stubs(:emails)
+ .with([100], %w[UID FLAGS LABELS ENVELOPE], anything)
+ .returns([{ "UID" => 100, "LABELS" => %w[\\Inbox], "FLAGS" => %i[Seen] }])
+ provider
+ .stubs(:emails)
+ .with([200], %w[UID FLAGS LABELS RFC822], anything)
+ .returns(
+ [
+ {
+ "UID" => 200,
+ "LABELS" => %w[\\Inbox],
+ "FLAGS" => %i[Recent],
+ "RFC822" =>
+ EmailFabricator(
+ message_id: SecureRandom.hex,
+ in_reply_to: first_message_id,
+ from: second_from,
+ to: group.email_username,
+ subject: "Re: #{subject}",
+ body: second_body,
+ ),
+ },
+ ],
+ )
- expect { sync_handler.process }
- .to not_change { Topic.count }
- .and change { Post.where(post_type: Post.types[:regular]).count }.by(1)
- .and change { IncomingEmail.count }.by(1)
+ expect { sync_handler.process }.to not_change { Topic.count }.and change {
+ Post.where(post_type: Post.types[:regular]).count
+ }.by(1).and change { IncomingEmail.count }.by(1)
post = Post.where(post_type: Post.types[:regular]).last
expect(post.user.email).to eq(second_from)
@@ -259,25 +252,19 @@ RSpec.describe Imap::Sync do
provider.stubs(:uids).with(to: 200).returns([100, 200])
provider.stubs(:uids).with(from: 201).returns([])
- provider.stubs(:emails).with([100, 200], ['UID', 'FLAGS', 'LABELS', 'ENVELOPE'], anything).returns(
- [
- {
- 'UID' => 100,
- 'LABELS' => %w[],
- 'FLAGS' => %i[Seen]
- },
- {
- 'UID' => 200,
- 'LABELS' => %w[],
- 'FLAGS' => %i[Recent],
- }
- ]
- )
+ provider
+ .stubs(:emails)
+ .with([100, 200], %w[UID FLAGS LABELS ENVELOPE], anything)
+ .returns(
+ [
+ { "UID" => 100, "LABELS" => %w[], "FLAGS" => %i[Seen] },
+ { "UID" => 200, "LABELS" => %w[], "FLAGS" => %i[Recent] },
+ ],
+ )
- expect { sync_handler.process }
- .to not_change { Topic.count }
- .and not_change { Post.where(post_type: Post.types[:regular]).count }
- .and not_change { IncomingEmail.count }
+ expect { sync_handler.process }.to not_change { Topic.count }.and not_change {
+ Post.where(post_type: Post.types[:regular]).count
+ }.and not_change { IncomingEmail.count }
topic = Topic.last
expect(topic.title).to eq(subject)
@@ -292,24 +279,27 @@ RSpec.describe Imap::Sync do
provider.stubs(:open_mailbox).returns(uid_validity: 1)
provider.stubs(:uids).with.returns([100])
- provider.stubs(:emails).with([100], ['UID', 'FLAGS', 'LABELS', 'RFC822'], anything).returns(
- [
- {
- 'UID' => 100,
- 'LABELS' => %w[\\Inbox],
- 'FLAGS' => %i[Seen],
- 'RFC822' => EmailFabricator(
- message_id: first_message_id,
- from: first_from,
- to: group.email_username,
- cc: second_from,
- subject: subject,
- body: first_body
- )
- }
- ]
- )
-
+ provider
+ .stubs(:emails)
+ .with([100], %w[UID FLAGS LABELS RFC822], anything)
+ .returns(
+ [
+ {
+ "UID" => 100,
+ "LABELS" => %w[\\Inbox],
+ "FLAGS" => %i[Seen],
+ "RFC822" =>
+ EmailFabricator(
+ message_id: first_message_id,
+ from: first_from,
+ to: group.email_username,
+ cc: second_from,
+ subject: subject,
+ body: first_body,
+ ),
+ },
+ ],
+ )
end
it "detects previously synced UIDs are missing and deletes the posts if they are in the trash mailbox" do
@@ -322,14 +312,9 @@ RSpec.describe Imap::Sync do
provider.stubs(:find_spam_by_message_ids).returns(stub(spam_emails: []))
provider.stubs(:find_trashed_by_message_ids).returns(
stub(
- trashed_emails: [
- stub(
- uid: 10,
- message_id: incoming_100.message_id
- )
- ],
- trash_uid_validity: 99
- )
+ trashed_emails: [stub(uid: 10, message_id: incoming_100.message_id)],
+ trash_uid_validity: 99,
+ ),
)
sync_handler.process
@@ -350,14 +335,9 @@ RSpec.describe Imap::Sync do
provider.stubs(:find_trashed_by_message_ids).returns(stub(trashed_emails: []))
provider.stubs(:find_spam_by_message_ids).returns(
stub(
- spam_emails: [
- stub(
- uid: 10,
- message_id: incoming_100.message_id
- )
- ],
- spam_uid_validity: 99
- )
+ spam_emails: [stub(uid: 10, message_id: incoming_100.message_id)],
+ spam_uid_validity: 99,
+ ),
)
sync_handler.process
@@ -394,31 +374,31 @@ RSpec.describe Imap::Sync do
provider.stubs(:uids).with(from: 101).returns([])
PostDestroyer.new(Discourse.system_user, incoming_100.post).destroy
- provider.stubs(:emails).with([100], ['UID', 'FLAGS', 'LABELS', 'ENVELOPE'], anything).returns(
- [
- {
- 'UID' => 100,
- 'LABELS' => %w[\\Inbox],
- 'FLAGS' => %i[Seen],
- 'RFC822' => EmailFabricator(
- message_id: first_message_id,
- from: first_from,
- to: group.email_username,
- cc: second_from,
- subject: subject,
- body: first_body
- )
- }
- ]
- )
- provider.stubs(:emails).with(100, ['FLAGS', 'LABELS']).returns(
- [
- {
- 'LABELS' => %w[\\Inbox],
- 'FLAGS' => %i[Seen]
- }
- ]
- )
+ provider
+ .stubs(:emails)
+ .with([100], %w[UID FLAGS LABELS ENVELOPE], anything)
+ .returns(
+ [
+ {
+ "UID" => 100,
+ "LABELS" => %w[\\Inbox],
+ "FLAGS" => %i[Seen],
+ "RFC822" =>
+ EmailFabricator(
+ message_id: first_message_id,
+ from: first_from,
+ to: group.email_username,
+ cc: second_from,
+ subject: subject,
+ body: first_body,
+ ),
+ },
+ ],
+ )
+ provider
+ .stubs(:emails)
+ .with(100, %w[FLAGS LABELS])
+ .returns([{ "LABELS" => %w[\\Inbox], "FLAGS" => %i[Seen] }])
provider.expects(:trash).with(100)
sync_handler.process
@@ -430,14 +410,9 @@ RSpec.describe Imap::Sync do
provider.stubs(:find_spam_by_message_ids).returns(stub(spam_emails: []))
provider.stubs(:find_trashed_by_message_ids).returns(
stub(
- trashed_emails: [
- stub(
- uid: 10,
- message_id: incoming_100.message_id
- )
- ],
- trash_uid_validity: 99
- )
+ trashed_emails: [stub(uid: 10, message_id: incoming_100.message_id)],
+ trash_uid_validity: 99,
+ ),
)
PostDestroyer.expects(:new).never
@@ -456,23 +431,27 @@ RSpec.describe Imap::Sync do
provider.stubs(:open_mailbox).returns(uid_validity: 1)
provider.stubs(:uids).with.returns([100])
- provider.stubs(:emails).with([100], ['UID', 'FLAGS', 'LABELS', 'RFC822'], anything).returns(
- [
- {
- 'UID' => 100,
- 'LABELS' => %w[\\Inbox],
- 'FLAGS' => %i[Seen],
- 'RFC822' => EmailFabricator(
- message_id: first_message_id,
- from: first_from,
- to: group.email_username,
- cc: second_from,
- subject: subject,
- body: first_body
- )
- }
- ]
- )
+ provider
+ .stubs(:emails)
+ .with([100], %w[UID FLAGS LABELS RFC822], anything)
+ .returns(
+ [
+ {
+ "UID" => 100,
+ "LABELS" => %w[\\Inbox],
+ "FLAGS" => %i[Seen],
+ "RFC822" =>
+ EmailFabricator(
+ message_id: first_message_id,
+ from: first_from,
+ to: group.email_username,
+ cc: second_from,
+ subject: subject,
+ body: first_body,
+ ),
+ },
+ ],
+ )
sync_handler.process
@incoming_email = IncomingEmail.find_by(message_id: first_message_id)
@@ -480,34 +459,23 @@ RSpec.describe Imap::Sync do
provider.stubs(:uids).with(to: 100).returns([100])
provider.stubs(:uids).with(from: 101).returns([101])
- provider.stubs(:emails).with([100], ['UID', 'FLAGS', 'LABELS', 'ENVELOPE'], anything).returns(
- [
- {
- 'UID' => 100,
- 'LABELS' => %w[\\Inbox],
- 'FLAGS' => %i[Seen]
- }
- ]
- )
- provider.stubs(:emails).with([101], ['UID', 'FLAGS', 'LABELS', 'RFC822'], anything).returns(
- []
- )
- provider.stubs(:emails).with(100, ['FLAGS', 'LABELS']).returns(
- [
- {
- 'LABELS' => %w[\\Inbox],
- 'FLAGS' => %i[Seen]
- }
- ]
- )
+ provider
+ .stubs(:emails)
+ .with([100], %w[UID FLAGS LABELS ENVELOPE], anything)
+ .returns([{ "UID" => 100, "LABELS" => %w[\\Inbox], "FLAGS" => %i[Seen] }])
+ provider.stubs(:emails).with([101], %w[UID FLAGS LABELS RFC822], anything).returns([])
+ provider
+ .stubs(:emails)
+ .with(100, %w[FLAGS LABELS])
+ .returns([{ "LABELS" => %w[\\Inbox], "FLAGS" => %i[Seen] }])
end
it "archives an email on the IMAP server when archived in discourse" do
GroupArchivedMessage.archive!(group.id, @topic, skip_imap_sync: false)
@incoming_email.update(imap_sync: true)
- provider.stubs(:store).with(100, 'FLAGS', anything, anything)
- provider.stubs(:store).with(100, 'LABELS', ["\\Inbox"], ["seen"])
+ provider.stubs(:store).with(100, "FLAGS", anything, anything)
+ provider.stubs(:store).with(100, "LABELS", ["\\Inbox"], ["seen"])
provider.expects(:archive).with(100)
sync_handler.process
@@ -515,111 +483,118 @@ RSpec.describe Imap::Sync do
it "does not archive email if not archived in discourse, it unarchives it instead" do
@incoming_email.update(imap_sync: true)
- provider.stubs(:store).with(100, 'FLAGS', anything, anything)
- provider.stubs(:store).with(100, 'LABELS', ["\\Inbox"], ["\\Inbox", "seen"])
+ provider.stubs(:store).with(100, "FLAGS", anything, anything)
+ provider.stubs(:store).with(100, "LABELS", ["\\Inbox"], ["\\Inbox", "seen"])
provider.expects(:archive).with(100).never
provider.expects(:unarchive).with(100)
sync_handler.process
end
end
-
end
- describe 'invalidated previous sync' do
- let(:subject) { 'Testing email post' }
+ describe "invalidated previous sync" do
+ let(:subject) { "Testing email post" }
- let(:first_from) { 'john@free.fr' }
+ let(:first_from) { "john@free.fr" }
let(:first_message_id) { SecureRandom.hex }
- let(:first_body) { 'This is the first message of this exchange.' }
+ let(:first_body) { "This is the first message of this exchange." }
- let(:second_from) { 'sam@free.fr' }
+ let(:second_from) { "sam@free.fr" }
let(:second_message_id) { SecureRandom.hex }
- let(:second_body) { 'This is an answer to this message.
' }
+ let(:second_body) { "This is an answer to this message.
" }
# TODO: Improve the invalidating flow for mailbox change. This is a destructive
# action so it should not be done often.
- xit 'is updated' do
+ xit "is updated" do
provider = MockedImapProvider.any_instance
provider.stubs(:open_mailbox).returns(uid_validity: 1)
provider.stubs(:uids).with.returns([100, 200])
- provider.stubs(:emails).with([100, 200], ['UID', 'FLAGS', 'LABELS', 'RFC822'], anything).returns(
- [
- {
- 'UID' => 100,
- 'LABELS' => %w[\\Inbox],
- 'FLAGS' => %i[Seen],
- 'RFC822' => EmailFabricator(
- message_id: first_message_id,
- from: first_from,
- to: group.email_username,
- cc: second_from,
- subject: subject,
- body: first_body
- )
- },
- {
- 'UID' => 200,
- 'LABELS' => %w[\\Inbox],
- 'FLAGS' => %i[Recent],
- 'RFC822' => EmailFabricator(
- message_id: second_message_id,
- in_reply_to: first_message_id,
- from: second_from,
- to: group.email_username,
- subject: "Re: #{subject}",
- body: second_body
- )
- }
- ]
- )
+ provider
+ .stubs(:emails)
+ .with([100, 200], %w[UID FLAGS LABELS RFC822], anything)
+ .returns(
+ [
+ {
+ "UID" => 100,
+ "LABELS" => %w[\\Inbox],
+ "FLAGS" => %i[Seen],
+ "RFC822" =>
+ EmailFabricator(
+ message_id: first_message_id,
+ from: first_from,
+ to: group.email_username,
+ cc: second_from,
+ subject: subject,
+ body: first_body,
+ ),
+ },
+ {
+ "UID" => 200,
+ "LABELS" => %w[\\Inbox],
+ "FLAGS" => %i[Recent],
+ "RFC822" =>
+ EmailFabricator(
+ message_id: second_message_id,
+ in_reply_to: first_message_id,
+ from: second_from,
+ to: group.email_username,
+ subject: "Re: #{subject}",
+ body: second_body,
+ ),
+ },
+ ],
+ )
- expect { sync_handler.process }
- .to change { Topic.count }.by(1)
- .and change { Post.where(post_type: Post.types[:regular]).count }.by(2)
- .and change { IncomingEmail.count }.by(2)
+ expect { sync_handler.process }.to change { Topic.count }.by(1).and change {
+ Post.where(post_type: Post.types[:regular]).count
+ }.by(2).and change { IncomingEmail.count }.by(2)
imap_data = Topic.last.incoming_email.pluck(:imap_uid_validity, :imap_uid, :imap_group_id)
expect(imap_data).to contain_exactly([1, 100, group.id], [1, 200, group.id])
provider.stubs(:open_mailbox).returns(uid_validity: 2)
provider.stubs(:uids).with.returns([111, 222])
- provider.stubs(:emails).with([111, 222], ['UID', 'FLAGS', 'LABELS', 'RFC822'], anything).returns(
- [
- {
- 'UID' => 111,
- 'LABELS' => %w[\\Inbox],
- 'FLAGS' => %i[Seen],
- 'RFC822' => EmailFabricator(
- message_id: first_message_id,
- from: first_from,
- to: group.email_username,
- cc: second_from,
- subject: subject,
- body: first_body
- )
- },
- {
- 'UID' => 222,
- 'LABELS' => %w[\\Inbox],
- 'FLAGS' => %i[Recent],
- 'RFC822' => EmailFabricator(
- message_id: second_message_id,
- in_reply_to: first_message_id,
- from: second_from,
- to: group.email_username,
- subject: "Re: #{subject}",
- body: second_body
- )
- }
- ]
- )
+ provider
+ .stubs(:emails)
+ .with([111, 222], %w[UID FLAGS LABELS RFC822], anything)
+ .returns(
+ [
+ {
+ "UID" => 111,
+ "LABELS" => %w[\\Inbox],
+ "FLAGS" => %i[Seen],
+ "RFC822" =>
+ EmailFabricator(
+ message_id: first_message_id,
+ from: first_from,
+ to: group.email_username,
+ cc: second_from,
+ subject: subject,
+ body: first_body,
+ ),
+ },
+ {
+ "UID" => 222,
+ "LABELS" => %w[\\Inbox],
+ "FLAGS" => %i[Recent],
+ "RFC822" =>
+ EmailFabricator(
+ message_id: second_message_id,
+ in_reply_to: first_message_id,
+ from: second_from,
+ to: group.email_username,
+ subject: "Re: #{subject}",
+ body: second_body,
+ ),
+ },
+ ],
+ )
- expect { sync_handler.process }
- .to not_change { Topic.count }
- .and not_change { Post.where(post_type: Post.types[:regular]).count }
- .and not_change { IncomingEmail.count }
+ expect { sync_handler.process }.to not_change { Topic.count }.and not_change {
+ Post.where(post_type: Post.types[:regular]).count
+ }.and not_change { IncomingEmail.count }
imap_data = Topic.last.incoming_email.pluck(:imap_uid_validity, :imap_uid, :imap_group_id)
expect(imap_data).to contain_exactly([2, 111, group.id], [2, 222, group.id])
diff --git a/spec/lib/import/normalize_spec.rb b/spec/lib/import/normalize_spec.rb
index 77b483fa580..0fd7e384c5f 100644
--- a/spec/lib/import/normalize_spec.rb
+++ b/spec/lib/import/normalize_spec.rb
@@ -12,7 +12,8 @@ RSpec.describe Import::Normalize do
test
this is a ""a blog ")
+ stub_request(:get, url).to_return(
+ status: 200,
+ body: "a blog ",
+ )
InlineOneboxer.invalidate(url)
expect(InlineOneboxer.cache_lookup(url)).to be_blank
@@ -40,7 +40,7 @@ RSpec.describe InlineOneboxer do
cached = InlineOneboxer.cache_lookup(url)
expect(cached[:url]).to eq(url)
- expect(cached[:title]).to eq('a blog')
+ expect(cached[:title]).to eq("a blog")
end
end
@@ -56,25 +56,52 @@ RSpec.describe InlineOneboxer do
topic2 = Fabricate(:topic, category: category2)
# Link to `topic` from new topic (same category)
- onebox = InlineOneboxer.lookup(topic.url, user_id: admin.id, category_id: category.id, skip_cache: true)
+ onebox =
+ InlineOneboxer.lookup(
+ topic.url,
+ user_id: admin.id,
+ category_id: category.id,
+ skip_cache: true,
+ )
expect(onebox).to be_present
expect(onebox[:url]).to eq(topic.url)
expect(onebox[:title]).to eq(topic.title)
# Link to `topic` from `topic`
- onebox = InlineOneboxer.lookup(topic.url, user_id: admin.id, category_id: topic.category_id, topic_id: topic.id, skip_cache: true)
+ onebox =
+ InlineOneboxer.lookup(
+ topic.url,
+ user_id: admin.id,
+ category_id: topic.category_id,
+ topic_id: topic.id,
+ skip_cache: true,
+ )
expect(onebox).to be_present
expect(onebox[:url]).to eq(topic.url)
expect(onebox[:title]).to eq(topic.title)
# Link to `topic` from `topic1` (same category)
- onebox = InlineOneboxer.lookup(topic.url, user_id: admin.id, category_id: topic1.category_id, topic_id: topic1.id, skip_cache: true)
+ onebox =
+ InlineOneboxer.lookup(
+ topic.url,
+ user_id: admin.id,
+ category_id: topic1.category_id,
+ topic_id: topic1.id,
+ skip_cache: true,
+ )
expect(onebox).to be_present
expect(onebox[:url]).to eq(topic.url)
expect(onebox[:title]).to eq(topic.title)
# Link to `topic` from `topic2` (different category)
- onebox = InlineOneboxer.lookup(topic.url, user_id: admin.id, category_id: topic2.category_id, topic_id: topic2.id, skip_cache: true)
+ onebox =
+ InlineOneboxer.lookup(
+ topic.url,
+ user_id: admin.id,
+ category_id: topic2.category_id,
+ topic_id: topic2.id,
+ skip_cache: true,
+ )
expect(onebox).to be_blank
end
@@ -103,12 +130,9 @@ RSpec.describe InlineOneboxer do
topic = Fabricate(:topic, title: "Inline oneboxer")
Fabricate(:post, topic: topic) # OP
Fabricate(:post, topic: topic)
- lookup = -> (number) do
- InlineOneboxer.lookup(
- "#{topic.url}/#{number}",
- skip_cache: true
- )[:title]
- end
+ lookup = ->(number) {
+ InlineOneboxer.lookup("#{topic.url}/#{number}", skip_cache: true)[:title]
+ }
posts = topic.reload.posts.order("post_number ASC")
expect(lookup.call(0)).to eq("Inline oneboxer")
@@ -139,14 +163,13 @@ RSpec.describe InlineOneboxer do
it "will crawl anything if allowed to" do
SiteSetting.enable_inline_onebox_on_all_domains = true
- stub_request(:get, "https://eviltrout.com/some-path").
- to_return(status: 200, body: "a blog ")
-
- onebox = InlineOneboxer.lookup(
- "https://eviltrout.com/some-path",
- skip_cache: true
+ stub_request(:get, "https://eviltrout.com/some-path").to_return(
+ status: 200,
+ body: "a blog ",
)
+ onebox = InlineOneboxer.lookup("https://eviltrout.com/some-path", skip_cache: true)
+
expect(onebox).to be_present
expect(onebox[:url]).to eq("https://eviltrout.com/some-path")
expect(onebox[:title]).to eq("a blog")
@@ -155,14 +178,13 @@ RSpec.describe InlineOneboxer do
it "will not return a onebox if it does not meet minimal length" do
SiteSetting.enable_inline_onebox_on_all_domains = true
- stub_request(:get, "https://eviltrout.com/some-path").
- to_return(status: 200, body: "a ")
-
- onebox = InlineOneboxer.lookup(
- "https://eviltrout.com/some-path",
- skip_cache: true
+ stub_request(:get, "https://eviltrout.com/some-path").to_return(
+ status: 200,
+ body: "a ",
)
+ onebox = InlineOneboxer.lookup("https://eviltrout.com/some-path", skip_cache: true)
+
expect(onebox).to be_present
expect(onebox[:url]).to eq("https://eviltrout.com/some-path")
expect(onebox[:title]).to eq(nil)
@@ -172,10 +194,7 @@ RSpec.describe InlineOneboxer do
SiteSetting.allowed_inline_onebox_domains = "eviltrout.com"
RetrieveTitle.stubs(:crawl).returns("Evil Trout's Blog")
- onebox = InlineOneboxer.lookup(
- "https://eviltrout.com/some-path",
- skip_cache: true
- )
+ onebox = InlineOneboxer.lookup("https://eviltrout.com/some-path", skip_cache: true)
expect(onebox).to be_present
expect(onebox[:url]).to eq("https://eviltrout.com/some-path")
expect(onebox[:title]).to eq("Evil Trout's Blog")
@@ -184,11 +203,10 @@ RSpec.describe InlineOneboxer do
describe "lookups for blocked domains in the hostname" do
shared_examples "blocks the domain" do |setting, domain_to_test|
it "does not retrieve title" do
- stub_request(:get, domain_to_test)
- .to_return(
- status: 200,
- body: "hello world ",
- )
+ stub_request(:get, domain_to_test).to_return(
+ status: 200,
+ body: "hello world ",
+ )
SiteSetting.blocked_onebox_domains = setting
onebox = InlineOneboxer.lookup(domain_to_test, skip_cache: true)
@@ -199,11 +217,10 @@ RSpec.describe InlineOneboxer do
shared_examples "does not fulfil blocked domain" do |setting, domain_to_test|
it "retrieves title" do
- stub_request(:get, domain_to_test)
- .to_return(
- status: 200,
- body: "hello world ",
- )
+ stub_request(:get, domain_to_test).to_return(
+ status: 200,
+ body: "hello world ",
+ )
SiteSetting.blocked_onebox_domains = setting
onebox = InlineOneboxer.lookup(domain_to_test, skip_cache: true)
@@ -226,39 +243,55 @@ RSpec.describe InlineOneboxer do
it "doesn't retrieve title if a blocked domain is encountered anywhere in the redirect chain" do
SiteSetting.blocked_onebox_domains = "redirect.com"
- stub_request(:get, "https://mainwebsite.com/blah")
- .to_return(status: 301, body: "", headers: { "location" => "https://redirect.com/blah" })
- stub_request(:get, "https://redirect.com/blah")
- .to_return(status: 301, body: "", headers: { "location" => "https://finalwebsite.com/blah" })
- stub_request(:get, "https://finalwebsite.com/blah")
- .to_return(status: 200, body: "hello world ")
+ stub_request(:get, "https://mainwebsite.com/blah").to_return(
+ status: 301,
+ body: "",
+ headers: {
+ "location" => "https://redirect.com/blah",
+ },
+ )
+ stub_request(:get, "https://redirect.com/blah").to_return(
+ status: 301,
+ body: "",
+ headers: {
+ "location" => "https://finalwebsite.com/blah",
+ },
+ )
+ stub_request(:get, "https://finalwebsite.com/blah").to_return(
+ status: 200,
+ body: "hello world ",
+ )
onebox = InlineOneboxer.lookup("https://mainwebsite.com/blah", skip_cache: true)
expect(onebox[:title]).to be_blank
end
it "doesn't retrieve title if the Discourse-No-Onebox header == 1" do
- stub_request(:get, "https://mainwebsite.com/blah")
- .to_return(
- status: 200,
- body: "hello world ",
- headers: { "Discourse-No-Onebox" => "1" }
- )
+ stub_request(:get, "https://mainwebsite.com/blah").to_return(
+ status: 200,
+ body: "hello world ",
+ headers: {
+ "Discourse-No-Onebox" => "1",
+ },
+ )
onebox = InlineOneboxer.lookup("https://mainwebsite.com/blah", skip_cache: true)
expect(onebox[:title]).to be_blank
- stub_request(:get, "https://mainwebsite.com/blah/2")
- .to_return(
- status: 301,
- body: "",
- headers: { "location" => "https://mainwebsite.com/blah/2/redirect" }
- )
- stub_request(:get, "https://mainwebsite.com/blah/2/redirect")
- .to_return(
- status: 301,
- body: "",
- headers: { "Discourse-No-Onebox" => "1", "location" => "https://somethingdoesnotmatter.com" }
- )
+ stub_request(:get, "https://mainwebsite.com/blah/2").to_return(
+ status: 301,
+ body: "",
+ headers: {
+ "location" => "https://mainwebsite.com/blah/2/redirect",
+ },
+ )
+ stub_request(:get, "https://mainwebsite.com/blah/2/redirect").to_return(
+ status: 301,
+ body: "",
+ headers: {
+ "Discourse-No-Onebox" => "1",
+ "location" => "https://somethingdoesnotmatter.com",
+ },
+ )
onebox = InlineOneboxer.lookup("https://mainwebsite.com/blah/2", skip_cache: true)
expect(onebox[:title]).to be_blank
onebox = InlineOneboxer.lookup("https://mainwebsite.com/blah/2/redirect", skip_cache: true)
@@ -267,48 +300,46 @@ RSpec.describe InlineOneboxer do
end
context "when block_onebox_on_redirect is enabled" do
- before do
- SiteSetting.block_onebox_on_redirect = true
- end
+ before { SiteSetting.block_onebox_on_redirect = true }
- after do
- FinalDestination.clear_https_cache!("redirects.com")
- end
+ after { FinalDestination.clear_https_cache!("redirects.com") }
it "doesn't onebox if the URL redirects" do
- stub_request(:get, "https://redirects.com/blah/gg")
- .to_return(
- status: 301,
- body: "",
- headers: { "location" => "https://redirects.com/blah/gg/redirect" }
- )
+ stub_request(:get, "https://redirects.com/blah/gg").to_return(
+ status: 301,
+ body: "",
+ headers: {
+ "location" => "https://redirects.com/blah/gg/redirect",
+ },
+ )
onebox = InlineOneboxer.lookup("https://redirects.com/blah/gg", skip_cache: true)
expect(onebox[:title]).to be_blank
end
it "allows an initial http -> https redirect if the redirect URL is identical to the original" do
- stub_request(:get, "http://redirects.com/blah/gg")
- .to_return(
- status: 301,
- body: "",
- headers: { "location" => "https://redirects.com/blah/gg" }
- )
- stub_request(:get, "https://redirects.com/blah/gg")
- .to_return(
- status: 200,
- body: "The Redirects Website "
- )
+ stub_request(:get, "http://redirects.com/blah/gg").to_return(
+ status: 301,
+ body: "",
+ headers: {
+ "location" => "https://redirects.com/blah/gg",
+ },
+ )
+ stub_request(:get, "https://redirects.com/blah/gg").to_return(
+ status: 200,
+ body: "The Redirects Website ",
+ )
onebox = InlineOneboxer.lookup("http://redirects.com/blah/gg", skip_cache: true)
expect(onebox[:title]).to eq("The Redirects Website")
end
it "doesn't allow an initial http -> https redirect if the redirect URL is different to the original" do
- stub_request(:get, "http://redirects.com/blah/gg")
- .to_return(
- status: 301,
- body: "",
- headers: { "location" => "https://redirects.com/blah/gg/2" }
- )
+ stub_request(:get, "http://redirects.com/blah/gg").to_return(
+ status: 301,
+ body: "",
+ headers: {
+ "location" => "https://redirects.com/blah/gg/2",
+ },
+ )
onebox = InlineOneboxer.lookup("http://redirects.com/blah/gg", skip_cache: true)
expect(onebox[:title]).to be_blank
end
@@ -319,14 +350,13 @@ RSpec.describe InlineOneboxer do
SiteSetting.enable_inline_onebox_on_all_domains = true
- stub_request(:get, "https://eviltrout.com/some-path").
- to_return(status: 200, body: "welcome to my blog ")
-
- onebox = InlineOneboxer.lookup(
- "https://eviltrout.com/some-path",
- skip_cache: true
+ stub_request(:get, "https://eviltrout.com/some-path").to_return(
+ status: 200,
+ body: "welcome to my blog ",
)
+ onebox = InlineOneboxer.lookup("https://eviltrout.com/some-path", skip_cache: true)
+
expect(onebox).to be_present
expect(onebox[:url]).to eq("https://eviltrout.com/some-path")
expect(onebox[:title]).to eq("welcome to ■■ blog")
@@ -337,13 +367,9 @@ RSpec.describe InlineOneboxer do
SiteSetting.enable_inline_onebox_on_all_domains = true
- stub_request(:get, "https://eviltrout.com/some-path").
- to_return(status: 404, body: "")
+ stub_request(:get, "https://eviltrout.com/some-path").to_return(status: 404, body: "")
- onebox = InlineOneboxer.lookup(
- "https://eviltrout.com/some-path",
- skip_cache: true
- )
+ onebox = InlineOneboxer.lookup("https://eviltrout.com/some-path", skip_cache: true)
expect(onebox).to be_present
expect(onebox[:url]).to eq("https://eviltrout.com/some-path")
@@ -353,15 +379,15 @@ RSpec.describe InlineOneboxer do
describe ".register_local_handler" do
it "calls registered local handler" do
- InlineOneboxer.register_local_handler('wizard') do |url, route|
- { url: url, title: 'Custom Onebox for Wizard' }
+ InlineOneboxer.register_local_handler("wizard") do |url, route|
+ { url: url, title: "Custom Onebox for Wizard" }
end
url = "#{Discourse.base_url}/wizard"
results = InlineOneboxer.new([url], skip_cache: true).process
expect(results).to be_present
expect(results[0][:url]).to eq(url)
- expect(results[0][:title]).to eq('Custom Onebox for Wizard')
+ expect(results[0][:title]).to eq("Custom Onebox for Wizard")
end
end
end
diff --git a/spec/lib/js_locale_helper_spec.rb b/spec/lib/js_locale_helper_spec.rb
index 775db523eb0..984fb64c66a 100644
--- a/spec/lib/js_locale_helper_spec.rb
+++ b/spec/lib/js_locale_helper_spec.rb
@@ -1,9 +1,8 @@
# frozen_string_literal: true
-require 'mini_racer'
+require "mini_racer"
RSpec.describe JsLocaleHelper do
-
module StubLoadTranslations
def set_translations(locale, translations)
@loaded_translations ||= HashWithIndifferentAccess.new
@@ -22,13 +21,15 @@ RSpec.describe JsLocaleHelper do
after { JsLocaleHelper.clear_cache! }
describe "#output_locale" do
-
it "doesn't change the cached translations hash" do
I18n.locale = :fr
- expect(JsLocaleHelper.output_locale('fr').length).to be > 0
- expect(JsLocaleHelper.translations_for('fr')['fr'].keys).to contain_exactly("js", "admin_js", "wizard_js")
+ expect(JsLocaleHelper.output_locale("fr").length).to be > 0
+ expect(JsLocaleHelper.translations_for("fr")["fr"].keys).to contain_exactly(
+ "js",
+ "admin_js",
+ "wizard_js",
+ )
end
-
end
describe "message format" do
@@ -37,11 +38,11 @@ RSpec.describe JsLocaleHelper do
end
def setup_message_format(format)
- filename = message_format_filename('en')
- compiled = JsLocaleHelper.compile_message_format(filename, 'en', format)
+ filename = message_format_filename("en")
+ compiled = JsLocaleHelper.compile_message_format(filename, "en", format)
@ctx = MiniRacer::Context.new
- @ctx.eval('MessageFormat = {locale: {}};')
+ @ctx.eval("MessageFormat = {locale: {}};")
@ctx.load(filename)
@ctx.eval("var test = #{compiled}")
end
@@ -50,71 +51,84 @@ RSpec.describe JsLocaleHelper do
@ctx.eval("test(#{opts.to_json})")
end
- it 'handles plurals' do
- setup_message_format('{NUM_RESULTS, plural,
+ it "handles plurals" do
+ setup_message_format(
+ "{NUM_RESULTS, plural,
one {1 result}
other {# results}
- }')
- expect(localize(NUM_RESULTS: 1)).to eq('1 result')
- expect(localize(NUM_RESULTS: 2)).to eq('2 results')
+ }",
+ )
+ expect(localize(NUM_RESULTS: 1)).to eq("1 result")
+ expect(localize(NUM_RESULTS: 2)).to eq("2 results")
end
- it 'handles double plurals' do
- setup_message_format('{NUM_RESULTS, plural,
+ it "handles double plurals" do
+ setup_message_format(
+ "{NUM_RESULTS, plural,
one {1 result}
other {# results}
} and {NUM_APPLES, plural,
one {1 apple}
other {# apples}
- }')
+ }",
+ )
- expect(localize(NUM_RESULTS: 1, NUM_APPLES: 2)).to eq('1 result and 2 apples')
- expect(localize(NUM_RESULTS: 2, NUM_APPLES: 1)).to eq('2 results and 1 apple')
+ expect(localize(NUM_RESULTS: 1, NUM_APPLES: 2)).to eq("1 result and 2 apples")
+ expect(localize(NUM_RESULTS: 2, NUM_APPLES: 1)).to eq("2 results and 1 apple")
end
- it 'handles select' do
- setup_message_format('{GENDER, select, male {He} female {She} other {They}} read a book')
- expect(localize(GENDER: 'male')).to eq('He read a book')
- expect(localize(GENDER: 'female')).to eq('She read a book')
- expect(localize(GENDER: 'none')).to eq('They read a book')
+ it "handles select" do
+ setup_message_format("{GENDER, select, male {He} female {She} other {They}} read a book")
+ expect(localize(GENDER: "male")).to eq("He read a book")
+ expect(localize(GENDER: "female")).to eq("She read a book")
+ expect(localize(GENDER: "none")).to eq("They read a book")
end
- it 'can strip out message formats' do
+ it "can strip out message formats" do
hash = { "a" => "b", "c" => { "d" => { "f_MF" => "bob" } } }
expect(JsLocaleHelper.strip_out_message_formats!(hash)).to eq("c.d.f_MF" => "bob")
expect(hash["c"]["d"]).to eq({})
end
- it 'handles message format special keys' do
- JsLocaleHelper.set_translations('en', "en" => {
+ it "handles message format special keys" do
+ JsLocaleHelper.set_translations(
+ "en",
+ "en" => {
"js" => {
"hello" => "world",
"test_MF" => "{HELLO} {COUNT, plural, one {1 duck} other {# ducks}}",
"error_MF" => "{{BLA}",
- "simple_MF" => "{COUNT, plural, one {1} other {#}}"
+ "simple_MF" => "{COUNT, plural, one {1} other {#}}",
},
"admin_js" => {
- "foo_MF" => "{HELLO} {COUNT, plural, one {1 duck} other {# ducks}}"
- }
- })
+ "foo_MF" => "{HELLO} {COUNT, plural, one {1 duck} other {# ducks}}",
+ },
+ },
+ )
ctx = MiniRacer::Context.new
ctx.eval("I18n = { pluralizationRules: {} };")
- ctx.eval(JsLocaleHelper.output_locale('en'))
+ ctx.eval(JsLocaleHelper.output_locale("en"))
expect(ctx.eval('I18n.translations["en"]["js"]["hello"]')).to eq("world")
expect(ctx.eval('I18n.translations["en"]["js"]["test_MF"]')).to eq(nil)
- expect(ctx.eval('I18n.messageFormat("test_MF", { HELLO: "hi", COUNT: 3 })')).to eq("hi 3 ducks")
- expect(ctx.eval('I18n.messageFormat("error_MF", { HELLO: "hi", COUNT: 3 })')).to match(/Invalid Format/)
+ expect(ctx.eval('I18n.messageFormat("test_MF", { HELLO: "hi", COUNT: 3 })')).to eq(
+ "hi 3 ducks",
+ )
+ expect(ctx.eval('I18n.messageFormat("error_MF", { HELLO: "hi", COUNT: 3 })')).to match(
+ /Invalid Format/,
+ )
expect(ctx.eval('I18n.messageFormat("missing", {})')).to match(/missing/)
expect(ctx.eval('I18n.messageFormat("simple_MF", {})')).to match(/COUNT/) # error
- expect(ctx.eval('I18n.messageFormat("foo_MF", { HELLO: "hi", COUNT: 4 })')).to eq("hi 4 ducks")
+ expect(ctx.eval('I18n.messageFormat("foo_MF", { HELLO: "hi", COUNT: 4 })')).to eq(
+ "hi 4 ducks",
+ )
end
- it 'load pluralization rules before precompile' do
- message = JsLocaleHelper.compile_message_format(message_format_filename('ru'), 'ru', 'format')
- expect(message).not_to match 'Plural Function not found'
+ it "load pluralization rules before precompile" do
+ message = JsLocaleHelper.compile_message_format(message_format_filename("ru"), "ru", "format")
+ expect(message).not_to match "Plural Function not found"
end
it "uses message formats from fallback locale" do
@@ -128,33 +142,42 @@ RSpec.describe JsLocaleHelper do
end
end
- it 'performs fallbacks to English if a translation is not available' do
- JsLocaleHelper.set_translations('en', "en" => {
+ it "performs fallbacks to English if a translation is not available" do
+ JsLocaleHelper.set_translations(
+ "en",
+ "en" => {
"js" => {
"only_english" => "1-en",
"english_and_site" => "3-en",
"english_and_user" => "5-en",
"all_three" => "7-en",
- }
- })
+ },
+ },
+ )
- JsLocaleHelper.set_translations('ru', "ru" => {
+ JsLocaleHelper.set_translations(
+ "ru",
+ "ru" => {
"js" => {
"only_site" => "2-ru",
"english_and_site" => "3-ru",
"site_and_user" => "6-ru",
"all_three" => "7-ru",
- }
- })
+ },
+ },
+ )
- JsLocaleHelper.set_translations('uk', "uk" => {
+ JsLocaleHelper.set_translations(
+ "uk",
+ "uk" => {
"js" => {
"only_user" => "4-uk",
"english_and_user" => "5-uk",
"site_and_user" => "6-uk",
"all_three" => "7-uk",
- }
- })
+ },
+ },
+ )
expected = {
"none" => "[uk.js.none]",
@@ -164,39 +187,37 @@ RSpec.describe JsLocaleHelper do
"only_user" => "4-uk",
"english_and_user" => "5-uk",
"site_and_user" => "6-uk",
- "all_three" => "7-uk"
+ "all_three" => "7-uk",
}
- SiteSetting.default_locale = 'ru'
+ SiteSetting.default_locale = "ru"
I18n.locale = :uk
ctx = MiniRacer::Context.new
- ctx.eval('var window = this;')
- ctx.load(Rails.root + 'app/assets/javascripts/locales/i18n.js')
+ ctx.eval("var window = this;")
+ ctx.load(Rails.root + "app/assets/javascripts/locales/i18n.js")
ctx.eval(JsLocaleHelper.output_locale(I18n.locale))
ctx.eval('I18n.defaultLocale = "ru";')
- expect(ctx.eval('I18n.translations').keys).to contain_exactly("uk", "en")
- expect(ctx.eval('I18n.translations.uk.js').keys).to contain_exactly("all_three", "english_and_user", "only_user", "site_and_user")
- expect(ctx.eval('I18n.translations.en.js').keys).to contain_exactly("only_english", "english_and_site")
+ expect(ctx.eval("I18n.translations").keys).to contain_exactly("uk", "en")
+ expect(ctx.eval("I18n.translations.uk.js").keys).to contain_exactly(
+ "all_three",
+ "english_and_user",
+ "only_user",
+ "site_and_user",
+ )
+ expect(ctx.eval("I18n.translations.en.js").keys).to contain_exactly(
+ "only_english",
+ "english_and_site",
+ )
- expected.each do |key, expect|
- expect(ctx.eval("I18n.t(#{"js.#{key}".inspect})")).to eq(expect)
- end
+ expected.each { |key, expect| expect(ctx.eval("I18n.t(#{"js.#{key}".inspect})")).to eq(expect) }
end
it "correctly evaluates message formats in en fallback" do
- JsLocaleHelper.set_translations("en", "en" => {
- "js" => {
- "something_MF" => "en mf",
- },
- })
+ JsLocaleHelper.set_translations("en", "en" => { "js" => { "something_MF" => "en mf" } })
- JsLocaleHelper.set_translations("de", "de" => {
- "js" => {
- "something_MF" => "de mf",
- },
- })
+ JsLocaleHelper.set_translations("de", "de" => { "js" => { "something_MF" => "de mf" } })
TranslationOverride.upsert!("en", "js.something_MF", <<~MF.strip)
There {
@@ -219,15 +240,17 @@ RSpec.describe JsLocaleHelper do
}
JS
- expect(ctx.eval("I18n.messageFormat('something_MF', { UNREAD: 1 })")).to eq("There is one unread")
+ expect(ctx.eval("I18n.messageFormat('something_MF', { UNREAD: 1 })")).to eq(
+ "There is one unread",
+ )
end
LocaleSiteSetting.values.each do |locale|
it "generates valid date helpers for #{locale[:value]} locale" do
js = JsLocaleHelper.output_locale(locale[:value])
ctx = MiniRacer::Context.new
- ctx.eval('var window = this;')
- ctx.load(Rails.root + 'app/assets/javascripts/locales/i18n.js')
+ ctx.eval("var window = this;")
+ ctx.load(Rails.root + "app/assets/javascripts/locales/i18n.js")
ctx.eval(js)
end
@@ -235,32 +258,36 @@ RSpec.describe JsLocaleHelper do
content = JsLocaleHelper.moment_locale(locale[:value])
if (locale[:value] == SiteSettings::DefaultsProvider::DEFAULT_LOCALE)
- expect(content).to eq('')
+ expect(content).to eq("")
else
- expect(content).to_not eq('')
+ expect(content).to_not eq("")
end
end
end
describe ".find_message_format_locale" do
it "finds locale's message format rules" do
- locale, filename = JsLocaleHelper.find_message_format_locale([:de], fallback_to_english: false)
+ locale, filename =
+ JsLocaleHelper.find_message_format_locale([:de], fallback_to_english: false)
expect(locale).to eq("de")
expect(filename).to end_with("/de.js")
end
it "finds locale for en_GB" do
- locale, filename = JsLocaleHelper.find_message_format_locale([:en_GB], fallback_to_english: false)
+ locale, filename =
+ JsLocaleHelper.find_message_format_locale([:en_GB], fallback_to_english: false)
expect(locale).to eq("en")
expect(filename).to end_with("/en.js")
- locale, filename = JsLocaleHelper.find_message_format_locale(["en_GB"], fallback_to_english: false)
+ locale, filename =
+ JsLocaleHelper.find_message_format_locale(["en_GB"], fallback_to_english: false)
expect(locale).to eq("en")
expect(filename).to end_with("/en.js")
end
it "falls back to en when locale doesn't have own message format rules" do
- locale, filename = JsLocaleHelper.find_message_format_locale([:nonexistent], fallback_to_english: true)
+ locale, filename =
+ JsLocaleHelper.find_message_format_locale([:nonexistent], fallback_to_english: true)
expect(locale).to eq("en")
expect(filename).to end_with("/en.js")
end
diff --git a/spec/lib/json_error_spec.rb b/spec/lib/json_error_spec.rb
index cee3760b037..14211498ec6 100644
--- a/spec/lib/json_error_spec.rb
+++ b/spec/lib/json_error_spec.rb
@@ -8,12 +8,11 @@ RSpec.shared_examples "a generic error" do
end
it "has a generic error message" do
- expect(result[:errors]).to eq([I18n.t('js.generic_error')])
+ expect(result[:errors]).to eq([I18n.t("js.generic_error")])
end
end
RSpec.describe JsonError do
-
let(:creator) { Object.new.extend(JsonError) }
describe "with a nil argument" do
@@ -49,5 +48,4 @@ RSpec.describe JsonError do
expect(result[:errors]).not_to be_blank
end
end
-
end
diff --git a/spec/lib/letter_avatar_spec.rb b/spec/lib/letter_avatar_spec.rb
index b5e49eec4e4..3dd910ab6ad 100644
--- a/spec/lib/letter_avatar_spec.rb
+++ b/spec/lib/letter_avatar_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-require 'letter_avatar'
+require "letter_avatar"
RSpec.describe LetterAvatar do
it "can cleanup correctly" do
diff --git a/spec/lib/message_id_service_spec.rb b/spec/lib/message_id_service_spec.rb
index d20c59fe207..dc8fa436fcc 100644
--- a/spec/lib/message_id_service_spec.rb
+++ b/spec/lib/message_id_service_spec.rb
@@ -11,38 +11,56 @@ RSpec.describe Email::MessageIdService do
it "generates for the post using the message_id on the post's incoming_email" do
Fabricate(:incoming_email, message_id: "test@test.localhost", post: post)
post.reload
- expect(subject.generate_for_post(post, use_incoming_email_if_present: true)).to eq("")
+ expect(subject.generate_for_post(post, use_incoming_email_if_present: true)).to eq(
+ "",
+ )
end
it "generates for the post without an incoming_email record" do
expect(subject.generate_for_post(post)).to match(subject.message_id_post_id_regexp)
- expect(subject.generate_for_post(post, use_incoming_email_if_present: true)).to match(subject.message_id_post_id_regexp)
+ expect(subject.generate_for_post(post, use_incoming_email_if_present: true)).to match(
+ subject.message_id_post_id_regexp,
+ )
end
end
describe "#generate_for_topic" do
it "generates for the topic using the message_id on the first post's incoming_email" do
- Fabricate(:incoming_email, message_id: "test213428@somemailservice.com", post: post, created_via: IncomingEmail.created_via_types[:handle_mail])
- post.reload
- expect(subject.generate_for_topic(topic, use_incoming_email_if_present: true)).to eq("")
- end
-
- it "does not use the first post's incoming email if it was created via group_smtp, only handle_mail" do
- incoming = Fabricate(
+ Fabricate(
:incoming_email,
message_id: "test213428@somemailservice.com",
post: post,
- created_via: IncomingEmail.created_via_types[:group_smtp]
+ created_via: IncomingEmail.created_via_types[:handle_mail],
)
post.reload
- expect(subject.generate_for_topic(topic, use_incoming_email_if_present: true)).to match(subject.message_id_topic_id_regexp)
+ expect(subject.generate_for_topic(topic, use_incoming_email_if_present: true)).to eq(
+ "",
+ )
+ end
+
+ it "does not use the first post's incoming email if it was created via group_smtp, only handle_mail" do
+ incoming =
+ Fabricate(
+ :incoming_email,
+ message_id: "test213428@somemailservice.com",
+ post: post,
+ created_via: IncomingEmail.created_via_types[:group_smtp],
+ )
+ post.reload
+ expect(subject.generate_for_topic(topic, use_incoming_email_if_present: true)).to match(
+ subject.message_id_topic_id_regexp,
+ )
incoming.update(created_via: IncomingEmail.created_via_types[:handle_mail])
- expect(subject.generate_for_topic(topic, use_incoming_email_if_present: true)).to eq("")
+ expect(subject.generate_for_topic(topic, use_incoming_email_if_present: true)).to eq(
+ "",
+ )
end
it "generates for the topic without an incoming_email record" do
expect(subject.generate_for_topic(topic)).to match(subject.message_id_topic_id_regexp)
- expect(subject.generate_for_topic(topic, use_incoming_email_if_present: true)).to match(subject.message_id_topic_id_regexp)
+ expect(subject.generate_for_topic(topic, use_incoming_email_if_present: true)).to match(
+ subject.message_id_topic_id_regexp,
+ )
end
it "generates canonical for the topic" do
@@ -67,17 +85,34 @@ RSpec.describe Email::MessageIdService do
it "handles bulk posts with a mixture of existing and new outbound_message_ids, returning in created_at order" do
topic = Fabricate(:topic)
- post_bulk1 = Fabricate(:post, topic: topic, created_at: 10.days.ago, outbound_message_id: "blah@test.host")
+ post_bulk1 =
+ Fabricate(
+ :post,
+ topic: topic,
+ created_at: 10.days.ago,
+ outbound_message_id: "blah@test.host",
+ )
post_bulk2 = Fabricate(:post, topic: topic, created_at: 12.days.ago, outbound_message_id: nil)
- post_bulk3 = Fabricate(:post, topic: topic, created_at: 11.days.ago, outbound_message_id: "sf92c349438509=3453@test.host")
+ post_bulk3 =
+ Fabricate(
+ :post,
+ topic: topic,
+ created_at: 11.days.ago,
+ outbound_message_id: "sf92c349438509=3453@test.host",
+ )
post_bulk4 = Fabricate(:post, topic: topic, created_at: 3.days.ago, outbound_message_id: nil)
- result = subject.generate_or_use_existing([post_bulk1.id, post_bulk2.id, post_bulk3.id, post_bulk4.id])
- expect(result).to eq([
- "",
- "",
- "",
- ""
- ])
+ result =
+ subject.generate_or_use_existing(
+ [post_bulk1.id, post_bulk2.id, post_bulk3.id, post_bulk4.id],
+ )
+ expect(result).to eq(
+ [
+ "",
+ "",
+ "",
+ "",
+ ],
+ )
end
end
@@ -86,7 +121,9 @@ RSpec.describe Email::MessageIdService do
let(:topic_format_message_id) { "" }
let(:discourse_format_message_id) { "" }
let(:default_format_message_id) { "<36ac1ddd-5083-461d-b72c-6372fb0e7f33@test.localhost>" }
- let(:gmail_format_message_id) { "" }
+ let(:gmail_format_message_id) do
+ ""
+ end
it "finds a post based only on a post-format message id" do
expect(subject.find_post_from_message_ids([post_format_message_id])).to eq(post)
@@ -106,25 +143,30 @@ RSpec.describe Email::MessageIdService do
end
it "finds a post from the email log" do
- email_log = Fabricate(:email_log, message_id: subject.message_id_clean(default_format_message_id))
+ email_log =
+ Fabricate(:email_log, message_id: subject.message_id_clean(default_format_message_id))
expect(subject.find_post_from_message_ids([default_format_message_id])).to eq(email_log.post)
end
it "finds a post from the incoming email log" do
- incoming_email = Fabricate(
- :incoming_email,
- message_id: subject.message_id_clean(gmail_format_message_id),
- post: Fabricate(:post)
+ incoming_email =
+ Fabricate(
+ :incoming_email,
+ message_id: subject.message_id_clean(gmail_format_message_id),
+ post: Fabricate(:post),
+ )
+ expect(subject.find_post_from_message_ids([gmail_format_message_id])).to eq(
+ incoming_email.post,
)
- expect(subject.find_post_from_message_ids([gmail_format_message_id])).to eq(incoming_email.post)
end
it "gets the last created post if multiple are returned" do
- incoming_email = Fabricate(
- :incoming_email,
- message_id: subject.message_id_clean(post_format_message_id),
- post: Fabricate(:post, created_at: 10.days.ago)
- )
+ incoming_email =
+ Fabricate(
+ :incoming_email,
+ message_id: subject.message_id_clean(post_format_message_id),
+ post: Fabricate(:post, created_at: 10.days.ago),
+ )
expect(subject.find_post_from_message_ids([post_format_message_id])).to eq(post)
end
end
@@ -147,7 +189,9 @@ RSpec.describe Email::MessageIdService do
expect(check_format("")).to eq(true)
expect(check_format("topic/1223@blah")).to eq(false)
- expect(check_format("")).to eq(false)
+ expect(
+ check_format(""),
+ ).to eq(false)
expect(check_format("t/1223@test.localhost")).to eq(false)
end
end
diff --git a/spec/lib/method_profiler_spec.rb b/spec/lib/method_profiler_spec.rb
index fe372cdddee..408a52defb5 100644
--- a/spec/lib/method_profiler_spec.rb
+++ b/spec/lib/method_profiler_spec.rb
@@ -6,9 +6,7 @@ RSpec.describe MethodProfiler do
end
def recurse(count = 5)
- if count > 0
- recurse(count - 1)
- end
+ recurse(count - 1) if count > 0
end
end
@@ -29,11 +27,13 @@ RSpec.describe MethodProfiler do
Sneetch.new.beach
data = MethodProfiler.transfer
result = nil
- Thread.new do
- MethodProfiler.start(data)
- Sneetch.new.beach
- result = MethodProfiler.stop
- end.join
+ Thread
+ .new do
+ MethodProfiler.start(data)
+ Sneetch.new.beach
+ result = MethodProfiler.stop
+ end
+ .join
expect(result[:at_beach][:calls]).to eq(2)
end
diff --git a/spec/lib/middleware/anonymous_cache_spec.rb b/spec/lib/middleware/anonymous_cache_spec.rb
index 34eff03ea22..05a496c8cb1 100644
--- a/spec/lib/middleware/anonymous_cache_spec.rb
+++ b/spec/lib/middleware/anonymous_cache_spec.rb
@@ -18,7 +18,9 @@ RSpec.describe Middleware::AnonymousCache do
end
it "is false for non GET" do
- expect(new_helper("ANON_CACHE_DURATION" => 10, "REQUEST_METHOD" => "POST").cacheable?).to eq(false)
+ expect(
+ new_helper("ANON_CACHE_DURATION" => 10, "REQUEST_METHOD" => "POST").cacheable?,
+ ).to eq(false)
end
it "is false if it has a valid auth cookie" do
@@ -97,12 +99,13 @@ RSpec.describe Middleware::AnonymousCache do
end
context "when cached" do
- let!(:helper) do
- new_helper("ANON_CACHE_DURATION" => 10)
- end
+ let!(:helper) { new_helper("ANON_CACHE_DURATION" => 10) }
let!(:crawler) do
- new_helper("ANON_CACHE_DURATION" => 10, "HTTP_USER_AGENT" => "AdsBot-Google (+http://www.google.com/adsbot.html)")
+ new_helper(
+ "ANON_CACHE_DURATION" => 10,
+ "HTTP_USER_AGENT" => "AdsBot-Google (+http://www.google.com/adsbot.html)",
+ )
end
after do
@@ -110,9 +113,7 @@ RSpec.describe Middleware::AnonymousCache do
crawler.clear_cache
end
- before do
- global_setting :anon_cache_store_threshold, 1
- end
+ before { global_setting :anon_cache_store_threshold, 1 }
it "compresses body on demand" do
global_setting :compress_anon_cache, true
@@ -121,7 +122,9 @@ RSpec.describe Middleware::AnonymousCache do
helper.cache([200, { "HELLO" => "WORLD" }, [payload]])
helper = new_helper("ANON_CACHE_DURATION" => 10)
- expect(helper.cached).to eq([200, { "X-Discourse-Cached" => "true", "HELLO" => "WORLD" }, [payload]])
+ expect(helper.cached).to eq(
+ [200, { "X-Discourse-Cached" => "true", "HELLO" => "WORLD" }, [payload]],
+ )
# depends on i7z implementation, but lets assume it is stable unless we discover
# otherwise
@@ -132,7 +135,9 @@ RSpec.describe Middleware::AnonymousCache do
helper.cache([200, { "HELLO" => "WORLD" }, ["hello ", "my world"]])
helper = new_helper("ANON_CACHE_DURATION" => 10)
- expect(helper.cached).to eq([200, { "X-Discourse-Cached" => "true", "HELLO" => "WORLD" }, ["hello my world"]])
+ expect(helper.cached).to eq(
+ [200, { "X-Discourse-Cached" => "true", "HELLO" => "WORLD" }, ["hello my world"]],
+ )
helper = new_helper("ANON_CACHE_DURATION" => 10, "HTTP_ACCEPT_ENCODING" => "gz, br")
expect(helper.cached).to eq(nil)
@@ -145,35 +150,35 @@ RSpec.describe Middleware::AnonymousCache do
helper = new_helper("ANON_CACHE_DURATION" => 10)
helper.is_mobile = true
- expect(helper.cached).to eq([200, { "X-Discourse-Cached" => "true", "HELLO" => "WORLD" }, ["hello my world"]])
+ expect(helper.cached).to eq(
+ [200, { "X-Discourse-Cached" => "true", "HELLO" => "WORLD" }, ["hello my world"]],
+ )
expect(crawler.cached).to eq(nil)
crawler.cache([200, { "HELLO" => "WORLD" }, ["hello ", "world"]])
- expect(crawler.cached).to eq([200, { "X-Discourse-Cached" => "true", "HELLO" => "WORLD" }, ["hello world"]])
+ expect(crawler.cached).to eq(
+ [200, { "X-Discourse-Cached" => "true", "HELLO" => "WORLD" }, ["hello world"]],
+ )
end
end
end
- describe 'background request rate limit' do
- it 'will rate limit background requests' do
-
- app = Middleware::AnonymousCache.new(
- lambda do |env|
- [200, {}, ["ok"]]
- end
- )
+ describe "background request rate limit" do
+ it "will rate limit background requests" do
+ app = Middleware::AnonymousCache.new(lambda { |env| [200, {}, ["ok"]] })
global_setting :background_requests_max_queue_length, "0.5"
cookie = create_auth_cookie(token: SecureRandom.hex)
- env = create_request_env.merge(
- "HTTP_COOKIE" => "_t=#{cookie}",
- "HOST" => "site.com",
- "REQUEST_METHOD" => "GET",
- "REQUEST_URI" => "/somewhere/rainbow",
- "REQUEST_QUEUE_SECONDS" => 2.1,
- "rack.input" => StringIO.new
- )
+ env =
+ create_request_env.merge(
+ "HTTP_COOKIE" => "_t=#{cookie}",
+ "HOST" => "site.com",
+ "REQUEST_METHOD" => "GET",
+ "REQUEST_URI" => "/somewhere/rainbow",
+ "REQUEST_QUEUE_SECONDS" => 2.1,
+ "rack.input" => StringIO.new,
+ )
# non background ... long request
env["REQUEST_QUEUE_SECONDS"] = 2
@@ -193,41 +198,39 @@ RSpec.describe Middleware::AnonymousCache do
status, _ = app.call(env.dup)
expect(status).to eq(200)
-
end
end
- describe '#force_anonymous!' do
- before do
- RateLimiter.enable
- end
-
- it 'will revert to anonymous once we reach the limit' do
+ describe "#force_anonymous!" do
+ before { RateLimiter.enable }
+ it "will revert to anonymous once we reach the limit" do
RateLimiter.clear_all!
is_anon = false
- app = Middleware::AnonymousCache.new(
- lambda do |env|
- is_anon = env["HTTP_COOKIE"].nil? && env["HTTP_DISCOURSE_LOGGED_IN"].nil?
- [200, {}, ["ok"]]
- end
- )
+ app =
+ Middleware::AnonymousCache.new(
+ lambda do |env|
+ is_anon = env["HTTP_COOKIE"].nil? && env["HTTP_DISCOURSE_LOGGED_IN"].nil?
+ [200, {}, ["ok"]]
+ end,
+ )
global_setting :force_anonymous_min_per_10_seconds, 2
global_setting :force_anonymous_min_queue_seconds, 1
cookie = create_auth_cookie(token: SecureRandom.hex)
- env = create_request_env.merge(
- "HTTP_COOKIE" => "_t=#{cookie}",
- "HTTP_DISCOURSE_LOGGED_IN" => "true",
- "HOST" => "site.com",
- "REQUEST_METHOD" => "GET",
- "REQUEST_URI" => "/somewhere/rainbow",
- "REQUEST_QUEUE_SECONDS" => 2.1,
- "rack.input" => StringIO.new
- )
+ env =
+ create_request_env.merge(
+ "HTTP_COOKIE" => "_t=#{cookie}",
+ "HTTP_DISCOURSE_LOGGED_IN" => "true",
+ "HOST" => "site.com",
+ "REQUEST_METHOD" => "GET",
+ "REQUEST_URI" => "/somewhere/rainbow",
+ "REQUEST_QUEUE_SECONDS" => 2.1,
+ "rack.input" => StringIO.new,
+ )
is_anon = false
app.call(env.dup)
@@ -244,7 +247,7 @@ RSpec.describe Middleware::AnonymousCache do
is_anon = false
_status, headers, _body = app.call(env.dup)
expect(is_anon).to eq(true)
- expect(headers['Set-Cookie']).to eq('dosp=1; Path=/')
+ expect(headers["Set-Cookie"]).to eq("dosp=1; Path=/")
# tricky change, a 50ms delay still will trigger protection
# once it is tripped
@@ -263,11 +266,10 @@ RSpec.describe Middleware::AnonymousCache do
end
end
- describe 'invalid request payload' do
- it 'returns 413 for GET request with payload' do
- status, headers, _ = middleware.call(env.tap do |environment|
- environment[Rack::RACK_INPUT].write("test")
- end)
+ describe "invalid request payload" do
+ it "returns 413 for GET request with payload" do
+ status, headers, _ =
+ middleware.call(env.tap { |environment| environment[Rack::RACK_INPUT].write("test") })
expect(status).to eq(413)
expect(headers["Cache-Control"]).to eq("private, max-age=0, must-revalidate")
@@ -278,104 +280,105 @@ RSpec.describe Middleware::AnonymousCache do
let :non_crawler do
{
"HTTP_USER_AGENT" =>
- "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36"
+ "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36",
}
end
def get(path, options)
- @env = env({
- "REQUEST_URI" => path,
- "PATH_INFO" => path,
- "REQUEST_PATH" => path
- }.merge(options[:headers]))
+ @env =
+ env(
+ { "REQUEST_URI" => path, "PATH_INFO" => path, "REQUEST_PATH" => path }.merge(
+ options[:headers],
+ ),
+ )
@status, @response_header, @response = middleware.call(@env)
end
it "applies allowed_crawler_user_agents correctly" do
- SiteSetting.allowed_crawler_user_agents = 'Googlebot'
+ SiteSetting.allowed_crawler_user_agents = "Googlebot"
- get '/', headers: {
- 'HTTP_USER_AGENT' => 'Googlebot/2.1 (+http://www.google.com/bot.html)'
- }
+ get "/", headers: { "HTTP_USER_AGENT" => "Googlebot/2.1 (+http://www.google.com/bot.html)" }
expect(@status).to eq(200)
- get '/', headers: {
- 'HTTP_USER_AGENT' => 'Anotherbot/2.1 (+http://www.notgoogle.com/bot.html)'
- }
+ get "/",
+ headers: {
+ "HTTP_USER_AGENT" => "Anotherbot/2.1 (+http://www.notgoogle.com/bot.html)",
+ }
expect(@status).to eq(403)
expect(@response).to be_an(Array)
- get '/', headers: non_crawler
+ get "/", headers: non_crawler
expect(@status).to eq(200)
end
it "doesn't block api requests" do
- SiteSetting.allowed_crawler_user_agents = 'Googlebot'
+ SiteSetting.allowed_crawler_user_agents = "Googlebot"
api_key = Fabricate(:api_key)
- get "/latest?api_key=#{api_key.key}&api_username=system", headers: {
- "QUERY_STRING" => "api_key=#{api_key.key}&api_username=system"
- }
+ get "/latest?api_key=#{api_key.key}&api_username=system",
+ headers: {
+ "QUERY_STRING" => "api_key=#{api_key.key}&api_username=system",
+ }
expect(@status).to eq(200)
end
it "applies blocked_crawler_user_agents correctly" do
- SiteSetting.blocked_crawler_user_agents = 'Googlebot'
+ SiteSetting.blocked_crawler_user_agents = "Googlebot"
- get '/', headers: non_crawler
+ get "/", headers: non_crawler
expect(@status).to eq(200)
- get '/', headers: {
- 'HTTP_USER_AGENT' => 'Googlebot/2.1 (+http://www.google.com/bot.html)'
- }
+ get "/", headers: { "HTTP_USER_AGENT" => "Googlebot/2.1 (+http://www.google.com/bot.html)" }
expect(@status).to eq(403)
- get '/', headers: {
- 'HTTP_USER_AGENT' => 'Twitterbot/2.1 (+http://www.notgoogle.com/bot.html)'
- }
+ get "/",
+ headers: {
+ "HTTP_USER_AGENT" => "Twitterbot/2.1 (+http://www.notgoogle.com/bot.html)",
+ }
expect(@status).to eq(200)
end
it "should never block robots.txt" do
- SiteSetting.blocked_crawler_user_agents = 'Googlebot'
+ SiteSetting.blocked_crawler_user_agents = "Googlebot"
- get '/robots.txt', headers: {
- 'HTTP_USER_AGENT' => 'Googlebot/2.1 (+http://www.google.com/bot.html)'
- }
+ get "/robots.txt",
+ headers: {
+ "HTTP_USER_AGENT" => "Googlebot/2.1 (+http://www.google.com/bot.html)",
+ }
expect(@status).to eq(200)
end
it "should never block srv/status" do
- SiteSetting.blocked_crawler_user_agents = 'Googlebot'
+ SiteSetting.blocked_crawler_user_agents = "Googlebot"
- get '/srv/status', headers: {
- 'HTTP_USER_AGENT' => 'Googlebot/2.1 (+http://www.google.com/bot.html)'
- }
+ get "/srv/status",
+ headers: {
+ "HTTP_USER_AGENT" => "Googlebot/2.1 (+http://www.google.com/bot.html)",
+ }
expect(@status).to eq(200)
end
it "blocked crawlers shouldn't log page views" do
- SiteSetting.blocked_crawler_user_agents = 'Googlebot'
+ SiteSetting.blocked_crawler_user_agents = "Googlebot"
- get '/', headers: {
- 'HTTP_USER_AGENT' => 'Googlebot/2.1 (+http://www.google.com/bot.html)'
- }
+ get "/", headers: { "HTTP_USER_AGENT" => "Googlebot/2.1 (+http://www.google.com/bot.html)" }
expect(@env["discourse.request_tracker.skip"]).to eq(true)
end
it "blocks json requests" do
- SiteSetting.blocked_crawler_user_agents = 'Googlebot'
+ SiteSetting.blocked_crawler_user_agents = "Googlebot"
- get '/srv/status.json', headers: {
- 'HTTP_USER_AGENT' => 'Googlebot/2.1 (+http://www.google.com/bot.html)'
- }
+ get "/srv/status.json",
+ headers: {
+ "HTTP_USER_AGENT" => "Googlebot/2.1 (+http://www.google.com/bot.html)",
+ }
expect(@status).to eq(403)
end
diff --git a/spec/lib/middleware/discourse_public_exceptions_spec.rb b/spec/lib/middleware/discourse_public_exceptions_spec.rb
index 557bb916188..e3545bb9cf6 100644
--- a/spec/lib/middleware/discourse_public_exceptions_spec.rb
+++ b/spec/lib/middleware/discourse_public_exceptions_spec.rb
@@ -6,28 +6,27 @@ RSpec.describe Middleware::DiscoursePublicExceptions do
Rails.logger = @fake_logger = FakeLogger.new
end
- after do
- Rails.logger = @orig_logger
- end
+ after { Rails.logger = @orig_logger }
def env(opts = {})
{
"HTTP_HOST" => "http://test.com",
"REQUEST_URI" => "/path?bla=1",
"REQUEST_METHOD" => "GET",
- "rack.input" => ""
+ "rack.input" => "",
}.merge(opts)
end
it "should not log for invalid mime type requests" do
ex = Middleware::DiscoursePublicExceptions.new("/test")
- ex.call(env(
- "HTTP_ACCEPT" => "../broken../",
- "action_dispatch.exception" => ActionController::RoutingError.new("abc")
- ))
+ ex.call(
+ env(
+ "HTTP_ACCEPT" => "../broken../",
+ "action_dispatch.exception" => ActionController::RoutingError.new("abc"),
+ ),
+ )
expect(@fake_logger.warnings.length).to eq(0)
end
-
end
diff --git a/spec/lib/middleware/enforce_hostname_spec.rb b/spec/lib/middleware/enforce_hostname_spec.rb
index 61f0873ae2d..d17657fbdc5 100644
--- a/spec/lib/middleware/enforce_hostname_spec.rb
+++ b/spec/lib/middleware/enforce_hostname_spec.rb
@@ -1,21 +1,23 @@
# frozen_string_literal: true
RSpec.describe Middleware::EnforceHostname do
-
before do
- RailsMultisite::ConnectionManagement.stubs(:current_db_hostnames).returns(['primary.example.com', 'secondary.example.com'])
- RailsMultisite::ConnectionManagement.stubs(:current_hostname).returns('primary.example.com')
+ RailsMultisite::ConnectionManagement.stubs(:current_db_hostnames).returns(
+ %w[primary.example.com secondary.example.com],
+ )
+ RailsMultisite::ConnectionManagement.stubs(:current_hostname).returns("primary.example.com")
end
def check_returned_host(input_host)
resolved_host = nil
- app = described_class.new(
- lambda do |env|
- resolved_host = env["HTTP_HOST"]
- [200, {}, ["ok"]]
- end
- )
+ app =
+ described_class.new(
+ lambda do |env|
+ resolved_host = env["HTTP_HOST"]
+ [200, {}, ["ok"]]
+ end,
+ )
app.call({ "HTTP_HOST" => input_host })
diff --git a/spec/lib/middleware/request_tracker_spec.rb b/spec/lib/middleware/request_tracker_spec.rb
index d00fc3f7592..7c4c7720a7d 100644
--- a/spec/lib/middleware/request_tracker_spec.rb
+++ b/spec/lib/middleware/request_tracker_spec.rb
@@ -5,10 +5,12 @@ RSpec.describe Middleware::RequestTracker do
path = opts.delete(:path) || "/path?bla=1"
create_request_env(path: path).merge(
"HTTP_HOST" => "http://test.com",
- "HTTP_USER_AGENT" => "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36",
+ "HTTP_USER_AGENT" =>
+ "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36",
"REQUEST_METHOD" => "GET",
- "HTTP_ACCEPT" => "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8",
- "rack.input" => StringIO.new
+ "HTTP_ACCEPT" =>
+ "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8",
+ "rack.input" => StringIO.new,
).merge(opts)
end
@@ -27,12 +29,13 @@ RSpec.describe Middleware::RequestTracker do
it "can handle rogue user agents" do
agent = (+"Evil Googlebot String \xc3\x28").force_encoding("Windows-1252")
- middleware = Middleware::RequestTracker.new(->(env) { ["200", { "Content-Type" => "text/html" }, [""]] })
+ middleware =
+ Middleware::RequestTracker.new(->(env) { ["200", { "Content-Type" => "text/html" }, [""]] })
middleware.call(env("HTTP_USER_AGENT" => agent))
CachedCounting.flush
- expect(WebCrawlerRequest.where(user_agent: agent.encode('utf-8')).count).to eq(1)
+ expect(WebCrawlerRequest.where(user_agent: agent.encode("utf-8")).count).to eq(1)
end
end
@@ -43,9 +46,12 @@ RSpec.describe Middleware::RequestTracker do
end
def log_tracked_view(val)
- data = Middleware::RequestTracker.get_data(env(
- "HTTP_DISCOURSE_TRACK_VIEW" => val
- ), ["200", { "Content-Type" => 'text/html' }], 0.2)
+ data =
+ Middleware::RequestTracker.get_data(
+ env("HTTP_DISCOURSE_TRACK_VIEW" => val),
+ ["200", { "Content-Type" => "text/html" }],
+ 0.2,
+ )
Middleware::RequestTracker.log_request(data)
end
@@ -62,29 +68,43 @@ RSpec.describe Middleware::RequestTracker do
end
it "can log requests correctly" do
- data = Middleware::RequestTracker.get_data(env(
- "HTTP_USER_AGENT" => "AdsBot-Google (+http://www.google.com/adsbot.html)"
- ), ["200", { "Content-Type" => 'text/html' }], 0.1)
+ data =
+ Middleware::RequestTracker.get_data(
+ env("HTTP_USER_AGENT" => "AdsBot-Google (+http://www.google.com/adsbot.html)"),
+ ["200", { "Content-Type" => "text/html" }],
+ 0.1,
+ )
Middleware::RequestTracker.log_request(data)
- data = Middleware::RequestTracker.get_data(env(
- "HTTP_DISCOURSE_TRACK_VIEW" => "1"
- ), ["200", {}], 0.1)
+ data =
+ Middleware::RequestTracker.get_data(
+ env("HTTP_DISCOURSE_TRACK_VIEW" => "1"),
+ ["200", {}],
+ 0.1,
+ )
Middleware::RequestTracker.log_request(data)
- data = Middleware::RequestTracker.get_data(env(
- "HTTP_USER_AGENT" => "Mozilla/5.0 (iPhone; CPU iPhone OS 8_1 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Version/8.0 Mobile/12B410 Safari/600.1.4"
- ), ["200", { "Content-Type" => 'text/html' }], 0.1)
+ data =
+ Middleware::RequestTracker.get_data(
+ env(
+ "HTTP_USER_AGENT" =>
+ "Mozilla/5.0 (iPhone; CPU iPhone OS 8_1 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Version/8.0 Mobile/12B410 Safari/600.1.4",
+ ),
+ ["200", { "Content-Type" => "text/html" }],
+ 0.1,
+ )
Middleware::RequestTracker.log_request(data)
# /srv/status is never a tracked view because content-type is text/plain
- data = Middleware::RequestTracker.get_data(env(
- "HTTP_USER_AGENT" => "kube-probe/1.18",
- "REQUEST_URI" => "/srv/status?shutdown_ok=1",
- ), ["200", { "Content-Type" => 'text/plain' }], 0.1)
+ data =
+ Middleware::RequestTracker.get_data(
+ env("HTTP_USER_AGENT" => "kube-probe/1.18", "REQUEST_URI" => "/srv/status?shutdown_ok=1"),
+ ["200", { "Content-Type" => "text/plain" }],
+ 0.1,
+ )
Middleware::RequestTracker.log_request(data)
@@ -101,21 +121,26 @@ RSpec.describe Middleware::RequestTracker do
end
it "logs API requests correctly" do
- data = Middleware::RequestTracker.get_data(
- env("_DISCOURSE_API" => "1"), ["200", { "Content-Type" => 'text/json' }], 0.1
- )
+ data =
+ Middleware::RequestTracker.get_data(
+ env("_DISCOURSE_API" => "1"),
+ ["200", { "Content-Type" => "text/json" }],
+ 0.1,
+ )
Middleware::RequestTracker.log_request(data)
- data = Middleware::RequestTracker.get_data(
- env("_DISCOURSE_API" => "1"), ["404", { "Content-Type" => 'text/json' }], 0.1
- )
+ data =
+ Middleware::RequestTracker.get_data(
+ env("_DISCOURSE_API" => "1"),
+ ["404", { "Content-Type" => "text/json" }],
+ 0.1,
+ )
Middleware::RequestTracker.log_request(data)
- data = Middleware::RequestTracker.get_data(
- env("_DISCOURSE_USER_API" => "1"), ["200", {}], 0.1
- )
+ data =
+ Middleware::RequestTracker.get_data(env("_DISCOURSE_USER_API" => "1"), ["200", {}], 0.1)
Middleware::RequestTracker.log_request(data)
CachedCounting.flush
@@ -129,9 +154,12 @@ RSpec.describe Middleware::RequestTracker do
it "can log Discourse user agent requests correctly" do
# log discourse api agents as crawlers for page view stats...
- data = Middleware::RequestTracker.get_data(env(
- "HTTP_USER_AGENT" => "DiscourseAPI Ruby Gem 0.19.0"
- ), ["200", { "Content-Type" => 'text/html' }], 0.1)
+ data =
+ Middleware::RequestTracker.get_data(
+ env("HTTP_USER_AGENT" => "DiscourseAPI Ruby Gem 0.19.0"),
+ ["200", { "Content-Type" => "text/html" }],
+ 0.1,
+ )
Middleware::RequestTracker.log_request(data)
@@ -141,9 +169,12 @@ RSpec.describe Middleware::RequestTracker do
expect(ApplicationRequest.page_view_crawler.first.count).to eq(1)
# ...but count our mobile app user agents as regular visits
- data = Middleware::RequestTracker.get_data(env(
- "HTTP_USER_AGENT" => "Mozilla/5.0 AppleWebKit/605.1.15 Mobile/15E148 DiscourseHub)"
- ), ["200", { "Content-Type" => 'text/html' }], 0.1)
+ data =
+ Middleware::RequestTracker.get_data(
+ env("HTTP_USER_AGENT" => "Mozilla/5.0 AppleWebKit/605.1.15 Mobile/15E148 DiscourseHub)"),
+ ["200", { "Content-Type" => "text/html" }],
+ 0.1,
+ )
Middleware::RequestTracker.log_request(data)
@@ -155,24 +186,35 @@ RSpec.describe Middleware::RequestTracker do
context "when ignoring anonymous page views" do
let(:anon_data) do
- Middleware::RequestTracker.get_data(env(
- "HTTP_USER_AGENT" => "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.72 Safari/537.36"
- ), ["200", { "Content-Type" => 'text/html' }], 0.1)
+ Middleware::RequestTracker.get_data(
+ env(
+ "HTTP_USER_AGENT" =>
+ "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.72 Safari/537.36",
+ ),
+ ["200", { "Content-Type" => "text/html" }],
+ 0.1,
+ )
end
let(:logged_in_data) do
user = Fabricate(:user, active: true)
token = UserAuthToken.generate!(user_id: user.id)
- cookie = create_auth_cookie(
- token: token.unhashed_auth_token,
- user_id: user.id,
- trust_level: user.trust_level,
- issued_at: 5.minutes.ago
+ cookie =
+ create_auth_cookie(
+ token: token.unhashed_auth_token,
+ user_id: user.id,
+ trust_level: user.trust_level,
+ issued_at: 5.minutes.ago,
+ )
+ Middleware::RequestTracker.get_data(
+ env(
+ "HTTP_USER_AGENT" =>
+ "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.72 Safari/537.36",
+ "HTTP_COOKIE" => "_t=#{cookie};",
+ ),
+ ["200", { "Content-Type" => "text/html" }],
+ 0.1,
)
- Middleware::RequestTracker.get_data(env(
- "HTTP_USER_AGENT" => "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.72 Safari/537.36",
- "HTTP_COOKIE" => "_t=#{cookie};"
- ), ["200", { "Content-Type" => 'text/html' }], 0.1)
end
it "does not ignore anonymous requests for public sites" do
@@ -218,17 +260,13 @@ RSpec.describe Middleware::RequestTracker do
# rate limiter tests depend on checks for retry-after
# they can be sensitive to clock skew during test runs
- freeze_time DateTime.parse('2021-01-01 01:00')
+ freeze_time DateTime.parse("2021-01-01 01:00")
end
- after do
- Rails.logger = @orig_logger
- end
+ after { Rails.logger = @orig_logger }
let :middleware do
- app = lambda do |env|
- [200, {}, ["OK"]]
- end
+ app = lambda { |env| [200, {}, ["OK"]] }
Middleware::RequestTracker.new(app)
end
@@ -245,10 +283,21 @@ RSpec.describe Middleware::RequestTracker do
it "blocks private IPs if not skipped" do
global_setting :max_reqs_per_ip_per_10_seconds, 1
- global_setting :max_reqs_per_ip_mode, 'warn+block'
+ global_setting :max_reqs_per_ip_mode, "warn+block"
global_setting :max_reqs_rate_limit_on_private, true
- addresses = %w[127.1.2.3 127.0.0.2 192.168.1.2 10.0.1.2 172.16.9.8 172.19.1.2 172.20.9.8 172.29.1.2 172.30.9.8 172.31.1.2]
+ addresses = %w[
+ 127.1.2.3
+ 127.0.0.2
+ 192.168.1.2
+ 10.0.1.2
+ 172.16.9.8
+ 172.19.1.2
+ 172.20.9.8
+ 172.29.1.2
+ 172.30.9.8
+ 172.31.1.2
+ ]
warn_count = 1
addresses.each do |addr|
env1 = env("REMOTE_ADDR" => addr)
@@ -256,7 +305,9 @@ RSpec.describe Middleware::RequestTracker do
status, _ = middleware.call(env1)
status, _ = middleware.call(env1)
- expect(@fake_logger.warnings.count { |w| w.include?("Global IP rate limit exceeded") }).to eq(warn_count)
+ expect(
+ @fake_logger.warnings.count { |w| w.include?("Global IP rate limit exceeded") },
+ ).to eq(warn_count)
expect(status).to eq(429)
warn_count += 1
end
@@ -264,7 +315,7 @@ RSpec.describe Middleware::RequestTracker do
it "blocks if the ip isn't static skipped" do
global_setting :max_reqs_per_ip_per_10_seconds, 1
- global_setting :max_reqs_per_ip_mode, 'block'
+ global_setting :max_reqs_per_ip_mode, "block"
env1 = env("REMOTE_ADDR" => "1.1.1.1")
status, _ = middleware.call(env1)
@@ -273,9 +324,13 @@ RSpec.describe Middleware::RequestTracker do
end
it "doesn't block if rate limiter is enabled but IP is on the static exception list" do
- stub_const(Middleware::RequestTracker, "STATIC_IP_SKIPPER", "177.33.14.73 191.209.88.192/30"&.split&.map { |ip| IPAddr.new(ip) }) do
+ stub_const(
+ Middleware::RequestTracker,
+ "STATIC_IP_SKIPPER",
+ "177.33.14.73 191.209.88.192/30"&.split&.map { |ip| IPAddr.new(ip) },
+ ) do
global_setting :max_reqs_per_ip_per_10_seconds, 1
- global_setting :max_reqs_per_ip_mode, 'block'
+ global_setting :max_reqs_per_ip_mode, "block"
env1 = env("REMOTE_ADDR" => "177.33.14.73")
env2 = env("REMOTE_ADDR" => "191.209.88.194")
@@ -296,16 +351,12 @@ RSpec.describe Middleware::RequestTracker do
describe "register_ip_skipper" do
before do
- Middleware::RequestTracker.register_ip_skipper do |ip|
- ip == "1.1.1.2"
- end
+ Middleware::RequestTracker.register_ip_skipper { |ip| ip == "1.1.1.2" }
global_setting :max_reqs_per_ip_per_10_seconds, 1
- global_setting :max_reqs_per_ip_mode, 'block'
+ global_setting :max_reqs_per_ip_mode, "block"
end
- after do
- Middleware::RequestTracker.unregister_ip_skipper
- end
+ after { Middleware::RequestTracker.unregister_ip_skipper }
it "won't block if the ip is skipped" do
env1 = env("REMOTE_ADDR" => "1.1.1.2")
@@ -324,47 +375,64 @@ RSpec.describe Middleware::RequestTracker do
it "does nothing for private IPs if skipped" do
global_setting :max_reqs_per_ip_per_10_seconds, 1
- global_setting :max_reqs_per_ip_mode, 'warn+block'
+ global_setting :max_reqs_per_ip_mode, "warn+block"
global_setting :max_reqs_rate_limit_on_private, false
- addresses = %w[127.1.2.3 127.0.3.1 192.168.1.2 10.0.1.2 172.16.9.8 172.19.1.2 172.20.9.8 172.29.1.2 172.30.9.8 172.31.1.2]
+ addresses = %w[
+ 127.1.2.3
+ 127.0.3.1
+ 192.168.1.2
+ 10.0.1.2
+ 172.16.9.8
+ 172.19.1.2
+ 172.20.9.8
+ 172.29.1.2
+ 172.30.9.8
+ 172.31.1.2
+ ]
addresses.each do |addr|
env1 = env("REMOTE_ADDR" => addr)
status, _ = middleware.call(env1)
status, _ = middleware.call(env1)
- expect(@fake_logger.warnings.count { |w| w.include?("Global IP rate limit exceeded") }).to eq(0)
+ expect(
+ @fake_logger.warnings.count { |w| w.include?("Global IP rate limit exceeded") },
+ ).to eq(0)
expect(status).to eq(200)
end
end
it "does warn if rate limiter is enabled via warn+block" do
global_setting :max_reqs_per_ip_per_10_seconds, 1
- global_setting :max_reqs_per_ip_mode, 'warn+block'
+ global_setting :max_reqs_per_ip_mode, "warn+block"
status, _ = middleware.call(env)
status, headers = middleware.call(env)
- expect(@fake_logger.warnings.count { |w| w.include?("Global IP rate limit exceeded") }).to eq(1)
+ expect(@fake_logger.warnings.count { |w| w.include?("Global IP rate limit exceeded") }).to eq(
+ 1,
+ )
expect(status).to eq(429)
expect(headers["Retry-After"]).to eq("10")
end
it "does warn if rate limiter is enabled" do
global_setting :max_reqs_per_ip_per_10_seconds, 1
- global_setting :max_reqs_per_ip_mode, 'warn'
+ global_setting :max_reqs_per_ip_mode, "warn"
status, _ = middleware.call(env)
status, _ = middleware.call(env)
- expect(@fake_logger.warnings.count { |w| w.include?("Global IP rate limit exceeded") }).to eq(1)
+ expect(@fake_logger.warnings.count { |w| w.include?("Global IP rate limit exceeded") }).to eq(
+ 1,
+ )
expect(status).to eq(200)
end
it "allows assets for more requests" do
global_setting :max_reqs_per_ip_per_10_seconds, 1
- global_setting :max_reqs_per_ip_mode, 'block'
+ global_setting :max_reqs_per_ip_mode, "block"
global_setting :max_asset_reqs_per_ip_per_10_seconds, 3
env1 = env("REMOTE_ADDR" => "1.1.1.1", "DISCOURSE_IS_ASSET_PATH" => 1)
@@ -388,7 +456,7 @@ RSpec.describe Middleware::RequestTracker do
it "does block if rate limiter is enabled" do
global_setting :max_reqs_per_ip_per_10_seconds, 1
- global_setting :max_reqs_per_ip_mode, 'block'
+ global_setting :max_reqs_per_ip_mode, "block"
env1 = env("REMOTE_ADDR" => "1.1.1.1")
env2 = env("REMOTE_ADDR" => "1.1.1.2")
@@ -408,10 +476,11 @@ RSpec.describe Middleware::RequestTracker do
it "is included when the requests-per-10-seconds limit is reached" do
global_setting :max_reqs_per_ip_per_10_seconds, 1
called = 0
- app = lambda do |_|
- called += 1
- [200, {}, ["OK"]]
- end
+ app =
+ lambda do |_|
+ called += 1
+ [200, {}, ["OK"]]
+ end
env = env("REMOTE_ADDR" => "1.1.1.1")
middleware = Middleware::RequestTracker.new(app)
status, = middleware.call(env)
@@ -430,10 +499,11 @@ RSpec.describe Middleware::RequestTracker do
it "is included when the requests-per-minute limit is reached" do
global_setting :max_reqs_per_ip_per_minute, 1
called = 0
- app = lambda do |_|
- called += 1
- [200, {}, ["OK"]]
- end
+ app =
+ lambda do |_|
+ called += 1
+ [200, {}, ["OK"]]
+ end
env = env("REMOTE_ADDR" => "1.1.1.1")
middleware = Middleware::RequestTracker.new(app)
status, = middleware.call(env)
@@ -452,11 +522,12 @@ RSpec.describe Middleware::RequestTracker do
it "is included when the assets-requests-per-10-seconds limit is reached" do
global_setting :max_asset_reqs_per_ip_per_10_seconds, 1
called = 0
- app = lambda do |env|
- called += 1
- env["DISCOURSE_IS_ASSET_PATH"] = true
- [200, {}, ["OK"]]
- end
+ app =
+ lambda do |env|
+ called += 1
+ env["DISCOURSE_IS_ASSET_PATH"] = true
+ [200, {}, ["OK"]]
+ end
env = env("REMOTE_ADDR" => "1.1.1.1")
middleware = Middleware::RequestTracker.new(app)
status, = middleware.call(env)
@@ -477,23 +548,26 @@ RSpec.describe Middleware::RequestTracker do
global_setting :max_reqs_per_ip_per_minute, 1
global_setting :skip_per_ip_rate_limit_trust_level, 3
- envs = 3.times.map do |n|
- user = Fabricate(:user, trust_level: 3)
- token = UserAuthToken.generate!(user_id: user.id)
- cookie = create_auth_cookie(
- token: token.unhashed_auth_token,
- user_id: user.id,
- trust_level: user.trust_level,
- issued_at: 5.minutes.ago
- )
- env("HTTP_COOKIE" => "_t=#{cookie}", "REMOTE_ADDR" => "1.1.1.1")
- end
+ envs =
+ 3.times.map do |n|
+ user = Fabricate(:user, trust_level: 3)
+ token = UserAuthToken.generate!(user_id: user.id)
+ cookie =
+ create_auth_cookie(
+ token: token.unhashed_auth_token,
+ user_id: user.id,
+ trust_level: user.trust_level,
+ issued_at: 5.minutes.ago,
+ )
+ env("HTTP_COOKIE" => "_t=#{cookie}", "REMOTE_ADDR" => "1.1.1.1")
+ end
called = 0
- app = lambda do |env|
- called += 1
- [200, {}, ["OK"]]
- end
+ app =
+ lambda do |env|
+ called += 1
+ [200, {}, ["OK"]]
+ end
envs.each do |env|
middleware = Middleware::RequestTracker.new(app)
status, = middleware.call(env)
@@ -517,19 +591,21 @@ RSpec.describe Middleware::RequestTracker do
global_setting :skip_per_ip_rate_limit_trust_level, 3
user = Fabricate(:user, trust_level: 3)
token = UserAuthToken.generate!(user_id: user.id)
- cookie = create_auth_cookie(
- token: token.unhashed_auth_token,
- user_id: user.id,
- trust_level: user.trust_level,
- issued_at: 5.minutes.ago
- )
+ cookie =
+ create_auth_cookie(
+ token: token.unhashed_auth_token,
+ user_id: user.id,
+ trust_level: user.trust_level,
+ issued_at: 5.minutes.ago,
+ )
env = env("HTTP_COOKIE" => "_t=#{cookie}", "REMOTE_ADDR" => "1.1.1.1")
called = 0
- app = lambda do |_|
- called += 1
- [200, {}, ["OK"]]
- end
+ app =
+ lambda do |_|
+ called += 1
+ [200, {}, ["OK"]]
+ end
freeze_time(12.minutes.from_now) do
middleware = Middleware::RequestTracker.new(app)
status, = middleware.call(env)
@@ -549,20 +625,22 @@ RSpec.describe Middleware::RequestTracker do
global_setting :skip_per_ip_rate_limit_trust_level, 3
user = Fabricate(:user, trust_level: 3)
token = UserAuthToken.generate!(user_id: user.id)
- cookie = create_auth_cookie(
- token: token.unhashed_auth_token,
- user_id: user.id,
- trust_level: user.trust_level,
- issued_at: Time.zone.now
- )
+ cookie =
+ create_auth_cookie(
+ token: token.unhashed_auth_token,
+ user_id: user.id,
+ trust_level: user.trust_level,
+ issued_at: Time.zone.now,
+ )
cookie = swap_2_different_characters(cookie)
env = env("HTTP_COOKIE" => "_t=#{cookie}", "REMOTE_ADDR" => "1.1.1.1")
called = 0
- app = lambda do |_|
- called += 1
- [200, {}, ["OK"]]
- end
+ app =
+ lambda do |_|
+ called += 1
+ [200, {}, ["OK"]]
+ end
middleware = Middleware::RequestTracker.new(app)
status, = middleware.call(env)
@@ -579,30 +657,22 @@ RSpec.describe Middleware::RequestTracker do
describe "callbacks" do
def app(result, sql_calls: 0, redis_calls: 0)
lambda do |env|
- sql_calls.times do
- User.where(id: -100).pluck(:id)
- end
- redis_calls.times do
- Discourse.redis.get("x")
- end
+ sql_calls.times { User.where(id: -100).pluck(:id) }
+ redis_calls.times { Discourse.redis.get("x") }
result
end
end
let(:logger) do
- ->(env, data) do
+ ->(env, data) {
@env = env
@data = data
- end
+ }
end
- before do
- Middleware::RequestTracker.register_detailed_request_logger(logger)
- end
+ before { Middleware::RequestTracker.register_detailed_request_logger(logger) }
- after do
- Middleware::RequestTracker.unregister_detailed_request_logger(logger)
- end
+ after { Middleware::RequestTracker.unregister_detailed_request_logger(logger) }
it "can report data from anon cache" do
cache = Middleware::AnonymousCache.new(app([200, {}, ["i am a thing"]]))
@@ -610,16 +680,24 @@ RSpec.describe Middleware::RequestTracker do
uri = "/path?#{SecureRandom.hex}"
- request_params = {
- "a" => "b",
- "action" => "bob",
- "controller" => "jane"
- }
+ request_params = { "a" => "b", "action" => "bob", "controller" => "jane" }
- tracker.call(env("REQUEST_URI" => uri, "ANON_CACHE_DURATION" => 60, "action_dispatch.request.parameters" => request_params))
+ tracker.call(
+ env(
+ "REQUEST_URI" => uri,
+ "ANON_CACHE_DURATION" => 60,
+ "action_dispatch.request.parameters" => request_params,
+ ),
+ )
expect(@data[:cache]).to eq("skip")
- tracker.call(env("REQUEST_URI" => uri, "ANON_CACHE_DURATION" => 60, "action_dispatch.request.parameters" => request_params))
+ tracker.call(
+ env(
+ "REQUEST_URI" => uri,
+ "ANON_CACHE_DURATION" => 60,
+ "action_dispatch.request.parameters" => request_params,
+ ),
+ )
expect(@data[:cache]).to eq("store")
tracker.call(env("REQUEST_URI" => uri, "ANON_CACHE_DURATION" => 60))
@@ -678,7 +756,7 @@ RSpec.describe Middleware::RequestTracker do
expect(@data[:is_background]).to eq(true)
expect(@data[:background_type]).to eq("message-bus-dlp")
- tracker.call(env("HTTP_DONT_CHUNK" => "True", path: "/message-bus/abcde/poll"))
+ tracker.call(env("HTTP_DONT_CHUNK" => "True", :path => "/message-bus/abcde/poll"))
expect(@data[:is_background]).to eq(true)
expect(@data[:background_type]).to eq("message-bus-dontchunk")
end
diff --git a/spec/lib/migration/column_dropper_spec.rb b/spec/lib/migration/column_dropper_spec.rb
index 2684bf17688..d5a42177a39 100644
--- a/spec/lib/migration/column_dropper_spec.rb
+++ b/spec/lib/migration/column_dropper_spec.rb
@@ -13,30 +13,22 @@ RSpec.describe Migration::ColumnDropper do
end
describe ".execute_drop" do
- let(:columns) { %w{junk junk2} }
+ let(:columns) { %w[junk junk2] }
- before do
- columns.each do |column|
- DB.exec("ALTER TABLE topics ADD COLUMN #{column} int")
- end
- end
+ before { columns.each { |column| DB.exec("ALTER TABLE topics ADD COLUMN #{column} int") } }
after do
- columns.each do |column|
- DB.exec("ALTER TABLE topics DROP COLUMN IF EXISTS #{column}")
- end
+ columns.each { |column| DB.exec("ALTER TABLE topics DROP COLUMN IF EXISTS #{column}") }
end
it "drops the columns" do
Migration::ColumnDropper.execute_drop("topics", columns)
- columns.each do |column|
- expect(has_column?('topics', column)).to eq(false)
- end
+ columns.each { |column| expect(has_column?("topics", column)).to eq(false) }
end
end
- describe '.mark_readonly' do
+ describe ".mark_readonly" do
let(:table_name) { "table_with_readonly_column" }
before do
@@ -47,7 +39,7 @@ RSpec.describe Migration::ColumnDropper do
VALUES (1, 'something@email.com');
SQL
- Migration::ColumnDropper.mark_readonly(table_name, 'email')
+ Migration::ColumnDropper.mark_readonly(table_name, "email")
end
after do
@@ -55,21 +47,21 @@ RSpec.describe Migration::ColumnDropper do
DB.exec <<~SQL
DROP TABLE IF EXISTS #{table_name};
- DROP FUNCTION IF EXISTS #{Migration::BaseDropper.readonly_function_name(table_name, 'email')} CASCADE;
+ DROP FUNCTION IF EXISTS #{Migration::BaseDropper.readonly_function_name(table_name, "email")} CASCADE;
SQL
end
- it 'should be droppable' do
- Migration::ColumnDropper.execute_drop(table_name, ['email'])
+ it "should be droppable" do
+ Migration::ColumnDropper.execute_drop(table_name, ["email"])
- expect(has_trigger?(Migration::BaseDropper.readonly_trigger_name(
- table_name, 'email'
- ))).to eq(false)
+ expect(has_trigger?(Migration::BaseDropper.readonly_trigger_name(table_name, "email"))).to eq(
+ false,
+ )
- expect(has_column?(table_name, 'email')).to eq(false)
+ expect(has_column?(table_name, "email")).to eq(false)
end
- it 'should prevent updates to the readonly column' do
+ it "should prevent updates to the readonly column" do
begin
DB.exec <<~SQL
UPDATE #{table_name}
@@ -79,46 +71,39 @@ RSpec.describe Migration::ColumnDropper do
rescue PG::RaiseException => e
[
"Discourse: email in #{table_name} is readonly",
- 'discourse_functions.raise_table_with_readonly_column_email_readonly()'
- ].each do |message|
- expect(e.message).to include(message)
- end
+ "discourse_functions.raise_table_with_readonly_column_email_readonly()",
+ ].each { |message| expect(e.message).to include(message) }
end
end
- it 'should allow updates to the other columns' do
+ it "should allow updates to the other columns" do
DB.exec <<~SQL
UPDATE #{table_name}
SET topic_id = 2
WHERE topic_id = 1
SQL
- expect(
- DB.query("SELECT * FROM #{table_name};").first.values
- ).to include 2, "something@email.com"
+ expect(DB.query("SELECT * FROM #{table_name};").first.values).to include 2,
+ "something@email.com"
end
- it 'should prevent insertions to the readonly column' do
- expect do
- ActiveRecord::Base.connection.raw_connection.exec <<~SQL
+ it "should prevent insertions to the readonly column" do
+ expect do ActiveRecord::Base.connection.raw_connection.exec <<~SQL end.to raise_error(
INSERT INTO #{table_name} (topic_id, email)
VALUES (2, 'something@email.com');
SQL
- end.to raise_error(
PG::RaiseException,
- /Discourse: email in table_with_readonly_column is readonly/
+ /Discourse: email in table_with_readonly_column is readonly/,
)
end
- it 'should allow insertions to the other columns' do
+ it "should allow insertions to the other columns" do
DB.exec <<~SQL
INSERT INTO #{table_name} (topic_id)
VALUES (2);
SQL
- expect(
- DB.query_single("SELECT topic_id FROM #{table_name} WHERE topic_id = 2")
- ).to eq([2])
+ expect(DB.query_single("SELECT topic_id FROM #{table_name} WHERE topic_id = 2")).to eq([2])
end
end
end
diff --git a/spec/lib/migration/safe_migrate_spec.rb b/spec/lib/migration/safe_migrate_spec.rb
index a0c8e736cda..06c15e985b3 100644
--- a/spec/lib/migration/safe_migrate_spec.rb
+++ b/spec/lib/migration/safe_migrate_spec.rb
@@ -1,9 +1,7 @@
# frozen_string_literal: true
RSpec.describe Migration::SafeMigrate do
- before do
- Migration::SafeMigrate::SafeMigration.disable_safe!
- end
+ before { Migration::SafeMigrate::SafeMigration.disable_safe! }
after do
Migration::SafeMigrate.disable!
@@ -12,7 +10,12 @@ RSpec.describe Migration::SafeMigrate do
def migrate_up(path)
migrations = ActiveRecord::MigrationContext.new(path, ActiveRecord::SchemaMigration).migrations
- ActiveRecord::Migrator.new(:up, migrations, ActiveRecord::SchemaMigration, migrations.first.version).run
+ ActiveRecord::Migrator.new(
+ :up,
+ migrations,
+ ActiveRecord::SchemaMigration,
+ migrations.first.version,
+ ).run
end
it "bans all table removal" do
@@ -20,11 +23,7 @@ RSpec.describe Migration::SafeMigrate do
path = File.expand_path "#{Rails.root}/spec/fixtures/db/migrate/drop_table"
- output = capture_stdout do
- expect do
- migrate_up(path)
- end.to raise_error(StandardError)
- end
+ output = capture_stdout { expect do migrate_up(path) end.to raise_error(StandardError) }
expect(output).to include("rails g post_migration")
@@ -37,11 +36,7 @@ RSpec.describe Migration::SafeMigrate do
path = File.expand_path "#{Rails.root}/spec/fixtures/db/migrate/rename_table"
- output = capture_stdout do
- expect do
- migrate_up(path)
- end.to raise_error(StandardError)
- end
+ output = capture_stdout { expect do migrate_up(path) end.to raise_error(StandardError) }
expect { User.first }.not_to raise_error
expect(User.first).not_to eq(nil)
@@ -54,11 +49,7 @@ RSpec.describe Migration::SafeMigrate do
path = File.expand_path "#{Rails.root}/spec/fixtures/db/migrate/remove_column"
- output = capture_stdout do
- expect do
- migrate_up(path)
- end.to raise_error(StandardError)
- end
+ output = capture_stdout { expect do migrate_up(path) end.to raise_error(StandardError) }
expect(output).to include("rails g post_migration")
@@ -71,11 +62,7 @@ RSpec.describe Migration::SafeMigrate do
path = File.expand_path "#{Rails.root}/spec/fixtures/db/migrate/rename_column"
- output = capture_stdout do
- expect do
- migrate_up(path)
- end.to raise_error(StandardError)
- end
+ output = capture_stdout { expect do migrate_up(path) end.to raise_error(StandardError) }
expect(output).to include("rails g post_migration")
@@ -89,34 +76,28 @@ RSpec.describe Migration::SafeMigrate do
path = File.expand_path "#{Rails.root}/spec/fixtures/db/migrate/drop_table"
- output = capture_stdout do
- migrate_up(path)
- end
+ output = capture_stdout { migrate_up(path) }
expect(output).to include("drop_table(:email_logs)")
end
- describe 'for a post deployment migration' do
- it 'should not ban unsafe migrations using up' do
+ describe "for a post deployment migration" do
+ it "should not ban unsafe migrations using up" do
Migration::SafeMigrate::SafeMigration.enable_safe!
path = File.expand_path "#{Rails.root}/spec/fixtures/db/post_migrate/drop_table"
- output = capture_stdout do
- migrate_up(path)
- end
+ output = capture_stdout { migrate_up(path) }
expect(output).to include("drop_table(:email_logs)")
end
- it 'should not ban unsafe migrations using change' do
+ it "should not ban unsafe migrations using change" do
Migration::SafeMigrate::SafeMigration.enable_safe!
path = File.expand_path "#{Rails.root}/spec/fixtures/db/post_migrate/change"
- output = capture_stdout do
- migrate_up(path)
- end
+ output = capture_stdout { migrate_up(path) }
expect(output).to include("drop_table(:email_logs)")
end
diff --git a/spec/lib/migration/table_dropper_spec.rb b/spec/lib/migration/table_dropper_spec.rb
index 535e67388a0..6b15603c1c4 100644
--- a/spec/lib/migration/table_dropper_spec.rb
+++ b/spec/lib/migration/table_dropper_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
RSpec.describe Migration::TableDropper do
-
def table_exists?(table_name)
DB.exec(<<~SQL) > 0
SELECT 1
@@ -11,7 +10,7 @@ RSpec.describe Migration::TableDropper do
SQL
end
- def function_exists?(function_name, schema_name = 'public')
+ def function_exists?(function_name, schema_name = "public")
DB.exec(<<~SQL) > 0
SELECT 1
FROM information_schema.routines
@@ -21,7 +20,7 @@ RSpec.describe Migration::TableDropper do
SQL
end
- let(:table_name) { 'table_with_old_name' }
+ let(:table_name) { "table_with_old_name" }
before do
DB.exec "CREATE TABLE #{table_name} (topic_id INTEGER)"
@@ -40,9 +39,7 @@ RSpec.describe Migration::TableDropper do
end
describe ".readonly_only_table" do
- before do
- Migration::TableDropper.read_only_table(table_name)
- end
+ before { Migration::TableDropper.read_only_table(table_name) }
after do
ActiveRecord::Base.connection.reset!
@@ -53,12 +50,10 @@ RSpec.describe Migration::TableDropper do
SQL
end
- it 'should be droppable' do
+ it "should be droppable" do
Migration::TableDropper.execute_drop(table_name)
- expect(has_trigger?(Migration::BaseDropper.readonly_trigger_name(
- table_name
- ))).to eq(false)
+ expect(has_trigger?(Migration::BaseDropper.readonly_trigger_name(table_name))).to eq(false)
expect(table_exists?(table_name)).to eq(false)
end
@@ -66,14 +61,13 @@ RSpec.describe Migration::TableDropper do
it "should drop the read_only function" do
Migration::TableDropper.execute_drop(table_name)
- schema_name, function_name = Migration::BaseDropper
- .readonly_function_name(table_name)
- .delete_suffix('()').split('.')
+ schema_name, function_name =
+ Migration::BaseDropper.readonly_function_name(table_name).delete_suffix("()").split(".")
expect(function_exists?(function_name, schema_name)).to eq(false)
end
- it 'should prevent insertions to the table' do
+ it "should prevent insertions to the table" do
begin
DB.exec <<~SQL
INSERT INTO #{table_name} (topic_id) VALUES (2)
@@ -81,10 +75,8 @@ RSpec.describe Migration::TableDropper do
rescue PG::RaiseException => e
[
"Discourse: #{table_name} is read only",
- 'discourse_functions.raise_table_with_old_name_readonly()'
- ].each do |message|
- expect(e.message).to include(message)
- end
+ "discourse_functions.raise_table_with_old_name_readonly()",
+ ].each { |message| expect(e.message).to include(message) }
end
end
end
diff --git a/spec/lib/mini_sql_multisite_connection_spec.rb b/spec/lib/mini_sql_multisite_connection_spec.rb
index 2a30ac161bd..5a2b32fa500 100644
--- a/spec/lib/mini_sql_multisite_connection_spec.rb
+++ b/spec/lib/mini_sql_multisite_connection_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
RSpec.describe MiniSqlMultisiteConnection do
-
describe "after_commit" do
it "works for 'fake' (joinable) transactions" do
outputString = "1"
@@ -28,14 +27,14 @@ RSpec.describe MiniSqlMultisiteConnection do
ActiveRecord::Base.transaction(requires_new: true, joinable: false) do
outputString += "2"
DB.exec("SELECT 1")
- ActiveRecord::Base.transaction(requires_new: true) do
- DB.exec("SELECT 2")
- outputString += "3"
- DB.after_commit { outputString += "6" }
- outputString += "4"
- end
- DB.after_commit { outputString += "7" }
- outputString += "5"
+ ActiveRecord::Base.transaction(requires_new: true) do
+ DB.exec("SELECT 2")
+ outputString += "3"
+ DB.after_commit { outputString += "6" }
+ outputString += "4"
+ end
+ DB.after_commit { outputString += "7" }
+ outputString += "5"
end
expect(outputString).to eq("1234567")
@@ -47,9 +46,7 @@ RSpec.describe MiniSqlMultisiteConnection do
ActiveRecord::Base.transaction do
outputString += "2"
- DB.after_commit do
- outputString += "4"
- end
+ DB.after_commit { outputString += "4" }
outputString += "3"
@@ -62,9 +59,7 @@ RSpec.describe MiniSqlMultisiteConnection do
it "runs immediately if there is no transaction" do
outputString = "1"
- DB.after_commit do
- outputString += "2"
- end
+ DB.after_commit { outputString += "2" }
outputString += "3"
@@ -75,7 +70,5 @@ RSpec.describe MiniSqlMultisiteConnection do
DB.prepared.query("SELECT ?", 1)
DB.prepared.query("SELECT ?", 2)
end
-
end
-
end
diff --git a/spec/lib/mobile_detection_spec.rb b/spec/lib/mobile_detection_spec.rb
index 5267383150d..853fe24b1be 100644
--- a/spec/lib/mobile_detection_spec.rb
+++ b/spec/lib/mobile_detection_spec.rb
@@ -43,5 +43,4 @@ Mozilla/5.0 (iPhone; CPU iPhone OS 14_8 like Mac OS X) AppleWebKit/605.1.15 (KHT
expect(MobileDetection.modern_mobile_device?(agent)).to eq(false)
end
end
-
end
diff --git a/spec/lib/new_post_manager_spec.rb b/spec/lib/new_post_manager_spec.rb
index c602df9a528..7edc8c61080 100644
--- a/spec/lib/new_post_manager_spec.rb
+++ b/spec/lib/new_post_manager_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-require 'new_post_manager'
+require "new_post_manager"
RSpec.describe NewPostManager do
fab!(:user) { Fabricate(:user) }
@@ -8,7 +8,7 @@ RSpec.describe NewPostManager do
describe "default action" do
it "creates the post by default" do
- manager = NewPostManager.new(user, raw: 'this is a new post', topic_id: topic.id)
+ manager = NewPostManager.new(user, raw: "this is a new post", topic_id: topic.id)
result = manager.perform
expect(result.action).to eq(:create_post)
@@ -25,11 +25,14 @@ RSpec.describe NewPostManager do
Group.refresh_automatic_groups!
SiteSetting.approve_unless_trust_level = 4
- manager = NewPostManager.new(user,
- raw: 'this is a new post',
- title: 'this is a new title',
- archetype: Archetype.private_message,
- target_usernames: other_user.username)
+ manager =
+ NewPostManager.new(
+ user,
+ raw: "this is a new post",
+ title: "this is a new title",
+ archetype: Archetype.private_message,
+ target_usernames: other_user.username,
+ )
result = manager.perform
@@ -40,9 +43,7 @@ RSpec.describe NewPostManager do
expect(result.post).to be_a(Post)
# It doesn't enqueue replies to the private message either
- manager = NewPostManager.new(user,
- raw: 'this is a new reply',
- topic_id: result.post.topic_id)
+ manager = NewPostManager.new(user, raw: "this is a new reply", topic_id: result.post.topic_id)
result = manager.perform
@@ -62,13 +63,14 @@ RSpec.describe NewPostManager do
category.custom_fields[Category::REQUIRE_TOPIC_APPROVAL] = true
category.save!
- manager = NewPostManager.new(
- user,
- raw: 'this is a new post',
- title: 'this is a new post',
- category: category.id,
- tags: [tag1.name, tag3.name]
- )
+ manager =
+ NewPostManager.new(
+ user,
+ raw: "this is a new post",
+ title: "this is a new post",
+ category: category.id,
+ tags: [tag1.name, tag3.name],
+ )
result = manager.perform
expect(result.success?).to eq(false)
expect(result.reviewable.persisted?).to eq(false)
@@ -77,17 +79,18 @@ RSpec.describe NewPostManager do
"tags.forbidden.category_does_not_allow_tags",
count: 1,
category: category.name,
- tags: tag3.name
- )
+ tags: tag3.name,
+ ),
)
- manager = NewPostManager.new(
- user,
- raw: 'this is a new post',
- title: 'this is a new post',
- category: category.id,
- tags: [tag2.name, tag3.name]
- )
+ manager =
+ NewPostManager.new(
+ user,
+ raw: "this is a new post",
+ title: "this is a new post",
+ category: category.id,
+ tags: [tag2.name, tag3.name],
+ )
result = manager.perform
expect(result.success?).to eq(false)
expect(result.reviewable.persisted?).to eq(false)
@@ -96,16 +99,16 @@ RSpec.describe NewPostManager do
"tags.forbidden.category_does_not_allow_tags",
count: 1,
category: category.name,
- tags: tag3.name
- )
+ tags: tag3.name,
+ ),
)
end
end
describe "default handler" do
- let(:manager) { NewPostManager.new(user, raw: 'this is new post content', topic_id: topic.id) }
+ let(:manager) { NewPostManager.new(user, raw: "this is new post content", topic_id: topic.id) }
- context 'with the settings zeroed out' do
+ context "with the settings zeroed out" do
before do
SiteSetting.approve_post_count = 0
SiteSetting.approve_unless_trust_level = 0
@@ -118,10 +121,8 @@ RSpec.describe NewPostManager do
end
end
- context 'with basic post/topic count restrictions' do
- before do
- SiteSetting.approve_post_count = 1
- end
+ context "with basic post/topic count restrictions" do
+ before { SiteSetting.approve_post_count = 1 }
it "works with a correct `user_stat.post_count`" do
result = NewPostManager.default_handler(manager)
@@ -144,7 +145,7 @@ RSpec.describe NewPostManager do
end
end
- context 'with a high approval post count and TL0' do
+ context "with a high approval post count and TL0" do
before do
SiteSetting.approve_post_count = 100
topic.user.trust_level = 0
@@ -157,7 +158,7 @@ RSpec.describe NewPostManager do
end
end
- context 'with a high approval post count and TL1' do
+ context "with a high approval post count and TL1" do
before do
SiteSetting.approve_post_count = 100
topic.user.trust_level = 1
@@ -170,7 +171,7 @@ RSpec.describe NewPostManager do
end
end
- context 'with a high approval post count, but TL2' do
+ context "with a high approval post count, but TL2" do
before do
SiteSetting.approve_post_count = 100
user.update!(trust_level: 2)
@@ -182,28 +183,27 @@ RSpec.describe NewPostManager do
end
end
- context 'with a high approval post count and secure category' do
- it 'does not create topic' do
+ context "with a high approval post count and secure category" do
+ it "does not create topic" do
SiteSetting.approve_post_count = 100
user = Fabricate(:user)
category_group = Fabricate(:category_group, permission_type: 2)
Fabricate(:group_user, group: category_group.group, user_id: user.id)
- manager = NewPostManager.new(
- user,
- raw: 'this is a new topic',
- title: "Let's start a new topic!",
- category: category_group.category_id
- )
+ manager =
+ NewPostManager.new(
+ user,
+ raw: "this is a new topic",
+ title: "Let's start a new topic!",
+ category: category_group.category_id,
+ )
expect(manager.perform.errors["base"][0]).to eq(I18n.t("js.errors.reasons.forbidden"))
end
end
- context 'with a high trust level setting' do
- before do
- SiteSetting.approve_unless_trust_level = 4
- end
+ context "with a high trust level setting" do
+ before { SiteSetting.approve_unless_trust_level = 4 }
it "will return an enqueue result" do
result = NewPostManager.default_handler(manager)
expect(NewPostManager.queue_enabled?).to eq(true)
@@ -219,12 +219,13 @@ RSpec.describe NewPostManager do
end
it "will return an enqueue result" do
- npm = NewPostManager.new(
- Fabricate(:user),
- title: 'this is a new topic title',
- raw: "this is the raw content",
- category: Fabricate(:category).id
- )
+ npm =
+ NewPostManager.new(
+ Fabricate(:user),
+ title: "this is a new topic title",
+ raw: "this is the raw content",
+ category: Fabricate(:category).id,
+ )
result = NewPostManager.default_handler(npm)
expect(NewPostManager.queue_enabled?).to eq(true)
@@ -233,7 +234,7 @@ RSpec.describe NewPostManager do
end
end
- context 'with staged moderation setting enabled' do
+ context "with staged moderation setting enabled" do
before do
SiteSetting.approve_unless_staged = true
user.update!(staged: true)
@@ -247,23 +248,19 @@ RSpec.describe NewPostManager do
end
end
- context 'with a high trust level setting for new topics but post responds to existing topic' do
- before do
- SiteSetting.approve_new_topics_unless_trust_level = 4
- end
+ context "with a high trust level setting for new topics but post responds to existing topic" do
+ before { SiteSetting.approve_new_topics_unless_trust_level = 4 }
it "doesn't return a result action" do
result = NewPostManager.default_handler(manager)
expect(result).to eq(nil)
end
end
- context 'with a fast typer' do
- before do
- user.update!(trust_level: 0)
- end
+ context "with a fast typer" do
+ before { user.update!(trust_level: 0) }
it "adds the silence reason in the system locale" do
- manager = build_manager_with('this is new post content')
+ manager = build_manager_with("this is new post content")
I18n.with_locale(:fr) do # Simulate french user
result = NewPostManager.default_handler(manager)
@@ -273,9 +270,9 @@ RSpec.describe NewPostManager do
expect(user.silence_reason).to eq(I18n.t("user.new_user_typed_too_fast", locale: :en))
end
- it 'runs the watched words check before checking if the user is a fast typer' do
+ it "runs the watched words check before checking if the user is a fast typer" do
Fabricate(:watched_word, word: "darn", action: WatchedWord.actions[:require_approval])
- manager = build_manager_with('this is darn new post content')
+ manager = build_manager_with("this is darn new post content")
result = NewPostManager.default_handler(manager)
@@ -288,23 +285,24 @@ RSpec.describe NewPostManager do
end
end
- context 'with media' do
+ context "with media" do
let(:manager_opts) do
{
- raw: 'this is new post content', topic_id: topic.id, first_post_checks: false,
+ raw: "this is new post content",
+ topic_id: topic.id,
+ first_post_checks: false,
image_sizes: {
"http://localhost:3000/uploads/default/original/1X/652fc9667040b1b89dc4d9b061a823ddb3c0cef0.jpeg" => {
- "width" => "500", "height" => "500"
- }
- }
+ "width" => "500",
+ "height" => "500",
+ },
+ },
}
end
- before do
- user.update!(trust_level: 0)
- end
+ before { user.update!(trust_level: 0) }
- it 'queues the post for review because if it contains embedded media.' do
+ it "queues the post for review because if it contains embedded media." do
SiteSetting.review_media_unless_trust_level = 1
manager = NewPostManager.new(user, manager_opts)
@@ -314,7 +312,7 @@ RSpec.describe NewPostManager do
expect(result.reason).to eq(:contains_media)
end
- it 'does not enqueue the post if the poster is a trusted user' do
+ it "does not enqueue the post if the poster is a trusted user" do
SiteSetting.review_media_unless_trust_level = 0
manager = NewPostManager.new(user, manager_opts)
@@ -326,11 +324,11 @@ RSpec.describe NewPostManager do
end
describe "new topic handler" do
- let(:manager) { NewPostManager.new(user, raw: 'this is new topic content', title: 'new topic title') }
- context 'with a high trust level setting for new topics' do
- before do
- SiteSetting.approve_new_topics_unless_trust_level = 4
- end
+ let(:manager) do
+ NewPostManager.new(user, raw: "this is new topic content", title: "new topic title")
+ end
+ context "with a high trust level setting for new topics" do
+ before { SiteSetting.approve_new_topics_unless_trust_level = 4 }
it "will return an enqueue result" do
result = NewPostManager.default_handler(manager)
expect(NewPostManager.queue_enabled?).to eq(true)
@@ -341,9 +339,7 @@ RSpec.describe NewPostManager do
end
describe "extensibility priority" do
- after do
- NewPostManager.clear_handlers!
- end
+ after { NewPostManager.clear_handlers! }
let(:default_handler) { NewPostManager.method(:default_handler) }
@@ -370,32 +366,33 @@ RSpec.describe NewPostManager do
before do
@counter = 0
- @counter_handler = lambda do |manager|
- result = nil
- if manager.args[:raw] == 'this post increases counter'
- @counter += 1
- result = NewPostResult.new(:counter, true)
+ @counter_handler =
+ lambda do |manager|
+ result = nil
+ if manager.args[:raw] == "this post increases counter"
+ @counter += 1
+ result = NewPostResult.new(:counter, true)
+ end
+
+ result
end
- result
- end
-
- @queue_handler = -> (manager) { manager.args[:raw] =~ /queue me/ ? manager.enqueue('default') : nil }
+ @queue_handler = ->(manager) {
+ manager.args[:raw] =~ /queue me/ ? manager.enqueue("default") : nil
+ }
NewPostManager.add_handler(&@counter_handler)
NewPostManager.add_handler(&@queue_handler)
end
- after do
- NewPostManager.clear_handlers!
- end
+ after { NewPostManager.clear_handlers! }
it "has a queue enabled" do
expect(NewPostManager.queue_enabled?).to eq(true)
end
it "calls custom handlers" do
- manager = NewPostManager.new(user, raw: 'this post increases counter', topic_id: topic.id)
+ manager = NewPostManager.new(user, raw: "this post increases counter", topic_id: topic.id)
result = manager.perform
@@ -411,25 +408,26 @@ RSpec.describe NewPostManager do
SiteSetting.min_trust_to_create_tag = 0
SiteSetting.min_trust_level_to_tag_topics = 0
- manager = NewPostManager.new(
- topic.user,
- raw: 'to the handler I say enqueue me!',
- title: 'this is the title of the queued post',
- tags: ['hello', 'world'],
- category: topic.category_id
- )
+ manager =
+ NewPostManager.new(
+ topic.user,
+ raw: "to the handler I say enqueue me!",
+ title: "this is the title of the queued post",
+ tags: %w[hello world],
+ category: topic.category_id,
+ )
result = manager.perform
reviewable = result.reviewable
expect(reviewable).to be_present
- expect(reviewable.payload['title']).to eq('this is the title of the queued post')
+ expect(reviewable.payload["title"]).to eq("this is the title of the queued post")
expect(reviewable.reviewable_scores).to be_present
expect(reviewable.force_review).to eq(true)
expect(reviewable.reviewable_by_moderator?).to eq(true)
expect(reviewable.category).to be_present
- expect(reviewable.payload['tags']).to eq(['hello', 'world'])
+ expect(reviewable.payload["tags"]).to eq(%w[hello world])
expect(result.action).to eq(:enqueued)
expect(result).to be_success
expect(result.pending_count).to eq(1)
@@ -439,11 +437,12 @@ RSpec.describe NewPostManager do
reviewable.perform(Discourse.system_user, :approve_post)
- manager = NewPostManager.new(
- topic.user,
- raw: 'another post by this user queue me',
- topic_id: topic.id
- )
+ manager =
+ NewPostManager.new(
+ topic.user,
+ raw: "another post by this user queue me",
+ topic_id: topic.id,
+ )
result = manager.perform
reviewable = result.reviewable
@@ -453,7 +452,7 @@ RSpec.describe NewPostManager do
end
it "if nothing returns a result it creates a post" do
- manager = NewPostManager.new(user, raw: 'this is a new post', topic_id: topic.id)
+ manager = NewPostManager.new(user, raw: "this is a new post", topic_id: topic.id)
result = manager.perform
@@ -491,41 +490,43 @@ RSpec.describe NewPostManager do
end
end
- context 'when posting in the category requires approval' do
+ context "when posting in the category requires approval" do
let!(:user) { Fabricate(:user) }
let!(:review_group) { Fabricate(:group) }
let!(:category) { Fabricate(:category, reviewable_by_group_id: review_group.id) }
- context 'when new topics require approval' do
+ context "when new topics require approval" do
before do
SiteSetting.tagging_enabled = true
category.custom_fields[Category::REQUIRE_TOPIC_APPROVAL] = true
category.save
end
- it 'enqueues new topics' do
- manager = NewPostManager.new(
- user,
- raw: 'this is a new topic',
- title: "Let's start a new topic!",
- category: category.id
- )
+ it "enqueues new topics" do
+ manager =
+ NewPostManager.new(
+ user,
+ raw: "this is a new topic",
+ title: "Let's start a new topic!",
+ category: category.id,
+ )
result = manager.perform
expect(result.action).to eq(:enqueued)
expect(result.reason).to eq(:category)
end
- it 'does not enqueue the topic when the poster is a category group moderator' do
+ it "does not enqueue the topic when the poster is a category group moderator" do
SiteSetting.enable_category_group_moderation = true
review_group.users << user
- manager = NewPostManager.new(
- user,
- raw: 'this is a new topic',
- title: "Let's start a new topic!",
- category: category.id
- )
+ manager =
+ NewPostManager.new(
+ user,
+ raw: "this is a new topic",
+ title: "Let's start a new topic!",
+ category: category.id,
+ )
result = manager.perform
expect(result.action).to eq(:create_post)
@@ -534,32 +535,34 @@ RSpec.describe NewPostManager do
context "when the category has tagging rules" do
context "when there is a minimum number of tags required for the category" do
- before do
- category.update(minimum_required_tags: 1)
- end
+ before { category.update(minimum_required_tags: 1) }
it "errors when there are no tags provided" do
- manager = NewPostManager.new(
- user,
- raw: 'this is a new topic',
- title: "Let's start a new topic!",
- category: category.id
- )
+ manager =
+ NewPostManager.new(
+ user,
+ raw: "this is a new topic",
+ title: "Let's start a new topic!",
+ category: category.id,
+ )
result = manager.perform
expect(result.action).to eq(:enqueued)
- expect(result.errors.full_messages).to include(I18n.t("tags.minimum_required_tags", count: category.minimum_required_tags))
+ expect(result.errors.full_messages).to include(
+ I18n.t("tags.minimum_required_tags", count: category.minimum_required_tags),
+ )
end
it "enqueues the topic if there are tags provided" do
tag = Fabricate(:tag)
- manager = NewPostManager.new(
- user,
- raw: 'this is a new topic',
- title: "Let's start a new topic!",
- category: category.id,
- tags: tag.name
- )
+ manager =
+ NewPostManager.new(
+ user,
+ raw: "this is a new topic",
+ title: "Let's start a new topic!",
+ category: category.id,
+ tags: tag.name,
+ )
result = manager.perform
expect(result.action).to eq(:enqueued)
@@ -572,16 +575,21 @@ RSpec.describe NewPostManager do
let(:tag) { Fabricate(:tag) }
before do
TagGroupMembership.create(tag: tag, tag_group: tag_group)
- category.update(category_required_tag_groups: [CategoryRequiredTagGroup.new(tag_group: tag_group, min_count: 1)])
+ category.update(
+ category_required_tag_groups: [
+ CategoryRequiredTagGroup.new(tag_group: tag_group, min_count: 1),
+ ],
+ )
end
it "errors when there are no tags from the group provided" do
- manager = NewPostManager.new(
- user,
- raw: 'this is a new topic',
- title: "Let's start a new topic!",
- category: category.id
- )
+ manager =
+ NewPostManager.new(
+ user,
+ raw: "this is a new topic",
+ title: "Let's start a new topic!",
+ category: category.id,
+ )
result = manager.perform
expect(result.action).to eq(:enqueued)
@@ -590,19 +598,20 @@ RSpec.describe NewPostManager do
"tags.required_tags_from_group",
count: category.category_required_tag_groups.first.min_count,
tag_group_name: category.category_required_tag_groups.first.tag_group.name,
- tags: tag.name
- )
+ tags: tag.name,
+ ),
)
end
it "enqueues the topic if there are tags provided" do
- manager = NewPostManager.new(
- user,
- raw: 'this is a new topic',
- title: "Let's start a new topic!",
- category: category.id,
- tags: [tag.name]
- )
+ manager =
+ NewPostManager.new(
+ user,
+ raw: "this is a new topic",
+ title: "Let's start a new topic!",
+ category: category.id,
+ tags: [tag.name],
+ )
result = manager.perform
expect(result.action).to eq(:enqueued)
@@ -612,7 +621,7 @@ RSpec.describe NewPostManager do
end
end
- context 'when new posts require approval' do
+ context "when new posts require approval" do
let!(:topic) { Fabricate(:topic, category: category) }
before do
@@ -620,8 +629,8 @@ RSpec.describe NewPostManager do
category.save
end
- it 'enqueues new posts' do
- manager = NewPostManager.new(user, raw: 'this is a new post', topic_id: topic.id)
+ it "enqueues new posts" do
+ manager = NewPostManager.new(user, raw: "this is a new post", topic_id: topic.id)
result = manager.perform
expect(result.action).to eq(:enqueued)
@@ -630,24 +639,16 @@ RSpec.describe NewPostManager do
it "doesn't blow up with invalid topic_id" do
expect do
- manager = NewPostManager.new(
- user,
- raw: 'this is a new topic',
- topic_id: 97546
- )
+ manager = NewPostManager.new(user, raw: "this is a new topic", topic_id: 97_546)
expect(manager.perform.action).to eq(:create_post)
end.not_to raise_error
end
- it 'does not enqueue the post when the poster is a category group moderator' do
+ it "does not enqueue the post when the poster is a category group moderator" do
SiteSetting.enable_category_group_moderation = true
review_group.users << user
- manager = NewPostManager.new(
- user,
- raw: 'this is a new post',
- topic_id: topic.id
- )
+ manager = NewPostManager.new(user, raw: "this is a new post", topic_id: topic.id)
result = manager.perform
expect(result.action).to eq(:create_post)
@@ -660,24 +661,24 @@ RSpec.describe NewPostManager do
let(:manager) do
NewPostManager.new(
topic.user,
- raw: 'this is emailed content',
+ raw: "this is emailed content",
topic_id: topic.id,
via_email: true,
- raw_email: 'raw email contents'
+ raw_email: "raw email contents",
)
end
- before do
- SiteSetting.approve_post_count = 100
- topic.user.trust_level = 0
- end
+ before do
+ SiteSetting.approve_post_count = 100
+ topic.user.trust_level = 0
+ end
it "will store via_email and raw_email in the enqueued post" do
result = manager.perform
expect(result.action).to eq(:enqueued)
expect(result.reviewable).to be_present
- expect(result.reviewable.payload['via_email']).to eq(true)
- expect(result.reviewable.payload['raw_email']).to eq('raw email contents')
+ expect(result.reviewable.payload["via_email"]).to eq(true)
+ expect(result.reviewable.payload["raw_email"]).to eq("raw email contents")
post = result.reviewable.perform(Discourse.system_user, :approve_post).created_post
expect(post.via_email).to eq(true)
@@ -690,14 +691,15 @@ RSpec.describe NewPostManager do
let(:admin) { Fabricate(:admin) }
it "silences users if its their first post" do
- manager = NewPostManager.new(
- user,
- raw: 'this is emailed content',
- via_email: true,
- raw_email: 'raw email contents',
- email_spam: true,
- first_post_checks: true
- )
+ manager =
+ NewPostManager.new(
+ user,
+ raw: "this is emailed content",
+ via_email: true,
+ raw_email: "raw email contents",
+ email_spam: true,
+ first_post_checks: true,
+ )
result = manager.perform
expect(result.action).to eq(:enqueued)
@@ -705,14 +707,15 @@ RSpec.describe NewPostManager do
end
it "doesn't silence or enqueue exempt users" do
- manager = NewPostManager.new(
- admin,
- raw: 'this is emailed content',
- via_email: true,
- raw_email: 'raw email contents',
- email_spam: true,
- first_post_checks: true
- )
+ manager =
+ NewPostManager.new(
+ admin,
+ raw: "this is emailed content",
+ via_email: true,
+ raw_email: "raw email contents",
+ email_spam: true,
+ first_post_checks: true,
+ )
result = manager.perform
expect(result.action).to eq(:create_post)
@@ -725,14 +728,15 @@ RSpec.describe NewPostManager do
let(:admin) { Fabricate(:admin) }
it "doesn't silence users" do
- manager = NewPostManager.new(
- user,
- raw: 'this is emailed content',
- via_email: true,
- raw_email: 'raw email contents',
- email_auth_res_action: :enqueue,
- first_post_checks: true
- )
+ manager =
+ NewPostManager.new(
+ user,
+ raw: "this is emailed content",
+ via_email: true,
+ raw_email: "raw email contents",
+ email_auth_res_action: :enqueue,
+ first_post_checks: true,
+ )
result = manager.perform
expect(result.action).to eq(:enqueued)
@@ -740,13 +744,14 @@ RSpec.describe NewPostManager do
end
it "still enqueues exempt users" do
- manager = NewPostManager.new(
- admin,
- raw: 'this is emailed content',
- via_email: true,
- raw_email: 'raw email contents',
- email_auth_res_action: :enqueue
- )
+ manager =
+ NewPostManager.new(
+ admin,
+ raw: "this is emailed content",
+ via_email: true,
+ raw_email: "raw email contents",
+ email_auth_res_action: :enqueue,
+ )
result = manager.perform
expect(result.action).to eq(:enqueued)
@@ -756,28 +761,30 @@ RSpec.describe NewPostManager do
describe "private message via email" do
it "doesn't enqueue authentication results failure" do
- manager = NewPostManager.new(
- topic.user,
- raw: 'this is emailed content',
- archetype: Archetype.private_message,
- via_email: true,
- raw_email: 'raw email contents',
- email_auth_res_action: :enqueue
- )
+ manager =
+ NewPostManager.new(
+ topic.user,
+ raw: "this is emailed content",
+ archetype: Archetype.private_message,
+ via_email: true,
+ raw_email: "raw email contents",
+ email_auth_res_action: :enqueue,
+ )
result = manager.perform
expect(result.action).to eq(:create_post)
end
it "doesn't enqueue spam failure" do
- manager = NewPostManager.new(
- topic.user,
- raw: 'this is emailed content',
- archetype: Archetype.private_message,
- via_email: true,
- raw_email: 'raw email contents',
- email_spam: true
- )
+ manager =
+ NewPostManager.new(
+ topic.user,
+ raw: "this is emailed content",
+ archetype: Archetype.private_message,
+ via_email: true,
+ raw_email: "raw email contents",
+ email_spam: true,
+ )
result = manager.perform
expect(result.action).to eq(:create_post)
diff --git a/spec/lib/new_post_result_spec.rb b/spec/lib/new_post_result_spec.rb
index 9e8b2335b5f..360300d10fd 100644
--- a/spec/lib/new_post_result_spec.rb
+++ b/spec/lib/new_post_result_spec.rb
@@ -1,13 +1,11 @@
# frozen_string_literal: true
-require 'new_post_result'
+require "new_post_result"
RSpec.describe NewPostResult do
-
it "fails by default" do
result = NewPostResult.new(:eviltrout)
expect(result.failed?).to eq(true)
expect(result.success?).to eq(false)
end
-
end
diff --git a/spec/lib/onebox/domain_checker_spec.rb b/spec/lib/onebox/domain_checker_spec.rb
index de3d71050a4..0b375363ce8 100644
--- a/spec/lib/onebox/domain_checker_spec.rb
+++ b/spec/lib/onebox/domain_checker_spec.rb
@@ -1,10 +1,8 @@
# frozen_string_literal: true
RSpec.describe Onebox::DomainChecker do
- describe '.is_blocked?' do
- before do
- SiteSetting.blocked_onebox_domains = "api.cat.org|kitten.cloud"
- end
+ describe ".is_blocked?" do
+ before { SiteSetting.blocked_onebox_domains = "api.cat.org|kitten.cloud" }
describe "returns true when entirely matched" do
it { expect(described_class.is_blocked?("api.cat.org")).to be(true) }
diff --git a/spec/lib/onebox/engine/allowlisted_generic_onebox_spec.rb b/spec/lib/onebox/engine/allowlisted_generic_onebox_spec.rb
index 4064fde840a..e7ff04589a8 100644
--- a/spec/lib/onebox/engine/allowlisted_generic_onebox_spec.rb
+++ b/spec/lib/onebox/engine/allowlisted_generic_onebox_spec.rb
@@ -3,23 +3,19 @@
RSpec.describe Onebox::Engine::AllowlistedGenericOnebox do
describe ".===" do
it "matches any domain" do
- expect(described_class === URI('http://foo.bar/resource')).to be(true)
+ expect(described_class === URI("http://foo.bar/resource")).to be(true)
end
it "doesn't match an IP address" do
- expect(described_class === URI('http://1.2.3.4/resource')).to be(false)
- expect(described_class === URI('http://1.2.3.4:1234/resource')).to be(false)
+ expect(described_class === URI("http://1.2.3.4/resource")).to be(false)
+ expect(described_class === URI("http://1.2.3.4:1234/resource")).to be(false)
end
end
- describe 'html_providers' do
+ describe "html_providers" do
class HTMLOnebox < Onebox::Engine::AllowlistedGenericOnebox
def data
- {
- html: 'cool html',
- height: 123,
- provider_name: 'CoolSite',
- }
+ { html: "cool html", height: 123, provider_name: "CoolSite" }
end
end
@@ -29,12 +25,12 @@ RSpec.describe Onebox::Engine::AllowlistedGenericOnebox do
end
it "returns the HMTL when in the `html_providers`" do
- Onebox::Engine::AllowlistedGenericOnebox.html_providers = ['CoolSite']
+ Onebox::Engine::AllowlistedGenericOnebox.html_providers = ["CoolSite"]
expect(HTMLOnebox.new("http://coolsite.com").to_html).to eq "cool html"
end
end
- describe 'rewrites' do
+ describe "rewrites" do
class DummyOnebox < Onebox::Engine::AllowlistedGenericOnebox
def generic_html
"VIDEO "
@@ -43,24 +39,31 @@ RSpec.describe Onebox::Engine::AllowlistedGenericOnebox do
it "doesn't rewrite URLs that arent in the list" do
Onebox::Engine::AllowlistedGenericOnebox.rewrites = []
- expect(DummyOnebox.new("http://youtube.com").to_html).to eq "VIDEO "
+ expect(
+ DummyOnebox.new("http://youtube.com").to_html,
+ ).to eq "VIDEO "
end
it "rewrites URLs when allowlisted" do
- Onebox::Engine::AllowlistedGenericOnebox.rewrites = %w(youtube.com)
- expect(DummyOnebox.new("http://youtube.com").to_html).to eq "VIDEO "
+ Onebox::Engine::AllowlistedGenericOnebox.rewrites = %w[youtube.com]
+ expect(
+ DummyOnebox.new("http://youtube.com").to_html,
+ ).to eq "VIDEO "
end
end
- describe 'oembed_providers' do
+ describe "oembed_providers" do
let(:url) { "http://www.meetup.com/Toronto-Ember-JS-Meetup/events/219939537" }
before do
- stub_request(:get, url).to_return(status: 200, body: onebox_response('meetup'))
- stub_request(:get, "http://api.meetup.com/oembed?url=#{url}").to_return(status: 200, body: onebox_response('meetup_oembed'))
+ stub_request(:get, url).to_return(status: 200, body: onebox_response("meetup"))
+ stub_request(:get, "http://api.meetup.com/oembed?url=#{url}").to_return(
+ status: 200,
+ body: onebox_response("meetup_oembed"),
+ )
end
- it 'uses the endpoint for the url' do
+ it "uses the endpoint for the url" do
onebox = described_class.new("http://www.meetup.com/Toronto-Ember-JS-Meetup/events/219939537")
expect(onebox.raw).not_to be_nil
expect(onebox.raw[:title]).to eq "February EmberTO Meet-up"
@@ -68,12 +71,15 @@ RSpec.describe Onebox::Engine::AllowlistedGenericOnebox do
end
describe "cookie support" do
- let(:url) { "http://www.dailymail.co.uk/news/article-479146/Brutality-justice-The-truth-tarred-feathered-drug-dealer.html" }
+ let(:url) do
+ "http://www.dailymail.co.uk/news/article-479146/Brutality-justice-The-truth-tarred-feathered-drug-dealer.html"
+ end
it "sends the cookie with the request" do
- stub_request(:get, url)
- .with(headers: { cookie: 'evil=trout' })
- .to_return(status: 200, body: onebox_response('dailymail'))
+ stub_request(:get, url).with(headers: { cookie: "evil=trout" }).to_return(
+ status: 200,
+ body: onebox_response("dailymail"),
+ )
onebox = described_class.new(url)
onebox.options = { cookie: "evil=trout" }
@@ -82,65 +88,86 @@ RSpec.describe Onebox::Engine::AllowlistedGenericOnebox do
end
it "fetches site_name and article_published_time tags" do
- stub_request(:get, url).to_return(status: 200, body: onebox_response('dailymail'))
+ stub_request(:get, url).to_return(status: 200, body: onebox_response("dailymail"))
onebox = described_class.new(url)
expect(onebox.to_html).to include("Mail Online – 8 Aug 14")
end
end
- describe 'canonical link' do
- context 'when using canonical link if available' do
- let(:mobile_url) { "https://m.etsy.com/in-en/listing/87673424/personalized-word-pillow-case-letter" }
- let(:canonical_url) { "https://www.etsy.com/in-en/listing/87673424/personalized-word-pillow-case-letter" }
+ describe "canonical link" do
+ context "when using canonical link if available" do
+ let(:mobile_url) do
+ "https://m.etsy.com/in-en/listing/87673424/personalized-word-pillow-case-letter"
+ end
+ let(:canonical_url) do
+ "https://www.etsy.com/in-en/listing/87673424/personalized-word-pillow-case-letter"
+ end
before do
- stub_request(:get, mobile_url).to_return(status: 200, body: onebox_response('etsy_mobile'))
- stub_request(:get, canonical_url).to_return(status: 200, body: onebox_response('etsy'))
+ stub_request(:get, mobile_url).to_return(status: 200, body: onebox_response("etsy_mobile"))
+ stub_request(:get, canonical_url).to_return(status: 200, body: onebox_response("etsy"))
stub_request(:head, canonical_url).to_return(status: 200, body: "")
end
- it 'fetches opengraph data and price from canonical link' do
+ it "fetches opengraph data and price from canonical link" do
onebox = described_class.new(mobile_url)
expect(onebox.to_html).not_to be_nil
expect(onebox.to_html).to include("images/favicon.ico")
expect(onebox.to_html).to include("Etsy")
expect(onebox.to_html).to include("Personalized Word Pillow Case")
- expect(onebox.to_html).to include("Allow your personality to shine through your decor; this contemporary and modern accent will help you do just that.")
- expect(onebox.to_html).to include("https://i.etsystatic.com/6088772/r/il/719b4b/1631899982/il_570xN.1631899982_2iay.jpg")
+ expect(onebox.to_html).to include(
+ "Allow your personality to shine through your decor; this contemporary and modern accent will help you do just that.",
+ )
+ expect(onebox.to_html).to include(
+ "https://i.etsystatic.com/6088772/r/il/719b4b/1631899982/il_570xN.1631899982_2iay.jpg",
+ )
expect(onebox.to_html).to include("CAD 52.00")
end
end
- context 'when not using canonical link for Discourse topics' do
- let(:discourse_topic_url) { "https://meta.discourse.org/t/congratulations-most-stars-in-2013-github-octoverse/12483" }
- let(:discourse_topic_reply_url) { "https://meta.discourse.org/t/congratulations-most-stars-in-2013-github-octoverse/12483/2" }
+ context "when not using canonical link for Discourse topics" do
+ let(:discourse_topic_url) do
+ "https://meta.discourse.org/t/congratulations-most-stars-in-2013-github-octoverse/12483"
+ end
+ let(:discourse_topic_reply_url) do
+ "https://meta.discourse.org/t/congratulations-most-stars-in-2013-github-octoverse/12483/2"
+ end
before do
- stub_request(:get, discourse_topic_url).to_return(status: 200, body: onebox_response('discourse_topic'))
- stub_request(:get, discourse_topic_reply_url).to_return(status: 200, body: onebox_response('discourse_topic_reply'))
+ stub_request(:get, discourse_topic_url).to_return(
+ status: 200,
+ body: onebox_response("discourse_topic"),
+ )
+ stub_request(:get, discourse_topic_reply_url).to_return(
+ status: 200,
+ body: onebox_response("discourse_topic_reply"),
+ )
end
- it 'fetches opengraph data from original link' do
+ it "fetches opengraph data from original link" do
onebox = described_class.new(discourse_topic_reply_url)
expect(onebox.to_html).not_to be_nil
expect(onebox.to_html).to include("Congratulations, most stars in 2013 GitHub Octoverse!")
- expect(onebox.to_html).to include("Thanks for that link and thank you – and everyone else who is contributing to the project!")
- expect(onebox.to_html).to include("https://d11a6trkgmumsb.cloudfront.net/optimized/2X/d/d063b3b0807377d98695ee08042a9ba0a8c593bd_2_690x362.png")
+ expect(onebox.to_html).to include(
+ "Thanks for that link and thank you – and everyone else who is contributing to the project!",
+ )
+ expect(onebox.to_html).to include(
+ "https://d11a6trkgmumsb.cloudfront.net/optimized/2X/d/d063b3b0807377d98695ee08042a9ba0a8c593bd_2_690x362.png",
+ )
end
end
end
- describe 'to_html' do
- let(:original_link) { "http://www.dailymail.co.uk/pages/live/articles/news/news.html?in_article_id=479146&in_page_id=1770" }
- let(:redirect_link) { 'http://www.dailymail.co.uk/news/article-479146/Brutality-justice-The-truth-tarred-feathered-drug-dealer.html' }
+ describe "to_html" do
+ let(:original_link) do
+ "http://www.dailymail.co.uk/pages/live/articles/news/news.html?in_article_id=479146&in_page_id=1770"
+ end
+ let(:redirect_link) do
+ "http://www.dailymail.co.uk/news/article-479146/Brutality-justice-The-truth-tarred-feathered-drug-dealer.html"
+ end
before do
- stub_request(:get, original_link).to_return(
- status: 301,
- headers: {
- location: redirect_link,
- }
- )
- stub_request(:get, redirect_link).to_return(status: 200, body: onebox_response('dailymail'))
+ stub_request(:get, original_link).to_return(status: 301, headers: { location: redirect_link })
+ stub_request(:get, redirect_link).to_return(status: 200, body: onebox_response("dailymail"))
stub_request(:head, redirect_link).to_return(status: 200, body: "")
end
@@ -163,67 +190,95 @@ RSpec.describe Onebox::Engine::AllowlistedGenericOnebox do
end
end
- describe 'missing description' do
- context 'when working without description if image is present' do
+ describe "missing description" do
+ context "when working without description if image is present" do
before do
- stub_request(:get, "https://edition.cnn.com/2020/05/15/health/gallery/coronavirus-people-adopting-pets-photos/index.html")
- .to_return(status: 200, body: onebox_response('cnn'))
- stub_request(:get, "https://www.cnn.com/2020/05/15/health/gallery/coronavirus-people-adopting-pets-photos/index.html")
- .to_return(status: 200, body: onebox_response('cnn'))
- stub_request(:head, "https://www.cnn.com/2020/05/15/health/gallery/coronavirus-people-adopting-pets-photos/index.html")
- .to_return(status: 200, body: "")
+ stub_request(
+ :get,
+ "https://edition.cnn.com/2020/05/15/health/gallery/coronavirus-people-adopting-pets-photos/index.html",
+ ).to_return(status: 200, body: onebox_response("cnn"))
+ stub_request(
+ :get,
+ "https://www.cnn.com/2020/05/15/health/gallery/coronavirus-people-adopting-pets-photos/index.html",
+ ).to_return(status: 200, body: onebox_response("cnn"))
+ stub_request(
+ :head,
+ "https://www.cnn.com/2020/05/15/health/gallery/coronavirus-people-adopting-pets-photos/index.html",
+ ).to_return(status: 200, body: "")
end
- it 'shows basic onebox' do
- onebox = described_class.new("https://edition.cnn.com/2020/05/15/health/gallery/coronavirus-people-adopting-pets-photos/index.html")
+ it "shows basic onebox" do
+ onebox =
+ described_class.new(
+ "https://edition.cnn.com/2020/05/15/health/gallery/coronavirus-people-adopting-pets-photos/index.html",
+ )
expect(onebox.to_html).not_to be_nil
- expect(onebox.to_html).to include("https://edition.cnn.com/2020/05/15/health/gallery/coronavirus-people-adopting-pets-photos/index.html")
- expect(onebox.to_html).to include("https://cdn.cnn.com/cnnnext/dam/assets/200427093451-10-coronavirus-people-adopting-pets-super-tease.jpg")
- expect(onebox.to_html).to include("People are fostering and adopting pets during the pandemic")
+ expect(onebox.to_html).to include(
+ "https://edition.cnn.com/2020/05/15/health/gallery/coronavirus-people-adopting-pets-photos/index.html",
+ )
+ expect(onebox.to_html).to include(
+ "https://cdn.cnn.com/cnnnext/dam/assets/200427093451-10-coronavirus-people-adopting-pets-super-tease.jpg",
+ )
+ expect(onebox.to_html).to include(
+ "People are fostering and adopting pets during the pandemic",
+ )
end
end
- context 'when using basic meta description when necessary' do
+ context "when using basic meta description when necessary" do
before do
- stub_request(:get, "https://www.reddit.com/r/colors/comments/b4d5xm/literally_nothing_black_edition/")
- .to_return(status: 200, body: onebox_response('reddit_image'))
- stub_request(:get, "https://www.example.com/content")
- .to_return(status: 200, body: onebox_response('basic_description'))
+ stub_request(
+ :get,
+ "https://www.reddit.com/r/colors/comments/b4d5xm/literally_nothing_black_edition/",
+ ).to_return(status: 200, body: onebox_response("reddit_image"))
+ stub_request(:get, "https://www.example.com/content").to_return(
+ status: 200,
+ body: onebox_response("basic_description"),
+ )
end
- it 'uses opengraph tags when present' do
- onebox = described_class.new("https://www.reddit.com/r/colors/comments/b4d5xm/literally_nothing_black_edition/")
+ it "uses opengraph tags when present" do
+ onebox =
+ described_class.new(
+ "https://www.reddit.com/r/colors/comments/b4d5xm/literally_nothing_black_edition/",
+ )
expect(onebox.to_html).to include("4 votes and 1 comment so far on Reddit")
end
- it 'fallback to basic meta description if other description tags are missing' do
+ it "fallback to basic meta description if other description tags are missing" do
onebox = described_class.new("https://www.example.com/content")
expect(onebox.to_html).to include("basic meta description")
end
end
end
- describe 'article html hosts' do
- context 'when returning article_html for hosts in article_html_hosts' do
+ describe "article html hosts" do
+ context "when returning article_html for hosts in article_html_hosts" do
before do
- stub_request(:get, "https://www.imdb.com/title/tt0108002/")
- .to_return(status: 200, body: onebox_response('imdb'))
+ stub_request(:get, "https://www.imdb.com/title/tt0108002/").to_return(
+ status: 200,
+ body: onebox_response("imdb"),
+ )
end
- it 'shows article onebox' do
+ it "shows article onebox" do
onebox = described_class.new("https://www.imdb.com/title/tt0108002/")
expect(onebox.to_html).to include("https://www.imdb.com/title/tt0108002")
- expect(onebox.to_html).to include("https://m.media-amazon.com/images/M/MV5BZGUzMDU1YmQtMzBkOS00MTNmLTg5ZDQtZjY5Njk4Njk2MmRlXkEyXkFqcGdeQXVyNjc1NTYyMjg@._V1_FMjpg_UX1000_.jpg")
+ expect(onebox.to_html).to include(
+ "https://m.media-amazon.com/images/M/MV5BZGUzMDU1YmQtMzBkOS00MTNmLTg5ZDQtZjY5Njk4Njk2MmRlXkEyXkFqcGdeQXVyNjc1NTYyMjg@._V1_FMjpg_UX1000_.jpg",
+ )
expect(onebox.to_html).to include("Rudy (1993) - IMDb")
- expect(onebox.to_html).to include("Rudy: Directed by David Anspaugh. With Sean Astin, Jon Favreau, Ned Beatty, Greta Lind. Rudy has always been told that he was too small to play college football.")
+ expect(onebox.to_html).to include(
+ "Rudy: Directed by David Anspaugh. With Sean Astin, Jon Favreau, Ned Beatty, Greta Lind. Rudy has always been told that he was too small to play college football.",
+ )
end
- it 'shows rating' do
+ it "shows rating" do
onebox = described_class.new("https://www.imdb.com/title/tt0108002/")
expect(onebox.to_html).to include("7.5")
end
- it 'shows duration' do
+ it "shows duration" do
onebox = described_class.new("https://www.imdb.com/title/tt0108002/")
expect(onebox.to_html).to include("01:54")
end
diff --git a/spec/lib/onebox/engine/amazon_onebox_spec.rb b/spec/lib/onebox/engine/amazon_onebox_spec.rb
index ad624b6c9cd..b0deee8736d 100644
--- a/spec/lib/onebox/engine/amazon_onebox_spec.rb
+++ b/spec/lib/onebox/engine/amazon_onebox_spec.rb
@@ -6,8 +6,10 @@ RSpec.describe Onebox::Engine::AmazonOnebox do
@link = "https://www.amazon.com/Knit-Noro-Accessories-Colorful-Little/dp/193609620X"
@uri = "https://www.amazon.com/dp/193609620X"
- stub_request(:get, "https://www.amazon.com/Seven-Languages-Weeks-Programming-Programmers/dp/193435659X")
- .to_return(status: 200, body: onebox_response("amazon"))
+ stub_request(
+ :get,
+ "https://www.amazon.com/Seven-Languages-Weeks-Programming-Programmers/dp/193435659X",
+ ).to_return(status: 200, body: onebox_response("amazon"))
end
include_context "with engines"
@@ -21,11 +23,17 @@ RSpec.describe Onebox::Engine::AmazonOnebox do
end
it "matches canadian domains" do
- check_link("ca", "https://www.amazon.ca/Too-Much-Happiness-Alice-Munro-ebook/dp/B0031TZ98K/")
+ check_link(
+ "ca",
+ "https://www.amazon.ca/Too-Much-Happiness-Alice-Munro-ebook/dp/B0031TZ98K/",
+ )
end
it "matches german domains" do
- check_link("de", "https://www.amazon.de/Buddenbrooks-Verfall-einer-Familie-Roman/dp/3596294312/")
+ check_link(
+ "de",
+ "https://www.amazon.de/Buddenbrooks-Verfall-einer-Familie-Roman/dp/3596294312/",
+ )
end
it "matches uk domains" do
@@ -33,15 +41,24 @@ RSpec.describe Onebox::Engine::AmazonOnebox do
end
it "matches japanese domains" do
- check_link("co.jp", "https://www.amazon.co.jp/%E9%9B%AA%E5%9B%BD-%E6%96%B0%E6%BD%AE%E6%96%87%E5%BA%AB-%E3%81%8B-1-1-%E5%B7%9D%E7%AB%AF-%E5%BA%B7%E6%88%90/dp/4101001014/")
+ check_link(
+ "co.jp",
+ "https://www.amazon.co.jp/%E9%9B%AA%E5%9B%BD-%E6%96%B0%E6%BD%AE%E6%96%87%E5%BA%AB-%E3%81%8B-1-1-%E5%B7%9D%E7%AB%AF-%E5%BA%B7%E6%88%90/dp/4101001014/",
+ )
end
it "matches chinese domains" do
- check_link("cn", "https://www.amazon.cn/%E5%AD%99%E5%AD%90%E5%85%B5%E6%B3%95-%E5%AD%99%E8%86%91%E5%85%B5%E6%B3%95-%E5%AD%99%E6%AD%A6/dp/B0011C40FC/")
+ check_link(
+ "cn",
+ "https://www.amazon.cn/%E5%AD%99%E5%AD%90%E5%85%B5%E6%B3%95-%E5%AD%99%E8%86%91%E5%85%B5%E6%B3%95-%E5%AD%99%E6%AD%A6/dp/B0011C40FC/",
+ )
end
it "matches french domains" do
- check_link("fr", "https://www.amazon.fr/Les-Mots-autres-%C3%A9crits-autobiographiques/dp/2070114147/")
+ check_link(
+ "fr",
+ "https://www.amazon.fr/Les-Mots-autres-%C3%A9crits-autobiographiques/dp/2070114147/",
+ )
end
it "matches italian domains" do
@@ -49,11 +66,17 @@ RSpec.describe Onebox::Engine::AmazonOnebox do
end
it "matches spanish domains" do
- check_link("es", "https://www.amazon.es/familia-Pascual-Duarte-Camilo-Jos%C3%A9-ebook/dp/B00EJRTKTW/")
+ check_link(
+ "es",
+ "https://www.amazon.es/familia-Pascual-Duarte-Camilo-Jos%C3%A9-ebook/dp/B00EJRTKTW/",
+ )
end
it "matches brazilian domains" do
- check_link("com.br", "https://www.amazon.com.br/A-p%C3%A1tria-chuteiras-Nelson-Rodrigues-ebook/dp/B00J2B414Y/")
+ check_link(
+ "com.br",
+ "https://www.amazon.com.br/A-p%C3%A1tria-chuteiras-Nelson-Rodrigues-ebook/dp/B00J2B414Y/",
+ )
end
it "matches indian domains" do
@@ -61,34 +84,44 @@ RSpec.describe Onebox::Engine::AmazonOnebox do
end
it "matches mexican domains" do
- check_link("com.mx", "https://www.amazon.com.mx/Legend-Zelda-Links-Awakening-Nintendo/dp/B07SG15148/")
+ check_link(
+ "com.mx",
+ "https://www.amazon.com.mx/Legend-Zelda-Links-Awakening-Nintendo/dp/B07SG15148/",
+ )
end
end
describe "#url" do
- let(:long_url) { "https://www.amazon.ca/gp/product/B087Z3N428?pf_rd_r=SXABADD0ZZ3NF9Q5F8TW&pf_rd_p=05378fd5-c43e-4948-99b1-a65b129fdd73&pd_rd_r=0237fb28-7f47-49f4-986a-be0c78e52863&pd_rd_w=FfIoI&pd_rd_wg=Hw4qq&ref_=pd_gw_unk" }
+ let(:long_url) do
+ "https://www.amazon.ca/gp/product/B087Z3N428?pf_rd_r=SXABADD0ZZ3NF9Q5F8TW&pf_rd_p=05378fd5-c43e-4948-99b1-a65b129fdd73&pd_rd_r=0237fb28-7f47-49f4-986a-be0c78e52863&pd_rd_w=FfIoI&pd_rd_wg=Hw4qq&ref_=pd_gw_unk"
+ end
it "maintains the same http/https scheme as the requested URL" do
- expect(described_class.new("https://www.amazon.fr/gp/product/B01BYD0TZM").url)
- .to eq("https://www.amazon.fr/dp/B01BYD0TZM")
+ expect(described_class.new("https://www.amazon.fr/gp/product/B01BYD0TZM").url).to eq(
+ "https://www.amazon.fr/dp/B01BYD0TZM",
+ )
- expect(described_class.new("http://www.amazon.fr/gp/product/B01BYD0TZM").url)
- .to eq("https://www.amazon.fr/dp/B01BYD0TZM")
+ expect(described_class.new("http://www.amazon.fr/gp/product/B01BYD0TZM").url).to eq(
+ "https://www.amazon.fr/dp/B01BYD0TZM",
+ )
end
it "removes parameters from the URL" do
- expect(described_class.new(long_url).url)
- .not_to include("?pf_rd_r")
+ expect(described_class.new(long_url).url).not_to include("?pf_rd_r")
end
end
describe "#to_html" do
it "includes image" do
- expect(html).to include("https://images-na.ssl-images-amazon.com/images/I/51opYcR6kVL._SY400_.jpg")
+ expect(html).to include(
+ "https://images-na.ssl-images-amazon.com/images/I/51opYcR6kVL._SY400_.jpg",
+ )
end
it "includes description" do
- expect(html).to include("You should learn a programming language every year, as recommended by The Pragmatic Programmer.")
+ expect(html).to include(
+ "You should learn a programming language every year, as recommended by The Pragmatic Programmer.",
+ )
end
it "includes price" do
@@ -96,7 +129,9 @@ RSpec.describe Onebox::Engine::AmazonOnebox do
end
it "includes title" do
- expect(html).to include("Seven Languages in Seven Weeks: A Pragmatic Guide to Learning Programming Languages (Pragmatic Programmers)")
+ expect(html).to include(
+ "Seven Languages in Seven Weeks: A Pragmatic Guide to Learning Programming Languages (Pragmatic Programmers)",
+ )
end
end
end
@@ -106,20 +141,28 @@ RSpec.describe Onebox::Engine::AmazonOnebox do
let(:html) { described_class.new(link).to_html }
before do
- stub_request(:get, "https://www.amazon.com/dp/B01MFXN4Y2")
- .to_return(status: 200, body: onebox_response("amazon-og"))
+ stub_request(:get, "https://www.amazon.com/dp/B01MFXN4Y2").to_return(
+ status: 200,
+ body: onebox_response("amazon-og"),
+ )
- stub_request(:get, "https://www.amazon.com/Christine-Rebecca-Hall/dp/B01MFXN4Y2")
- .to_return(status: 200, body: onebox_response("amazon-og"))
+ stub_request(:get, "https://www.amazon.com/Christine-Rebecca-Hall/dp/B01MFXN4Y2").to_return(
+ status: 200,
+ body: onebox_response("amazon-og"),
+ )
end
describe "#to_html" do
it "includes image" do
- expect(html).to include("https://images-na.ssl-images-amazon.com/images/I/51nOF2iBa6L._SX940_.jpg")
+ expect(html).to include(
+ "https://images-na.ssl-images-amazon.com/images/I/51nOF2iBa6L._SX940_.jpg",
+ )
end
it "includes description" do
- expect(html).to include("CHRISTINE is the story of an aspiring newswoman caught in the midst of a personal and professional life crisis. Between unrequited love, frustration at work, a tumultuous home, and self-doubt; she begins to spiral down a dark path.")
+ expect(html).to include(
+ "CHRISTINE is the story of an aspiring newswoman caught in the midst of a personal and professional life crisis. Between unrequited love, frustration at work, a tumultuous home, and self-doubt; she begins to spiral down a dark path.",
+ )
end
it "includes title" do
@@ -133,16 +176,22 @@ RSpec.describe Onebox::Engine::AmazonOnebox do
let(:html) { described_class.new(link).to_html }
before do
- stub_request(:get, "https://www.amazon.com/dp/B00AYQNR46")
- .to_return(status: 200, body: onebox_response("amazon"))
+ stub_request(:get, "https://www.amazon.com/dp/B00AYQNR46").to_return(
+ status: 200,
+ body: onebox_response("amazon"),
+ )
- stub_request(:get, "https://www.amazon.com/Seven-Languages-Weeks-Programming-Programmers/dp/193435659X")
- .to_return(status: 200, body: onebox_response("amazon"))
+ stub_request(
+ :get,
+ "https://www.amazon.com/Seven-Languages-Weeks-Programming-Programmers/dp/193435659X",
+ ).to_return(status: 200, body: onebox_response("amazon"))
end
describe "#to_html" do
it "includes title and author" do
- expect(html).to include("Seven Languages in Seven Weeks: A Pragmatic Guide to Learning Programming Languages (Pragmatic Programmers)")
+ expect(html).to include(
+ "Seven Languages in Seven Weeks: A Pragmatic Guide to Learning Programming Languages (Pragmatic Programmers)",
+ )
expect(html).to include("Bruce Tate")
end
@@ -161,21 +210,29 @@ RSpec.describe Onebox::Engine::AmazonOnebox do
let(:html) { described_class.new(link).to_html }
before do
- stub_request(:get, "https://www.amazon.com/dp/193435659X")
- .to_return(status: 200, body: onebox_response("amazon-ebook"))
+ stub_request(:get, "https://www.amazon.com/dp/193435659X").to_return(
+ status: 200,
+ body: onebox_response("amazon-ebook"),
+ )
- stub_request(:get, "https://www.amazon.com/Seven-Languages-Weeks-Programming-Programmers-ebook/dp/B00AYQNR46")
- .to_return(status: 200, body: onebox_response("amazon-ebook"))
+ stub_request(
+ :get,
+ "https://www.amazon.com/Seven-Languages-Weeks-Programming-Programmers-ebook/dp/B00AYQNR46",
+ ).to_return(status: 200, body: onebox_response("amazon-ebook"))
end
describe "#to_html" do
it "includes title and author" do
- expect(html).to include("Seven Languages in Seven Weeks: A Pragmatic Guide to Learning Programming Languages (Pragmatic Programmers)")
+ expect(html).to include(
+ "Seven Languages in Seven Weeks: A Pragmatic Guide to Learning Programming Languages (Pragmatic Programmers)",
+ )
expect(html).to include("Bruce Tate")
end
it "includes image" do
- expect(html).to include("https://images-na.ssl-images-amazon.com/images/I/51LZT%2BtSrTL._SX133_.jpg")
+ expect(html).to include(
+ "https://images-na.ssl-images-amazon.com/images/I/51LZT%2BtSrTL._SX133_.jpg",
+ )
end
it "includes ASIN" do
@@ -197,8 +254,10 @@ RSpec.describe Onebox::Engine::AmazonOnebox do
let(:onebox) { described_class.new(link) }
before do
- stub_request(:get, "https://www.amazon.com/dp/B0123ABCD3210")
- .to_return(status: 200, body: onebox_response("amazon-error"))
+ stub_request(:get, "https://www.amazon.com/dp/B0123ABCD3210").to_return(
+ status: 200,
+ body: onebox_response("amazon-error"),
+ )
end
it "returns a blank result" do
@@ -206,7 +265,9 @@ RSpec.describe Onebox::Engine::AmazonOnebox do
end
it "produces a placeholder" do
- expect(onebox.placeholder_html).to include('')
+ expect(onebox.placeholder_html).to include(
+ '',
+ )
end
it "returns errors" do
@@ -220,11 +281,15 @@ RSpec.describe Onebox::Engine::AmazonOnebox do
let(:html) { described_class.new(link).to_html }
before do
- stub_request(:get, "https://www.amazon.com/dp/B07FQ7M16H")
- .to_return(status: 200, body: onebox_response("amazon-alternate"))
+ stub_request(:get, "https://www.amazon.com/dp/B07FQ7M16H").to_return(
+ status: 200,
+ body: onebox_response("amazon-alternate"),
+ )
- stub_request(:get, "https://www.amazon.com/Lnchett-Nibbler-Quality-Attachment-Straight/dp/B07FQ7M16H")
- .to_return(status: 200, body: onebox_response("amazon-alternate"))
+ stub_request(
+ :get,
+ "https://www.amazon.com/Lnchett-Nibbler-Quality-Attachment-Straight/dp/B07FQ7M16H",
+ ).to_return(status: 200, body: onebox_response("amazon-alternate"))
end
describe "#to_html" do
@@ -233,7 +298,9 @@ RSpec.describe Onebox::Engine::AmazonOnebox do
end
it "includes description" do
- expect(html).to include("Drill Attachment for Straight Curve and Circle Cutting, Maximum 14 Gauge Steel")
+ expect(html).to include(
+ "Drill Attachment for Straight Curve and Circle Cutting, Maximum 14 Gauge Steel",
+ )
end
it "includes price" do
diff --git a/spec/lib/onebox/engine/animated_image_onebox_spec.rb b/spec/lib/onebox/engine/animated_image_onebox_spec.rb
index 049ce7e793f..85543fcf063 100644
--- a/spec/lib/onebox/engine/animated_image_onebox_spec.rb
+++ b/spec/lib/onebox/engine/animated_image_onebox_spec.rb
@@ -13,9 +13,7 @@ RSpec.describe Onebox::Engine::AnimatedImageOnebox do
stub_request(:get, tenor).to_return(status: 200, body: onebox_response("tenor"))
end
- after do
- Onebox.options = @previous_options
- end
+ after { Onebox.options = @previous_options }
it "works for giphy short URLs" do
html = described_class.new(giphy).to_html
diff --git a/spec/lib/onebox/engine/audio_onebox_spec.rb b/spec/lib/onebox/engine/audio_onebox_spec.rb
index cf3a3a9257e..a66ab849c06 100644
--- a/spec/lib/onebox/engine/audio_onebox_spec.rb
+++ b/spec/lib/onebox/engine/audio_onebox_spec.rb
@@ -2,34 +2,53 @@
RSpec.describe Onebox::Engine::AudioOnebox do
it "supports ogg" do
- expect(Onebox.preview('http://upload.wikimedia.org/wikipedia/commons/c/c8/Example.ogg').to_s).to match(/main/spec/fixtures')
+ expect(html).to include(
+ 'main/spec/fixtures ',
+ )
end
it "includes repository name" do
@@ -27,29 +32,39 @@ RSpec.describe Onebox::Engine::GithubFolderOnebox do
end
end
- context 'with fragments' do
+ context "with fragments" do
before do
@link = "https://github.com/discourse/discourse#setting-up-discourse"
@uri = "https://github.com/discourse/discourse"
- stub_request(:get, @uri).to_return(status: 200, body: onebox_response("githubfolder-discourse-root"))
+ stub_request(:get, @uri).to_return(
+ status: 200,
+ body: onebox_response("githubfolder-discourse-root"),
+ )
@onebox = described_class.new(@link)
end
it "extracts subtitles when linking to docs" do
- expect(@onebox.to_html).to include("discourse/discourse - Setting up Discourse ")
+ expect(@onebox.to_html).to include(
+ "discourse/discourse - Setting up Discourse ",
+ )
end
end
- context 'with rdoc fragments' do
+ context "with rdoc fragments" do
before do
@link = "https://github.com/ruby/rdoc#description-"
@uri = "https://github.com/ruby/rdoc"
- stub_request(:get, @uri).to_return(status: 200, body: onebox_response("githubfolder-rdoc-root"))
+ stub_request(:get, @uri).to_return(
+ status: 200,
+ body: onebox_response("githubfolder-rdoc-root"),
+ )
@onebox = described_class.new(@link)
end
it "extracts subtitles when linking to docs" do
- expect(@onebox.to_html).to include("GitHub - ruby/rdoc: RDoc produces HTML and online documentation for Ruby... - Description¶ ↑ ")
+ expect(@onebox.to_html).to include(
+ "GitHub - ruby/rdoc: RDoc produces HTML and online documentation for Ruby... - Description¶ ↑ ",
+ )
end
end
end
diff --git a/spec/lib/onebox/engine/github_gist_onebox_spec.rb b/spec/lib/onebox/engine/github_gist_onebox_spec.rb
index 6cbb285e005..7196a046cf1 100644
--- a/spec/lib/onebox/engine/github_gist_onebox_spec.rb
+++ b/spec/lib/onebox/engine/github_gist_onebox_spec.rb
@@ -4,8 +4,10 @@ RSpec.describe Onebox::Engine::GithubGistOnebox do
before do
@link = "https://gist.github.com/karreiro/208fdd59fc4b4c39283b"
- stub_request(:get, "https://api.github.com/gists/208fdd59fc4b4c39283b")
- .to_return(status: 200, body: onebox_response(described_class.onebox_name))
+ stub_request(:get, "https://api.github.com/gists/208fdd59fc4b4c39283b").to_return(
+ status: 200,
+ body: onebox_response(described_class.onebox_name),
+ )
end
include_context "with engines"
@@ -14,7 +16,7 @@ RSpec.describe Onebox::Engine::GithubGistOnebox do
describe "#data" do
let(:gist_files) { data[:gist_files] }
- it 'includes contents with 10 lines at most' do
+ it "includes contents with 10 lines at most" do
gist_files.each do |gist_file|
truncated_lines = gist_file.content.split("\n").size
expect(truncated_lines).to be < 10
@@ -23,7 +25,7 @@ RSpec.describe Onebox::Engine::GithubGistOnebox do
end
describe "#to_html" do
- describe 'when Gist API responds correctly' do
+ describe "when Gist API responds correctly" do
it "includes the link to original page" do
expect(html).to include("https://gist.github.com/karreiro/208fdd59fc4b4c39283b")
end
@@ -49,10 +51,11 @@ RSpec.describe Onebox::Engine::GithubGistOnebox do
end
end
- describe 'when the rate limit has been reached' do
+ describe "when the rate limit has been reached" do
before do
- stub_request(:get, "https://api.github.com/gists/208fdd59fc4b4c39283b")
- .to_return(status: 403)
+ stub_request(:get, "https://api.github.com/gists/208fdd59fc4b4c39283b").to_return(
+ status: 403,
+ )
end
it "includes the link to original page" do
diff --git a/spec/lib/onebox/engine/github_pull_request_onebox_spec.rb b/spec/lib/onebox/engine/github_pull_request_onebox_spec.rb
index 24f62fe08bd..f0fdca0e228 100644
--- a/spec/lib/onebox/engine/github_pull_request_onebox_spec.rb
+++ b/spec/lib/onebox/engine/github_pull_request_onebox_spec.rb
@@ -5,7 +5,10 @@ RSpec.describe Onebox::Engine::GithubPullRequestOnebox do
@link = "https://github.com/discourse/discourse/pull/1253/"
@uri = "https://api.github.com/repos/discourse/discourse/pulls/1253"
- stub_request(:get, @uri).to_return(status: 200, body: onebox_response(described_class.onebox_name))
+ stub_request(:get, @uri).to_return(
+ status: 200,
+ body: onebox_response(described_class.onebox_name),
+ )
end
include_context "with engines"
@@ -52,16 +55,23 @@ RSpec.describe Onebox::Engine::GithubPullRequestOnebox do
context "with commit links" do
before do
- @link = "https://github.com/discourse/discourse/pull/1253/commits/d7d3be1130c665cc7fab9f05dbf32335229137a6"
- @uri = "https://api.github.com/repos/discourse/discourse/commits/d7d3be1130c665cc7fab9f05dbf32335229137a6"
+ @link =
+ "https://github.com/discourse/discourse/pull/1253/commits/d7d3be1130c665cc7fab9f05dbf32335229137a6"
+ @uri =
+ "https://api.github.com/repos/discourse/discourse/commits/d7d3be1130c665cc7fab9f05dbf32335229137a6"
- stub_request(:get, @uri).to_return(status: 200, body: onebox_response(described_class.onebox_name + "_commit"))
+ stub_request(:get, @uri).to_return(
+ status: 200,
+ body: onebox_response(described_class.onebox_name + "_commit"),
+ )
end
it "includes commit name" do
- doc = Nokogiri::HTML5(html)
- expect(doc.css('h4').text.strip).to eq("Add audio onebox")
- expect(doc.css('.github-body-container').text).to include("http://meta.discourse.org/t/audio-html5-tag/8168")
+ doc = Nokogiri.HTML5(html)
+ expect(doc.css("h4").text.strip).to eq("Add audio onebox")
+ expect(doc.css(".github-body-container").text).to include(
+ "http://meta.discourse.org/t/audio-html5-tag/8168",
+ )
end
end
@@ -70,7 +80,10 @@ RSpec.describe Onebox::Engine::GithubPullRequestOnebox do
@link = "https://github.com/discourse/discourse/pull/1253/#issuecomment-21597425"
@uri = "https://api.github.com/repos/discourse/discourse/issues/comments/21597425"
- stub_request(:get, @uri).to_return(status: 200, body: onebox_response(described_class.onebox_name + "_comment"))
+ stub_request(:get, @uri).to_return(
+ status: 200,
+ body: onebox_response(described_class.onebox_name + "_comment"),
+ )
end
it "includes comment" do
diff --git a/spec/lib/onebox/engine/gitlab_blob_onebox_spec.rb b/spec/lib/onebox/engine/gitlab_blob_onebox_spec.rb
index ec812b66bc5..21bcef26ec8 100644
--- a/spec/lib/onebox/engine/gitlab_blob_onebox_spec.rb
+++ b/spec/lib/onebox/engine/gitlab_blob_onebox_spec.rb
@@ -2,10 +2,13 @@
RSpec.describe Onebox::Engine::GitlabBlobOnebox do
before do
- @link = "https://gitlab.com/discourse/onebox/blob/master/lib/onebox/engine/gitlab_blob_onebox.rb"
+ @link =
+ "https://gitlab.com/discourse/onebox/blob/master/lib/onebox/engine/gitlab_blob_onebox.rb"
- stub_request(:get, "https://gitlab.com/discourse/onebox/raw/master/lib/onebox/engine/gitlab_blob_onebox.rb")
- .to_return(status: 200, body: onebox_response(described_class.onebox_name))
+ stub_request(
+ :get,
+ "https://gitlab.com/discourse/onebox/raw/master/lib/onebox/engine/gitlab_blob_onebox.rb",
+ ).to_return(status: 200, body: onebox_response(described_class.onebox_name))
end
include_context "with engines"
diff --git a/spec/lib/onebox/engine/google_docs_onebox_spec.rb b/spec/lib/onebox/engine/google_docs_onebox_spec.rb
index 214fe05dab1..28344b043fe 100644
--- a/spec/lib/onebox/engine/google_docs_onebox_spec.rb
+++ b/spec/lib/onebox/engine/google_docs_onebox_spec.rb
@@ -16,7 +16,9 @@ RSpec.describe Onebox::Engine::GoogleDocsOnebox do
end
it "has description" do
- expect(html).to include("Lorem Ipsum Lorem ipsum dolor sit amet, consectetur adipiscing elit")
+ expect(html).to include(
+ "Lorem Ipsum Lorem ipsum dolor sit amet, consectetur adipiscing elit",
+ )
end
it "has icon" do
diff --git a/spec/lib/onebox/engine/google_drive_onebox_spec.rb b/spec/lib/onebox/engine/google_drive_onebox_spec.rb
index 3224e8b3e1e..58b67748aa5 100644
--- a/spec/lib/onebox/engine/google_drive_onebox_spec.rb
+++ b/spec/lib/onebox/engine/google_drive_onebox_spec.rb
@@ -4,16 +4,18 @@ RSpec.describe Onebox::Engine::GoogleDriveOnebox do
let(:link) { "https://drive.google.com/file/d/1FgMt06wENEUfC6_-1tImXaNCH7vM9QsA/view" }
let(:html) { described_class.new(link).to_html }
- before do
- stub_request(:get, link).to_return(status: 200, body: onebox_response("googledrive"))
- end
+ before { stub_request(:get, link).to_return(status: 200, body: onebox_response("googledrive")) }
it "includes title" do
- expect(html).to include('test.txt ')
+ expect(html).to include(
+ 'test.txt ',
+ )
end
it "includes image" do
- expect(html).to include("https://lh5.googleusercontent.com/wcDbcSFKB3agLf0963iFPqwy96OE2s7of1pAEbEOpg-38yS_m7u8VHKezWQ=w1200-h630-p")
+ expect(html).to include(
+ "https://lh5.googleusercontent.com/wcDbcSFKB3agLf0963iFPqwy96OE2s7of1pAEbEOpg-38yS_m7u8VHKezWQ=w1200-h630-p",
+ )
end
it "includes description" do
diff --git a/spec/lib/onebox/engine/google_maps_onebox_spec.rb b/spec/lib/onebox/engine/google_maps_onebox_spec.rb
index f0eeb542389..498d4289f4c 100644
--- a/spec/lib/onebox/engine/google_maps_onebox_spec.rb
+++ b/spec/lib/onebox/engine/google_maps_onebox_spec.rb
@@ -5,36 +5,51 @@ RSpec.describe Onebox::Engine::GoogleMapsOnebox do
short: {
test: "https://goo.gl/maps/rEG3D",
redirect: [302, :long],
- expect: "https://maps.google.de/maps?sll=40.689249,-74.0445&sspn=0.0062479,0.0109864&cid=4667599994556318251&q=Statue+of+Liberty+National+Monument&output=embed&dg=ntvb&ll=40.689249,-74.0445&spn=0.0062479,0.0109864",
+ expect:
+ "https://maps.google.de/maps?sll=40.689249,-74.0445&sspn=0.0062479,0.0109864&cid=4667599994556318251&q=Statue+of+Liberty+National+Monument&output=embed&dg=ntvb&ll=40.689249,-74.0445&spn=0.0062479,0.0109864",
},
long: {
- test: "https://www.google.de/maps/place/Statue+of+Liberty+National+Monument/@40.689249,-74.0445,17z/data=!3m1!4b1!4m2!3m1!1s0x89c25090129c363d:0x40c6a5770d25022b",
+ test:
+ "https://www.google.de/maps/place/Statue+of+Liberty+National+Monument/@40.689249,-74.0445,17z/data=!3m1!4b1!4m2!3m1!1s0x89c25090129c363d:0x40c6a5770d25022b",
redirect: [301, :canonical],
- expect: "https://maps.google.de/maps?sll=40.689249,-74.0445&sspn=0.0062479,0.0109864&cid=4667599994556318251&q=Statue+of+Liberty+National+Monument&output=embed&dg=ntvb&ll=40.689249,-74.0445&spn=0.0062479,0.0109864",
+ expect:
+ "https://maps.google.de/maps?sll=40.689249,-74.0445&sspn=0.0062479,0.0109864&cid=4667599994556318251&q=Statue+of+Liberty+National+Monument&output=embed&dg=ntvb&ll=40.689249,-74.0445&spn=0.0062479,0.0109864",
},
canonical: {
- test: "https://maps.google.de/maps?sll=40.689249,-74.0445&sspn=0.0062479,0.0109864&cid=4667599994556318251&q=Statue+of+Liberty+National+Monument&output=classic&dg=ntvb",
- expect: "https://maps.google.de/maps?sll=40.689249,-74.0445&sspn=0.0062479,0.0109864&cid=4667599994556318251&q=Statue+of+Liberty+National+Monument&output=embed&dg=ntvb&ll=40.689249,-74.0445&spn=0.0062479,0.0109864",
+ test:
+ "https://maps.google.de/maps?sll=40.689249,-74.0445&sspn=0.0062479,0.0109864&cid=4667599994556318251&q=Statue+of+Liberty+National+Monument&output=classic&dg=ntvb",
+ expect:
+ "https://maps.google.de/maps?sll=40.689249,-74.0445&sspn=0.0062479,0.0109864&cid=4667599994556318251&q=Statue+of+Liberty+National+Monument&output=embed&dg=ntvb&ll=40.689249,-74.0445&spn=0.0062479,0.0109864",
},
custom: {
test: "https://www.google.com/maps/d/edit?mid=zPYyZFrHi1MU.kX85W_Y2y2_E",
expect: "https://www.google.com/maps/d/embed?mid=zPYyZFrHi1MU.kX85W_Y2y2_E",
},
streetview: {
- test: "https://www.google.com/maps/@46.414384,10.013947,3a,75y,232.83h,99.08t/data=!3m5!1e1!3m3!1s9WgYUb5quXDjqqFd3DWI6A!2e0!3e5?hl=de",
- expect: "https://www.google.com/maps/embed?pb=!3m2!2sen!4v0!6m8!1m7!1s9WgYUb5quXDjqqFd3DWI6A!2m2!1d46.414384!2d10.013947!3f232.83!4f9.908!5f0.75",
- streetview: true
+ test:
+ "https://www.google.com/maps/@46.414384,10.013947,3a,75y,232.83h,99.08t/data=!3m5!1e1!3m3!1s9WgYUb5quXDjqqFd3DWI6A!2e0!3e5?hl=de",
+ expect:
+ "https://www.google.com/maps/embed?pb=!3m2!2sen!4v0!6m8!1m7!1s9WgYUb5quXDjqqFd3DWI6A!2m2!1d46.414384!2d10.013947!3f232.83!4f9.908!5f0.75",
+ streetview: true,
},
unresolveable: {
- test: "https://www.google.com/maps/place/Den+Abattoir/@51.2285173,4.4336702,17z/data=!4m7!1m4!3m3!1s0x47c3f7a5ac48e237:0x63d716018f584a33!2zUGnDqXRyYWlu!3b1!3m1!1s0x0000000000000000:0xfbfac0c41c32471a",
- redirect: [302, "https://www.google.com/maps/place/Den+Abattoir/@51.2285173,4.4336702,17z/data=!4m7!1m4!3m3!1s0x47c3f7a5ac48e237:0x63d716018f584a33!2zUGnDqXRyYWlu!3b1!3m1!1s0x0000000000000000:0xfbfac0c41c32471a?dg=dbrw&newdg=1"],
- expect: "https://maps.google.com/maps?ll=51.2285173,4.4336702&z=17&output=embed&dg=ntvb&q=Den+Abattoir&cid=18157036796216755994"
+ test:
+ "https://www.google.com/maps/place/Den+Abattoir/@51.2285173,4.4336702,17z/data=!4m7!1m4!3m3!1s0x47c3f7a5ac48e237:0x63d716018f584a33!2zUGnDqXRyYWlu!3b1!3m1!1s0x0000000000000000:0xfbfac0c41c32471a",
+ redirect: [
+ 302,
+ "https://www.google.com/maps/place/Den+Abattoir/@51.2285173,4.4336702,17z/data=!4m7!1m4!3m3!1s0x47c3f7a5ac48e237:0x63d716018f584a33!2zUGnDqXRyYWlu!3b1!3m1!1s0x0000000000000000:0xfbfac0c41c32471a?dg=dbrw&newdg=1",
+ ],
+ expect:
+ "https://maps.google.com/maps?ll=51.2285173,4.4336702&z=17&output=embed&dg=ntvb&q=Den+Abattoir&cid=18157036796216755994",
},
satellite: {
test: "https://www.google.de/maps/@40.6894264,-74.0449146,758m/data=!3m1!1e3",
- redirect: [302, "https://www.google.de/maps/@40.6894264,-74.0449146,758m/data=!3m1!1e3?dg=dbrw&newdg=1"],
- expect: "https://maps.google.com/maps?ll=40.6894264,-74.0449146&z=16&output=embed&dg=ntvb"
- }
+ redirect: [
+ 302,
+ "https://www.google.de/maps/@40.6894264,-74.0449146,758m/data=!3m1!1e3?dg=dbrw&newdg=1",
+ ],
+ expect: "https://maps.google.com/maps?ll=40.6894264,-74.0449146&z=16&output=embed&dg=ntvb",
+ },
}
# Register URL redirects
@@ -43,17 +58,18 @@ RSpec.describe Onebox::Engine::GoogleMapsOnebox do
status, location = *t[:redirect]
location = URLS[location][:test] if location.is_a? Symbol
- stub_request(:head, t[:test])
- .to_return(status: status, headers: { location: location })
+ stub_request(:head, t[:test]).to_return(status: status, headers: { location: location })
end
end
# Prevent sleep from wasting our time when we test with strange redirects
subject do
- described_class.send(:allocate).tap do |obj|
- obj.stubs(:sleep)
- obj.send(:initialize, link)
- end
+ described_class
+ .send(:allocate)
+ .tap do |obj|
+ obj.stubs(:sleep)
+ obj.send(:initialize, link)
+ end
end
let(:data) { Onebox::Helpers.symbolize_keys(subject.send(:data)) }
diff --git a/spec/lib/onebox/engine/google_photos_onebox_spec.rb b/spec/lib/onebox/engine/google_photos_onebox_spec.rb
index 90d6436667c..505fff77f60 100644
--- a/spec/lib/onebox/engine/google_photos_onebox_spec.rb
+++ b/spec/lib/onebox/engine/google_photos_onebox_spec.rb
@@ -6,10 +6,14 @@ RSpec.describe Onebox::Engine::GooglePhotosOnebox do
before do
stub_request(:get, link).to_return(status: 200, body: onebox_response("googlephotos"))
- stub_request(:get, "https://photos.google.com/share/AF1QipOV3gcu_edA8lyjJEpS9sC1g3AeCUtaZox11ylYZId7wJ7cthZ8M1kZXeAp5vhEPg?key=QktmUFNvdWpNVktERU5zWmVRZlZubzRRc0ttWWN3")
- .to_return(status: 200, body: onebox_response("googlephotos"))
- stub_request(:head, "https://photos.google.com/share/AF1QipOV3gcu_edA8lyjJEpS9sC1g3AeCUtaZox11ylYZId7wJ7cthZ8M1kZXeAp5vhEPg?key=QktmUFNvdWpNVktERU5zWmVRZlZubzRRc0ttWWN3")
- .to_return(status: 200, body: "")
+ stub_request(
+ :get,
+ "https://photos.google.com/share/AF1QipOV3gcu_edA8lyjJEpS9sC1g3AeCUtaZox11ylYZId7wJ7cthZ8M1kZXeAp5vhEPg?key=QktmUFNvdWpNVktERU5zWmVRZlZubzRRc0ttWWN3",
+ ).to_return(status: 200, body: onebox_response("googlephotos"))
+ stub_request(
+ :head,
+ "https://photos.google.com/share/AF1QipOV3gcu_edA8lyjJEpS9sC1g3AeCUtaZox11ylYZId7wJ7cthZ8M1kZXeAp5vhEPg?key=QktmUFNvdWpNVktERU5zWmVRZlZubzRRc0ttWWN3",
+ ).to_return(status: 200, body: "")
end
it "includes album title" do
@@ -17,6 +21,8 @@ RSpec.describe Onebox::Engine::GooglePhotosOnebox do
end
it "includes album poster image" do
- expect(html).to include("https://lh3.googleusercontent.com/ZlYoleNnrVo8qdx0qEjKi_-_VXY7pqqCqIW-B88EMqJ0etibFw1kEu4bzo-T4jyOQ9Ey2ekADim_L3re4lT3aBmYJUwhjkEUb5Yk59YaCSy2R8AoME5Rx4wviDRgICllF8g6lsZnS8c=w600-h315-p-k")
+ expect(html).to include(
+ "https://lh3.googleusercontent.com/ZlYoleNnrVo8qdx0qEjKi_-_VXY7pqqCqIW-B88EMqJ0etibFw1kEu4bzo-T4jyOQ9Ey2ekADim_L3re4lT3aBmYJUwhjkEUb5Yk59YaCSy2R8AoME5Rx4wviDRgICllF8g6lsZnS8c=w600-h315-p-k",
+ )
end
end
diff --git a/spec/lib/onebox/engine/google_play_app_onebox_spec.rb b/spec/lib/onebox/engine/google_play_app_onebox_spec.rb
index 43bf0437e18..25ee7336e46 100644
--- a/spec/lib/onebox/engine/google_play_app_onebox_spec.rb
+++ b/spec/lib/onebox/engine/google_play_app_onebox_spec.rb
@@ -4,8 +4,10 @@ RSpec.describe Onebox::Engine::GooglePlayAppOnebox do
before do
@link = "https://play.google.com/store/apps/details?id=com.hulu.plus&hl=en"
- stub_request(:get, "https://play.google.com/store/apps/details?id=com.hulu.plus&hl=en")
- .to_return(status: 200, body: onebox_response("googleplayapp"))
+ stub_request(
+ :get,
+ "https://play.google.com/store/apps/details?id=com.hulu.plus&hl=en",
+ ).to_return(status: 200, body: onebox_response("googleplayapp"))
end
include_context "with engines"
diff --git a/spec/lib/onebox/engine/hackernews_spec.rb b/spec/lib/onebox/engine/hackernews_spec.rb
index 152ec7adc4d..8e5a72bc672 100644
--- a/spec/lib/onebox/engine/hackernews_spec.rb
+++ b/spec/lib/onebox/engine/hackernews_spec.rb
@@ -7,11 +7,16 @@ RSpec.describe Onebox::Engine::HackernewsOnebox do
let(:html) { described_class.new(link).to_html }
before do
- stub_request(:get, api_link).to_return(status: 200, body: onebox_response("hackernews_comment"))
+ stub_request(:get, api_link).to_return(
+ status: 200,
+ body: onebox_response("hackernews_comment"),
+ )
end
it "has the comments first words" do
- expect(html).to include("Completely, forums are about basic human expression in paragraph form.")
+ expect(html).to include(
+ "Completely, forums are about basic human expression in paragraph form.",
+ )
end
it "has author username" do
diff --git a/spec/lib/onebox/engine/html_spec.rb b/spec/lib/onebox/engine/html_spec.rb
index 7fcc298c57e..9af34b04364 100644
--- a/spec/lib/onebox/engine/html_spec.rb
+++ b/spec/lib/onebox/engine/html_spec.rb
@@ -5,8 +5,10 @@ RSpec.describe Onebox::Engine::HTML do
@link = "http://amazon.com"
stub_request(:get, @link).to_return(status: 200, body: onebox_response("amazon"))
- stub_request(:get, "https://www.amazon.com/Seven-Languages-Weeks-Programming-Programmers/dp/193435659X")
- .to_return(status: 200, body: onebox_response("amazon"))
+ stub_request(
+ :get,
+ "https://www.amazon.com/Seven-Languages-Weeks-Programming-Programmers/dp/193435659X",
+ ).to_return(status: 200, body: onebox_response("amazon"))
end
describe "#raw" do
diff --git a/spec/lib/onebox/engine/image_onebox_spec.rb b/spec/lib/onebox/engine/image_onebox_spec.rb
index de3a40e961b..b3889bd528f 100644
--- a/spec/lib/onebox/engine/image_onebox_spec.rb
+++ b/spec/lib/onebox/engine/image_onebox_spec.rb
@@ -2,42 +2,66 @@
RSpec.describe Onebox::Engine::ImageOnebox do
it "supports png" do
- expect(Onebox.preview('http://www.discourse.org/images/logo.png').to_s).to match(/success
")
expect(described_class.fetch_html_doc(uri).to_s).to match("success")
@@ -61,18 +64,30 @@ RSpec.describe Onebox::Helpers do
context "with canonical link" do
it "follows canonical link" do
- uri = 'https://www.example.com'
- stub_request(:get, uri).to_return(status: 200, body: "invalid
")
- stub_request(:get, 'http://foobar.com').to_return(status: 200, body: "success
")
- stub_request(:head, 'http://foobar.com').to_return(status: 200, body: "")
+ uri = "https://www.example.com"
+ stub_request(:get, uri).to_return(
+ status: 200,
+ body: "invalid
",
+ )
+ stub_request(:get, "http://foobar.com").to_return(
+ status: 200,
+ body: "success
",
+ )
+ stub_request(:head, "http://foobar.com").to_return(status: 200, body: "")
expect(described_class.fetch_html_doc(uri).to_s).to match("success")
end
it "does not follow canonical link pointing at localhost" do
- uri = 'https://www.example.com'
- FinalDestination::SSRFDetector.stubs(:lookup_ips).with { |h| h == "localhost" }.returns(["127.0.0.1"])
- stub_request(:get, uri).to_return(status: 200, body: "success
")
+ uri = "https://www.example.com"
+ FinalDestination::SSRFDetector
+ .stubs(:lookup_ips)
+ .with { |h| h == "localhost" }
+ .returns(["127.0.0.1"])
+ stub_request(:get, uri).to_return(
+ status: 200,
+ body: "success
",
+ )
expect(described_class.fetch_html_doc(uri).to_s).to match("success")
end
@@ -81,11 +96,11 @@ RSpec.describe Onebox::Helpers do
describe ".fetch_content_length" do
it "does not connect to private IP" do
- uri = 'https://www.example.com'
+ uri = "https://www.example.com"
FinalDestination::TestHelper.stub_to_fail do
- expect {
- described_class.fetch_content_length(uri)
- }.to raise_error(FinalDestination::SSRFDetector::DisallowedIpError)
+ expect { described_class.fetch_content_length(uri) }.to raise_error(
+ FinalDestination::SSRFDetector::DisallowedIpError,
+ )
end
end
end
@@ -97,11 +112,19 @@ RSpec.describe Onebox::Helpers do
(1..6).each do |i|
code = codes.pop || 302
- stub_request(:get, "https://httpbin.org/redirect/#{i}")
- .to_return(status: code, body: "", headers: { location: "https://httpbin.org/redirect/#{i - 1}" })
+ stub_request(:get, "https://httpbin.org/redirect/#{i}").to_return(
+ status: code,
+ body: "",
+ headers: {
+ location: "https://httpbin.org/redirect/#{i - 1}",
+ },
+ )
end
- stub_request(:get, "https://httpbin.org/redirect/0").to_return(status: 200, body: "success
")
+ stub_request(:get, "https://httpbin.org/redirect/0").to_return(
+ status: 200,
+ body: "success
",
+ )
end
it "can follow redirects" do
@@ -109,9 +132,10 @@ RSpec.describe Onebox::Helpers do
end
it "errors on long redirect chains" do
- expect {
- described_class.fetch_response("https://httpbin.org/redirect/6")
- }.to raise_error(Net::HTTPError, /redirect too deep/)
+ expect { described_class.fetch_response("https://httpbin.org/redirect/6") }.to raise_error(
+ Net::HTTPError,
+ /redirect too deep/,
+ )
end
end
@@ -122,14 +146,18 @@ RSpec.describe Onebox::Helpers do
headers: {
location: "/cookies",
"set-cookie": "a=b; Path=/",
- }
+ },
)
- stub_request(:get, "https://httpbin.org/cookies")
- .with(headers: { cookie: "a=b; Path=/" })
- .to_return(status: 200, body: "success, cookie readback not implemented")
+ stub_request(:get, "https://httpbin.org/cookies").with(
+ headers: {
+ cookie: "a=b; Path=/",
+ },
+ ).to_return(status: 200, body: "success, cookie readback not implemented")
- expect(described_class.fetch_response('https://httpbin.org/cookies/set/a/b')).to match("success")
+ expect(described_class.fetch_response("https://httpbin.org/cookies/set/a/b")).to match(
+ "success",
+ )
end
it "does not send cookies to the wrong domain" do
@@ -140,14 +168,16 @@ RSpec.describe Onebox::Helpers do
headers: {
location: "https://evil.com/show_cookies",
"set-cookie": "a=b; Path=/",
- }
+ },
)
- stub_request(:get, "https://evil.com/show_cookies")
- .with(headers: { cookie: nil })
- .to_return(status: 200, body: "success, cookie readback not implemented")
+ stub_request(:get, "https://evil.com/show_cookies").with(
+ headers: {
+ cookie: nil,
+ },
+ ).to_return(status: 200, body: "success, cookie readback not implemented")
- described_class.fetch_response('https://httpbin.org/cookies/set/a/b')
+ described_class.fetch_response("https://httpbin.org/cookies/set/a/b")
end
end
end
@@ -155,11 +185,13 @@ RSpec.describe Onebox::Helpers do
describe "user_agent" do
context "with default" do
it "has the default Discourse user agent" do
- stub_request(:get, "http://example.com/some-resource")
- .with(headers: { "user-agent" => /Discourse Forum Onebox/ })
- .to_return(status: 200, body: "test")
+ stub_request(:get, "http://example.com/some-resource").with(
+ headers: {
+ "user-agent" => /Discourse Forum Onebox/,
+ },
+ ).to_return(status: 200, body: "test")
- described_class.fetch_response('http://example.com/some-resource')
+ described_class.fetch_response("http://example.com/some-resource")
end
end
@@ -174,48 +206,175 @@ RSpec.describe Onebox::Helpers do
end
it "has the custom user agent" do
- stub_request(:get, "http://example.com/some-resource")
- .with(headers: { "user-agent" => "EvilTroutBot v0.1" })
- .to_return(status: 200, body: "test")
+ stub_request(:get, "http://example.com/some-resource").with(
+ headers: {
+ "user-agent" => "EvilTroutBot v0.1",
+ },
+ ).to_return(status: 200, body: "test")
- described_class.fetch_response('http://example.com/some-resource')
+ described_class.fetch_response("http://example.com/some-resource")
end
end
end
- describe '.normalize_url_for_output' do
- it { expect(described_class.normalize_url_for_output('http://example.com/fo o')).to eq("http://example.com/fo%20o") }
- it { expect(described_class.normalize_url_for_output("http://example.com/fo'o")).to eq("http://example.com/fo'o") }
- it { expect(described_class.normalize_url_for_output('http://example.com/fo"o')).to eq("http://example.com/fo"o") }
- it { expect(described_class.normalize_url_for_output('http://example.com/fo')).to eq("http://example.com/foo") }
- it { expect(described_class.normalize_url_for_output('http://example.com/d’écran-à')).to eq("http://example.com/d’écran-à") }
- it { expect(described_class.normalize_url_for_output('//example.com/hello')).to eq("//example.com/hello") }
- it { expect(described_class.normalize_url_for_output('example.com/hello')).to eq("") }
- it { expect(described_class.normalize_url_for_output('linear-gradient(310.77deg, #29AA9F 0%, #098EA6 100%)')).to eq("") }
+ describe ".normalize_url_for_output" do
+ it do
+ expect(described_class.normalize_url_for_output("http://example.com/fo o")).to eq(
+ "http://example.com/fo%20o",
+ )
+ end
+ it do
+ expect(described_class.normalize_url_for_output("http://example.com/fo'o")).to eq(
+ "http://example.com/fo'o",
+ )
+ end
+ it do
+ expect(described_class.normalize_url_for_output('http://example.com/fo"o')).to eq(
+ "http://example.com/fo"o",
+ )
+ end
+ it do
+ expect(described_class.normalize_url_for_output("http://example.com/fo")).to eq(
+ "http://example.com/foo",
+ )
+ end
+ it do
+ expect(described_class.normalize_url_for_output("http://example.com/d’écran-à")).to eq(
+ "http://example.com/d’écran-à",
+ )
+ end
+ it do
+ expect(described_class.normalize_url_for_output("//example.com/hello")).to eq(
+ "//example.com/hello",
+ )
+ end
+ it { expect(described_class.normalize_url_for_output("example.com/hello")).to eq("") }
+ it do
+ expect(
+ described_class.normalize_url_for_output(
+ "linear-gradient(310.77deg, #29AA9F 0%, #098EA6 100%)",
+ ),
+ ).to eq("")
+ end
end
- describe '.get_absolute_image_url' do
- it { expect(described_class.get_absolute_image_url('//meta.discourse.org/favicon.ico', 'https://meta.discourse.org')).to eq('https://meta.discourse.org/favicon.ico') }
- it { expect(described_class.get_absolute_image_url('http://meta.discourse.org/favicon.ico', 'https://meta.discourse.org')).to eq('http://meta.discourse.org/favicon.ico') }
- it { expect(described_class.get_absolute_image_url('https://meta.discourse.org/favicon.ico', 'https://meta.discourse.org')).to eq('https://meta.discourse.org/favicon.ico') }
- it { expect(described_class.get_absolute_image_url('/favicon.ico', 'https://meta.discourse.org')).to eq('https://meta.discourse.org/favicon.ico') }
- it { expect(described_class.get_absolute_image_url('/favicon.ico', 'https://meta.discourse.org/forum/subdir')).to eq('https://meta.discourse.org/favicon.ico') }
- it { expect(described_class.get_absolute_image_url('../favicon.ico', 'https://meta.discourse.org/forum/subdir/')).to eq('https://meta.discourse.org/forum/favicon.ico') }
+ describe ".get_absolute_image_url" do
+ it do
+ expect(
+ described_class.get_absolute_image_url(
+ "//meta.discourse.org/favicon.ico",
+ "https://meta.discourse.org",
+ ),
+ ).to eq("https://meta.discourse.org/favicon.ico")
+ end
+ it do
+ expect(
+ described_class.get_absolute_image_url(
+ "http://meta.discourse.org/favicon.ico",
+ "https://meta.discourse.org",
+ ),
+ ).to eq("http://meta.discourse.org/favicon.ico")
+ end
+ it do
+ expect(
+ described_class.get_absolute_image_url(
+ "https://meta.discourse.org/favicon.ico",
+ "https://meta.discourse.org",
+ ),
+ ).to eq("https://meta.discourse.org/favicon.ico")
+ end
+ it do
+ expect(
+ described_class.get_absolute_image_url("/favicon.ico", "https://meta.discourse.org"),
+ ).to eq("https://meta.discourse.org/favicon.ico")
+ end
+ it do
+ expect(
+ described_class.get_absolute_image_url(
+ "/favicon.ico",
+ "https://meta.discourse.org/forum/subdir",
+ ),
+ ).to eq("https://meta.discourse.org/favicon.ico")
+ end
+ it do
+ expect(
+ described_class.get_absolute_image_url(
+ "../favicon.ico",
+ "https://meta.discourse.org/forum/subdir/",
+ ),
+ ).to eq("https://meta.discourse.org/forum/favicon.ico")
+ end
end
- describe '.uri_encode' do
- it { expect(described_class.uri_encode('http://example.com/f"o&o?[b"ar]')).to eq("http://example.com/f%22o&o?%5Bb%22ar%5D") }
- it { expect(described_class.uri_encode("http://example.com/f.o~o;?")).to eq("http://example.com/f.o~o;?%3Cba%27r%3E") }
- it { expect(described_class.uri_encode("http://example.com/(foo)?b+a+r")).to eq("http://example.com/%3Cpa'th%3E(foo)?b%2Ba%2Br") }
- it { expect(described_class.uri_encode("http://example.com/p,a:t!h-f$o@o*?b!a#r@")).to eq("http://example.com/p,a:t!h-f$o@o*?b%21a#r%40") }
- it { expect(described_class.uri_encode("http://example.com/path&foo?b'a&qu(er)y=1")).to eq("http://example.com/path&foo?b%27a%3Cr%3E&qu%28er%29y=1") }
- it { expect(described_class.uri_encode("http://example.com/index&")).to eq("http://example.com/index&%3Cscript%3Ealert('XSS');%3C/script%3E") }
- it { expect(described_class.uri_encode("http://example.com/index.html?message=")).to eq("http://example.com/index.html?message=%3Cscript%3Ealert%28%27XSS%27%29%3B%3C%2Fscript%3E") }
- it { expect(described_class.uri_encode("http://example.com/index.php/")).to eq("http://example.com/index.php/%3CIFRAME%20SRC=source.com%20onload='alert(document.cookie)'%3E%3C/IFRAME%3E") }
- it { expect(described_class.uri_encode("https://en.wiktionary.org/wiki/greengrocer%27s_apostrophe")).to eq("https://en.wiktionary.org/wiki/greengrocer%27s_apostrophe") }
+ describe ".uri_encode" do
+ it do
+ expect(described_class.uri_encode('http://example.com/f"o&o?[b"ar]')).to eq(
+ "http://example.com/f%22o&o?%5Bb%22ar%5D",
+ )
+ end
+ it do
+ expect(described_class.uri_encode("http://example.com/f.o~o;?")).to eq(
+ "http://example.com/f.o~o;?%3Cba%27r%3E",
+ )
+ end
+ it do
+ expect(described_class.uri_encode("http://example.com/(foo)?b+a+r")).to eq(
+ "http://example.com/%3Cpa'th%3E(foo)?b%2Ba%2Br",
+ )
+ end
+ it do
+ expect(described_class.uri_encode("http://example.com/p,a:t!h-f$o@o*?b!a#r@")).to eq(
+ "http://example.com/p,a:t!h-f$o@o*?b%21a#r%40",
+ )
+ end
+ it do
+ expect(described_class.uri_encode("http://example.com/path&foo?b'a&qu(er)y=1")).to eq(
+ "http://example.com/path&foo?b%27a%3Cr%3E&qu%28er%29y=1",
+ )
+ end
+ it do
+ expect(
+ described_class.uri_encode("http://example.com/index&"),
+ ).to eq("http://example.com/index&%3Cscript%3Ealert('XSS');%3C/script%3E")
+ end
+ it do
+ expect(
+ described_class.uri_encode(
+ "http://example.com/index.html?message=",
+ ),
+ ).to eq(
+ "http://example.com/index.html?message=%3Cscript%3Ealert%28%27XSS%27%29%3B%3C%2Fscript%3E",
+ )
+ end
+ it do
+ expect(
+ described_class.uri_encode(
+ "http://example.com/index.php/",
+ ),
+ ).to eq(
+ "http://example.com/index.php/%3CIFRAME%20SRC=source.com%20onload='alert(document.cookie)'%3E%3C/IFRAME%3E",
+ )
+ end
+ it do
+ expect(
+ described_class.uri_encode("https://en.wiktionary.org/wiki/greengrocer%27s_apostrophe"),
+ ).to eq("https://en.wiktionary.org/wiki/greengrocer%27s_apostrophe")
+ end
- it { expect(described_class.uri_encode("https://example.com/random%2Bpath?q=random%2Bquery")).to eq("https://example.com/random%2Bpath?q=random%2Bquery") }
- it { expect(described_class.uri_encode("https://glitch.com/edit/#!/equinox-watch")).to eq("https://glitch.com/edit/#!/equinox-watch") }
- it { expect(described_class.uri_encode("https://gitpod.io/#https://github.com/eclipse-theia/theia")).to eq("https://gitpod.io/#https://github.com/eclipse-theia/theia") }
+ it do
+ expect(
+ described_class.uri_encode("https://example.com/random%2Bpath?q=random%2Bquery"),
+ ).to eq("https://example.com/random%2Bpath?q=random%2Bquery")
+ end
+ it do
+ expect(described_class.uri_encode("https://glitch.com/edit/#!/equinox-watch")).to eq(
+ "https://glitch.com/edit/#!/equinox-watch",
+ )
+ end
+ it do
+ expect(
+ described_class.uri_encode("https://gitpod.io/#https://github.com/eclipse-theia/theia"),
+ ).to eq("https://gitpod.io/#https://github.com/eclipse-theia/theia")
+ end
end
end
diff --git a/spec/lib/onebox/json_ld_spec.rb b/spec/lib/onebox/json_ld_spec.rb
index d668622184e..15ce2b522fb 100644
--- a/spec/lib/onebox/json_ld_spec.rb
+++ b/spec/lib/onebox/json_ld_spec.rb
@@ -1,69 +1,79 @@
# frozen_string_literal: true
-require 'onebox/json_ld'
+require "onebox/json_ld"
RSpec.describe Onebox::JsonLd do
- it 'logs warning and returns an empty hash if received json is invalid' do
+ it "logs warning and returns an empty hash if received json is invalid" do
invalid_json = "{\"@type\":invalid-json}"
- doc = Nokogiri::HTML("")
+ doc = Nokogiri.HTML("")
Discourse.expects(:warn_exception).with(
- instance_of(JSON::ParserError), message: "Error parsing JSON-LD: #{invalid_json}"
+ instance_of(JSON::ParserError),
+ message: "Error parsing JSON-LD: #{invalid_json}",
)
json_ld = described_class.new(doc)
expect(json_ld.data).to eq({})
end
- it 'returns an empty hash if there is no JSON-LD script tag' do
- doc = Nokogiri::HTML("")
+ it "returns an empty hash if there is no JSON-LD script tag" do
+ doc = Nokogiri.HTML("")
json_ld = described_class.new(doc)
expect(json_ld.data).to eq({})
end
- it 'returns an empty hash if there is no JSON-LD data' do
- doc = Nokogiri::HTML("")
+ it "returns an empty hash if there is no JSON-LD data" do
+ doc = Nokogiri.HTML("")
json_ld = described_class.new(doc)
expect(json_ld.data).to eq({})
end
- it 'returns an empty hash if the type of JSON-LD data is not Movie' do
- doc = Nokogiri::HTML("")
+ it "returns an empty hash if the type of JSON-LD data is not Movie" do
+ doc =
+ Nokogiri.HTML(
+ "",
+ )
json_ld = described_class.new(doc)
expect(json_ld.data).to eq({})
end
- it 'correctly normalizes the properties' do
- doc = Nokogiri::HTML(onebox_response('imdb'))
+ it "correctly normalizes the properties" do
+ doc = Nokogiri.HTML(onebox_response("imdb"))
json_ld = described_class.new(doc)
expect(json_ld.data).to eq(expected_movie_hash)
end
- it 'does not fail when there is more than one JSON-LD element' do
- doc = Nokogiri::HTML(onebox_response('imdb'))
- doc.css("body")[0] << ""
+ it "does not fail when there is more than one JSON-LD element" do
+ doc = Nokogiri.HTML(onebox_response("imdb"))
+ doc.css("body")[
+ 0
+ ] << ""
Discourse.expects(:warn_exception).never
json_ld = described_class.new(doc)
expect(json_ld.data).to eq(expected_movie_hash)
end
- it 'returns first supported type when JSON-LD is an array' do
- array_json = ''
- doc = Nokogiri::HTML(array_json)
+ it "returns first supported type when JSON-LD is an array" do
+ array_json =
+ ''
+ doc = Nokogiri.HTML(array_json)
json_ld = described_class.new(doc)
- expect(json_ld.data).to eq({
- description: nil,
- duration: nil,
- genres: nil,
- image: nil,
- name: "La grande bellezza",
- rating: nil
- })
+ expect(json_ld.data).to eq(
+ {
+ description: nil,
+ duration: nil,
+ genres: nil,
+ image: nil,
+ name: "La grande bellezza",
+ rating: nil,
+ },
+ )
end
- it 'does not fail when JSON-LD returns an array with no supported types' do
- array_json = ''
- doc = Nokogiri::HTML(array_json)
+ it "does not fail when JSON-LD returns an array with no supported types" do
+ array_json =
+ ''
+ doc = Nokogiri.HTML(array_json)
json_ld = described_class.new(doc)
expect(json_ld.data).to eq({})
end
@@ -72,12 +82,14 @@ RSpec.describe Onebox::JsonLd do
def expected_movie_hash
{
- name: 'Rudy',
- image: 'https://m.media-amazon.com/images/M/MV5BZGUzMDU1YmQtMzBkOS00MTNmLTg5ZDQtZjY5Njk4Njk2MmRlXkEyXkFqcGdeQXVyNjc1NTYyMjg@._V1_.jpg',
- description: 'Rudy has always been told that he was too small to play college football. But he is determined to overcome the odds and fulfill his dream of playing for Notre Dame.',
+ name: "Rudy",
+ image:
+ "https://m.media-amazon.com/images/M/MV5BZGUzMDU1YmQtMzBkOS00MTNmLTg5ZDQtZjY5Njk4Njk2MmRlXkEyXkFqcGdeQXVyNjc1NTYyMjg@._V1_.jpg",
+ description:
+ "Rudy has always been told that he was too small to play college football. But he is determined to overcome the odds and fulfill his dream of playing for Notre Dame.",
rating: 7.5,
- genres: ['Biography', 'Drama', 'Sport'],
- duration: '01:54'
+ genres: %w[Biography Drama Sport],
+ duration: "01:54",
}
end
end
diff --git a/spec/lib/onebox/matcher_spec.rb b/spec/lib/onebox/matcher_spec.rb
index 1042dbb98dd..4659744a2d4 100644
--- a/spec/lib/onebox/matcher_spec.rb
+++ b/spec/lib/onebox/matcher_spec.rb
@@ -6,7 +6,7 @@ class TestEngine
end
def self.iframe_origins
- ["https://example.com", "https://example2.com"]
+ %w[https://example.com https://example2.com]
end
end
@@ -55,7 +55,7 @@ RSpec.describe Onebox::Matcher do
end
describe "with a allowlisted port/scheme" do
- %w{http://example.com https://example.com http://example.com:80 //example.com}.each do |url|
+ %w[http://example.com https://example.com http://example.com:80 //example.com].each do |url|
it "finds an engine for '#{url}'" do
matcher = Onebox::Matcher.new(url, opts)
matcher.stubs(:ordered_engines).returns([TestEngine])
@@ -65,7 +65,7 @@ RSpec.describe Onebox::Matcher do
end
describe "without a allowlisted port/scheme" do
- %w{http://example.com:21 ftp://example.com}.each do |url|
+ %w[http://example.com:21 ftp://example.com].each do |url|
it "doesn't find an engine for '#{url}'" do
matcher = Onebox::Matcher.new(url, opts)
matcher.stubs(:ordered_engines).returns([TestEngine])
@@ -88,13 +88,22 @@ RSpec.describe Onebox::Matcher do
end
it "doesn't find an engine when only some subdomains are allowed" do
- matcher = Onebox::Matcher.new("https://example.com", allowed_iframe_regexes: Onebox::Engine.origins_to_regexes(["https://example.com"]))
+ matcher =
+ Onebox::Matcher.new(
+ "https://example.com",
+ allowed_iframe_regexes: Onebox::Engine.origins_to_regexes(["https://example.com"]),
+ )
matcher.stubs(:ordered_engines).returns([TestEngine])
expect(matcher.oneboxed).to be_nil
end
it "finds an engine when all required domains are allowed" do
- matcher = Onebox::Matcher.new("https://example.com", allowed_iframe_regexes: Onebox::Engine.origins_to_regexes(["https://example.com", "https://example2.com"]))
+ matcher =
+ Onebox::Matcher.new(
+ "https://example.com",
+ allowed_iframe_regexes:
+ Onebox::Engine.origins_to_regexes(%w[https://example.com https://example2.com]),
+ )
matcher.stubs(:ordered_engines).returns([TestEngine])
expect(matcher.oneboxed).not_to be_nil
end
diff --git a/spec/lib/onebox/movie_spec.rb b/spec/lib/onebox/movie_spec.rb
index a8f324bc8e6..4ab9b685e2b 100644
--- a/spec/lib/onebox/movie_spec.rb
+++ b/spec/lib/onebox/movie_spec.rb
@@ -1,34 +1,37 @@
# frozen_string_literal: true
-require 'onebox/movie'
+require "onebox/movie"
RSpec.describe Onebox::Movie do
- it 'returns a nil rating if there is no aggregateRating item in json_ld data' do
- json_ld_data = json_ld_data_from_doc(
- ""
- )
+ it "returns a nil rating if there is no aggregateRating item in json_ld data" do
+ json_ld_data =
+ json_ld_data_from_doc(
+ "",
+ )
json_ld = described_class.new(json_ld_data)
expect(json_ld.rating).to eq(nil)
end
- it 'returns a nil rating if there is no ratingValue item in json_ld data' do
- json_ld_data = json_ld_data_from_doc(
- ""
- )
+ it "returns a nil rating if there is no ratingValue item in json_ld data" do
+ json_ld_data =
+ json_ld_data_from_doc(
+ "",
+ )
json_ld = described_class.new(json_ld_data)
expect(json_ld.rating).to eq(nil)
end
- it 'returns a nil if there is no duration in json_ld data' do
- json_ld_data = json_ld_data_from_doc(
- ""
- )
+ it "returns a nil if there is no duration in json_ld data" do
+ json_ld_data =
+ json_ld_data_from_doc(
+ "",
+ )
json_ld = described_class.new(json_ld_data)
expect(json_ld.duration).to eq(nil)
end
- it 'to_h returns hash version of the object' do
- json_ld_data = json_ld_data_from_doc(onebox_response('imdb'))
+ it "to_h returns hash version of the object" do
+ json_ld_data = json_ld_data_from_doc(onebox_response("imdb"))
movie = described_class.new(json_ld_data)
expect(movie.to_h).to eq(expected_movie_hash)
end
@@ -36,17 +39,19 @@ RSpec.describe Onebox::Movie do
private
def json_ld_data_from_doc(html)
- JSON[Nokogiri::HTML(html).search('script[type="application/ld+json"]').text]
+ JSON[Nokogiri.HTML(html).search('script[type="application/ld+json"]').text]
end
def expected_movie_hash
{
- name: 'Rudy',
- image: 'https://m.media-amazon.com/images/M/MV5BZGUzMDU1YmQtMzBkOS00MTNmLTg5ZDQtZjY5Njk4Njk2MmRlXkEyXkFqcGdeQXVyNjc1NTYyMjg@._V1_.jpg',
- description: 'Rudy has always been told that he was too small to play college football. But he is determined to overcome the odds and fulfill his dream of playing for Notre Dame.',
+ name: "Rudy",
+ image:
+ "https://m.media-amazon.com/images/M/MV5BZGUzMDU1YmQtMzBkOS00MTNmLTg5ZDQtZjY5Njk4Njk2MmRlXkEyXkFqcGdeQXVyNjc1NTYyMjg@._V1_.jpg",
+ description:
+ "Rudy has always been told that he was too small to play college football. But he is determined to overcome the odds and fulfill his dream of playing for Notre Dame.",
rating: 7.5,
- genres: ['Biography', 'Drama', 'Sport'],
- duration: '01:54'
+ genres: %w[Biography Drama Sport],
+ duration: "01:54",
}
end
end
diff --git a/spec/lib/onebox/open_graph_spec.rb b/spec/lib/onebox/open_graph_spec.rb
index b0fae43982c..efbbb90bb47 100644
--- a/spec/lib/onebox/open_graph_spec.rb
+++ b/spec/lib/onebox/open_graph_spec.rb
@@ -4,15 +4,23 @@ require "onebox/open_graph"
RSpec.describe Onebox::OpenGraph do
it "excludes html tags in title" do
- doc = Nokogiri::HTML('Did’ you <b>miss me</b>? - Album on Imgur Did’ you <b>miss me</b>? - Album on Imgur ")
- profile.update!(
- location: "")
expect(preview("/u/#{user.username}")).not_to include("http://test.localhost/new?%27class=black ")
+ expect(cpp.html).to eq(
+ "http://test.localhost/new?%27class=black
",
+ )
end
end
@@ -184,8 +217,20 @@ RSpec.describe Oneboxer do
it "does not return a onebox if redirect uri final destination is in blacklist" do
SiteSetting.blocked_onebox_domains = "kitten.com"
- stub_request(:get, "http://cat.com/meow").to_return(status: 301, body: "", headers: { "location" => "https://kitten.com" })
- stub_request(:head, "http://cat.com/meow").to_return(status: 301, body: "", headers: { "location" => "https://kitten.com" })
+ stub_request(:get, "http://cat.com/meow").to_return(
+ status: 301,
+ body: "",
+ headers: {
+ "location" => "https://kitten.com",
+ },
+ )
+ stub_request(:head, "http://cat.com/meow").to_return(
+ status: 301,
+ body: "",
+ headers: {
+ "location" => "https://kitten.com",
+ },
+ )
stub_request(:get, "https://kitten.com").to_return(status: 200, body: html, headers: {})
stub_request(:head, "https://kitten.com").to_return(status: 200, body: "", headers: {})
@@ -202,10 +247,28 @@ RSpec.describe Oneboxer do
it "does not return onebox if anything in the redirect chain is blocked" do
SiteSetting.blocked_onebox_domains = "middle.com"
- stub_request(:get, "https://cat.com/start").to_return(status: 301, body: "a", headers: { "location" => "https://middle.com/midway" })
- stub_request(:head, "https://cat.com/start").to_return(status: 301, body: "a", headers: { "location" => "https://middle.com/midway" })
+ stub_request(:get, "https://cat.com/start").to_return(
+ status: 301,
+ body: "a",
+ headers: {
+ "location" => "https://middle.com/midway",
+ },
+ )
+ stub_request(:head, "https://cat.com/start").to_return(
+ status: 301,
+ body: "a",
+ headers: {
+ "location" => "https://middle.com/midway",
+ },
+ )
- stub_request(:head, "https://middle.com/midway").to_return(status: 301, body: "b", headers: { "location" => "https://cat.com/end" })
+ stub_request(:head, "https://middle.com/midway").to_return(
+ status: 301,
+ body: "b",
+ headers: {
+ "location" => "https://cat.com/end",
+ },
+ )
stub_request(:get, "https://cat.com/end").to_return(status: 200, body: html)
stub_request(:head, "https://cat.com/end").to_return(status: 200, body: "", headers: {})
@@ -216,10 +279,20 @@ RSpec.describe Oneboxer do
end
it "does not return onebox if the Discourse-No-Onebox header == 1" do
- stub_request(:get, "https://website.com/discourse-no-onebox")
- .to_return(status: 200, body: "abc", headers: { "Discourse-No-Onebox" => "1" })
- stub_request(:head, "https://website.com/discourse-no-onebox")
- .to_return(status: 200, body: "", headers: { "Discourse-No-Onebox" => "1" })
+ stub_request(:get, "https://website.com/discourse-no-onebox").to_return(
+ status: 200,
+ body: "abc",
+ headers: {
+ "Discourse-No-Onebox" => "1",
+ },
+ )
+ stub_request(:head, "https://website.com/discourse-no-onebox").to_return(
+ status: 200,
+ body: "",
+ headers: {
+ "Discourse-No-Onebox" => "1",
+ },
+ )
result = Oneboxer.external_onebox("https://website.com/discourse-no-onebox")
expect(result[:onebox]).to be_empty
@@ -227,23 +300,57 @@ RSpec.describe Oneboxer do
end
it "does not return onebox if the Discourse-No-Onebox header == 1 anywhere in the redirect chain" do
- stub_request(:get, "https://website.com/redirect-no-onebox")
- .to_return(status: 301, body: "", headers: { "Discourse-No-Onebox" => "1", "location" => "https://willneverreach.com" })
- stub_request(:head, "https://website.com/redirect-no-onebox")
- .to_return(status: 301, body: "", headers: { "Discourse-No-Onebox" => "1", "location" => "https://willneverreach.com" })
+ stub_request(:get, "https://website.com/redirect-no-onebox").to_return(
+ status: 301,
+ body: "",
+ headers: {
+ "Discourse-No-Onebox" => "1",
+ "location" => "https://willneverreach.com",
+ },
+ )
+ stub_request(:head, "https://website.com/redirect-no-onebox").to_return(
+ status: 301,
+ body: "",
+ headers: {
+ "Discourse-No-Onebox" => "1",
+ "location" => "https://willneverreach.com",
+ },
+ )
result = Oneboxer.external_onebox("https://website.com/redirect-no-onebox")
expect(result[:onebox]).to be_empty
expect(result[:preview]).to be_empty
- stub_request(:get, "https://website.com/redirect")
- .to_return(status: 301, body: "", headers: { "location" => "https://website.com/redirect/dont-onebox" })
- stub_request(:head, "https://website.com/redirect")
- .to_return(status: 301, body: "", headers: { "location" => "https://website.com/redirect/dont-onebox" })
- stub_request(:get, "https://website.com/redirect/dont-onebox")
- .to_return(status: 301, body: "", headers: { "Discourse-No-Onebox" => "1", "location" => "https://wontreachme.com" })
- stub_request(:head, "https://website.com/redirect/dont-onebox")
- .to_return(status: 301, body: "", headers: { "Discourse-No-Onebox" => "1", "location" => "https://wontreachme.com" })
+ stub_request(:get, "https://website.com/redirect").to_return(
+ status: 301,
+ body: "",
+ headers: {
+ "location" => "https://website.com/redirect/dont-onebox",
+ },
+ )
+ stub_request(:head, "https://website.com/redirect").to_return(
+ status: 301,
+ body: "",
+ headers: {
+ "location" => "https://website.com/redirect/dont-onebox",
+ },
+ )
+ stub_request(:get, "https://website.com/redirect/dont-onebox").to_return(
+ status: 301,
+ body: "",
+ headers: {
+ "Discourse-No-Onebox" => "1",
+ "location" => "https://wontreachme.com",
+ },
+ )
+ stub_request(:head, "https://website.com/redirect/dont-onebox").to_return(
+ status: 301,
+ body: "",
+ headers: {
+ "Discourse-No-Onebox" => "1",
+ "location" => "https://wontreachme.com",
+ },
+ )
result = Oneboxer.external_onebox("https://website.com/redirect")
expect(result[:onebox]).to be_empty
@@ -264,46 +371,42 @@ RSpec.describe Oneboxer do
end
it "doesn't return onebox if the URL redirects" do
- stub_request(:head, "https://redirects2.com/full-onebox")
- .to_return(
- status: 301,
- body: "",
- headers: { "location" => "https://redirects2.com/real-full-onebox" }
- )
- stub_request(:get, "https://redirects2.com/full-onebox")
- .to_return(
- status: 301,
- body: "",
- headers: { "location" => "https://redirects2.com/real-full-onebox" }
- )
+ stub_request(:head, "https://redirects2.com/full-onebox").to_return(
+ status: 301,
+ body: "",
+ headers: {
+ "location" => "https://redirects2.com/real-full-onebox",
+ },
+ )
+ stub_request(:get, "https://redirects2.com/full-onebox").to_return(
+ status: 301,
+ body: "",
+ headers: {
+ "location" => "https://redirects2.com/real-full-onebox",
+ },
+ )
result = Oneboxer.external_onebox("https://redirects2.com/full-onebox")
expect(result[:onebox]).to be_blank
end
it "allows an initial http -> https redirect if the redirect URL is identical to the original" do
- stub_request(:get, "http://redirects3.com/full-onebox")
- .to_return(
- status: 301,
- body: "",
- headers: { "location" => "https://redirects3.com/full-onebox" }
- )
- stub_request(:head, "http://redirects3.com/full-onebox")
- .to_return(
- status: 301,
- body: "",
- headers: { "location" => "https://redirects3.com/full-onebox" }
- )
+ stub_request(:get, "http://redirects3.com/full-onebox").to_return(
+ status: 301,
+ body: "",
+ headers: {
+ "location" => "https://redirects3.com/full-onebox",
+ },
+ )
+ stub_request(:head, "http://redirects3.com/full-onebox").to_return(
+ status: 301,
+ body: "",
+ headers: {
+ "location" => "https://redirects3.com/full-onebox",
+ },
+ )
- stub_request(:get, "https://redirects3.com/full-onebox")
- .to_return(
- status: 200,
- body: html
- )
- stub_request(:head, "https://redirects3.com/full-onebox")
- .to_return(
- status: 200,
- body: "",
- )
+ stub_request(:get, "https://redirects3.com/full-onebox").to_return(status: 200, body: html)
+ stub_request(:head, "https://redirects3.com/full-onebox").to_return(status: 200, body: "")
result = Oneboxer.external_onebox("http://redirects3.com/full-onebox")
onebox = result[:onebox]
expect(onebox).to include("https://redirects3.com/full-onebox")
@@ -312,31 +415,35 @@ RSpec.describe Oneboxer do
end
it "doesn't allow an initial http -> https redirect if the redirect URL is different to the original" do
- stub_request(:get, "http://redirects4.com/full-onebox")
- .to_return(
- status: 301,
- body: "",
- headers: { "location" => "https://redirects4.com/full-onebox/2" }
- )
- stub_request(:head, "http://redirects4.com/full-onebox")
- .to_return(
- status: 301,
- body: "",
- headers: { "location" => "https://redirects4.com/full-onebox/2" }
- )
+ stub_request(:get, "http://redirects4.com/full-onebox").to_return(
+ status: 301,
+ body: "",
+ headers: {
+ "location" => "https://redirects4.com/full-onebox/2",
+ },
+ )
+ stub_request(:head, "http://redirects4.com/full-onebox").to_return(
+ status: 301,
+ body: "",
+ headers: {
+ "location" => "https://redirects4.com/full-onebox/2",
+ },
+ )
- stub_request(:get, "https://redirects4.com/full-onebox")
- .to_return(
- status: 301,
- body: "",
- headers: { "location" => "https://redirects4.com/full-onebox/2" }
- )
- stub_request(:head, "https://redirects4.com/full-onebox")
- .to_return(
- status: 301,
- body: "",
- headers: { "location" => "https://redirects4.com/full-onebox/2" }
- )
+ stub_request(:get, "https://redirects4.com/full-onebox").to_return(
+ status: 301,
+ body: "",
+ headers: {
+ "location" => "https://redirects4.com/full-onebox/2",
+ },
+ )
+ stub_request(:head, "https://redirects4.com/full-onebox").to_return(
+ status: 301,
+ body: "",
+ headers: {
+ "location" => "https://redirects4.com/full-onebox/2",
+ },
+ )
result = Oneboxer.external_onebox("http://redirects4.com/full-onebox")
expect(result[:onebox]).to be_blank
end
@@ -345,7 +452,7 @@ RSpec.describe Oneboxer do
it "censors external oneboxes" do
Fabricate(:watched_word, action: WatchedWord.actions[:censor], word: "bad word")
- url = 'https://example.com/'
+ url = "https://example.com/"
stub_request(:any, url).to_return(status: 200, body: <<~HTML, headers: {})
@@ -359,10 +466,10 @@ RSpec.describe Oneboxer do
HTML
onebox = Oneboxer.external_onebox(url)
- expect(onebox[:onebox]).to include('title with')
- expect(onebox[:onebox]).not_to include('bad word')
- expect(onebox[:preview]).to include('title with')
- expect(onebox[:preview]).not_to include('bad word')
+ expect(onebox[:onebox]).to include("title with")
+ expect(onebox[:onebox]).not_to include("bad word")
+ expect(onebox[:preview]).to include("title with")
+ expect(onebox[:preview]).not_to include("bad word")
end
it "returns onebox" do
@@ -377,19 +484,28 @@ RSpec.describe Oneboxer do
it "uses the Onebox custom user agent on specified hosts" do
SiteSetting.force_custom_user_agent_hosts = "http://codepen.io|https://video.discourse.org/"
- url = 'https://video.discourse.org/presentation.mp4'
+ url = "https://video.discourse.org/presentation.mp4"
stub_request(:head, url).to_return(status: 403, body: "", headers: {})
stub_request(:get, url).to_return(status: 403, body: "", headers: {})
- stub_request(:head, url).with(headers: { "User-Agent" => Onebox.options.user_agent }).to_return(status: 200, body: "", headers: {})
- stub_request(:get, url).with(headers: { "User-Agent" => Onebox.options.user_agent }).to_return(status: 200, body: "", headers: {})
+ stub_request(:head, url).with(headers: { "User-Agent" => Onebox.options.user_agent }).to_return(
+ status: 200,
+ body: "",
+ headers: {
+ },
+ )
+ stub_request(:get, url).with(headers: { "User-Agent" => Onebox.options.user_agent }).to_return(
+ status: 200,
+ body: "",
+ headers: {
+ },
+ )
expect(Oneboxer.preview(url, invalidate_oneboxes: true)).to be_present
end
context "with youtube stub" do
- let(:html) do
- <<~HTML
+ let(:html) { <<~HTML }
onebox
' }
- doc = Nokogiri::HTML5::fragment(cooked.to_html)
+ cooked = Oneboxer.apply(PrettyText.cook(raw)) { "onebox
" }
+ doc = Nokogiri::HTML5.fragment(cooked.to_html)
expect(doc.to_html).to match_html <<~HTML
Before Onebox
onebox
@@ -553,8 +715,8 @@ RSpec.describe Oneboxer do
HTML
raw = "Before Onebox\nhttps://example.com\nhttps://example.com\nAfter Onebox"
- cooked = Oneboxer.apply(PrettyText.cook(raw)) { 'onebox
' }
- doc = Nokogiri::HTML5::fragment(cooked.to_html)
+ cooked = Oneboxer.apply(PrettyText.cook(raw)) { "onebox
" }
+ doc = Nokogiri::HTML5.fragment(cooked.to_html)
expect(doc.to_html).to match_html <<~HTML
Before Onebox
onebox
@@ -563,11 +725,11 @@ RSpec.describe Oneboxer do
HTML
end
- it 'does keeps SVGs valid' do
+ it "does keeps SVGs valid" do
raw = "Onebox\n\nhttps://example.com"
cooked = PrettyText.cook(raw)
- cooked = Oneboxer.apply(Loofah.fragment(cooked)) { '' }
- doc = Nokogiri::HTML5::fragment(cooked.to_html)
+ cooked = Oneboxer.apply(Loofah.fragment(cooked)) { "" }
+ doc = Nokogiri::HTML5.fragment(cooked.to_html)
expect(doc.to_html).to match_html <<~HTML
Onebox
@@ -575,21 +737,21 @@ RSpec.describe Oneboxer do
end
end
- describe '#force_get_hosts' do
+ describe "#force_get_hosts" do
before do
SiteSetting.cache_onebox_response_body_domains = "example.net|example.com|example.org"
end
it "includes Amazon sites" do
- expect(Oneboxer.force_get_hosts).to include('https://www.amazon.ca')
+ expect(Oneboxer.force_get_hosts).to include("https://www.amazon.ca")
end
it "includes cache_onebox_response_body_domains" do
- expect(Oneboxer.force_get_hosts).to include('https://www.example.com')
+ expect(Oneboxer.force_get_hosts).to include("https://www.example.com")
end
end
- describe 'strategies' do
+ describe "strategies" do
it "has a 'default' strategy" do
expect(Oneboxer.strategies.keys.first).to eq(:default)
end
@@ -602,8 +764,7 @@ RSpec.describe Oneboxer do
context "when using a non-default strategy" do
let(:hostname) { "my.interesting.site" }
let(:url) { "https://#{hostname}/cool/content" }
- let(:html) do
- <<~HTML
+ let(:html) { <<~HTML }
cache me if you can
HTML
- end
let(:url) { "https://www.example.com/my/great/content" }
let(:url2) { "https://www.example2.com/my/great/content" }
@@ -679,12 +837,10 @@ RSpec.describe Oneboxer do
describe "register_local_handler" do
it "calls registered local handler" do
- Oneboxer.register_local_handler('wizard') do |url, route|
- 'Custom Onebox for Wizard'
- end
+ Oneboxer.register_local_handler("wizard") { |url, route| "Custom Onebox for Wizard" }
url = "#{Discourse.base_url}/wizard"
- expect(Oneboxer.preview(url)).to eq('Custom Onebox for Wizard')
+ expect(Oneboxer.preview(url)).to eq("Custom Onebox for Wizard")
end
end
end
diff --git a/spec/lib/onpdiff_spec.rb b/spec/lib/onpdiff_spec.rb
index 73acd797299..0a7e46a131c 100644
--- a/spec/lib/onpdiff_spec.rb
+++ b/spec/lib/onpdiff_spec.rb
@@ -1,15 +1,15 @@
# frozen_string_literal: true
RSpec.describe ONPDiff do
-
describe "diff" do
-
it "returns an empty array when there is no content to diff" do
expect(ONPDiff.new("", "").diff).to eq([])
end
it "returns an array with the operation code for each element" do
- expect(ONPDiff.new("abcd", "abef").diff).to eq([["a", :common], ["b", :common], ["e", :add], ["f", :add], ["c", :delete], ["d", :delete]])
+ expect(ONPDiff.new("abcd", "abef").diff).to eq(
+ [["a", :common], ["b", :common], ["e", :add], ["f", :add], ["c", :delete], ["d", :delete]],
+ )
end
it "bails out on large diffs" do
@@ -17,57 +17,65 @@ RSpec.describe ONPDiff do
b = SecureRandom.alphanumeric(5_000)
expect(ONPDiff.new(a, b).diff).to eq([])
end
-
end
describe "short_diff" do
-
it "returns an empty array when there is no content to diff" do
expect(ONPDiff.new("", "").short_diff).to eq([])
end
it "returns an array with the operation code for each element" do
- expect(ONPDiff.new("abc", "acd").short_diff).to eq([["a", :common], ["b", :delete], ["c", :common], ["d", :add]])
+ expect(ONPDiff.new("abc", "acd").short_diff).to eq(
+ [["a", :common], ["b", :delete], ["c", :common], ["d", :add]],
+ )
end
it "returns an array with sequentially similar operations merged" do
- expect(ONPDiff.new("abcd", "abef").short_diff).to eq([["ab", :common], ["ef", :add], ["cd", :delete]])
+ expect(ONPDiff.new("abcd", "abef").short_diff).to eq(
+ [["ab", :common], ["ef", :add], ["cd", :delete]],
+ )
end
-
end
describe "paragraph_diff" do
-
it "returns an empty array when there is no content to diff" do
expect(ONPDiff.new("", "").paragraph_diff).to eq([])
end
it "returns an array with the operation code for each element" do
- expect(ONPDiff.new("abc", "acd").paragraph_diff).to eq([["a", :common], ["b", :delete], ["c", :common], ["d", :add]])
+ expect(ONPDiff.new("abc", "acd").paragraph_diff).to eq(
+ [["a", :common], ["b", :delete], ["c", :common], ["d", :add]],
+ )
end
it "pairs as many elements as possible" do
- expect(ONPDiff.new("abcd", "abef").paragraph_diff).to eq([
- ["a", :common], ["b", :common],
- ["e", :add], ["c", :delete],
- ["f", :add], ["d", :delete]
- ])
+ expect(ONPDiff.new("abcd", "abef").paragraph_diff).to eq(
+ [["a", :common], ["b", :common], ["e", :add], ["c", :delete], ["f", :add], ["d", :delete]],
+ )
- expect(ONPDiff.new("abcde", "abfg").paragraph_diff).to eq([
- ["a", :common], ["b", :common],
- ["c", :delete],
- ["d", :delete], ["f", :add],
- ["e", :delete], ["g", :add]
- ])
+ expect(ONPDiff.new("abcde", "abfg").paragraph_diff).to eq(
+ [
+ ["a", :common],
+ ["b", :common],
+ ["c", :delete],
+ ["d", :delete],
+ ["f", :add],
+ ["e", :delete],
+ ["g", :add],
+ ],
+ )
- expect(ONPDiff.new("abcd", "abefg").paragraph_diff).to eq([
- ["a", :common], ["b", :common],
- ["e", :add],
- ["f", :add], ["c", :delete],
- ["g", :add], ["d", :delete]
- ])
+ expect(ONPDiff.new("abcd", "abefg").paragraph_diff).to eq(
+ [
+ ["a", :common],
+ ["b", :common],
+ ["e", :add],
+ ["f", :add],
+ ["c", :delete],
+ ["g", :add],
+ ["d", :delete],
+ ],
+ )
end
-
end
-
end
diff --git a/spec/lib/pbkdf2_spec.rb b/spec/lib/pbkdf2_spec.rb
index 2a5d65a3def..456757dc724 100644
--- a/spec/lib/pbkdf2_spec.rb
+++ b/spec/lib/pbkdf2_spec.rb
@@ -1,11 +1,15 @@
# frozen_string_literal: true
-require 'pbkdf2'
+require "pbkdf2"
RSpec.describe Pbkdf2 do
# trivial test to ensure this does not regress during extraction
it "hashes stuff correctly" do
- expect(Pbkdf2.hash_password('test', 'abcd', 100)).to eq("0313a6aca54dd4c5d82a699a8a0f0ffb0191b4ef62414b8d9dbc11c0c5ac04da")
- expect(Pbkdf2.hash_password('test', 'abcd', 101)).to eq("c7a7b2891bf8e6f82d08cf8d83824edcf6c7c6bacb6a741f38e21fc7977bd20f")
+ expect(Pbkdf2.hash_password("test", "abcd", 100)).to eq(
+ "0313a6aca54dd4c5d82a699a8a0f0ffb0191b4ef62414b8d9dbc11c0c5ac04da",
+ )
+ expect(Pbkdf2.hash_password("test", "abcd", 101)).to eq(
+ "c7a7b2891bf8e6f82d08cf8d83824edcf6c7c6bacb6a741f38e21fc7977bd20f",
+ )
end
end
diff --git a/spec/lib/pinned_check_spec.rb b/spec/lib/pinned_check_spec.rb
index afc88c68381..5d98fe62be3 100644
--- a/spec/lib/pinned_check_spec.rb
+++ b/spec/lib/pinned_check_spec.rb
@@ -1,15 +1,13 @@
# frozen_string_literal: true
-require 'pinned_check'
+require "pinned_check"
RSpec.describe PinnedCheck do
-
let(:pinned_at) { 12.hours.ago }
let(:unpinned_topic) { Fabricate.build(:topic) }
let(:pinned_topic) { Fabricate.build(:topic, pinned_at: pinned_at) }
context "without a topic_user record (either anonymous or never been in the topic)" do
-
it "returns false if the topic is not pinned" do
expect(PinnedCheck.pinned?(unpinned_topic)).to eq(false)
end
@@ -17,7 +15,6 @@ RSpec.describe PinnedCheck do
it "returns true if the topic is pinned" do
expect(PinnedCheck.pinned?(unpinned_topic)).to eq(false)
end
-
end
context "with a topic_user record" do
@@ -29,7 +26,6 @@ RSpec.describe PinnedCheck do
it "returns false" do
expect(PinnedCheck.pinned?(unpinned_topic, topic_user)).to eq(false)
end
-
end
describe "pinned topic" do
@@ -49,7 +45,5 @@ RSpec.describe PinnedCheck do
expect(PinnedCheck.pinned?(pinned_topic, topic_user)).to eq(true)
end
end
-
end
-
end
diff --git a/spec/lib/plain_text_to_markdown_spec.rb b/spec/lib/plain_text_to_markdown_spec.rb
index c6f9af3b70c..9afc57afcf5 100644
--- a/spec/lib/plain_text_to_markdown_spec.rb
+++ b/spec/lib/plain_text_to_markdown_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-require 'plain_text_to_markdown'
+require "plain_text_to_markdown"
RSpec.describe PlainTextToMarkdown do
def to_markdown(text, opts = {})
@@ -50,30 +50,37 @@ RSpec.describe PlainTextToMarkdown do
describe "special characters" do
it "escapes special Markdown characters" do
expect(to_markdown('\ backslash')).to eq('\\\\ backslash')
- expect(to_markdown('` backtick')).to eq('\` backtick')
- expect(to_markdown('* asterisk')).to eq('\* asterisk')
- expect(to_markdown('_ underscore')).to eq('\_ underscore')
- expect(to_markdown('{} curly braces')).to eq('\{\} curly braces')
- expect(to_markdown('[] square brackets')).to eq('\[\] square brackets')
- expect(to_markdown('() parentheses')).to eq('\(\) parentheses')
- expect(to_markdown('# hash mark')).to eq('\# hash mark')
- expect(to_markdown('+ plus sign')).to eq('\+ plus sign')
- expect(to_markdown('- minus sign')).to eq('\- minus sign')
- expect(to_markdown('. dot')).to eq('\. dot')
- expect(to_markdown('! exclamation mark')).to eq('\! exclamation mark')
- expect(to_markdown('~ tilde')).to eq('\~ tilde')
+ expect(to_markdown("` backtick")).to eq('\` backtick')
+ expect(to_markdown("* asterisk")).to eq('\* asterisk')
+ expect(to_markdown("_ underscore")).to eq('\_ underscore')
+ expect(to_markdown("{} curly braces")).to eq('\{\} curly braces')
+ expect(to_markdown("[] square brackets")).to eq('\[\] square brackets')
+ expect(to_markdown("() parentheses")).to eq('\(\) parentheses')
+ expect(to_markdown("# hash mark")).to eq('\# hash mark')
+ expect(to_markdown("+ plus sign")).to eq('\+ plus sign')
+ expect(to_markdown("- minus sign")).to eq('\- minus sign')
+ expect(to_markdown(". dot")).to eq('\. dot')
+ expect(to_markdown("! exclamation mark")).to eq('\! exclamation mark')
+ expect(to_markdown("~ tilde")).to eq('\~ tilde')
end
it "escapes special HTML characters" do
expect(to_markdown("' single quote")).to eq("' single quote")
expect(to_markdown("\" double quote")).to eq("" double quote")
expect(to_markdown("& ampersand")).to eq("& ampersand")
- expect(to_markdown("<> less-than and greater-than sign")).to eq("<> less\\-than and greater\\-than sign")
+ expect(to_markdown("<> less-than and greater-than sign")).to eq(
+ "<> less\\-than and greater\\-than sign",
+ )
end
it "escapes special characters but ignores links" do
- expect(to_markdown("*some text* https://www.example.com/foo.html?a=1&b=0 & *more text*"))
- .to eq("\\*some text\\* https://www.example.com/foo.html?a=1&b=0 & <https://www.example.com/bar.html?a=1&b=0> \\*more text\\*")
+ expect(
+ to_markdown(
+ "*some text* https://www.example.com/foo.html?a=1&b=0 & *more text*",
+ ),
+ ).to eq(
+ "\\*some text\\* https://www.example.com/foo.html?a=1&b=0 & <https://www.example.com/bar.html?a=1&b=0> \\*more text\\*",
+ )
end
end
@@ -108,29 +115,37 @@ RSpec.describe PlainTextToMarkdown do
describe "format=flowed" do
it "concats lines ending with a space" do
- text = "Lorem ipsum dolor sit amet, consectetur \nadipiscing elit. Quasi vero, inquit, \nperpetua oratio rhetorum solum, non \netiam philosophorum sit."
- markdown = "Lorem ipsum dolor sit amet, consectetur adipiscing elit\\. Quasi vero, inquit, perpetua oratio rhetorum solum, non etiam philosophorum sit\\."
+ text =
+ "Lorem ipsum dolor sit amet, consectetur \nadipiscing elit. Quasi vero, inquit, \nperpetua oratio rhetorum solum, non \netiam philosophorum sit."
+ markdown =
+ "Lorem ipsum dolor sit amet, consectetur adipiscing elit\\. Quasi vero, inquit, perpetua oratio rhetorum solum, non etiam philosophorum sit\\."
expect(to_markdown(text, format_flowed: true)).to eq(markdown)
end
it "does not concat lines when there is an empty line between" do
- text = "Lorem ipsum dolor sit amet, consectetur \nadipiscing elit. \n\nQuasi vero, inquit, \nperpetua oratio rhetorum solum, non \netiam philosophorum sit."
- markdown = "Lorem ipsum dolor sit amet, consectetur adipiscing elit\\. \n\nQuasi vero, inquit, perpetua oratio rhetorum solum, non etiam philosophorum sit\\."
+ text =
+ "Lorem ipsum dolor sit amet, consectetur \nadipiscing elit. \n\nQuasi vero, inquit, \nperpetua oratio rhetorum solum, non \netiam philosophorum sit."
+ markdown =
+ "Lorem ipsum dolor sit amet, consectetur adipiscing elit\\. \n\nQuasi vero, inquit, perpetua oratio rhetorum solum, non etiam philosophorum sit\\."
expect(to_markdown(text, format_flowed: true)).to eq(markdown)
end
it "concats quoted lines ending with a space" do
- text = "> Lorem ipsum dolor sit amet, consectetur \n> adipiscing elit. Quasi vero, inquit, \n> perpetua oratio rhetorum solum, non \n> etiam philosophorum sit."
- markdown = "> Lorem ipsum dolor sit amet, consectetur adipiscing elit\\. Quasi vero, inquit, perpetua oratio rhetorum solum, non etiam philosophorum sit\\."
+ text =
+ "> Lorem ipsum dolor sit amet, consectetur \n> adipiscing elit. Quasi vero, inquit, \n> perpetua oratio rhetorum solum, non \n> etiam philosophorum sit."
+ markdown =
+ "> Lorem ipsum dolor sit amet, consectetur adipiscing elit\\. Quasi vero, inquit, perpetua oratio rhetorum solum, non etiam philosophorum sit\\."
expect(to_markdown(text, format_flowed: true)).to eq(markdown)
end
it "does not concat quoted lines ending with a space when the quote level differs" do
- text = "> Lorem ipsum dolor sit amet, consectetur \n> adipiscing elit. \n>> Quasi vero, inquit, \n>> perpetua oratio rhetorum solum, non \n> etiam philosophorum sit."
- markdown = "> Lorem ipsum dolor sit amet, consectetur adipiscing elit\\. \n>> Quasi vero, inquit, perpetua oratio rhetorum solum, non \n>\n> etiam philosophorum sit\\."
+ text =
+ "> Lorem ipsum dolor sit amet, consectetur \n> adipiscing elit. \n>> Quasi vero, inquit, \n>> perpetua oratio rhetorum solum, non \n> etiam philosophorum sit."
+ markdown =
+ "> Lorem ipsum dolor sit amet, consectetur adipiscing elit\\. \n>> Quasi vero, inquit, perpetua oratio rhetorum solum, non \n>\n> etiam philosophorum sit\\."
expect(to_markdown(text, format_flowed: true)).to eq(markdown)
end
@@ -159,29 +174,36 @@ RSpec.describe PlainTextToMarkdown do
describe "links" do
it "removes duplicate links" do
- expect(to_markdown("foo https://www.example.com/foo.html?a=1 bar"))
- .to eq("foo https://www.example.com/foo.html?a=1 bar")
+ expect(
+ to_markdown(
+ "foo https://www.example.com/foo.html?a=1 bar",
+ ),
+ ).to eq("foo https://www.example.com/foo.html?a=1 bar")
- expect(to_markdown("foo https://www.example.com/foo.html bar"))
- .to eq("foo https://www.example.com/foo.html bar")
+ expect(
+ to_markdown("foo https://www.example.com/foo.html bar"),
+ ).to eq("foo https://www.example.com/foo.html bar")
- expect(to_markdown("foo https://www.example.com/foo.html (https://www.example.com/foo.html) bar"))
- .to eq("foo https://www.example.com/foo.html bar")
+ expect(
+ to_markdown("foo https://www.example.com/foo.html (https://www.example.com/foo.html) bar"),
+ ).to eq("foo https://www.example.com/foo.html bar")
- expect(to_markdown("foo https://www.example.com/foo.html https://www.example.com/foo.html bar"))
- .to eq("foo https://www.example.com/foo.html bar")
+ expect(
+ to_markdown("foo https://www.example.com/foo.html https://www.example.com/foo.html bar"),
+ ).to eq("foo https://www.example.com/foo.html bar")
end
it "does not removes duplicate links when there is text between the links" do
- expect(to_markdown("foo https://www.example.com/foo.html bar https://www.example.com/foo.html baz"))
- .to eq("foo https://www.example.com/foo.html bar https://www.example.com/foo.html baz")
+ expect(
+ to_markdown(
+ "foo https://www.example.com/foo.html bar https://www.example.com/foo.html baz",
+ ),
+ ).to eq("foo https://www.example.com/foo.html bar https://www.example.com/foo.html baz")
end
it "does not explode with weird links" do
expect {
- Timeout::timeout(0.25) {
- to_markdown("https://www.discourse.org/?boom=#{"." * 20}")
- }
+ Timeout.timeout(0.25) { to_markdown("https://www.discourse.org/?boom=#{"." * 20}") }
}.not_to raise_error
end
end
@@ -192,7 +214,9 @@ RSpec.describe PlainTextToMarkdown do
end
it "does not detect Markdown code block when backticks are not on new line" do
- expect(to_markdown("foo\n```\n ```")).to eq("foo\n\\`\\`\\`\n<this is code> \\`\\`\\`")
+ expect(to_markdown("foo\n```\n ```")).to eq(
+ "foo\n\\`\\`\\`\n<this is code> \\`\\`\\`",
+ )
end
it "does not detect Markdown code block when backticks are indented by more than 3 whitespaces" do
@@ -203,7 +227,9 @@ RSpec.describe PlainTextToMarkdown do
expect(to_markdown("foo\n```\n\n ```")).to include("<this is code>")
expect(to_markdown("foo\n ```\n\n```")).to include("<this is code>")
- expect(to_markdown("foo\n```\n\n ```")).to include("<this is code>")
+ expect(to_markdown("foo\n```\n\n ```")).to include(
+ "<this is code>",
+ )
end
end
end
diff --git a/spec/lib/plugin/filter_manager_spec.rb b/spec/lib/plugin/filter_manager_spec.rb
index 80bf0e14fcb..78275b0189d 100644
--- a/spec/lib/plugin/filter_manager_spec.rb
+++ b/spec/lib/plugin/filter_manager_spec.rb
@@ -4,22 +4,15 @@ RSpec.describe Plugin::FilterManager do
let(:instance) { Plugin::FilterManager.new }
it "calls registered filters correctly" do
- instance.register(:added_numbers) do |context, result|
- context + result + 1
- end
+ instance.register(:added_numbers) { |context, result| context + result + 1 }
- instance.register(:added_numbers) do |context, result|
- context + result + 2
- end
+ instance.register(:added_numbers) { |context, result| context + result + 2 }
expect(instance.apply(:added_numbers, 1, 0)).to eq(5)
end
it "should raise an exception if wrong arity is passed in" do
- expect do
- instance.register(:test) do
- end
- end.to raise_error(ArgumentError)
+ expect do instance.register(:test) {} end.to raise_error(ArgumentError)
end
it "should return the original if no filters exist" do
@@ -27,8 +20,6 @@ RSpec.describe Plugin::FilterManager do
end
it "should raise an exception if no block is passed in" do
- expect do
- instance.register(:test)
- end.to raise_error(ArgumentError)
+ expect do instance.register(:test) end.to raise_error(ArgumentError)
end
end
diff --git a/spec/lib/plugin/instance_spec.rb b/spec/lib/plugin/instance_spec.rb
index fef597b9a67..cb9314464ad 100644
--- a/spec/lib/plugin/instance_spec.rb
+++ b/spec/lib/plugin/instance_spec.rb
@@ -1,9 +1,7 @@
# frozen_string_literal: true
RSpec.describe Plugin::Instance do
- after do
- DiscoursePluginRegistry.reset!
- end
+ after { DiscoursePluginRegistry.reset! }
describe "find_all" do
it "can find plugins correctly" do
@@ -39,7 +37,6 @@ RSpec.describe Plugin::Instance do
end
end
class TroutJuniorSerializer < TroutSerializer
-
attribute :i_am_child
def name
@@ -83,9 +80,7 @@ RSpec.describe Plugin::Instance do
@child_serializer = TroutJuniorSerializer.new(@trout)
end
- after do
- DiscourseEvent.off(:hello, &@set.first)
- end
+ after { DiscourseEvent.off(:hello, &@set.first) }
it "checks enabled/disabled functionality for extensions" do
# with an enabled plugin
@@ -116,11 +111,11 @@ RSpec.describe Plugin::Instance do
ctx = Trout.new
ctx.data = "hello"
- @plugin.register_html_builder('test:html') { |c| "#{c.data}
" }
+ @plugin.register_html_builder("test:html") { |c| "#{c.data}
" }
@plugin.enabled = false
- expect(DiscoursePluginRegistry.build_html('test:html', ctx)).to eq("")
+ expect(DiscoursePluginRegistry.build_html("test:html", ctx)).to eq("")
@plugin.enabled = true
- expect(DiscoursePluginRegistry.build_html('test:html', ctx)).to eq("hello
")
+ expect(DiscoursePluginRegistry.build_html("test:html", ctx)).to eq("hello
")
end
end
end
@@ -143,7 +138,9 @@ RSpec.describe Plugin::Instance do
plugin.send :register_assets!
- expect(DiscoursePluginRegistry.vendored_core_pretty_text.first).to eq("vendor/assets/javascripts/moment.js")
+ expect(DiscoursePluginRegistry.vendored_core_pretty_text.first).to eq(
+ "vendor/assets/javascripts/moment.js",
+ )
end
end
@@ -168,12 +165,13 @@ RSpec.describe Plugin::Instance do
end
end
- it 'patches the enabled? function for auth_providers if not defined' do
- SimpleAuthenticator = Class.new(Auth::Authenticator) do
- def name
- "my_authenticator"
+ it "patches the enabled? function for auth_providers if not defined" do
+ SimpleAuthenticator =
+ Class.new(Auth::Authenticator) do
+ def name
+ "my_authenticator"
+ end
end
- end
plugin = Plugin::Instance.new
@@ -189,7 +187,7 @@ RSpec.describe Plugin::Instance do
# With enabled site setting
plugin = Plugin::Instance.new
authenticator = SimpleAuthenticator.new
- plugin.auth_provider(enabled_setting: 'enable_badges', authenticator: authenticator)
+ plugin.auth_provider(enabled_setting: "enable_badges", authenticator: authenticator)
plugin.notify_before_auth
expect(authenticator.enabled?).to eq(false)
@@ -197,12 +195,15 @@ RSpec.describe Plugin::Instance do
plugin = Plugin::Instance.new
SiteSetting.enable_badges = true
- authenticator = Class.new(SimpleAuthenticator) do
- def enabled?
- false
- end
- end.new
- plugin.auth_provider(enabled_setting: 'enable_badges', authenticator: authenticator)
+ authenticator =
+ Class
+ .new(SimpleAuthenticator) do
+ def enabled?
+ false
+ end
+ end
+ .new
+ plugin.auth_provider(enabled_setting: "enable_badges", authenticator: authenticator)
plugin.notify_before_auth
expect(authenticator.enabled?).to eq(false)
end
@@ -224,9 +225,7 @@ RSpec.describe Plugin::Instance do
# calls ensure_assets! make sure they are there
expect(plugin.assets.count).to eq(1)
- plugin.assets.each do |a, opts|
- expect(File.exist?(a)).to eq(true)
- end
+ plugin.assets.each { |a, opts| expect(File.exist?(a)).to eq(true) }
# ensure it cleans up all crap in autogenerated directory
expect(File.exist?(junk_file)).to eq(false)
@@ -240,7 +239,7 @@ RSpec.describe Plugin::Instance do
plugin.notify_before_auth
expect(DiscoursePluginRegistry.auth_providers.count).to eq(1)
auth_provider = DiscoursePluginRegistry.auth_providers.to_a[0]
- expect(auth_provider.authenticator.name).to eq('facebook')
+ expect(auth_provider.authenticator.name).to eq("facebook")
end
it "finds all the custom assets" do
@@ -269,13 +268,9 @@ RSpec.describe Plugin::Instance do
end
describe "serialized_current_user_fields" do
- before do
- DiscoursePluginRegistry.serialized_current_user_fields << "has_car"
- end
+ before { DiscoursePluginRegistry.serialized_current_user_fields << "has_car" }
- after do
- DiscoursePluginRegistry.serialized_current_user_fields.delete "has_car"
- end
+ after { DiscoursePluginRegistry.serialized_current_user_fields.delete "has_car" }
it "correctly serializes custom user fields" do
DiscoursePluginRegistry.serialized_current_user_fields << "has_car"
@@ -304,7 +299,7 @@ RSpec.describe Plugin::Instance do
it "can add a color scheme for the first time" do
plugin = Plugin::Instance.new nil, "/tmp/test.rb"
expect {
- plugin.register_color_scheme("Purple", primary: 'EEE0E5')
+ plugin.register_color_scheme("Purple", primary: "EEE0E5")
plugin.notify_after_initialize
}.to change { ColorScheme.count }.by(1)
expect(ColorScheme.where(name: "Purple")).to be_present
@@ -314,27 +309,27 @@ RSpec.describe Plugin::Instance do
Fabricate(:color_scheme, name: "Halloween")
plugin = Plugin::Instance.new nil, "/tmp/test.rb"
expect {
- plugin.register_color_scheme("Halloween", primary: 'EEE0E5')
+ plugin.register_color_scheme("Halloween", primary: "EEE0E5")
plugin.notify_after_initialize
}.to_not change { ColorScheme.count }
end
end
- describe '.register_seedfu_fixtures' do
+ describe ".register_seedfu_fixtures" do
it "should add the new path to SeedFu's fixtures path" do
plugin = Plugin::Instance.new nil, "/tmp/test.rb"
- plugin.register_seedfu_fixtures(['some_path'])
- plugin.register_seedfu_fixtures('some_path2')
+ plugin.register_seedfu_fixtures(["some_path"])
+ plugin.register_seedfu_fixtures("some_path2")
- expect(SeedFu.fixture_paths).to include('some_path')
- expect(SeedFu.fixture_paths).to include('some_path2')
+ expect(SeedFu.fixture_paths).to include("some_path")
+ expect(SeedFu.fixture_paths).to include("some_path2")
end
end
- describe '#add_model_callback' do
+ describe "#add_model_callback" do
let(:metadata) do
metadata = Plugin::Metadata.new
- metadata.name = 'test'
+ metadata.name = "test"
metadata
end
@@ -344,34 +339,30 @@ RSpec.describe Plugin::Instance do
plugin
end
- it 'should add the right callback' do
+ it "should add the right callback" do
called = 0
- plugin_instance.add_model_callback(User, :after_create) do
- called += 1
- end
+ plugin_instance.add_model_callback(User, :after_create) { called += 1 }
user = Fabricate(:user)
expect(called).to eq(1)
- user.update!(username: 'some_username')
+ user.update!(username: "some_username")
expect(called).to eq(1)
end
- it 'should add the right callback with options' do
+ it "should add the right callback with options" do
called = 0
- plugin_instance.add_model_callback(User, :after_commit, on: :create) do
- called += 1
- end
+ plugin_instance.add_model_callback(User, :after_commit, on: :create) { called += 1 }
user = Fabricate(:user)
expect(called).to eq(1)
- user.update!(username: 'some_username')
+ user.update!(username: "some_username")
expect(called).to eq(1)
end
@@ -382,12 +373,13 @@ RSpec.describe Plugin::Instance do
let!(:plugin) { Plugin::Instance.new(nil, "#{plugin_path}/plugin.rb") }
let(:plural) do
{
- keys: [:one, :few, :other],
- rule: lambda do |n|
- return :one if n == 1
- return :few if n < 10
- :other
- end
+ keys: %i[one few other],
+ rule:
+ lambda do |n|
+ return :one if n == 1
+ return :few if n < 10
+ :other
+ end,
}
end
@@ -412,7 +404,7 @@ RSpec.describe Plugin::Instance do
register_locale("foo_BAR", name: "Foo", nativeName: "Foo Bar", plural: plural)
expect(DiscoursePluginRegistry.locales).to have_key(:foo_BAR)
- expect(DiscoursePluginRegistry.locales).to have_key('foo_BAR')
+ expect(DiscoursePluginRegistry.locales).to have_key("foo_BAR")
end
it "correctly registers a new locale" do
@@ -422,16 +414,26 @@ RSpec.describe Plugin::Instance do
expect(DiscoursePluginRegistry.locales).to have_key(:foo_BAR)
expect(locale[:fallbackLocale]).to be_nil
- expect(locale[:message_format]).to eq(["foo_BAR", "#{plugin_path}/lib/javascripts/locale/message_format/foo_BAR.js"])
- expect(locale[:moment_js]).to eq(["foo_BAR", "#{plugin_path}/lib/javascripts/locale/moment_js/foo_BAR.js"])
- expect(locale[:moment_js_timezones]).to eq(["foo_BAR", "#{plugin_path}/lib/javascripts/locale/moment_js_timezones/foo_BAR.js"])
+ expect(locale[:message_format]).to eq(
+ ["foo_BAR", "#{plugin_path}/lib/javascripts/locale/message_format/foo_BAR.js"],
+ )
+ expect(locale[:moment_js]).to eq(
+ ["foo_BAR", "#{plugin_path}/lib/javascripts/locale/moment_js/foo_BAR.js"],
+ )
+ expect(locale[:moment_js_timezones]).to eq(
+ ["foo_BAR", "#{plugin_path}/lib/javascripts/locale/moment_js_timezones/foo_BAR.js"],
+ )
expect(locale[:plural]).to eq(plural.with_indifferent_access)
expect(Rails.configuration.assets.precompile).to include("locales/foo_BAR.js")
- expect(JsLocaleHelper.find_message_format_locale(["foo_BAR"], fallback_to_english: true)).to eq(locale[:message_format])
+ expect(
+ JsLocaleHelper.find_message_format_locale(["foo_BAR"], fallback_to_english: true),
+ ).to eq(locale[:message_format])
expect(JsLocaleHelper.find_moment_locale(["foo_BAR"])).to eq (locale[:moment_js])
- expect(JsLocaleHelper.find_moment_locale(["foo_BAR"], timezone_names: true)).to eq (locale[:moment_js_timezones])
+ expect(JsLocaleHelper.find_moment_locale(["foo_BAR"], timezone_names: true)).to eq (
+ locale[:moment_js_timezones]
+ )
end
it "correctly registers a new locale using a fallback locale" do
@@ -441,14 +443,22 @@ RSpec.describe Plugin::Instance do
expect(DiscoursePluginRegistry.locales).to have_key(:tup)
expect(locale[:fallbackLocale]).to eq("pt_BR")
- expect(locale[:message_format]).to eq(["pt_BR", "#{Rails.root}/lib/javascripts/locale/pt_BR.js"])
- expect(locale[:moment_js]).to eq(["pt-br", "#{Rails.root}/vendor/assets/javascripts/moment-locale/pt-br.js"])
- expect(locale[:moment_js_timezones]).to eq(["pt", "#{Rails.root}/vendor/assets/javascripts/moment-timezone-names-locale/pt.js"])
+ expect(locale[:message_format]).to eq(
+ ["pt_BR", "#{Rails.root}/lib/javascripts/locale/pt_BR.js"],
+ )
+ expect(locale[:moment_js]).to eq(
+ ["pt-br", "#{Rails.root}/vendor/assets/javascripts/moment-locale/pt-br.js"],
+ )
+ expect(locale[:moment_js_timezones]).to eq(
+ ["pt", "#{Rails.root}/vendor/assets/javascripts/moment-timezone-names-locale/pt.js"],
+ )
expect(locale[:plural]).to be_nil
expect(Rails.configuration.assets.precompile).to include("locales/tup.js")
- expect(JsLocaleHelper.find_message_format_locale(["tup"], fallback_to_english: true)).to eq(locale[:message_format])
+ expect(JsLocaleHelper.find_message_format_locale(["tup"], fallback_to_english: true)).to eq(
+ locale[:message_format],
+ )
expect(JsLocaleHelper.find_moment_locale(["tup"])).to eq (locale[:moment_js])
end
@@ -459,13 +469,19 @@ RSpec.describe Plugin::Instance do
expect(DiscoursePluginRegistry.locales).to have_key(:tlh)
expect(locale[:fallbackLocale]).to be_nil
- expect(locale[:message_format]).to eq(["tlh", "#{plugin_path}/lib/javascripts/locale/message_format/tlh.js"])
- expect(locale[:moment_js]).to eq(["tlh", "#{Rails.root}/vendor/assets/javascripts/moment-locale/tlh.js"])
+ expect(locale[:message_format]).to eq(
+ ["tlh", "#{plugin_path}/lib/javascripts/locale/message_format/tlh.js"],
+ )
+ expect(locale[:moment_js]).to eq(
+ ["tlh", "#{Rails.root}/vendor/assets/javascripts/moment-locale/tlh.js"],
+ )
expect(locale[:plural]).to eq(plural.with_indifferent_access)
expect(Rails.configuration.assets.precompile).to include("locales/tlh.js")
- expect(JsLocaleHelper.find_message_format_locale(["tlh"], fallback_to_english: true)).to eq(locale[:message_format])
+ expect(JsLocaleHelper.find_message_format_locale(["tlh"], fallback_to_english: true)).to eq(
+ locale[:message_format],
+ )
expect(JsLocaleHelper.find_moment_locale(["tlh"])).to eq (locale[:moment_js])
end
@@ -474,18 +490,18 @@ RSpec.describe Plugin::Instance do
expect(DiscoursePluginRegistry.locales.count).to eq(0)
end
- [
- "config/locales/client.foo_BAR.yml",
- "config/locales/server.foo_BAR.yml",
- "lib/javascripts/locale/message_format/foo_BAR.js",
- "lib/javascripts/locale/moment_js/foo_BAR.js",
- "assets/locales/foo_BAR.js.erb"
+ %w[
+ config/locales/client.foo_BAR.yml
+ config/locales/server.foo_BAR.yml
+ lib/javascripts/locale/message_format/foo_BAR.js
+ lib/javascripts/locale/moment_js/foo_BAR.js
+ assets/locales/foo_BAR.js.erb
].each do |path|
it "does not register a new locale when #{path} is missing" do
path = "#{plugin_path}/#{path}"
- File.stubs('exist?').returns(false)
- File.stubs('exist?').with(regexp_matches(/#{Regexp.quote(plugin_path)}.*/)).returns(true)
- File.stubs('exist?').with(path).returns(false)
+ File.stubs("exist?").returns(false)
+ File.stubs("exist?").with(regexp_matches(/#{Regexp.quote(plugin_path)}.*/)).returns(true)
+ File.stubs("exist?").with(path).returns(false)
register_locale("foo_BAR", name: "Foo", nativeName: "Foo Bar", plural: plural)
expect(DiscoursePluginRegistry.locales.count).to eq(0)
@@ -493,8 +509,8 @@ RSpec.describe Plugin::Instance do
end
end
- describe '#register_reviewable_types' do
- it 'Overrides the existing Reviewable types adding new ones' do
+ describe "#register_reviewable_types" do
+ it "Overrides the existing Reviewable types adding new ones" do
current_types = Reviewable.types
new_type_class = Class
@@ -504,8 +520,8 @@ RSpec.describe Plugin::Instance do
end
end
- describe '#extend_list_method' do
- it 'Overrides the existing list appending new elements' do
+ describe "#extend_list_method" do
+ it "Overrides the existing list appending new elements" do
current_list = Reviewable.types
new_element = Class.name
@@ -515,16 +531,12 @@ RSpec.describe Plugin::Instance do
end
end
- describe '#register_emoji' do
- before do
- Plugin::CustomEmoji.clear_cache
- end
+ describe "#register_emoji" do
+ before { Plugin::CustomEmoji.clear_cache }
- after do
- Plugin::CustomEmoji.clear_cache
- end
+ after { Plugin::CustomEmoji.clear_cache }
- it 'allows to register an emoji' do
+ it "allows to register an emoji" do
Plugin::Instance.new.register_emoji("foo", "/foo/bar.png")
custom_emoji = Emoji.custom.first
@@ -534,7 +546,7 @@ RSpec.describe Plugin::Instance do
expect(custom_emoji.group).to eq(Emoji::DEFAULT_GROUP)
end
- it 'allows to register an emoji with a group' do
+ it "allows to register an emoji with a group" do
Plugin::Instance.new.register_emoji("bar", "/baz/bar.png", "baz")
custom_emoji = Emoji.custom.first
@@ -545,7 +557,7 @@ RSpec.describe Plugin::Instance do
end
end
- describe '#replace_flags' do
+ describe "#replace_flags" do
after do
PostActionType.replace_flag_settings(nil)
ReviewableScore.reload_types
@@ -553,31 +565,26 @@ RSpec.describe Plugin::Instance do
let(:original_flags) { PostActionType.flag_settings }
- it 'adds a new flag' do
+ it "adds a new flag" do
highest_flag_id = ReviewableScore.types.values.max
flag_name = :new_flag
subject.replace_flags(settings: original_flags) do |settings, next_flag_id|
- settings.add(
- next_flag_id,
- flag_name
- )
+ settings.add(next_flag_id, flag_name)
end
expect(PostActionType.flag_settings.flag_types.keys).to include(flag_name)
expect(PostActionType.flag_settings.flag_types.values.max).to eq(highest_flag_id + 1)
end
- it 'adds a new score type after adding a new flag' do
+ it "adds a new score type after adding a new flag" do
highest_flag_id = ReviewableScore.types.values.max
new_score_type = :new_score_type
- subject.replace_flags(settings: original_flags, score_type_names: [new_score_type]) do |settings, next_flag_id|
- settings.add(
- next_flag_id,
- :new_flag
- )
- end
+ subject.replace_flags(
+ settings: original_flags,
+ score_type_names: [new_score_type],
+ ) { |settings, next_flag_id| settings.add(next_flag_id, :new_flag) }
expect(PostActionType.flag_settings.flag_types.values.max).to eq(highest_flag_id + 1)
expect(ReviewableScore.types.keys).to include(new_score_type)
@@ -585,27 +592,25 @@ RSpec.describe Plugin::Instance do
end
end
- describe '#add_api_key_scope' do
+ describe "#add_api_key_scope" do
after { DiscoursePluginRegistry.reset! }
- it 'adds a custom api key scope' do
+ it "adds a custom api key scope" do
actions = %w[admin/groups#create]
subject.add_api_key_scope(:groups, create: { actions: actions })
- expect(ApiKeyScope.scope_mappings.dig(:groups, :create, :actions)).to contain_exactly(*actions)
+ expect(ApiKeyScope.scope_mappings.dig(:groups, :create, :actions)).to contain_exactly(
+ *actions,
+ )
end
end
- describe '#add_directory_column' do
+ describe "#add_directory_column" do
let!(:plugin) { Plugin::Instance.new }
- before do
- DirectoryItem.clear_plugin_queries
- end
+ before { DirectoryItem.clear_plugin_queries }
- after do
- DirectoryColumn.clear_plugin_directory_columns
- end
+ after { DirectoryColumn.clear_plugin_directory_columns }
describe "with valid column name" do
let(:column_name) { "random_c" }
@@ -619,42 +624,56 @@ RSpec.describe Plugin::Instance do
DiscourseEvent.all_off("before_directory_refresh")
end
- it 'creates a directory column record when directory items are refreshed' do
- plugin.add_directory_column(column_name, query: "SELECT COUNT(*) FROM users", icon: 'recycle')
- expect(DirectoryColumn.find_by(name: column_name, icon: 'recycle', enabled: false)).not_to be_present
+ it "creates a directory column record when directory items are refreshed" do
+ plugin.add_directory_column(
+ column_name,
+ query: "SELECT COUNT(*) FROM users",
+ icon: "recycle",
+ )
+ expect(
+ DirectoryColumn.find_by(name: column_name, icon: "recycle", enabled: false),
+ ).not_to be_present
DirectoryItem.refresh!
- expect(DirectoryColumn.find_by(name: column_name, icon: 'recycle', enabled: false)).to be_present
+ expect(
+ DirectoryColumn.find_by(name: column_name, icon: "recycle", enabled: false),
+ ).to be_present
end
end
- it 'errors when the column_name contains invalid characters' do
+ it "errors when the column_name contains invalid characters" do
expect {
- plugin.add_directory_column('Capital', query: "SELECT COUNT(*) FROM users", icon: 'recycle')
+ plugin.add_directory_column("Capital", query: "SELECT COUNT(*) FROM users", icon: "recycle")
}.to raise_error(RuntimeError)
expect {
- plugin.add_directory_column('has space', query: "SELECT COUNT(*) FROM users", icon: 'recycle')
+ plugin.add_directory_column(
+ "has space",
+ query: "SELECT COUNT(*) FROM users",
+ icon: "recycle",
+ )
}.to raise_error(RuntimeError)
expect {
- plugin.add_directory_column('has_number_1', query: "SELECT COUNT(*) FROM users", icon: 'recycle')
+ plugin.add_directory_column(
+ "has_number_1",
+ query: "SELECT COUNT(*) FROM users",
+ icon: "recycle",
+ )
}.to raise_error(RuntimeError)
end
end
- describe '#register_site_categories_callback' do
+ describe "#register_site_categories_callback" do
fab!(:category) { Fabricate(:category) }
- it 'adds a callback to the Site#categories' do
+ it "adds a callback to the Site#categories" do
instance = Plugin::Instance.new
site_guardian = Guardian.new
instance.register_site_categories_callback do |categories, guardian|
- categories.each do |category|
- category[:test_field] = "test"
- end
+ categories.each { |category| category[:test_field] = "test" }
expect(guardian).to eq(site_guardian)
end
@@ -668,35 +687,34 @@ RSpec.describe Plugin::Instance do
end
end
- describe '#register_notification_consolidation_plan' do
+ describe "#register_notification_consolidation_plan" do
let(:plugin) { Plugin::Instance.new }
fab!(:topic) { Fabricate(:topic) }
- after do
- DiscoursePluginRegistry.reset_register!(:notification_consolidation_plans)
- end
+ after { DiscoursePluginRegistry.reset_register!(:notification_consolidation_plans) }
- it 'fails when the received object is not a consolidation plan' do
- expect { plugin.register_notification_consolidation_plan(Object.new) }.to raise_error(ArgumentError)
- end
-
- it 'registers a consolidation plan and uses it' do
- plan = Notifications::ConsolidateNotifications.new(
- from: Notification.types[:code_review_commit_approved],
- to: Notification.types[:code_review_commit_approved],
- threshold: 1,
- consolidation_window: 1.minute,
- unconsolidated_query_blk: ->(notifications, _data) do
- notifications.where("(data::json ->> 'consolidated') IS NULL")
- end,
- consolidated_query_blk: ->(notifications, _data) do
- notifications.where("(data::json ->> 'consolidated') IS NOT NULL")
- end
- ).set_mutations(
- set_data_blk: ->(notification) do
- notification.data_hash.merge(consolidated: true)
- end
+ it "fails when the received object is not a consolidation plan" do
+ expect { plugin.register_notification_consolidation_plan(Object.new) }.to raise_error(
+ ArgumentError,
)
+ end
+
+ it "registers a consolidation plan and uses it" do
+ plan =
+ Notifications::ConsolidateNotifications.new(
+ from: Notification.types[:code_review_commit_approved],
+ to: Notification.types[:code_review_commit_approved],
+ threshold: 1,
+ consolidation_window: 1.minute,
+ unconsolidated_query_blk: ->(notifications, _data) {
+ notifications.where("(data::json ->> 'consolidated') IS NULL")
+ },
+ consolidated_query_blk: ->(notifications, _data) {
+ notifications.where("(data::json ->> 'consolidated') IS NOT NULL")
+ },
+ ).set_mutations(
+ set_data_blk: ->(notification) { notification.data_hash.merge(consolidated: true) },
+ )
plugin.register_notification_consolidation_plan(plan)
@@ -709,7 +727,10 @@ RSpec.describe Plugin::Instance do
end
def commit_approved_notifications
- Notification.where(user: topic.user, notification_type: Notification.types[:code_review_commit_approved])
+ Notification.where(
+ user: topic.user,
+ notification_type: Notification.types[:code_review_commit_approved],
+ )
end
def create_notification!
@@ -717,24 +738,25 @@ RSpec.describe Plugin::Instance do
notification_type: Notification.types[:code_review_commit_approved],
topic_id: topic.id,
user: topic.user,
- data: {}
+ data: {
+ },
)
end
end
- describe '#register_email_unsubscriber' do
+ describe "#register_email_unsubscriber" do
let(:plugin) { Plugin::Instance.new }
- after do
- DiscoursePluginRegistry.reset_register!(:email_unsubscribers)
- end
+ after { DiscoursePluginRegistry.reset_register!(:email_unsubscribers) }
it "doesn't let you override core unsubscribers" do
- expect { plugin.register_email_unsubscriber(UnsubscribeKey::ALL_TYPE, Object) }.to raise_error(ArgumentError)
+ expect {
+ plugin.register_email_unsubscriber(UnsubscribeKey::ALL_TYPE, Object)
+ }.to raise_error(ArgumentError)
end
it "finds the plugin's custom unsubscriber" do
- new_unsubscriber_type = 'new_type'
+ new_unsubscriber_type = "new_type"
key = UnsubscribeKey.new(unsubscribe_key_type: new_unsubscriber_type)
CustomUnsubscriber = Class.new(EmailControllerHelper::BaseEmailUnsubscriber)
@@ -747,30 +769,24 @@ RSpec.describe Plugin::Instance do
describe "#register_about_stat_group" do
let(:plugin) { Plugin::Instance.new }
- after do
- About.clear_plugin_stat_groups
- end
+ after { About.clear_plugin_stat_groups }
it "registers an about stat group correctly" do
- stats = { last_day: 1, "7_days" => 10, "30_days" => 100, count: 1000 }
- plugin.register_about_stat_group("some_group", show_in_ui: true) do
- stats
- end
+ stats = { :last_day => 1, "7_days" => 10, "30_days" => 100, :count => 1000 }
+ plugin.register_about_stat_group("some_group", show_in_ui: true) { stats }
expect(About.new.plugin_stats.with_indifferent_access).to match(
hash_including(
some_group_last_day: 1,
some_group_7_days: 10,
some_group_30_days: 100,
some_group_count: 1000,
- )
+ ),
)
end
it "hides the stat group from the UI by default" do
- stats = { last_day: 1, "7_days" => 10, "30_days" => 100, count: 1000 }
- plugin.register_about_stat_group("some_group") do
- stats
- end
+ stats = { :last_day => 1, "7_days" => 10, "30_days" => 100, :count => 1000 }
+ plugin.register_about_stat_group("some_group") { stats }
expect(About.displayed_plugin_stat_groups).to eq([])
end
end
@@ -778,9 +794,7 @@ RSpec.describe Plugin::Instance do
describe "#register_user_destroyer_on_content_deletion_callback" do
let(:plugin) { Plugin::Instance.new }
- after do
- DiscoursePluginRegistry.reset_register!(:user_destroyer_on_content_deletion_callbacks)
- end
+ after { DiscoursePluginRegistry.reset_register!(:user_destroyer_on_content_deletion_callbacks) }
fab!(:user) { Fabricate(:user) }
diff --git a/spec/lib/post_action_creator_spec.rb b/spec/lib/post_action_creator_spec.rb
index 6c66c50d1c8..4304febc949 100644
--- a/spec/lib/post_action_creator_spec.rb
+++ b/spec/lib/post_action_creator_spec.rb
@@ -6,9 +6,7 @@ RSpec.describe PostActionCreator do
fab!(:post) { Fabricate(:post) }
let(:like_type_id) { PostActionType.types[:like] }
- before do
- Group.refresh_automatic_groups!
- end
+ before { Group.refresh_automatic_groups! }
describe "rate limits" do
before do
@@ -22,15 +20,18 @@ RSpec.describe PostActionCreator do
PostActionCreator.like(user, post)
PostActionDestroyer.destroy(user, post, :like)
- expect {
- PostActionCreator.like(user, post)
- }.to raise_error(RateLimiter::LimitExceeded)
+ expect { PostActionCreator.like(user, post) }.to raise_error(RateLimiter::LimitExceeded)
end
end
describe "messaging" do
it "doesn't generate title longer than 255 characters" do
- topic = Fabricate(:topic, title: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc sit amet rutrum neque. Pellentesque suscipit vehicula facilisis. Phasellus lacus sapien, aliquam nec convallis sit amet, vestibulum laoreet ante. Curabitur et pellentesque tortor. Donec non.")
+ topic =
+ Fabricate(
+ :topic,
+ title:
+ "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc sit amet rutrum neque. Pellentesque suscipit vehicula facilisis. Phasellus lacus sapien, aliquam nec convallis sit amet, vestibulum laoreet ante. Curabitur et pellentesque tortor. Donec non.",
+ )
post = Fabricate(:post, topic: topic)
expect(PostActionCreator.notify_user(user, post, "WAT")).to be_success
@@ -53,8 +54,8 @@ RSpec.describe PostActionCreator do
end
end
- describe 'perform' do
- it 'creates a post action' do
+ describe "perform" do
+ it "creates a post action" do
result = PostActionCreator.new(user, post, like_type_id).perform
expect(result.success).to eq(true)
expect(result.post_action).to be_present
@@ -63,12 +64,11 @@ RSpec.describe PostActionCreator do
expect(result.post_action.post_action_type_id).to eq(like_type_id)
end
- it 'notifies subscribers' do
+ it "notifies subscribers" do
expect(post.reload.like_count).to eq(0)
- messages = MessageBus.track_publish do
- PostActionCreator.new(user, post, like_type_id).perform
- end
+ messages =
+ MessageBus.track_publish { PostActionCreator.new(user, post, like_type_id).perform }
message = messages.find { |msg| msg.data[:type] === :liked }.data
expect(message).to be_present
@@ -77,29 +77,32 @@ RSpec.describe PostActionCreator do
expect(message[:user_id]).to eq(user.id)
end
- it 'notifies updated topic stats to subscribers' do
+ it "notifies updated topic stats to subscribers" do
topic = Fabricate(:topic)
post = Fabricate(:post, topic: topic)
expect(post.reload.like_count).to eq(0)
- messages = MessageBus.track_publish("/topic/#{topic.id}") do
- PostActionCreator.new(user, post, like_type_id).perform
- end
+ messages =
+ MessageBus.track_publish("/topic/#{topic.id}") do
+ PostActionCreator.new(user, post, like_type_id).perform
+ end
stats_message = messages.select { |msg| msg.data[:type] == :stats }.first
expect(stats_message).to be_present
expect(stats_message.data[:like_count]).to eq(1)
end
- it 'does not create an invalid post action' do
+ it "does not create an invalid post action" do
result = PostActionCreator.new(user, nil, like_type_id).perform
expect(result.failed?).to eq(true)
end
- it 'does not create a double like notification' do
+ it "does not create a double like notification" do
PostActionNotifier.enable
- post.user.user_option.update!(like_notification_frequency: UserOption.like_notification_frequency_type[:always])
+ post.user.user_option.update!(
+ like_notification_frequency: UserOption.like_notification_frequency_type[:always],
+ )
expect(PostActionCreator.new(user, post, like_type_id).perform.success).to eq(true)
expect(PostActionDestroyer.new(user, post, like_type_id).perform.success).to eq(true)
@@ -107,16 +110,16 @@ RSpec.describe PostActionCreator do
notification = Notification.last
notification_data = JSON.parse(notification.data)
- expect(notification_data['display_username']).to eq(user.username)
- expect(notification_data['username2']).to eq(nil)
+ expect(notification_data["display_username"]).to eq(user.username)
+ expect(notification_data["username2"]).to eq(nil)
end
- it 'does not create a notification if silent mode is enabled' do
+ it "does not create a notification if silent mode is enabled" do
PostActionNotifier.enable
- expect(
- PostActionCreator.new(user, post, like_type_id, silent: true).perform.success
- ).to eq(true)
+ expect(PostActionCreator.new(user, post, like_type_id, silent: true).perform.success).to eq(
+ true,
+ )
expect(Notification.where(notification_type: Notification.types[:liked]).exists?).to eq(false)
end
@@ -153,7 +156,7 @@ RSpec.describe PostActionCreator do
expect(post.hidden?).to eq(true)
end
- it 'does not hide the post if the setting is disabled' do
+ it "does not hide the post if the setting is disabled" do
SiteSetting.high_trust_flaggers_auto_hide_posts = false
result = PostActionCreator.create(user, post, :spam)
@@ -161,7 +164,7 @@ RSpec.describe PostActionCreator do
expect(post.hidden?).to eq(false)
end
- it 'sets the force_review field' do
+ it "sets the force_review field" do
result = PostActionCreator.create(user, post, :spam)
reviewable = result.reviewable
@@ -171,9 +174,9 @@ RSpec.describe PostActionCreator do
end
context "with existing reviewable" do
- let!(:reviewable) {
+ let!(:reviewable) do
PostActionCreator.create(Fabricate(:user), post, :inappropriate).reviewable
- }
+ end
it "appends to an existing reviewable if exists" do
result = PostActionCreator.create(user, post, :inappropriate)
@@ -241,17 +244,14 @@ RSpec.describe PostActionCreator do
end
describe "take_action" do
- before do
- PostActionCreator.create(Fabricate(:user), post, :inappropriate)
- end
+ before { PostActionCreator.create(Fabricate(:user), post, :inappropriate) }
it "will agree with the old reviewable" do
- reviewable = PostActionCreator.new(
- Fabricate(:moderator),
- post,
- PostActionType.types[:spam],
- take_action: true
- ).perform.reviewable
+ reviewable =
+ PostActionCreator
+ .new(Fabricate(:moderator), post, PostActionType.types[:spam], take_action: true)
+ .perform
+ .reviewable
scores = reviewable.reviewable_scores
expect(scores[0]).to be_agreed
expect(scores[1]).to be_agreed
@@ -260,27 +260,30 @@ RSpec.describe PostActionCreator do
end
describe "queue_for_review" do
- it 'fails if the user is not a staff member' do
- creator = PostActionCreator.new(
- user, post,
- PostActionType.types[:notify_moderators], queue_for_review: true
- )
+ it "fails if the user is not a staff member" do
+ creator =
+ PostActionCreator.new(
+ user,
+ post,
+ PostActionType.types[:notify_moderators],
+ queue_for_review: true,
+ )
result = creator.perform
expect(result.success?).to eq(false)
end
- it 'creates a new reviewable and hides the post' do
+ it "creates a new reviewable and hides the post" do
result = build_creator.perform
expect(result.success?).to eq(true)
score = result.reviewable.reviewable_scores.last
- expect(score.reason).to eq('queued_by_staff')
+ expect(score.reason).to eq("queued_by_staff")
expect(post.reload.hidden?).to eq(true)
end
- it 'hides the topic even if it has replies' do
+ it "hides the topic even if it has replies" do
Fabricate(:post, topic: post.topic)
result = build_creator.perform
@@ -290,8 +293,10 @@ RSpec.describe PostActionCreator do
def build_creator
PostActionCreator.new(
- admin, post,
- PostActionType.types[:notify_moderators], queue_for_review: true
+ admin,
+ post,
+ PostActionType.types[:notify_moderators],
+ queue_for_review: true,
)
end
end
diff --git a/spec/lib/post_action_destroyer_spec.rb b/spec/lib/post_action_destroyer_spec.rb
index f381897b81d..661d8903f9f 100644
--- a/spec/lib/post_action_destroyer_spec.rb
+++ b/spec/lib/post_action_destroyer_spec.rb
@@ -5,25 +5,21 @@ RSpec.describe PostActionDestroyer do
fab!(:user) { Fabricate(:user) }
fab!(:post) { Fabricate(:post) }
- describe '#perform' do
- context 'with like' do
- context 'when post action exists' do
- before do
- PostActionCreator.new(user, post, PostActionType.types[:like]).perform
+ describe "#perform" do
+ context "with like" do
+ context "when post action exists" do
+ before { PostActionCreator.new(user, post, PostActionType.types[:like]).perform }
+
+ it "destroys the post action" do
+ expect { PostActionDestroyer.destroy(user, post, :like) }.to change {
+ PostAction.count
+ }.by(-1)
end
- it 'destroys the post action' do
- expect {
- PostActionDestroyer.destroy(user, post, :like)
- }.to change { PostAction.count }.by(-1)
- end
-
- it 'notifies subscribers' do
+ it "notifies subscribers" do
expect(post.reload.like_count).to eq(1)
- messages = MessageBus.track_publish do
- PostActionDestroyer.destroy(user, post, :like)
- end
+ messages = MessageBus.track_publish { PostActionDestroyer.destroy(user, post, :like) }
message = messages.find { |msg| msg.data[:type] === :unliked }.data
expect(message).to be_present
@@ -32,16 +28,17 @@ RSpec.describe PostActionDestroyer do
expect(message[:user_id]).to eq(user.id)
end
- it 'notifies updated topic stats to subscribers' do
+ it "notifies updated topic stats to subscribers" do
topic = Fabricate(:topic)
post = Fabricate(:post, topic: topic)
PostActionCreator.new(user, post, PostActionType.types[:like]).perform
expect(post.reload.like_count).to eq(1)
- messages = MessageBus.track_publish("/topic/#{topic.id}") do
- PostActionDestroyer.destroy(user, post, :like)
- end
+ messages =
+ MessageBus.track_publish("/topic/#{topic.id}") do
+ PostActionDestroyer.destroy(user, post, :like)
+ end
stats_message = messages.select { |msg| msg.data[:type] == :stats }.first
expect(stats_message).to be_present
@@ -49,8 +46,8 @@ RSpec.describe PostActionDestroyer do
end
end
- context 'when post action doesn’t exist' do
- it 'fails' do
+ context "when post action doesn’t exist" do
+ it "fails" do
result = PostActionDestroyer.destroy(user, post, :like)
expect(result.success).to eq(false)
expect(result.not_found).to eq(true)
@@ -58,21 +55,17 @@ RSpec.describe PostActionDestroyer do
end
end
- context 'with any other notifiable type' do
- before do
- PostActionCreator.new(user, post, PostActionType.types[:spam]).perform
+ context "with any other notifiable type" do
+ before { PostActionCreator.new(user, post, PostActionType.types[:spam]).perform }
+
+ it "destroys the post action" do
+ expect { PostActionDestroyer.destroy(user, post, :spam) }.to change { PostAction.count }.by(
+ -1,
+ )
end
- it 'destroys the post action' do
- expect {
- PostActionDestroyer.destroy(user, post, :spam)
- }.to change { PostAction.count }.by(-1)
- end
-
- it 'notifies subscribers' do
- messages = MessageBus.track_publish do
- PostActionDestroyer.destroy(user, post, :spam)
- end
+ it "notifies subscribers" do
+ messages = MessageBus.track_publish { PostActionDestroyer.destroy(user, post, :spam) }
expect(messages.last.data[:type]).to eq(:acted)
end
diff --git a/spec/lib/post_creator_spec.rb b/spec/lib/post_creator_spec.rb
index daac32148ce..4dc8bdde0d1 100644
--- a/spec/lib/post_creator_spec.rb
+++ b/spec/lib/post_creator_spec.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
-require 'post_creator'
-require 'topic_subtype'
+require "post_creator"
+require "topic_subtype"
RSpec.describe PostCreator do
fab!(:user) { Fabricate(:user) }
@@ -12,19 +12,42 @@ RSpec.describe PostCreator do
describe "new topic" do
fab!(:category) { Fabricate(:category, user: user) }
- let(:basic_topic_params) { { title: "hello world topic", raw: "my name is fred", archetype_id: 1, advance_draft: true } }
- let(:image_sizes) { { 'http://an.image.host/image.jpg' => { "width" => 111, "height" => 222 } } }
+ let(:basic_topic_params) do
+ { title: "hello world topic", raw: "my name is fred", archetype_id: 1, advance_draft: true }
+ end
+ let(:image_sizes) do
+ { "http://an.image.host/image.jpg" => { "width" => 111, "height" => 222 } }
+ end
let(:creator) { PostCreator.new(user, basic_topic_params) }
- let(:creator_with_category) { PostCreator.new(user, basic_topic_params.merge(category: category.id)) }
- let(:creator_with_meta_data) { PostCreator.new(user, basic_topic_params.merge(meta_data: { hello: "world" })) }
- let(:creator_with_image_sizes) { PostCreator.new(user, basic_topic_params.merge(image_sizes: image_sizes)) }
- let(:creator_with_featured_link) { PostCreator.new(user, title: "featured link topic", archetype_id: 1, featured_link: "http://www.discourse.org", raw: "http://www.discourse.org") }
+ let(:creator_with_category) do
+ PostCreator.new(user, basic_topic_params.merge(category: category.id))
+ end
+ let(:creator_with_meta_data) do
+ PostCreator.new(user, basic_topic_params.merge(meta_data: { hello: "world" }))
+ end
+ let(:creator_with_image_sizes) do
+ PostCreator.new(user, basic_topic_params.merge(image_sizes: image_sizes))
+ end
+ let(:creator_with_featured_link) do
+ PostCreator.new(
+ user,
+ title: "featured link topic",
+ archetype_id: 1,
+ featured_link: "http://www.discourse.org",
+ raw: "http://www.discourse.org",
+ )
+ end
it "can create a topic with null byte central" do
- post = PostCreator.create(user, title: "hello\u0000world this is title", raw: "this is my\u0000 first topic")
- expect(post.raw).to eq 'this is my first topic'
- expect(post.topic.title).to eq 'Helloworld this is title'
+ post =
+ PostCreator.create(
+ user,
+ title: "hello\u0000world this is title",
+ raw: "this is my\u0000 first topic",
+ )
+ expect(post.raw).to eq "this is my first topic"
+ expect(post.topic.title).to eq "Helloworld this is title"
end
it "can be created with auto tracking disabled" do
@@ -68,7 +91,11 @@ RSpec.describe PostCreator do
end
it "can be created with custom fields" do
- post = PostCreator.create(user, basic_topic_params.merge(topic_opts: { custom_fields: { hello: "world" } }))
+ post =
+ PostCreator.create(
+ user,
+ basic_topic_params.merge(topic_opts: { custom_fields: { hello: "world" } }),
+ )
expect(post.topic.custom_fields).to eq("hello" => "world")
end
@@ -80,7 +107,7 @@ RSpec.describe PostCreator do
end
context "with invalid title" do
- let(:creator_invalid_title) { PostCreator.new(user, basic_topic_params.merge(title: 'a')) }
+ let(:creator_invalid_title) { PostCreator.new(user, basic_topic_params.merge(title: "a")) }
it "has errors" do
creator_invalid_title.create
@@ -89,7 +116,7 @@ RSpec.describe PostCreator do
end
context "with invalid raw" do
- let(:creator_invalid_raw) { PostCreator.new(user, basic_topic_params.merge(raw: '')) }
+ let(:creator_invalid_raw) { PostCreator.new(user, basic_topic_params.merge(raw: "")) }
it "has errors" do
creator_invalid_raw.create
@@ -134,24 +161,37 @@ RSpec.describe PostCreator do
expect(events).to include(
event_name: :before_create_post,
- params: [creator.post, creator.opts]
+ params: [creator.post, creator.opts],
)
end
it "does not notify on system messages" do
- messages = MessageBus.track_publish do
- p = PostCreator.create(admin, basic_topic_params.merge(post_type: Post.types[:moderator_action]))
- PostCreator.create(admin, basic_topic_params.merge(topic_id: p.topic_id, post_type: Post.types[:moderator_action]))
- end
+ messages =
+ MessageBus.track_publish do
+ p =
+ PostCreator.create(
+ admin,
+ basic_topic_params.merge(post_type: Post.types[:moderator_action]),
+ )
+ PostCreator.create(
+ admin,
+ basic_topic_params.merge(
+ topic_id: p.topic_id,
+ post_type: Post.types[:moderator_action],
+ ),
+ )
+ end
# don't notify on system messages they introduce too much noise
channels = messages.map(&:channel)
expect(channels.find { |s| s =~ /unread/ }).to eq(nil)
expect(channels.find { |s| s =~ /new/ }).to eq(nil)
end
- it 'enqueues job to generate messages' do
+ it "enqueues job to generate messages" do
p = creator.create
- expect(job_enqueued?(job: :post_update_topic_tracking_state, args: { post_id: p.id })).to eq(true)
+ expect(
+ job_enqueued?(job: :post_update_topic_tracking_state, args: { post_id: p.id }),
+ ).to eq(true)
end
it "generates the correct messages for a secure topic" do
@@ -170,11 +210,18 @@ RSpec.describe PostCreator do
created_post = nil
other_user_tracking_topic = nil
- messages = MessageBus.track_publish do
- created_post = PostCreator.new(admin, basic_topic_params.merge(category: cat.id)).create
- Fabricate(:topic_user_tracking, topic: created_post.topic, user: other_admin)
- _reply = PostCreator.new(admin, raw: "this is my test reply 123 testing", topic_id: created_post.topic_id, advance_draft: true).create
- end
+ messages =
+ MessageBus.track_publish do
+ created_post = PostCreator.new(admin, basic_topic_params.merge(category: cat.id)).create
+ Fabricate(:topic_user_tracking, topic: created_post.topic, user: other_admin)
+ _reply =
+ PostCreator.new(
+ admin,
+ raw: "this is my test reply 123 testing",
+ topic_id: created_post.topic_id,
+ advance_draft: true,
+ ).create
+ end
messages.filter! { |m| m.channel != "/distributed_hash" }
@@ -196,21 +243,24 @@ RSpec.describe PostCreator do
"/user-drafts/#{admin.id}",
"/user-drafts/#{admin.id}",
"/user-drafts/#{admin.id}",
- ].sort
+ ].sort,
)
admin_ids = [Group[:admins].id]
- expect(messages.any? { |m| m.group_ids != admin_ids && (!m.user_ids.include?(other_admin.id) && !m.user_ids.include?(admin.id)) }).to eq(false)
+ expect(
+ messages.any? do |m|
+ m.group_ids != admin_ids &&
+ (!m.user_ids.include?(other_admin.id) && !m.user_ids.include?(admin.id))
+ end,
+ ).to eq(false)
end
- it 'generates the correct messages for a normal topic' do
+ it "generates the correct messages for a normal topic" do
Jobs.run_immediately!
UserActionManager.enable
p = nil
- messages = MessageBus.track_publish do
- p = creator.create
- end
+ messages = MessageBus.track_publish { p = creator.create }
latest = messages.find { |m| m.channel == "/latest" }
expect(latest).not_to eq(nil)
@@ -227,19 +277,20 @@ RSpec.describe PostCreator do
draft_count = messages.find { |m| m.channel == "/user-drafts/#{p.user_id}" }
expect(draft_count).not_to eq(nil)
- topics_stats = messages.find { |m| m.channel == "/topic/#{p.topic.id}" && m.data[:type] == :stats }
+ topics_stats =
+ messages.find { |m| m.channel == "/topic/#{p.topic.id}" && m.data[:type] == :stats }
expect(topics_stats).to eq(nil)
expect(messages.filter { |m| m.channel != "/distributed_hash" }.length).to eq(7)
end
- it 'extracts links from the post' do
+ it "extracts links from the post" do
create_post(raw: "this is a link to the best site at https://google.com")
creator.create
expect(TopicLink.count).to eq(1)
end
- it 'queues up post processing job when saved' do
+ it "queues up post processing job when saved" do
creator.create
post = Post.last
@@ -261,45 +312,49 @@ RSpec.describe PostCreator do
expect(notify_mailing_list_subscribers_args["post_id"]).to eq(post_id)
end
- it 'passes the invalidate_oneboxes along to the job if present' do
+ it "passes the invalidate_oneboxes along to the job if present" do
creator.opts[:invalidate_oneboxes] = true
creator.create
expect(job_enqueued?(job: :process_post, args: { invalidate_oneboxes: true })).to eq(true)
end
- it 'passes the image_sizes along to the job if present' do
- image_sizes = { 'http://an.image.host/image.jpg' => { 'width' => 17, 'height' => 31 } }
+ it "passes the image_sizes along to the job if present" do
+ image_sizes = { "http://an.image.host/image.jpg" => { "width" => 17, "height" => 31 } }
creator.opts[:image_sizes] = image_sizes
creator.create
expect(job_enqueued?(job: :process_post, args: { image_sizes: image_sizes })).to eq(true)
end
- it 'assigns a category when supplied' do
+ it "assigns a category when supplied" do
expect(creator_with_category.create.topic.category).to eq(category)
end
- it 'adds meta data from the post' do
- expect(creator_with_meta_data.create.topic.meta_data['hello']).to eq('world')
+ it "adds meta data from the post" do
+ expect(creator_with_meta_data.create.topic.meta_data["hello"]).to eq("world")
end
- it 'passes the image sizes through' do
+ it "passes the image sizes through" do
Post.any_instance.expects(:image_sizes=).with(image_sizes)
creator_with_image_sizes.create
end
- it 'sets topic excerpt if first post, but not second post' do
+ it "sets topic excerpt if first post, but not second post" do
first_post = creator.create
topic = first_post.topic.reload
expect(topic.excerpt).to be_present
expect {
- PostCreator.new(first_post.user, topic_id: first_post.topic_id, raw: "this is the second post").create
+ PostCreator.new(
+ first_post.user,
+ topic_id: first_post.topic_id,
+ raw: "this is the second post",
+ ).create
topic.reload
}.to_not change { topic.excerpt }
end
- it 'supports custom excerpts' do
+ it "supports custom excerpts" do
raw = <<~MD
I am
@@ -314,7 +369,7 @@ RSpec.describe PostCreator do
expect(post.excerpt).to eq("I am\na custom excerpt")
end
- it 'creates post stats' do
+ it "creates post stats" do
Draft.set(user, Draft::NEW_TOPIC, 0, "test")
Draft.set(user, Draft::NEW_TOPIC, 0, "test1")
expect(user.user_stat.draft_count).to eq(1)
@@ -330,16 +385,16 @@ RSpec.describe PostCreator do
end
end
- it 'clears the draft if advanced_draft is true' do
+ it "clears the draft if advanced_draft is true" do
creator = PostCreator.new(user, basic_topic_params.merge(advance_draft: true))
- Draft.set(user, Draft::NEW_TOPIC, 0, 'test')
+ Draft.set(user, Draft::NEW_TOPIC, 0, "test")
expect(Draft.where(user: user).size).to eq(1)
expect { creator.create }.to change { Draft.count }.by(-1)
end
- it 'does not clear the draft if advanced_draft is false' do
+ it "does not clear the draft if advanced_draft is false" do
creator = PostCreator.new(user, basic_topic_params.merge(advance_draft: false))
- Draft.set(user, Draft::NEW_TOPIC, 0, 'test')
+ Draft.set(user, Draft::NEW_TOPIC, 0, "test")
expect(Draft.where(user: user).size).to eq(1)
expect { creator.create }.not_to change { Draft.count }
end
@@ -353,25 +408,29 @@ RSpec.describe PostCreator do
expect(topic.word_count).to eq(4)
end
- it 'creates a post with featured link' do
+ it "creates a post with featured link" do
SiteSetting.topic_featured_link_enabled = true
SiteSetting.min_first_post_length = 100
post = creator_with_featured_link.create
- expect(post.topic.featured_link).to eq('http://www.discourse.org')
+ expect(post.topic.featured_link).to eq("http://www.discourse.org")
expect(post.valid?).to eq(true)
end
- it 'allows notification email to be skipped' do
+ it "allows notification email to be skipped" do
user_2 = Fabricate(:user)
- creator = PostCreator.new(user,
- title: 'hi there welcome to my topic',
- raw: "this is my awesome message @#{user_2.username_lower}",
- archetype: Archetype.private_message,
- target_usernames: [user_2.username],
- post_alert_options: { skip_send_email: true }
- )
+ creator =
+ PostCreator.new(
+ user,
+ title: "hi there welcome to my topic",
+ raw: "this is my awesome message @#{user_2.username_lower}",
+ archetype: Archetype.private_message,
+ target_usernames: [user_2.username],
+ post_alert_options: {
+ skip_send_email: true,
+ },
+ )
NotificationEmailer.expects(:process_notification).never
@@ -393,29 +452,24 @@ RSpec.describe PostCreator do
describe "topic's auto close based on last post" do
fab!(:topic_timer) do
- Fabricate(:topic_timer,
+ Fabricate(
+ :topic_timer,
based_on_last_post: true,
execute_at: Time.zone.now - 12.hours,
created_at: Time.zone.now - 24.hours,
- duration_minutes: 12 * 60
+ duration_minutes: 12 * 60,
)
end
let(:topic) { topic_timer.topic }
- fab!(:post) do
- Fabricate(:post, topic: topic_timer.topic)
- end
+ fab!(:post) { Fabricate(:post, topic: topic_timer.topic) }
it "updates topic's auto close date" do
freeze_time
post
- PostCreator.new(
- topic.user,
- topic_id: topic.id,
- raw: "this is a second post"
- ).create
+ PostCreator.new(topic.user, topic_id: topic.id, raw: "this is a second post").create
topic_timer.reload
@@ -424,26 +478,22 @@ RSpec.describe PostCreator do
end
describe "when auto_close_topics_post_count has been reached" do
- before do
- SiteSetting.auto_close_topics_post_count = 2
- end
+ before { SiteSetting.auto_close_topics_post_count = 2 }
it "closes the topic and deletes the topic timer" do
freeze_time
post
- PostCreator.new(
- topic.user,
- topic_id: topic.id,
- raw: "this is a second post"
- ).create
+ PostCreator.new(topic.user, topic_id: topic.id, raw: "this is a second post").create
topic.reload
- expect(topic.posts.last.raw).to eq(I18n.t(
- 'topic_statuses.autoclosed_topic_max_posts',
- count: SiteSetting.auto_close_topics_post_count
- ))
+ expect(topic.posts.last.raw).to eq(
+ I18n.t(
+ "topic_statuses.autoclosed_topic_max_posts",
+ count: SiteSetting.auto_close_topics_post_count,
+ ),
+ )
expect(topic.closed).to eq(true)
expect(topic_timer.reload.deleted_at).to eq_time(Time.zone.now)
@@ -453,42 +503,41 @@ RSpec.describe PostCreator do
post
I18n.with_locale(:fr) do
- PostCreator.new(
- topic.user,
- topic_id: topic.id,
- raw: "this is a second post"
- ).create
+ PostCreator.new(topic.user, topic_id: topic.id, raw: "this is a second post").create
end
topic.reload
- expect(topic.posts.last.raw).to eq(I18n.t(
- 'topic_statuses.autoclosed_topic_max_posts',
- count: SiteSetting.auto_close_topics_post_count,
- locale: :en
- ))
+ expect(topic.posts.last.raw).to eq(
+ I18n.t(
+ "topic_statuses.autoclosed_topic_max_posts",
+ count: SiteSetting.auto_close_topics_post_count,
+ locale: :en,
+ ),
+ )
end
describe "auto_close_topics_create_linked_topic is enabled" do
- before do
- SiteSetting.auto_close_topics_create_linked_topic = true
- end
+ before { SiteSetting.auto_close_topics_create_linked_topic = true }
it "enqueues a job to create a new linked topic" do
freeze_time
post
- post_2 = PostCreator.new(
- topic.user,
- topic_id: topic.id,
- raw: "this is a second post"
- ).create
+ post_2 =
+ PostCreator.new(
+ topic.user,
+ topic_id: topic.id,
+ raw: "this is a second post",
+ ).create
topic.reload
expect(topic.closed).to eq(true)
expect(topic_timer.reload.deleted_at).to eq_time(Time.zone.now)
- expect(job_enqueued?(job: :create_linked_topic, args: { post_id: post_2.id })).to eq(true)
+ expect(
+ job_enqueued?(job: :create_linked_topic, args: { post_id: post_2.id }),
+ ).to eq(true)
end
end
end
@@ -496,13 +545,11 @@ RSpec.describe PostCreator do
end
context "with tags" do
- let(:tag_names) { ['art', 'science', 'dance'] }
+ let(:tag_names) { %w[art science dance] }
let(:creator_with_tags) { PostCreator.new(user, basic_topic_params.merge(tags: tag_names)) }
context "with tagging disabled" do
- before do
- SiteSetting.tagging_enabled = false
- end
+ before { SiteSetting.tagging_enabled = false }
it "doesn't create tags" do
expect { @post = creator_with_tags.create }.not_to change { Tag.count }
@@ -511,9 +558,7 @@ RSpec.describe PostCreator do
end
context "with tagging enabled" do
- before do
- SiteSetting.tagging_enabled = true
- end
+ before { SiteSetting.tagging_enabled = true }
context "when can create tags" do
before do
@@ -529,7 +574,9 @@ RSpec.describe PostCreator do
it "creates missing tags if some exist" do
_existing_tag1 = Fabricate(:tag, name: tag_names[0])
_existing_tag1 = Fabricate(:tag, name: tag_names[1])
- expect { @post = creator_with_tags.create }.to change { Tag.count }.by(tag_names.size - 2)
+ expect { @post = creator_with_tags.create }.to change { Tag.count }.by(
+ tag_names.size - 2,
+ )
expect(@post.topic.tags.map(&:name).sort).to eq(tag_names.sort)
end
end
@@ -551,30 +598,56 @@ RSpec.describe PostCreator do
before do
SiteSetting.min_trust_to_create_tag = 0
SiteSetting.min_trust_level_to_tag_topics = 0
- Fabricate(:tag, name: 'greetings')
- Fabricate(:tag, name: 'hey')
- Fabricate(:tag, name: 'about-art')
- Fabricate(:tag, name: 'about-artists')
+ Fabricate(:tag, name: "greetings")
+ Fabricate(:tag, name: "hey")
+ Fabricate(:tag, name: "about-art")
+ Fabricate(:tag, name: "about-artists")
end
context "without regular expressions" do
it "works with many tags" do
- Fabricate(:watched_word, action: WatchedWord.actions[:tag], word: "HELLO", replacement: "greetings,hey")
+ Fabricate(
+ :watched_word,
+ action: WatchedWord.actions[:tag],
+ word: "HELLO",
+ replacement: "greetings,hey",
+ )
@post = creator.create
- expect(@post.topic.tags.map(&:name)).to match_array(['greetings', 'hey'])
+ expect(@post.topic.tags.map(&:name)).to match_array(%w[greetings hey])
end
it "works with overlapping words" do
- Fabricate(:watched_word, action: WatchedWord.actions[:tag], word: "art", replacement: "about-art")
- Fabricate(:watched_word, action: WatchedWord.actions[:tag], word: "artist*", replacement: "about-artists")
+ Fabricate(
+ :watched_word,
+ action: WatchedWord.actions[:tag],
+ word: "art",
+ replacement: "about-art",
+ )
+ Fabricate(
+ :watched_word,
+ action: WatchedWord.actions[:tag],
+ word: "artist*",
+ replacement: "about-artists",
+ )
- post = PostCreator.new(user, title: "hello world topic", raw: "this is topic abour artists", archetype_id: 1).create
- expect(post.topic.tags.map(&:name)).to match_array(['about-artists'])
+ post =
+ PostCreator.new(
+ user,
+ title: "hello world topic",
+ raw: "this is topic abour artists",
+ archetype_id: 1,
+ ).create
+ expect(post.topic.tags.map(&:name)).to match_array(["about-artists"])
end
it "does not treat as regular expressions" do
- Fabricate(:watched_word, action: WatchedWord.actions[:tag], word: "he(llo|y)", replacement: "greetings,hey")
+ Fabricate(
+ :watched_word,
+ action: WatchedWord.actions[:tag],
+ word: "he(llo|y)",
+ replacement: "greetings,hey",
+ )
@post = creator_with_tags.create
expect(@post.topic.tags.map(&:name)).to match_array(tag_names)
@@ -584,10 +657,15 @@ RSpec.describe PostCreator do
context "with regular expressions" do
it "works" do
SiteSetting.watched_words_regular_expressions = true
- Fabricate(:watched_word, action: WatchedWord.actions[:tag], word: "he(llo|y)", replacement: "greetings,hey")
+ Fabricate(
+ :watched_word,
+ action: WatchedWord.actions[:tag],
+ word: "he(llo|y)",
+ replacement: "greetings,hey",
+ )
@post = creator_with_tags.create
- expect(@post.topic.tags.map(&:name)).to match_array(tag_names + ['greetings', 'hey'])
+ expect(@post.topic.tags.map(&:name)).to match_array(tag_names + %w[greetings hey])
end
end
end
@@ -595,8 +673,8 @@ RSpec.describe PostCreator do
end
end
- context 'when auto-close param is given' do
- it 'ensures the user can auto-close the topic, but ignores auto-close param silently' do
+ context "when auto-close param is given" do
+ it "ensures the user can auto-close the topic, but ignores auto-close param silently" do
Guardian.any_instance.stubs(:can_moderate?).returns(false)
expect {
PostCreator.new(user, basic_topic_params.merge(auto_close_time: 2)).create!
@@ -605,28 +683,27 @@ RSpec.describe PostCreator do
end
end
- describe 'whisper' do
+ describe "whisper" do
fab!(:topic) { Fabricate(:topic, user: user) }
- it 'whispers do not mess up the public view' do
+ it "whispers do not mess up the public view" do
# turns out this can fail on leap years if we don't do this
- freeze_time DateTime.parse('2010-01-01 12:00')
+ freeze_time DateTime.parse("2010-01-01 12:00")
- first = PostCreator.new(
- user,
- topic_id: topic.id,
- raw: 'this is the first post'
- ).create
+ first = PostCreator.new(user, topic_id: topic.id, raw: "this is the first post").create
freeze_time 1.year.from_now
user_stat = user.user_stat
- whisper = PostCreator.new(user,
- topic_id: topic.id,
- reply_to_post_number: 1,
- post_type: Post.types[:whisper],
- raw: 'this is a whispered reply').create
+ whisper =
+ PostCreator.new(
+ user,
+ topic_id: topic.id,
+ reply_to_post_number: 1,
+ post_type: Post.types[:whisper],
+ raw: "this is a whispered reply",
+ ).create
# don't count whispers in user stats
expect(user_stat.reload.post_count).to eq(0)
@@ -634,11 +711,14 @@ RSpec.describe PostCreator do
expect(whisper).to be_present
expect(whisper.post_type).to eq(Post.types[:whisper])
- whisper_reply = PostCreator.new(user,
- topic_id: topic.id,
- reply_to_post_number: whisper.post_number,
- post_type: Post.types[:regular],
- raw: 'replying to a whisper this time').create
+ whisper_reply =
+ PostCreator.new(
+ user,
+ topic_id: topic.id,
+ reply_to_post_number: whisper.post_number,
+ post_type: Post.types[:regular],
+ raw: "replying to a whisper this time",
+ ).create
expect(whisper_reply).to be_present
expect(whisper_reply.post_type).to eq(Post.types[:whisper])
@@ -670,7 +750,7 @@ RSpec.describe PostCreator do
highest_staff_post_number: 0,
highest_post_number: 0,
posts_count: 0,
- last_posted_at: 1.year.ago
+ last_posted_at: 1.year.ago,
)
Topic.reset_highest(topic.id)
@@ -683,26 +763,24 @@ RSpec.describe PostCreator do
end
end
- describe 'silent' do
+ describe "silent" do
fab!(:topic) { Fabricate(:topic, user: user) }
- it 'silent do not mess up the public view' do
- freeze_time DateTime.parse('2010-01-01 12:00')
+ it "silent do not mess up the public view" do
+ freeze_time DateTime.parse("2010-01-01 12:00")
- first = PostCreator.new(
- user,
- topic_id: topic.id,
- raw: 'this is the first post'
- ).create
+ first = PostCreator.new(user, topic_id: topic.id, raw: "this is the first post").create
freeze_time 1.year.from_now
- PostCreator.new(user,
+ PostCreator.new(
+ user,
topic_id: topic.id,
reply_to_post_number: 1,
silent: true,
post_type: Post.types[:regular],
- raw: 'this is a whispered reply').create
+ raw: "this is a whispered reply",
+ ).create
topic.reload
@@ -713,9 +791,9 @@ RSpec.describe PostCreator do
end
end
- describe 'uniqueness' do
+ describe "uniqueness" do
fab!(:topic) { Fabricate(:topic, user: user) }
- let(:basic_topic_params) { { raw: 'test reply', topic_id: topic.id, reply_to_post_number: 4 } }
+ let(:basic_topic_params) { { raw: "test reply", topic_id: topic.id, reply_to_post_number: 4 } }
let(:creator) { PostCreator.new(user, basic_topic_params) }
context "when disabled" do
@@ -730,12 +808,10 @@ RSpec.describe PostCreator do
end
end
- context 'when enabled' do
+ context "when enabled" do
let(:new_post_creator) { PostCreator.new(user, basic_topic_params) }
- before do
- SiteSetting.unique_posts_mins = 10
- end
+ before { SiteSetting.unique_posts_mins = 10 }
it "fails for dupe post across topic" do
first = create_post(raw: "this is a test #{SecureRandom.hex}")
@@ -771,17 +847,14 @@ RSpec.describe PostCreator do
expect(new_post_creator.errors).to be_blank
end
end
-
end
describe "host spam" do
fab!(:topic) { Fabricate(:topic, user: user) }
- let(:basic_topic_params) { { raw: 'test reply', topic_id: topic.id, reply_to_post_number: 4 } }
+ let(:basic_topic_params) { { raw: "test reply", topic_id: topic.id, reply_to_post_number: 4 } }
let(:creator) { PostCreator.new(user, basic_topic_params) }
- before do
- Post.any_instance.expects(:has_host_spam?).returns(true)
- end
+ before { Post.any_instance.expects(:has_host_spam?).returns(true) }
it "does not create the post" do
GroupMessage.stubs(:create)
@@ -792,27 +865,31 @@ RSpec.describe PostCreator do
end
it "sends a message to moderators" do
- GroupMessage.expects(:create).with do |group_name, msg_type, params|
- group_name == (Group[:moderators].name) && msg_type == (:spam_post_blocked) && params[:user].id == (user.id)
- end
+ GroupMessage
+ .expects(:create)
+ .with do |group_name, msg_type, params|
+ group_name == (Group[:moderators].name) && msg_type == (:spam_post_blocked) &&
+ params[:user].id == (user.id)
+ end
creator.create
end
- it 'does not create a reviewable post if the review_every_post setting is enabled' do
+ it "does not create a reviewable post if the review_every_post setting is enabled" do
SiteSetting.review_every_post = true
GroupMessage.stubs(:create)
expect { creator.create }.not_to change(ReviewablePost, :count)
end
-
end
# more integration testing ... maximise our testing
- describe 'existing topic' do
- fab!(:topic) { Fabricate(:topic, user: user, title: 'topic title with 25 chars') }
- let(:creator) { PostCreator.new(user, raw: 'test reply', topic_id: topic.id, reply_to_post_number: 4) }
+ describe "existing topic" do
+ fab!(:topic) { Fabricate(:topic, user: user, title: "topic title with 25 chars") }
+ let(:creator) do
+ PostCreator.new(user, raw: "test reply", topic_id: topic.id, reply_to_post_number: 4)
+ end
- it 'ensures the user can create the post' do
+ it "ensures the user can create the post" do
Guardian.any_instance.expects(:can_create?).with(Post, topic).returns(false)
post = creator.create
expect(post).to be_blank
@@ -820,8 +897,8 @@ RSpec.describe PostCreator do
expect(creator.errors.messages[:base][0]).to match I18n.t(:topic_not_found)
end
- context 'with success' do
- it 'create correctly' do
+ context "with success" do
+ it "create correctly" do
post = creator.create
expect(Post.count).to eq(1)
expect(Topic.count).to eq(1)
@@ -831,8 +908,18 @@ RSpec.describe PostCreator do
context "when the user has bookmarks with auto_delete_preference on_owner_reply" do
before do
- Fabricate(:bookmark, user: user, bookmarkable: Fabricate(:post, topic: topic), auto_delete_preference: Bookmark.auto_delete_preferences[:on_owner_reply])
- Fabricate(:bookmark, user: user, bookmarkable: Fabricate(:post, topic: topic), auto_delete_preference: Bookmark.auto_delete_preferences[:on_owner_reply])
+ Fabricate(
+ :bookmark,
+ user: user,
+ bookmarkable: Fabricate(:post, topic: topic),
+ auto_delete_preference: Bookmark.auto_delete_preferences[:on_owner_reply],
+ )
+ Fabricate(
+ :bookmark,
+ user: user,
+ bookmarkable: Fabricate(:post, topic: topic),
+ auto_delete_preference: Bookmark.auto_delete_preferences[:on_owner_reply],
+ )
TopicUser.create!(topic: topic, user: user, bookmarked: true)
end
@@ -856,9 +943,9 @@ RSpec.describe PostCreator do
before do
PostCreator.new(
coding_horror,
- raw: 'first post in topic',
+ raw: "first post in topic",
topic_id: topic.id,
- created_at: Time.zone.now - 24.hours
+ created_at: Time.zone.now - 24.hours,
).create
end
@@ -875,24 +962,27 @@ RSpec.describe PostCreator do
reply_timestamp = 1.day.from_now.round
# tests if messages of type :stats are published and the relevant data is fetched from the topic
- messages = MessageBus.track_publish("/topic/#{topic.id}") do
- PostCreator.new(
- evil_trout,
- raw: 'other post in topic',
- topic_id: topic.id,
- created_at: reply_timestamp
- ).create
- end
+ messages =
+ MessageBus.track_publish("/topic/#{topic.id}") do
+ PostCreator.new(
+ evil_trout,
+ raw: "other post in topic",
+ topic_id: topic.id,
+ created_at: reply_timestamp,
+ ).create
+ end
stats_message = messages.select { |msg| msg.data[:type] == :stats }.first
expect(stats_message).to be_present
expect(stats_message.data[:posts_count]).to eq(2)
expect(stats_message.data[:last_posted_at]).to eq(reply_timestamp.as_json)
- expect(stats_message.data[:last_poster]).to eq(BasicUserSerializer.new(evil_trout, root: false).as_json)
+ expect(stats_message.data[:last_poster]).to eq(
+ BasicUserSerializer.new(evil_trout, root: false).as_json,
+ )
end
it "updates topic stats even when topic fails validation" do
- topic.update_columns(title: 'below 15 chars')
+ topic.update_columns(title: "below 15 chars")
post = creator.create
topic.reload
@@ -903,13 +993,13 @@ RSpec.describe PostCreator do
end
end
- context 'when the topic is in slow mode' do
+ context "when the topic is in slow mode" do
before do
- one_day = 86400
+ one_day = 86_400
topic.update!(slow_mode_seconds: one_day)
end
- it 'fails if the user recently posted in this topic' do
+ it "fails if the user recently posted in this topic" do
TopicUser.create!(user: user, topic: topic, last_posted_at: 10.minutes.ago)
post = creator.create
@@ -919,7 +1009,7 @@ RSpec.describe PostCreator do
expect(creator.errors.messages[:base][0]).to match I18n.t(:slow_mode_enabled)
end
- it 'creates the topic if the user last post is older than the slow mode interval' do
+ it "creates the topic if the user last post is older than the slow mode interval" do
TopicUser.create!(user: user, topic: topic, last_posted_at: 5.days.ago)
post = creator.create
@@ -928,8 +1018,9 @@ RSpec.describe PostCreator do
expect(creator.errors.count).to be_zero
end
- it 'creates the topic if the user is a staff member' do
- post_creator = PostCreator.new(admin, raw: 'test reply', topic_id: topic.id, reply_to_post_number: 4)
+ it "creates the topic if the user is a staff member" do
+ post_creator =
+ PostCreator.new(admin, raw: "test reply", topic_id: topic.id, reply_to_post_number: 4)
TopicUser.create!(user: admin, topic: topic, last_posted_at: 10.minutes.ago)
post = post_creator.create
@@ -940,11 +1031,13 @@ RSpec.describe PostCreator do
end
end
- describe 'closed topic' do
+ describe "closed topic" do
fab!(:topic) { Fabricate(:topic, user: user, closed: true) }
- let(:creator) { PostCreator.new(user, raw: 'test reply', topic_id: topic.id, reply_to_post_number: 4) }
+ let(:creator) do
+ PostCreator.new(user, raw: "test reply", topic_id: topic.id, reply_to_post_number: 4)
+ end
- it 'responds with an error message' do
+ it "responds with an error message" do
post = creator.create
expect(post).to be_blank
expect(creator.errors.count).to eq 1
@@ -952,11 +1045,13 @@ RSpec.describe PostCreator do
end
end
- describe 'missing topic' do
+ describe "missing topic" do
let(:topic) { Fabricate(:topic, user: user, deleted_at: 5.minutes.ago) }
- let(:creator) { PostCreator.new(user, raw: 'test reply', topic_id: topic.id, reply_to_post_number: 4) }
+ let(:creator) do
+ PostCreator.new(user, raw: "test reply", topic_id: topic.id, reply_to_post_number: 4)
+ end
- it 'responds with an error message' do
+ it "responds with an error message" do
post = creator.create
expect(post).to be_blank
expect(creator.errors.count).to eq 1
@@ -968,33 +1063,43 @@ RSpec.describe PostCreator do
let(:raw) { "this is my awesome message body hello world" }
it "passes the cooking options through correctly" do
- creator = PostCreator.new(user,
- title: 'hi there welcome to my topic',
- raw: raw,
- cooking_options: { traditional_markdown_linebreaks: true })
+ creator =
+ PostCreator.new(
+ user,
+ title: "hi there welcome to my topic",
+ raw: raw,
+ cooking_options: {
+ traditional_markdown_linebreaks: true,
+ },
+ )
- Post.any_instance.expects(:cook).with(raw, has_key(:traditional_markdown_linebreaks)).returns(raw)
+ Post
+ .any_instance
+ .expects(:cook)
+ .with(raw, has_key(:traditional_markdown_linebreaks))
+ .returns(raw)
creator.create
end
end
# integration test ... minimise db work
- describe 'private message' do
+ describe "private message" do
let(:target_user1) { coding_horror }
fab!(:target_user2) { Fabricate(:moderator) }
fab!(:unrelated_user) { Fabricate(:user) }
let(:post) do
Group.refresh_automatic_groups!
- PostCreator.create!(user,
- title: 'hi there welcome to my topic',
+ PostCreator.create!(
+ user,
+ title: "hi there welcome to my topic",
raw: "this is my awesome message @#{unrelated_user.username_lower}",
archetype: Archetype.private_message,
- target_usernames: [target_user1.username, target_user2.username].join(','),
- category: 1
+ target_usernames: [target_user1.username, target_user2.username].join(","),
+ category: 1,
)
end
- it 'acts correctly' do
+ it "acts correctly" do
freeze_time
user.update_columns(last_posted_at: 1.year.ago)
@@ -1024,15 +1129,14 @@ RSpec.describe PostCreator do
UserArchivedMessage.create(user_id: target_user2.id, topic_id: post.topic_id)
# if an admin replies they should be added to the allowed user list
- PostCreator.create!(admin,
- raw: 'hi there welcome topic, I am a mod',
- topic_id: post.topic_id
- )
+ PostCreator.create!(admin, raw: "hi there welcome topic, I am a mod", topic_id: post.topic_id)
post.topic.reload
expect(post.topic.topic_allowed_users.where(user_id: admin.id).count).to eq(1)
- expect(UserArchivedMessage.where(user_id: target_user2.id, topic_id: post.topic_id).count).to eq(0)
+ expect(
+ UserArchivedMessage.where(user_id: target_user2.id, topic_id: post.topic_id).count,
+ ).to eq(0)
# if another admin replies and is already member of the group, don't add them to topic_allowed_users
group = Fabricate(:group)
@@ -1040,12 +1144,12 @@ RSpec.describe PostCreator do
admin2 = Fabricate(:admin)
group.add(admin2)
- PostCreator.create!(admin2, raw: 'I am also an admin, and a mod', topic_id: post.topic_id)
+ PostCreator.create!(admin2, raw: "I am also an admin, and a mod", topic_id: post.topic_id)
expect(post.topic.topic_allowed_users.where(user_id: admin2.id).count).to eq(0)
end
- it 'does not add whisperers to allowed users of the topic' do
+ it "does not add whisperers to allowed users of the topic" do
SiteSetting.whispers_allowed_groups = "#{Group::AUTO_GROUPS[:staff]}"
unrelated_user.update!(admin: true)
@@ -1053,15 +1157,17 @@ RSpec.describe PostCreator do
unrelated_user,
raw: "This is a whisper that I am testing",
topic_id: post.topic_id,
- post_type: Post.types[:whisper]
+ post_type: Post.types[:whisper],
)
expect(post.topic.topic_allowed_users.map(&:user_id)).to contain_exactly(
- target_user1.id, target_user2.id, user.id
+ target_user1.id,
+ target_user2.id,
+ user.id,
)
end
- it 'does not add whisperers to allowed users of the topic' do
+ it "does not add whisperers to allowed users of the topic" do
unrelated_user.update!(admin: true)
PostCreator.create!(
@@ -1072,11 +1178,13 @@ RSpec.describe PostCreator do
)
expect(post.topic.topic_allowed_users.map(&:user_id)).to contain_exactly(
- target_user1.id, target_user2.id, user.id
+ target_user1.id,
+ target_user2.id,
+ user.id,
)
end
- it 'does not increase posts count for small actions' do
+ it "does not increase posts count for small actions" do
topic = Fabricate(:private_message_topic, user: Fabricate(:user))
Fabricate(:post, topic: topic)
@@ -1104,11 +1212,13 @@ RSpec.describe PostCreator do
let(:target_user1) { coding_horror }
fab!(:target_user2) { Fabricate(:moderator) }
let(:base_args) do
- { title: 'you need a warning buddy!',
+ {
+ title: "you need a warning buddy!",
raw: "you did something bad and I'm telling you about it!",
is_warning: true,
target_usernames: target_user1.username,
- category: 1 }
+ category: 1,
+ }
end
it "works as expected" do
@@ -1119,8 +1229,14 @@ RSpec.describe PostCreator do
expect(creator.errors).to be_present
# Too many users
- creator = PostCreator.new(user, base_args.merge(archetype: Archetype.private_message,
- target_usernames: [target_user1.username, target_user2.username].join(',')))
+ creator =
+ PostCreator.new(
+ user,
+ base_args.merge(
+ archetype: Archetype.private_message,
+ target_usernames: [target_user1.username, target_user2.username].join(","),
+ ),
+ )
creator.create
expect(creator.errors).to be_present
@@ -1139,48 +1255,51 @@ RSpec.describe PostCreator do
end
end
- describe 'auto closing' do
- it 'closes private messages that have more than N posts' do
+ describe "auto closing" do
+ it "closes private messages that have more than N posts" do
SiteSetting.auto_close_messages_post_count = 2
- post1 = create_post(archetype: Archetype.private_message,
- target_usernames: [admin.username])
+ post1 = create_post(archetype: Archetype.private_message, target_usernames: [admin.username])
- expect do
- create_post(user: post1.user, topic_id: post1.topic_id)
- end.to change { Post.count }.by(2)
+ expect do create_post(user: post1.user, topic_id: post1.topic_id) end.to change {
+ Post.count
+ }.by(2)
post1.topic.reload
- expect(post1.topic.posts.last.raw).to eq(I18n.t(
- 'topic_statuses.autoclosed_message_max_posts',
- count: SiteSetting.auto_close_messages_post_count
- ))
+ expect(post1.topic.posts.last.raw).to eq(
+ I18n.t(
+ "topic_statuses.autoclosed_message_max_posts",
+ count: SiteSetting.auto_close_messages_post_count,
+ ),
+ )
expect(post1.topic.closed).to eq(true)
end
- it 'closes topics that have more than N posts' do
+ it "closes topics that have more than N posts" do
SiteSetting.auto_close_topics_post_count = 2
post1 = create_post
- expect do
- create_post(user: post1.user, topic_id: post1.topic_id)
- end.to change { Post.count }.by(2)
+ expect do create_post(user: post1.user, topic_id: post1.topic_id) end.to change {
+ Post.count
+ }.by(2)
post1.topic.reload
- expect(post1.topic.posts.last.raw).to eq(I18n.t(
- 'topic_statuses.autoclosed_topic_max_posts',
- count: SiteSetting.auto_close_topics_post_count
- ))
+ expect(post1.topic.posts.last.raw).to eq(
+ I18n.t(
+ "topic_statuses.autoclosed_topic_max_posts",
+ count: SiteSetting.auto_close_topics_post_count,
+ ),
+ )
expect(post1.topic.closed).to eq(true)
end
end
- describe 'private message to group' do
+ describe "private message to group" do
fab!(:target_user1) { coding_horror }
fab!(:target_user2) { Fabricate(:moderator) }
let!(:group) do
@@ -1193,15 +1312,16 @@ RSpec.describe PostCreator do
fab!(:unrelated) { Fabricate(:user) }
let(:post) do
Group.refresh_automatic_groups!
- PostCreator.create!(user,
- title: 'hi there welcome to my topic',
+ PostCreator.create!(
+ user,
+ title: "hi there welcome to my topic",
raw: "this is my awesome message @#{unrelated.username_lower}",
archetype: Archetype.private_message,
- target_group_names: group.name
+ target_group_names: group.name,
)
end
- it 'can post to a group correctly' do
+ it "can post to a group correctly" do
Jobs.run_immediately!
expect(post.topic.archetype).to eq(Archetype.private_message)
@@ -1217,65 +1337,74 @@ RSpec.describe PostCreator do
GroupArchivedMessage.create!(group: group, topic: post.topic)
- message = MessageBus.track_publish(
- PrivateMessageTopicTrackingState.group_channel(group.id)
- ) do
- PostCreator.create!(user,
- raw: "this is a reply to the group message",
- topic_id: post.topic_id
- )
- end.first
+ message =
+ MessageBus
+ .track_publish(PrivateMessageTopicTrackingState.group_channel(group.id)) do
+ PostCreator.create!(
+ user,
+ raw: "this is a reply to the group message",
+ topic_id: post.topic_id,
+ )
+ end
+ .first
expect(message.data["message_type"]).to eq(
- PrivateMessageTopicTrackingState::GROUP_ARCHIVE_MESSAGE_TYPE
+ PrivateMessageTopicTrackingState::GROUP_ARCHIVE_MESSAGE_TYPE,
)
expect(message.data["payload"]["acting_user_id"]).to eq(user.id)
- expect(GroupArchivedMessage.exists?(group: group, topic: post.topic))
- .to eq(false)
+ expect(GroupArchivedMessage.exists?(group: group, topic: post.topic)).to eq(false)
end
end
- describe 'setting created_at' do
- it 'supports Time instances' do
+ describe "setting created_at" do
+ it "supports Time instances" do
freeze_time
- post1 = PostCreator.create(user,
- raw: 'This is very interesting test post content',
- title: 'This is a very interesting test post title',
- created_at: 1.week.ago
- )
+ post1 =
+ PostCreator.create(
+ user,
+ raw: "This is very interesting test post content",
+ title: "This is a very interesting test post title",
+ created_at: 1.week.ago,
+ )
topic = post1.topic
- post2 = PostCreator.create(user,
- raw: 'This is very interesting test post content',
- topic_id: topic,
- created_at: 1.week.ago
- )
+ post2 =
+ PostCreator.create(
+ user,
+ raw: "This is very interesting test post content",
+ topic_id: topic,
+ created_at: 1.week.ago,
+ )
expect(post1.created_at).to eq_time(1.week.ago)
expect(post2.created_at).to eq_time(1.week.ago)
expect(topic.created_at).to eq_time(1.week.ago)
end
- it 'supports strings' do
+ it "supports strings" do
freeze_time
- time = Time.zone.parse('2019-09-02')
+ time = Time.zone.parse("2019-09-02")
- post1 = PostCreator.create(user,
- raw: 'This is very interesting test post content',
- title: 'This is a very interesting test post title',
- created_at: '2019-09-02'
- )
+ post1 =
+ PostCreator.create(
+ user,
+ raw: "This is very interesting test post content",
+ title: "This is a very interesting test post title",
+ created_at: "2019-09-02",
+ )
topic = post1.topic
- post2 = PostCreator.create(user,
- raw: 'This is very interesting test post content',
- topic_id: topic,
- created_at: '2019-09-02 00:00:00 UTC'
- )
+ post2 =
+ PostCreator.create(
+ user,
+ raw: "This is very interesting test post content",
+ topic_id: topic,
+ created_at: "2019-09-02 00:00:00 UTC",
+ )
expect(post1.created_at).to eq_time(time)
expect(post2.created_at).to eq_time(time)
@@ -1283,9 +1412,9 @@ RSpec.describe PostCreator do
end
end
- describe 'disable validations' do
- it 'can save a post' do
- creator = PostCreator.new(user, raw: 'q', title: 'q', skip_validations: true)
+ describe "disable validations" do
+ it "can save a post" do
+ creator = PostCreator.new(user, raw: "q", title: "q", skip_validations: true)
creator.create
expect(creator.errors).to be_blank
end
@@ -1293,7 +1422,13 @@ RSpec.describe PostCreator do
describe "word_count" do
it "has a word count" do
- creator = PostCreator.new(user, title: 'some inspired poetry for a rainy day', raw: 'mary had a little lamb, little lamb, little lamb. mary had a little lamb. Здравствуйте')
+ creator =
+ PostCreator.new(
+ user,
+ title: "some inspired poetry for a rainy day",
+ raw:
+ "mary had a little lamb, little lamb, little lamb. mary had a little lamb. Здравствуйте",
+ )
post = creator.create
expect(post.word_count).to eq(15)
@@ -1306,19 +1441,25 @@ RSpec.describe PostCreator do
let(:embed_url) { "http://eviltrout.com/stupid-url" }
it "creates the topic_embed record" do
- creator = PostCreator.new(user,
- embed_url: embed_url,
- title: 'Reviews of Science Ovens',
- raw: 'Did you know that you can use microwaves to cook your dinner? Science!')
+ creator =
+ PostCreator.new(
+ user,
+ embed_url: embed_url,
+ title: "Reviews of Science Ovens",
+ raw: "Did you know that you can use microwaves to cook your dinner? Science!",
+ )
creator.create
expect(creator.errors).to be_blank
expect(TopicEmbed.where(embed_url: embed_url).exists?).to eq(true)
# If we try to create another topic with the embed url, should fail
- creator = PostCreator.new(user,
- embed_url: embed_url,
- title: 'More Reviews of Science Ovens',
- raw: 'As if anyone ever wanted to learn more about them!')
+ creator =
+ PostCreator.new(
+ user,
+ embed_url: embed_url,
+ title: "More Reviews of Science Ovens",
+ raw: "As if anyone ever wanted to learn more about them!",
+ )
result = creator.create
expect(result).to be_present
expect(creator.errors).to be_present
@@ -1328,12 +1469,17 @@ RSpec.describe PostCreator do
describe "read credit for creator" do
it "should give credit to creator" do
post = create_post
- expect(PostTiming.find_by(topic_id: post.topic_id,
- post_number: post.post_number,
- user_id: post.user_id).msecs).to be > 0
+ expect(
+ PostTiming.find_by(
+ topic_id: post.topic_id,
+ post_number: post.post_number,
+ user_id: post.user_id,
+ ).msecs,
+ ).to be > 0
- expect(TopicUser.find_by(topic_id: post.topic_id,
- user_id: post.user_id).last_read_post_number).to eq(1)
+ expect(
+ TopicUser.find_by(topic_id: post.topic_id, user_id: post.user_id).last_read_post_number,
+ ).to eq(1)
end
end
@@ -1341,14 +1487,20 @@ RSpec.describe PostCreator do
it "does not allow suspended users to create topics" do
user = Fabricate(:user, suspended_at: 1.month.ago, suspended_till: 1.month.from_now)
- creator = PostCreator.new(user, title: "my test title 123", raw: "I should not be allowed to post")
+ creator =
+ PostCreator.new(user, title: "my test title 123", raw: "I should not be allowed to post")
creator.create
expect(creator.errors.count).to be > 0
end
end
it "doesn't strip starting whitespaces" do
- pc = PostCreator.new(user, title: "testing whitespace stripping", raw: " <-- whitespaces --> ")
+ pc =
+ PostCreator.new(
+ user,
+ title: "testing whitespace stripping",
+ raw: " <-- whitespaces --> ",
+ )
post = pc.create
expect(post.raw).to eq(" <-- whitespaces -->")
end
@@ -1358,8 +1510,8 @@ RSpec.describe PostCreator do
@posts_created = 0
@topics_created = 0
- @increase_posts = -> (post, opts, user) { @posts_created += 1 }
- @increase_topics = -> (topic, opts, user) { @topics_created += 1 }
+ @increase_posts = ->(post, opts, user) { @posts_created += 1 }
+ @increase_topics = ->(topic, opts, user) { @topics_created += 1 }
DiscourseEvent.on(:post_created, &@increase_posts)
DiscourseEvent.on(:topic_created, &@increase_topics)
end
@@ -1370,14 +1522,19 @@ RSpec.describe PostCreator do
end
it "fires both event when creating a topic" do
- pc = PostCreator.new(user, raw: 'this is the new content for my topic', title: 'this is my new topic title')
+ pc =
+ PostCreator.new(
+ user,
+ raw: "this is the new content for my topic",
+ title: "this is my new topic title",
+ )
_post = pc.create
expect(@posts_created).to eq(1)
expect(@topics_created).to eq(1)
end
it "fires only the post event when creating a post" do
- pc = PostCreator.new(user, topic_id: topic.id, raw: 'this is the new content for my post')
+ pc = PostCreator.new(user, topic_id: topic.id, raw: "this is the new content for my post")
_post = pc.create
expect(@posts_created).to eq(1)
expect(@topics_created).to eq(0)
@@ -1388,10 +1545,12 @@ RSpec.describe PostCreator do
fab!(:staged) { Fabricate(:staged) }
it "automatically watches all messages it participates in" do
- post = PostCreator.create(staged,
- title: "this is the title of a topic created by a staged user",
- raw: "this is the content of a topic created by a staged user ;)"
- )
+ post =
+ PostCreator.create(
+ staged,
+ title: "this is the title of a topic created by a staged user",
+ raw: "this is the content of a topic created by a staged user ;)",
+ )
topic_user = TopicUser.find_by(user_id: staged.id, topic_id: post.topic_id)
expect(topic_user.notification_level).to eq(TopicUser.notification_levels[:watching])
expect(topic_user.notifications_reason_id).to eq(TopicUser.notification_reasons[:auto_watch])
@@ -1402,15 +1561,20 @@ RSpec.describe PostCreator do
it "automatically watches topic based on preference" do
user.user_option.notification_level_when_replying = 3
- topic = PostCreator.create(admin,
- title: "this is the title of a topic created by an admin for watching notification",
- raw: "this is the content of a topic created by an admin for keeping a watching notification state on a topic ;)"
- )
+ topic =
+ PostCreator.create(
+ admin,
+ title: "this is the title of a topic created by an admin for watching notification",
+ raw:
+ "this is the content of a topic created by an admin for keeping a watching notification state on a topic ;)",
+ )
- post = PostCreator.create(user,
- topic_id: topic.topic_id,
- raw: "this is a reply to set the tracking state to watching ;)"
- )
+ post =
+ PostCreator.create(
+ user,
+ topic_id: topic.topic_id,
+ raw: "this is a reply to set the tracking state to watching ;)",
+ )
topic_user = TopicUser.find_by(user_id: user.id, topic_id: post.topic_id)
expect(topic_user.notification_level).to eq(TopicUser.notification_levels[:watching])
end
@@ -1418,15 +1582,20 @@ RSpec.describe PostCreator do
it "topic notification level remains tracking based on preference" do
user.user_option.notification_level_when_replying = 2
- topic = PostCreator.create(admin,
- title: "this is the title of a topic created by an admin for tracking notification",
- raw: "this is the content of a topic created by an admin for keeping a tracking notification state on a topic ;)"
- )
+ topic =
+ PostCreator.create(
+ admin,
+ title: "this is the title of a topic created by an admin for tracking notification",
+ raw:
+ "this is the content of a topic created by an admin for keeping a tracking notification state on a topic ;)",
+ )
- post = PostCreator.create(user,
- topic_id: topic.topic_id,
- raw: "this is a reply to set the tracking state to tracking ;)"
- )
+ post =
+ PostCreator.create(
+ user,
+ topic_id: topic.topic_id,
+ raw: "this is a reply to set the tracking state to tracking ;)",
+ )
topic_user = TopicUser.find_by(user_id: user.id, topic_id: post.topic_id)
expect(topic_user.notification_level).to eq(TopicUser.notification_levels[:tracking])
end
@@ -1434,15 +1603,20 @@ RSpec.describe PostCreator do
it "topic notification level is normal based on preference" do
user.user_option.notification_level_when_replying = 1
- topic = PostCreator.create(admin,
- title: "this is the title of a topic created by an admin for tracking notification",
- raw: "this is the content of a topic created by an admin for keeping a tracking notification state on a topic ;)"
- )
+ topic =
+ PostCreator.create(
+ admin,
+ title: "this is the title of a topic created by an admin for tracking notification",
+ raw:
+ "this is the content of a topic created by an admin for keeping a tracking notification state on a topic ;)",
+ )
- post = PostCreator.create(user,
- topic_id: topic.topic_id,
- raw: "this is a reply to set the tracking state to normal ;)"
- )
+ post =
+ PostCreator.create(
+ user,
+ topic_id: topic.topic_id,
+ raw: "this is a reply to set the tracking state to normal ;)",
+ )
topic_user = TopicUser.find_by(user_id: user.id, topic_id: post.topic_id)
expect(topic_user.notification_level).to eq(TopicUser.notification_levels[:regular])
end
@@ -1453,30 +1627,22 @@ RSpec.describe PostCreator do
pm = Fabricate(:private_message_topic, user: admin)
pm.invite(admin, user.username)
- PostCreator.create(
- user,
- topic_id: pm.id,
- raw: "this is a test reply 123 123 ;)"
- )
+ PostCreator.create(user, topic_id: pm.id, raw: "this is a test reply 123 123 ;)")
topic_user = TopicUser.find_by(user_id: user.id, topic_id: pm.id)
expect(topic_user.notification_level).to eq(3)
end
- it 'sets the last_posted_at timestamp to track the last time the user posted' do
+ it "sets the last_posted_at timestamp to track the last time the user posted" do
topic = Fabricate(:topic)
- PostCreator.create(
- user,
- topic_id: topic.id,
- raw: "this is a test reply 123 123 ;)"
- )
+ PostCreator.create(user, topic_id: topic.id, raw: "this is a test reply 123 123 ;)")
topic_user = TopicUser.find_by(user_id: user.id, topic_id: topic.id)
expect(topic_user.last_posted_at).to be_present
end
end
- describe '#create!' do
+ describe "#create!" do
it "should return the post if it was successfully created" do
title = "This is a valid title"
raw = "This is a really awesome post"
@@ -1490,7 +1656,7 @@ RSpec.describe PostCreator do
end
it "should raise an error when post fails to be created" do
- post_creator = PostCreator.new(user, title: '', raw: '')
+ post_creator = PostCreator.new(user, title: "", raw: "")
expect { post_creator.create! }.to raise_error(ActiveRecord::RecordNotSaved)
end
@@ -1498,16 +1664,19 @@ RSpec.describe PostCreator do
Jobs.run_immediately!
user2 = Fabricate(:user)
- topic = Fabricate(:private_message_topic,
- topic_allowed_users: [
- Fabricate.build(:topic_allowed_user, user: user),
- Fabricate.build(:topic_allowed_user, user: user2)
- ],
- )
- Fabricate(:topic_user,
+ topic =
+ Fabricate(
+ :private_message_topic,
+ topic_allowed_users: [
+ Fabricate.build(:topic_allowed_user, user: user),
+ Fabricate.build(:topic_allowed_user, user: user2),
+ ],
+ )
+ Fabricate(
+ :topic_user,
topic: topic,
user: user2,
- notification_level: TopicUser.notification_levels[:watching]
+ notification_level: TopicUser.notification_levels[:watching],
)
expect {
@@ -1520,37 +1689,37 @@ RSpec.describe PostCreator do
end
end
- describe 'private message to a user that has disabled private messages' do
- fab!(:another_user) { Fabricate(:user, username: 'HelloWorld') }
+ describe "private message to a user that has disabled private messages" do
+ fab!(:another_user) { Fabricate(:user, username: "HelloWorld") }
- before do
- another_user.user_option.update!(allow_private_messages: false)
- end
+ before { another_user.user_option.update!(allow_private_messages: false) }
- it 'should not be valid' do
- post_creator = PostCreator.new(
- user,
- title: 'this message is to someone who muted me!',
- raw: "you will have to see this even if you muted me!",
- archetype: Archetype.private_message,
- target_usernames: "#{another_user.username}"
- )
+ it "should not be valid" do
+ post_creator =
+ PostCreator.new(
+ user,
+ title: "this message is to someone who muted me!",
+ raw: "you will have to see this even if you muted me!",
+ archetype: Archetype.private_message,
+ target_usernames: "#{another_user.username}",
+ )
expect(post_creator).to_not be_valid
- expect(post_creator.errors.full_messages).to include(I18n.t(
- "not_accepting_pms", username: another_user.username
- ))
+ expect(post_creator.errors.full_messages).to include(
+ I18n.t("not_accepting_pms", username: another_user.username),
+ )
end
- it 'should not be valid if the name is downcased' do
- post_creator = PostCreator.new(
- user,
- title: 'this message is to someone who muted me!',
- raw: "you will have to see this even if you muted me!",
- archetype: Archetype.private_message,
- target_usernames: "#{another_user.username.downcase}"
- )
+ it "should not be valid if the name is downcased" do
+ post_creator =
+ PostCreator.new(
+ user,
+ title: "this message is to someone who muted me!",
+ raw: "you will have to see this even if you muted me!",
+ archetype: Archetype.private_message,
+ target_usernames: "#{another_user.username.downcase}",
+ )
expect(post_creator).to_not be_valid
end
@@ -1560,38 +1729,40 @@ RSpec.describe PostCreator do
fab!(:muted_me) { evil_trout }
fab!(:another_user) { Fabricate(:user) }
- it 'should fail' do
+ it "should fail" do
updater = UserUpdater.new(muted_me, muted_me)
updater.update_muted_users("#{user.username}")
- pc = PostCreator.new(
- user,
- title: 'this message is to someone who muted me!',
- raw: "you will have to see this even if you muted me!",
- archetype: Archetype.private_message,
- target_usernames: "#{muted_me.username},#{another_user.username}"
- )
+ pc =
+ PostCreator.new(
+ user,
+ title: "this message is to someone who muted me!",
+ raw: "you will have to see this even if you muted me!",
+ archetype: Archetype.private_message,
+ target_usernames: "#{muted_me.username},#{another_user.username}",
+ )
expect(pc).not_to be_valid
expect(pc.errors.full_messages).to contain_exactly(
- I18n.t(:not_accepting_pms, username: muted_me.username)
+ I18n.t(:not_accepting_pms, username: muted_me.username),
)
end
fab!(:staff_user) { Fabricate(:admin) }
- it 'succeeds if the user is staff' do
+ it "succeeds if the user is staff" do
updater = UserUpdater.new(muted_me, muted_me)
updater.update_muted_users("#{staff_user.username}")
- pc = PostCreator.new(
- staff_user,
- title: 'this message is to someone who muted me!',
- raw: "you will have to see this even if you muted me!",
- archetype: Archetype.private_message,
- target_usernames: "#{muted_me.username}"
- )
+ pc =
+ PostCreator.new(
+ staff_user,
+ title: "this message is to someone who muted me!",
+ raw: "you will have to see this even if you muted me!",
+ archetype: Archetype.private_message,
+ target_usernames: "#{muted_me.username}",
+ )
expect(pc).to be_valid
expect(pc.errors).to be_blank
end
@@ -1604,19 +1775,20 @@ RSpec.describe PostCreator do
context "when post author is ignored" do
let!(:ignored_user) { Fabricate(:ignored_user, user: ignorer, ignored_user: user) }
- it 'should fail' do
- pc = PostCreator.new(
- user,
- title: 'this message is to someone who ignored me!',
- raw: "you will have to see this even if you ignored me!",
- archetype: Archetype.private_message,
- target_usernames: "#{ignorer.username},#{another_user.username}"
- )
+ it "should fail" do
+ pc =
+ PostCreator.new(
+ user,
+ title: "this message is to someone who ignored me!",
+ raw: "you will have to see this even if you ignored me!",
+ archetype: Archetype.private_message,
+ target_usernames: "#{ignorer.username},#{another_user.username}",
+ )
expect(pc).not_to be_valid
expect(pc.errors.full_messages).to contain_exactly(
- I18n.t(:not_accepting_pms, username: ignorer.username)
- )
+ I18n.t(:not_accepting_pms, username: ignorer.username),
+ )
end
end
@@ -1624,19 +1796,19 @@ RSpec.describe PostCreator do
fab!(:staff_user) { Fabricate(:admin) }
fab!(:ignored_user) { Fabricate(:ignored_user, user: ignorer, ignored_user: staff_user) }
- it 'succeeds if the user is staff' do
- pc = PostCreator.new(
- staff_user,
- title: 'this message is to someone who ignored me!',
- raw: "you will have to see this even if you ignored me!",
- archetype: Archetype.private_message,
- target_usernames: "#{ignorer.username}"
- )
+ it "succeeds if the user is staff" do
+ pc =
+ PostCreator.new(
+ staff_user,
+ title: "this message is to someone who ignored me!",
+ raw: "you will have to see this even if you ignored me!",
+ archetype: Archetype.private_message,
+ target_usernames: "#{ignorer.username}",
+ )
expect(pc).to be_valid
expect(pc.errors).to be_blank
end
end
-
end
describe "private message to user in allow list" do
@@ -1644,18 +1816,21 @@ RSpec.describe PostCreator do
fab!(:allowed_user) { Fabricate(:user) }
context "when post author is allowed" do
- let!(:allowed_pm_user) { Fabricate(:allowed_pm_user, user: allowed_user, allowed_pm_user: sender) }
+ let!(:allowed_pm_user) do
+ Fabricate(:allowed_pm_user, user: allowed_user, allowed_pm_user: sender)
+ end
- it 'should succeed' do
+ it "should succeed" do
allowed_user.user_option.update!(enable_allowed_pm_users: true)
- pc = PostCreator.new(
- sender,
- title: 'this message is to someone who is in my allow list!',
- raw: "you will have to see this because I'm in your allow list!",
- archetype: Archetype.private_message,
- target_usernames: "#{allowed_user.username}"
- )
+ pc =
+ PostCreator.new(
+ sender,
+ title: "this message is to someone who is in my allow list!",
+ raw: "you will have to see this because I'm in your allow list!",
+ archetype: Archetype.private_message,
+ target_usernames: "#{allowed_user.username}",
+ )
expect(pc).to be_valid
expect(pc.errors).to be_blank
@@ -1663,24 +1838,27 @@ RSpec.describe PostCreator do
end
context "when personal messages are disabled" do
- let!(:allowed_pm_user) { Fabricate(:allowed_pm_user, user: allowed_user, allowed_pm_user: sender) }
+ let!(:allowed_pm_user) do
+ Fabricate(:allowed_pm_user, user: allowed_user, allowed_pm_user: sender)
+ end
- it 'should fail' do
+ it "should fail" do
allowed_user.user_option.update!(allow_private_messages: false)
allowed_user.user_option.update!(enable_allowed_pm_users: true)
- pc = PostCreator.new(
- sender,
- title: 'this message is to someone who is in my allow list!',
- raw: "you will have to see this because I'm in your allow list!",
- archetype: Archetype.private_message,
- target_usernames: "#{allowed_user.username}"
- )
+ pc =
+ PostCreator.new(
+ sender,
+ title: "this message is to someone who is in my allow list!",
+ raw: "you will have to see this because I'm in your allow list!",
+ archetype: Archetype.private_message,
+ target_usernames: "#{allowed_user.username}",
+ )
expect(pc).not_to be_valid
expect(pc.errors.full_messages).to contain_exactly(
- I18n.t(:not_accepting_pms, username: allowed_user.username)
- )
+ I18n.t(:not_accepting_pms, username: allowed_user.username),
+ )
end
end
end
@@ -1691,35 +1869,39 @@ RSpec.describe PostCreator do
fab!(:not_allowed_user) { Fabricate(:user) }
context "when post author is not allowed" do
- let!(:allowed_pm_user) { Fabricate(:allowed_pm_user, user: not_allowed_user, allowed_pm_user: allowed_user) }
+ let!(:allowed_pm_user) do
+ Fabricate(:allowed_pm_user, user: not_allowed_user, allowed_pm_user: allowed_user)
+ end
- it 'should fail' do
+ it "should fail" do
not_allowed_user.user_option.update!(enable_allowed_pm_users: true)
- pc = PostCreator.new(
- sender,
- title: 'this message is to someone who is not in my allowed list!',
- raw: "you will have to see this even if you don't want message from me!",
- archetype: Archetype.private_message,
- target_usernames: "#{not_allowed_user.username}"
- )
+ pc =
+ PostCreator.new(
+ sender,
+ title: "this message is to someone who is not in my allowed list!",
+ raw: "you will have to see this even if you don't want message from me!",
+ archetype: Archetype.private_message,
+ target_usernames: "#{not_allowed_user.username}",
+ )
expect(pc).not_to be_valid
expect(pc.errors.full_messages).to contain_exactly(
- I18n.t(:not_accepting_pms, username: not_allowed_user.username)
- )
+ I18n.t(:not_accepting_pms, username: not_allowed_user.username),
+ )
end
- it 'should succeed when not enabled' do
+ it "should succeed when not enabled" do
not_allowed_user.user_option.update!(enable_allowed_pm_users: false)
- pc = PostCreator.new(
- sender,
- title: 'this message is to someone who is not in my allowed list!',
- raw: "you will have to see this even if you don't want message from me!",
- archetype: Archetype.private_message,
- target_usernames: "#{not_allowed_user.username}"
- )
+ pc =
+ PostCreator.new(
+ sender,
+ title: "this message is to someone who is not in my allowed list!",
+ raw: "you will have to see this even if you don't want message from me!",
+ archetype: Archetype.private_message,
+ target_usernames: "#{not_allowed_user.username}",
+ )
expect(pc).to be_valid
expect(pc.errors).to be_blank
@@ -1731,16 +1913,19 @@ RSpec.describe PostCreator do
fab!(:staff_user) { Fabricate(:admin) }
fab!(:allowed_user) { Fabricate(:user) }
fab!(:not_allowed_user) { Fabricate(:user) }
- fab!(:allowed_pm_user) { Fabricate(:allowed_pm_user, user: staff_user, allowed_pm_user: allowed_user) }
+ fab!(:allowed_pm_user) do
+ Fabricate(:allowed_pm_user, user: staff_user, allowed_pm_user: allowed_user)
+ end
- it 'succeeds if the user is staff' do
- pc = PostCreator.new(
- staff_user,
- title: 'this message is to someone who did not allow me!',
- raw: "you will have to see this even if you did not allow me!",
- archetype: Archetype.private_message,
- target_usernames: "#{not_allowed_user.username}"
- )
+ it "succeeds if the user is staff" do
+ pc =
+ PostCreator.new(
+ staff_user,
+ title: "this message is to someone who did not allow me!",
+ raw: "you will have to see this even if you did not allow me!",
+ archetype: Archetype.private_message,
+ target_usernames: "#{not_allowed_user.username}",
+ )
expect(pc).to be_valid
expect(pc.errors).to be_blank
end
@@ -1752,24 +1937,27 @@ RSpec.describe PostCreator do
fab!(:not_allowed_user) { Fabricate(:user) }
context "when post author is not allowed" do
- let!(:allowed_pm_user) { Fabricate(:allowed_pm_user, user: allowed_user, allowed_pm_user: sender) }
+ let!(:allowed_pm_user) do
+ Fabricate(:allowed_pm_user, user: allowed_user, allowed_pm_user: sender)
+ end
- it 'should fail' do
+ it "should fail" do
allowed_user.user_option.update!(enable_allowed_pm_users: true)
not_allowed_user.user_option.update!(enable_allowed_pm_users: true)
- pc = PostCreator.new(
- sender,
- title: 'this message is to someone who is not in my allowed list!',
- raw: "you will have to see this even if you don't want message from me!",
- archetype: Archetype.private_message,
- target_usernames: "#{allowed_user.username},#{not_allowed_user.username}"
- )
+ pc =
+ PostCreator.new(
+ sender,
+ title: "this message is to someone who is not in my allowed list!",
+ raw: "you will have to see this even if you don't want message from me!",
+ archetype: Archetype.private_message,
+ target_usernames: "#{allowed_user.username},#{not_allowed_user.username}",
+ )
expect(pc).not_to be_valid
expect(pc.errors.full_messages).to contain_exactly(
- I18n.t(:not_accepting_pms, username: not_allowed_user.username)
- )
+ I18n.t(:not_accepting_pms, username: not_allowed_user.username),
+ )
end
end
end
@@ -1779,32 +1967,40 @@ RSpec.describe PostCreator do
fab!(:target_user2) { evil_trout }
fab!(:target_user3) { Fabricate(:walter_white) }
- before do
- SiteSetting.max_allowed_message_recipients = 2
- end
+ before { SiteSetting.max_allowed_message_recipients = 2 }
context "for normal user" do
- it 'fails when sending message to multiple recipients' do
- pc = PostCreator.new(
- user,
- title: 'this message is for multiple recipients!',
- raw: "Lorem ipsum dolor sit amet, id elitr praesent mea, ut ius facilis fierent.",
- archetype: Archetype.private_message,
- target_usernames: [target_user1.username, target_user2.username, target_user3.username].join(',')
- )
+ it "fails when sending message to multiple recipients" do
+ pc =
+ PostCreator.new(
+ user,
+ title: "this message is for multiple recipients!",
+ raw: "Lorem ipsum dolor sit amet, id elitr praesent mea, ut ius facilis fierent.",
+ archetype: Archetype.private_message,
+ target_usernames: [
+ target_user1.username,
+ target_user2.username,
+ target_user3.username,
+ ].join(","),
+ )
expect(pc).not_to be_valid
expect(pc.errors).to be_present
end
- it 'succeeds when sending message to multiple recipients if skip_validations is true' do
- pc = PostCreator.new(
- user,
- title: 'this message is for multiple recipients!',
- raw: "Lorem ipsum dolor sit amet, id elitr praesent mea, ut ius facilis fierent.",
- archetype: Archetype.private_message,
- target_usernames: [target_user1.username, target_user2.username, target_user3.username].join(','),
- skip_validations: true
- )
+ it "succeeds when sending message to multiple recipients if skip_validations is true" do
+ pc =
+ PostCreator.new(
+ user,
+ title: "this message is for multiple recipients!",
+ raw: "Lorem ipsum dolor sit amet, id elitr praesent mea, ut ius facilis fierent.",
+ archetype: Archetype.private_message,
+ target_usernames: [
+ target_user1.username,
+ target_user2.username,
+ target_user3.username,
+ ].join(","),
+ skip_validations: true,
+ )
expect(pc).to be_valid
expect(pc.errors).to be_blank
end
@@ -1813,14 +2009,19 @@ RSpec.describe PostCreator do
context "if the user is staff" do
fab!(:staff_user) { Fabricate(:admin) }
- it 'succeeds when sending message to multiple recipients' do
- pc = PostCreator.new(
- staff_user,
- title: 'this message is for multiple recipients!',
- raw: "Lorem ipsum dolor sit amet, id elitr praesent mea, ut ius facilis fierent.",
- archetype: Archetype.private_message,
- target_usernames: [target_user1.username, target_user2.username, target_user3.username].join(',')
- )
+ it "succeeds when sending message to multiple recipients" do
+ pc =
+ PostCreator.new(
+ staff_user,
+ title: "this message is for multiple recipients!",
+ raw: "Lorem ipsum dolor sit amet, id elitr praesent mea, ut ius facilis fierent.",
+ archetype: Archetype.private_message,
+ target_usernames: [
+ target_user1.username,
+ target_user2.username,
+ target_user3.username,
+ ].join(","),
+ )
expect(pc).to be_valid
expect(pc.errors).to be_blank
end
@@ -1833,10 +2034,16 @@ RSpec.describe PostCreator do
fab!(:anonymous) { Fabricate(:anonymous) }
it "generates post notices for new users" do
- post = PostCreator.create!(user, title: "one of my first topics", raw: "one of my first posts")
+ post =
+ PostCreator.create!(user, title: "one of my first topics", raw: "one of my first posts")
expect(post.custom_fields[Post::NOTICE]).to eq("type" => Post.notices[:new_user])
- post = PostCreator.create!(user, title: "another one of my first topics", raw: "another one of my first posts")
+ post =
+ PostCreator.create!(
+ user,
+ title: "another one of my first topics",
+ raw: "another one of my first posts",
+ )
expect(post.custom_fields[Post::NOTICE]).to eq(nil)
end
@@ -1845,9 +2052,13 @@ RSpec.describe PostCreator do
old_post = Fabricate(:post, user: user, created_at: 31.days.ago)
post = PostCreator.create!(user, title: "this is a returning topic", raw: "this is a post")
- expect(post.custom_fields[Post::NOTICE]).to eq("type" => Post.notices[:returning_user], "last_posted_at" => old_post.created_at.iso8601)
+ expect(post.custom_fields[Post::NOTICE]).to eq(
+ "type" => Post.notices[:returning_user],
+ "last_posted_at" => old_post.created_at.iso8601,
+ )
- post = PostCreator.create!(user, title: "this is another topic", raw: "this is my another post")
+ post =
+ PostCreator.create!(user, title: "this is another topic", raw: "this is my another post")
expect(post.custom_fields[Post::NOTICE]).to eq(nil)
end
@@ -1856,7 +2067,12 @@ RSpec.describe PostCreator do
[anonymous, Discourse.system_user, staged].each do |user|
expect(user.posts.size).to eq(0)
- post = PostCreator.create!(user, title: "#{user.username}'s first topic", raw: "#{user.name}'s first post")
+ post =
+ PostCreator.create!(
+ user,
+ title: "#{user.username}'s first topic",
+ raw: "#{user.name}'s first post",
+ )
expect(post.custom_fields[Post::NOTICE]).to eq(nil)
end
end
@@ -1875,18 +2091,19 @@ RSpec.describe PostCreator do
end
it "links post uploads" do
- _public_post = PostCreator.create(
- user,
- topic_id: public_topic.id,
- raw: "A public post with an image.\n"
- )
+ _public_post =
+ PostCreator.create(
+ user,
+ topic_id: public_topic.id,
+ raw: "A public post with an image.\n",
+ )
end
end
- describe 'queue for review' do
+ describe "queue for review" do
before { SiteSetting.review_every_post = true }
- it 'created a reviewable post after creating the post' do
+ it "created a reviewable post after creating the post" do
title = "This is a valid title"
raw = "This is a really awesome post"
@@ -1895,8 +2112,8 @@ RSpec.describe PostCreator do
expect { post_creator.create }.to change(ReviewablePost, :count).by(1)
end
- it 'does not create a reviewable post if the post is not valid' do
- post_creator = PostCreator.new(user, title: '', raw: '')
+ it "does not create a reviewable post if the post is not valid" do
+ post_creator = PostCreator.new(user, title: "", raw: "")
expect { post_creator.create }.not_to change(ReviewablePost, :count)
end
diff --git a/spec/lib/post_destroyer_spec.rb b/spec/lib/post_destroyer_spec.rb
index 34bfb4d6d98..20a18a3e829 100644
--- a/spec/lib/post_destroyer_spec.rb
+++ b/spec/lib/post_destroyer_spec.rb
@@ -1,9 +1,7 @@
# frozen_string_literal: true
RSpec.describe PostDestroyer do
- before do
- UserActionManager.enable
- end
+ before { UserActionManager.enable }
fab!(:moderator) { Fabricate(:moderator) }
fab!(:admin) { Fabricate(:admin) }
@@ -44,8 +42,8 @@ RSpec.describe PostDestroyer do
end
end
- describe 'destroy_old_stubs' do
- it 'destroys stubs for deleted by user topics' do
+ describe "destroy_old_stubs" do
+ it "destroys stubs for deleted by user topics" do
SiteSetting.delete_removed_posts_after = 24
PostDestroyer.new(post.user, post).destroy
@@ -55,7 +53,7 @@ RSpec.describe PostDestroyer do
expect(post.reload.deleted_at).not_to eq(nil)
end
- it 'destroys stubs for deleted by user posts' do
+ it "destroys stubs for deleted by user posts" do
SiteSetting.delete_removed_posts_after = 24
topic = post.topic
reply1 = create_post(topic: topic)
@@ -103,7 +101,7 @@ RSpec.describe PostDestroyer do
expect(reply1.deleted_at).to_not eq(nil)
end
- it 'uses the delete_removed_posts_after site setting' do
+ it "uses the delete_removed_posts_after site setting" do
topic = post.topic
reply1 = create_post(topic: topic)
reply2 = create_post(topic: topic)
@@ -155,19 +153,22 @@ RSpec.describe PostDestroyer do
reply = create_post(topic: post.topic)
author = reply.user
- post_action = author.user_actions.where(action_type: UserAction::REPLY, target_post_id: reply.id).first
+ post_action =
+ author.user_actions.where(action_type: UserAction::REPLY, target_post_id: reply.id).first
expect(post_action).to be_present
PostDestroyer.new(moderator, reply).destroy
# User Action is removed
- post_action = author.user_actions.where(action_type: UserAction::REPLY, target_post_id: reply.id).first
+ post_action =
+ author.user_actions.where(action_type: UserAction::REPLY, target_post_id: reply.id).first
expect(post_action).to be_blank
PostDestroyer.new(moderator, reply).recover
# On recovery, the user action is recreated
- post_action = author.user_actions.where(action_type: UserAction::REPLY, target_post_id: reply.id).first
+ post_action =
+ author.user_actions.where(action_type: UserAction::REPLY, target_post_id: reply.id).first
expect(post_action).to be_present
end
@@ -175,9 +176,9 @@ RSpec.describe PostDestroyer do
post = Fabricate(:post)
UserDestroyer.new(Discourse.system_user).destroy(post.user, delete_posts: true)
- expect { PostDestroyer.new(admin, post.reload).recover }
- .to change { post.reload.user_id }.to(Discourse.system_user.id)
- .and change { post.topic.user_id }.to(Discourse.system_user.id)
+ expect { PostDestroyer.new(admin, post.reload).recover }.to change { post.reload.user_id }.to(
+ Discourse.system_user.id,
+ ).and change { post.topic.user_id }.to(Discourse.system_user.id)
end
it "bypassed validation when updating users" do
@@ -200,7 +201,7 @@ RSpec.describe PostDestroyer do
expect(@user.user_stat.post_count).to eq(1)
end
- it 'Recovers the post correctly' do
+ it "Recovers the post correctly" do
PostDestroyer.new(admin, post).destroy
post.reload
@@ -215,8 +216,8 @@ RSpec.describe PostDestroyer do
it "doesn't raise an error when the raw doesn't change" do
PostRevisor.new(@reply).revise!(
@user,
- { edit_reason: 'made a change' },
- force_new_version: true
+ { edit_reason: "made a change" },
+ force_new_version: true,
)
PostDestroyer.new(@user, @reply.reload).recover
end
@@ -224,11 +225,11 @@ RSpec.describe PostDestroyer do
it "won't recover a non user-deleted post" do
PostRevisor.new(@reply).revise!(
admin,
- { raw: 'this is a change to the post' },
- force_new_version: true
+ { raw: "this is a change to the post" },
+ force_new_version: true,
)
PostDestroyer.new(@user, @reply.reload).recover
- expect(@reply.reload.raw).to eq('this is a change to the post')
+ expect(@reply.reload.raw).to eq("this is a change to the post")
end
it "should increment the user's post count" do
@@ -240,15 +241,25 @@ RSpec.describe PostDestroyer do
expect(@user.user_stat.topic_count).to eq(1)
expect(@user.reload.user_stat.post_count).to eq(1)
- expect(UserAction.where(target_topic_id: post.topic_id, action_type: UserAction::NEW_TOPIC).count).to eq(1)
- expect(UserAction.where(target_topic_id: post.topic_id, action_type: UserAction::REPLY).count).to eq(1)
+ expect(
+ UserAction.where(
+ target_topic_id: post.topic_id,
+ action_type: UserAction::NEW_TOPIC,
+ ).count,
+ ).to eq(1)
+ expect(
+ UserAction.where(target_topic_id: post.topic_id, action_type: UserAction::REPLY).count,
+ ).to eq(1)
end
it "runs the SyncTopicUserBookmarked for the topic that the post is in so topic_users.bookmarked is correct" do
PostDestroyer.new(@user, @reply).destroy
- expect_enqueued_with(job: :sync_topic_user_bookmarked, args: { topic_id: @reply.topic_id }) do
- PostDestroyer.new(@user, @reply.reload).recover
- end
+ expect_enqueued_with(
+ job: :sync_topic_user_bookmarked,
+ args: {
+ topic_id: @reply.topic_id,
+ },
+ ) { PostDestroyer.new(@user, @reply.reload).recover }
end
end
@@ -278,8 +289,15 @@ RSpec.describe PostDestroyer do
expect(@user.reload.user_stat.topic_count).to eq(1)
expect(@user.user_stat.post_count).to eq(1)
- expect(UserAction.where(target_topic_id: post.topic_id, action_type: UserAction::NEW_TOPIC).count).to eq(1)
- expect(UserAction.where(target_topic_id: post.topic_id, action_type: UserAction::REPLY).count).to eq(1)
+ expect(
+ UserAction.where(
+ target_topic_id: post.topic_id,
+ action_type: UserAction::NEW_TOPIC,
+ ).count,
+ ).to eq(1)
+ expect(
+ UserAction.where(target_topic_id: post.topic_id, action_type: UserAction::REPLY).count,
+ ).to eq(1)
end
context "when recovered by user with access to moderate topic category" do
@@ -314,9 +332,7 @@ RSpec.describe PostDestroyer do
end
context "when the topic is deleted" do
- before do
- @reply.topic.trash!
- end
+ before { @reply.topic.trash! }
it "changes deleted_at to nil" do
changes_deleted_at_to_nil
end
@@ -360,25 +376,26 @@ RSpec.describe PostDestroyer do
it "unmarks the matching incoming email for imap sync" do
SiteSetting.enable_imap = true
- incoming = Fabricate(:incoming_email, imap_sync: true, post: post, topic: post.topic, imap_uid: 99)
+ incoming =
+ Fabricate(:incoming_email, imap_sync: true, post: post, topic: post.topic, imap_uid: 99)
PostDestroyer.new(moderator, post).recover
incoming.reload
expect(incoming.imap_sync).to eq(false)
end
end
- describe 'basic destroying' do
+ describe "basic destroying" do
it "as the creator of the post, doesn't delete the post" do
begin
post2 = create_post
user_stat = post2.user.user_stat
called = 0
- topic_destroyed = -> (topic, user) do
+ topic_destroyed = ->(topic, user) {
expect(topic).to eq(post2.topic)
expect(user).to eq(post2.user)
called += 1
- end
+ }
DiscourseEvent.on(:topic_destroyed, &topic_destroyed)
@@ -390,18 +407,18 @@ RSpec.describe PostDestroyer do
expect(post2.deleted_at).to be_blank
expect(post2.deleted_by).to be_blank
expect(post2.user_deleted).to eq(true)
- expect(post2.raw).to eq(I18n.t('js.topic.deleted_by_author_simple'))
+ expect(post2.raw).to eq(I18n.t("js.topic.deleted_by_author_simple"))
expect(post2.version).to eq(2)
expect(called).to eq(1)
expect(user_stat.reload.post_count).to eq(0)
expect(user_stat.reload.topic_count).to eq(1)
called = 0
- topic_recovered = -> (topic, user) do
+ topic_recovered = ->(topic, user) {
expect(topic).to eq(post2.topic)
expect(user).to eq(post2.user)
called += 1
- end
+ }
DiscourseEvent.on(:topic_recovered, &topic_recovered)
@@ -423,7 +440,7 @@ RSpec.describe PostDestroyer do
it "maintains history when a user destroys a hidden post" do
post.hide!(PostActionType.types[:inappropriate])
PostDestroyer.new(post.user, post).destroy
- expect(post.revisions[0].modifications['raw']).to be_present
+ expect(post.revisions[0].modifications["raw"]).to be_present
end
it "when topic is destroyed, it updates user_stats correctly" do
@@ -463,8 +480,8 @@ RSpec.describe PostDestroyer do
expect(user1.user_stat.post_count).to eq(0)
end
- it 'deletes the published page associated with the topic' do
- slug = 'my-published-page'
+ it "deletes the published page associated with the topic" do
+ slug = "my-published-page"
publish_result = PublishedPage.publish!(admin, post.topic, slug)
pp = publish_result.last
expect(publish_result.first).to eq(true)
@@ -486,7 +503,7 @@ RSpec.describe PostDestroyer do
expect(post.deleted_at).to eq(nil)
expect(post.user_deleted).to eq(true)
- expect(post.raw).to eq(I18n.t('js.post.deleted_by_author_simple'))
+ expect(post.raw).to eq(I18n.t("js.post.deleted_by_author_simple"))
end
it "runs the SyncTopicUserBookmarked for the topic that the post is in so topic_users.bookmarked is correct" do
@@ -497,7 +514,10 @@ RSpec.describe PostDestroyer do
it "skips post revise validations when post is marked for deletion by the author" do
SiteSetting.min_first_post_length = 100
- post = create_post(raw: "this is a long post what passes the min_first_post_length validation " * 3)
+ post =
+ create_post(
+ raw: "this is a long post what passes the min_first_post_length validation " * 3,
+ )
PostDestroyer.new(post.user, post).destroy
post.reload
expect(post.errors).to be_blank
@@ -586,23 +606,23 @@ RSpec.describe PostDestroyer do
it "doesn't count whispers" do
user_stat = admin.user_stat
- whisper = PostCreator.new(
- admin,
- topic_id: post.topic.id,
- reply_to_post_number: 1,
- post_type: Post.types[:whisper],
- raw: 'this is a whispered reply'
- ).create
+ whisper =
+ PostCreator.new(
+ admin,
+ topic_id: post.topic.id,
+ reply_to_post_number: 1,
+ post_type: Post.types[:whisper],
+ raw: "this is a whispered reply",
+ ).create
expect(user_stat.reload.post_count).to eq(0)
- expect {
- PostDestroyer.new(admin, whisper).destroy
- }.to_not change { user_stat.reload.post_count }
+ expect { PostDestroyer.new(admin, whisper).destroy }.to_not change {
+ user_stat.reload.post_count
+ }
end
end
-
end
- describe 'private message' do
+ describe "private message" do
fab!(:author) { Fabricate(:user) }
fab!(:private_message) { Fabricate(:private_message_topic, user: author) }
fab!(:first_post) { Fabricate(:post, topic: private_message, user: author) }
@@ -614,9 +634,7 @@ RSpec.describe PostDestroyer do
author.reload
}.to_not change { author.post_count }
- expect {
- PostDestroyer.new(admin, second_post).recover
- }.to_not change { author.post_count }
+ expect { PostDestroyer.new(admin, second_post).recover }.to_not change { author.post_count }
end
it "doesn't update topic_count for first post" do
@@ -627,7 +645,7 @@ RSpec.describe PostDestroyer do
expect(author.post_count).to eq(0) # also unchanged
end
- it 'triggers the extensibility events' do
+ it "triggers the extensibility events" do
events = DiscourseEvent.track_events { PostDestroyer.new(admin, first_post).destroy }.last(2)
expect(events[0][:event_name]).to eq(:post_destroyed)
@@ -637,7 +655,7 @@ RSpec.describe PostDestroyer do
expect(events[1][:params].first).to eq(first_post.topic)
end
- it 'should not log a personal message view' do
+ it "should not log a personal message view" do
SiteSetting.log_personal_messages_views = true
Fabricate(:topic_web_hook)
StaffActionLogger.any_instance.expects(:log_check_personal_message).never
@@ -646,14 +664,13 @@ RSpec.describe PostDestroyer do
end
describe "deleting a post directly after a whisper" do
- before do
- SiteSetting.whispers_allowed_groups = "#{Group::AUTO_GROUPS[:staff]}"
- end
+ before { SiteSetting.whispers_allowed_groups = "#{Group::AUTO_GROUPS[:staff]}" }
- it 'should not set Topic#last_post_user_id to a whisperer' do
+ it "should not set Topic#last_post_user_id to a whisperer" do
post_1 = create_post(topic: post.topic, user: moderator)
create_post(topic: post.topic, user: Fabricate(:user), post_type: Post.types[:whisper])
- whisper_2 = create_post(topic: post.topic, user: Fabricate(:user), post_type: Post.types[:whisper])
+ whisper_2 =
+ create_post(topic: post.topic, user: Fabricate(:user), post_type: Post.types[:whisper])
PostDestroyer.new(admin, whisper_2).destroy
@@ -661,7 +678,7 @@ RSpec.describe PostDestroyer do
end
end
- describe 'deleting the second post in a topic' do
+ describe "deleting the second post in a topic" do
fab!(:user) { Fabricate(:user) }
let!(:post) { create_post(user: user) }
let(:topic) { post.topic }
@@ -673,22 +690,22 @@ RSpec.describe PostDestroyer do
topic.reload
end
- it 'resets the last_poster_id back to the OP' do
+ it "resets the last_poster_id back to the OP" do
expect(topic.last_post_user_id).to eq(user.id)
end
- it 'resets the last_posted_at back to the OP' do
+ it "resets the last_posted_at back to the OP" do
expect(topic.last_posted_at.to_i).to eq(post.created_at.to_i)
end
- it 'resets the highest_post_number' do
+ it "resets the highest_post_number" do
expect(topic.highest_post_number).to eq(post.post_number)
end
- context 'with topic_user' do
+ context "with topic_user" do
let(:topic_user) { second_user.topic_users.find_by(topic_id: topic.id) }
- it 'clears the posted flag for the second user' do
+ it "clears the posted flag for the second user" do
expect(topic_user.posted?).to eq(false)
end
@@ -708,9 +725,7 @@ RSpec.describe PostDestroyer do
end
context "as a moderator" do
- before do
- PostDestroyer.new(moderator, post).destroy
- end
+ before { PostDestroyer.new(moderator, post).destroy }
it "deletes the post" do
expect(post.deleted_at).to be_present
@@ -732,7 +747,7 @@ RSpec.describe PostDestroyer do
expect { subject }.to change { UserHistory.count }.by(1)
end
- it 'triggers a extensibility event' do
+ it "triggers a extensibility event" do
events = DiscourseEvent.track_events { subject }
expect(events[0][:event_name]).to eq(:post_destroyed)
@@ -795,7 +810,7 @@ RSpec.describe PostDestroyer do
expect(post.deleted_by).to eq(admin)
end
- describe 'after delete' do
+ describe "after delete" do
fab!(:coding_horror) { coding_horror }
fab!(:post) { Fabricate(:post, raw: "Hello @CodingHorror") }
@@ -827,11 +842,11 @@ RSpec.describe PostDestroyer do
end
end
- context 'with a reply' do
+ context "with a reply" do
fab!(:reply) { Fabricate(:basic_reply, user: coding_horror, topic: post.topic) }
let!(:post_reply) { PostReply.create(post_id: post.id, reply_post_id: reply.id) }
- it 'changes the post count of the topic' do
+ it "changes the post count of the topic" do
post.reload
expect {
PostDestroyer.new(moderator, reply).destroy
@@ -839,13 +854,14 @@ RSpec.describe PostDestroyer do
}.to change(post.topic, :posts_count).by(-1)
end
- it 'lowers the reply_count when the reply is deleted' do
- expect {
- PostDestroyer.new(moderator, reply).destroy
- }.to change(post.post_replies, :count).by(-1)
+ it "lowers the reply_count when the reply is deleted" do
+ expect { PostDestroyer.new(moderator, reply).destroy }.to change(
+ post.post_replies,
+ :count,
+ ).by(-1)
end
- it 'should increase the post_number when there are deletion gaps' do
+ it "should increase the post_number when there are deletion gaps" do
PostDestroyer.new(moderator, reply).destroy
p = Fabricate(:post, user: post.user, topic: post.topic)
expect(p.post_number).to eq(3)
@@ -853,14 +869,15 @@ RSpec.describe PostDestroyer do
end
end
- describe '@mentions' do
- it 'removes notifications when deleted' do
+ describe "@mentions" do
+ it "removes notifications when deleted" do
Jobs.run_immediately!
user = Fabricate(:evil_trout)
- post = create_post(raw: 'Hello @eviltrout')
- expect {
- PostDestroyer.new(moderator, post).destroy
- }.to change(user.notifications, :count).by(-1)
+ post = create_post(raw: "Hello @eviltrout")
+ expect { PostDestroyer.new(moderator, post).destroy }.to change(
+ user.notifications,
+ :count,
+ ).by(-1)
end
end
@@ -869,9 +886,7 @@ RSpec.describe PostDestroyer do
let(:flag_result) { PostActionCreator.off_topic(moderator, second_post) }
let!(:flag) { flag_result.post_action }
- before do
- Jobs::SendSystemMessage.clear
- end
+ before { Jobs::SendSystemMessage.clear }
it "should delete public post actions and agree with flags" do
url = second_post.url
@@ -889,18 +904,21 @@ RSpec.describe PostDestroyer do
Jobs::SendSystemMessage.new.execute(jobs[0]["args"][0].with_indifferent_access)
- expect(Post.last.raw).to eq(I18n.t(
- "system_messages.flags_agreed_and_post_deleted.text_body_template",
- flagged_post_raw_content: second_post.raw,
- url: url,
- flag_reason: I18n.t(
- "flag_reasons.#{PostActionType.flag_types[off_topic.post_action_type_id]}",
- locale: SiteSetting.default_locale,
- base_path: Discourse.base_path
- ),
- site_name: SiteSetting.title,
- base_url: Discourse.base_url
- ).strip)
+ expect(Post.last.raw).to eq(
+ I18n.t(
+ "system_messages.flags_agreed_and_post_deleted.text_body_template",
+ flagged_post_raw_content: second_post.raw,
+ url: url,
+ flag_reason:
+ I18n.t(
+ "flag_reasons.#{PostActionType.flag_types[off_topic.post_action_type_id]}",
+ locale: SiteSetting.default_locale,
+ base_path: Discourse.base_path,
+ ),
+ site_name: SiteSetting.title,
+ base_url: Discourse.base_url,
+ ).strip,
+ )
end
it "should not send the flags_agreed_and_post_deleted message if it was deleted by system" do
@@ -941,11 +959,13 @@ RSpec.describe PostDestroyer do
let(:second_post) { Fabricate(:post, topic_id: post.topic_id) }
def create_user_action(action_type)
- UserAction.log_action!(action_type: action_type,
- user_id: codinghorror.id,
- acting_user_id: codinghorror.id,
- target_topic_id: second_post.topic_id,
- target_post_id: second_post.id)
+ UserAction.log_action!(
+ action_type: action_type,
+ user_id: codinghorror.id,
+ acting_user_id: codinghorror.id,
+ target_topic_id: second_post.topic_id,
+ target_post_id: second_post.id,
+ )
end
it "should delete the user actions" do
@@ -957,35 +977,37 @@ RSpec.describe PostDestroyer do
end
end
- describe 'topic links' do
- fab!(:first_post) { Fabricate(:post) }
- let!(:topic) { first_post.topic }
+ describe "topic links" do
+ fab!(:first_post) { Fabricate(:post) }
+ let!(:topic) { first_post.topic }
let!(:second_post) { Fabricate(:post_with_external_links, topic: topic) }
before { TopicLink.extract_from(second_post) }
- it 'should destroy the topic links when moderator destroys the post' do
+ it "should destroy the topic links when moderator destroys the post" do
PostDestroyer.new(moderator, second_post.reload).destroy
expect(topic.topic_links.count).to eq(0)
end
- it 'should destroy the topic links when the user destroys the post' do
+ it "should destroy the topic links when the user destroys the post" do
PostDestroyer.new(second_post.user, second_post.reload).destroy
expect(topic.topic_links.count).to eq(0)
end
end
- describe 'internal links' do
- fab!(:topic) { Fabricate(:topic) }
+ describe "internal links" do
+ fab!(:topic) { Fabricate(:topic) }
let!(:second_post) { Fabricate(:post, topic: topic) }
- fab!(:other_topic) { Fabricate(:topic) }
+ fab!(:other_topic) { Fabricate(:topic) }
let!(:other_post) { Fabricate(:post, topic: other_topic) }
fab!(:user) { Fabricate(:user) }
let!(:base_url) { URI.parse(Discourse.base_url) }
let!(:guardian) { Guardian.new }
- let!(:url) { "http://#{base_url.host}/t/#{other_topic.slug}/#{other_topic.id}/#{other_post.post_number}" }
+ let!(:url) do
+ "http://#{base_url.host}/t/#{other_topic.slug}/#{other_topic.id}/#{other_post.post_number}"
+ end
- it 'should destroy internal links when user deletes own post' do
+ it "should destroy internal links when user deletes own post" do
new_post = Post.create!(user: user, topic: topic, raw: "Link to other topic:\n\n#{url}\n")
TopicLink.extract_from(new_post)
@@ -998,7 +1020,7 @@ RSpec.describe PostDestroyer do
expect(updated_link_counts.count).to eq(0)
end
- it 'should destroy internal links when moderator deletes post' do
+ it "should destroy internal links when moderator deletes post" do
new_post = create_post(user: user, topic: topic, raw: "Link to other topic:\n\n#{url}\n")
TopicLink.extract_from(new_post)
link_counts = TopicLink.counts_for(guardian, other_topic.reload, [other_post])
@@ -1012,8 +1034,10 @@ RSpec.describe PostDestroyer do
end
end
- describe '.delete_with_replies' do
- subject(:delete_with_replies) { PostDestroyer.delete_with_replies(reporter, post, defer_reply_flags: defer_reply_flags) }
+ describe ".delete_with_replies" do
+ subject(:delete_with_replies) do
+ PostDestroyer.delete_with_replies(reporter, post, defer_reply_flags: defer_reply_flags)
+ end
fab!(:post) { Fabricate(:post) }
let(:reporter) { Discourse.system_user }
@@ -1026,19 +1050,19 @@ RSpec.describe PostDestroyer do
reviewable_reply
end
- context 'when deferring reply flags' do
+ context "when deferring reply flags" do
let(:defer_reply_flags) { true }
- it 'ignores flagged replies' do
+ it "ignores flagged replies" do
delete_with_replies
expect(reviewable_reply.reload).to be_ignored
end
end
- context 'when not deferring reply flags' do
+ context "when not deferring reply flags" do
let(:defer_reply_flags) { false }
- it 'approves flagged replies' do
+ it "approves flagged replies" do
delete_with_replies
expect(reviewable_reply.reload).to be_approved
end
@@ -1048,7 +1072,7 @@ RSpec.describe PostDestroyer do
describe "featured topics for user_profiles" do
fab!(:user) { Fabricate(:user) }
- it 'clears the user_profiles featured_topic column' do
+ it "clears the user_profiles featured_topic column" do
user.user_profile.update(featured_topic: post.topic)
PostDestroyer.new(admin, post).destroy
expect(user.user_profile.reload.featured_topic).to eq(nil)
@@ -1082,7 +1106,7 @@ RSpec.describe PostDestroyer do
expect { upload1.reload }.to raise_error(ActiveRecord::RecordNotFound)
end
- it 'soft delete if not creator of post or not private message' do
+ it "soft delete if not creator of post or not private message" do
PostDestroyer.new(moderator, reply, permanent: true).destroy
expect(reply.deleted_at).not_to eq(nil)
@@ -1092,7 +1116,7 @@ RSpec.describe PostDestroyer do
expect(post_revision.reload.persisted?).to be true
end
- it 'always destroy the post when the force_destroy option is passed' do
+ it "always destroy the post when the force_destroy option is passed" do
PostDestroyer.new(moderator, reply, force_destroy: true).destroy
expect { reply.reload }.to raise_error(ActiveRecord::RecordNotFound)
@@ -1108,15 +1132,20 @@ RSpec.describe PostDestroyer do
fab!(:first_post) { Fabricate(:post, created_at: 10.days.ago.round) }
fab!(:walter_white) { Fabricate(:walter_white) }
let!(:topic) { first_post.topic }
- let!(:reply) { Fabricate(:post, topic: topic, created_at: 5.days.ago.round, user: coding_horror) }
- let!(:expendable_reply) { Fabricate(:post, topic: topic, created_at: 2.days.ago.round, user: walter_white) }
+ let!(:reply) do
+ Fabricate(:post, topic: topic, created_at: 5.days.ago.round, user: coding_horror)
+ end
+ let!(:expendable_reply) do
+ Fabricate(:post, topic: topic, created_at: 2.days.ago.round, user: walter_white)
+ end
- it 'when a post is destroyed publishes updated topic stats' do
+ it "when a post is destroyed publishes updated topic stats" do
expect(topic.reload.posts_count).to eq(3)
- messages = MessageBus.track_publish("/topic/#{topic.id}") do
- PostDestroyer.new(moderator, expendable_reply, force_destroy: true).destroy
- end
+ messages =
+ MessageBus.track_publish("/topic/#{topic.id}") do
+ PostDestroyer.new(moderator, expendable_reply, force_destroy: true).destroy
+ end
expect { expendable_reply.reload }.to raise_error(ActiveRecord::RecordNotFound)
@@ -1124,15 +1153,18 @@ RSpec.describe PostDestroyer do
expect(stats_message).to be_present
expect(stats_message.data[:posts_count]).to eq(2)
expect(stats_message.data[:last_posted_at]).to eq(reply.created_at.as_json)
- expect(stats_message.data[:last_poster]).to eq(BasicUserSerializer.new(reply.user, root: false).as_json)
+ expect(stats_message.data[:last_poster]).to eq(
+ BasicUserSerializer.new(reply.user, root: false).as_json,
+ )
end
- it 'when a post is deleted publishes updated topic stats' do
+ it "when a post is deleted publishes updated topic stats" do
expect(topic.reload.posts_count).to eq(3)
- messages = MessageBus.track_publish("/topic/#{topic.id}") do
- PostDestroyer.new(moderator, expendable_reply).destroy
- end
+ messages =
+ MessageBus.track_publish("/topic/#{topic.id}") do
+ PostDestroyer.new(moderator, expendable_reply).destroy
+ end
expect(expendable_reply.reload.deleted_at).not_to eq(nil)
@@ -1140,10 +1172,12 @@ RSpec.describe PostDestroyer do
expect(stats_message).to be_present
expect(stats_message.data[:posts_count]).to eq(2)
expect(stats_message.data[:last_posted_at]).to eq(reply.created_at.as_json)
- expect(stats_message.data[:last_poster]).to eq(BasicUserSerializer.new(reply.user, root: false).as_json)
+ expect(stats_message.data[:last_poster]).to eq(
+ BasicUserSerializer.new(reply.user, root: false).as_json,
+ )
end
- it 'when a post is recovered publishes update topic stats' do
+ it "when a post is recovered publishes update topic stats" do
expect(topic.reload.posts_count).to eq(3)
PostDestroyer.new(moderator, expendable_reply).destroy
@@ -1151,9 +1185,10 @@ RSpec.describe PostDestroyer do
expendable_reply.reload
- messages = MessageBus.track_publish("/topic/#{topic.id}") do
- PostDestroyer.new(admin, expendable_reply).recover
- end
+ messages =
+ MessageBus.track_publish("/topic/#{topic.id}") do
+ PostDestroyer.new(admin, expendable_reply).recover
+ end
expect(topic.reload.posts_count).to eq(3)
@@ -1161,7 +1196,9 @@ RSpec.describe PostDestroyer do
expect(stats_message).to be_present
expect(stats_message.data[:posts_count]).to eq(3)
expect(stats_message.data[:last_posted_at]).to eq(expendable_reply.created_at.as_json)
- expect(stats_message.data[:last_poster]).to eq(BasicUserSerializer.new(expendable_reply.user, root: false).as_json)
+ expect(stats_message.data[:last_poster]).to eq(
+ BasicUserSerializer.new(expendable_reply.user, root: false).as_json,
+ )
end
end
end
diff --git a/spec/lib/post_jobs_enqueuer_spec.rb b/spec/lib/post_jobs_enqueuer_spec.rb
index d4cb1dde511..3a66a3ab4dc 100644
--- a/spec/lib/post_jobs_enqueuer_spec.rb
+++ b/spec/lib/post_jobs_enqueuer_spec.rb
@@ -10,13 +10,14 @@ RSpec.describe PostJobsEnqueuer do
context "for regular topics" do
it "enqueues the :post_alert job" do
- expect_enqueued_with(job: :post_alert, args: {
- post_id: post.id,
- new_record: true,
- options: opts[:post_alert_options]
- }) do
- subject.enqueue_jobs
- end
+ expect_enqueued_with(
+ job: :post_alert,
+ args: {
+ post_id: post.id,
+ new_record: true,
+ options: opts[:post_alert_options],
+ },
+ ) { subject.enqueue_jobs }
end
it "enqueues the :notify_mailing_list_subscribers job" do
@@ -93,9 +94,12 @@ RSpec.describe PostJobsEnqueuer do
end
it "does not enqueue the :make_embedded_topic_visible job" do
- expect_not_enqueued_with(job: :make_embedded_topic_visible, args: { topic_id: topic.id }) do
- subject.enqueue_jobs
- end
+ expect_not_enqueued_with(
+ job: :make_embedded_topic_visible,
+ args: {
+ topic_id: topic.id,
+ },
+ ) { subject.enqueue_jobs }
end
end
end
diff --git a/spec/lib/post_locker_spec.rb b/spec/lib/post_locker_spec.rb
index 26f826589f5..99fa861b242 100644
--- a/spec/lib/post_locker_spec.rb
+++ b/spec/lib/post_locker_spec.rb
@@ -5,9 +5,7 @@ RSpec.describe PostLocker do
fab!(:post) { Fabricate(:post) }
it "doesn't allow regular users to lock posts" do
- expect {
- PostLocker.new(post, post.user).lock
- }.to raise_error(Discourse::InvalidAccess)
+ expect { PostLocker.new(post, post.user).lock }.to raise_error(Discourse::InvalidAccess)
expect(post).not_to be_locked
expect(post.locked_by_id).to be_blank
@@ -16,9 +14,7 @@ RSpec.describe PostLocker do
it "doesn't allow regular users to unlock posts" do
PostLocker.new(post, moderator).lock
- expect {
- PostLocker.new(post, post.user).lock
- }.to raise_error(Discourse::InvalidAccess)
+ expect { PostLocker.new(post, post.user).lock }.to raise_error(Discourse::InvalidAccess)
expect(post).to be_locked
expect(post.locked_by_id).to eq(moderator.id)
@@ -31,18 +27,21 @@ RSpec.describe PostLocker do
PostLocker.new(post, moderator).lock
expect(post).to be_locked
expect(post.locked_by_id).to eq(moderator.id)
- expect(UserHistory.where(
- acting_user_id: moderator.id,
- action: UserHistory.actions[:post_locked]
- ).exists?).to eq(true)
+ expect(
+ UserHistory.where(
+ acting_user_id: moderator.id,
+ action: UserHistory.actions[:post_locked],
+ ).exists?,
+ ).to eq(true)
PostLocker.new(post, moderator).unlock
expect(post).not_to be_locked
expect(post.locked_by_id).to be_blank
- expect(UserHistory.where(
- acting_user_id: moderator.id,
- action: UserHistory.actions[:post_unlocked]
- ).exists?).to eq(true)
+ expect(
+ UserHistory.where(
+ acting_user_id: moderator.id,
+ action: UserHistory.actions[:post_unlocked],
+ ).exists?,
+ ).to eq(true)
end
-
end
diff --git a/spec/lib/post_merger_spec.rb b/spec/lib/post_merger_spec.rb
index 4e9483ef001..676b94cad4a 100644
--- a/spec/lib/post_merger_spec.rb
+++ b/spec/lib/post_merger_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-require 'post_merger'
+require "post_merger"
RSpec.describe PostMerger do
fab!(:moderator) { Fabricate(:moderator) }
@@ -11,12 +11,14 @@ RSpec.describe PostMerger do
describe ".merge" do
it "should merge posts into the latest post correctly" do
- reply1 = create_post(topic: topic, raw: 'The first reply', post_number: 2, user: user)
- reply2 = create_post(topic: topic, raw: "The second reply\nSecond line", post_number: 3, user: user)
- reply3 = create_post(topic: topic, raw: 'The third reply', post_number: 4, user: user)
+ reply1 = create_post(topic: topic, raw: "The first reply", post_number: 2, user: user)
+ reply2 =
+ create_post(topic: topic, raw: "The second reply\nSecond line", post_number: 3, user: user)
+ reply3 = create_post(topic: topic, raw: "The third reply", post_number: 4, user: user)
replies = [reply3, reply2, reply1]
- message = MessageBus.track_publish("/topic/#{topic.id}") { PostMerger.new(admin, replies).merge }.last
+ message =
+ MessageBus.track_publish("/topic/#{topic.id}") { PostMerger.new(admin, replies).merge }.last
expect(message.data[:type]).to eq(:revised)
expect(message.data[:post_number]).to eq(reply3.post_number)
@@ -25,13 +27,12 @@ RSpec.describe PostMerger do
expect(reply2.trashed?).to eq(true)
expect(reply3.deleted_at).to eq(nil)
- expect(reply3.edit_reason).to eq(I18n.t(
- "merge_posts.edit_reason",
- count: replies.count - 1, username: admin.username
- ))
+ expect(reply3.edit_reason).to eq(
+ I18n.t("merge_posts.edit_reason", count: replies.count - 1, username: admin.username),
+ )
expect(reply3.raw).to eq(
- "The first reply\n\nThe second reply\nSecond line\n\nThe third reply"
+ "The first reply\n\nThe second reply\nSecond line\n\nThe third reply",
)
end
@@ -40,7 +41,9 @@ RSpec.describe PostMerger do
reply1 = create_post(topic: topic, post_number: post.post_number, user: user)
reply2 = create_post(topic: topic, post_number: post.post_number, user: user)
- expect { PostMerger.new(admin, [reply2, post, reply1]).merge }.to raise_error(Discourse::InvalidAccess)
+ expect { PostMerger.new(admin, [reply2, post, reply1]).merge }.to raise_error(
+ Discourse::InvalidAccess,
+ )
end
it "should only allow staff to merge posts" do
@@ -54,10 +57,18 @@ RSpec.describe PostMerger do
tl3 = Fabricate(:user, trust_level: 3)
tl4 = Fabricate(:user, trust_level: 4)
- expect { PostMerger.new(tl1, [reply2, reply1]).merge }.to raise_error(Discourse::InvalidAccess)
- expect { PostMerger.new(tl2, [reply2, reply1]).merge }.to raise_error(Discourse::InvalidAccess)
- expect { PostMerger.new(tl3, [reply2, reply1]).merge }.to raise_error(Discourse::InvalidAccess)
- expect { PostMerger.new(tl4, [reply2, reply1]).merge }.to raise_error(Discourse::InvalidAccess)
+ expect { PostMerger.new(tl1, [reply2, reply1]).merge }.to raise_error(
+ Discourse::InvalidAccess,
+ )
+ expect { PostMerger.new(tl2, [reply2, reply1]).merge }.to raise_error(
+ Discourse::InvalidAccess,
+ )
+ expect { PostMerger.new(tl3, [reply2, reply1]).merge }.to raise_error(
+ Discourse::InvalidAccess,
+ )
+ expect { PostMerger.new(tl4, [reply2, reply1]).merge }.to raise_error(
+ Discourse::InvalidAccess,
+ )
PostMerger.new(Fabricate(:admin), [reply2, reply1]).merge
@@ -71,7 +82,8 @@ RSpec.describe PostMerger do
another_post = create_post(user: post.user)
expect { PostMerger.new(user, [another_post, post]).merge }.to raise_error(
- PostMerger::CannotMergeError, I18n.t("merge_posts.errors.different_topics")
+ PostMerger::CannotMergeError,
+ I18n.t("merge_posts.errors.different_topics"),
)
end
@@ -79,20 +91,23 @@ RSpec.describe PostMerger do
another_post = create_post(user: user, topic_id: topic.id)
expect { PostMerger.new(user, [another_post, post]).merge }.to raise_error(
- PostMerger::CannotMergeError, I18n.t("merge_posts.errors.different_users")
+ PostMerger::CannotMergeError,
+ I18n.t("merge_posts.errors.different_users"),
)
end
it "should not allow posts with length greater than max_post_length" do
SiteSetting.max_post_length = 60
- reply1 = create_post(topic: topic, raw: 'The first reply', post_number: 2, user: user)
- reply2 = create_post(topic: topic, raw: "The second reply\nSecond line", post_number: 3, user: user)
- reply3 = create_post(topic: topic, raw: 'The third reply', post_number: 4, user: user)
+ reply1 = create_post(topic: topic, raw: "The first reply", post_number: 2, user: user)
+ reply2 =
+ create_post(topic: topic, raw: "The second reply\nSecond line", post_number: 3, user: user)
+ reply3 = create_post(topic: topic, raw: "The third reply", post_number: 4, user: user)
replies = [reply3, reply2, reply1]
expect { PostMerger.new(admin, replies).merge }.to raise_error(
- PostMerger::CannotMergeError, I18n.t("merge_posts.errors.max_post_length")
+ PostMerger::CannotMergeError,
+ I18n.t("merge_posts.errors.max_post_length"),
)
end
end
diff --git a/spec/lib/post_revisor_spec.rb b/spec/lib/post_revisor_spec.rb
index 2810a21e89b..7af48fcdb73 100644
--- a/spec/lib/post_revisor_spec.rb
+++ b/spec/lib/post_revisor_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-require 'post_revisor'
+require "post_revisor"
RSpec.describe PostRevisor do
fab!(:topic) { Fabricate(:topic) }
@@ -11,56 +11,55 @@ RSpec.describe PostRevisor do
fab!(:moderator) { Fabricate(:moderator) }
let(:post_args) { { user: newuser, topic: topic } }
- describe 'TopicChanges' do
- let(:tc) {
+ describe "TopicChanges" do
+ let(:tc) do
topic.reload
PostRevisor::TopicChanges.new(topic, topic.user)
- }
+ end
- it 'provides a guardian' do
+ it "provides a guardian" do
expect(tc.guardian).to be_an_instance_of Guardian
end
- it 'tracks changes properly' do
+ it "tracks changes properly" do
expect(tc.diff).to eq({})
# it remembers changes we tell it to
- tc.record_change('height', '180cm', '170cm')
- expect(tc.diff['height']).to eq(['180cm', '170cm'])
+ tc.record_change("height", "180cm", "170cm")
+ expect(tc.diff["height"]).to eq(%w[180cm 170cm])
# it works with arrays of values
- tc.record_change('colors', nil, ['red', 'blue'])
- expect(tc.diff['colors']).to eq([nil, ['red', 'blue']])
+ tc.record_change("colors", nil, %w[red blue])
+ expect(tc.diff["colors"]).to eq([nil, %w[red blue]])
# it does not record changes to the same val
- tc.record_change('wat', 'js', 'js')
- expect(tc.diff['wat']).to be_nil
-
- tc.record_change('tags', ['a', 'b'], ['a', 'b'])
- expect(tc.diff['tags']).to be_nil
+ tc.record_change("wat", "js", "js")
+ expect(tc.diff["wat"]).to be_nil
+ tc.record_change("tags", %w[a b], %w[a b])
+ expect(tc.diff["tags"]).to be_nil
end
end
- describe 'editing category' do
+ describe "editing category" do
it "triggers the :post_edited event with topic_changed?" do
category = Fabricate(:category)
category.set_permissions(everyone: :full)
category.save!
post = create_post
- events = DiscourseEvent.track_events do
- post.revise(post.user, category_id: category.id)
- end
+ events = DiscourseEvent.track_events { post.revise(post.user, category_id: category.id) }
event = events.find { |e| e[:event_name] == :post_edited }
expect(event[:params].first).to eq(post)
expect(event[:params].second).to eq(true)
expect(event[:params].third).to be_kind_of(PostRevisor)
- expect(event[:params].third.topic_diff).to eq({ "category_id" => [SiteSetting.uncategorized_category_id, category.id] })
+ expect(event[:params].third.topic_diff).to eq(
+ { "category_id" => [SiteSetting.uncategorized_category_id, category.id] },
+ )
end
- it 'does not revise category when no permission to create a topic in category' do
+ it "does not revise category when no permission to create a topic in category" do
category = Fabricate(:category)
category.set_permissions(staff: :full)
category.save!
@@ -82,7 +81,7 @@ RSpec.describe PostRevisor do
expect(post.topic.category_id).to eq(category.id)
end
- it 'does not revise category when the destination category requires topic approval' do
+ it "does not revise category when the destination category requires topic approval" do
new_category = Fabricate(:category)
new_category.custom_fields[Category::REQUIRE_TOPIC_APPROVAL] = true
new_category.save!
@@ -100,7 +99,7 @@ RSpec.describe PostRevisor do
expect(post.reload.topic.category_id).to eq(new_category.id)
end
- it 'does not revise category if incorrect amount of tags' do
+ it "does not revise category if incorrect amount of tags" do
SiteSetting.min_trust_to_create_tag = 0
SiteSetting.min_trust_level_to_tag_topics = 0
@@ -118,12 +117,12 @@ RSpec.describe PostRevisor do
expect(post.reload.topic.category_id).to eq(new_category.id)
topic_tag.destroy
- post.revise(post.user, category_id: new_category.id, tags: ['test_tag'])
+ post.revise(post.user, category_id: new_category.id, tags: ["test_tag"])
expect(post.reload.topic.category_id).to eq(new_category.id)
end
end
- describe 'editing tags' do
+ describe "editing tags" do
fab!(:post) { Fabricate(:post) }
subject { PostRevisor.new(post) }
@@ -134,33 +133,32 @@ RSpec.describe PostRevisor do
TopicUser.change(
newuser.id,
post.topic_id,
- notification_level: TopicUser.notification_levels[:watching]
+ notification_level: TopicUser.notification_levels[:watching],
)
end
- it 'creates notifications' do
- expect { subject.revise!(admin, tags: ['new-tag']) }
- .to change { Notification.count }.by(1)
+ it "creates notifications" do
+ expect { subject.revise!(admin, tags: ["new-tag"]) }.to change { Notification.count }.by(1)
end
- it 'skips notifications if disable_tags_edit_notifications' do
+ it "skips notifications if disable_tags_edit_notifications" do
SiteSetting.disable_tags_edit_notifications = true
- expect { subject.revise!(admin, tags: ['new-tag']) }
- .not_to change { Notification.count }
+ expect { subject.revise!(admin, tags: ["new-tag"]) }.not_to change { Notification.count }
end
end
- describe 'revise wiki' do
+ describe "revise wiki" do
before do
# There used to be a bug where wiki changes were considered posting "too similar"
# so this is enabled and checked
- Discourse.redis.delete_prefixed('unique-post')
+ Discourse.redis.delete_prefixed("unique-post")
SiteSetting.unique_posts_mins = 10
end
- it 'allows the user to change it to a wiki' do
- pc = PostCreator.new(newuser, topic_id: topic.id, raw: 'this is a post that will become a wiki')
+ it "allows the user to change it to a wiki" do
+ pc =
+ PostCreator.new(newuser, topic_id: topic.id, raw: "this is a post that will become a wiki")
post = pc.create
expect(post.revise(post.user, wiki: true)).to be_truthy
post.reload
@@ -168,29 +166,29 @@ RSpec.describe PostRevisor do
end
end
- describe 'revise' do
+ describe "revise" do
let(:post) { Fabricate(:post, post_args) }
let(:first_version_at) { post.last_version_at }
subject { PostRevisor.new(post) }
- it 'destroys last revision if edit is undone' do
+ it "destroys last revision if edit is undone" do
old_raw = post.raw
- subject.revise!(admin, raw: 'new post body', tags: ['new-tag'])
- expect(post.topic.reload.tags.map(&:name)).to contain_exactly('new-tag')
+ subject.revise!(admin, raw: "new post body", tags: ["new-tag"])
+ expect(post.topic.reload.tags.map(&:name)).to contain_exactly("new-tag")
expect(post.post_revisions.reload.size).to eq(1)
subject.revise!(admin, raw: old_raw, tags: [])
expect(post.topic.reload.tags.map(&:name)).to be_empty
expect(post.post_revisions.reload.size).to eq(0)
- subject.revise!(admin, raw: 'next post body', tags: ['new-tag'])
- expect(post.topic.reload.tags.map(&:name)).to contain_exactly('new-tag')
+ subject.revise!(admin, raw: "next post body", tags: ["new-tag"])
+ expect(post.topic.reload.tags.map(&:name)).to contain_exactly("new-tag")
expect(post.post_revisions.reload.size).to eq(1)
end
- describe 'with the same body' do
+ describe "with the same body" do
it "doesn't change version" do
expect {
expect(subject.revise!(post.user, raw: post.raw)).to eq(false)
@@ -199,7 +197,7 @@ RSpec.describe PostRevisor do
end
end
- describe 'with nil raw contents' do
+ describe "with nil raw contents" do
it "doesn't change version" do
expect {
expect(subject.revise!(post.user, raw: nil)).to eq(false)
@@ -208,16 +206,14 @@ RSpec.describe PostRevisor do
end
end
- describe 'topic is in slow mode' do
- before do
- topic.update!(slow_mode_seconds: 1000)
- end
+ describe "topic is in slow mode" do
+ before { topic.update!(slow_mode_seconds: 1000) }
- it 'regular edits are not allowed by default' do
+ it "regular edits are not allowed by default" do
subject.revise!(
post.user,
- { raw: 'updated body' },
- revised_at: post.updated_at + 1000.minutes
+ { raw: "updated body" },
+ revised_at: post.updated_at + 1000.minutes,
)
post.reload
@@ -225,50 +221,50 @@ RSpec.describe PostRevisor do
expect(post.errors.messages[:base].first).to be I18n.t("cannot_edit_on_slow_mode")
end
- it 'grace period editing is allowed' do
+ it "grace period editing is allowed" do
SiteSetting.editing_grace_period = 1.minute
subject.revise!(
post.user,
- { raw: 'updated body' },
- revised_at: post.updated_at + 10.seconds
+ { raw: "updated body" },
+ revised_at: post.updated_at + 10.seconds,
)
post.reload
expect(post.errors).to be_empty
end
- it 'regular edits are allowed if it was turned on in settings' do
+ it "regular edits are allowed if it was turned on in settings" do
SiteSetting.slow_mode_prevents_editing = false
subject.revise!(
post.user,
- { raw: 'updated body' },
- revised_at: post.updated_at + 10.minutes
+ { raw: "updated body" },
+ revised_at: post.updated_at + 10.minutes,
)
post.reload
expect(post.errors).to be_empty
end
- it 'staff is allowed to edit posts even if the topic is in slow mode' do
+ it "staff is allowed to edit posts even if the topic is in slow mode" do
admin = Fabricate(:admin)
- subject.revise!(
- admin,
- { raw: 'updated body' },
- revised_at: post.updated_at + 10.minutes
- )
+ subject.revise!(admin, { raw: "updated body" }, revised_at: post.updated_at + 10.minutes)
post.reload
expect(post.errors).to be_empty
end
end
- describe 'grace period editing' do
- it 'correctly applies edits' do
+ describe "grace period editing" do
+ it "correctly applies edits" do
SiteSetting.editing_grace_period = 1.minute
- subject.revise!(post.user, { raw: 'updated body' }, revised_at: post.updated_at + 10.seconds)
+ subject.revise!(
+ post.user,
+ { raw: "updated body" },
+ revised_at: post.updated_at + 10.seconds,
+ )
post.reload
expect(post.version).to eq(1)
@@ -281,16 +277,24 @@ RSpec.describe PostRevisor do
it "does create a new version if a large diff happens" do
SiteSetting.editing_grace_period_max_diff = 10
- post = Fabricate(:post, raw: 'hello world')
+ post = Fabricate(:post, raw: "hello world")
revisor = PostRevisor.new(post)
- revisor.revise!(post.user, { raw: 'hello world123456789' }, revised_at: post.updated_at + 1.second)
+ revisor.revise!(
+ post.user,
+ { raw: "hello world123456789" },
+ revised_at: post.updated_at + 1.second,
+ )
post.reload
expect(post.version).to eq(1)
revisor = PostRevisor.new(post)
- revisor.revise!(post.user, { raw: 'hello world12345678901' }, revised_at: post.updated_at + 1.second)
+ revisor.revise!(
+ post.user,
+ { raw: "hello world12345678901" },
+ revised_at: post.updated_at + 1.second,
+ )
post.reload
expect(post.version).to eq(2)
@@ -303,12 +307,15 @@ RSpec.describe PostRevisor do
post.user.update_columns(trust_level: 2)
revisor = PostRevisor.new(post)
- revisor.revise!(post.user, { raw: 'hello world12345678901 123456789012' }, revised_at: post.updated_at + 1.second)
+ revisor.revise!(
+ post.user,
+ { raw: "hello world12345678901 123456789012" },
+ revised_at: post.updated_at + 1.second,
+ )
post.reload
expect(post.version).to eq(2)
expect(post.revisions.count).to eq(1)
-
end
it "doesn't create a new version" do
@@ -316,9 +323,17 @@ RSpec.describe PostRevisor do
SiteSetting.editing_grace_period_max_diff = 100
# making a revision
- subject.revise!(post.user, { raw: 'updated body' }, revised_at: post.updated_at + SiteSetting.editing_grace_period + 1.seconds)
+ subject.revise!(
+ post.user,
+ { raw: "updated body" },
+ revised_at: post.updated_at + SiteSetting.editing_grace_period + 1.seconds,
+ )
# "roll back"
- subject.revise!(post.user, { raw: 'Hello world' }, revised_at: post.updated_at + SiteSetting.editing_grace_period + 2.seconds)
+ subject.revise!(
+ post.user,
+ { raw: "Hello world" },
+ revised_at: post.updated_at + SiteSetting.editing_grace_period + 2.seconds,
+ )
post.reload
@@ -329,15 +344,24 @@ RSpec.describe PostRevisor do
it "should bump the topic" do
expect {
- subject.revise!(post.user, { raw: 'updated body' }, revised_at: post.updated_at + SiteSetting.editing_grace_period + 1.seconds)
+ subject.revise!(
+ post.user,
+ { raw: "updated body" },
+ revised_at: post.updated_at + SiteSetting.editing_grace_period + 1.seconds,
+ )
}.to change { post.topic.bumped_at }
end
it "should send muted and latest message" do
TopicUser.create!(topic: post.topic, user: post.user, notification_level: 0)
- messages = MessageBus.track_publish("/latest") do
- subject.revise!(post.user, { raw: 'updated body' }, revised_at: post.updated_at + SiteSetting.editing_grace_period + 1.seconds)
- end
+ messages =
+ MessageBus.track_publish("/latest") do
+ subject.revise!(
+ post.user,
+ { raw: "updated body" },
+ revised_at: post.updated_at + SiteSetting.editing_grace_period + 1.seconds,
+ )
+ end
muted_message = messages.find { |message| message.data["message_type"] == "muted" }
latest_message = messages.find { |message| message.data["message_type"] == "latest" }
@@ -347,11 +371,15 @@ RSpec.describe PostRevisor do
end
end
- describe 'edit reasons' do
+ describe "edit reasons" do
it "does create a new version if an edit reason is provided" do
- post = Fabricate(:post, raw: 'hello world')
+ post = Fabricate(:post, raw: "hello world")
revisor = PostRevisor.new(post)
- revisor.revise!(post.user, { raw: 'hello world123456789', edit_reason: 'this is my reason' }, revised_at: post.updated_at + 1.second)
+ revisor.revise!(
+ post.user,
+ { raw: "hello world123456789", edit_reason: "this is my reason" },
+ revised_at: post.updated_at + 1.second,
+ )
post.reload
expect(post.version).to eq(2)
expect(post.revisions.count).to eq(1)
@@ -360,55 +388,74 @@ RSpec.describe PostRevisor do
it "resets the edit_reason attribute in post model" do
freeze_time
SiteSetting.editing_grace_period = 5.seconds
- post = Fabricate(:post, raw: 'hello world')
+ post = Fabricate(:post, raw: "hello world")
revisor = PostRevisor.new(post)
- revisor.revise!(post.user, { raw: 'hello world123456789', edit_reason: 'this is my reason' }, revised_at: post.updated_at + 1.second)
+ revisor.revise!(
+ post.user,
+ { raw: "hello world123456789", edit_reason: "this is my reason" },
+ revised_at: post.updated_at + 1.second,
+ )
post.reload
- expect(post.edit_reason).to eq('this is my reason')
+ expect(post.edit_reason).to eq("this is my reason")
- revisor.revise!(post.user, { raw: 'hello world4321' }, revised_at: post.updated_at + 7.seconds)
+ revisor.revise!(
+ post.user,
+ { raw: "hello world4321" },
+ revised_at: post.updated_at + 7.seconds,
+ )
post.reload
expect(post.edit_reason).not_to be_present
end
it "does not create a new version if an edit reason is provided and its the same as the current edit reason" do
- post = Fabricate(:post, raw: 'hello world', edit_reason: 'this is my reason')
+ post = Fabricate(:post, raw: "hello world", edit_reason: "this is my reason")
revisor = PostRevisor.new(post)
- revisor.revise!(post.user, { raw: 'hello world123456789', edit_reason: 'this is my reason' }, revised_at: post.updated_at + 1.second)
+ revisor.revise!(
+ post.user,
+ { raw: "hello world123456789", edit_reason: "this is my reason" },
+ revised_at: post.updated_at + 1.second,
+ )
post.reload
expect(post.version).to eq(1)
expect(post.revisions.count).to eq(0)
end
it "does not clobber the existing edit reason for a revision if it is not provided in a subsequent revision" do
- post = Fabricate(:post, raw: 'hello world')
+ post = Fabricate(:post, raw: "hello world")
revisor = PostRevisor.new(post)
- revisor.revise!(post.user, { raw: 'hello world123456789', edit_reason: 'this is my reason' }, revised_at: post.updated_at + 1.second)
+ revisor.revise!(
+ post.user,
+ { raw: "hello world123456789", edit_reason: "this is my reason" },
+ revised_at: post.updated_at + 1.second,
+ )
post.reload
- revisor.revise!(post.user, { raw: 'hello some other thing' }, revised_at: post.updated_at + 1.second)
- expect(post.revisions.first.modifications[:edit_reason]).to eq([nil, 'this is my reason'])
+ revisor.revise!(
+ post.user,
+ { raw: "hello some other thing" },
+ revised_at: post.updated_at + 1.second,
+ )
+ expect(post.revisions.first.modifications[:edit_reason]).to eq([nil, "this is my reason"])
end
end
- describe 'hidden post' do
+ describe "hidden post" do
it "correctly stores the modification value" do
post.update(hidden: true, hidden_reason_id: Post.hidden_reasons[:flag_threshold_reached])
revisor = PostRevisor.new(post)
- revisor.revise!(post.user, { raw: 'hello world' }, revised_at: post.updated_at + 11.minutes)
+ revisor.revise!(post.user, { raw: "hello world" }, revised_at: post.updated_at + 11.minutes)
expect(post.revisions.first.modifications.symbolize_keys).to eq(
cooked: ["
Hello world
", "
hello world
"],
- raw: ["Hello world", "hello world"]
+ raw: ["Hello world", "hello world"],
)
end
end
- describe 'revision much later' do
-
+ describe "revision much later" do
let!(:revised_at) { post.updated_at + 2.minutes }
before do
SiteSetting.editing_grace_period = 1.minute
- subject.revise!(post.user, { raw: 'updated body' }, revised_at: revised_at)
+ subject.revise!(post.user, { raw: "updated body" }, revised_at: revised_at)
post.reload
end
@@ -416,12 +463,12 @@ RSpec.describe PostRevisor do
expect(subject.category_changed).to be_blank
end
- it 'updates the versions' do
+ it "updates the versions" do
expect(post.version).to eq(2)
expect(post.public_version).to eq(2)
end
- it 'creates a new revision' do
+ it "creates a new revision" do
expect(post.revisions.size).to eq(1)
end
@@ -430,9 +477,8 @@ RSpec.describe PostRevisor do
end
describe "new edit window" do
-
before do
- subject.revise!(post.user, { raw: 'yet another updated body' }, revised_at: revised_at)
+ subject.revise!(post.user, { raw: "yet another updated body" }, revised_at: revised_at)
post.reload
end
@@ -450,11 +496,14 @@ RSpec.describe PostRevisor do
end
context "after second window" do
-
let!(:new_revised_at) { revised_at + 2.minutes }
before do
- subject.revise!(post.user, { raw: 'yet another, another updated body' }, revised_at: new_revised_at)
+ subject.revise!(
+ post.user,
+ { raw: "yet another, another updated body" },
+ revised_at: new_revised_at,
+ )
post.reload
end
@@ -470,7 +519,7 @@ RSpec.describe PostRevisor do
end
end
- describe 'category topic' do
+ describe "category topic" do
let!(:category) do
category = Fabricate(:category)
category.update_column(:topic_id, topic.id)
@@ -521,7 +570,9 @@ RSpec.describe PostRevisor do
it "returns a error for the user" do
expect(post.errors.present?).to eq(true)
- expect(post.errors.messages[:base].first).to be I18n.t("category.errors.description_incomplete")
+ expect(post.errors.messages[:base].first).to be I18n.t(
+ "category.errors.description_incomplete",
+ )
end
it "doesn't update the description of the category" do
@@ -529,9 +580,9 @@ RSpec.describe PostRevisor do
end
end
- context 'when updating back to the original paragraph' do
+ context "when updating back to the original paragraph" do
before do
- category.update_column(:description, 'this is my description')
+ category.update_column(:description, "this is my description")
subject.revise!(post.user, raw: Category.post_template)
category.reload
end
@@ -544,10 +595,9 @@ RSpec.describe PostRevisor do
expect(subject.category_changed).to eq(category)
end
end
-
end
- describe 'rate limiter' do
+ describe "rate limiter" do
fab!(:changed_by) { coding_horror }
before do
@@ -558,18 +608,18 @@ RSpec.describe PostRevisor do
it "triggers a rate limiter" do
EditRateLimiter.any_instance.expects(:performed!)
- subject.revise!(changed_by, raw: 'updated body')
+ subject.revise!(changed_by, raw: "updated body")
end
it "raises error when a user gets rate limited" do
SiteSetting.max_edits_per_day = 1
user = Fabricate(:user, trust_level: 1)
- subject.revise!(user, raw: 'body (edited)')
+ subject.revise!(user, raw: "body (edited)")
- expect do
- subject.revise!(user, raw: 'body (edited twice) ')
- end.to raise_error(RateLimiter::LimitExceeded)
+ expect do subject.revise!(user, raw: "body (edited twice) ") end.to raise_error(
+ RateLimiter::LimitExceeded,
+ )
end
it "edit limits scale up depending on user's trust level" do
@@ -579,28 +629,28 @@ RSpec.describe PostRevisor do
SiteSetting.tl4_additional_edits_per_day_multiplier = 4
user = Fabricate(:user, trust_level: 2)
- expect { subject.revise!(user, raw: 'body (edited)') }.to_not raise_error
- expect { subject.revise!(user, raw: 'body (edited twice)') }.to_not raise_error
- expect do
- subject.revise!(user, raw: 'body (edited three times) ')
- end.to raise_error(RateLimiter::LimitExceeded)
+ expect { subject.revise!(user, raw: "body (edited)") }.to_not raise_error
+ expect { subject.revise!(user, raw: "body (edited twice)") }.to_not raise_error
+ expect do subject.revise!(user, raw: "body (edited three times) ") end.to raise_error(
+ RateLimiter::LimitExceeded,
+ )
user = Fabricate(:user, trust_level: 3)
- expect { subject.revise!(user, raw: 'body (edited)') }.to_not raise_error
- expect { subject.revise!(user, raw: 'body (edited twice)') }.to_not raise_error
- expect { subject.revise!(user, raw: 'body (edited three times)') }.to_not raise_error
- expect do
- subject.revise!(user, raw: 'body (edited four times) ')
- end.to raise_error(RateLimiter::LimitExceeded)
+ expect { subject.revise!(user, raw: "body (edited)") }.to_not raise_error
+ expect { subject.revise!(user, raw: "body (edited twice)") }.to_not raise_error
+ expect { subject.revise!(user, raw: "body (edited three times)") }.to_not raise_error
+ expect do subject.revise!(user, raw: "body (edited four times) ") end.to raise_error(
+ RateLimiter::LimitExceeded,
+ )
user = Fabricate(:user, trust_level: 4)
- expect { subject.revise!(user, raw: 'body (edited)') }.to_not raise_error
- expect { subject.revise!(user, raw: 'body (edited twice)') }.to_not raise_error
- expect { subject.revise!(user, raw: 'body (edited three times)') }.to_not raise_error
- expect { subject.revise!(user, raw: 'body (edited four times)') }.to_not raise_error
- expect do
- subject.revise!(user, raw: 'body (edited five times) ')
- end.to raise_error(RateLimiter::LimitExceeded)
+ expect { subject.revise!(user, raw: "body (edited)") }.to_not raise_error
+ expect { subject.revise!(user, raw: "body (edited twice)") }.to_not raise_error
+ expect { subject.revise!(user, raw: "body (edited three times)") }.to_not raise_error
+ expect { subject.revise!(user, raw: "body (edited four times)") }.to_not raise_error
+ expect do subject.revise!(user, raw: "body (edited five times) ") end.to raise_error(
+ RateLimiter::LimitExceeded,
+ )
end
end
@@ -621,7 +671,6 @@ RSpec.describe PostRevisor do
it "marks the admin as the last updater" do
expect(post.last_editor_id).to eq(changed_by.id)
end
-
end
describe "new user editing their own post" do
@@ -635,18 +684,15 @@ RSpec.describe PostRevisor do
it "doesn't allow images to be inserted" do
expect(post.errors).to be_present
end
-
end
- describe 'with a new body' do
- before do
- SiteSetting.editing_grace_period_max_diff = 1000
- end
+ describe "with a new body" do
+ before { SiteSetting.editing_grace_period_max_diff = 1000 }
fab!(:changed_by) { coding_horror }
let!(:result) { subject.revise!(changed_by, raw: "lets update the body. Здравствуйте") }
- it 'correctly updates raw' do
+ it "correctly updates raw" do
expect(result).to eq(true)
expect(post.raw).to eq("lets update the body. Здравствуйте")
expect(post.invalidate_oneboxes).to eq(true)
@@ -661,16 +707,20 @@ RSpec.describe PostRevisor do
expect(post.topic.word_count).to eq(5)
end
- it 'increases the post_edits stat count' do
- expect do
- subject.revise!(post.user, { raw: "This is a new revision" })
- end.to change { post.user.user_stat.post_edits_count.to_i }.by(1)
+ it "increases the post_edits stat count" do
+ expect do subject.revise!(post.user, { raw: "This is a new revision" }) end.to change {
+ post.user.user_stat.post_edits_count.to_i
+ }.by(1)
end
- context 'when second poster posts again quickly' do
- it 'is a grace period edit, because the second poster posted again quickly' do
+ context "when second poster posts again quickly" do
+ it "is a grace period edit, because the second poster posted again quickly" do
SiteSetting.editing_grace_period = 1.minute
- subject.revise!(changed_by, { raw: 'yet another updated body' }, revised_at: post.updated_at + 10.seconds)
+ subject.revise!(
+ changed_by,
+ { raw: "yet another updated body" },
+ revised_at: post.updated_at + 10.seconds,
+ )
post.reload
expect(post.version).to eq(2)
expect(post.public_version).to eq(2)
@@ -678,28 +728,30 @@ RSpec.describe PostRevisor do
end
end
- context 'when passing skip_revision as true' do
+ context "when passing skip_revision as true" do
before do
SiteSetting.editing_grace_period = 1.minute
- subject.revise!(changed_by, { raw: 'yet another updated body' }, revised_at: post.updated_at + 10.hours, skip_revision: true)
+ subject.revise!(
+ changed_by,
+ { raw: "yet another updated body" },
+ revised_at: post.updated_at + 10.hours,
+ skip_revision: true,
+ )
post.reload
end
- it 'does not create new revision ' do
+ it "does not create new revision " do
expect(post.version).to eq(2)
expect(post.public_version).to eq(2)
expect(post.revisions.size).to eq(1)
end
end
- context 'when editing the before_edit_post event signature' do
- it 'contains post and params' do
- params = { raw: 'body (edited)' }
+ context "when editing the before_edit_post event signature" do
+ it "contains post and params" do
+ params = { raw: "body (edited)" }
events = DiscourseEvent.track_events { subject.revise!(user, params) }
- expect(events).to include(
- event_name: :before_edit_post,
- params: [post, params]
- )
+ expect(events).to include(event_name: :before_edit_post, params: [post, params])
end
end
end
@@ -709,21 +761,23 @@ RSpec.describe PostRevisor do
revisor = PostRevisor.new(post)
first_post = topic.first_post
expect {
- revisor.revise!(first_post.user, { raw: 'Edit the first post' }, revised_at: first_post.updated_at + 10.seconds)
+ revisor.revise!(
+ first_post.user,
+ { raw: "Edit the first post" },
+ revised_at: first_post.updated_at + 10.seconds,
+ )
topic.reload
}.to change { topic.excerpt }
second_post = Fabricate(:post, post_args.merge(post_number: 2, topic_id: topic.id))
expect {
- PostRevisor.new(second_post).revise!(second_post.user, raw: 'Edit the 2nd post')
+ PostRevisor.new(second_post).revise!(second_post.user, raw: "Edit the 2nd post")
topic.reload
}.to_not change { topic.excerpt }
end
end
describe "welcome topic" do
- before do
- SiteSetting.welcome_topic_id = topic.id
- end
+ before { SiteSetting.welcome_topic_id = topic.id }
it "should publish welcome topic edit message" do
revisor = PostRevisor.new(post)
@@ -731,10 +785,12 @@ RSpec.describe PostRevisor do
UserAuthToken.generate!(user_id: admin.id)
Discourse.cache.write(Site.welcome_topic_banner_cache_key(admin.id), true)
- messages = MessageBus.track_publish("/site/welcome-topic-banner") do
- revisor.revise!(admin, { raw: 'updated welcome topic body' })
- end
- welcome_topic_banner_message = messages.find { |message| message.channel == "/site/welcome-topic-banner" }
+ messages =
+ MessageBus.track_publish("/site/welcome-topic-banner") do
+ revisor.revise!(admin, { raw: "updated welcome topic body" })
+ end
+ welcome_topic_banner_message =
+ messages.find { |message| message.channel == "/site/welcome-topic-banner" }
expect(welcome_topic_banner_message).to be_present
expect(welcome_topic_banner_message.data).to eq(false)
end
@@ -748,11 +804,8 @@ RSpec.describe PostRevisor do
it "revises and tracks changes of topic titles" do
new_title = "New topic title"
- result = subject.revise!(
- post.user,
- { title: new_title },
- revised_at: post.updated_at + 10.minutes
- )
+ result =
+ subject.revise!(post.user, { title: new_title }, revised_at: post.updated_at + 10.minutes)
expect(result).to eq(true)
post.reload
@@ -762,11 +815,12 @@ RSpec.describe PostRevisor do
it "revises and tracks changes of topic archetypes" do
new_archetype = Archetype.banner
- result = subject.revise!(
- post.user,
- { archetype: new_archetype },
- revised_at: post.updated_at + 10.minutes
- )
+ result =
+ subject.revise!(
+ post.user,
+ { archetype: new_archetype },
+ revised_at: post.updated_at + 10.minutes,
+ )
expect(result).to eq(true)
post.reload
@@ -775,14 +829,14 @@ RSpec.describe PostRevisor do
end
it "revises and tracks changes of topic tags" do
- subject.revise!(admin, tags: ['new-tag'])
- expect(post.post_revisions.last.modifications).to eq('tags' => [[], ['new-tag']])
+ subject.revise!(admin, tags: ["new-tag"])
+ expect(post.post_revisions.last.modifications).to eq("tags" => [[], ["new-tag"]])
- subject.revise!(admin, tags: ['new-tag', 'new-tag-2'])
- expect(post.post_revisions.last.modifications).to eq('tags' => [[], ['new-tag', 'new-tag-2']])
+ subject.revise!(admin, tags: %w[new-tag new-tag-2])
+ expect(post.post_revisions.last.modifications).to eq("tags" => [[], %w[new-tag new-tag-2]])
- subject.revise!(admin, tags: ['new-tag-3'])
- expect(post.post_revisions.last.modifications).to eq('tags' => [[], ['new-tag-3']])
+ subject.revise!(admin, tags: ["new-tag-3"])
+ expect(post.post_revisions.last.modifications).to eq("tags" => [[], ["new-tag-3"]])
end
describe "#publish_changes" do
@@ -791,9 +845,12 @@ RSpec.describe PostRevisor do
it "should publish topic changes to clients" do
revisor = PostRevisor.new(topic.ordered_posts.first, topic)
- message = MessageBus.track_publish("/topic/#{topic.id}") do
- revisor.revise!(newuser, title: 'this is a test topic')
- end.first
+ message =
+ MessageBus
+ .track_publish("/topic/#{topic.id}") do
+ revisor.revise!(newuser, title: "this is a test topic")
+ end
+ .first
payload = message.data
expect(payload[:reload_topic]).to eq(true)
@@ -802,63 +859,48 @@ RSpec.describe PostRevisor do
context "when logging staff edits" do
it "doesn't log when a regular user revises a post" do
- subject.revise!(
- post.user,
- raw: "lets totally update the body"
- )
- log = UserHistory.where(
- acting_user_id: post.user.id,
- action: UserHistory.actions[:post_edit]
- )
+ subject.revise!(post.user, raw: "lets totally update the body")
+ log =
+ UserHistory.where(acting_user_id: post.user.id, action: UserHistory.actions[:post_edit])
expect(log).to be_blank
end
it "logs an edit when a staff member revises a post" do
- subject.revise!(
- moderator,
- raw: "lets totally update the body"
- )
- log = UserHistory.where(
- acting_user_id: moderator.id,
- action: UserHistory.actions[:post_edit]
- ).first
+ subject.revise!(moderator, raw: "lets totally update the body")
+ log =
+ UserHistory.where(
+ acting_user_id: moderator.id,
+ action: UserHistory.actions[:post_edit],
+ ).first
expect(log).to be_present
expect(log.details).to eq("Hello world\n\n---\n\nlets totally update the body")
end
it "doesn't log an edit when skip_staff_log is true" do
- subject.revise!(
- moderator,
- { raw: "lets totally update the body" },
- skip_staff_log: true
- )
- log = UserHistory.where(
- acting_user_id: moderator.id,
- action: UserHistory.actions[:post_edit]
- ).first
+ subject.revise!(moderator, { raw: "lets totally update the body" }, skip_staff_log: true)
+ log =
+ UserHistory.where(
+ acting_user_id: moderator.id,
+ action: UserHistory.actions[:post_edit],
+ ).first
expect(log).to be_blank
end
it "doesn't log an edit when a staff member edits their own post" do
- revisor = PostRevisor.new(
- Fabricate(:post, user: moderator)
- )
- revisor.revise!(
- moderator,
- raw: "my own edit to my own thing"
- )
+ revisor = PostRevisor.new(Fabricate(:post, user: moderator))
+ revisor.revise!(moderator, raw: "my own edit to my own thing")
- log = UserHistory.where(
- acting_user_id: moderator.id,
- action: UserHistory.actions[:post_edit]
- )
+ log =
+ UserHistory.where(acting_user_id: moderator.id, action: UserHistory.actions[:post_edit])
expect(log).to be_blank
end
end
context "when logging group moderator edits" do
fab!(:group_user) { Fabricate(:group_user) }
- fab!(:category) { Fabricate(:category, reviewable_by_group_id: group_user.group.id, topic: topic) }
+ fab!(:category) do
+ Fabricate(:category, reviewable_by_group_id: group_user.group.id, topic: topic)
+ end
before do
SiteSetting.enable_category_group_moderation = true
@@ -867,45 +909,40 @@ RSpec.describe PostRevisor do
end
it "logs an edit when a group moderator revises the category description" do
- PostRevisor.new(post).revise!(group_user.user, raw: "a group moderator can update the description")
+ PostRevisor.new(post).revise!(
+ group_user.user,
+ raw: "a group moderator can update the description",
+ )
- log = UserHistory.where(
- acting_user_id: group_user.user.id,
- action: UserHistory.actions[:post_edit]
- ).first
+ log =
+ UserHistory.where(
+ acting_user_id: group_user.user.id,
+ action: UserHistory.actions[:post_edit],
+ ).first
expect(log).to be_present
- expect(log.details).to eq("Hello world\n\n---\n\na group moderator can update the description")
+ expect(log.details).to eq(
+ "Hello world\n\n---\n\na group moderator can update the description",
+ )
end
end
context "with staff_edit_locks_post" do
context "when disabled" do
- before do
- SiteSetting.staff_edit_locks_post = false
- end
+ before { SiteSetting.staff_edit_locks_post = false }
it "does not lock the post when revised" do
- result = subject.revise!(
- moderator,
- raw: "lets totally update the body"
- )
+ result = subject.revise!(moderator, raw: "lets totally update the body")
expect(result).to eq(true)
post.reload
expect(post).not_to be_locked
-
end
end
context "when enabled" do
- before do
- SiteSetting.staff_edit_locks_post = true
- end
+ before { SiteSetting.staff_edit_locks_post = true }
it "locks the post when revised by staff" do
- result = subject.revise!(
- moderator,
- raw: "lets totally update the body"
- )
+ result = subject.revise!(moderator, raw: "lets totally update the body")
expect(result).to eq(true)
post.reload
expect(post).to be_locked
@@ -913,20 +950,14 @@ RSpec.describe PostRevisor do
it "doesn't lock the wiki posts" do
post.wiki = true
- result = subject.revise!(
- moderator,
- raw: "some new raw content"
- )
+ result = subject.revise!(moderator, raw: "some new raw content")
expect(result).to eq(true)
post.reload
expect(post).not_to be_locked
end
it "doesn't lock the post when the raw did not change" do
- result = subject.revise!(
- moderator,
- title: "New topic title, cool!"
- )
+ result = subject.revise!(moderator, title: "New topic title, cool!")
expect(result).to eq(true)
post.reload
expect(post.topic.title).to eq("New topic title, cool!")
@@ -934,20 +965,14 @@ RSpec.describe PostRevisor do
end
it "doesn't lock the post when revised by a regular user" do
- result = subject.revise!(
- user,
- raw: "lets totally update the body"
- )
+ result = subject.revise!(user, raw: "lets totally update the body")
expect(result).to eq(true)
post.reload
expect(post).not_to be_locked
end
it "doesn't lock the post when revised by system user" do
- result = subject.revise!(
- Discourse.system_user,
- raw: "I usually replace hotlinked images"
- )
+ result = subject.revise!(Discourse.system_user, raw: "I usually replace hotlinked images")
expect(result).to eq(true)
post.reload
expect(post).not_to be_locked
@@ -957,10 +982,7 @@ RSpec.describe PostRevisor do
staff_post = Fabricate(:post, user: moderator)
revisor = PostRevisor.new(staff_post)
- result = revisor.revise!(
- moderator,
- raw: "lets totally update the body"
- )
+ result = revisor.revise!(moderator, raw: "lets totally update the body")
expect(result).to eq(true)
staff_post.reload
expect(staff_post).not_to be_locked
@@ -971,9 +993,7 @@ RSpec.describe PostRevisor do
context "with alerts" do
fab!(:mentioned_user) { Fabricate(:user) }
- before do
- Jobs.run_immediately!
- end
+ before { Jobs.run_immediately! }
it "generates a notification for a mention" do
expect {
@@ -983,20 +1003,23 @@ RSpec.describe PostRevisor do
it "never generates a notification for a mention when the System user revise a post" do
expect {
- subject.revise!(Discourse.system_user, raw: "System user is mentioning @#{mentioned_user.username_lower}")
- }.not_to change { Notification.where(notification_type: Notification.types[:mentioned]).count }
+ subject.revise!(
+ Discourse.system_user,
+ raw: "System user is mentioning @#{mentioned_user.username_lower}",
+ )
+ }.not_to change {
+ Notification.where(notification_type: Notification.types[:mentioned]).count
+ }
end
-
end
context "with tagging" do
context "with tagging disabled" do
- before do
- SiteSetting.tagging_enabled = false
- end
+ before { SiteSetting.tagging_enabled = false }
it "doesn't add the tags" do
- result = subject.revise!(user, raw: "lets totally update the body", tags: ['totally', 'update'])
+ result =
+ subject.revise!(user, raw: "lets totally update the body", tags: %w[totally update])
expect(result).to eq(true)
post.reload
expect(post.topic.tags.size).to eq(0)
@@ -1004,9 +1027,7 @@ RSpec.describe PostRevisor do
end
context "with tagging enabled" do
- before do
- SiteSetting.tagging_enabled = true
- end
+ before { SiteSetting.tagging_enabled = true }
context "when can create tags" do
before do
@@ -1016,21 +1037,23 @@ RSpec.describe PostRevisor do
it "can create all tags if none exist" do
expect {
- @result = subject.revise!(user, raw: "lets totally update the body", tags: ['totally', 'update'])
+ @result =
+ subject.revise!(user, raw: "lets totally update the body", tags: %w[totally update])
}.to change { Tag.count }.by(2)
expect(@result).to eq(true)
post.reload
- expect(post.topic.tags.map(&:name).sort).to eq(['totally', 'update'])
+ expect(post.topic.tags.map(&:name).sort).to eq(%w[totally update])
end
it "creates missing tags if some exist" do
- Fabricate(:tag, name: 'totally')
+ Fabricate(:tag, name: "totally")
expect {
- @result = subject.revise!(user, raw: "lets totally update the body", tags: ['totally', 'update'])
+ @result =
+ subject.revise!(user, raw: "lets totally update the body", tags: %w[totally update])
}.to change { Tag.count }.by(1)
expect(@result).to eq(true)
post.reload
- expect(post.topic.tags.map(&:name).sort).to eq(['totally', 'update'])
+ expect(post.topic.tags.map(&:name).sort).to eq(%w[totally update])
end
it "can remove all tags" do
@@ -1042,48 +1065,55 @@ RSpec.describe PostRevisor do
end
it "can't add staff-only tags" do
- create_staff_only_tags(['important'])
- result = subject.revise!(user, raw: "lets totally update the body", tags: ['important', 'stuff'])
+ create_staff_only_tags(["important"])
+ result =
+ subject.revise!(user, raw: "lets totally update the body", tags: %w[important stuff])
expect(result).to eq(false)
expect(post.topic.errors.present?).to eq(true)
end
it "staff can add staff-only tags" do
- create_staff_only_tags(['important'])
- result = subject.revise!(admin, raw: "lets totally update the body", tags: ['important', 'stuff'])
+ create_staff_only_tags(["important"])
+ result =
+ subject.revise!(admin, raw: "lets totally update the body", tags: %w[important stuff])
expect(result).to eq(true)
post.reload
- expect(post.topic.tags.map(&:name).sort).to eq(['important', 'stuff'])
+ expect(post.topic.tags.map(&:name).sort).to eq(%w[important stuff])
end
it "triggers the :post_edited event with topic_changed?" do
topic.tags = [Fabricate(:tag, name: "super"), Fabricate(:tag, name: "stuff")]
- events = DiscourseEvent.track_events do
- subject.revise!(user, raw: "lets totally update the body", tags: [])
- end
+ events =
+ DiscourseEvent.track_events do
+ subject.revise!(user, raw: "lets totally update the body", tags: [])
+ end
event = events.find { |e| e[:event_name] == :post_edited }
expect(event[:params].first).to eq(post)
expect(event[:params].second).to eq(true)
expect(event[:params].third).to be_kind_of(PostRevisor)
- expect(event[:params].third.topic_diff).to eq({ "tags" => [["super", "stuff"], []] })
+ expect(event[:params].third.topic_diff).to eq({ "tags" => [%w[super stuff], []] })
end
context "with staff-only tags" do
before do
- create_staff_only_tags(['important'])
+ create_staff_only_tags(["important"])
topic = post.topic
- topic.tags = [Fabricate(:tag, name: "super"), Tag.where(name: "important").first, Fabricate(:tag, name: "stuff")]
+ topic.tags = [
+ Fabricate(:tag, name: "super"),
+ Tag.where(name: "important").first,
+ Fabricate(:tag, name: "stuff"),
+ ]
end
it "staff-only tags can't be removed" do
- result = subject.revise!(user, raw: "lets totally update the body", tags: ['stuff'])
+ result = subject.revise!(user, raw: "lets totally update the body", tags: ["stuff"])
expect(result).to eq(false)
expect(post.topic.errors.present?).to eq(true)
post.reload
- expect(post.topic.tags.map(&:name).sort).to eq(['important', 'stuff', 'super'])
+ expect(post.topic.tags.map(&:name).sort).to eq(%w[important stuff super])
end
it "can't remove all tags if some are staff-only" do
@@ -1091,14 +1121,14 @@ RSpec.describe PostRevisor do
expect(result).to eq(false)
expect(post.topic.errors.present?).to eq(true)
post.reload
- expect(post.topic.tags.map(&:name).sort).to eq(['important', 'stuff', 'super'])
+ expect(post.topic.tags.map(&:name).sort).to eq(%w[important stuff super])
end
it "staff-only tags can be removed by staff" do
- result = subject.revise!(admin, raw: "lets totally update the body", tags: ['stuff'])
+ result = subject.revise!(admin, raw: "lets totally update the body", tags: ["stuff"])
expect(result).to eq(true)
post.reload
- expect(post.topic.tags.map(&:name)).to eq(['stuff'])
+ expect(post.topic.tags.map(&:name)).to eq(["stuff"])
end
it "staff can remove all tags" do
@@ -1114,27 +1144,41 @@ RSpec.describe PostRevisor do
before do
topic.update!(bumped_at: bumped_at)
- create_hidden_tags(['important', 'secret'])
+ create_hidden_tags(%w[important secret])
topic = post.topic
- topic.tags = [Fabricate(:tag, name: "super"), Tag.where(name: "important").first, Fabricate(:tag, name: "stuff")]
+ topic.tags = [
+ Fabricate(:tag, name: "super"),
+ Tag.where(name: "important").first,
+ Fabricate(:tag, name: "stuff"),
+ ]
end
it "doesn't bump topic if only staff-only tags are added" do
expect {
- result = subject.revise!(Fabricate(:admin), raw: post.raw, tags: topic.tags.map(&:name) + ['secret'])
+ result =
+ subject.revise!(
+ Fabricate(:admin),
+ raw: post.raw,
+ tags: topic.tags.map(&:name) + ["secret"],
+ )
expect(result).to eq(true)
}.to_not change { topic.reload.bumped_at }
end
it "doesn't bump topic if only staff-only tags are removed" do
expect {
- result = subject.revise!(Fabricate(:admin), raw: post.raw, tags: topic.tags.map(&:name) - ['important', 'secret'])
+ result =
+ subject.revise!(
+ Fabricate(:admin),
+ raw: post.raw,
+ tags: topic.tags.map(&:name) - %w[important secret],
+ )
expect(result).to eq(true)
}.to_not change { topic.reload.bumped_at }
end
it "doesn't bump topic if only staff-only tags are removed and there are no tags left" do
- topic.tags = Tag.where(name: ['important', 'secret']).to_a
+ topic.tags = Tag.where(name: %w[important secret]).to_a
expect {
result = subject.revise!(Fabricate(:admin), raw: post.raw, tags: [])
expect(result).to eq(true)
@@ -1142,7 +1186,7 @@ RSpec.describe PostRevisor do
end
it "doesn't bump topic if empty string is given" do
- topic.tags = Tag.where(name: ['important', 'secret']).to_a
+ topic.tags = Tag.where(name: %w[important secret]).to_a
expect {
result = subject.revise!(Fabricate(:admin), raw: post.raw, tags: [""])
expect(result).to eq(true)
@@ -1151,13 +1195,22 @@ RSpec.describe PostRevisor do
it "should bump topic if non staff-only tags are added" do
expect {
- result = subject.revise!(Fabricate(:admin), raw: post.raw, tags: topic.tags.map(&:name) + [Fabricate(:tag).name])
+ result =
+ subject.revise!(
+ Fabricate(:admin),
+ raw: post.raw,
+ tags: topic.tags.map(&:name) + [Fabricate(:tag).name],
+ )
expect(result).to eq(true)
}.to change { topic.reload.bumped_at }
end
it "creates a hidden revision" do
- subject.revise!(Fabricate(:admin), raw: post.raw, tags: topic.tags.map(&:name) + ['secret'])
+ subject.revise!(
+ Fabricate(:admin),
+ raw: post.raw,
+ tags: topic.tags.map(&:name) + ["secret"],
+ )
expect(post.reload.revisions.first.hidden).to eq(true)
end
@@ -1165,8 +1218,14 @@ RSpec.describe PostRevisor do
PostActionNotifier.enable
Jobs.run_immediately!
expect {
- subject.revise!(Fabricate(:admin), raw: post.raw, tags: topic.tags.map(&:name) + ['secret'])
- }.not_to change { Notification.where(notification_type: Notification.types[:edited]).count }
+ subject.revise!(
+ Fabricate(:admin),
+ raw: post.raw,
+ tags: topic.tags.map(&:name) + ["secret"],
+ )
+ }.not_to change {
+ Notification.where(notification_type: Notification.types[:edited]).count
+ }
end
end
@@ -1175,12 +1234,18 @@ RSpec.describe PostRevisor do
fab!(:tag2) { Fabricate(:tag) }
fab!(:tag3) { Fabricate(:tag) }
fab!(:tag_group) { Fabricate(:tag_group, tags: [tag1, tag2]) }
- fab!(:category) { Fabricate(:category, name: "beta", category_required_tag_groups: [CategoryRequiredTagGroup.new(tag_group: tag_group, min_count: 1)]) }
-
- before do
- post.topic.update(category: category)
+ fab!(:category) do
+ Fabricate(
+ :category,
+ name: "beta",
+ category_required_tag_groups: [
+ CategoryRequiredTagGroup.new(tag_group: tag_group, min_count: 1),
+ ],
+ )
end
+ before { post.topic.update(category: category) }
+
it "doesn't allow removing all tags from the group" do
post.topic.tags = [tag1, tag2]
result = subject.revise!(user, raw: "lets totally update the body", tags: [])
@@ -1210,13 +1275,14 @@ RSpec.describe PostRevisor do
end
it "only uses existing tags" do
- Fabricate(:tag, name: 'totally')
+ Fabricate(:tag, name: "totally")
expect {
- @result = subject.revise!(user, raw: "lets totally update the body", tags: ['totally', 'update'])
+ @result =
+ subject.revise!(user, raw: "lets totally update the body", tags: %w[totally update])
}.to_not change { Tag.count }
expect(@result).to eq(true)
post.reload
- expect(post.topic.tags.map(&:name)).to eq(['totally'])
+ expect(post.topic.tags.map(&:name)).to eq(["totally"])
end
end
end
@@ -1227,17 +1293,11 @@ RSpec.describe PostRevisor do
let(:image2) { Fabricate(:upload) }
let(:image3) { Fabricate(:upload) }
let(:image4) { Fabricate(:upload) }
- let(:post_args) do
- {
- user: user,
- topic: topic,
- raw: <<~RAW
+ let(:post_args) { { user: user, topic: topic, raw: <<~RAW } }
This is a post with multiple uploads
RAW
- }
- end
it "updates linked post uploads" do
post.link_post_uploads
@@ -1250,7 +1310,11 @@ RSpec.describe PostRevisor do
RAW
- expect(post.reload.upload_references.pluck(:upload_id)).to contain_exactly(image2.id, image3.id, image4.id)
+ expect(post.reload.upload_references.pluck(:upload_id)).to contain_exactly(
+ image2.id,
+ image3.id,
+ image4.id,
+ )
end
context "with secure uploads uploads" do
@@ -1271,11 +1335,13 @@ RSpec.describe PostRevisor do
RAW
expect(image5.reload.secure).to eq(false)
- expect(image5.security_last_changed_reason).to eq("access control post dictates security | source: post revisor")
+ expect(image5.security_last_changed_reason).to eq(
+ "access control post dictates security | source: post revisor",
+ )
end
it "does not update the upload secure status, which is secure by default from the composer for a private" do
- post.topic.update(category: Fabricate(:private_category, group: Fabricate(:group)))
+ post.topic.update(category: Fabricate(:private_category, group: Fabricate(:group)))
stub_image_size
subject.revise!(user, raw: <<~RAW)
This is a post with a secure upload
@@ -1283,12 +1349,14 @@ RSpec.describe PostRevisor do
RAW
expect(image5.reload.secure).to eq(true)
- expect(image5.security_last_changed_reason).to eq("access control post dictates security | source: post revisor")
+ expect(image5.security_last_changed_reason).to eq(
+ "access control post dictates security | source: post revisor",
+ )
end
end
end
- context 'with drafts' do
+ context "with drafts" do
it "does not advance draft sequence if keep_existing_draft option is true" do
post = Fabricate(:post, user: user)
topic = post.topic
@@ -1300,59 +1368,73 @@ RSpec.describe PostRevisor do
PostRevisor.new(post).revise!(
post.user,
{ title: "updated title for my topic" },
- keep_existing_draft: true
+ keep_existing_draft: true,
)
- }.to not_change { Draft.where(user: user, draft_key: draft_key).first.sequence }
- .and not_change { DraftSequence.where(user_id: user.id, draft_key: draft_key).first.sequence }
+ }.to not_change {
+ Draft.where(user: user, draft_key: draft_key).first.sequence
+ }.and not_change {
+ DraftSequence.where(user_id: user.id, draft_key: draft_key).first.sequence
+ }
expect {
- PostRevisor.new(post).revise!(
- post.user,
- { title: "updated title for my topic" },
- )
- }.to change { Draft.where(user: user, draft_key: draft_key).count }.from(1).to(0)
- .and change { DraftSequence.where(user_id: user.id, draft_key: draft_key).first.sequence }.by(1)
+ PostRevisor.new(post).revise!(post.user, { title: "updated title for my topic" })
+ }.to change { Draft.where(user: user, draft_key: draft_key).count }.from(1).to(
+ 0,
+ ).and change {
+ DraftSequence.where(user_id: user.id, draft_key: draft_key).first.sequence
+ }.by(1)
end
end
- context 'when skipping validations' do
- fab!(:post) { Fabricate(:post, raw: 'aaa', skip_validation: true) }
+ context "when skipping validations" do
+ fab!(:post) { Fabricate(:post, raw: "aaa", skip_validation: true) }
- it 'can revise multiple times and remove unnecessary revisions' do
- subject.revise!(admin, { raw: 'bbb' }, skip_validations: true)
+ it "can revise multiple times and remove unnecessary revisions" do
+ subject.revise!(admin, { raw: "bbb" }, skip_validations: true)
expect(post.errors).to be_empty
# Revert to old version which was invalid to destroy previously created
# post revision and trigger another post save.
- subject.revise!(admin, { raw: 'aaa' }, skip_validations: true)
+ subject.revise!(admin, { raw: "aaa" }, skip_validations: true)
expect(post.errors).to be_empty
end
end
end
- context 'when the review_every_post setting is enabled' do
+ context "when the review_every_post setting is enabled" do
let(:post) { Fabricate(:post, post_args) }
let(:revisor) { PostRevisor.new(post) }
before { SiteSetting.review_every_post = true }
- it 'queues the post when a regular user edits it' do
+ it "queues the post when a regular user edits it" do
expect {
- revisor.revise!(post.user, { raw: 'updated body' }, revised_at: post.updated_at + 10.minutes)
+ revisor.revise!(
+ post.user,
+ { raw: "updated body" },
+ revised_at: post.updated_at + 10.minutes,
+ )
}.to change(ReviewablePost, :count).by(1)
end
- it 'does nothing when a staff member edits a post' do
+ it "does nothing when a staff member edits a post" do
admin = Fabricate(:admin)
- expect { revisor.revise!(admin, { raw: 'updated body' }) }.not_to change(ReviewablePost, :count)
+ expect { revisor.revise!(admin, { raw: "updated body" }) }.not_to change(
+ ReviewablePost,
+ :count,
+ )
end
- it 'skips grace period edits' do
+ it "skips grace period edits" do
SiteSetting.editing_grace_period = 1.minute
expect {
- revisor.revise!(post.user, { raw: 'updated body' }, revised_at: post.updated_at + 10.seconds)
+ revisor.revise!(
+ post.user,
+ { raw: "updated body" },
+ revised_at: post.updated_at + 10.seconds,
+ )
}.not_to change(ReviewablePost, :count)
end
end
diff --git a/spec/lib/presence_channel_spec.rb b/spec/lib/presence_channel_spec.rb
index 1ffd320298b..29a1f44f833 100644
--- a/spec/lib/presence_channel_spec.rb
+++ b/spec/lib/presence_channel_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-require 'presence_channel'
+require "presence_channel"
RSpec.describe PresenceChannel do
fab!(:user) { Fabricate(:user) }
@@ -14,16 +14,16 @@ RSpec.describe PresenceChannel do
secure_group = Fabricate(:group)
PresenceChannel.register_prefix("test") do |channel|
case channel
- when /\A\/test\/public\d*\z/
+ when %r{\A/test/public\d*\z}
PresenceChannel::Config.new(public: true)
when "/test/secureuser"
- PresenceChannel::Config.new(allowed_user_ids: [ secure_user.id ])
+ PresenceChannel::Config.new(allowed_user_ids: [secure_user.id])
when "/test/securegroup"
- PresenceChannel::Config.new(allowed_group_ids: [ secure_group.id ])
+ PresenceChannel::Config.new(allowed_group_ids: [secure_group.id])
when "/test/alloweduser"
- PresenceChannel::Config.new(allowed_user_ids: [ user.id ])
+ PresenceChannel::Config.new(allowed_user_ids: [user.id])
when "/test/allowedgroup"
- PresenceChannel::Config.new(allowed_group_ids: [ group.id ])
+ PresenceChannel::Config.new(allowed_group_ids: [group.id])
when "/test/noaccess"
PresenceChannel::Config.new
when "/test/countonly"
@@ -36,7 +36,7 @@ RSpec.describe PresenceChannel do
after do
PresenceChannel.clear_all!
- PresenceChannel.unregister_prefix('test')
+ PresenceChannel.unregister_prefix("test")
end
it "can perform basic channel functionality" do
@@ -81,9 +81,10 @@ RSpec.describe PresenceChannel do
it "correctly sends messages to message bus" do
channel = PresenceChannel.new("/test/public1")
- messages = MessageBus.track_publish(channel.message_bus_channel_name) do
- channel.present(user_id: user.id, client_id: "a")
- end
+ messages =
+ MessageBus.track_publish(channel.message_bus_channel_name) do
+ channel.present(user_id: user.id, client_id: "a")
+ end
data = messages.map(&:data)
expect(data.count).to eq(1)
@@ -92,9 +93,7 @@ RSpec.describe PresenceChannel do
freeze_time Time.zone.now + 1 + PresenceChannel::DEFAULT_TIMEOUT
- messages = MessageBus.track_publish(channel.message_bus_channel_name) do
- channel.auto_leave
- end
+ messages = MessageBus.track_publish(channel.message_bus_channel_name) { channel.auto_leave }
data = messages.map(&:data)
expect(data.count).to eq(1)
@@ -117,38 +116,38 @@ RSpec.describe PresenceChannel do
freeze_time start_time + PresenceChannel::DEFAULT_TIMEOUT + 1
- messages = MessageBus.track_publish do
- PresenceChannel.auto_leave_all
- end
+ messages = MessageBus.track_publish { PresenceChannel.auto_leave_all }
- expect(messages.map { |m| [ m.channel, m.data ] }).to contain_exactly(
+ expect(messages.map { |m| [m.channel, m.data] }).to contain_exactly(
["/presence/test/public1", { "leaving_user_ids" => [user.id] }],
- ["/presence/test/public2", { "leaving_user_ids" => [user.id] }]
+ ["/presence/test/public2", { "leaving_user_ids" => [user.id] }],
)
expect(channel1.user_ids).to eq([])
expect(channel2.user_ids).to eq([user2.id])
end
- it 'only sends one `enter` and `leave` message' do
+ it "only sends one `enter` and `leave` message" do
channel = PresenceChannel.new("/test/public1")
- messages = MessageBus.track_publish(channel.message_bus_channel_name) do
- channel.present(user_id: user.id, client_id: "a")
- channel.present(user_id: user.id, client_id: "a")
- channel.present(user_id: user.id, client_id: "b")
- end
+ messages =
+ MessageBus.track_publish(channel.message_bus_channel_name) do
+ channel.present(user_id: user.id, client_id: "a")
+ channel.present(user_id: user.id, client_id: "a")
+ channel.present(user_id: user.id, client_id: "b")
+ end
data = messages.map(&:data)
expect(data.count).to eq(1)
expect(data[0].keys).to contain_exactly("entering_users")
expect(data[0]["entering_users"].map { |u| u[:id] }).to contain_exactly(user.id)
- messages = MessageBus.track_publish(channel.message_bus_channel_name) do
- channel.leave(user_id: user.id, client_id: "a")
- channel.leave(user_id: user.id, client_id: "a")
- channel.leave(user_id: user.id, client_id: "b")
- end
+ messages =
+ MessageBus.track_publish(channel.message_bus_channel_name) do
+ channel.leave(user_id: user.id, client_id: "a")
+ channel.leave(user_id: user.id, client_id: "a")
+ channel.leave(user_id: user.id, client_id: "b")
+ end
data = messages.map(&:data)
expect(data.count).to eq(1)
@@ -179,8 +178,14 @@ RSpec.describe PresenceChannel do
initial_zlist_ttl = r.ttl(channel.send(:redis_key_zlist))
initial_hash_ttl = r.ttl(channel.send(:redis_key_hash))
- expect(initial_zlist_ttl).to be_between(PresenceChannel::GC_SECONDS, PresenceChannel::GC_SECONDS + 5.minutes)
- expect(initial_hash_ttl).to be_between(PresenceChannel::GC_SECONDS, PresenceChannel::GC_SECONDS + 5.minutes)
+ expect(initial_zlist_ttl).to be_between(
+ PresenceChannel::GC_SECONDS,
+ PresenceChannel::GC_SECONDS + 5.minutes,
+ )
+ expect(initial_hash_ttl).to be_between(
+ PresenceChannel::GC_SECONDS,
+ PresenceChannel::GC_SECONDS + 5.minutes,
+ )
freeze_time 1.minute.from_now
@@ -194,7 +199,7 @@ RSpec.describe PresenceChannel do
expect(new_hash_ttl).to be > initial_hash_ttl
end
- it 'handles security correctly for anon' do
+ it "handles security correctly for anon" do
expect(PresenceChannel.new("/test/public1").can_enter?(user_id: nil)).to eq(false)
expect(PresenceChannel.new("/test/secureuser").can_enter?(user_id: nil)).to eq(false)
expect(PresenceChannel.new("/test/securegroup").can_enter?(user_id: nil)).to eq(false)
@@ -206,7 +211,7 @@ RSpec.describe PresenceChannel do
expect(PresenceChannel.new("/test/noaccess").can_view?(user_id: nil)).to eq(false)
end
- it 'handles security correctly for a user' do
+ it "handles security correctly for a user" do
expect(PresenceChannel.new("/test/secureuser").can_enter?(user_id: user.id)).to eq(false)
expect(PresenceChannel.new("/test/securegroup").can_enter?(user_id: user.id)).to eq(false)
expect(PresenceChannel.new("/test/alloweduser").can_enter?(user_id: user.id)).to eq(true)
@@ -220,39 +225,39 @@ RSpec.describe PresenceChannel do
expect(PresenceChannel.new("/test/noaccess").can_view?(user_id: user.id)).to eq(false)
end
- it 'publishes messages with appropriate security' do
+ it "publishes messages with appropriate security" do
channel = PresenceChannel.new("/test/alloweduser")
- messages = MessageBus.track_publish(channel.message_bus_channel_name) do
- channel.present(user_id: user.id, client_id: "a")
- end
+ messages =
+ MessageBus.track_publish(channel.message_bus_channel_name) do
+ channel.present(user_id: user.id, client_id: "a")
+ end
expect(messages.count).to eq(1)
expect(messages[0].user_ids).to eq([user.id])
channel = PresenceChannel.new("/test/allowedgroup")
- messages = MessageBus.track_publish(channel.message_bus_channel_name) do
- channel.present(user_id: user.id, client_id: "a")
- end
+ messages =
+ MessageBus.track_publish(channel.message_bus_channel_name) do
+ channel.present(user_id: user.id, client_id: "a")
+ end
expect(messages.count).to eq(1)
expect(messages[0].group_ids).to eq([group.id])
end
- it 'publishes messages correctly in count_only mode' do
+ it "publishes messages correctly in count_only mode" do
channel = PresenceChannel.new("/test/countonly")
- messages = MessageBus.track_publish(channel.message_bus_channel_name) do
- channel.present(user_id: user.id, client_id: "a")
- end
+ messages =
+ MessageBus.track_publish(channel.message_bus_channel_name) do
+ channel.present(user_id: user.id, client_id: "a")
+ end
expect(messages.count).to eq(1)
- expect(messages[0].data).to eq({
- "count_delta" => 1
- })
+ expect(messages[0].data).to eq({ "count_delta" => 1 })
- messages = MessageBus.track_publish(channel.message_bus_channel_name) do
- channel.leave(user_id: user.id, client_id: "a")
- end
+ messages =
+ MessageBus.track_publish(channel.message_bus_channel_name) do
+ channel.leave(user_id: user.id, client_id: "a")
+ end
expect(messages.count).to eq(1)
- expect(messages[0].data).to eq({
- "count_delta" => -1
- })
+ expect(messages[0].data).to eq({ "count_delta" => -1 })
end
it "sets a mutex when the change involves publishing messages" do
@@ -269,14 +274,14 @@ RSpec.describe PresenceChannel do
# Enter and leave
expect(PresenceChannel.redis.get(redis_key_mutex)).to eq(nil)
- channel.present(user_id: user.id, client_id: 'a')
+ channel.present(user_id: user.id, client_id: "a")
expect(PresenceChannel.redis.get(redis_key_mutex)).to eq(nil)
- channel.leave(user_id: user.id, client_id: 'a')
+ channel.leave(user_id: user.id, client_id: "a")
expect(PresenceChannel.redis.get(redis_key_mutex)).to eq(nil)
expect(messages_published).to eq(2)
# Enter and auto_leave
- channel.present(user_id: user.id, client_id: 'a')
+ channel.present(user_id: user.id, client_id: "a")
expect(PresenceChannel.redis.get(redis_key_mutex)).to eq(nil)
freeze_time 1.hour.from_now
channel.auto_leave
diff --git a/spec/lib/pretty_text/helpers_spec.rb b/spec/lib/pretty_text/helpers_spec.rb
index 4e95adc8449..c8612c9cc4b 100644
--- a/spec/lib/pretty_text/helpers_spec.rb
+++ b/spec/lib/pretty_text/helpers_spec.rb
@@ -50,12 +50,19 @@ RSpec.describe PrettyText::Helpers do
describe ".hashtag_lookup" do
fab!(:tag) { Fabricate(:tag, name: "somecooltag", description: "Coolest things ever") }
fab!(:category) do
- Fabricate(:category, name: "Some Awesome Category", slug: "someawesomecategory", description: "Really great stuff here")
+ Fabricate(
+ :category,
+ name: "Some Awesome Category",
+ slug: "someawesomecategory",
+ description: "Really great stuff here",
+ )
end
fab!(:user) { Fabricate(:user) }
it "handles tags and categories based on slug with type suffix" do
- expect(PrettyText::Helpers.hashtag_lookup("somecooltag::tag", user.id, %w[category tag])).to eq(
+ expect(
+ PrettyText::Helpers.hashtag_lookup("somecooltag::tag", user.id, %w[category tag]),
+ ).to eq(
{
relative_url: tag.url,
text: "somecooltag",
@@ -66,7 +73,13 @@ RSpec.describe PrettyText::Helpers do
type: "tag",
},
)
- expect(PrettyText::Helpers.hashtag_lookup("someawesomecategory::category", user.id, %w[category tag])).to eq(
+ expect(
+ PrettyText::Helpers.hashtag_lookup(
+ "someawesomecategory::category",
+ user.id,
+ %w[category tag],
+ ),
+ ).to eq(
{
relative_url: category.url,
text: "Some Awesome Category",
@@ -107,7 +120,9 @@ RSpec.describe PrettyText::Helpers do
type: "tag",
},
)
- expect(PrettyText::Helpers.hashtag_lookup("someawesomecategory", user.id, %w[category tag])).to eq(
+ expect(
+ PrettyText::Helpers.hashtag_lookup("someawesomecategory", user.id, %w[category tag]),
+ ).to eq(
{
relative_url: category.url,
text: "Some Awesome Category",
@@ -122,8 +137,11 @@ RSpec.describe PrettyText::Helpers do
it "does not include categories the cooking user does not have access to" do
group = Fabricate(:group)
- private_category = Fabricate(:private_category, slug: "secretcategory", name: "Manager Hideout", group: group)
- expect(PrettyText::Helpers.hashtag_lookup("secretcategory", user.id, %w[category tag])).to eq(nil)
+ private_category =
+ Fabricate(:private_category, slug: "secretcategory", name: "Manager Hideout", group: group)
+ expect(PrettyText::Helpers.hashtag_lookup("secretcategory", user.id, %w[category tag])).to eq(
+ nil,
+ )
GroupUser.create(group: group, user: user)
expect(PrettyText::Helpers.hashtag_lookup("secretcategory", user.id, %w[category tag])).to eq(
diff --git a/spec/lib/pretty_text_spec.rb b/spec/lib/pretty_text_spec.rb
index 4ffc050c90a..25a8d80749b 100644
--- a/spec/lib/pretty_text_spec.rb
+++ b/spec/lib/pretty_text_spec.rb
@@ -1,14 +1,12 @@
# frozen_string_literal: true
-require 'pretty_text'
+require "pretty_text"
RSpec.describe PrettyText do
fab!(:user) { Fabricate(:user) }
fab!(:post) { Fabricate(:post) }
- before do
- SiteSetting.enable_markdown_typographer = false
- end
+ before { SiteSetting.enable_markdown_typographer = false }
def n(html)
html.strip
@@ -18,18 +16,19 @@ RSpec.describe PrettyText do
PrettyText.cook(*args)
end
- let(:wrapped_image) { "
" }
+ let(:wrapped_image) do
+ "
"
+ end
describe "Quoting" do
context "with avatar" do
- let(:default_avatar) { "//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/{size}.png" }
-
- before do
- User.stubs(:default_template).returns(default_avatar)
+ let(:default_avatar) do
+ "//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/{size}.png"
end
- it "do off topic quoting with emoji unescape" do
+ before { User.stubs(:default_template).returns(default_avatar) }
+ it "do off topic quoting with emoji unescape" do
topic = Fabricate(:topic, title: "this is a test topic :slight_smile:")
expected = <<~HTML
@@ -43,19 +42,19 @@ RSpec.describe PrettyText do
HTML
- expect(cook("[quote=\"EvilTrout, post:2, topic:#{topic.id}\"]\nddd\n[/quote]", topic_id: 1)).to eq(n(expected))
+ expect(
+ cook("[quote=\"EvilTrout, post:2, topic:#{topic.id}\"]\nddd\n[/quote]", topic_id: 1),
+ ).to eq(n(expected))
end
context "with emojis" do
- let(:md) do
- <<~MD
+ let(:md) { <<~MD }
> This is a quote with a regular emoji :upside_down_face:
> This is a quote with an emoji shortcut :)
> This is a quote with a Unicode emoji 😎
MD
- end
it "does not unescape emojis when emojis are disabled" do
SiteSetting.enable_emoji = false
@@ -172,7 +171,7 @@ RSpec.describe PrettyText do
end
it "does use emoji CDN when others CDNs are also enabled" do
- set_cdn_url('https://cdn.com')
+ set_cdn_url("https://cdn.com")
setup_s3
SiteSetting.s3_cdn_url = "https://s3.cdn.com"
SiteSetting.external_emoji_url = "https://emoji.cdn.com"
@@ -209,7 +208,12 @@ RSpec.describe PrettyText do
HTML
- expect(cook("[quote=\"maja, post:3, topic:#{topic.id}\"]\nI have nothing to say.\n[/quote]", topic_id: 1)).to eq(n(expected))
+ expect(
+ cook(
+ "[quote=\"maja, post:3, topic:#{topic.id}\"]\nI have nothing to say.\n[/quote]",
+ topic_id: 1,
+ ),
+ ).to eq(n(expected))
end
it "do off topic quoting with the force_quote_link opt and no topic_id opt provided" do
@@ -227,7 +231,11 @@ RSpec.describe PrettyText do
HTML
- cooked = cook("[quote=\"maja, post:3, topic:#{topic.id}\"]\nI have nothing to say.\n[/quote]", force_quote_link: true)
+ cooked =
+ cook(
+ "[quote=\"maja, post:3, topic:#{topic.id}\"]\nI have nothing to say.\n[/quote]",
+ force_quote_link: true,
+ )
expect(cooked).to eq(n(expected))
end
@@ -298,16 +306,15 @@ RSpec.describe PrettyText do
end
context "with primary user group" do
- let(:default_avatar) { "//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/{size}.png" }
+ let(:default_avatar) do
+ "//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/{size}.png"
+ end
fab!(:group) { Fabricate(:group) }
fab!(:user) { Fabricate(:user, primary_group: group) }
- before do
- User.stubs(:default_template).returns(default_avatar)
- end
+ before { User.stubs(:default_template).returns(default_avatar) }
it "adds primary group class to referenced users quote" do
-
topic = Fabricate(:topic, title: "this is a test topic")
expected = <<~HTML
@@ -321,7 +328,12 @@ RSpec.describe PrettyText do
HTML
- expect(cook("[quote=\"#{user.username}, post:2, topic:#{topic.id}\"]\nddd\n[/quote]", topic_id: 1)).to eq(n(expected))
+ expect(
+ cook(
+ "[quote=\"#{user.username}, post:2, topic:#{topic.id}\"]\nddd\n[/quote]",
+ topic_id: 1,
+ ),
+ ).to eq(n(expected))
end
end
@@ -344,12 +356,12 @@ RSpec.describe PrettyText do
end
it "can handle quote edge cases" do
- expect(PrettyText.cook("[quote]abc\ntest\n[/quote]")).not_to include('aside')
- expect(PrettyText.cook("[quote] \ntest\n[/quote] ")).to include('aside')
- expect(PrettyText.cook("a\n[quote]\ntest\n[/quote]\n\n\na")).to include('aside')
- expect(PrettyText.cook("- a\n[quote]\ntest\n[/quote]\n\n\na")).to include('aside')
- expect(PrettyText.cook("[quote]\ntest")).not_to include('aside')
- expect(PrettyText.cook("[quote]\ntest\n[/quote]z")).not_to include('aside')
+ expect(PrettyText.cook("[quote]abc\ntest\n[/quote]")).not_to include("aside")
+ expect(PrettyText.cook("[quote] \ntest\n[/quote] ")).to include("aside")
+ expect(PrettyText.cook("a\n[quote]\ntest\n[/quote]\n\n\na")).to include("aside")
+ expect(PrettyText.cook("- a\n[quote]\ntest\n[/quote]\n\n\na")).to include("aside")
+ expect(PrettyText.cook("[quote]\ntest")).not_to include("aside")
+ expect(PrettyText.cook("[quote]\ntest\n[/quote]z")).not_to include("aside")
nested = <<~MD
[quote]
@@ -362,8 +374,8 @@ RSpec.describe PrettyText do
MD
cooked = PrettyText.cook(nested)
- expect(cooked.scan('aside').length).to eq(4)
- expect(cooked.scan('quote]').length).to eq(0)
+ expect(cooked.scan("aside").length).to eq(4)
+ expect(cooked.scan("quote]").length).to eq(0)
end
context "with letter avatar" do
@@ -383,127 +395,142 @@ RSpec.describe PrettyText do
describe "Mentions" do
it "can handle mentions after abbr" do
- expect(PrettyText.cook("test
test \n\n@bob")).to eq("
test test
\n
@bob
")
+ expect(PrettyText.cook("test
test \n\n@bob")).to eq(
+ "
test test
\n
@bob
",
+ )
end
it "should handle 3 mentions in a row" do
- expect(PrettyText.cook('@hello @hello @hello')).to match_html "
@hello @hello @hello
"
+ expect(
+ PrettyText.cook("@hello @hello @hello"),
+ ).to match_html "
@hello @hello @hello
"
end
it "can handle mention edge cases" do
expect(PrettyText.cook("hi\n@s")).to eq("
hi@s
")
expect(PrettyText.cook("hi\n@ss")).to eq("
hi@ss
")
expect(PrettyText.cook("hi\n@s.")).to eq("
hi@s .
")
- expect(PrettyText.cook("hi\n@s.s")).to eq("
hi@s.s
")
+ expect(PrettyText.cook("hi\n@s.s")).to eq(
+ "
hi@s.s
",
+ )
expect(PrettyText.cook("hi\n@.s.s")).to eq("
hi
")
end
it "handles user and group mentions correctly" do
- ['User', 'user2'].each do |username |
- Fabricate(:user, username: username)
- end
+ %w[User user2].each { |username| Fabricate(:user, username: username) }
- Fabricate(:group, name: 'Group', mentionable_level: Group::ALIAS_LEVELS[:everyone])
- Fabricate(:group, name: 'Group2', mentionable_level: Group::ALIAS_LEVELS[:members_mods_and_admins])
+ Fabricate(:group, name: "Group", mentionable_level: Group::ALIAS_LEVELS[:everyone])
+ Fabricate(
+ :group,
+ name: "Group2",
+ mentionable_level: Group::ALIAS_LEVELS[:members_mods_and_admins],
+ )
[
[
- 'hi @uSer! @user2 hi',
- '
hi @uSer ! @user2 hi
'
+ "hi @uSer! @user2 hi",
+ '
hi @uSer ! @user2 hi
',
],
[
"hi\n@user. @GROUP @somemention @group2",
- %Q|
hi@user . @GROUP @somemention @group2
|
- ]
- ].each do |input, expected|
- expect(PrettyText.cook(input)).to eq(expected)
- end
+ %Q|
hi@user . @GROUP @somemention @group2
|,
+ ],
+ ].each { |input, expected| expect(PrettyText.cook(input)).to eq(expected) }
end
- context 'with subfolder' do
+ context "with subfolder" do
it "handles user and group mentions correctly" do
set_subfolder "/forum"
- Fabricate(:user, username: 'user1')
- Fabricate(:group, name: 'groupA', mentionable_level: Group::ALIAS_LEVELS[:everyone])
+ Fabricate(:user, username: "user1")
+ Fabricate(:group, name: "groupA", mentionable_level: Group::ALIAS_LEVELS[:everyone])
- input = 'hi there @user1 and @groupA'
- expected = '
hi there @user1 and @groupA
'
+ input = "hi there @user1 and @groupA"
+ expected =
+ '
hi there @user1 and @groupA
'
expect(PrettyText.cook(input)).to eq(expected)
end
end
it "does not assign the notify class to a group that can't be mentioned" do
- group = Fabricate(:group,
- visibility_level: Group.visibility_levels[:members],
- mentionable_level: Group::ALIAS_LEVELS[:nobody]
- )
+ group =
+ Fabricate(
+ :group,
+ visibility_level: Group.visibility_levels[:members],
+ mentionable_level: Group::ALIAS_LEVELS[:nobody],
+ )
expect(PrettyText.cook("test @#{group.name} test")).to eq(
- %Q|
test @#{group.name} test
|
+ %Q|
test @#{group.name} test
|,
)
end
it "assigns the notify class if the user can mention" do
- group = Fabricate(:group,
- visibility_level: Group.visibility_levels[:members],
- mentionable_level: Group::ALIAS_LEVELS[:members_mods_and_admins]
- )
+ group =
+ Fabricate(
+ :group,
+ visibility_level: Group.visibility_levels[:members],
+ mentionable_level: Group::ALIAS_LEVELS[:members_mods_and_admins],
+ )
expect(PrettyText.cook("test @#{group.name} test", user_id: Fabricate(:admin).id)).to eq(
- %Q|
test @#{group.name} test
|
+ %Q|
test @#{group.name} test
|,
)
end
- it 'does not mention staged users' do
+ it "does not mention staged users" do
user = Fabricate(:user, staged: true)
expect(PrettyText.cook("something @#{user.username} something")).to eq(
- %Q|
something @#{user.username} something
|
+ %Q|
something @#{user.username} something
|,
)
end
- context 'when mentions are disabled' do
- before do
- SiteSetting.enable_mentions = false
- end
+ context "when mentions are disabled" do
+ before { SiteSetting.enable_mentions = false }
- it 'should not convert mentions to links' do
- expect(PrettyText.cook('hi @user')).to eq('
hi @user
')
+ it "should not convert mentions to links" do
+ expect(PrettyText.cook("hi @user")).to eq("
hi @user
")
end
end
it "can handle mentions inside a hyperlink" do
- expect(PrettyText.cook("
@inner ")).to match_html '
@inner
'
+ expect(PrettyText.cook("
@inner ")).to match_html "
@inner
"
end
it "can handle mentions inside a hyperlink" do
- expect(PrettyText.cook("[link @inner](http://site.com)")).to match_html '
link @inner
'
+ expect(
+ PrettyText.cook("[link @inner](http://site.com)"),
+ ).to match_html '
link @inner
'
end
it "can handle a list of mentions" do
- expect(PrettyText.cook("@a,@b")).to match_html('
@a ,@b
')
- end
-
- it "should handle group mentions with a hyphen and without" do
- expect(PrettyText.cook('@hello @hello-hello')).to match_html "
@hello @hello-hello
"
- end
-
- it 'should allow for @mentions to have punctuation' do
- expect(PrettyText.cook("hello @bob's @bob,@bob; @bob\"")).to match_html(
- "
hello @bob 's @bob ,@bob ; @bob \"
"
+ expect(PrettyText.cook("@a,@b")).to match_html(
+ '
@a ,@b
',
)
end
- it 'should not treat a medium link as a mention' do
- expect(PrettyText.cook(". http://test/@sam")).not_to include('mention')
+ it "should handle group mentions with a hyphen and without" do
+ expect(
+ PrettyText.cook("@hello @hello-hello"),
+ ).to match_html "
@hello @hello-hello
"
+ end
+
+ it "should allow for @mentions to have punctuation" do
+ expect(PrettyText.cook("hello @bob's @bob,@bob; @bob\"")).to match_html(
+ "
hello @bob 's @bob ,@bob ; @bob \"
",
+ )
+ end
+
+ it "should not treat a medium link as a mention" do
+ expect(PrettyText.cook(". http://test/@sam")).not_to include("mention")
end
context "with Unicode usernames disabled" do
before { SiteSetting.unicode_usernames = false }
- it 'does not detect mention' do
+ it "does not detect mention" do
expect(PrettyText.cook("Hello @狮子")).to_not include("mention")
end
end
@@ -511,14 +538,16 @@ RSpec.describe PrettyText do
context "with Unicode usernames enabled" do
before { SiteSetting.unicode_usernames = true }
- it 'does detect mention' do
- expect(PrettyText.cook("Hello @狮子")).to match_html '
Hello @狮子
'
+ it "does detect mention" do
+ expect(
+ PrettyText.cook("Hello @狮子"),
+ ).to match_html '
Hello @狮子
'
end
end
end
describe "code fences" do
- it 'indents code correctly' do
+ it "indents code correctly" do
code = <<~MD
X
```
@@ -542,40 +571,82 @@ RSpec.describe PrettyText do
expect(PrettyText.cook("```\n💣`\n```\n")).not_to match(/\:bomb\:/)
end
- it 'can include code class correctly' do
- SiteSetting.highlighted_languages += '|c++|structured-text|p21'
+ it "can include code class correctly" do
+ SiteSetting.highlighted_languages += "|c++|structured-text|p21"
# keep in mind spaces should be trimmed per spec
- expect(PrettyText.cook("``` ruby the mooby\n`````")).to eq('
')
- expect(PrettyText.cook("```cpp\ncpp\n```")).to match_html("
cpp\n")
- expect(PrettyText.cook("```\ncpp\n```")).to match_html("
cpp\n")
- expect(PrettyText.cook("```text\ncpp\n```")).to match_html("
cpp\n")
- expect(PrettyText.cook("```custom\ncustom content\n```")).to match_html("
custom content\n")
- expect(PrettyText.cook("```custom foo=bar\ncustom content\n```")).to match_html("
custom content")
- expect(PrettyText.cook("```INVALID a=1\n```")).to match_html("
\n")
- expect(PrettyText.cook("```INVALID a=1, foo=bar , baz=2\n```")).to match_html("
\n")
- expect(PrettyText.cook("```text\n```")).to match_html("
\n")
- expect(PrettyText.cook("```auto\n```")).to match_html("
\n")
- expect(PrettyText.cook("```ruby startline=3 $%@#\n```")).to match_html("
\n")
- expect(PrettyText.cook("```mermaid a_-你=17\n```")).to match_html("
\n")
- expect(PrettyText.cook("```mermaid foo=\n```")).to match_html("
\n")
- expect(PrettyText.cook("```mermaid foo= begin admin o \n```")).to match_html("
\n")
- expect(PrettyText.cook("```c++\nc++\n```")).to match_html("
c++\n")
- expect(PrettyText.cook("```structured-text\nstructured-text\n```")).to match_html("
structured-text\n")
- expect(PrettyText.cook("```p21\np21\n```")).to match_html("
p21\n")
- expect(PrettyText.cook("
")).to match_html("
")
+ expect(PrettyText.cook("``` ruby the mooby\n`````")).to eq(
+ '
',
+ )
+ expect(PrettyText.cook("```cpp\ncpp\n```")).to match_html(
+ "
cpp\n",
+ )
+ expect(PrettyText.cook("```\ncpp\n```")).to match_html(
+ "
cpp\n",
+ )
+ expect(PrettyText.cook("```text\ncpp\n```")).to match_html(
+ "
cpp\n",
+ )
+ expect(PrettyText.cook("```custom\ncustom content\n```")).to match_html(
+ "
custom content\n",
+ )
+ expect(PrettyText.cook("```custom foo=bar\ncustom content\n```")).to match_html(
+ "
custom content",
+ )
+ expect(PrettyText.cook("```INVALID a=1\n```")).to match_html(
+ "
\n",
+ )
+ expect(PrettyText.cook("```INVALID a=1, foo=bar , baz=2\n```")).to match_html(
+ "
\n",
+ )
+ expect(PrettyText.cook("```text\n```")).to match_html(
+ "
\n",
+ )
+ expect(PrettyText.cook("```auto\n```")).to match_html(
+ "
\n",
+ )
+ expect(PrettyText.cook("```ruby startline=3 $%@#\n```")).to match_html(
+ "
\n",
+ )
+ expect(PrettyText.cook("```mermaid a_-你=17\n```")).to match_html(
+ "
\n",
+ )
+ expect(
+ PrettyText.cook("```mermaid foo=\n```"),
+ ).to match_html(
+ "
\n",
+ )
+ expect(PrettyText.cook("```mermaid foo= begin admin o \n```")).to match_html(
+ "
\n",
+ )
+ expect(PrettyText.cook("```c++\nc++\n```")).to match_html(
+ "
c++\n",
+ )
+ expect(PrettyText.cook("```structured-text\nstructured-text\n```")).to match_html(
+ "
structured-text\n",
+ )
+ expect(PrettyText.cook("```p21\np21\n```")).to match_html(
+ "
p21\n",
+ )
+ expect(
+ PrettyText.cook("
"),
+ ).to match_html("
")
end
- it 'indents code correctly' do
+ it "indents code correctly" do
code = "X\n```\n\n #\n x\n```"
cooked = PrettyText.cook(code)
- expect(cooked).to match_html("
X
\n
\n #\n x\n")
+ expect(cooked).to match_html(
+ "
X
\n
\n #\n x\n",
+ )
end
- it 'does censor code fences' do
+ it "does censor code fences" do
begin
- ['apple', 'banana'].each { |w| Fabricate(:watched_word, word: w, action: WatchedWord.actions[:censor]) }
- expect(PrettyText.cook("# banana")).not_to include('banana')
+ %w[apple banana].each do |w|
+ Fabricate(:watched_word, word: w, action: WatchedWord.actions[:censor])
+ end
+ expect(PrettyText.cook("# banana")).not_to include("banana")
ensure
Discourse.redis.flushdb
end
@@ -682,45 +753,59 @@ RSpec.describe PrettyText do
end
it "should not inject nofollow in all local links" do
- expect(PrettyText.cook("
cnn ") !~ /nofollow ugc/).to eq(true)
+ expect(
+ PrettyText.cook("
cnn ") !~ /nofollow ugc/,
+ ).to eq(true)
end
it "should not inject nofollow in all subdomain links" do
- expect(PrettyText.cook("
cnn ") !~ /nofollow ugc/).to eq(true)
+ expect(
+ PrettyText.cook(
+ "
cnn ",
+ ) !~ /nofollow ugc/,
+ ).to eq(true)
end
it "should inject nofollow in all non subdomain links" do
- expect(PrettyText.cook("
cnn ")).to match(/nofollow ugc/)
+ expect(
+ PrettyText.cook(
+ "
cnn ",
+ ),
+ ).to match(/nofollow ugc/)
end
it "should not inject nofollow for foo.com" do
- expect(PrettyText.cook("
cnn ") !~ /nofollow ugc/).to eq(true)
+ expect(PrettyText.cook("
cnn ") !~ /nofollow ugc/).to eq(
+ true,
+ )
end
it "should inject nofollow for afoo.com" do
- expect(PrettyText.cook("
cnn ")).to match(/nofollow ugc/)
+ expect(PrettyText.cook("
cnn ")).to match(
+ /nofollow ugc/,
+ )
end
it "should not inject nofollow for bar.foo.com" do
- expect(PrettyText.cook("
cnn ") !~ /nofollow ugc/).to eq(true)
+ expect(
+ PrettyText.cook("
cnn ") !~ /nofollow ugc/,
+ ).to eq(true)
end
it "should not inject nofollow if omit_nofollow option is given" do
- expect(PrettyText.cook('
cnn ', omit_nofollow: true) !~ /nofollow ugc/).to eq(true)
+ expect(
+ PrettyText.cook('
cnn ', omit_nofollow: true) !~ /nofollow ugc/,
+ ).to eq(true)
end
- it 'adds the noopener attribute even if omit_nofollow option is given' do
+ it "adds the noopener attribute even if omit_nofollow option is given" do
raw_html = '
Check out my site! '
- expect(
- PrettyText.cook(raw_html, omit_nofollow: true)
- ).to match(/noopener/)
+ expect(PrettyText.cook(raw_html, omit_nofollow: true)).to match(/noopener/)
end
- it 'adds the noopener attribute even if omit_nofollow option is given' do
+ it "adds the noopener attribute even if omit_nofollow option is given" do
raw_html = '
Check out my site! '
- expect(
- PrettyText.cook(raw_html, omit_nofollow: false)
- ).to match(/noopener nofollow ugc/)
+ expect(PrettyText.cook(raw_html, omit_nofollow: false)).to match(/noopener nofollow ugc/)
end
end
@@ -729,7 +814,8 @@ RSpec.describe PrettyText do
spinner = "
", 100)).to eq("[image]")
end
- context 'with alt tags' do
+ context "with alt tags" do
it "should keep alt tags" do
- expect(PrettyText.excerpt("expand hello
expand expand hello
expand expand hello
expand helloexpand hello
expand hello [image] "
+ expect(
+ PrettyText.excerpt(wrapped_image, 100),
+ ).to match_html "
[image] "
end
it "should strip images when option is set" do
- expect(PrettyText.excerpt("
", 100, strip_images: true)).to be_blank
- expect(PrettyText.excerpt("
Hello world!", 100, strip_images: true)).to eq("Hello world!")
+ expect(
+ PrettyText.excerpt("
", 100, strip_images: true),
+ ).to be_blank
+ expect(
+ PrettyText.excerpt(
+ "
Hello world!",
+ 100,
+ strip_images: true,
+ ),
+ ).to eq("Hello world!")
end
it "should strip images, but keep emojis when option is set" do
- emoji_image = "
"
+ emoji_image =
+ "
"
html = "
Hello world #{emoji_image}"
expect(PrettyText.excerpt(html, 100, strip_images: true)).to eq("Hello world :heart:")
- expect(PrettyText.excerpt(html, 100, strip_images: true, keep_emoji_images: true)).to match_html("Hello world #{emoji_image}")
+ expect(
+ PrettyText.excerpt(html, 100, strip_images: true, keep_emoji_images: true),
+ ).to match_html("Hello world #{emoji_image}")
end
end
@@ -809,11 +929,15 @@ RSpec.describe PrettyText do
end
it "should have an option to strip links" do
- expect(PrettyText.excerpt("
cnn ", 100, strip_links: true)).to eq("cnn")
+ expect(PrettyText.excerpt("
cnn ", 100, strip_links: true)).to eq(
+ "cnn",
+ )
end
it "should preserve links" do
- expect(PrettyText.excerpt("
cnn ", 100)).to match_html "
cnn "
+ expect(
+ PrettyText.excerpt("
cnn ", 100),
+ ).to match_html "
cnn "
end
it "should deal with special keys properly" do
@@ -830,27 +954,41 @@ RSpec.describe PrettyText do
end
it "should strip quotes" do
- expect(PrettyText.excerpt("
boom", 5)).to eq("boom")
+ expect(PrettyText.excerpt("
boom", 5)).to eq(
+ "boom",
+ )
end
it "should not count the surrounds of a link" do
- expect(PrettyText.excerpt("
cnn ", 3)).to match_html "
cnn "
+ expect(
+ PrettyText.excerpt("
cnn ", 3),
+ ).to match_html "
cnn "
end
it "uses an ellipsis instead of html entities if provided with the option" do
- expect(PrettyText.excerpt("
cnn ", 2, text_entities: true)).to match_html "
cn... "
+ expect(
+ PrettyText.excerpt("
cnn ", 2, text_entities: true),
+ ).to match_html "
cn... "
end
it "should truncate links" do
- expect(PrettyText.excerpt("
cnn ", 2)).to match_html "
cn… "
+ expect(
+ PrettyText.excerpt("
cnn ", 2),
+ ).to match_html "
cn… "
end
it "doesn't extract empty quotes as links" do
- expect(PrettyText.extract_links("
\n").to_a).to be_empty
+ expect(
+ PrettyText.extract_links("
\n").to_a,
+ ).to be_empty
end
it "doesn't extract links from elided parts" do
- expect(PrettyText.extract_links("
cnn \n").to_a).to be_empty
+ expect(
+ PrettyText.extract_links(
+ "
cnn \n",
+ ).to_a,
+ ).to be_empty
end
def extract_urls(text)
@@ -862,7 +1000,9 @@ RSpec.describe PrettyText do
end
it "should extract links to topics" do
- expect(extract_urls("
")).to eq(["/t/321"])
+ expect(extract_urls("
")).to eq(
+ ["/t/321"],
+ )
end
it "does not extract links from hotlinked images" do
@@ -880,11 +1020,17 @@ RSpec.describe PrettyText do
end
it "should lazyYT videos" do
- expect(extract_urls("
")).to eq(["https://www.youtube.com/watch?v=yXEuEUQIP3Q"])
+ expect(
+ extract_urls(
+ "
",
+ ),
+ ).to eq(["https://www.youtube.com/watch?v=yXEuEUQIP3Q"])
end
it "should extract links to posts" do
- expect(extract_urls("
")).to eq(["/t/1234/4567"])
+ expect(
+ extract_urls("
"),
+ ).to eq(["/t/1234/4567"])
end
it "should not extract links to anchors" do
@@ -892,20 +1038,25 @@ RSpec.describe PrettyText do
end
it "should not extract links inside quotes" do
- links = PrettyText.extract_links("
+ links =
+ PrettyText.extract_links(
+ "
http://useless1.com
http://useless2.com
- ")
+ ",
+ )
- expect(links.map { |l| [l.url, l.is_quote] }.sort).to eq([
- ["http://body_only.com", false],
- ["http://body_and_quote.com", false],
- ["/t/1234", true],
- ].sort)
+ expect(links.map { |l| [l.url, l.is_quote] }.sort).to eq(
+ [
+ ["http://body_only.com", false],
+ ["http://body_and_quote.com", false],
+ ["/t/1234", true],
+ ].sort,
+ )
end
it "should not extract links inside oneboxes" do
@@ -921,15 +1072,22 @@ RSpec.describe PrettyText do
HTML
- expect(PrettyText.extract_links(onebox).map(&:url)).to contain_exactly("https://twitter.com/EDBPostgres/status/1402528437441634306")
+ expect(PrettyText.extract_links(onebox).map(&:url)).to contain_exactly(
+ "https://twitter.com/EDBPostgres/status/1402528437441634306",
+ )
end
it "should not preserve tags in code blocks" do
- expect(PrettyText.excerpt("
<h3>Hours</h3>", 100)).to eq("<h3>Hours</h3>")
+ expect(
+ PrettyText.excerpt(
+ "
<h3>Hours</h3>",
+ 100,
+ ),
+ ).to eq("<h3>Hours</h3>")
end
it "should handle nil" do
- expect(PrettyText.excerpt(nil, 100)).to eq('')
+ expect(PrettyText.excerpt(nil, 100)).to eq("")
end
it "handles custom bbcode excerpt" do
@@ -941,15 +1099,17 @@ RSpec.describe PrettyText do
MD
post = Fabricate(:post, raw: raw)
- expect(post.excerpt).to eq("hello
site ")
+ expect(post.excerpt).to eq(
+ "hello
site ",
+ )
end
it "handles div excerpt at the beginning of a post" do
- expect(PrettyText.excerpt("
hi
test", 100)).to eq('hi')
+ expect(PrettyText.excerpt("
hi
test", 100)).to eq("hi")
end
it "handles span excerpt at the beginning of a post" do
- expect(PrettyText.excerpt("
hi test", 100)).to eq('hi')
+ expect(PrettyText.excerpt("
hi test", 100)).to eq("hi")
end
it "ignores max excerpt length if a div excerpt is specified" do
@@ -969,40 +1129,53 @@ RSpec.describe PrettyText do
end
it "should have an option to preserve emoji images" do
- emoji_image = "
"
- expect(PrettyText.excerpt(emoji_image, 100, keep_emoji_images: true)).to match_html(emoji_image)
+ emoji_image =
+ "
"
+ expect(PrettyText.excerpt(emoji_image, 100, keep_emoji_images: true)).to match_html(
+ emoji_image,
+ )
end
it "should have an option to remap emoji to code points" do
- emoji_image = "I
you
"
- expect(PrettyText.excerpt(emoji_image, 100, remap_emoji: true)).to match_html("I ❤ you :unknown:")
+ emoji_image =
+ "I
you
"
+ expect(PrettyText.excerpt(emoji_image, 100, remap_emoji: true)).to match_html(
+ "I ❤ you :unknown:",
+ )
end
it "should have an option to preserve emoji codes" do
- emoji_code = "
"
+ emoji_code =
+ "
"
expect(PrettyText.excerpt(emoji_code, 100)).to eq(":heart:")
end
- context 'with option to preserve onebox source' do
+ context "with option to preserve onebox source" do
it "should return the right excerpt" do
- onebox = "
\n \n \n Well, there's an Italian translation for \"New Topic\" in beta, it's been there since November 2014 and it works here on meta. Do you have any plugins installed? Try disabling them. I'm quite confident that it's either a plugin or a site...
\n\n \n \n \n \n
\n
\n \n\n\n"
- expected = "
meta.discourse.org "
+ onebox =
+ "
\n \n \n Well, there's an Italian translation for \"New Topic\" in beta, it's been there since November 2014 and it works here on meta. Do you have any plugins installed? Try disabling them. I'm quite confident that it's either a plugin or a site...
\n\n \n \n \n \n
\n
\n \n\n\n"
+ expected =
+ "
meta.discourse.org "
- expect(PrettyText.excerpt(onebox, 100, keep_onebox_source: true))
- .to eq(expected)
+ expect(PrettyText.excerpt(onebox, 100, keep_onebox_source: true)).to eq(expected)
- expect(PrettyText.excerpt("#{onebox}\n \n \n \n\n\n #{onebox}", 100, keep_onebox_source: true))
- .to eq("#{expected}\n\n#{expected}")
+ expect(
+ PrettyText.excerpt("#{onebox}\n \n \n \n\n\n #{onebox}", 100, keep_onebox_source: true),
+ ).to eq("#{expected}\n\n#{expected}")
end
- it 'should continue to strip quotes' do
- expect(PrettyText.excerpt(
- "
boom", 100, keep_onebox_source: true
- )).to eq("boom")
+ it "should continue to strip quotes" do
+ expect(
+ PrettyText.excerpt(
+ "
boom",
+ 100,
+ keep_onebox_source: true,
+ ),
+ ).to eq("boom")
end
end
- it 'should strip audio/video' do
+ it "should strip audio/video" do
html = <<~HTML
https://awebsite.com/audio.mp3 batman ")).to eq("I'm the linked batman")
+ expect(
+ PrettyText.strip_links(
+ "I'm the linked batman ",
+ ),
+ ).to eq("I'm the linked batman")
end
it "escapes the text content" do
- expect(PrettyText.strip_links("I'm the linked <batman> ")).to eq("I'm the linked <batman>")
+ expect(
+ PrettyText.strip_links(
+ "I'm the linked <batman> ",
+ ),
+ ).to eq("I'm the linked <batman>")
end
end
@@ -1062,25 +1243,31 @@ RSpec.describe PrettyText do
end
it "strips the metadata" do
- expect(strip_image_wrapping(wrapped_image)).to match_html ""
+ expect(
+ strip_image_wrapping(wrapped_image),
+ ).to match_html ""
end
end
- describe 'format_for_email' do
+ describe "format_for_email" do
let(:base_url) { "http://baseurl.net" }
- before do
- Discourse.stubs(:base_url).returns(base_url)
- end
+ before { Discourse.stubs(:base_url).returns(base_url) }
- it 'does not crash' do
- PrettyText.format_for_email('test ', post)
+ it "does not crash" do
+ PrettyText.format_for_email(
+ 'test ',
+ post,
+ )
end
it "adds base url to relative links" do
- html = "@wiseguy , @trollol what do you guys think?
"
+ html =
+ "@wiseguy , @trollol what do you guys think?
"
output = described_class.format_for_email(html, post)
- expect(output).to eq("@wiseguy , @trollol what do you guys think?
")
+ expect(output).to eq(
+ "@wiseguy , @trollol what do you guys think?
",
+ )
end
it "doesn't change external absolute links" do
@@ -1104,8 +1291,11 @@ RSpec.describe PrettyText do
end
it "prefers data-original-href attribute to get Vimeo iframe link and escapes it" do
- html = "Check out this video – .
"
- expect(PrettyText.format_for_email(html, post)).to match(Regexp.escape("https://vimeo.com/329875646/%3E%20%3Cscript%3Ealert(1)%3C/script%3E"))
+ html =
+ "Check out this video – .
"
+ expect(PrettyText.format_for_email(html, post)).to match(
+ Regexp.escape("https://vimeo.com/329875646/%3E%20%3Cscript%3Ealert(1)%3C/script%3E"),
+ )
end
describe "#convert_vimeo_iframes" do
@@ -1117,7 +1307,7 @@ RSpec.describe PrettyText do
md = PrettyText.format_for_email(html, post)
- expect(md).not_to include('This is a Vimeo link:
https://vimeo.com/1
@@ -1144,7 +1334,7 @@ RSpec.describe PrettyText do
md = PrettyText.format_for_email(html, post)
- expect(md).not_to include('
HTML
md = PrettyText.format_for_email(html, post)
- expect(md).not_to include('
↔
')
+ expect(PrettyText.cook("↔")).to eq("↔
")
end
it "doesn't replace emoji in inline code blocks with our emoji sets if emoji is enabled" do
@@ -1297,10 +1487,18 @@ RSpec.describe PrettyText do
end
it "replaces skin toned emoji" do
- expect(PrettyText.cook("hello 👱🏿♀️")).to eq("hello
")
- expect(PrettyText.cook("hello 👩🎤")).to eq("hello
")
- expect(PrettyText.cook("hello 👩🏾🎓")).to eq("hello
")
- expect(PrettyText.cook("hello 🤷♀️")).to eq("hello
")
+ expect(PrettyText.cook("hello 👱🏿♀️")).to eq(
+ "hello
",
+ )
+ expect(PrettyText.cook("hello 👩🎤")).to eq(
+ "hello
",
+ )
+ expect(PrettyText.cook("hello 👩🏾🎓")).to eq(
+ "hello
",
+ )
+ expect(PrettyText.cook("hello 🤷♀️")).to eq(
+ "hello
",
+ )
end
it "correctly strips VARIATION SELECTOR-16 character (ufe0f) from some emojis" do
@@ -1314,7 +1512,7 @@ RSpec.describe PrettyText do
describe "custom emoji" do
it "replaces the custom emoji" do
- CustomEmoji.create!(name: 'trout', upload: Fabricate(:upload))
+ CustomEmoji.create!(name: "trout", upload: Fabricate(:upload))
Emoji.clear_cache
expect(PrettyText.cook("hello :trout:")).to match(/hello
")
- expect(PrettyText.cook("hello 👩🎤")).to eq("hello
")
- expect(PrettyText.cook("hello 👩🏾🎓")).to eq("hello
")
- expect(PrettyText.cook("hello 🤷♀️")).to eq("hello
")
+ expect(PrettyText.cook("hello 👱🏿♀️")).to eq(
+ "hello
",
+ )
+ expect(PrettyText.cook("hello 👩🎤")).to eq(
+ "hello
",
+ )
+ expect(PrettyText.cook("hello 👩🏾🎓")).to eq(
+ "hello
",
+ )
+ expect(PrettyText.cook("hello 🤷♀️")).to eq(
+ "hello
",
+ )
end
it "should not treat a non emoji as an emoji" do
- expect(PrettyText.cook(':email,class_name:')).not_to include('emoji')
+ expect(PrettyText.cook(":email,class_name:")).not_to include("emoji")
end
it "supports href schemes" do
SiteSetting.allowed_href_schemes = "macappstore|steam"
cooked = cook("[Steam URL Scheme](steam://store/452530)")
- expected = 'Steam URL Scheme
'
+ expected =
+ 'Steam URL Scheme
'
expect(cooked).to eq(n expected)
end
it "supports forbidden schemes" do
SiteSetting.allowed_href_schemes = "macappstore|itunes"
cooked = cook("[Steam URL Scheme](steam://store/452530)")
- expected = 'Steam URL Scheme
'
+ expected = "Steam URL Scheme
"
expect(cooked).to eq(n expected)
end
it "applies scheme restrictions to img[src] attributes" do
SiteSetting.allowed_href_schemes = "steam"
- cooked = cook " "
- expected = '
'
+ cooked =
+ cook " "
+ expected =
+ '
'
expect(cooked).to eq(n expected)
end
@@ -1398,21 +1607,21 @@ RSpec.describe PrettyText do
HTML
end
- it 'allows only tel URL scheme to start with a plus character' do
+ it "allows only tel URL scheme to start with a plus character" do
SiteSetting.allowed_href_schemes = "tel|steam"
cooked = cook("[Tel URL Scheme](tel://+452530579785)")
expected = 'Tel URL Scheme
'
expect(cooked).to eq(n expected)
cooked2 = cook("[Steam URL Scheme](steam://+store/452530)")
- expected2 = 'Steam URL Scheme
'
+ expected2 = "Steam URL Scheme
"
expect(cooked2).to eq(n expected2)
end
it "produces hashtag links" do
- category = Fabricate(:category, name: 'testing')
- category2 = Fabricate(:category, name: 'known')
- Fabricate(:topic, tags: [Fabricate(:tag, name: 'known')])
+ category = Fabricate(:category, name: "testing")
+ category2 = Fabricate(:category, name: "known")
+ Fabricate(:topic, tags: [Fabricate(:tag, name: "known")])
cooked = PrettyText.cook(" #unknown::tag #known #known::tag #testing")
@@ -1420,11 +1629,8 @@ RSpec.describe PrettyText do
"#unknown::tag ",
"#known ",
"#known ",
- "#testing "
- ].each do |element|
-
- expect(cooked).to include(element)
- end
+ "#testing ",
+ ].each { |element| expect(cooked).to include(element) }
cooked = PrettyText.cook("[`a` #known::tag here](http://example.com)")
@@ -1446,34 +1652,41 @@ RSpec.describe PrettyText do
expect(cooked).to eq(html.strip)
# ensure it does not fight with the autolinker
- expect(PrettyText.cook(' http://somewhere.com/#known')).not_to include('hashtag')
- expect(PrettyText.cook(' http://somewhere.com/?#known')).not_to include('hashtag')
- expect(PrettyText.cook(' http://somewhere.com/?abc#known')).not_to include('hashtag')
-
+ expect(PrettyText.cook(" http://somewhere.com/#known")).not_to include("hashtag")
+ expect(PrettyText.cook(" http://somewhere.com/?#known")).not_to include("hashtag")
+ expect(PrettyText.cook(" http://somewhere.com/?abc#known")).not_to include("hashtag")
end
it "produces hashtag links when enable_experimental_hashtag_autocomplete is enabled" do
SiteSetting.enable_experimental_hashtag_autocomplete = true
user = Fabricate(:user)
- category = Fabricate(:category, name: 'testing', slug: 'testing')
- category2 = Fabricate(:category, name: 'known', slug: 'known')
+ category = Fabricate(:category, name: "testing", slug: "testing")
+ category2 = Fabricate(:category, name: "known", slug: "known")
group = Fabricate(:group)
- private_category = Fabricate(:private_category, name: 'secret', group: group, slug: 'secret')
- Fabricate(:topic, tags: [Fabricate(:tag, name: 'known')])
+ private_category = Fabricate(:private_category, name: "secret", group: group, slug: "secret")
+ Fabricate(:topic, tags: [Fabricate(:tag, name: "known")])
cooked = PrettyText.cook(" #unknown::tag #known #known::tag #testing #secret", user_id: user.id)
expect(cooked).to include("#unknown::tag ")
- expect(cooked).to include("known known testing known known testing #secret ")
# If the user hash access to the private category it should be cooked with the details + icon
group.add(user)
cooked = PrettyText.cook(" #unknown::tag #known #known::tag #testing #secret", user_id: user.id)
- expect(cooked).to include("secret secret `a` #known::tag here ", user_id: user.id)
+ cooked =
+ PrettyText.cook("`a` #known::tag here ", user_id: user.id)
expect(cooked).to eq(html.strip)
@@ -1494,9 +1708,9 @@ RSpec.describe PrettyText do
expect(cooked).to eq(html.strip)
# ensure it does not fight with the autolinker
- expect(PrettyText.cook(' http://somewhere.com/#known')).not_to include('hashtag')
- expect(PrettyText.cook(' http://somewhere.com/?#known')).not_to include('hashtag')
- expect(PrettyText.cook(' http://somewhere.com/?abc#known')).not_to include('hashtag')
+ expect(PrettyText.cook(" http://somewhere.com/#known")).not_to include("hashtag")
+ expect(PrettyText.cook(" http://somewhere.com/?#known")).not_to include("hashtag")
+ expect(PrettyText.cook(" http://somewhere.com/?abc#known")).not_to include("hashtag")
end
it "can handle mixed lists" do
@@ -1514,7 +1728,6 @@ RSpec.describe PrettyText do
end
it "can handle emoji by name" do
-
expected = <a,
"
+ expected =
+ "a,
"
expect(cooked).to match(expected.strip)
end
it "can handle emoji by translation" do
- expected = "
"
+ expected =
+ "
"
expect(PrettyText.cook(";)")).to eq(expected)
end
@@ -1554,78 +1769,79 @@ HTML
context "with basic words" do
fab!(:watched_words) do
- ["shucks", "whiz", "whizzer", "a**le", "badword*", "shuck$", "café", "$uper"].each do |word|
+ %w[shucks whiz whizzer a**le badword* shuck$ café $uper].each do |word|
Fabricate(:watched_word, action: WatchedWord.actions[:censor], word: word)
end
end
it "works correctly" do
- expect_cooked_match("aw shucks, golly gee whiz.",
- "aw ■■■■■■, golly gee ■■■■.
")
+ expect_cooked_match("aw shucks, golly gee whiz.", "aw ■■■■■■, golly gee ■■■■.
")
end
it "doesn't censor words unless they have boundaries." do
- expect_cooked_match("you are a whizzard! I love cheesewhiz. Whiz.",
- "you are a whizzard! I love cheesewhiz. ■■■■.
")
+ expect_cooked_match(
+ "you are a whizzard! I love cheesewhiz. Whiz.",
+ "you are a whizzard! I love cheesewhiz. ■■■■.
",
+ )
end
it "censors words even if previous partial matches exist." do
- expect_cooked_match("you are a whizzer! I love cheesewhiz. Whiz.",
- "you are a ■■■■■■■! I love cheesewhiz. ■■■■.
")
+ expect_cooked_match(
+ "you are a whizzer! I love cheesewhiz. Whiz.",
+ "you are a ■■■■■■■! I love cheesewhiz. ■■■■.
",
+ )
end
it "won't break links by censoring them." do
- expect_cooked_match("The link still works. [whiz](http://www.whiz.com)",
- 'The link still works. ■■■■
')
+ expect_cooked_match(
+ "The link still works. [whiz](http://www.whiz.com)",
+ 'The link still works. ■■■■
',
+ )
end
it "escapes regexp characters" do
- expect_cooked_match(
- "I have a pen, I have an a**le",
- "I have a pen, I have an ■■■■■
"
- )
+ expect_cooked_match("I have a pen, I have an a**le", "I have a pen, I have an ■■■■■
")
end
it "works for words ending in non-word characters" do
expect_cooked_match(
"Aw shuck$, I can't fix the problem with money",
- "Aw ■■■■■■, I can't fix the problem with money
")
+ "Aw ■■■■■■, I can't fix the problem with money
",
+ )
end
it "works for words ending in accented characters" do
- expect_cooked_match(
- "Let's go to a café today",
- "Let's go to a ■■■■ today
")
+ expect_cooked_match("Let's go to a café today", "Let's go to a ■■■■ today
")
end
it "works for words starting with non-word characters" do
- expect_cooked_match(
- "Discourse is $uper amazing",
- "Discourse is ■■■■■ amazing
")
+ expect_cooked_match("Discourse is $uper amazing", "Discourse is ■■■■■ amazing
")
end
it "handles * as wildcard" do
- expect_cooked_match(
- "No badword or apple here plz.",
- "No ■■■■■■■ or ■■■■■ here plz.
")
+ expect_cooked_match("No badword or apple here plz.", "No ■■■■■■■ or ■■■■■ here plz.
")
end
end
context "with watched words as regular expressions" do
before { SiteSetting.watched_words_regular_expressions = true }
it "supports words as regular expressions" do
- ["xyz*", "plee+ase"].each do |word|
+ %w[xyz* plee+ase].each do |word|
Fabricate(:watched_word, action: WatchedWord.actions[:censor], word: word)
end
- expect_cooked_match("Pleased to meet you, but pleeeease call me later, xyz123",
- "Pleased to meet you, but ■■■■■■■■■ call me later, ■■■123
")
+ expect_cooked_match(
+ "Pleased to meet you, but pleeeease call me later, xyz123",
+ "Pleased to meet you, but ■■■■■■■■■ call me later, ■■■123
",
+ )
end
it "supports custom boundaries" do
Fabricate(:watched_word, action: WatchedWord.actions[:censor], word: "\\btown\\b")
- expect_cooked_match("Meet downtown in your town at the townhouse on Main St.",
- "Meet downtown in your ■■■■ at the townhouse on Main St.
")
+ expect_cooked_match(
+ "Meet downtown in your town at the townhouse on Main St.",
+ "Meet downtown in your ■■■■ at the townhouse on Main St.
",
+ )
end
end
end
@@ -1634,7 +1850,12 @@ HTML
after { Discourse.redis.flushdb }
it "replaces words with other words" do
- Fabricate(:watched_word, action: WatchedWord.actions[:replace], word: "dolor sit*", replacement: "something else")
+ Fabricate(
+ :watched_word,
+ action: WatchedWord.actions[:replace],
+ word: "dolor sit*",
+ replacement: "something else",
+ )
expect(PrettyText.cook("Lorem ipsum dolor sit amet")).to match_html(<<~HTML)
Lorem ipsum something else amet
@@ -1654,7 +1875,12 @@ HTML
end
it "replaces words with links" do
- Fabricate(:watched_word, action: WatchedWord.actions[:link], word: "meta", replacement: "https://meta.discourse.org")
+ Fabricate(
+ :watched_word,
+ action: WatchedWord.actions[:link],
+ word: "meta",
+ replacement: "https://meta.discourse.org",
+ )
expect(PrettyText.cook("Meta is a Discourse forum")).to match_html(<<~HTML)
@@ -1665,7 +1891,12 @@ HTML
end
it "works with regex" do
- Fabricate(:watched_word, action: WatchedWord.actions[:replace], word: "f.o", replacement: "test")
+ Fabricate(
+ :watched_word,
+ action: WatchedWord.actions[:replace],
+ word: "f.o",
+ replacement: "test",
+ )
expect(PrettyText.cook("foo")).to match_html("
foo
")
expect(PrettyText.cook("f.o")).to match_html("test
")
@@ -1679,7 +1910,12 @@ HTML
it "does not replace hashtags and mentions" do
Fabricate(:user, username: "test")
category = Fabricate(:category, slug: "test")
- Fabricate(:watched_word, action: WatchedWord.actions[:replace], word: "test", replacement: "discourse")
+ Fabricate(
+ :watched_word,
+ action: WatchedWord.actions[:replace],
+ word: "test",
+ replacement: "discourse",
+ )
expect(PrettyText.cook("@test #test test")).to match_html(<<~HTML)
@@ -1695,7 +1931,12 @@ HTML
Fabricate(:user, username: "test")
category = Fabricate(:category, slug: "test", name: "test")
- Fabricate(:watched_word, action: WatchedWord.actions[:replace], word: "es", replacement: "discourse")
+ Fabricate(
+ :watched_word,
+ action: WatchedWord.actions[:replace],
+ word: "es",
+ replacement: "discourse",
+ )
expect(PrettyText.cook("@test #test test")).to match_html(<<~HTML)
@@ -1716,9 +1957,19 @@ HTML
end
it "supports overlapping words" do
- Fabricate(:watched_word, action: WatchedWord.actions[:link], word: "meta", replacement: "https://meta.discourse.org")
+ Fabricate(
+ :watched_word,
+ action: WatchedWord.actions[:link],
+ word: "meta",
+ replacement: "https://meta.discourse.org",
+ )
Fabricate(:watched_word, action: WatchedWord.actions[:replace], word: "iz", replacement: "is")
- Fabricate(:watched_word, action: WatchedWord.actions[:link], word: "discourse", replacement: "https://discourse.org")
+ Fabricate(
+ :watched_word,
+ action: WatchedWord.actions[:link],
+ word: "discourse",
+ replacement: "https://discourse.org",
+ )
expect(PrettyText.cook("Meta iz a Discourse forum")).to match_html(<<~HTML)
@@ -1731,38 +1982,42 @@ HTML
end
end
- it 'supports typographer' do
+ it "supports typographer" do
SiteSetting.enable_markdown_typographer = true
- expect(PrettyText.cook('->')).to eq('
→
')
+ expect(PrettyText.cook("->")).to eq(" →
")
SiteSetting.enable_markdown_typographer = false
- expect(PrettyText.cook('->')).to eq('->
')
+ expect(PrettyText.cook("->")).to eq("->
")
end
- it 'uses quotation marks from site settings' do
+ it "uses quotation marks from site settings" do
SiteSetting.enable_markdown_typographer = true
- expect(PrettyText.cook(%q|"Do you know," he said, "what 'Discourse' is?"|)).to eq(%q|“Do you know,” he said, “what ‘Discourse’ is?”
|)
+ expect(PrettyText.cook(%q|"Do you know," he said, "what 'Discourse' is?"|)).to eq(
+ "“Do you know,” he said, “what ‘Discourse’ is?”
",
+ )
SiteSetting.markdown_typographer_quotation_marks = "„|“|‚|‘"
- expect(PrettyText.cook(%q|"Weißt du", sagte er, "was 'Discourse' ist?"|)).to eq(%q|„Weißt du“, sagte er, „was ‚Discourse‘ ist?“
|)
+ expect(PrettyText.cook(%q|"Weißt du", sagte er, "was 'Discourse' ist?"|)).to eq(
+ "„Weißt du“, sagte er, „was ‚Discourse‘ ist?“
",
+ )
end
- it 'handles onebox correctly' do
+ it "handles onebox correctly" do
expect(PrettyText.cook("http://a.com\nhttp://b.com").split("onebox").length).to eq(3)
expect(PrettyText.cook("http://a.com\n\nhttp://b.com").split("onebox").length).to eq(3)
- expect(PrettyText.cook("a\nhttp://a.com")).to include('onebox')
- expect(PrettyText.cook("> http://a.com")).not_to include('onebox')
- expect(PrettyText.cook("a\nhttp://a.com a")).not_to include('onebox')
- expect(PrettyText.cook("a\nhttp://a.com\na")).to include('onebox')
- expect(PrettyText.cook("http://a.com")).to include('onebox')
- expect(PrettyText.cook("http://a.com ")).to include('onebox')
- expect(PrettyText.cook("http://a.com a")).not_to include('onebox')
- expect(PrettyText.cook("- http://a.com")).not_to include('onebox')
- expect(PrettyText.cook("")).not_to include('onebox')
- expect(PrettyText.cook(" http://a.com")).not_to include('onebox')
- expect(PrettyText.cook("a\n http://a.com")).not_to include('onebox')
- expect(PrettyText.cook("sam@sam.com")).not_to include('onebox')
- expect(PrettyText.cook("")).not_to include("onebox")
+ expect(PrettyText.cook(" http://a.com")).not_to include("onebox")
+ expect(PrettyText.cook("a\n http://a.com")).not_to include("onebox")
+ expect(PrettyText.cook("sam@sam.com")).not_to include("onebox")
+ expect(PrettyText.cook("a
\ncodea
\ncodeacode
")
@@ -1790,11 +2047,10 @@ HTML
quote = create_post(topic_id: op.topic.id, raw: "This is a sample reply with a quote\n\n#{url}")
quote.reload
- expect(quote.cooked).not_to include('[quote')
+ expect(quote.cooked).not_to include("[quote")
end
it "supports tables" do
-
markdown = <<~MD
| Tables | Are | Cool |
| ------------- |:-------------:| -----:|
@@ -1833,7 +2089,8 @@ HTML
it "provides safety for img bbcode" do
cooked = PrettyText.cook "[img]http://aaa.com[/img]"
- html = '
'
+ html =
+ '
'
expect(cooked).to eq(html)
end
@@ -1845,19 +2102,25 @@ HTML
it "supports url bbcode" do
cooked = PrettyText.cook "[url]http://sam.com[/url]"
- html = 'http://sam.com
'
+ html =
+ 'http://sam.com
'
expect(cooked).to eq(html)
end
it "supports nesting tags in url" do
cooked = PrettyText.cook("[url=http://sam.com][b]I am sam[/b][/url]")
- html = 'I am sam
'
+ html =
+ 'I am sam
'
expect(cooked).to eq(html)
end
it "supports query params in bbcode url" do
- cooked = PrettyText.cook("[url=https://www.amazon.com/Camcorder-Hausbell-302S-Control-Infrared/dp/B01KLOA1PI/?tag=discourse]BBcode link[/url]")
- html = 'BBcode link
'
+ cooked =
+ PrettyText.cook(
+ "[url=https://www.amazon.com/Camcorder-Hausbell-302S-Control-Infrared/dp/B01KLOA1PI/?tag=discourse]BBcode link[/url]",
+ )
+ html =
+ 'BBcode link
'
expect(cooked).to eq(html)
end
@@ -1875,13 +2138,15 @@ HTML
it "support special handling for space in urls" do
cooked = PrettyText.cook "http://testing.com?a%20b"
- html = 'http://testing.com?a%20b
'
+ html =
+ 'http://testing.com?a%20b
'
expect(cooked).to eq(html)
end
it "supports onebox for decoded urls" do
cooked = PrettyText.cook "http://testing.com?a%50b"
- html = 'http://testing.com?aPb
'
+ html =
+ 'http://testing.com?aPb
'
expect(cooked).to eq(html)
end
@@ -1890,7 +2155,7 @@ HTML
end
it "should not onebox magically linked urls" do
- expect(PrettyText.cook('[url]site.com[/url]')).not_to include('onebox')
+ expect(PrettyText.cook("[url]site.com[/url]")).not_to include("onebox")
end
it "should sanitize the html" do
@@ -1902,7 +2167,9 @@ HTML
end
it "should allow sanitize bypass" do
- expect(PrettyText.cook("alert(42) ", sanitize: false)).to eq "alert(42)
"
+ expect(
+ PrettyText.cook("alert(42) ", sanitize: false),
+ ).to eq "alert(42)
"
end
# custom rule used to specify image dimensions via alt tags
@@ -1946,13 +2213,11 @@ HTML
expect(cooked).to eq(html.strip)
end
-
end
describe "upload decoding" do
-
it "can decode upload:// for default setup" do
- set_cdn_url('https://cdn.com')
+ set_cdn_url("https://cdn.com")
upload = Fabricate(:upload)
@@ -2011,7 +2276,6 @@ HTML
end
it "can place a blank image if we can not find the upload" do
-
raw = <<~MD
@@ -2025,7 +2289,6 @@ HTML
expect(PrettyText.cook(raw)).to eq(cooked.strip)
end
-
end
it "can properly allowlist iframes" do
@@ -2045,7 +2308,6 @@ HTML
cooked = PrettyText.cook(raw).strip
expect(cooked).to eq(html.strip)
-
end
it "You can disable linkify" do
@@ -2094,8 +2356,13 @@ HTML
end
it "allowlists lang attribute" do
- cooked = PrettyText.cook("tester
tester
tester ")
- expect(cooked).to eq("tester
tester
tester ")
+ cooked =
+ PrettyText.cook(
+ "tester
tester
tester ",
+ )
+ expect(cooked).to eq(
+ "tester
tester
tester ",
+ )
end
it "allowlists ruby tags" do
@@ -2210,7 +2477,7 @@ HTML
end
it "adds anchor links to headings" do
- cooked = PrettyText.cook('# Hello world')
+ cooked = PrettyText.cook("# Hello world")
html = <<~HTML
@@ -2223,12 +2490,12 @@ HTML
end
describe "customizing markdown-it rules" do
- it 'customizes the markdown-it rules correctly' do
- cooked = PrettyText.cook('This is some text **bold**', markdown_it_rules: [])
+ it "customizes the markdown-it rules correctly" do
+ cooked = PrettyText.cook("This is some text **bold**", markdown_it_rules: [])
expect(cooked).to eq(" This is some text **bold**
")
- cooked = PrettyText.cook('This is some text **bold**', markdown_it_rules: ["emphasis"])
+ cooked = PrettyText.cook("This is some text **bold**", markdown_it_rules: ["emphasis"])
expect(cooked).to eq("This is some text bold
")
end
@@ -2236,15 +2503,17 @@ HTML
describe "enabling/disabling features" do
it "allows features to be overridden" do
- cooked = PrettyText.cook(':grin: @mention', features_override: [])
+ cooked = PrettyText.cook(":grin: @mention", features_override: [])
expect(cooked).to eq(":grin: @mention
")
- cooked = PrettyText.cook(':grin: @mention', features_override: ["emoji"])
+ cooked = PrettyText.cook(":grin: @mention", features_override: ["emoji"])
- expect(cooked).to eq("
")
+ expect(cooked).to eq(
+ "
",
+ )
- cooked = PrettyText.cook(':grin: @mention', features_override: ["mentions", "text-post-process"])
+ cooked = PrettyText.cook(":grin: @mention", features_override: %w[mentions text-post-process])
expect(cooked).to eq(":grin: @mention
")
end
diff --git a/spec/lib/promotion_spec.rb b/spec/lib/promotion_spec.rb
index 3f5e6be0f98..d830480ce39 100644
--- a/spec/lib/promotion_spec.rb
+++ b/spec/lib/promotion_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-require 'promotion'
+require "promotion"
RSpec.describe Promotion do
describe "review" do
@@ -21,7 +21,7 @@ RSpec.describe Promotion do
expect { Promotion.new(nil).review }.not_to raise_error
end
- context 'when user has done nothing' do
+ context "when user has done nothing" do
let!(:result) { promotion.review }
it "returns false" do
@@ -110,7 +110,13 @@ RSpec.describe Promotion do
end
context "when may send tl2 promotion messages" do
- fab!(:user) { Fabricate(:user, trust_level: TrustLevel[1], created_at: (SiteSetting.tl2_requires_time_spent_mins * 60).minutes.ago) }
+ fab!(:user) do
+ Fabricate(
+ :user,
+ trust_level: TrustLevel[1],
+ created_at: (SiteSetting.tl2_requires_time_spent_mins * 60).minutes.ago,
+ )
+ end
before do
stat = user.user_stat
@@ -125,16 +131,18 @@ RSpec.describe Promotion do
end
it "sends promotion message by default" do
- expect_enqueued_with(job: :send_system_message, args: { user_id: user.id, message_type: 'tl2_promotion_message' }) do
- @result = promotion.review
- end
+ expect_enqueued_with(
+ job: :send_system_message,
+ args: {
+ user_id: user.id,
+ message_type: "tl2_promotion_message",
+ },
+ ) { @result = promotion.review }
end
it "can be turned off" do
SiteSetting.send_tl2_promotion_message = false
- expect_not_enqueued_with(job: :send_system_message) do
- @result = promotion.review
- end
+ expect_not_enqueued_with(job: :send_system_message) { @result = promotion.review }
end
end
end
@@ -143,7 +151,7 @@ RSpec.describe Promotion do
fab!(:user) { Fabricate(:user, trust_level: TrustLevel[1], created_at: 2.days.ago) }
let(:promotion) { Promotion.new(user) }
- context 'when has done nothing' do
+ context "when has done nothing" do
let!(:result) { promotion.review }
it "returns false" do
@@ -205,7 +213,6 @@ RSpec.describe Promotion do
expect(user.trust_level).to eq(TrustLevel[1])
end
end
-
end
describe "regular" do
@@ -214,25 +221,25 @@ RSpec.describe Promotion do
context "when doesn't qualify for promotion" do
before do
- TrustLevel3Requirements.any_instance.expects(:requirements_met?).at_least_once.returns(false)
+ TrustLevel3Requirements
+ .any_instance
+ .expects(:requirements_met?)
+ .at_least_once
+ .returns(false)
end
it "review_tl2 returns false" do
- expect {
- expect(promotion.review_tl2).to eq(false)
- }.to_not change { user.reload.trust_level }
+ expect { expect(promotion.review_tl2).to eq(false) }.to_not change {
+ user.reload.trust_level
+ }
end
it "doesn't promote" do
- expect {
- promotion.review_tl2
- }.to_not change { user.reload.trust_level }
+ expect { promotion.review_tl2 }.to_not change { user.reload.trust_level }
end
it "doesn't log a trust level change" do
- expect {
- promotion.review_tl2
- }.to_not change { UserHistory.count }
+ expect { promotion.review_tl2 }.to_not change { UserHistory.count }
end
end
@@ -251,9 +258,9 @@ RSpec.describe Promotion do
end
it "logs a trust level change" do
- expect {
- promotion.review_tl2
- }.to change { UserHistory.where(action: UserHistory.actions[:auto_trust_level_change]).count }.by(1)
+ expect { promotion.review_tl2 }.to change {
+ UserHistory.where(action: UserHistory.actions[:auto_trust_level_change]).count
+ }.by(1)
end
end
end
diff --git a/spec/lib/quote_comparer_spec.rb b/spec/lib/quote_comparer_spec.rb
index 240a90e5a77..ebc74d8d022 100644
--- a/spec/lib/quote_comparer_spec.rb
+++ b/spec/lib/quote_comparer_spec.rb
@@ -1,9 +1,8 @@
# frozen_string_literal: true
-require 'quote_comparer'
+require "quote_comparer"
RSpec.describe QuoteComparer do
-
describe "#missing?" do
fab!(:post) { Fabricate(:post, raw: "This has **text** we _are_ matching") }
diff --git a/spec/lib/rate_limiter/limit_exceeded_spec.rb b/spec/lib/rate_limiter/limit_exceeded_spec.rb
index 5457214148f..a9cfa38649f 100644
--- a/spec/lib/rate_limiter/limit_exceeded_spec.rb
+++ b/spec/lib/rate_limiter/limit_exceeded_spec.rb
@@ -1,19 +1,17 @@
# frozen_string_literal: true
RSpec.describe RateLimiter::LimitExceeded do
- describe '#description' do
- it 'should return the right description' do
+ describe "#description" do
+ it "should return the right description" do
[
[3, I18n.t("rate_limiter.short_time")],
[59, I18n.t("rate_limiter.seconds", count: 59)],
[3599, I18n.t("rate_limiter.minutes", count: 59)],
- [7000, I18n.t("rate_limiter.hours", count: 1)]
+ [7000, I18n.t("rate_limiter.hours", count: 1)],
].each do |available_in, time_left|
-
- expect(described_class.new(available_in).description).to eq(I18n.t(
- "rate_limiter.too_many_requests",
- time_left: time_left
- ))
+ expect(described_class.new(available_in).description).to eq(
+ I18n.t("rate_limiter.too_many_requests", time_left: time_left),
+ )
end
end
end
diff --git a/spec/lib/rate_limiter_spec.rb b/spec/lib/rate_limiter_spec.rb
index 83af13f8f63..cc0100bc71c 100644
--- a/spec/lib/rate_limiter_spec.rb
+++ b/spec/lib/rate_limiter_spec.rb
@@ -1,16 +1,22 @@
# frozen_string_literal: true
-require 'rate_limiter'
+require "rate_limiter"
RSpec.describe RateLimiter do
fab!(:user) { Fabricate(:user) }
fab!(:admin) { Fabricate(:admin) }
let(:rate_limiter) { RateLimiter.new(user, "peppermint-butler", 2, 60) }
- let(:apply_staff_rate_limiter) { RateLimiter.new(admin, "peppermint-servant", 5, 40, apply_limit_to_staff: true) }
- let(:staff_rate_limiter) { RateLimiter.new(user, "peppermind-servant", 5, 40, staff_limit: { max: 10, secs: 80 }) }
- let(:admin_staff_rate_limiter) { RateLimiter.new(admin, "peppermind-servant", 5, 40, staff_limit: { max: 10, secs: 80 }) }
+ let(:apply_staff_rate_limiter) do
+ RateLimiter.new(admin, "peppermint-servant", 5, 40, apply_limit_to_staff: true)
+ end
+ let(:staff_rate_limiter) do
+ RateLimiter.new(user, "peppermind-servant", 5, 40, staff_limit: { max: 10, secs: 80 })
+ end
+ let(:admin_staff_rate_limiter) do
+ RateLimiter.new(admin, "peppermind-servant", 5, 40, staff_limit: { max: 10, secs: 80 })
+ end
- describe 'disabled' do
+ describe "disabled" do
before do
rate_limiter.performed!
rate_limiter.performed!
@@ -29,7 +35,7 @@ RSpec.describe RateLimiter do
end
end
- describe 'enabled' do
+ describe "enabled" do
before do
RateLimiter.enable
rate_limiter.clear!
@@ -37,8 +43,8 @@ RSpec.describe RateLimiter do
admin_staff_rate_limiter.clear!
end
- context 'with aggressive rate limiter' do
- it 'can operate correctly and totally stop limiting' do
+ context "with aggressive rate limiter" do
+ it "can operate correctly and totally stop limiting" do
freeze_time
# 2 requests every 30 seconds
@@ -49,24 +55,16 @@ RSpec.describe RateLimiter do
limiter.performed!
freeze_time 29.seconds.from_now
- expect do
- limiter.performed!
- end.to raise_error(RateLimiter::LimitExceeded)
+ expect do limiter.performed! end.to raise_error(RateLimiter::LimitExceeded)
- expect do
- limiter.performed!
- end.to raise_error(RateLimiter::LimitExceeded)
+ expect do limiter.performed! end.to raise_error(RateLimiter::LimitExceeded)
# in aggressive mode both these ^^^ count as an attempt
freeze_time 29.seconds.from_now
- expect do
- limiter.performed!
- end.to raise_error(RateLimiter::LimitExceeded)
+ expect do limiter.performed! end.to raise_error(RateLimiter::LimitExceeded)
- expect do
- limiter.performed!
- end.to raise_error(RateLimiter::LimitExceeded)
+ expect do limiter.performed! end.to raise_error(RateLimiter::LimitExceeded)
freeze_time 30.seconds.from_now
@@ -75,8 +73,8 @@ RSpec.describe RateLimiter do
end
end
- context 'with global rate limiter' do
- it 'can operate in global mode' do
+ context "with global rate limiter" do
+ it "can operate in global mode" do
limiter = RateLimiter.new(nil, "test", 2, 30, global: true)
limiter.clear!
@@ -96,22 +94,20 @@ RSpec.describe RateLimiter do
end
end
- context 'when handling readonly' do
+ context "when handling readonly" do
before do
# random IP address in the ULA range that does not exist
- Discourse.redis.without_namespace.slaveof 'fdec:3f5d:d0b7:4c4b:472b:636a:4370:7ac5', '49999'
+ Discourse.redis.without_namespace.slaveof "fdec:3f5d:d0b7:4c4b:472b:636a:4370:7ac5", "49999"
end
- after do
- Discourse.redis.without_namespace.slaveof 'no', 'one'
- end
+ after { Discourse.redis.without_namespace.slaveof "no", "one" }
- it 'does not explode' do
+ it "does not explode" do
expect { rate_limiter.performed! }.not_to raise_error
end
end
- context 'when never done' do
+ context "when never done" do
it "should perform right away" do
expect(rate_limiter.can_perform?).to eq(true)
end
@@ -131,12 +127,12 @@ RSpec.describe RateLimiter do
end
end
- context 'when max is less than or equal to zero' do
- it 'should raise the right error' do
+ context "when max is less than or equal to zero" do
+ it "should raise the right error" do
[-1, 0, nil].each do |max|
- expect do
- RateLimiter.new(user, "a", max, 60).performed!
- end.to raise_error(RateLimiter::LimitExceeded)
+ expect do RateLimiter.new(user, "a", max, 60).performed! end.to raise_error(
+ RateLimiter::LimitExceeded,
+ )
end
end
end
@@ -160,7 +156,7 @@ RSpec.describe RateLimiter do
end
end
- it 'raises no error when the sliding window ended' do
+ it "raises no error when the sliding window ended" do
freeze_time 60.seconds.from_now
expect { rate_limiter.performed! }.not_to raise_error
end
@@ -217,9 +213,7 @@ RSpec.describe RateLimiter do
end
describe "#rollback!" do
- before do
- rate_limiter.rollback!
- end
+ before { rate_limiter.rollback! }
it "returns true for can_perform since there is now room" do
expect(rate_limiter.can_perform?).to eq(true)
diff --git a/spec/lib/retrieve_title_spec.rb b/spec/lib/retrieve_title_spec.rb
index 1826a162348..5afc01a0d7a 100644
--- a/spec/lib/retrieve_title_spec.rb
+++ b/spec/lib/retrieve_title_spec.rb
@@ -3,52 +3,45 @@
RSpec.describe RetrieveTitle do
describe ".extract_title" do
it "will extract the value from the title tag" do
- title = RetrieveTitle.extract_title(
- "My Cool Title "
- )
+ title = RetrieveTitle.extract_title("My Cool Title ")
expect(title).to eq("My Cool Title")
end
it "will strip whitespace" do
- title = RetrieveTitle.extract_title(
- " Another Title\n\n "
- )
+ title = RetrieveTitle.extract_title(" Another Title\n\n ")
expect(title).to eq("Another Title")
end
it "will pick og:title if title is missing" do
- title = RetrieveTitle.extract_title(<<~HTML
+ title = RetrieveTitle.extract_title(<<~HTML)
Good Title
YouTube
HTML
- )
expect(title).to eq("Video Title")
end
@@ -67,56 +60,85 @@ RSpec.describe RetrieveTitle do
describe ".crawl" do
it "can properly extract a title from a url" do
- stub_request(:get, "https://brelksdjflaskfj.com/amazing")
- .to_return(status: 200, body: "very amazing ")
+ stub_request(:get, "https://brelksdjflaskfj.com/amazing").to_return(
+ status: 200,
+ body: "very amazing ",
+ )
# we still resolve the IP address for every host
- IPSocket.stubs(:getaddress).returns('100.2.3.4')
+ IPSocket.stubs(:getaddress).returns("100.2.3.4")
expect(RetrieveTitle.crawl("https://brelksdjflaskfj.com/amazing")).to eq("very amazing")
end
it "detects and uses encoding from Content-Type header" do
- stub_request(:get, "https://brelksdjflaskfj.com/amazing")
- .to_return(
- status: 200,
- body: "fancy apostrophes ’’’ ".dup.force_encoding('ASCII-8BIT'),
- headers: { 'Content-Type' => 'text/html; charset="utf-8"' }
- )
+ stub_request(:get, "https://brelksdjflaskfj.com/amazing").to_return(
+ status: 200,
+ body: "fancy apostrophes ’’’ ".dup.force_encoding("ASCII-8BIT"),
+ headers: {
+ "Content-Type" => 'text/html; charset="utf-8"',
+ },
+ )
- IPSocket.stubs(:getaddress).returns('100.2.3.4')
- expect(RetrieveTitle.crawl("https://brelksdjflaskfj.com/amazing")).to eq("fancy apostrophes ’’’")
+ IPSocket.stubs(:getaddress).returns("100.2.3.4")
+ expect(RetrieveTitle.crawl("https://brelksdjflaskfj.com/amazing")).to eq(
+ "fancy apostrophes ’’’",
+ )
- stub_request(:get, "https://brelksdjflaskfj.com/amazing")
- .to_return(
- status: 200,
- body: "japanese こんにちは website ".encode('EUC-JP').force_encoding('ASCII-8BIT'),
- headers: { 'Content-Type' => 'text/html;charset=euc-jp' }
- )
+ stub_request(:get, "https://brelksdjflaskfj.com/amazing").to_return(
+ status: 200,
+ body:
+ "japanese こんにちは website ".encode("EUC-JP").force_encoding(
+ "ASCII-8BIT",
+ ),
+ headers: {
+ "Content-Type" => "text/html;charset=euc-jp",
+ },
+ )
- IPSocket.stubs(:getaddress).returns('100.2.3.4')
- expect(RetrieveTitle.crawl("https://brelksdjflaskfj.com/amazing")).to eq("japanese こんにちは website")
+ IPSocket.stubs(:getaddress).returns("100.2.3.4")
+ expect(RetrieveTitle.crawl("https://brelksdjflaskfj.com/amazing")).to eq(
+ "japanese こんにちは website",
+ )
end
it "can follow redirect" do
- stub_request(:get, "http://foobar.com/amazing").
- to_return(status: 301, body: "", headers: { "location" => "https://wikipedia.com/amazing" })
+ stub_request(:get, "http://foobar.com/amazing").to_return(
+ status: 301,
+ body: "",
+ headers: {
+ "location" => "https://wikipedia.com/amazing",
+ },
+ )
- stub_request(:get, "https://wikipedia.com/amazing").
- to_return(status: 200, body: "very amazing ", headers: {})
+ stub_request(:get, "https://wikipedia.com/amazing").to_return(
+ status: 200,
+ body: "very amazing ",
+ headers: {
+ },
+ )
- IPSocket.stubs(:getaddress).returns('100.2.3.4')
+ IPSocket.stubs(:getaddress).returns("100.2.3.4")
expect(RetrieveTitle.crawl("http://foobar.com/amazing")).to eq("very amazing")
end
it "returns empty title if redirect uri is in blacklist" do
SiteSetting.blocked_onebox_domains = "wikipedia.com"
- stub_request(:get, "http://foobar.com/amazing")
- .to_return(status: 301, body: "", headers: { "location" => "https://wikipedia.com/amazing" })
+ stub_request(:get, "http://foobar.com/amazing").to_return(
+ status: 301,
+ body: "",
+ headers: {
+ "location" => "https://wikipedia.com/amazing",
+ },
+ )
- stub_request(:get, "https://wikipedia.com/amazing")
- .to_return(status: 200, body: "very amazing ", headers: {})
+ stub_request(:get, "https://wikipedia.com/amazing").to_return(
+ status: 200,
+ body: "very amazing ",
+ headers: {
+ },
+ )
expect(RetrieveTitle.crawl("http://foobar.com/amazing")).to eq(nil)
end
@@ -124,25 +146,40 @@ RSpec.describe RetrieveTitle do
it "doesn't return title if a blocked domain is encountered anywhere in the redirect chain" do
SiteSetting.blocked_onebox_domains = "wikipedia.com"
- stub_request(:get, "http://foobar.com/amazing")
- .to_return(status: 301, body: "", headers: { "location" => "https://wikipedia.com/amazing" })
+ stub_request(:get, "http://foobar.com/amazing").to_return(
+ status: 301,
+ body: "",
+ headers: {
+ "location" => "https://wikipedia.com/amazing",
+ },
+ )
- stub_request(:get, "https://wikipedia.com/amazing")
- .to_return(status: 301, body: "", headers: { "location" => "https://cat.com/meow" })
+ stub_request(:get, "https://wikipedia.com/amazing").to_return(
+ status: 301,
+ body: "",
+ headers: {
+ "location" => "https://cat.com/meow",
+ },
+ )
- stub_request(:get, "https://cat.com/meow")
- .to_return(status: 200, body: "very amazing ", headers: {})
+ stub_request(:get, "https://cat.com/meow").to_return(
+ status: 200,
+ body: "very amazing ",
+ headers: {
+ },
+ )
expect(RetrieveTitle.crawl("http://foobar.com/amazing")).to be_blank
end
it "doesn't return title if the Discourse-No-Onebox header == 1" do
- stub_request(:get, "https://cat.com/meow/no-onebox")
- .to_return(
- status: 200,
- body: "discourse stay away ",
- headers: { "Discourse-No-Onebox" => "1" }
- )
+ stub_request(:get, "https://cat.com/meow/no-onebox").to_return(
+ status: 200,
+ body: "discourse stay away ",
+ headers: {
+ "Discourse-No-Onebox" => "1",
+ },
+ )
expect(RetrieveTitle.crawl("https://cat.com/meow/no-onebox")).to be_blank
end
@@ -172,11 +209,15 @@ RSpec.describe RetrieveTitle do
end
end
- describe '.fetch_title' do
+ describe ".fetch_title" do
it "does not parse broken title tag" do
# webmock does not do chunks
- stub_request(:get, "https://en.wikipedia.org/wiki/Internet").
- to_return(status: 200, body: "Internet - Wikipedia</ti" , headers: {})
+ stub_request(:get, "https://en.wikipedia.org/wiki/Internet").to_return(
+ status: 200,
+ body: "<html><head><title>Internet - Wikipedia</ti",
+ headers: {
+ },
+ )
title = RetrieveTitle.fetch_title("https://en.wikipedia.org/wiki/Internet")
expect(title).to eq(nil)
@@ -184,8 +225,12 @@ RSpec.describe RetrieveTitle do
it "can parse correct title tag" do
# webmock does not do chunks
- stub_request(:get, "https://en.wikipedia.org/wiki/Internet").
- to_return(status: 200, body: "<html><head><title>Internet - Wikipedia " , headers: {})
+ stub_request(:get, "https://en.wikipedia.org/wiki/Internet").to_return(
+ status: 200,
+ body: "Internet - Wikipedia ",
+ headers: {
+ },
+ )
title = RetrieveTitle.fetch_title("https://en.wikipedia.org/wiki/Internet")
expect(title).to eq("Internet - Wikipedia")
diff --git a/spec/lib/rtl_spec.rb b/spec/lib/rtl_spec.rb
index f67aa0a5f97..900d4be3b03 100644
--- a/spec/lib/rtl_spec.rb
+++ b/spec/lib/rtl_spec.rb
@@ -3,46 +3,44 @@
RSpec.describe Rtl do
let(:user) { Fabricate.build(:user) }
- describe '.css_class' do
- context 'when user locale is allowed' do
- before {
- SiteSetting.allow_user_locale = true
- }
+ describe ".css_class" do
+ context "when user locale is allowed" do
+ before { SiteSetting.allow_user_locale = true }
- context 'when user locale is RTL' do
- before { user.locale = 'he' }
+ context "when user locale is RTL" do
+ before { user.locale = "he" }
- it 'returns rtl class' do
- expect(Rtl.new(user).css_class).to eq('rtl')
+ it "returns rtl class" do
+ expect(Rtl.new(user).css_class).to eq("rtl")
end
end
- context 'when user locale is not RTL' do
- it 'returns empty class' do
- expect(Rtl.new(user).css_class).to eq('')
+ context "when user locale is not RTL" do
+ it "returns empty class" do
+ expect(Rtl.new(user).css_class).to eq("")
end
end
end
- context 'when user locale is not allowed' do
+ context "when user locale is not allowed" do
before { SiteSetting.allow_user_locale = false }
- context 'when site default locale is RTL' do
- before { SiteSetting.default_locale = 'he' }
+ context "when site default locale is RTL" do
+ before { SiteSetting.default_locale = "he" }
- it 'returns rtl class' do
- expect(Rtl.new(user).css_class).to eq('rtl')
+ it "returns rtl class" do
+ expect(Rtl.new(user).css_class).to eq("rtl")
end
end
- context 'when site default locale is LTR' do
- before { SiteSetting.default_locale = 'en' }
+ context "when site default locale is LTR" do
+ before { SiteSetting.default_locale = "en" }
- context 'when user locale is RTL' do
- before { user.stubs(:locale).returns('he') }
+ context "when user locale is RTL" do
+ before { user.stubs(:locale).returns("he") }
- it 'returns empty class' do
- expect(Rtl.new(user).css_class).to eq('')
+ it "returns empty class" do
+ expect(Rtl.new(user).css_class).to eq("")
end
end
end
diff --git a/spec/lib/s3_cors_rulesets_spec.rb b/spec/lib/s3_cors_rulesets_spec.rb
index e2de7b314ea..60344e991d0 100644
--- a/spec/lib/s3_cors_rulesets_spec.rb
+++ b/spec/lib/s3_cors_rulesets_spec.rb
@@ -33,10 +33,8 @@ RSpec.describe S3CorsRulesets do
client.expects(:put_bucket_cors).with(
bucket: "s3-upload-bucket",
cors_configuration: {
- cors_rules: [
- S3CorsRulesets::ASSETS
- ]
- }
+ cors_rules: [S3CorsRulesets::ASSETS],
+ },
)
result = sync_rules
expect(result[:assets_rules_status]).to eq(S3CorsRulesets::RULE_STATUS_APPLIED)
@@ -45,9 +43,7 @@ RSpec.describe S3CorsRulesets do
end
it "does not apply the ASSETS rules if they already exist" do
- client.stub_responses(:get_bucket_cors, {
- cors_rules: [S3CorsRulesets::ASSETS]
- })
+ client.stub_responses(:get_bucket_cors, { cors_rules: [S3CorsRulesets::ASSETS] })
client.expects(:put_bucket_cors).never
result = sync_rules
expect(result[:assets_rules_status]).to eq(S3CorsRulesets::RULE_STATUS_EXISTED)
@@ -62,18 +58,14 @@ RSpec.describe S3CorsRulesets do
client.expects(:put_bucket_cors).with(
bucket: "s3-upload-bucket",
cors_configuration: {
- cors_rules: [
- S3CorsRulesets::ASSETS
- ]
- }
+ cors_rules: [S3CorsRulesets::ASSETS],
+ },
)
client.expects(:put_bucket_cors).with(
bucket: "s3-backup-upload-bucket",
cors_configuration: {
- cors_rules: [
- S3CorsRulesets::BACKUP_DIRECT_UPLOAD
- ]
- }
+ cors_rules: [S3CorsRulesets::BACKUP_DIRECT_UPLOAD],
+ },
)
result = sync_rules
expect(result[:assets_rules_status]).to eq(S3CorsRulesets::RULE_STATUS_APPLIED)
@@ -88,18 +80,14 @@ RSpec.describe S3CorsRulesets do
client.expects(:put_bucket_cors).with(
bucket: "s3-upload-bucket",
cors_configuration: {
- cors_rules: [
- S3CorsRulesets::ASSETS
- ]
- }
+ cors_rules: [S3CorsRulesets::ASSETS],
+ },
)
client.expects(:put_bucket_cors).with(
bucket: "s3-upload-bucket",
cors_configuration: {
- cors_rules: [
- S3CorsRulesets::DIRECT_UPLOAD
- ]
- }
+ cors_rules: [S3CorsRulesets::DIRECT_UPLOAD],
+ },
)
result = sync_rules
expect(result[:assets_rules_status]).to eq(S3CorsRulesets::RULE_STATUS_APPLIED)
@@ -111,9 +99,16 @@ RSpec.describe S3CorsRulesets do
SiteSetting.enable_direct_s3_uploads = true
setup_backups
- client.stub_responses(:get_bucket_cors, {
- cors_rules: [S3CorsRulesets::ASSETS, S3CorsRulesets::BACKUP_DIRECT_UPLOAD, S3CorsRulesets::DIRECT_UPLOAD]
- })
+ client.stub_responses(
+ :get_bucket_cors,
+ {
+ cors_rules: [
+ S3CorsRulesets::ASSETS,
+ S3CorsRulesets::BACKUP_DIRECT_UPLOAD,
+ S3CorsRulesets::DIRECT_UPLOAD,
+ ],
+ },
+ )
client.expects(:put_bucket_cors).never
result = sync_rules
expect(result[:assets_rules_status]).to eq(S3CorsRulesets::RULE_STATUS_EXISTED)
@@ -132,19 +127,15 @@ RSpec.describe S3CorsRulesets do
context "when S3 is set up with database settings" do
let(:use_db_s3_config) { true }
- before do
- setup_s3
- end
+ before { setup_s3 }
it "only tries to apply the ASSETS rules by default" do
client.stub_responses(:get_bucket_cors, {})
client.expects(:put_bucket_cors).with(
bucket: "s3-upload-bucket",
cors_configuration: {
- cors_rules: [
- S3CorsRulesets::ASSETS
- ]
- }
+ cors_rules: [S3CorsRulesets::ASSETS],
+ },
)
result = sync_rules
expect(result[:assets_rules_status]).to eq(S3CorsRulesets::RULE_STATUS_APPLIED)
@@ -153,9 +144,7 @@ RSpec.describe S3CorsRulesets do
end
it "does not apply the ASSETS rules if they already exist" do
- client.stub_responses(:get_bucket_cors, {
- cors_rules: [S3CorsRulesets::ASSETS]
- })
+ client.stub_responses(:get_bucket_cors, { cors_rules: [S3CorsRulesets::ASSETS] })
client.expects(:put_bucket_cors).never
result = sync_rules
expect(result[:assets_rules_status]).to eq(S3CorsRulesets::RULE_STATUS_EXISTED)
@@ -172,18 +161,14 @@ RSpec.describe S3CorsRulesets do
client.expects(:put_bucket_cors).with(
bucket: "s3-upload-bucket",
cors_configuration: {
- cors_rules: [
- S3CorsRulesets::ASSETS
- ]
- }
+ cors_rules: [S3CorsRulesets::ASSETS],
+ },
)
client.expects(:put_bucket_cors).with(
bucket: "s3-backup-upload-bucket",
cors_configuration: {
- cors_rules: [
- S3CorsRulesets::BACKUP_DIRECT_UPLOAD
- ]
- }
+ cors_rules: [S3CorsRulesets::BACKUP_DIRECT_UPLOAD],
+ },
)
result = sync_rules
expect(result[:assets_rules_status]).to eq(S3CorsRulesets::RULE_STATUS_APPLIED)
@@ -198,18 +183,14 @@ RSpec.describe S3CorsRulesets do
client.expects(:put_bucket_cors).with(
bucket: "s3-upload-bucket",
cors_configuration: {
- cors_rules: [
- S3CorsRulesets::ASSETS
- ]
- }
+ cors_rules: [S3CorsRulesets::ASSETS],
+ },
)
client.expects(:put_bucket_cors).with(
bucket: "s3-upload-bucket",
cors_configuration: {
- cors_rules: [
- S3CorsRulesets::DIRECT_UPLOAD
- ]
- }
+ cors_rules: [S3CorsRulesets::DIRECT_UPLOAD],
+ },
)
result = sync_rules
expect(result[:assets_rules_status]).to eq(S3CorsRulesets::RULE_STATUS_APPLIED)
diff --git a/spec/lib/s3_helper_spec.rb b/spec/lib/s3_helper_spec.rb
index 394cc6324b9..30705d7cc47 100644
--- a/spec/lib/s3_helper_spec.rb
+++ b/spec/lib/s3_helper_spec.rb
@@ -34,44 +34,45 @@ RSpec.describe "S3Helper" do
it "can correctly set the purge policy" do
SiteSetting.s3_configure_tombstone_policy = true
- stub_request(:get, "http://169.254.169.254/latest/meta-data/iam/security-credentials/").
- to_return(status: 404, body: "", headers: {})
+ stub_request(
+ :get,
+ "http://169.254.169.254/latest/meta-data/iam/security-credentials/",
+ ).to_return(status: 404, body: "", headers: {})
- stub_request(:get, "https://bob.s3.#{SiteSetting.s3_region}.amazonaws.com/?lifecycle").
- to_return(status: 200, body: @lifecycle, headers: {})
+ stub_request(
+ :get,
+ "https://bob.s3.#{SiteSetting.s3_region}.amazonaws.com/?lifecycle",
+ ).to_return(status: 200, body: @lifecycle, headers: {})
- stub_request(:put, "https://bob.s3.#{SiteSetting.s3_region}.amazonaws.com/?lifecycle").
- with do |req|
+ stub_request(:put, "https://bob.s3.#{SiteSetting.s3_region}.amazonaws.com/?lifecycle")
+ .with do |req|
+ hash = Hash.from_xml(req.body.to_s)
+ rules = hash["LifecycleConfiguration"]["Rule"]
- hash = Hash.from_xml(req.body.to_s)
- rules = hash["LifecycleConfiguration"]["Rule"]
+ expect(rules.length).to eq(2)
+ expect(rules[1]["Expiration"]["Days"]).to eq("100")
+ # fixes the bad filter
+ expect(rules[0]["Filter"]["Prefix"]).to eq("projectdocs/")
+ end
+ .to_return(status: 200, body: "", headers: {})
- expect(rules.length).to eq(2)
- expect(rules[1]["Expiration"]["Days"]).to eq("100")
- # fixes the bad filter
- expect(rules[0]["Filter"]["Prefix"]).to eq("projectdocs/")
- end.to_return(status: 200, body: "", headers: {})
-
- helper = S3Helper.new('bob', 'tomb')
+ helper = S3Helper.new("bob", "tomb")
helper.update_tombstone_lifecycle(100)
end
it "can skip policy update when s3_configure_tombstone_policy is false" do
SiteSetting.s3_configure_tombstone_policy = false
- helper = S3Helper.new('bob', 'tomb')
+ helper = S3Helper.new("bob", "tomb")
helper.update_tombstone_lifecycle(100)
end
- describe '#list' do
- it 'creates the prefix correctly' do
- {
- 'some/bucket' => 'bucket/testing',
- 'some' => 'testing'
- }.each do |bucket_name, prefix|
+ describe "#list" do
+ it "creates the prefix correctly" do
+ { "some/bucket" => "bucket/testing", "some" => "testing" }.each do |bucket_name, prefix|
s3_helper = S3Helper.new(bucket_name, "", client: client)
Aws::S3::Bucket.any_instance.expects(:objects).with({ prefix: prefix })
- s3_helper.list('testing')
+ s3_helper.list("testing")
end
end
end
@@ -89,14 +90,21 @@ RSpec.describe "S3Helper" do
s3_helper = S3Helper.new("bucket/folder_path", "", client: client)
object1 = s3_helper.object("original/1X/def.xyz")
- object2 = s3_helper.object("#{FileStore::BaseStore::TEMPORARY_UPLOAD_PREFIX}folder_path/uploads/default/blah/def.xyz")
+ object2 =
+ s3_helper.object(
+ "#{FileStore::BaseStore::TEMPORARY_UPLOAD_PREFIX}folder_path/uploads/default/blah/def.xyz",
+ )
expect(object1.key).to eq("folder_path/original/1X/def.xyz")
- expect(object2.key).to eq("#{FileStore::BaseStore::TEMPORARY_UPLOAD_PREFIX}folder_path/uploads/default/blah/def.xyz")
+ expect(object2.key).to eq(
+ "#{FileStore::BaseStore::TEMPORARY_UPLOAD_PREFIX}folder_path/uploads/default/blah/def.xyz",
+ )
end
describe "#copy" do
- let(:source_key) { "#{FileStore::BaseStore::TEMPORARY_UPLOAD_PREFIX}uploads/default/blah/source.jpg" }
+ let(:source_key) do
+ "#{FileStore::BaseStore::TEMPORARY_UPLOAD_PREFIX}uploads/default/blah/source.jpg"
+ end
let(:destination_key) { "original/1X/destination.jpg" }
let(:s3_helper) { S3Helper.new("test-bucket", "", client: client) }
@@ -105,12 +113,14 @@ RSpec.describe "S3Helper" do
source_stub.stubs(:size).returns(5 * 1024 * 1024)
s3_helper.send(:s3_bucket).expects(:object).with(source_key).returns(source_stub)
- destination_stub = Aws::S3::Object.new(bucket_name: "test-bucket", key: destination_key, client: client)
+ destination_stub =
+ Aws::S3::Object.new(bucket_name: "test-bucket", key: destination_key, client: client)
s3_helper.send(:s3_bucket).expects(:object).with(destination_key).returns(destination_stub)
- destination_stub.expects(:copy_from).with(source_stub, {}).returns(
- stub(copy_object_result: stub(etag: '"etag"'))
- )
+ destination_stub
+ .expects(:copy_from)
+ .with(source_stub, {})
+ .returns(stub(copy_object_result: stub(etag: '"etag"')))
response = s3_helper.copy(source_key, destination_key)
expect(response.first).to eq(destination_key)
@@ -122,13 +132,15 @@ RSpec.describe "S3Helper" do
source_stub.stubs(:size).returns(20 * 1024 * 1024)
s3_helper.send(:s3_bucket).expects(:object).with(source_key).returns(source_stub)
- destination_stub = Aws::S3::Object.new(bucket_name: "test-bucket", key: destination_key, client: client)
+ destination_stub =
+ Aws::S3::Object.new(bucket_name: "test-bucket", key: destination_key, client: client)
s3_helper.send(:s3_bucket).expects(:object).with(destination_key).returns(destination_stub)
options = { multipart_copy: true, content_length: source_stub.size }
- destination_stub.expects(:copy_from).with(source_stub, options).returns(
- stub(data: stub(etag: '"etag"'))
- )
+ destination_stub
+ .expects(:copy_from)
+ .with(source_stub, options)
+ .returns(stub(data: stub(etag: '"etag"')))
response = s3_helper.copy(source_key, destination_key)
expect(response.first).to eq(destination_key)
@@ -140,19 +152,26 @@ RSpec.describe "S3Helper" do
source_stub.stubs(:size).returns(5 * 1024 * 1024)
s3_helper.send(:s3_bucket).expects(:object).with(source_key).returns(source_stub)
- destination_stub = Aws::S3::Object.new(bucket_name: "test-bucket", key: destination_key, client: client)
+ destination_stub =
+ Aws::S3::Object.new(bucket_name: "test-bucket", key: destination_key, client: client)
s3_helper.send(:s3_bucket).expects(:object).with(destination_key).returns(destination_stub)
content_disposition = "attachment; filename=\"source.jpg\"; filename*=UTF-8''source.jpg"
options = { content_disposition: content_disposition, metadata_directive: "REPLACE" }
- destination_stub.expects(:copy_from).with(source_stub, options).returns(
- stub(data: stub(etag: '"etag"'))
- )
+ destination_stub
+ .expects(:copy_from)
+ .with(source_stub, options)
+ .returns(stub(data: stub(etag: '"etag"')))
- response = s3_helper.copy(
- source_key, destination_key,
- options: { apply_metadata_to_destination: true, content_disposition: content_disposition }
- )
+ response =
+ s3_helper.copy(
+ source_key,
+ destination_key,
+ options: {
+ apply_metadata_to_destination: true,
+ content_disposition: content_disposition,
+ },
+ )
expect(response.first).to eq(destination_key)
expect(response.second).to eq("etag")
end
@@ -168,47 +187,54 @@ RSpec.describe "S3Helper" do
end
it "creates the assets rule if no rule exists" do
- s3_helper.s3_client.stub_responses(:get_bucket_cors, Aws::S3::Errors::NoSuchCORSConfiguration.new("", {}))
- s3_helper.s3_client.expects(:put_bucket_cors).with(
- bucket: s3_helper.s3_bucket_name,
- cors_configuration: {
- cors_rules: [S3CorsRulesets::ASSETS]
- }
+ s3_helper.s3_client.stub_responses(
+ :get_bucket_cors,
+ Aws::S3::Errors::NoSuchCORSConfiguration.new("", {}),
)
+ s3_helper
+ .s3_client
+ .expects(:put_bucket_cors)
+ .with(
+ bucket: s3_helper.s3_bucket_name,
+ cors_configuration: {
+ cors_rules: [S3CorsRulesets::ASSETS],
+ },
+ )
s3_helper.ensure_cors!([S3CorsRulesets::ASSETS])
end
it "does nothing if a rule already exists" do
- s3_helper.s3_client.stub_responses(:get_bucket_cors, {
- cors_rules: [S3CorsRulesets::ASSETS]
- })
+ s3_helper.s3_client.stub_responses(:get_bucket_cors, { cors_rules: [S3CorsRulesets::ASSETS] })
s3_helper.s3_client.expects(:put_bucket_cors).never
s3_helper.ensure_cors!([S3CorsRulesets::ASSETS])
end
it "applies the passed in rule if a different rule already exists" do
- s3_helper.s3_client.stub_responses(:get_bucket_cors, {
- cors_rules: [S3CorsRulesets::ASSETS]
- })
- s3_helper.s3_client.expects(:put_bucket_cors).with(
- bucket: s3_helper.s3_bucket_name,
- cors_configuration: {
- cors_rules: [S3CorsRulesets::ASSETS, S3CorsRulesets::BACKUP_DIRECT_UPLOAD]
- }
- )
+ s3_helper.s3_client.stub_responses(:get_bucket_cors, { cors_rules: [S3CorsRulesets::ASSETS] })
+ s3_helper
+ .s3_client
+ .expects(:put_bucket_cors)
+ .with(
+ bucket: s3_helper.s3_bucket_name,
+ cors_configuration: {
+ cors_rules: [S3CorsRulesets::ASSETS, S3CorsRulesets::BACKUP_DIRECT_UPLOAD],
+ },
+ )
s3_helper.ensure_cors!([S3CorsRulesets::BACKUP_DIRECT_UPLOAD])
end
it "returns false if the CORS rules do not get applied from an error" do
- s3_helper.s3_client.stub_responses(:get_bucket_cors, {
- cors_rules: [S3CorsRulesets::ASSETS]
- })
- s3_helper.s3_client.expects(:put_bucket_cors).with(
- bucket: s3_helper.s3_bucket_name,
- cors_configuration: {
- cors_rules: [S3CorsRulesets::ASSETS, S3CorsRulesets::BACKUP_DIRECT_UPLOAD]
- }
- ).raises(Aws::S3::Errors::AccessDenied.new("test", "test", {}))
+ s3_helper.s3_client.stub_responses(:get_bucket_cors, { cors_rules: [S3CorsRulesets::ASSETS] })
+ s3_helper
+ .s3_client
+ .expects(:put_bucket_cors)
+ .with(
+ bucket: s3_helper.s3_bucket_name,
+ cors_configuration: {
+ cors_rules: [S3CorsRulesets::ASSETS, S3CorsRulesets::BACKUP_DIRECT_UPLOAD],
+ },
+ )
+ .raises(Aws::S3::Errors::AccessDenied.new("test", "test", {}))
expect(s3_helper.ensure_cors!([S3CorsRulesets::BACKUP_DIRECT_UPLOAD])).to eq(false)
end
end
@@ -219,7 +245,7 @@ RSpec.describe "S3Helper" do
it "works" do
# The S3::Client with `stub_responses: true` includes validation of requests.
# If the request were invalid, this spec would raise an error
- s3_helper.delete_objects(["object/one.txt", "object/two.txt"])
+ s3_helper.delete_objects(%w[object/one.txt object/two.txt])
end
end
end
diff --git a/spec/lib/s3_inventory_multisite_spec.rb b/spec/lib/s3_inventory_multisite_spec.rb
index 8f5a3fa6c63..19cb36313c8 100644
--- a/spec/lib/s3_inventory_multisite_spec.rb
+++ b/spec/lib/s3_inventory_multisite_spec.rb
@@ -23,6 +23,9 @@ RSpec.describe "S3Inventory", type: :multisite do
expect(db1.lines.count).to eq(3)
expect(db2.lines.count).to eq(1)
- files.values.each { |f| f.close; f.unlink }
+ files.values.each do |f|
+ f.close
+ f.unlink
+ end
end
end
diff --git a/spec/lib/s3_inventory_spec.rb b/spec/lib/s3_inventory_spec.rb
index ab215820d98..92172aef965 100644
--- a/spec/lib/s3_inventory_spec.rb
+++ b/spec/lib/s3_inventory_spec.rb
@@ -14,37 +14,42 @@ RSpec.describe "S3Inventory" do
setup_s3
SiteSetting.enable_s3_inventory = true
- client.stub_responses(:list_objects, -> (context) {
- expect(context.params[:prefix]).to eq("#{S3Inventory::INVENTORY_PREFIX}/#{S3Inventory::INVENTORY_VERSION}/bucket/original/hive")
+ client.stub_responses(
+ :list_objects,
+ ->(context) {
+ expect(context.params[:prefix]).to eq(
+ "#{S3Inventory::INVENTORY_PREFIX}/#{S3Inventory::INVENTORY_VERSION}/bucket/original/hive",
+ )
- {
- contents: [
- {
- etag: "\"70ee1738b6b21e2c8a43f3a5ab0eee71\"",
- key: "example1.csv.gz",
- last_modified: Time.parse("2014-11-21T19:40:05.000Z"),
- owner: {
- display_name: "myname",
- id: "12345example25102679df27bb0ae12b3f85be6f290b936c4393484be31bebcc",
+ {
+ contents: [
+ {
+ etag: "\"70ee1738b6b21e2c8a43f3a5ab0eee71\"",
+ key: "example1.csv.gz",
+ last_modified: Time.parse("2014-11-21T19:40:05.000Z"),
+ owner: {
+ display_name: "myname",
+ id: "12345example25102679df27bb0ae12b3f85be6f290b936c4393484be31bebcc",
+ },
+ size: 11,
+ storage_class: "STANDARD",
},
- size: 11,
- storage_class: "STANDARD",
- },
- {
- etag: "\"9c8af9a76df052144598c115ef33e511\"",
- key: "example2.csv.gz",
- last_modified: Time.parse("2013-11-15T01:10:49.000Z"),
- owner: {
- display_name: "myname",
- id: "12345example25102679df27bb0ae12b3f85be6f290b936c4393484be31bebcc",
+ {
+ etag: "\"9c8af9a76df052144598c115ef33e511\"",
+ key: "example2.csv.gz",
+ last_modified: Time.parse("2013-11-15T01:10:49.000Z"),
+ owner: {
+ display_name: "myname",
+ id: "12345example25102679df27bb0ae12b3f85be6f290b936c4393484be31bebcc",
+ },
+ size: 713_193,
+ storage_class: "STANDARD",
},
- size: 713193,
- storage_class: "STANDARD",
- }
- ],
- next_marker: "eyJNYXJrZXIiOiBudWxsLCAiYm90b190cnVuY2F0ZV9hbW91bnQiOiAyfQ=="
- }
- })
+ ],
+ next_marker: "eyJNYXJrZXIiOiBudWxsLCAiYm90b190cnVuY2F0ZV9hbW91bnQiOiAyfQ==",
+ }
+ },
+ )
inventory.stubs(:cleanup!)
end
@@ -61,10 +66,12 @@ RSpec.describe "S3Inventory" do
CSV.foreach(csv_filename, headers: false) do |row|
next unless row[S3Inventory::CSV_KEY_INDEX].include?("default")
- Fabricate(:upload,
+ Fabricate(
+ :upload,
etag: row[S3Inventory::CSV_ETAG_INDEX],
url: File.join(Discourse.store.absolute_base_url, row[S3Inventory::CSV_KEY_INDEX]),
- updated_at: 2.days.ago)
+ updated_at: 2.days.ago,
+ )
end
@upload1 = Fabricate(:upload, etag: "ETag", updated_at: 1.days.ago)
@@ -76,9 +83,7 @@ RSpec.describe "S3Inventory" do
end
it "should display missing uploads correctly" do
- output = capture_stdout do
- inventory.backfill_etags_and_list_missing
- end
+ output = capture_stdout { inventory.backfill_etags_and_list_missing }
expect(output).to eq("#{@upload1.url}\n#{@no_etag.url}\n2 of 5 uploads are missing\n")
expect(Discourse.stats.get("missing_s3_uploads")).to eq(2)
@@ -88,9 +93,7 @@ RSpec.describe "S3Inventory" do
differing_etag = Upload.find_by(etag: "defcaac0b4aca535c284e95f30d608d0")
differing_etag.update_columns(etag: "somethingelse")
- output = capture_stdout do
- inventory.backfill_etags_and_list_missing
- end
+ output = capture_stdout { inventory.backfill_etags_and_list_missing }
expect(output).to eq(<<~TEXT)
#{differing_etag.url} has different etag
@@ -104,15 +107,21 @@ RSpec.describe "S3Inventory" do
end
it "marks missing uploads as not verified and found uploads as verified. uploads not checked will be verified nil" do
- expect(Upload.where(verification_status: Upload.verification_statuses[:unchecked]).count).to eq(12)
- output = capture_stdout do
- inventory.backfill_etags_and_list_missing
- end
+ expect(
+ Upload.where(verification_status: Upload.verification_statuses[:unchecked]).count,
+ ).to eq(12)
+ output = capture_stdout { inventory.backfill_etags_and_list_missing }
verification_status = Upload.pluck(:verification_status)
- expect(Upload.where(verification_status: Upload.verification_statuses[:verified]).count).to eq(3)
- expect(Upload.where(verification_status: Upload.verification_statuses[:invalid_etag]).count).to eq(2)
- expect(Upload.where(verification_status: Upload.verification_statuses[:unchecked]).count).to eq(7)
+ expect(
+ Upload.where(verification_status: Upload.verification_statuses[:verified]).count,
+ ).to eq(3)
+ expect(
+ Upload.where(verification_status: Upload.verification_statuses[:invalid_etag]).count,
+ ).to eq(2)
+ expect(
+ Upload.where(verification_status: Upload.verification_statuses[:unchecked]).count,
+ ).to eq(7)
end
it "does not affect the updated_at date of uploads" do
@@ -120,9 +129,7 @@ RSpec.describe "S3Inventory" do
upload_2_updated = @upload2.updated_at
no_etag_updated = @no_etag.updated_at
- output = capture_stdout do
- inventory.backfill_etags_and_list_missing
- end
+ output = capture_stdout { inventory.backfill_etags_and_list_missing }
expect(@upload1.reload.updated_at).to eq_time(upload_1_updated)
expect(@upload2.reload.updated_at).to eq_time(upload_2_updated)
@@ -132,16 +139,25 @@ RSpec.describe "S3Inventory" do
it "should backfill etags to uploads table correctly" do
files = [
- ["#{Discourse.store.absolute_base_url}/uploads/default/original/1X/0184537a4f419224404d013414e913a4f56018f2.jpg", "defcaac0b4aca535c284e95f30d608d0"],
- ["#{Discourse.store.absolute_base_url}/uploads/default/original/1X/0789fbf5490babc68326b9cec90eeb0d6590db05.png", "25c02eaceef4cb779fc17030d33f7f06"]
+ [
+ "#{Discourse.store.absolute_base_url}/uploads/default/original/1X/0184537a4f419224404d013414e913a4f56018f2.jpg",
+ "defcaac0b4aca535c284e95f30d608d0",
+ ],
+ [
+ "#{Discourse.store.absolute_base_url}/uploads/default/original/1X/0789fbf5490babc68326b9cec90eeb0d6590db05.png",
+ "25c02eaceef4cb779fc17030d33f7f06",
+ ],
]
files.each { |file| Fabricate(:upload, url: file[0]) }
inventory.expects(:files).returns([{ key: "Key", filename: "#{csv_filename}.gz" }]).times(3)
- output = capture_stdout do
- expect { inventory.backfill_etags_and_list_missing }.to change { Upload.where(etag: nil).count }.by(-2)
- end
+ output =
+ capture_stdout do
+ expect { inventory.backfill_etags_and_list_missing }.to change {
+ Upload.where(etag: nil).count
+ }.by(-2)
+ end
expect(Upload.by_users.order(:url).pluck(:url, :etag)).to eq(files)
end
@@ -158,17 +174,19 @@ RSpec.describe "S3Inventory" do
Fabricate(:upload, etag: "ETag2", updated_at: Time.now)
no_etag = Fabricate(:upload, updated_at: 2.days.ago)
- output = capture_stdout do
- File.open(csv_filename) do |f|
- preloaded_inventory = S3Inventory.new(
- helper,
- :upload,
- preloaded_inventory_file: f,
- preloaded_inventory_date: Time.now
- )
- preloaded_inventory.backfill_etags_and_list_missing
+ output =
+ capture_stdout do
+ File.open(csv_filename) do |f|
+ preloaded_inventory =
+ S3Inventory.new(
+ helper,
+ :upload,
+ preloaded_inventory_file: f,
+ preloaded_inventory_date: Time.now,
+ )
+ preloaded_inventory.backfill_etags_and_list_missing
+ end
end
- end
expect(output).to eq("#{upload.url}\n#{no_etag.url}\n2 of 5 uploads are missing\n")
expect(Discourse.stats.get("missing_s3_uploads")).to eq(2)
@@ -177,16 +195,18 @@ RSpec.describe "S3Inventory" do
describe "s3 inventory configuration" do
let(:bucket_name) { "s3-upload-bucket" }
let(:subfolder_path) { "subfolder" }
- before do
- SiteSetting.s3_upload_bucket = "#{bucket_name}/#{subfolder_path}"
- end
+ before { SiteSetting.s3_upload_bucket = "#{bucket_name}/#{subfolder_path}" }
it "is formatted correctly for subfolders" do
s3_helper = S3Helper.new(SiteSetting.Upload.s3_upload_bucket.downcase, "", client: client)
config = S3Inventory.new(s3_helper, :upload).send(:inventory_configuration)
- expect(config[:destination][:s3_bucket_destination][:bucket]).to eq("arn:aws:s3:::#{bucket_name}")
- expect(config[:destination][:s3_bucket_destination][:prefix]).to eq("#{subfolder_path}/inventory/1")
+ expect(config[:destination][:s3_bucket_destination][:bucket]).to eq(
+ "arn:aws:s3:::#{bucket_name}",
+ )
+ expect(config[:destination][:s3_bucket_destination][:prefix]).to eq(
+ "#{subfolder_path}/inventory/1",
+ )
expect(config[:id]).to eq("#{subfolder_path}-original")
expect(config[:schedule][:frequency]).to eq("Daily")
expect(config[:included_object_versions]).to eq("Current")
diff --git a/spec/lib/scheduler/defer_spec.rb b/spec/lib/scheduler/defer_spec.rb
index 748c2499467..67882c2a7ef 100644
--- a/spec/lib/scheduler/defer_spec.rb
+++ b/spec/lib/scheduler/defer_spec.rb
@@ -8,9 +8,7 @@ RSpec.describe Scheduler::Defer do
def wait_for(timeout, &blk)
till = Time.now + (timeout.to_f / 1000)
- while Time.now < till && !blk.call
- sleep 0.001
- end
+ sleep 0.001 while Time.now < till && !blk.call
end
before do
@@ -18,26 +16,21 @@ RSpec.describe Scheduler::Defer do
@defer.async = true
end
- after do
- @defer.stop!
- end
+ after { @defer.stop! }
it "supports timeout reporting" do
@defer.timeout = 0.05
- logger = track_log_messages do |l|
- 10.times do
- @defer.later("fast job") {}
- end
+ logger =
+ track_log_messages do |l|
+ 10.times { @defer.later("fast job") {} }
- @defer.later "weird slow job" do
- sleep
- end
+ @defer.later "weird slow job" do
+ sleep
+ end
- wait_for(200) do
- l.errors.length == 1
+ wait_for(200) { l.errors.length == 1 }
end
- end
expect(logger.warnings.length).to eq(0)
expect(logger.fatals.length).to eq(0)
@@ -49,9 +42,7 @@ RSpec.describe Scheduler::Defer do
x = 1
@defer.pause
- @defer.later do
- x = 2
- end
+ @defer.later { x = 2 }
expect(@defer.length).to eq(1)
@@ -61,13 +52,9 @@ RSpec.describe Scheduler::Defer do
@defer.resume
- @defer.later do
- x = 3
- end
+ @defer.later { x = 3 }
- wait_for(1000) do
- x == 3
- end
+ wait_for(1000) { x == 3 }
expect(x).to eq(3)
end
@@ -75,19 +62,13 @@ RSpec.describe Scheduler::Defer do
it "recovers from a crash / fork" do
s = nil
@defer.stop!
- wait_for(1000) do
- @defer.stopped?
- end
+ wait_for(1000) { @defer.stopped? }
# hack allow thread to die
sleep 0.005
- @defer.later do
- s = "good"
- end
+ @defer.later { s = "good" }
- wait_for(1000) do
- s == "good"
- end
+ wait_for(1000) { s == "good" }
expect(s).to eq("good")
end
@@ -95,15 +76,10 @@ RSpec.describe Scheduler::Defer do
it "can queue jobs properly" do
s = nil
- @defer.later do
- s = "good"
- end
+ @defer.later { s = "good" }
- wait_for(1000) do
- s == "good"
- end
+ wait_for(1000) { s == "good" }
expect(s).to eq("good")
end
-
end
diff --git a/spec/lib/score_calculator_spec.rb b/spec/lib/score_calculator_spec.rb
index 9506ec4a1ac..db24c7dbe2c 100644
--- a/spec/lib/score_calculator_spec.rb
+++ b/spec/lib/score_calculator_spec.rb
@@ -1,20 +1,20 @@
# frozen_string_literal: true
-require 'score_calculator'
+require "score_calculator"
RSpec.describe ScoreCalculator do
fab!(:post) { Fabricate(:post, reads: 111) }
fab!(:another_post) { Fabricate(:post, topic: post.topic, reads: 222) }
let(:topic) { post.topic }
- context 'with weightings' do
+ context "with weightings" do
before do
ScoreCalculator.new(reads: 3).calculate
post.reload
another_post.reload
end
- it 'takes the supplied weightings into effect' do
+ it "takes the supplied weightings into effect" do
expect(post.score).to eq(333)
expect(another_post.score).to eq(666)
end
@@ -29,7 +29,7 @@ RSpec.describe ScoreCalculator do
end
end
- describe 'summary' do
+ describe "summary" do
it "won't update the site settings when the site settings don't match" do
ScoreCalculator.new(reads: 3).calculate
topic.reload
diff --git a/spec/lib/scss_checker_spec.rb b/spec/lib/scss_checker_spec.rb
index fe1381525b7..46af7d8d1d5 100644
--- a/spec/lib/scss_checker_spec.rb
+++ b/spec/lib/scss_checker_spec.rb
@@ -3,14 +3,18 @@
RSpec.describe Stylesheet::Manager::ScssChecker do
fab!(:theme) { Fabricate(:theme) }
- describe '#has_scss' do
- it 'should return true when theme has scss' do
+ describe "#has_scss" do
+ it "should return true when theme has scss" do
scss_theme = Fabricate(:theme, component: true)
scss_theme.set_field(target: :common, name: "scss", value: ".scss{color: red;}")
scss_theme.save!
embedded_scss_theme = Fabricate(:theme, component: true)
- embedded_scss_theme.set_field(target: :common, name: "embedded_scss", value: ".scss{color: red;}")
+ embedded_scss_theme.set_field(
+ target: :common,
+ name: "embedded_scss",
+ value: ".scss{color: red;}",
+ )
embedded_scss_theme.save!
theme_ids = [scss_theme.id, embedded_scss_theme.id]
@@ -26,9 +30,8 @@ RSpec.describe Stylesheet::Manager::ScssChecker do
expect(embedded_theme_checker.has_scss(embedded_scss_theme.id)).to eq(true)
end
- it 'should return false when theme does not have scss' do
- expect(described_class.new(:desktop_theme, [theme.id]).has_scss(theme.id))
- .to eq(false)
+ it "should return false when theme does not have scss" do
+ expect(described_class.new(:desktop_theme, [theme.id]).has_scss(theme.id)).to eq(false)
end
end
end
diff --git a/spec/lib/search_spec.rb b/spec/lib/search_spec.rb
index b7f9fd283ad..01640a5f99b 100644
--- a/spec/lib/search_spec.rb
+++ b/spec/lib/search_spec.rb
@@ -30,7 +30,9 @@ RSpec.describe Search do
link to a video file: https://somesite.com/content/somethingelse.MOV
RAW
result = Search::GroupedSearchResults.blurb_for(cooked: cooked)
- expect(result).to eq("link to an external page: https://google.com/?u=bar link to an audio file: #{I18n.t("search.audio")} link to a video file: #{I18n.t("search.video")}")
+ expect(result).to eq(
+ "link to an external page: https://google.com/?u=bar link to an audio file: #{I18n.t("search.audio")} link to a video file: #{I18n.t("search.video")}",
+ )
end
it "strips URLs correctly when blurb is longer than limit" do
@@ -43,7 +45,9 @@ RSpec.describe Search do
RAW
result = Search::GroupedSearchResults.blurb_for(cooked: cooked)
- expect(result).to eq("Here goes a test cooked with enough characters to hit the blurb limit. Something is very interesting about this audio file. #{I18n.t("search.audio")}")
+ expect(result).to eq(
+ "Here goes a test cooked with enough characters to hit the blurb limit. Something is very interesting about this audio file. #{I18n.t("search.audio")}",
+ )
end
it "does not fail on bad URLs" do
@@ -56,13 +60,13 @@ RSpec.describe Search do
end
describe "#execute" do
- before do
- SiteSetting.tagging_enabled = true
- end
+ before { SiteSetting.tagging_enabled = true }
context "with staff tags" do
fab!(:hidden_tag) { Fabricate(:tag) }
- let!(:staff_tag_group) { Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name]) }
+ let!(:staff_tag_group) do
+ Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name])
+ end
fab!(:topic) { Fabricate(:topic, tags: [hidden_tag]) }
fab!(:post) { Fabricate(:post, topic: topic) }
@@ -89,13 +93,9 @@ RSpec.describe Search do
fab!(:post_1) { Fabricate(:post, raw: "Cette ****** d'art n'est pas une œuvre") }
fab!(:post_2) { Fabricate(:post, raw: "Cette oeuvre d'art n'est pas une *****") }
- before do
- SearchIndexer.enable
- end
+ before { SearchIndexer.enable }
- after do
- SearchIndexer.disable
- end
+ after { SearchIndexer.disable }
it "removes them if search_ignore_accents" do
SiteSetting.search_ignore_accents = true
@@ -119,13 +119,9 @@ RSpec.describe Search do
fab!(:post_1) { Fabricate(:post, raw: "searching for: John's") }
fab!(:post_2) { Fabricate(:post, raw: "searching for: Johns") }
- before do
- SearchIndexer.enable
- end
+ before { SearchIndexer.enable }
- after do
- SearchIndexer.disable
- end
+ after { SearchIndexer.disable }
it "returns correct results" do
SiteSetting.search_ignore_accents = false
@@ -163,9 +159,7 @@ RSpec.describe Search do
SiteSetting.tagging_enabled = true
Search.custom_topic_eager_load([:topic_users])
- Search.custom_topic_eager_load() do
- [:bookmarks]
- end
+ Search.custom_topic_eager_load() { [:bookmarks] }
expect(Search.execute("test").posts[0].topic.association(:tags).loaded?).to be true
expect(Search.execute("test").posts[0].topic.association(:topic_users).loaded?).to be true
@@ -202,23 +196,40 @@ RSpec.describe Search do
expect(result.users).to contain_exactly(user)
user_field2 = Fabricate(:user_field, name: "another custom field", searchable: true)
- UserCustomField.create!(user: user, value: "longer test", name: "user_field_#{user_field2.id}")
- UserCustomField.create!(user: user2, value: "second user test", name: "user_field_#{user_field2.id}")
+ UserCustomField.create!(
+ user: user,
+ value: "longer test",
+ name: "user_field_#{user_field2.id}",
+ )
+ UserCustomField.create!(
+ user: user2,
+ value: "second user test",
+ name: "user_field_#{user_field2.id}",
+ )
SearchIndexer.index(user, force: true)
SearchIndexer.index(user2, force: true)
result = Search.execute("test", guardian: Guardian.new(user2))
- expect(result.users.find { |u| u.id == user.id }.custom_data).to eq([
- { name: "custom field", value: "test" },
- { name: "another custom field", value: "longer test" }
- ])
- expect(result.users.find { |u| u.id == user2.id }.custom_data).to eq([
- { name: "another custom field", value: "second user test" }
- ])
+ expect(result.users.find { |u| u.id == user.id }.custom_data).to eq(
+ [
+ { name: "custom field", value: "test" },
+ { name: "another custom field", value: "longer test" },
+ ],
+ )
+ expect(result.users.find { |u| u.id == user2.id }.custom_data).to eq(
+ [{ name: "another custom field", value: "second user test" }],
+ )
end
context "when using SiteSetting.enable_listing_suspended_users_on_search" do
- fab!(:suspended_user) { Fabricate(:user, username: 'revolver_ocelot', suspended_at: Time.now, suspended_till: 5.days.from_now) }
+ fab!(:suspended_user) do
+ Fabricate(
+ :user,
+ username: "revolver_ocelot",
+ suspended_at: Time.now,
+ suspended_till: 5.days.from_now,
+ )
+ end
before { SearchIndexer.index(suspended_user, force: true) }
@@ -260,23 +271,31 @@ RSpec.describe Search do
SearchIndexer.index(post, force: true)
expect(Search.execute("test ##{category.slug}").posts).to contain_exactly(post)
- expect(Search.execute("test ##{category.slug}:#{subcategory.slug}").posts).to contain_exactly(post)
+ expect(Search.execute("test ##{category.slug}:#{subcategory.slug}").posts).to contain_exactly(
+ post,
+ )
expect(Search.execute("test ##{subcategory.slug}").posts).to contain_exactly(post)
- expect(Search.execute("test ##{subcategory.slug}:#{subsubcategory.slug}").posts).to contain_exactly(post)
+ expect(
+ Search.execute("test ##{subcategory.slug}:#{subsubcategory.slug}").posts,
+ ).to contain_exactly(post)
expect(Search.execute("test ##{subsubcategory.slug}").posts).to contain_exactly(post)
expect(Search.execute("test #=#{category.slug}").posts).to be_empty
expect(Search.execute("test #=#{category.slug}:#{subcategory.slug}").posts).to be_empty
expect(Search.execute("test #=#{subcategory.slug}").posts).to be_empty
- expect(Search.execute("test #=#{subcategory.slug}:#{subsubcategory.slug}").posts).to contain_exactly(post)
+ expect(
+ Search.execute("test #=#{subcategory.slug}:#{subsubcategory.slug}").posts,
+ ).to contain_exactly(post)
expect(Search.execute("test #=#{subsubcategory.slug}").posts).to contain_exactly(post)
end
end
- describe 'post indexing' do
- fab!(:category) { Fabricate(:category_with_definition, name: 'america') }
- fab!(:topic) { Fabricate(:topic, title: 'sam saffron test topic', category: category) }
- let!(:post) { Fabricate(:post, topic: topic, raw: 'this fun test fun test elephant "
end
- it 'returns the post' do
+ it "returns the post" do
SiteSetting.use_pg_headlines_for_excerpt = true
- result = Search.execute('elephant',
- type_filter: 'topic',
- include_blurbs: true
- )
+ result = Search.execute("elephant", type_filter: "topic", include_blurbs: true)
expect(result.posts.map(&:id)).to contain_exactly(reply.id)
@@ -835,24 +875,26 @@ RSpec.describe Search do
it "only applies highlighting to the first #{Search::MAX_LENGTH_FOR_HEADLINE} characters" do
SiteSetting.use_pg_headlines_for_excerpt = true
- reply.update!(raw: "#{'a' * Search::MAX_LENGTH_FOR_HEADLINE} #{reply.raw}")
+ reply.update!(raw: "#{"a" * Search::MAX_LENGTH_FOR_HEADLINE} #{reply.raw}")
- result = Search.execute('elephant')
+ result = Search.execute("elephant")
expect(result.posts.map(&:id)).to contain_exactly(reply.id)
post = result.posts.first
- expect(post.headline.include?('elephant')).to eq(false)
+ expect(post.headline.include?("elephant")).to eq(false)
end
it "does not truncate topic title when applying highlights" do
SiteSetting.use_pg_headlines_for_excerpt = true
topic = reply.topic
- topic.update!(title: "#{'very ' * 7}long topic title with our search term in the middle of the title")
+ topic.update!(
+ title: "#{"very " * 7}long topic title with our search term in the middle of the title",
+ )
- result = Search.execute('search term')
+ result = Search.execute("search term")
expect(result.posts.first.topic_title_headline).to eq(<<~HTML.chomp)
Very very very very very very very long topic title with our search term in the middle of the title
@@ -862,71 +904,64 @@ RSpec.describe Search do
it "limits the search headline to #{Search::GroupedSearchResults::BLURB_LENGTH} characters" do
SiteSetting.use_pg_headlines_for_excerpt = true
- reply.update!(raw: "#{'a' * Search::GroupedSearchResults::BLURB_LENGTH} elephant")
+ reply.update!(raw: "#{"a" * Search::GroupedSearchResults::BLURB_LENGTH} elephant")
- result = Search.execute('elephant')
+ result = Search.execute("elephant")
expect(result.posts.map(&:id)).to contain_exactly(reply.id)
post = result.posts.first
- expect(result.blurb(post)).to eq("#{'a' * Search::GroupedSearchResults::BLURB_LENGTH}#{Search::GroupedSearchResults::OMISSION}")
+ expect(result.blurb(post)).to eq(
+ "#{"a" * Search::GroupedSearchResults::BLURB_LENGTH}#{Search::GroupedSearchResults::OMISSION}",
+ )
end
- it 'returns the right post and blurb for searches with phrase' do
+ it "returns the right post and blurb for searches with phrase" do
SiteSetting.use_pg_headlines_for_excerpt = true
- result = Search.execute('"elephant"',
- type_filter: 'topic',
- include_blurbs: true
- )
+ result = Search.execute('"elephant"', type_filter: "topic", include_blurbs: true)
expect(result.posts.map(&:id)).to contain_exactly(reply.id)
expect(result.blurb(result.posts.first)).to eq(expected_blurb)
end
- it 'applies a small penalty to closed topic when ranking' do
- post = Fabricate(:post,
- raw: "My weekly update",
- topic: Fabricate(:topic,
- title: "A topic that will be closed",
- closed: true
+ it "applies a small penalty to closed topic when ranking" do
+ post =
+ Fabricate(
+ :post,
+ raw: "My weekly update",
+ topic: Fabricate(:topic, title: "A topic that will be closed", closed: true),
)
- )
- post2 = Fabricate(:post,
- raw: "My weekly update",
- topic: Fabricate(:topic,
- title: "A topic that will be open"
+ post2 =
+ Fabricate(
+ :post,
+ raw: "My weekly update",
+ topic: Fabricate(:topic, title: "A topic that will be open"),
)
- )
- result = Search.execute('weekly update')
+ result = Search.execute("weekly update")
expect(result.posts.pluck(:id)).to eq([post2.id, post.id])
end
- it 'aggregates searches in a topic by returning the post with the lowest post number' do
+ it "aggregates searches in a topic by returning the post with the lowest post number" do
post = Fabricate(:post, topic: topic, raw: "this is a play post")
post2 = Fabricate(:post, topic: topic, raw: "play play playing played play")
post3 = Fabricate(:post, raw: "this is a play post")
- 5.times do
- Fabricate(:post, topic: topic, raw: "play playing played")
- end
+ 5.times { Fabricate(:post, topic: topic, raw: "play playing played") }
- results = Search.execute('play')
+ results = Search.execute("play")
- expect(results.posts.map(&:id)).to eq([
- post.id,
- post3.id
- ])
+ expect(results.posts.map(&:id)).to eq([post.id, post3.id])
end
it "is able to search with an offset when configured" do
post_1 = Fabricate(:post, raw: "this is a play post")
SiteSetting.search_recent_regular_posts_offset_post_id = post_1.id + 1
- results = Search.execute('play post')
+ results = Search.execute("play post")
expect(results.posts).to eq([post_1])
@@ -934,78 +969,87 @@ RSpec.describe Search do
SiteSetting.search_recent_regular_posts_offset_post_id = post_2.id
- results = Search.execute('play post')
+ results = Search.execute("play post")
- expect(results.posts.map(&:id)).to eq([
- post_2.id,
- post_1.id
- ])
+ expect(results.posts.map(&:id)).to eq([post_2.id, post_1.id])
end
- it 'allows staff and members of whisperers group to search for whispers' do
+ it "allows staff and members of whisperers group to search for whispers" do
whisperers_group = Fabricate(:group)
user = Fabricate(:user)
SiteSetting.whispers_allowed_groups = "#{Group::AUTO_GROUPS[:staff]}|#{whisperers_group.id}"
- post.update!(post_type: Post.types[:whisper], raw: 'this is a tiger')
+ post.update!(post_type: Post.types[:whisper], raw: "this is a tiger")
- results = Search.execute('tiger')
+ results = Search.execute("tiger")
expect(results.posts).to eq([])
- results = Search.execute('tiger', guardian: Guardian.new(admin))
+ results = Search.execute("tiger", guardian: Guardian.new(admin))
expect(results.posts).to eq([post])
- results = Search.execute('tiger', guardian: Guardian.new(user))
+ results = Search.execute("tiger", guardian: Guardian.new(user))
expect(results.posts).to eq([])
user.groups << whisperers_group
- results = Search.execute('tiger', guardian: Guardian.new(user))
+ results = Search.execute("tiger", guardian: Guardian.new(user))
expect(results.posts).to eq([post])
end
end
- describe 'topics' do
+ describe "topics" do
let(:post) { Fabricate(:post) }
let(:topic) { post.topic }
- context 'with search within topic' do
+ context "with search within topic" do
def new_post(raw, topic = nil, created_at: nil)
topic ||= Fabricate(:topic)
- Fabricate(:post, topic: topic, topic_id: topic.id, user: topic.user, raw: raw, created_at: created_at)
+ Fabricate(
+ :post,
+ topic: topic,
+ topic_id: topic.id,
+ user: topic.user,
+ raw: raw,
+ created_at: created_at,
+ )
end
- it 'works in Chinese' do
+ it "works in Chinese" do
SiteSetting.search_tokenize_chinese_japanese_korean = true
- post = new_post('I am not in English 何点になると思いますか')
+ post = new_post("I am not in English 何点になると思いますか")
- results = Search.execute('何点になると思', search_context: post.topic)
+ results = Search.execute("何点になると思", search_context: post.topic)
expect(results.posts.map(&:id)).to eq([post.id])
end
- it 'displays multiple results within a topic' do
+ it "displays multiple results within a topic" do
topic2 = Fabricate(:topic)
- new_post('this is the other post I am posting', topic2, created_at: 6.minutes.ago)
- new_post('this is my fifth post I am posting', topic2, created_at: 5.minutes.ago)
+ new_post("this is the other post I am posting", topic2, created_at: 6.minutes.ago)
+ new_post("this is my fifth post I am posting", topic2, created_at: 5.minutes.ago)
- post1 = new_post('this is the other post I am posting', topic, created_at: 4.minutes.ago)
- post2 = new_post('this is my first post I am posting', topic, created_at: 3.minutes.ago)
- post3 = new_post('this is a real long and complicated bla this is my second post I am Posting birds with more stuff bla bla', topic, created_at: 2.minutes.ago)
- post4 = new_post('this is my fourth post I am posting', topic, created_at: 1.minute.ago)
+ post1 = new_post("this is the other post I am posting", topic, created_at: 4.minutes.ago)
+ post2 = new_post("this is my first post I am posting", topic, created_at: 3.minutes.ago)
+ post3 =
+ new_post(
+ "this is a real long and complicated bla this is my second post I am Posting birds with more stuff bla bla",
+ topic,
+ created_at: 2.minutes.ago,
+ )
+ post4 = new_post("this is my fourth post I am posting", topic, created_at: 1.minute.ago)
# update posts_count
topic.reload
- results = Search.execute('posting', search_context: post1.topic)
+ results = Search.execute("posting", search_context: post1.topic)
expect(results.posts.map(&:id)).to eq([post1.id, post2.id, post3.id, post4.id])
- results = Search.execute('posting l', search_context: post1.topic)
+ results = Search.execute("posting l", search_context: post1.topic)
expect(results.posts.map(&:id)).to eq([post4.id, post3.id, post2.id, post1.id])
# stop words should work
- results = Search.execute('this', search_context: post1.topic)
+ results = Search.execute("this", search_context: post1.topic)
expect(results.posts.length).to eq(4)
# phrase search works as expected
@@ -1015,23 +1059,23 @@ RSpec.describe Search do
it "works for unlisted topics" do
topic.update(visible: false)
- _post = new_post('discourse is awesome', topic)
- results = Search.execute('discourse', search_context: topic)
+ _post = new_post("discourse is awesome", topic)
+ results = Search.execute("discourse", search_context: topic)
expect(results.posts.length).to eq(1)
end
end
- context 'when searching the OP' do
+ context "when searching the OP" do
let!(:post) { Fabricate(:post_with_long_raw_content) }
- let(:result) { Search.execute('hundred', type_filter: 'topic') }
+ let(:result) { Search.execute("hundred", type_filter: "topic") }
- it 'returns a result correctly' do
+ it "returns a result correctly" do
expect(result.posts.length).to eq(1)
expect(result.posts[0].id).to eq(post.id)
end
end
- context 'when searching for quoted title' do
+ context "when searching for quoted title" do
it "can find quoted title" do
create_post(raw: "this is the raw body", title: "I am a title yeah")
result = Search.execute('"a title yeah"')
@@ -1041,49 +1085,82 @@ RSpec.describe Search do
end
context "when searching for a topic by id" do
- let(:result) { Search.execute(topic.id, type_filter: 'topic', search_for_id: true, min_search_term_length: 1) }
+ let(:result) do
+ Search.execute(
+ topic.id,
+ type_filter: "topic",
+ search_for_id: true,
+ min_search_term_length: 1,
+ )
+ end
- it 'returns the topic' do
+ it "returns the topic" do
expect(result.posts.length).to eq(1)
expect(result.posts.first.id).to eq(post.id)
end
end
context "when searching for a topic by url" do
- it 'returns the topic' do
- result = Search.execute(topic.relative_url, search_for_id: true, type_filter: 'topic')
+ it "returns the topic" do
+ result = Search.execute(topic.relative_url, search_for_id: true, type_filter: "topic")
expect(result.posts.length).to eq(1)
expect(result.posts.first.id).to eq(post.id)
end
- context 'with restrict_to_archetype' do
+ context "with restrict_to_archetype" do
let(:personal_message) { Fabricate(:private_message_topic) }
let!(:p1) { Fabricate(:post, topic: personal_message, post_number: 1) }
- it 'restricts result to topics' do
- result = Search.execute(personal_message.relative_url, search_for_id: true, type_filter: 'topic', restrict_to_archetype: Archetype.default)
+ it "restricts result to topics" do
+ result =
+ Search.execute(
+ personal_message.relative_url,
+ search_for_id: true,
+ type_filter: "topic",
+ restrict_to_archetype: Archetype.default,
+ )
expect(result.posts.length).to eq(0)
- result = Search.execute(topic.relative_url, search_for_id: true, type_filter: 'topic', restrict_to_archetype: Archetype.default)
+ result =
+ Search.execute(
+ topic.relative_url,
+ search_for_id: true,
+ type_filter: "topic",
+ restrict_to_archetype: Archetype.default,
+ )
expect(result.posts.length).to eq(1)
end
- it 'restricts result to messages' do
- result = Search.execute(topic.relative_url, search_for_id: true, type_filter: 'private_messages', guardian: Guardian.new(admin), restrict_to_archetype: Archetype.private_message)
+ it "restricts result to messages" do
+ result =
+ Search.execute(
+ topic.relative_url,
+ search_for_id: true,
+ type_filter: "private_messages",
+ guardian: Guardian.new(admin),
+ restrict_to_archetype: Archetype.private_message,
+ )
expect(result.posts.length).to eq(0)
- result = Search.execute(personal_message.relative_url, search_for_id: true, type_filter: 'private_messages', guardian: Guardian.new(admin), restrict_to_archetype: Archetype.private_message)
+ result =
+ Search.execute(
+ personal_message.relative_url,
+ search_for_id: true,
+ type_filter: "private_messages",
+ guardian: Guardian.new(admin),
+ restrict_to_archetype: Archetype.private_message,
+ )
expect(result.posts.length).to eq(1)
end
end
end
- context 'with security' do
+ context "with security" do
def result(current_user)
- Search.execute('hello', guardian: Guardian.new(current_user))
+ Search.execute("hello", guardian: Guardian.new(current_user))
end
- it 'secures results correctly' do
+ it "secures results correctly" do
category = Fabricate(:category_with_definition)
topic.category_id = category.id
@@ -1099,7 +1176,7 @@ RSpec.describe Search do
end
end
- describe 'cyrillic topic' do
+ describe "cyrillic topic" do
let!(:cyrillic_topic) do
Fabricate(:topic) do
user
@@ -1108,37 +1185,36 @@ RSpec.describe Search do
end
let!(:post) { Fabricate(:post, topic: cyrillic_topic, user: cyrillic_topic.user) }
- let(:result) { Search.execute('запись') }
+ let(:result) { Search.execute("запись") }
- it 'finds something when given cyrillic query' do
+ it "finds something when given cyrillic query" do
expect(result.posts).to contain_exactly(post)
end
end
- it 'does not tokenize search term' do
- Fabricate(:post, raw: 'thing is canned should still be found!')
- expect(Search.execute('canned').posts).to be_present
+ it "does not tokenize search term" do
+ Fabricate(:post, raw: "thing is canned should still be found!")
+ expect(Search.execute("canned").posts).to be_present
end
- describe 'categories' do
+ describe "categories" do
let(:category) { Fabricate(:category_with_definition, name: "monkey Category 2") }
let(:topic) { Fabricate(:topic, category: category) }
let!(:post) { Fabricate(:post, topic: topic, raw: "snow monkey") }
let!(:ignored_category) do
- Fabricate(:category_with_definition,
+ Fabricate(
+ :category_with_definition,
name: "monkey Category 1",
slug: "test",
- search_priority: Searchable::PRIORITIES[:ignore]
+ search_priority: Searchable::PRIORITIES[:ignore],
)
end
it "should return the right categories" do
search = Search.execute("monkey")
- expect(search.categories).to contain_exactly(
- category, ignored_category
- )
+ expect(search.categories).to contain_exactly(category, ignored_category)
expect(search.posts).to eq([category.topic.first_post, post])
@@ -1149,32 +1225,35 @@ RSpec.describe Search do
describe "with child categories" do
let!(:child_of_ignored_category) do
- Fabricate(:category_with_definition,
+ Fabricate(
+ :category_with_definition,
name: "monkey Category 3",
- parent_category: ignored_category
+ parent_category: ignored_category,
)
end
let!(:post2) do
- Fabricate(:post,
+ Fabricate(
+ :post,
topic: Fabricate(:topic, category: child_of_ignored_category),
- raw: "snow monkey park"
+ raw: "snow monkey park",
)
end
- it 'returns the right results' do
+ it "returns the right results" do
search = Search.execute("monkey")
expect(search.categories).to contain_exactly(
- category, ignored_category, child_of_ignored_category
+ category,
+ ignored_category,
+ child_of_ignored_category,
)
- expect(search.posts.map(&:id)).to eq([
- child_of_ignored_category.topic.first_post,
- category.topic.first_post,
- post2,
- post
- ].map(&:id))
+ expect(search.posts.map(&:id)).to eq(
+ [child_of_ignored_category.topic.first_post, category.topic.first_post, post2, post].map(
+ &:id
+ ),
+ )
search = Search.execute("snow")
expect(search.posts.map(&:id)).to eq([post2.id, post.id])
@@ -1183,18 +1262,15 @@ RSpec.describe Search do
category.save!
search = Search.execute("monkey")
- expect(search.categories).to contain_exactly(
- ignored_category, child_of_ignored_category
- )
+ expect(search.categories).to contain_exactly(ignored_category, child_of_ignored_category)
- expect(search.posts.map(&:id)).to eq([
- child_of_ignored_category.topic.first_post,
- post2
- ].map(&:id))
+ expect(search.posts.map(&:id)).to eq(
+ [child_of_ignored_category.topic.first_post, post2].map(&:id),
+ )
end
end
- describe 'categories with different priorities' do
+ describe "categories with different priorities" do
let(:category2) { Fabricate(:category_with_definition) }
it "should return posts in the right order" do
@@ -1216,39 +1292,37 @@ RSpec.describe Search do
end
end
- describe 'groups' do
+ describe "groups" do
def search(user = Fabricate(:user))
Search.execute(group.name, guardian: Guardian.new(user))
end
let!(:group) { Group[:trust_level_0] }
- it 'shows group' do
+ it "shows group" do
expect(search.groups.map(&:name)).to eq([group.name])
end
- context 'with group visibility' do
+ context "with group visibility" do
let!(:group) { Fabricate(:group) }
- before do
- group.update!(visibility_level: 3)
- end
+ before { group.update!(visibility_level: 3) }
- context 'with staff logged in' do
- it 'shows group' do
+ context "with staff logged in" do
+ it "shows group" do
expect(search(admin).groups.map(&:name)).to eq([group.name])
end
end
- context 'with non staff logged in' do
- it 'shows doesn’t show group' do
+ context "with non staff logged in" do
+ it "shows doesn’t show group" do
expect(search.groups.map(&:name)).to be_empty
end
end
end
end
- describe 'tags' do
+ describe "tags" do
def search
Search.execute(tag.name)
end
@@ -1258,16 +1332,20 @@ RSpec.describe Search do
let(:tag_group) { Fabricate(:tag_group) }
let(:category) { Fabricate(:category_with_definition) }
- context 'with post searching' do
+ context "with post searching" do
before do
SiteSetting.tagging_enabled = true
- DiscourseTagging.tag_topic_by_names(post.topic, Guardian.new(Fabricate.build(:admin)), [tag.name, uppercase_tag.name])
+ DiscourseTagging.tag_topic_by_names(
+ post.topic,
+ Guardian.new(Fabricate.build(:admin)),
+ [tag.name, uppercase_tag.name],
+ )
post.topic.save
end
- let(:post) { Fabricate(:post, raw: 'I am special post') }
+ let(:post) { Fabricate(:post, raw: "I am special post") }
- it 'can find posts with tags' do
+ it "can find posts with tags" do
# we got to make this index (it is deferred)
Jobs::ReindexSearch.new.rebuild_posts
@@ -1283,55 +1361,59 @@ RSpec.describe Search do
expect(result.posts.length).to eq(0)
end
- it 'can find posts with tag synonyms' do
- synonym = Fabricate(:tag, name: 'synonym', target_tag: tag)
+ it "can find posts with tag synonyms" do
+ synonym = Fabricate(:tag, name: "synonym", target_tag: tag)
Jobs::ReindexSearch.new.rebuild_posts
result = Search.execute(synonym.name)
expect(result.posts.length).to eq(1)
end
end
- context 'when tagging is disabled' do
+ context "when tagging is disabled" do
before { SiteSetting.tagging_enabled = false }
- it 'does not include tags' do
+ it "does not include tags" do
expect(search.tags).to_not be_present
end
end
- context 'when tagging is enabled' do
+ context "when tagging is enabled" do
before { SiteSetting.tagging_enabled = true }
- it 'returns the tag in the result' do
+ it "returns the tag in the result" do
expect(search.tags).to eq([tag])
end
- it 'shows staff tags' do
+ it "shows staff tags" do
create_staff_only_tags(["#{tag.name}9"])
- expect(Search.execute(tag.name, guardian: Guardian.new(admin)).tags.map(&:name)).to eq([tag.name, "#{tag.name}9"])
+ expect(Search.execute(tag.name, guardian: Guardian.new(admin)).tags.map(&:name)).to eq(
+ [tag.name, "#{tag.name}9"],
+ )
expect(search.tags.map(&:name)).to eq([tag.name, "#{tag.name}9"])
end
- it 'includes category-restricted tags' do
+ it "includes category-restricted tags" do
category_tag = Fabricate(:tag, name: "#{tag.name}9")
tag_group.tags = [category_tag]
category.set_permissions(admins: :full)
category.allowed_tag_groups = [tag_group.name]
category.save!
- expect(Search.execute(tag.name, guardian: Guardian.new(admin)).tags).to eq([tag, category_tag])
+ expect(Search.execute(tag.name, guardian: Guardian.new(admin)).tags).to eq(
+ [tag, category_tag],
+ )
expect(search.tags).to eq([tag, category_tag])
end
end
end
- describe 'type_filter' do
- let!(:user) { Fabricate(:user, username: 'amazing', email: 'amazing@amazing.com') }
- let!(:category) { Fabricate(:category_with_definition, name: 'amazing category', user: user) }
+ describe "type_filter" do
+ let!(:user) { Fabricate(:user, username: "amazing", email: "amazing@amazing.com") }
+ let!(:category) { Fabricate(:category_with_definition, name: "amazing category", user: user) }
- context 'with user filter' do
- let(:results) { Search.execute('amazing', type_filter: 'user') }
+ context "with user filter" do
+ let(:results) { Search.execute("amazing", type_filter: "user") }
it "returns a user result" do
expect(results.categories.length).to eq(0)
@@ -1340,8 +1422,8 @@ RSpec.describe Search do
end
end
- context 'with category filter' do
- let(:results) { Search.execute('amazing', type_filter: 'category') }
+ context "with category filter" do
+ let(:results) { Search.execute("amazing", type_filter: "category") }
it "returns a category result" do
expect(results.categories.length).to eq(1)
@@ -1351,23 +1433,22 @@ RSpec.describe Search do
end
end
- describe 'search_context' do
- it 'can find a user when using search context' do
+ describe "search_context" do
+ it "can find a user when using search context" do
coding_horror = Fabricate(:coding_horror)
post = Fabricate(:post)
Fabricate(:post, user: coding_horror)
- result = Search.execute('hello', search_context: post.user)
+ result = Search.execute("hello", search_context: post.user)
result.posts.first.topic_id = post.topic_id
expect(result.posts.length).to eq(1)
end
- it 'can use category as a search context' do
- category = Fabricate(:category_with_definition,
- search_priority: Searchable::PRIORITIES[:ignore]
- )
+ it "can use category as a search context" do
+ category =
+ Fabricate(:category_with_definition, search_priority: Searchable::PRIORITIES[:ignore])
topic = Fabricate(:topic, category: category)
topic_no_cat = Fabricate(:topic)
@@ -1378,43 +1459,49 @@ RSpec.describe Search do
post = Fabricate(:post, topic: topic, user: topic.user)
Fabricate(:post, topic: topic_no_cat, user: topic.user)
- sub_post = Fabricate(:post, raw: 'I am saying hello from a subcategory', topic: sub_topic, user: topic.user)
+ sub_post =
+ Fabricate(
+ :post,
+ raw: "I am saying hello from a subcategory",
+ topic: sub_topic,
+ user: topic.user,
+ )
- search = Search.execute('hello', search_context: category)
+ search = Search.execute("hello", search_context: category)
expect(search.posts.map(&:id)).to match_array([post.id, sub_post.id])
expect(search.posts.length).to eq(2)
end
- it 'can use tag as a search context' do
- tag = Fabricate(:tag, name: 'important-stuff')
+ it "can use tag as a search context" do
+ tag = Fabricate(:tag, name: "important-stuff")
topic_no_tag = Fabricate(:topic)
Fabricate(:topic_tag, tag: tag, topic: topic)
- post = Fabricate(:post, topic: topic, user: topic.user, raw: 'This is my hello')
+ post = Fabricate(:post, topic: topic, user: topic.user, raw: "This is my hello")
Fabricate(:post, topic: topic_no_tag, user: topic.user)
- search = Search.execute('hello', search_context: tag)
+ search = Search.execute("hello", search_context: tag)
expect(search.posts.map(&:id)).to contain_exactly(post.id)
expect(search.posts.length).to eq(1)
end
end
- describe 'Japanese search' do
+ describe "Japanese search" do
let!(:topic) { Fabricate(:topic) }
- let!(:post) { Fabricate(:post, topic: topic, raw: 'This is some japanese text 日本が大好きです。') }
- let!(:topic_2) { Fabricate(:topic, title: '日本の話題、 more japanese text') }
+ let!(:post) { Fabricate(:post, topic: topic, raw: "This is some japanese text 日本が大好きです。") }
+ let!(:topic_2) { Fabricate(:topic, title: "日本の話題、 more japanese text") }
let!(:post_2) { Fabricate(:post, topic: topic_2) }
- describe '.prepare_data' do
- it 'removes punctuations' do
+ describe ".prepare_data" do
+ it "removes punctuations" do
SiteSetting.search_tokenize_japanese = true
expect(Search.prepare_data(post.raw)).to eq("This is some japanese text 日本 が 大好き です")
end
end
- describe '.execute' do
+ describe ".execute" do
before do
@old_default = SiteSetting.defaults.get(:min_search_term_length)
SiteSetting.defaults.set_regardless_of_locale(:min_search_term_length, 1)
@@ -1426,101 +1513,106 @@ RSpec.describe Search do
SiteSetting.refresh!
end
- it 'finds posts containing Japanese text if tokenization is forced' do
+ it "finds posts containing Japanese text if tokenization is forced" do
SiteSetting.search_tokenize_japanese = true
- expect(Search.execute('日本').posts.map(&:id)).to eq([post_2.id, post.id])
- expect(Search.execute('日').posts.map(&:id)).to eq([post_2.id, post.id])
+ expect(Search.execute("日本").posts.map(&:id)).to eq([post_2.id, post.id])
+ expect(Search.execute("日").posts.map(&:id)).to eq([post_2.id, post.id])
end
it "find posts containing search term when site's locale is set to Japanese" do
- SiteSetting.default_locale = 'ja'
+ SiteSetting.default_locale = "ja"
- expect(Search.execute('日本').posts.map(&:id)).to eq([post_2.id, post.id])
- expect(Search.execute('日').posts.map(&:id)).to eq([post_2.id, post.id])
+ expect(Search.execute("日本").posts.map(&:id)).to eq([post_2.id, post.id])
+ expect(Search.execute("日").posts.map(&:id)).to eq([post_2.id, post.id])
end
- it 'does not include superfluous spaces in blurbs' do
- SiteSetting.default_locale = 'ja'
+ it "does not include superfluous spaces in blurbs" do
+ SiteSetting.default_locale = "ja"
- post.update!(raw: '場サアマネ織企ういかせ竹域ヱイマ穂基ホ神3予読ずねいぱ松査ス禁多サウ提懸イふ引小43改こょドめ。深とつぐ主思料農ぞかル者杯検める活分えほづぼ白犠')
+ post.update!(
+ raw: "場サアマネ織企ういかせ竹域ヱイマ穂基ホ神3予読ずねいぱ松査ス禁多サウ提懸イふ引小43改こょドめ。深とつぐ主思料農ぞかル者杯検める活分えほづぼ白犠",
+ )
- results = Search.execute('ういかせ竹域', type_filter: 'topic')
+ results = Search.execute("ういかせ竹域", type_filter: "topic")
expect(results.posts.length).to eq(1)
- expect(results.blurb(results.posts.first)).to include('ういかせ竹域')
+ expect(results.blurb(results.posts.first)).to include("ういかせ竹域")
end
end
end
- describe 'Chinese search' do
- let(:sentence) { 'Discourse is a software company 中国的基础设施网络正在组装。' }
- let(:sentence_t) { 'Discourse is a software company 太平山森林遊樂區。' }
+ describe "Chinese search" do
+ let(:sentence) { "Discourse is a software company 中国的基础设施网络正在组装。" }
+ let(:sentence_t) { "Discourse is a software company 太平山森林遊樂區。" }
- it 'splits English / Chinese and filter out Chinese stop words' do
- SiteSetting.default_locale = 'zh_CN'
+ it "splits English / Chinese and filter out Chinese stop words" do
+ SiteSetting.default_locale = "zh_CN"
data = Search.prepare_data(sentence)
expect(data).to eq("Discourse is a software company 中国 基础设施 网络 正在 组装")
end
- it 'splits for indexing and filter out stop words' do
- SiteSetting.default_locale = 'zh_CN'
+ it "splits for indexing and filter out stop words" do
+ SiteSetting.default_locale = "zh_CN"
data = Search.prepare_data(sentence, :index)
expect(data).to eq("Discourse is a software company 中国 基础设施 网络 正在 组装")
end
- it 'splits English / Traditional Chinese and filter out stop words' do
- SiteSetting.default_locale = 'zh_TW'
+ it "splits English / Traditional Chinese and filter out stop words" do
+ SiteSetting.default_locale = "zh_TW"
data = Search.prepare_data(sentence_t)
expect(data).to eq("Discourse is a software company 太平山 森林 遊樂區")
end
- it 'does not split strings beginning with numeric chars into different segments' do
- SiteSetting.default_locale = 'zh_TW'
+ it "does not split strings beginning with numeric chars into different segments" do
+ SiteSetting.default_locale = "zh_TW"
data = Search.prepare_data("#{sentence} 123abc")
expect(data).to eq("Discourse is a software company 中国 基础设施 网络 正在 组装 123abc")
end
- it 'finds chinese topic based on title' do
- SiteSetting.default_locale = 'zh_TW'
+ it "finds chinese topic based on title" do
+ SiteSetting.default_locale = "zh_TW"
SiteSetting.min_search_term_length = 1
- topic = Fabricate(:topic, title: 'My Title Discourse社區指南')
+ topic = Fabricate(:topic, title: "My Title Discourse社區指南")
post = Fabricate(:post, topic: topic)
- expect(Search.execute('社區指南').posts.first.id).to eq(post.id)
- expect(Search.execute('指南').posts.first.id).to eq(post.id)
+ expect(Search.execute("社區指南").posts.first.id).to eq(post.id)
+ expect(Search.execute("指南").posts.first.id).to eq(post.id)
end
- it 'finds chinese topic based on title if tokenization is forced' do
+ it "finds chinese topic based on title if tokenization is forced" do
begin
SiteSetting.search_tokenize_chinese = true
default_min_search_term_length = SiteSetting.defaults.get(:min_search_term_length)
SiteSetting.defaults.set_regardless_of_locale(:min_search_term_length, 1)
SiteSetting.refresh!
- topic = Fabricate(:topic, title: 'My Title Discourse社區指南')
+ topic = Fabricate(:topic, title: "My Title Discourse社區指南")
post = Fabricate(:post, topic: topic)
- expect(Search.execute('社區指南').posts.first.id).to eq(post.id)
- expect(Search.execute('指南').posts.first.id).to eq(post.id)
+ expect(Search.execute("社區指南").posts.first.id).to eq(post.id)
+ expect(Search.execute("指南").posts.first.id).to eq(post.id)
ensure
if default_min_search_term_length
- SiteSetting.defaults.set_regardless_of_locale(:min_search_term_length, default_min_search_term_length)
+ SiteSetting.defaults.set_regardless_of_locale(
+ :min_search_term_length,
+ default_min_search_term_length,
+ )
SiteSetting.refresh!
end
end
end
end
- describe 'Advanced search' do
+ describe "Advanced search" do
describe "bookmarks" do
fab!(:user) { Fabricate(:user) }
- let!(:bookmark_post1) { Fabricate(:post, raw: 'boom this is a bookmarked post') }
- let!(:bookmark_post2) { Fabricate(:post, raw: 'wow some other cool thing') }
+ let!(:bookmark_post1) { Fabricate(:post, raw: "boom this is a bookmarked post") }
+ let!(:bookmark_post2) { Fabricate(:post, raw: "wow some other cool thing") }
def search_with_bookmarks
- Search.execute('boom in:bookmarks', guardian: Guardian.new(user))
+ Search.execute("boom in:bookmarks", guardian: Guardian.new(user))
end
it "can filter by posts in the user's bookmarks" do
@@ -1530,99 +1622,99 @@ RSpec.describe Search do
end
end
- it 'supports pinned' do
- Fabricate(:post, raw: 'hi this is a test 123 123', topic: topic)
- _post = Fabricate(:post, raw: 'boom boom shake the room', topic: topic)
+ it "supports pinned" do
+ Fabricate(:post, raw: "hi this is a test 123 123", topic: topic)
+ _post = Fabricate(:post, raw: "boom boom shake the room", topic: topic)
topic.update_pinned(true)
- expect(Search.execute('boom in:pinned').posts.length).to eq(1)
- expect(Search.execute('boom IN:PINNED').posts.length).to eq(1)
+ expect(Search.execute("boom in:pinned").posts.length).to eq(1)
+ expect(Search.execute("boom IN:PINNED").posts.length).to eq(1)
end
- it 'supports wiki' do
+ it "supports wiki" do
topic_2 = Fabricate(:topic)
- post = Fabricate(:post, raw: 'this is a test 248', wiki: true, topic: topic)
- Fabricate(:post, raw: 'this is a test 248', wiki: false, topic: topic_2)
+ post = Fabricate(:post, raw: "this is a test 248", wiki: true, topic: topic)
+ Fabricate(:post, raw: "this is a test 248", wiki: false, topic: topic_2)
- expect(Search.execute('test 248').posts.length).to eq(2)
- expect(Search.execute('test 248 in:wiki').posts.first).to eq(post)
- expect(Search.execute('test 248 IN:WIKI').posts.first).to eq(post)
+ expect(Search.execute("test 248").posts.length).to eq(2)
+ expect(Search.execute("test 248 in:wiki").posts.first).to eq(post)
+ expect(Search.execute("test 248 IN:WIKI").posts.first).to eq(post)
end
- it 'supports searching for posts that the user has seen/unseen' do
+ it "supports searching for posts that the user has seen/unseen" do
topic_2 = Fabricate(:topic)
- post = Fabricate(:post, raw: 'logan is longan', topic: topic)
- post_2 = Fabricate(:post, raw: 'longan is logan', topic: topic_2)
+ post = Fabricate(:post, raw: "logan is longan", topic: topic)
+ post_2 = Fabricate(:post, raw: "longan is logan", topic: topic_2)
[post.user, topic.user].each do |user|
- PostTiming.create!(
- post_number: post.post_number,
- topic: topic,
- user: user,
- msecs: 1
- )
+ PostTiming.create!(post_number: post.post_number, topic: topic, user: user, msecs: 1)
end
expect(post.seen?(post.user)).to eq(true)
- expect(Search.execute('longan').posts.sort).to eq([post, post_2])
+ expect(Search.execute("longan").posts.sort).to eq([post, post_2])
- expect(Search.execute('longan in:seen', guardian: Guardian.new(post.user)).posts)
- .to eq([post])
+ expect(Search.execute("longan in:seen", guardian: Guardian.new(post.user)).posts).to eq(
+ [post],
+ )
- expect(Search.execute('longan IN:SEEN', guardian: Guardian.new(post.user)).posts)
- .to eq([post])
+ expect(Search.execute("longan IN:SEEN", guardian: Guardian.new(post.user)).posts).to eq(
+ [post],
+ )
- expect(Search.execute('longan in:seen').posts.sort).to eq([post, post_2])
+ expect(Search.execute("longan in:seen").posts.sort).to eq([post, post_2])
- expect(Search.execute('longan in:seen', guardian: Guardian.new(post_2.user)).posts)
- .to eq([])
+ expect(Search.execute("longan in:seen", guardian: Guardian.new(post_2.user)).posts).to eq([])
- expect(Search.execute('longan', guardian: Guardian.new(post_2.user)).posts.sort)
- .to eq([post, post_2])
+ expect(Search.execute("longan", guardian: Guardian.new(post_2.user)).posts.sort).to eq(
+ [post, post_2],
+ )
- expect(Search.execute('longan in:unseen', guardian: Guardian.new(post_2.user)).posts.sort)
- .to eq([post, post_2])
+ expect(
+ Search.execute("longan in:unseen", guardian: Guardian.new(post_2.user)).posts.sort,
+ ).to eq([post, post_2])
- expect(Search.execute('longan in:unseen', guardian: Guardian.new(post.user)).posts)
- .to eq([post_2])
+ expect(Search.execute("longan in:unseen", guardian: Guardian.new(post.user)).posts).to eq(
+ [post_2],
+ )
- expect(Search.execute('longan IN:UNSEEN', guardian: Guardian.new(post.user)).posts)
- .to eq([post_2])
+ expect(Search.execute("longan IN:UNSEEN", guardian: Guardian.new(post.user)).posts).to eq(
+ [post_2],
+ )
end
- it 'supports before and after filters' do
- time = Time.zone.parse('2001-05-20 2:55')
+ it "supports before and after filters" do
+ time = Time.zone.parse("2001-05-20 2:55")
freeze_time(time)
- post_1 = Fabricate(:post, raw: 'hi this is a test 123 123', created_at: time.months_ago(2))
- post_2 = Fabricate(:post, raw: 'boom boom shake the room test')
+ post_1 = Fabricate(:post, raw: "hi this is a test 123 123", created_at: time.months_ago(2))
+ post_2 = Fabricate(:post, raw: "boom boom shake the room test")
- expect(Search.execute('test before:1').posts).to contain_exactly(post_1)
- expect(Search.execute('test before:2001-04-20').posts).to contain_exactly(post_1)
- expect(Search.execute('test before:2001').posts).to eq([])
- expect(Search.execute('test after:2001').posts).to contain_exactly(post_1, post_2)
- expect(Search.execute('test before:monday').posts).to contain_exactly(post_1)
- expect(Search.execute('test after:jan').posts).to contain_exactly(post_1, post_2)
+ expect(Search.execute("test before:1").posts).to contain_exactly(post_1)
+ expect(Search.execute("test before:2001-04-20").posts).to contain_exactly(post_1)
+ expect(Search.execute("test before:2001").posts).to eq([])
+ expect(Search.execute("test after:2001").posts).to contain_exactly(post_1, post_2)
+ expect(Search.execute("test before:monday").posts).to contain_exactly(post_1)
+ expect(Search.execute("test after:jan").posts).to contain_exactly(post_1, post_2)
end
- it 'supports in:first, user:, @username' do
- post_1 = Fabricate(:post, raw: 'hi this is a test 123 123', topic: topic)
- post_2 = Fabricate(:post, raw: 'boom boom shake the room test', topic: topic)
+ it "supports in:first, user:, @username" do
+ post_1 = Fabricate(:post, raw: "hi this is a test 123 123", topic: topic)
+ post_2 = Fabricate(:post, raw: "boom boom shake the room test", topic: topic)
- expect(Search.execute('test in:first').posts).to contain_exactly(post_1)
- expect(Search.execute('test IN:FIRST').posts).to contain_exactly(post_1)
+ expect(Search.execute("test in:first").posts).to contain_exactly(post_1)
+ expect(Search.execute("test IN:FIRST").posts).to contain_exactly(post_1)
- expect(Search.execute('boom').posts).to contain_exactly(post_2)
+ expect(Search.execute("boom").posts).to contain_exactly(post_2)
- expect(Search.execute('boom in:first').posts).to eq([])
- expect(Search.execute('boom f').posts).to eq([])
+ expect(Search.execute("boom in:first").posts).to eq([])
+ expect(Search.execute("boom f").posts).to eq([])
- expect(Search.execute('123 in:first').posts).to contain_exactly(post_1)
- expect(Search.execute('123 f').posts).to contain_exactly(post_1)
+ expect(Search.execute("123 in:first").posts).to contain_exactly(post_1)
+ expect(Search.execute("123 f").posts).to contain_exactly(post_1)
- expect(Search.execute('user:nobody').posts).to eq([])
+ expect(Search.execute("user:nobody").posts).to eq([])
expect(Search.execute("user:#{post_1.user.username}").posts).to contain_exactly(post_1)
expect(Search.execute("user:#{post_1.user_id}").posts).to contain_exactly(post_1)
@@ -1630,7 +1722,7 @@ RSpec.describe Search do
SiteSetting.unicode_usernames = true
unicode_user = Fabricate(:unicode_user)
- post_3 = Fabricate(:post, user: unicode_user, raw: 'post by a unicode user', topic: topic)
+ post_3 = Fabricate(:post, user: unicode_user, raw: "post by a unicode user", topic: topic)
expect(Search.execute("@#{post_3.user.username}").posts).to contain_exactly(post_3)
end
@@ -1642,263 +1734,307 @@ RSpec.describe Search do
fab!(:user_3) { Fabricate(:user) }
fab!(:group) { Fabricate(:group, name: "Like_a_Boss").tap { |g| g.add(user) } }
fab!(:group_2) { Fabricate(:group).tap { |g| g.add(user_2) } }
- let!(:post) { Fabricate(:post, raw: 'hi this is a test 123 123', topic: topic, user: user) }
+ let!(:post) { Fabricate(:post, raw: "hi this is a test 123 123", topic: topic, user: user) }
let!(:post_2) { Fabricate(:post, user: user_2) }
- it 'should not return any posts if group does not exist' do
+ it "should not return any posts if group does not exist" do
group.update!(
visibility_level: Group.visibility_levels[:public],
- members_visibility_level: Group.visibility_levels[:public]
+ members_visibility_level: Group.visibility_levels[:public],
)
- expect(Search.execute('group:99999').posts).to eq([])
+ expect(Search.execute("group:99999").posts).to eq([])
end
- it 'should return the right posts for a public group' do
+ it "should return the right posts for a public group" do
group.update!(
visibility_level: Group.visibility_levels[:public],
- members_visibility_level: Group.visibility_levels[:public]
+ members_visibility_level: Group.visibility_levels[:public],
)
- expect(Search.execute('group:like_a_boss').posts).to contain_exactly(post)
+ expect(Search.execute("group:like_a_boss").posts).to contain_exactly(post)
expect(Search.execute("group:#{group.id}").posts).to contain_exactly(post)
end
it "should return the right posts for a public group with members' visibility restricted to logged on users" do
group.update!(
visibility_level: Group.visibility_levels[:public],
- members_visibility_level: Group.visibility_levels[:logged_on_users]
+ members_visibility_level: Group.visibility_levels[:logged_on_users],
)
expect(Search.execute("group:#{group.id}").posts).to eq([])
- expect(Search.execute("group:#{group.id}", guardian: Guardian.new(user_3)).posts).to contain_exactly(post)
+ expect(
+ Search.execute("group:#{group.id}", guardian: Guardian.new(user_3)).posts,
+ ).to contain_exactly(post)
end
it "should return the right posts for a group with visibility restricted to logged on users with members' visibility restricted to members" do
group.update!(
visibility_level: Group.visibility_levels[:logged_on_users],
- members_visibility_level: Group.visibility_levels[:members]
+ members_visibility_level: Group.visibility_levels[:members],
)
expect(Search.execute("group:#{group.id}").posts).to eq([])
expect(Search.execute("group:#{group.id}", guardian: Guardian.new(user_3)).posts).to eq([])
- expect(Search.execute("group:#{group.id}", guardian: Guardian.new(user)).posts).to contain_exactly(post)
+ expect(
+ Search.execute("group:#{group.id}", guardian: Guardian.new(user)).posts,
+ ).to contain_exactly(post)
end
end
- it 'supports badge' do
+ it "supports badge" do
topic = Fabricate(:topic, created_at: 3.months.ago)
- post = Fabricate(:post, raw: 'hi this is a test 123 123', topic: topic)
+ post = Fabricate(:post, raw: "hi this is a test 123 123", topic: topic)
badge = Badge.create!(name: "Like a Boss", badge_type_id: 1)
- UserBadge.create!(user_id: post.user_id, badge_id: badge.id, granted_at: 1.minute.ago, granted_by_id: -1)
+ UserBadge.create!(
+ user_id: post.user_id,
+ badge_id: badge.id,
+ granted_at: 1.minute.ago,
+ granted_by_id: -1,
+ )
expect(Search.execute('badge:"like a boss"').posts.length).to eq(1)
expect(Search.execute('BADGE:"LIKE A BOSS"').posts.length).to eq(1)
expect(Search.execute('badge:"test"').posts.length).to eq(0)
end
- it 'can match exact phrases' do
- post = Fabricate(:post, raw: %{this is a test post with 'a URL https://some.site.com/search?q=test.test.test some random text I have to add})
- post2 = Fabricate(:post, raw: 'test URL post with')
+ it "can match exact phrases" do
+ post =
+ Fabricate(
+ :post,
+ raw:
+ "this is a test post with 'a URL https://some.site.com/search?q=test.test.test some random text I have to add",
+ )
+ post2 = Fabricate(:post, raw: "test URL post with")
expect(Search.execute("test post with 'a URL).posts").posts).to eq([post2, post])
expect(Search.execute(%{"test post with 'a URL"}).posts).to eq([post])
expect(Search.execute(%{"https://some.site.com/search?q=test.test.test"}).posts).to eq([post])
- expect(Search.execute(%{" with 'a URL https://some.site.com/search?q=test.test.test"}).posts).to eq([post])
+ expect(
+ Search.execute(%{" with 'a URL https://some.site.com/search?q=test.test.test"}).posts,
+ ).to eq([post])
end
- it 'can search numbers correctly, and match exact phrases' do
- post = Fabricate(:post, raw: '3.0 eta is in 2 days horrah')
- post2 = Fabricate(:post, raw: '3.0 is eta in 2 days horrah')
+ it "can search numbers correctly, and match exact phrases" do
+ post = Fabricate(:post, raw: "3.0 eta is in 2 days horrah")
+ post2 = Fabricate(:post, raw: "3.0 is eta in 2 days horrah")
- expect(Search.execute('3.0 eta').posts).to eq([post, post2])
+ expect(Search.execute("3.0 eta").posts).to eq([post, post2])
expect(Search.execute("'3.0 eta'").posts).to eq([post, post2])
expect(Search.execute("\"3.0 eta\"").posts).to contain_exactly(post)
expect(Search.execute('"3.0, eta is"').posts).to eq([])
end
- it 'can find by status' do
+ it "can find by status" do
public_category = Fabricate(:category, read_restricted: false)
- post = Fabricate(:post, raw: 'hi this is a test 123 123')
+ post = Fabricate(:post, raw: "hi this is a test 123 123")
topic = post.topic
topic.update(category: public_category)
private_category = Fabricate(:category, read_restricted: true)
- post2 = Fabricate(:post, raw: 'hi this is another test 123 123')
+ post2 = Fabricate(:post, raw: "hi this is another test 123 123")
second_topic = post2.topic
second_topic.update(category: private_category)
_post3 = Fabricate(:post, raw: "another test!", user: topic.user, topic: second_topic)
- expect(Search.execute('test status:public').posts.length).to eq(1)
- expect(Search.execute('test status:closed').posts.length).to eq(0)
- expect(Search.execute('test status:open').posts.length).to eq(1)
- expect(Search.execute('test STATUS:OPEN').posts.length).to eq(1)
- expect(Search.execute('test posts_count:1').posts.length).to eq(1)
- expect(Search.execute('test min_post_count:1').posts.length).to eq(1)
- expect(Search.execute('test min_posts:1').posts.length).to eq(1)
- expect(Search.execute('test max_posts:2').posts.length).to eq(1)
+ expect(Search.execute("test status:public").posts.length).to eq(1)
+ expect(Search.execute("test status:closed").posts.length).to eq(0)
+ expect(Search.execute("test status:open").posts.length).to eq(1)
+ expect(Search.execute("test STATUS:OPEN").posts.length).to eq(1)
+ expect(Search.execute("test posts_count:1").posts.length).to eq(1)
+ expect(Search.execute("test min_post_count:1").posts.length).to eq(1)
+ expect(Search.execute("test min_posts:1").posts.length).to eq(1)
+ expect(Search.execute("test max_posts:2").posts.length).to eq(1)
topic.update(closed: true)
second_topic.update(category: public_category)
- expect(Search.execute('test status:public').posts.length).to eq(2)
- expect(Search.execute('test status:closed').posts.length).to eq(1)
- expect(Search.execute('status:closed').posts.length).to eq(1)
- expect(Search.execute('test status:open').posts.length).to eq(1)
+ expect(Search.execute("test status:public").posts.length).to eq(2)
+ expect(Search.execute("test status:closed").posts.length).to eq(1)
+ expect(Search.execute("status:closed").posts.length).to eq(1)
+ expect(Search.execute("test status:open").posts.length).to eq(1)
topic.update(archived: true, closed: false)
second_topic.update(closed: true)
- expect(Search.execute('test status:archived').posts.length).to eq(1)
- expect(Search.execute('test status:open').posts.length).to eq(0)
+ expect(Search.execute("test status:archived").posts.length).to eq(1)
+ expect(Search.execute("test status:open").posts.length).to eq(0)
- expect(Search.execute('test status:noreplies').posts.length).to eq(1)
+ expect(Search.execute("test status:noreplies").posts.length).to eq(1)
- expect(Search.execute('test in:likes', guardian: Guardian.new(topic.user)).posts.length).to eq(0)
+ expect(
+ Search.execute("test in:likes", guardian: Guardian.new(topic.user)).posts.length,
+ ).to eq(0)
- expect(Search.execute('test in:posted', guardian: Guardian.new(topic.user)).posts.length).to eq(2)
- expect(Search.execute('test In:PoStEd', guardian: Guardian.new(topic.user)).posts.length).to eq(2)
+ expect(
+ Search.execute("test in:posted", guardian: Guardian.new(topic.user)).posts.length,
+ ).to eq(2)
+ expect(
+ Search.execute("test In:PoStEd", guardian: Guardian.new(topic.user)).posts.length,
+ ).to eq(2)
- in_created = Search.execute('test in:created', guardian: Guardian.new(topic.user)).posts
- created_by_user = Search.execute("test created:@#{topic.user.username}", guardian: Guardian.new(topic.user)).posts
+ in_created = Search.execute("test in:created", guardian: Guardian.new(topic.user)).posts
+ created_by_user =
+ Search.execute(
+ "test created:@#{topic.user.username}",
+ guardian: Guardian.new(topic.user),
+ ).posts
expect(in_created.length).to eq(1)
expect(created_by_user.length).to eq(1)
expect(in_created).to eq(created_by_user)
- expect(Search.execute("test created:@#{second_topic.user.username}", guardian: Guardian.new(topic.user)).posts.length).to eq(1)
+ expect(
+ Search
+ .execute(
+ "test created:@#{second_topic.user.username}",
+ guardian: Guardian.new(topic.user),
+ )
+ .posts
+ .length,
+ ).to eq(1)
new_user = Fabricate(:user)
- expect(Search.execute("test created:@#{new_user.username}", guardian: Guardian.new(topic.user)).posts.length).to eq(0)
+ expect(
+ Search
+ .execute("test created:@#{new_user.username}", guardian: Guardian.new(topic.user))
+ .posts
+ .length,
+ ).to eq(0)
- TopicUser.change(topic.user.id, topic.id, notification_level: TopicUser.notification_levels[:tracking])
- expect(Search.execute('test in:watching', guardian: Guardian.new(topic.user)).posts.length).to eq(0)
- expect(Search.execute('test in:tracking', guardian: Guardian.new(topic.user)).posts.length).to eq(1)
+ TopicUser.change(
+ topic.user.id,
+ topic.id,
+ notification_level: TopicUser.notification_levels[:tracking],
+ )
+ expect(
+ Search.execute("test in:watching", guardian: Guardian.new(topic.user)).posts.length,
+ ).to eq(0)
+ expect(
+ Search.execute("test in:tracking", guardian: Guardian.new(topic.user)).posts.length,
+ ).to eq(1)
end
- it 'can find posts with images' do
+ it "can find posts with images" do
post_uploaded = Fabricate(:post_with_uploaded_image)
Fabricate(:post)
CookedPostProcessor.new(post_uploaded).update_post_image
- expect(Search.execute('with:images').posts.map(&:id)).to contain_exactly(post_uploaded.id)
+ expect(Search.execute("with:images").posts.map(&:id)).to contain_exactly(post_uploaded.id)
end
- it 'can find by latest' do
- topic1 = Fabricate(:topic, title: 'I do not like that Sam I am')
+ it "can find by latest" do
+ topic1 = Fabricate(:topic, title: "I do not like that Sam I am")
post1 = Fabricate(:post, topic: topic1, created_at: 10.minutes.ago)
- post2 = Fabricate(:post, raw: 'that Sam I am, that Sam I am', created_at: 5.minutes.ago)
+ post2 = Fabricate(:post, raw: "that Sam I am, that Sam I am", created_at: 5.minutes.ago)
- expect(Search.execute('sam').posts.map(&:id)).to eq([post1.id, post2.id])
- expect(Search.execute('sam ORDER:LATEST').posts.map(&:id)).to eq([post2.id, post1.id])
- expect(Search.execute('sam l').posts.map(&:id)).to eq([post2.id, post1.id])
- expect(Search.execute('l sam').posts.map(&:id)).to eq([post2.id, post1.id])
+ expect(Search.execute("sam").posts.map(&:id)).to eq([post1.id, post2.id])
+ expect(Search.execute("sam ORDER:LATEST").posts.map(&:id)).to eq([post2.id, post1.id])
+ expect(Search.execute("sam l").posts.map(&:id)).to eq([post2.id, post1.id])
+ expect(Search.execute("l sam").posts.map(&:id)).to eq([post2.id, post1.id])
end
- it 'can order by topic creation' do
- today = Date.today
- yesterday = 1.day.ago
+ it "can order by topic creation" do
+ today = Date.today
+ yesterday = 1.day.ago
two_days_ago = 2.days.ago
category = Fabricate(:category_with_definition)
- old_topic = Fabricate(:topic,
- title: 'First Topic, testing the created_at sort',
- created_at: two_days_ago,
- category: category
- )
+ old_topic =
+ Fabricate(
+ :topic,
+ title: "First Topic, testing the created_at sort",
+ created_at: two_days_ago,
+ category: category,
+ )
- latest_topic = Fabricate(:topic,
- title: 'Second Topic, testing the created_at sort',
- created_at: yesterday,
- category: category
- )
+ latest_topic =
+ Fabricate(
+ :topic,
+ title: "Second Topic, testing the created_at sort",
+ created_at: yesterday,
+ category: category,
+ )
- old_relevant_topic_post = Fabricate(:post,
- topic: old_topic,
- created_at: yesterday,
- raw: 'Relevant Relevant Topic'
- )
+ old_relevant_topic_post =
+ Fabricate(:post, topic: old_topic, created_at: yesterday, raw: "Relevant Relevant Topic")
- latest_irrelevant_topic_post = Fabricate(:post,
- topic: latest_topic,
- created_at: today,
- raw: 'Not Relevant'
- )
+ latest_irrelevant_topic_post =
+ Fabricate(:post, topic: latest_topic, created_at: today, raw: "Not Relevant")
# Expecting the default results
- expect(Search.execute('Topic').posts.map(&:id)).to eq([
- old_relevant_topic_post.id,
- latest_irrelevant_topic_post.id,
- category.topic.first_post.id
- ])
+ expect(Search.execute("Topic").posts.map(&:id)).to eq(
+ [old_relevant_topic_post.id, latest_irrelevant_topic_post.id, category.topic.first_post.id],
+ )
# Expecting the ordered by topic creation results
- expect(Search.execute('Topic order:latest_topic').posts.map(&:id)).to eq([
- category.topic.first_post.id,
- latest_irrelevant_topic_post.id,
- old_relevant_topic_post.id
- ])
+ expect(Search.execute("Topic order:latest_topic").posts.map(&:id)).to eq(
+ [category.topic.first_post.id, latest_irrelevant_topic_post.id, old_relevant_topic_post.id],
+ )
end
- it 'can order by topic views' do
+ it "can order by topic views" do
topic = Fabricate(:topic, views: 1)
topic2 = Fabricate(:topic, views: 2)
- post = Fabricate(:post, raw: 'Topic', topic: topic)
- post2 = Fabricate(:post, raw: 'Topic', topic: topic2)
+ post = Fabricate(:post, raw: "Topic", topic: topic)
+ post2 = Fabricate(:post, raw: "Topic", topic: topic2)
- expect(Search.execute('Topic order:views').posts.map(&:id)).to eq([
- post2.id,
- post.id
- ])
+ expect(Search.execute("Topic order:views").posts.map(&:id)).to eq([post2.id, post.id])
end
- it 'can filter by topic views' do
+ it "can filter by topic views" do
topic = Fabricate(:topic, views: 100)
topic2 = Fabricate(:topic, views: 200)
- post = Fabricate(:post, raw: 'Topic', topic: topic)
- post2 = Fabricate(:post, raw: 'Topic', topic: topic2)
+ post = Fabricate(:post, raw: "Topic", topic: topic)
+ post2 = Fabricate(:post, raw: "Topic", topic: topic2)
- expect(Search.execute('Topic min_views:150').posts.map(&:id)).to eq([post2.id])
- expect(Search.execute('Topic max_views:150').posts.map(&:id)).to eq([post.id])
+ expect(Search.execute("Topic min_views:150").posts.map(&:id)).to eq([post2.id])
+ expect(Search.execute("Topic max_views:150").posts.map(&:id)).to eq([post.id])
end
- it 'can search for terms with dots' do
- post = Fabricate(:post, raw: 'Will.2000 Will.Bob.Bill...')
- expect(Search.execute('bill').posts.map(&:id)).to eq([post.id])
- expect(Search.execute('bob').posts.map(&:id)).to eq([post.id])
- expect(Search.execute('2000').posts.map(&:id)).to eq([post.id])
+ it "can search for terms with dots" do
+ post = Fabricate(:post, raw: "Will.2000 Will.Bob.Bill...")
+ expect(Search.execute("bill").posts.map(&:id)).to eq([post.id])
+ expect(Search.execute("bob").posts.map(&:id)).to eq([post.id])
+ expect(Search.execute("2000").posts.map(&:id)).to eq([post.id])
end
- it 'can search URLS correctly' do
- post = Fabricate(:post, raw: 'i like http://wb.camra.org.uk/latest#test so yay')
+ it "can search URLS correctly" do
+ post = Fabricate(:post, raw: "i like http://wb.camra.org.uk/latest#test so yay")
- expect(Search.execute('http://wb.camra.org.uk/latest#test').posts.map(&:id)).to eq([post.id])
- expect(Search.execute('camra').posts.map(&:id)).to eq([post.id])
- expect(Search.execute('http://wb').posts.map(&:id)).to eq([post.id])
- expect(Search.execute('wb.camra').posts.map(&:id)).to eq([post.id])
- expect(Search.execute('wb.camra.org').posts.map(&:id)).to eq([post.id])
- expect(Search.execute('org.uk').posts.map(&:id)).to eq([post.id])
- expect(Search.execute('camra.org.uk').posts.map(&:id)).to eq([post.id])
- expect(Search.execute('wb.camra.org.uk').posts.map(&:id)).to eq([post.id])
- expect(Search.execute('wb.camra.org.uk/latest').posts.map(&:id)).to eq([post.id])
- expect(Search.execute('/latest#test').posts.map(&:id)).to eq([post.id])
+ expect(Search.execute("http://wb.camra.org.uk/latest#test").posts.map(&:id)).to eq([post.id])
+ expect(Search.execute("camra").posts.map(&:id)).to eq([post.id])
+ expect(Search.execute("http://wb").posts.map(&:id)).to eq([post.id])
+ expect(Search.execute("wb.camra").posts.map(&:id)).to eq([post.id])
+ expect(Search.execute("wb.camra.org").posts.map(&:id)).to eq([post.id])
+ expect(Search.execute("org.uk").posts.map(&:id)).to eq([post.id])
+ expect(Search.execute("camra.org.uk").posts.map(&:id)).to eq([post.id])
+ expect(Search.execute("wb.camra.org.uk").posts.map(&:id)).to eq([post.id])
+ expect(Search.execute("wb.camra.org.uk/latest").posts.map(&:id)).to eq([post.id])
+ expect(Search.execute("/latest#test").posts.map(&:id)).to eq([post.id])
end
- it 'supports category slug and tags' do
+ it "supports category slug and tags" do
# main category
- category = Fabricate(:category_with_definition, name: 'category 24', slug: 'cateGory-24')
+ category = Fabricate(:category_with_definition, name: "category 24", slug: "cateGory-24")
topic = Fabricate(:topic, created_at: 3.months.ago, category: category)
- post = Fabricate(:post, raw: 'Sams first post', topic: topic)
+ post = Fabricate(:post, raw: "Sams first post", topic: topic)
- expect(Search.execute('sams post #categoRy-24').posts.length).to eq(1)
+ expect(Search.execute("sams post #categoRy-24").posts.length).to eq(1)
expect(Search.execute("sams post category:#{category.id}").posts.length).to eq(1)
- expect(Search.execute('sams post #categoRy-25').posts.length).to eq(0)
+ expect(Search.execute("sams post #categoRy-25").posts.length).to eq(0)
- sub_category = Fabricate(:category_with_definition, name: 'sub category', slug: 'sub-category', parent_category_id: category.id)
+ sub_category =
+ Fabricate(
+ :category_with_definition,
+ name: "sub category",
+ slug: "sub-category",
+ parent_category_id: category.id,
+ )
second_topic = Fabricate(:topic, created_at: 3.months.ago, category: sub_category)
- Fabricate(:post, raw: 'sams second post', topic: second_topic)
+ Fabricate(:post, raw: "sams second post", topic: second_topic)
expect(Search.execute("sams post category:categoRY-24").posts.length).to eq(2)
expect(Search.execute("sams post category:=cAtegory-24").posts.length).to eq(1)
@@ -1907,53 +2043,55 @@ RSpec.describe Search do
expect(Search.execute("sams post #=category-24").posts.length).to eq(1)
expect(Search.execute("sams post #sub-category").posts.length).to eq(1)
- expect(Search.execute("sams post #categoRY-24:SUB-category").posts.length)
- .to eq(1)
+ expect(Search.execute("sams post #categoRY-24:SUB-category").posts.length).to eq(1)
# tags
- topic.tags = [Fabricate(:tag, name: 'alpha'), Fabricate(:tag, name: 'привет'), Fabricate(:tag, name: 'HeLlO')]
- expect(Search.execute('this is a test #alpha').posts.map(&:id)).to eq([post.id])
- expect(Search.execute('this is a test #привет').posts.map(&:id)).to eq([post.id])
- expect(Search.execute('this is a test #hElLo').posts.map(&:id)).to eq([post.id])
- expect(Search.execute('this is a test #beta').posts.size).to eq(0)
+ topic.tags = [
+ Fabricate(:tag, name: "alpha"),
+ Fabricate(:tag, name: "привет"),
+ Fabricate(:tag, name: "HeLlO"),
+ ]
+ expect(Search.execute("this is a test #alpha").posts.map(&:id)).to eq([post.id])
+ expect(Search.execute("this is a test #привет").posts.map(&:id)).to eq([post.id])
+ expect(Search.execute("this is a test #hElLo").posts.map(&:id)).to eq([post.id])
+ expect(Search.execute("this is a test #beta").posts.size).to eq(0)
end
- it 'supports sub-sub category slugs' do
-
+ it "supports sub-sub category slugs" do
SiteSetting.max_category_nesting = 3
- category = Fabricate(:category, name: 'top', slug: 'top')
- sub = Fabricate(:category, name: 'middle', slug: 'middle', parent_category_id: category.id)
- leaf = Fabricate(:category, name: 'leaf', slug: 'leaf', parent_category_id: sub.id)
+ category = Fabricate(:category, name: "top", slug: "top")
+ sub = Fabricate(:category, name: "middle", slug: "middle", parent_category_id: category.id)
+ leaf = Fabricate(:category, name: "leaf", slug: "leaf", parent_category_id: sub.id)
topic = Fabricate(:topic, created_at: 3.months.ago, category: leaf)
- _post = Fabricate(:post, raw: 'Sams first post', topic: topic)
+ _post = Fabricate(:post, raw: "Sams first post", topic: topic)
- expect(Search.execute('#Middle:leaf first post').posts.size).to eq(1)
+ expect(Search.execute("#Middle:leaf first post").posts.size).to eq(1)
end
- it 'correctly handles #symbol when no tag or category match' do
- Fabricate(:post, raw: 'testing #1 #9998')
- results = Search.new('testing #1').execute
+ it "correctly handles #symbol when no tag or category match" do
+ Fabricate(:post, raw: "testing #1 #9998")
+ results = Search.new("testing #1").execute
expect(results.posts.length).to eq(1)
- results = Search.new('#9998').execute
+ results = Search.new("#9998").execute
expect(results.posts.length).to eq(1)
- results = Search.new('#nonexistent').execute
+ results = Search.new("#nonexistent").execute
expect(results.posts.length).to eq(0)
- results = Search.new('xxx #:').execute
+ results = Search.new("xxx #:").execute
expect(results.posts.length).to eq(0)
end
- context 'with tags' do
- fab!(:tag1) { Fabricate(:tag, name: 'lunch') }
- fab!(:tag2) { Fabricate(:tag, name: 'eggs') }
- fab!(:tag3) { Fabricate(:tag, name: 'sandwiches') }
+ context "with tags" do
+ fab!(:tag1) { Fabricate(:tag, name: "lunch") }
+ fab!(:tag2) { Fabricate(:tag, name: "eggs") }
+ fab!(:tag3) { Fabricate(:tag, name: "sandwiches") }
fab!(:tag_group) do
- group = TagGroup.create!(name: 'mid day')
+ group = TagGroup.create!(name: "mid day")
TagGroupMembership.create!(tag_id: tag1.id, tag_group_id: group.id)
TagGroupMembership.create!(tag_id: tag3.id, tag_group_id: group.id)
group
@@ -1976,80 +2114,103 @@ RSpec.describe Search do
fab!(:post4) { indexed_post(topic: topic4) }
fab!(:post5) { indexed_post(topic: topic5) }
- it 'can find posts by tag group' do
- expect(Search.execute('#mid-day').posts.map(&:id)).to eq([
- post5, post4, post3
- ].map(&:id))
+ it "can find posts by tag group" do
+ expect(Search.execute("#mid-day").posts.map(&:id)).to eq([post5, post4, post3].map(&:id))
end
- it 'can find posts with tag' do
- post4 = Fabricate(:post, topic: topic3, raw: "It probably doesn't help that they're green...")
+ it "can find posts with tag" do
+ post4 =
+ Fabricate(:post, topic: topic3, raw: "It probably doesn't help that they're green...")
- expect(Search.execute('green tags:eggs').posts.map(&:id)).to eq([post4.id])
- expect(Search.execute('tags:plants').posts.size).to eq(0)
+ expect(Search.execute("green tags:eggs").posts.map(&:id)).to eq([post4.id])
+ expect(Search.execute("tags:plants").posts.size).to eq(0)
end
- it 'can find posts with non-latin tag' do
- topic.tags = [Fabricate(:tag, name: 'さようなら')]
- post = Fabricate(:post, raw: 'Testing post', topic: topic)
+ it "can find posts with non-latin tag" do
+ topic.tags = [Fabricate(:tag, name: "さようなら")]
+ post = Fabricate(:post, raw: "Testing post", topic: topic)
- expect(Search.execute('tags:さようなら').posts.map(&:id)).to eq([post.id])
+ expect(Search.execute("tags:さようなら").posts.map(&:id)).to eq([post.id])
end
- it 'can find posts with thai tag' do
- topic.tags = [Fabricate(:tag, name: 'เรซิ่น')]
- post = Fabricate(:post, raw: 'Testing post', topic: topic)
+ it "can find posts with thai tag" do
+ topic.tags = [Fabricate(:tag, name: "เรซิ่น")]
+ post = Fabricate(:post, raw: "Testing post", topic: topic)
- expect(Search.execute('tags:เรซิ่น').posts.map(&:id)).to eq([post.id])
+ expect(Search.execute("tags:เรซิ่น").posts.map(&:id)).to eq([post.id])
end
- it 'can find posts with any tag from multiple tags' do
- expect(Search.execute('tags:eggs,lunch').posts.map(&:id).sort).to eq([post1.id, post2.id, post3.id, post4.id, post5.id].sort)
+ it "can find posts with any tag from multiple tags" do
+ expect(Search.execute("tags:eggs,lunch").posts.map(&:id).sort).to eq(
+ [post1.id, post2.id, post3.id, post4.id, post5.id].sort,
+ )
end
- it 'can find posts which contains all provided tags' do
- expect(Search.execute('tags:lunch+eggs+sandwiches').posts.map(&:id)).to eq([post4.id].sort)
- expect(Search.execute('tags:eggs+lunch+sandwiches').posts.map(&:id)).to eq([post4.id].sort)
+ it "can find posts which contains all provided tags" do
+ expect(Search.execute("tags:lunch+eggs+sandwiches").posts.map(&:id)).to eq([post4.id].sort)
+ expect(Search.execute("tags:eggs+lunch+sandwiches").posts.map(&:id)).to eq([post4.id].sort)
end
- it 'can find posts which contains provided tags and does not contain selected ones' do
- expect(Search.execute('tags:eggs -tags:lunch').posts.map(&:id))
- .to eq([post5, post2, post1].map(&:id))
+ it "can find posts which contains provided tags and does not contain selected ones" do
+ expect(Search.execute("tags:eggs -tags:lunch").posts.map(&:id)).to eq(
+ [post5, post2, post1].map(&:id),
+ )
- expect(Search.execute('tags:eggs -tags:lunch+sandwiches').posts.map(&:id))
- .to eq([post5, post3, post2, post1].map(&:id))
+ expect(Search.execute("tags:eggs -tags:lunch+sandwiches").posts.map(&:id)).to eq(
+ [post5, post3, post2, post1].map(&:id),
+ )
- expect(Search.execute('tags:eggs -tags:lunch,sandwiches').posts.map(&:id))
- .to eq([post2, post1].map(&:id))
+ expect(Search.execute("tags:eggs -tags:lunch,sandwiches").posts.map(&:id)).to eq(
+ [post2, post1].map(&:id),
+ )
end
- it 'orders posts correctly when combining tags with categories or terms' do
- cat1 = Fabricate(:category_with_definition, name: 'food')
+ it "orders posts correctly when combining tags with categories or terms" do
+ cat1 = Fabricate(:category_with_definition, name: "food")
topic6 = Fabricate(:topic, tags: [tag1, tag2], category: cat1)
topic7 = Fabricate(:topic, tags: [tag1, tag2, tag3], category: cat1)
- post7 = Fabricate(:post, topic: topic6, raw: "Wakey, wakey, eggs and bakey.", like_count: 5, created_at: 2.minutes.ago)
- post8 = Fabricate(:post, topic: topic7, raw: "Bakey, bakey, eggs to makey.", like_count: 2, created_at: 1.minute.ago)
+ post7 =
+ Fabricate(
+ :post,
+ topic: topic6,
+ raw: "Wakey, wakey, eggs and bakey.",
+ like_count: 5,
+ created_at: 2.minutes.ago,
+ )
+ post8 =
+ Fabricate(
+ :post,
+ topic: topic7,
+ raw: "Bakey, bakey, eggs to makey.",
+ like_count: 2,
+ created_at: 1.minute.ago,
+ )
- expect(Search.execute('bakey tags:lunch order:latest').posts.map(&:id))
- .to eq([post8.id, post7.id])
+ expect(Search.execute("bakey tags:lunch order:latest").posts.map(&:id)).to eq(
+ [post8.id, post7.id],
+ )
- expect(Search.execute('#food tags:lunch order:latest').posts.map(&:id))
- .to eq([post8.id, post7.id])
+ expect(Search.execute("#food tags:lunch order:latest").posts.map(&:id)).to eq(
+ [post8.id, post7.id],
+ )
- expect(Search.execute('#food tags:lunch order:likes').posts.map(&:id))
- .to eq([post7.id, post8.id])
+ expect(Search.execute("#food tags:lunch order:likes").posts.map(&:id)).to eq(
+ [post7.id, post8.id],
+ )
end
-
end
it "can find posts which contains filetypes" do
post1 = Fabricate(:post, raw: "http://example.com/image.png")
- post2 = Fabricate(:post,
- raw: "Discourse logo\n"\
- "http://example.com/logo.png\n"\
- "http://example.com/vector_image.svg"
- )
+ post2 =
+ Fabricate(
+ :post,
+ raw:
+ "Discourse logo\n" \
+ "http://example.com/logo.png\n" \
+ "http://example.com/vector_image.svg",
+ )
post_with_upload = Fabricate(:post, uploads: [Fabricate(:upload)])
Fabricate(:post)
@@ -2057,18 +2218,18 @@ RSpec.describe Search do
TopicLink.extract_from(post1)
TopicLink.extract_from(post2)
- expect(Search.execute('filetype:svg').posts).to eq([post2])
+ expect(Search.execute("filetype:svg").posts).to eq([post2])
- expect(Search.execute('filetype:png').posts.map(&:id)).to eq([
- post_with_upload, post2, post1
- ].map(&:id))
+ expect(Search.execute("filetype:png").posts.map(&:id)).to eq(
+ [post_with_upload, post2, post1].map(&:id),
+ )
- expect(Search.execute('logo filetype:png').posts).to eq([post2])
+ expect(Search.execute("logo filetype:png").posts).to eq([post2])
end
end
- describe '#ts_query' do
- it 'can parse complex strings using ts_query helper' do
+ describe "#ts_query" do
+ it "can parse complex strings using ts_query helper" do
str = +" grigio:babel deprecated? "
str << "page page on Atmosphere](https://atmospherejs.com/grigio/babel)xxx: aaa.js:222 aaa'\"bbb"
@@ -2080,40 +2241,42 @@ RSpec.describe Search do
expect(ts_query).to include("baz")
end
- it 'escapes the term correctly' do
- expect(Search.ts_query(term: 'Title with trailing backslash\\'))
- .to eq("TO_TSQUERY('english', '''Title with trailing backslash\\\\\\\\'':*')")
+ it "escapes the term correctly" do
+ expect(Search.ts_query(term: 'Title with trailing backslash\\')).to eq(
+ "TO_TSQUERY('english', '''Title with trailing backslash\\\\\\\\'':*')",
+ )
- expect(Search.ts_query(term: "Title with trailing quote'"))
- .to eq("TO_TSQUERY('english', '''Title with trailing quote'''''':*')")
+ expect(Search.ts_query(term: "Title with trailing quote'")).to eq(
+ "TO_TSQUERY('english', '''Title with trailing quote'''''':*')",
+ )
end
end
- describe '#word_to_date' do
- it 'parses relative dates correctly' do
- time = Time.zone.parse('2001-02-20 2:55')
+ describe "#word_to_date" do
+ it "parses relative dates correctly" do
+ time = Time.zone.parse("2001-02-20 2:55")
freeze_time(time)
- expect(Search.word_to_date('yesterday')).to eq(time.beginning_of_day.yesterday)
- expect(Search.word_to_date('suNday')).to eq(Time.zone.parse('2001-02-18'))
- expect(Search.word_to_date('thursday')).to eq(Time.zone.parse('2001-02-15'))
- expect(Search.word_to_date('deCember')).to eq(Time.zone.parse('2000-12-01'))
- expect(Search.word_to_date('deC')).to eq(Time.zone.parse('2000-12-01'))
- expect(Search.word_to_date('january')).to eq(Time.zone.parse('2001-01-01'))
- expect(Search.word_to_date('jan')).to eq(Time.zone.parse('2001-01-01'))
+ expect(Search.word_to_date("yesterday")).to eq(time.beginning_of_day.yesterday)
+ expect(Search.word_to_date("suNday")).to eq(Time.zone.parse("2001-02-18"))
+ expect(Search.word_to_date("thursday")).to eq(Time.zone.parse("2001-02-15"))
+ expect(Search.word_to_date("deCember")).to eq(Time.zone.parse("2000-12-01"))
+ expect(Search.word_to_date("deC")).to eq(Time.zone.parse("2000-12-01"))
+ expect(Search.word_to_date("january")).to eq(Time.zone.parse("2001-01-01"))
+ expect(Search.word_to_date("jan")).to eq(Time.zone.parse("2001-01-01"))
- expect(Search.word_to_date('100')).to eq(time.beginning_of_day.days_ago(100))
+ expect(Search.word_to_date("100")).to eq(time.beginning_of_day.days_ago(100))
- expect(Search.word_to_date('invalid')).to eq(nil)
+ expect(Search.word_to_date("invalid")).to eq(nil)
end
- it 'parses absolute dates correctly' do
- expect(Search.word_to_date('2001-1-20')).to eq(Time.zone.parse('2001-01-20'))
- expect(Search.word_to_date('2030-10-2')).to eq(Time.zone.parse('2030-10-02'))
- expect(Search.word_to_date('2030-10')).to eq(Time.zone.parse('2030-10-01'))
- expect(Search.word_to_date('2030')).to eq(Time.zone.parse('2030-01-01'))
- expect(Search.word_to_date('2030-01-32')).to eq(nil)
- expect(Search.word_to_date('10000')).to eq(nil)
+ it "parses absolute dates correctly" do
+ expect(Search.word_to_date("2001-1-20")).to eq(Time.zone.parse("2001-01-20"))
+ expect(Search.word_to_date("2030-10-2")).to eq(Time.zone.parse("2030-10-02"))
+ expect(Search.word_to_date("2030-10")).to eq(Time.zone.parse("2030-10-01"))
+ expect(Search.word_to_date("2030")).to eq(Time.zone.parse("2030-01-01"))
+ expect(Search.word_to_date("2030-01-32")).to eq(nil)
+ expect(Search.word_to_date("10000")).to eq(nil)
end
end
@@ -2136,110 +2299,104 @@ RSpec.describe Search do
describe "search_log_id" do
it "returns an id when the search succeeds" do
- s = Search.new(
- 'indiana jones',
- search_type: :header,
- ip_address: '127.0.0.1'
- )
+ s = Search.new("indiana jones", search_type: :header, ip_address: "127.0.0.1")
results = s.execute
expect(results.search_log_id).to be_present
end
it "does not log search if search_type is not present" do
- s = Search.new('foo bar', ip_address: '127.0.0.1')
+ s = Search.new("foo bar", ip_address: "127.0.0.1")
results = s.execute
expect(results.search_log_id).not_to be_present
end
end
- describe 'in:title' do
- it 'allows for search in title' do
- topic = Fabricate(:topic, title: 'I am testing a title search')
- _post2 = Fabricate(:post, topic: topic, raw: 'this is the second post', post_number: 2)
- post = Fabricate(:post, topic: topic, raw: 'this is the first post', post_number: 1)
+ describe "in:title" do
+ it "allows for search in title" do
+ topic = Fabricate(:topic, title: "I am testing a title search")
+ _post2 = Fabricate(:post, topic: topic, raw: "this is the second post", post_number: 2)
+ post = Fabricate(:post, topic: topic, raw: "this is the first post", post_number: 1)
- results = Search.execute('title in:title')
+ results = Search.execute("title in:title")
expect(results.posts.map(&:id)).to eq([post.id])
- results = Search.execute('title iN:tItLe')
+ results = Search.execute("title iN:tItLe")
expect(results.posts.map(&:id)).to eq([post.id])
- results = Search.execute('first in:title')
+ results = Search.execute("first in:title")
expect(results.posts).to eq([])
end
- it 'works irrespective of the order' do
+ it "works irrespective of the order" do
topic = Fabricate(:topic, title: "A topic about Discourse")
Fabricate(:post, topic: topic, raw: "This is another post")
topic2 = Fabricate(:topic, title: "This is another topic")
Fabricate(:post, topic: topic2, raw: "Discourse is awesome")
- results = Search.execute('Discourse in:title status:open')
+ results = Search.execute("Discourse in:title status:open")
expect(results.posts.length).to eq(1)
- results = Search.execute('in:title status:open Discourse')
+ results = Search.execute("in:title status:open Discourse")
expect(results.posts.length).to eq(1)
end
end
- describe 'ignore_diacritics' do
+ describe "ignore_diacritics" do
before { SiteSetting.search_ignore_accents = true }
- let!(:post1) { Fabricate(:post, raw: 'สวัสดี Rágis hello') }
+ let!(:post1) { Fabricate(:post, raw: "สวัสดี Rágis hello") }
- it ('allows strips correctly') do
- results = Search.execute('hello', type_filter: 'topic')
+ it ("allows strips correctly") do
+ results = Search.execute("hello", type_filter: "topic")
expect(results.posts.length).to eq(1)
- results = Search.execute('ragis', type_filter: 'topic')
+ results = Search.execute("ragis", type_filter: "topic")
expect(results.posts.length).to eq(1)
- results = Search.execute('Rágis', type_filter: 'topic')
+ results = Search.execute("Rágis", type_filter: "topic")
expect(results.posts.length).to eq(1)
# TODO: this is a test we need to fix!
#expect(results.blurb(results.posts.first)).to include('Rágis')
- results = Search.execute('สวัสดี', type_filter: 'topic')
+ results = Search.execute("สวัสดี", type_filter: "topic")
expect(results.posts.length).to eq(1)
end
end
- describe 'include_diacritics' do
+ describe "include_diacritics" do
before { SiteSetting.search_ignore_accents = false }
- let!(:post1) { Fabricate(:post, raw: 'สวัสดี Régis hello') }
+ let!(:post1) { Fabricate(:post, raw: "สวัสดี Régis hello") }
- it ('allows strips correctly') do
- results = Search.execute('hello', type_filter: 'topic')
+ it ("allows strips correctly") do
+ results = Search.execute("hello", type_filter: "topic")
expect(results.posts.length).to eq(1)
- results = Search.execute('regis', type_filter: 'topic')
+ results = Search.execute("regis", type_filter: "topic")
expect(results.posts.length).to eq(0)
- results = Search.execute('Régis', type_filter: 'topic')
+ results = Search.execute("Régis", type_filter: "topic")
expect(results.posts.length).to eq(1)
- expect(results.blurb(results.posts.first)).to include('Régis')
+ expect(results.blurb(results.posts.first)).to include("Régis")
- results = Search.execute('สวัสดี', type_filter: 'topic')
+ results = Search.execute("สวัสดี", type_filter: "topic")
expect(results.posts.length).to eq(1)
end
end
- describe 'pagination' do
+ describe "pagination" do
let(:number_of_results) { 2 }
- let!(:post1) { Fabricate(:post, raw: 'hello hello hello hello hello') }
- let!(:post2) { Fabricate(:post, raw: 'hello hello hello hello') }
- let!(:post3) { Fabricate(:post, raw: 'hello hello hello') }
- let!(:post4) { Fabricate(:post, raw: 'hello hello') }
- let!(:post5) { Fabricate(:post, raw: 'hello') }
+ let!(:post1) { Fabricate(:post, raw: "hello hello hello hello hello") }
+ let!(:post2) { Fabricate(:post, raw: "hello hello hello hello") }
+ let!(:post3) { Fabricate(:post, raw: "hello hello hello") }
+ let!(:post4) { Fabricate(:post, raw: "hello hello") }
+ let!(:post5) { Fabricate(:post, raw: "hello") }
- before do
- Search.stubs(:per_filter).returns(number_of_results)
- end
+ before { Search.stubs(:per_filter).returns(number_of_results) }
- it 'returns more results flag' do
- results = Search.execute('hello', search_type: :full_page, type_filter: 'topic')
- results2 = Search.execute('hello', search_type: :full_page, type_filter: 'topic', page: 2)
+ it "returns more results flag" do
+ results = Search.execute("hello", search_type: :full_page, type_filter: "topic")
+ results2 = Search.execute("hello", search_type: :full_page, type_filter: "topic", page: 2)
expect(results.posts.length).to eq(number_of_results)
expect(results.posts.map(&:id)).to eq([post1.id, post2.id])
@@ -2250,8 +2407,8 @@ RSpec.describe Search do
expect(results2.more_full_page_results).to eq(true)
end
- it 'correctly search with page parameter' do
- search = Search.new('hello', search_type: :full_page, type_filter: 'topic', page: 3)
+ it "correctly search with page parameter" do
+ search = Search.new("hello", search_type: :full_page, type_filter: "topic", page: 3)
results = search.execute
expect(search.offset).to eq(2 * number_of_results)
@@ -2260,31 +2417,31 @@ RSpec.describe Search do
expect(results.more_full_page_results).to eq(nil)
end
- it 'returns more results flag for header searches' do
- results = Search.execute('hello', search_type: :header)
+ it "returns more results flag for header searches" do
+ results = Search.execute("hello", search_type: :header)
expect(results.posts.length).to eq(Search.per_facet)
expect(results.more_posts).to eq(nil) # not 6 posts yet
- post6 = Fabricate(:post, raw: 'hello post #6')
+ post6 = Fabricate(:post, raw: "hello post #6")
- results = Search.execute('hello', search_type: :header)
+ results = Search.execute("hello", search_type: :header)
expect(results.posts.length).to eq(Search.per_facet)
expect(results.more_posts).to eq(true)
end
end
- describe 'header in-topic search' do
- let!(:topic) { Fabricate(:topic, title: 'This is a topic with a bunch of posts') }
- let!(:post1) { Fabricate(:post, topic: topic, raw: 'hola amiga') }
- let!(:post2) { Fabricate(:post, topic: topic, raw: 'hola amigo') }
- let!(:post3) { Fabricate(:post, topic: topic, raw: 'hola chica') }
- let!(:post4) { Fabricate(:post, topic: topic, raw: 'hola chico') }
- let!(:post5) { Fabricate(:post, topic: topic, raw: 'hola hermana') }
- let!(:post6) { Fabricate(:post, topic: topic, raw: 'hola hermano') }
- let!(:post7) { Fabricate(:post, topic: topic, raw: 'hola chiquito') }
+ describe "header in-topic search" do
+ let!(:topic) { Fabricate(:topic, title: "This is a topic with a bunch of posts") }
+ let!(:post1) { Fabricate(:post, topic: topic, raw: "hola amiga") }
+ let!(:post2) { Fabricate(:post, topic: topic, raw: "hola amigo") }
+ let!(:post3) { Fabricate(:post, topic: topic, raw: "hola chica") }
+ let!(:post4) { Fabricate(:post, topic: topic, raw: "hola chico") }
+ let!(:post5) { Fabricate(:post, topic: topic, raw: "hola hermana") }
+ let!(:post6) { Fabricate(:post, topic: topic, raw: "hola hermano") }
+ let!(:post7) { Fabricate(:post, topic: topic, raw: "hola chiquito") }
- it 'does not use per_facet pagination' do
- search = Search.new('hola', search_type: :header, search_context: topic)
+ it "does not use per_facet pagination" do
+ search = Search.new("hola", search_type: :header, search_context: topic)
results = search.execute
expect(results.posts.length).to eq(7)
@@ -2292,42 +2449,47 @@ RSpec.describe Search do
end
end
- describe 'in:tagged' do
- it 'allows for searching by presence of any tags' do
- topic = Fabricate(:topic, title: 'I am testing a tagged search')
- _post = Fabricate(:post, topic: topic, raw: 'this is the first post')
+ describe "in:tagged" do
+ it "allows for searching by presence of any tags" do
+ topic = Fabricate(:topic, title: "I am testing a tagged search")
+ _post = Fabricate(:post, topic: topic, raw: "this is the first post")
tag = Fabricate(:tag)
_topic_tag = Fabricate(:topic_tag, topic: topic, tag: tag)
- results = Search.execute('in:untagged')
+ results = Search.execute("in:untagged")
expect(results.posts.length).to eq(0)
- results = Search.execute('in:tagged')
+ results = Search.execute("in:tagged")
expect(results.posts.length).to eq(1)
- results = Search.execute('In:TaGgEd')
+ results = Search.execute("In:TaGgEd")
expect(results.posts.length).to eq(1)
end
end
- describe 'in:untagged' do
- it 'allows for searching by presence of no tags' do
- topic = Fabricate(:topic, title: 'I am testing a untagged search')
- _post = Fabricate(:post, topic: topic, raw: 'this is the first post')
+ describe "in:untagged" do
+ it "allows for searching by presence of no tags" do
+ topic = Fabricate(:topic, title: "I am testing a untagged search")
+ _post = Fabricate(:post, topic: topic, raw: "this is the first post")
- results = Search.execute('iN:uNtAgGeD')
+ results = Search.execute("iN:uNtAgGeD")
expect(results.posts.length).to eq(1)
- results = Search.execute('in:tagged')
+ results = Search.execute("in:tagged")
expect(results.posts.length).to eq(0)
end
end
- describe 'plugin extensions' do
- let!(:post0) { Fabricate(:post, raw: 'this is the first post about advanced filter with length more than 50 chars') }
- let!(:post1) { Fabricate(:post, raw: 'this is the second post about advanced filter') }
+ describe "plugin extensions" do
+ let!(:post0) do
+ Fabricate(
+ :post,
+ raw: "this is the first post about advanced filter with length more than 50 chars",
+ )
+ end
+ let!(:post1) { Fabricate(:post, raw: "this is the second post about advanced filter") }
- it 'allows to define custom filter' do
+ it "allows to define custom filter" do
expect(Search.new("advanced").execute.posts).to eq([post1, post0])
Search.advanced_filter(/^min_chars:(\d+)$/) do |posts, match|
posts.where("(SELECT LENGTH(p2.raw) FROM posts p2 WHERE p2.id = posts.id) >= ?", match.to_i)
@@ -2335,28 +2497,26 @@ RSpec.describe Search do
expect(Search.new("advanced min_chars:50").execute.posts).to eq([post0])
end
- it 'allows to define custom order' do
+ it "allows to define custom order" do
expect(Search.new("advanced").execute.posts).to eq([post1, post0])
- Search.advanced_order(:chars) do |posts|
- posts.reorder("MAX(LENGTH(posts.raw)) DESC")
- end
+ Search.advanced_order(:chars) { |posts| posts.reorder("MAX(LENGTH(posts.raw)) DESC") }
expect(Search.new("advanced order:chars").execute.posts).to eq([post0, post1])
end
end
- describe 'exclude_topics filter' do
+ describe "exclude_topics filter" do
before { SiteSetting.tagging_enabled = true }
let!(:user) { Fabricate(:user) }
- fab!(:group) { Fabricate(:group, name: 'bruce-world-fans') }
- fab!(:topic) { Fabricate(:topic, title: 'Bruce topic not a result') }
+ fab!(:group) { Fabricate(:group, name: "bruce-world-fans") }
+ fab!(:topic) { Fabricate(:topic, title: "Bruce topic not a result") }
- it 'works' do
- category = Fabricate(:category_with_definition, name: 'bruceland', user: user)
- tag = Fabricate(:tag, name: 'brucealicious')
+ it "works" do
+ category = Fabricate(:category_with_definition, name: "bruceland", user: user)
+ tag = Fabricate(:tag, name: "brucealicious")
- result = Search.execute('bruce', type_filter: 'exclude_topics')
+ result = Search.execute("bruce", type_filter: "exclude_topics")
expect(result.users.map(&:id)).to contain_exactly(user.id)
@@ -2369,8 +2529,8 @@ RSpec.describe Search do
expect(result.posts.length).to eq(0)
end
- it 'does not fail when parsed term is empty' do
- result = Search.execute('#cat ', type_filter: 'exclude_topics')
+ it "does not fail when parsed term is empty" do
+ result = Search.execute("#cat ", type_filter: "exclude_topics")
expect(result.categories.length).to eq(0)
end
end
diff --git a/spec/lib/second_factor/actions/discourse_connect_provider_spec.rb b/spec/lib/second_factor/actions/discourse_connect_provider_spec.rb
index 11dd7d2b3bd..30cef7a6602 100644
--- a/spec/lib/second_factor/actions/discourse_connect_provider_spec.rb
+++ b/spec/lib/second_factor/actions/discourse_connect_provider_spec.rb
@@ -22,11 +22,9 @@ RSpec.describe SecondFactor::Actions::DiscourseConnectProvider do
end
def create_request(query_string)
- ActionDispatch::TestRequest.create({
- "REQUEST_METHOD" => "GET",
- "PATH_INFO" => "/",
- "QUERY_STRING" => query_string
- })
+ ActionDispatch::TestRequest.create(
+ { "REQUEST_METHOD" => "GET", "PATH_INFO" => "/", "QUERY_STRING" => query_string },
+ )
end
def params_from_payload(payload)
@@ -85,19 +83,16 @@ RSpec.describe SecondFactor::Actions::DiscourseConnectProvider do
request = create_request(sso.payload)
params = params_from_payload(sso.payload)
action = create_instance(user, request)
- expect(action.second_factor_auth_skipped!(params)).to eq({
- logout: true,
- return_sso_url: "http://hobbit.shire.com/sso"
- })
+ expect(action.second_factor_auth_skipped!(params)).to eq(
+ { logout: true, return_sso_url: "http://hobbit.shire.com/sso" },
+ )
end
it "returns a hash with no_current_user: true if there's no current_user" do
request = create_request(sso.payload)
params = params_from_payload(sso.payload)
action = create_instance(nil, request)
- expect(action.second_factor_auth_skipped!(params)).to eq({
- no_current_user: true
- })
+ expect(action.second_factor_auth_skipped!(params)).to eq({ no_current_user: true })
end
it "returns sso_redirect_url to the SSO website with payload that indicates confirmed 2FA if confirmed_2fa_during_login is true" do
@@ -133,10 +128,9 @@ RSpec.describe SecondFactor::Actions::DiscourseConnectProvider do
request = create_request(sso.payload)
params = params_from_payload(sso.payload)
action = create_instance(nil, request)
- expect(action.second_factor_auth_skipped!(params)).to eq({
- logout: true,
- return_sso_url: "http://hobbit.shire.com/sso"
- })
+ expect(action.second_factor_auth_skipped!(params)).to eq(
+ { logout: true, return_sso_url: "http://hobbit.shire.com/sso" },
+ )
end
end
@@ -195,10 +189,12 @@ RSpec.describe SecondFactor::Actions::DiscourseConnectProvider do
end
it "includes a description" do
- expect(output[:description]).to eq(I18n.t(
- "second_factor_auth.actions.discourse_connect_provider.description",
- hostname: "hobbit.shire.com",
- ))
+ expect(output[:description]).to eq(
+ I18n.t(
+ "second_factor_auth.actions.discourse_connect_provider.description",
+ hostname: "hobbit.shire.com",
+ ),
+ )
end
end
diff --git a/spec/lib/second_factor/actions/grant_admin_spec.rb b/spec/lib/second_factor/actions/grant_admin_spec.rb
index 1c50c898f2e..d671a583b4c 100644
--- a/spec/lib/second_factor/actions/grant_admin_spec.rb
+++ b/spec/lib/second_factor/actions/grant_admin_spec.rb
@@ -10,19 +10,14 @@ RSpec.describe SecondFactor::Actions::GrantAdmin do
Discourse.redis.del(keys)
end
- after do
- cleanup_admin_confirmation_redis_keys
- end
+ after { cleanup_admin_confirmation_redis_keys }
def params(hash)
ActionController::Parameters.new(hash)
end
def create_request(request_method: "GET", path: "/")
- ActionDispatch::TestRequest.create({
- "REQUEST_METHOD" => request_method,
- "PATH_INFO" => path
- })
+ ActionDispatch::TestRequest.create({ "REQUEST_METHOD" => request_method, "PATH_INFO" => path })
end
def create_instance(user, request = nil)
@@ -33,16 +28,16 @@ RSpec.describe SecondFactor::Actions::GrantAdmin do
describe "#no_second_factors_enabled!" do
it "sends new admin confirmation email" do
instance = create_instance(admin)
- expect {
- instance.no_second_factors_enabled!(params({ user_id: user.id }))
- }.to change { AdminConfirmation.exists_for?(user.id) }.from(false).to(true)
+ expect { instance.no_second_factors_enabled!(params({ user_id: user.id })) }.to change {
+ AdminConfirmation.exists_for?(user.id)
+ }.from(false).to(true)
end
it "ensures the acting user is admin" do
instance = create_instance(user)
- expect {
- instance.no_second_factors_enabled!(params({ user_id: user.id }))
- }.to raise_error(Discourse::InvalidAccess)
+ expect { instance.no_second_factors_enabled!(params({ user_id: user.id })) }.to raise_error(
+ Discourse::InvalidAccess,
+ )
expect(AdminConfirmation.exists_for?(user.id)).to eq(false)
end
end
@@ -54,39 +49,38 @@ RSpec.describe SecondFactor::Actions::GrantAdmin do
expect(hash[:callback_params]).to eq({ user_id: user.id })
expect(hash[:redirect_url]).to eq("/admin/users/#{user.id}/#{user.username}")
expect(hash[:description]).to eq(
- I18n.t(
- "second_factor_auth.actions.grant_admin.description",
- username: "@#{user.username}"
- )
+ I18n.t("second_factor_auth.actions.grant_admin.description", username: "@#{user.username}"),
)
end
it "ensures the acting user is admin" do
instance = create_instance(user)
- expect {
- instance.second_factor_auth_required!(params({ user_id: user.id }))
- }.to raise_error(Discourse::InvalidAccess)
+ expect { instance.second_factor_auth_required!(params({ user_id: user.id })) }.to raise_error(
+ Discourse::InvalidAccess,
+ )
end
end
describe "#second_factor_auth_completed!" do
it "grants the target user admin access and logs to staff action logs" do
instance = create_instance(admin)
- expect {
- instance.second_factor_auth_completed!(user_id: user.id)
- }.to change { user.reload.admin }.from(false).to(true)
- expect(UserHistory.exists?(
- acting_user_id: admin.id,
- target_user_id: user.id,
- action: UserHistory.actions[:grant_admin]
- )).to eq(true)
+ expect { instance.second_factor_auth_completed!(user_id: user.id) }.to change {
+ user.reload.admin
+ }.from(false).to(true)
+ expect(
+ UserHistory.exists?(
+ acting_user_id: admin.id,
+ target_user_id: user.id,
+ action: UserHistory.actions[:grant_admin],
+ ),
+ ).to eq(true)
end
it "ensures the acting user is admin" do
instance = create_instance(user)
- expect {
- instance.second_factor_auth_completed!(user_id: user.id)
- }.to raise_error(Discourse::InvalidAccess)
+ expect { instance.second_factor_auth_completed!(user_id: user.id) }.to raise_error(
+ Discourse::InvalidAccess,
+ )
end
end
end
diff --git a/spec/lib/second_factor/auth_manager_spec.rb b/spec/lib/second_factor/auth_manager_spec.rb
index bd39b823995..4d151166ac3 100644
--- a/spec/lib/second_factor/auth_manager_spec.rb
+++ b/spec/lib/second_factor/auth_manager_spec.rb
@@ -6,10 +6,7 @@ RSpec.describe SecondFactor::AuthManager do
fab!(:user_totp) { Fabricate(:user_second_factor_totp, user: user) }
def create_request(request_method: "GET", path: "/")
- ActionDispatch::TestRequest.create({
- "REQUEST_METHOD" => request_method,
- "PATH_INFO" => path
- })
+ ActionDispatch::TestRequest.create({ "REQUEST_METHOD" => request_method, "PATH_INFO" => path })
end
def create_manager(action)
@@ -22,28 +19,24 @@ RSpec.describe SecondFactor::AuthManager do
end
def stage_challenge(successful:)
- request = create_request(
- request_method: "POST",
- path: "/abc/xyz"
- )
+ request = create_request(request_method: "POST", path: "/abc/xyz")
action = create_action(request)
action.expects(:no_second_factors_enabled!).never
action
.expects(:second_factor_auth_required!)
- .with({ random_param: 'hello' })
+ .with({ random_param: "hello" })
.returns({ callback_params: { call_me_back: 4314 } })
.once
manager = create_manager(action)
secure_session = {}
- expect {
- manager.run!(request, { random_param: 'hello' }, secure_session)
- }.to raise_error(SecondFactor::AuthManager::SecondFactorRequired) do |ex|
+ expect { manager.run!(request, { random_param: "hello" }, secure_session) }.to raise_error(
+ SecondFactor::AuthManager::SecondFactorRequired,
+ ) do |ex|
expect(ex.nonce).to be_present
end
- challenge = JSON
- .parse(secure_session["current_second_factor_auth_challenge"])
- .deep_symbolize_keys
+ challenge =
+ JSON.parse(secure_session["current_second_factor_auth_challenge"]).deep_symbolize_keys
if successful
challenge[:successful] = true
@@ -52,26 +45,20 @@ RSpec.describe SecondFactor::AuthManager do
[challenge[:nonce], secure_session]
end
- describe '#allow_backup_codes!' do
- it 'adds the backup codes method to the allowed methods set' do
+ describe "#allow_backup_codes!" do
+ it "adds the backup codes method to the allowed methods set" do
manager = create_manager(create_action)
- expect(manager.allowed_methods).not_to include(
- UserSecondFactor.methods[:backup_codes]
- )
+ expect(manager.allowed_methods).not_to include(UserSecondFactor.methods[:backup_codes])
manager.allow_backup_codes!
- expect(manager.allowed_methods).to include(
- UserSecondFactor.methods[:backup_codes]
- )
+ expect(manager.allowed_methods).to include(UserSecondFactor.methods[:backup_codes])
end
end
- describe '#run!' do
- context 'when the user does not have a suitable 2FA method' do
- before do
- user_totp.destroy!
- end
+ describe "#run!" do
+ context "when the user does not have a suitable 2FA method" do
+ before { user_totp.destroy! }
- it 'calls the no_second_factors_enabled! method of the action' do
+ it "calls the no_second_factors_enabled! method of the action" do
action = create_action
action.expects(:no_second_factors_enabled!).with({ hello_world: 331 }).once
action.expects(:second_factor_auth_required!).never
@@ -82,27 +69,26 @@ RSpec.describe SecondFactor::AuthManager do
end
it "initiates the 2FA process and stages a challenge in secure session when there is no nonce in params" do
- request = create_request(
- request_method: "POST",
- path: "/abc/xyz"
- )
+ request = create_request(request_method: "POST", path: "/abc/xyz")
action = create_action(request)
action.expects(:no_second_factors_enabled!).never
action
.expects(:second_factor_auth_required!)
.with({ expect_me: 131 })
.returns(
- callback_params: { call_me_back: 4314 },
+ callback_params: {
+ call_me_back: 4314,
+ },
redirect_url: "/gg",
- description: "hello world!"
+ description: "hello world!",
)
.once
action.expects(:second_factor_auth_completed!).never
manager = create_manager(action)
secure_session = {}
- expect {
- manager.run!(request, { expect_me: 131 }, secure_session)
- }.to raise_error(SecondFactor::AuthManager::SecondFactorRequired)
+ expect { manager.run!(request, { expect_me: 131 }, secure_session) }.to raise_error(
+ SecondFactor::AuthManager::SecondFactorRequired,
+ )
json = secure_session["current_second_factor_auth_challenge"]
challenge = JSON.parse(json).deep_symbolize_keys
expect(challenge[:nonce]).to be_present
@@ -115,25 +101,24 @@ RSpec.describe SecondFactor::AuthManager do
end
it "prefers callback_method and callback_path from the output of the action's second_factor_auth_required! method if they're present" do
- request = create_request(
- request_method: "POST",
- path: "/abc/xyz"
- )
+ request = create_request(request_method: "POST", path: "/abc/xyz")
action = create_action(request)
action
.expects(:second_factor_auth_required!)
.with({})
.returns(
- callback_params: { call_me_back: 4314 },
+ callback_params: {
+ call_me_back: 4314,
+ },
callback_method: "PUT",
- callback_path: "/test/443"
+ callback_path: "/test/443",
)
.once
manager = create_manager(action)
secure_session = {}
- expect {
- manager.run!(request, {}, secure_session)
- }.to raise_error(SecondFactor::AuthManager::SecondFactorRequired)
+ expect { manager.run!(request, {}, secure_session) }.to raise_error(
+ SecondFactor::AuthManager::SecondFactorRequired,
+ )
json = secure_session["current_second_factor_auth_challenge"]
challenge = JSON.parse(json).deep_symbolize_keys
expect(challenge[:callback_method]).to eq("PUT")
@@ -143,18 +128,12 @@ RSpec.describe SecondFactor::AuthManager do
it "calls the second_factor_auth_completed! method of the action if the challenge is successful and not expired" do
nonce, secure_session = stage_challenge(successful: true)
- request = create_request(
- request_method: "POST",
- path: "/abc/xyz"
- )
+ request = create_request(request_method: "POST", path: "/abc/xyz")
action = create_action(request)
action.expects(:no_second_factors_enabled!).never
action.expects(:second_factor_auth_required!).never
- action
- .expects(:second_factor_auth_completed!)
- .with({ call_me_back: 4314 })
- .once
+ action.expects(:second_factor_auth_completed!).with({ call_me_back: 4314 }).once
manager = create_manager(action)
manager.run!(request, { second_factor_nonce: nonce }, secure_session)
end
@@ -162,10 +141,7 @@ RSpec.describe SecondFactor::AuthManager do
it "does not call the second_factor_auth_completed! method of the action if the challenge is not marked successful" do
nonce, secure_session = stage_challenge(successful: false)
- request = create_request(
- request_method: "POST",
- path: "/abc/xyz"
- )
+ request = create_request(request_method: "POST", path: "/abc/xyz")
action = create_action(request)
action.expects(:no_second_factors_enabled!).never
action.expects(:second_factor_auth_required!).never
@@ -181,10 +157,7 @@ RSpec.describe SecondFactor::AuthManager do
it "does not call the second_factor_auth_completed! method of the action if the challenge is expired" do
nonce, secure_session = stage_challenge(successful: true)
- request = create_request(
- request_method: "POST",
- path: "/abc/xyz"
- )
+ request = create_request(request_method: "POST", path: "/abc/xyz")
action = create_action(request)
action.expects(:no_second_factors_enabled!).never
action.expects(:second_factor_auth_required!).never
@@ -220,9 +193,9 @@ RSpec.describe SecondFactor::AuthManager do
action.expects(:second_factor_auth_required!).with(params).returns({}).once
action.expects(:second_factor_auth_completed!).never
manager = create_manager(action)
- expect {
- manager.run!(action.request, params, {})
- }.to raise_error(SecondFactor::AuthManager::SecondFactorRequired) do |ex|
+ expect { manager.run!(action.request, params, {}) }.to raise_error(
+ SecondFactor::AuthManager::SecondFactorRequired,
+ ) do |ex|
expect(ex.nonce).to be_present
end
end
@@ -238,10 +211,7 @@ RSpec.describe SecondFactor::AuthManager do
expect(results.second_factor_auth_skipped?).to eq(true)
nonce, secure_session = stage_challenge(successful: true)
- request = create_request(
- request_method: "POST",
- path: "/abc/xyz"
- )
+ request = create_request(request_method: "POST", path: "/abc/xyz")
action = create_action(request)
action
.expects(:second_factor_auth_completed!)
diff --git a/spec/lib/seed_data/categories_spec.rb b/spec/lib/seed_data/categories_spec.rb
index ea5d730f739..d4b9072d790 100644
--- a/spec/lib/seed_data/categories_spec.rb
+++ b/spec/lib/seed_data/categories_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-require 'seed_data/categories'
+require "seed_data/categories"
RSpec.describe SeedData::Categories do
subject { SeedData::Categories.with_default_locale }
@@ -15,16 +15,11 @@ RSpec.describe SeedData::Categories do
describe "#create" do
def permissions(group, type)
- {
- group_id: Group::AUTO_GROUPS[group],
- permission_type: CategoryGroup.permission_types[type]
- }
+ { group_id: Group::AUTO_GROUPS[group], permission_type: CategoryGroup.permission_types[type] }
end
it "creates a missing category" do
- expect { create_category }
- .to change { Category.count }.by(1)
- .and change { Topic.count }.by(1)
+ expect { create_category }.to change { Category.count }.by(1).and change { Topic.count }.by(1)
category = Category.last
expect(category.name).to eq(I18n.t("staff_category_name"))
@@ -41,18 +36,14 @@ RSpec.describe SeedData::Categories do
before { create_category }
it "does not create another category" do
- expect { create_category }
- .to not_change { Category.count }
- .and not_change { Topic.count }
+ expect { create_category }.to not_change { Category.count }.and not_change { Topic.count }
end
it "creates a missing 'About Category' topic" do
category = Category.last
Topic.delete(category.topic_id)
- expect { create_category }
- .to not_change { Category.count }
- .and change { Topic.count }.by(1)
+ expect { create_category }.to not_change { Category.count }.and change { Topic.count }.by(1)
category.reload
expect(description_post(category).raw).to eq(I18n.t("staff_category_description"))
@@ -65,8 +56,7 @@ RSpec.describe SeedData::Categories do
expect(category.category_groups.count).to eq(0)
- expect { create_category }
- .to change { CategoryGroup.count }.by(1)
+ expect { create_category }.to change { CategoryGroup.count }.by(1)
category.reload
expect(category.category_groups.count).to eq(1)
@@ -84,8 +74,7 @@ RSpec.describe SeedData::Categories do
subcategory.set_permissions(group => :full)
subcategory.save!
- expect { create_category }
- .to change { CategoryGroup.count }.by(1)
+ expect { create_category }.to change { CategoryGroup.count }.by(1)
category.reload
expect(category.category_groups.count).to eq(1)
@@ -96,15 +85,15 @@ RSpec.describe SeedData::Categories do
it "does not seed the general category for non-new sites" do
Fabricate(:user) # If the site has human users don't seed
- expect { create_category("general_category_id") }
- .to not_change { Category.count }
- .and not_change { Topic.count }
+ expect { create_category("general_category_id") }.to not_change {
+ Category.count
+ }.and not_change { Topic.count }
end
it "seeds the general category for new sites" do
- expect { create_category("general_category_id") }
- .to change { Category.count }
- .and change { Topic.count }
+ expect { create_category("general_category_id") }.to change { Category.count }.and change {
+ Topic.count
+ }
expect(Category.last.name).to eq("General")
expect(SiteSetting.default_composer_category).to eq(Category.last.id)
@@ -117,7 +106,7 @@ RSpec.describe SeedData::Categories do
site_feedback_category = Category.last
create_category("general_category_id")
general_category = Category.last
- site_setting_ids = SiteSetting.default_sidebar_categories.split('|')
+ site_setting_ids = SiteSetting.default_sidebar_categories.split("|")
create_category("uncategorized_category_id")
expect(site_setting_ids[0].to_i).to eq(staff_category.id)
@@ -135,8 +124,7 @@ RSpec.describe SeedData::Categories do
expect(category.category_groups.first).to have_attributes(permissions(:trust_level_2, :full))
- expect { create_category("lounge_category_id") }
- .not_to change { CategoryGroup.count }
+ expect { create_category("lounge_category_id") }.not_to change { CategoryGroup.count }
category.reload
expect(category.category_groups.first).to have_attributes(permissions(:trust_level_2, :full))
@@ -195,9 +183,13 @@ RSpec.describe SeedData::Categories do
Post.last.revise(Fabricate(:admin), raw: "Hello world")
expected_options = [
- { id: "uncategorized_category_id", name: I18n.t("uncategorized_category_name"), selected: true },
+ {
+ id: "uncategorized_category_id",
+ name: I18n.t("uncategorized_category_name"),
+ selected: true,
+ },
{ id: "meta_category_id", name: I18n.t("meta_category_name"), selected: true },
- { id: "general_category_id", name: I18n.t("general_category_name"), selected: false }
+ { id: "general_category_id", name: I18n.t("general_category_name"), selected: false },
]
expect(subject.reseed_options).to eq(expected_options)
diff --git a/spec/lib/seed_data/topics_spec.rb b/spec/lib/seed_data/topics_spec.rb
index de116638585..581ecc10273 100644
--- a/spec/lib/seed_data/topics_spec.rb
+++ b/spec/lib/seed_data/topics_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-require 'seed_data/topics'
+require "seed_data/topics"
RSpec.describe SeedData::Topics do
subject { SeedData::Topics.with_default_locale }
@@ -16,13 +16,13 @@ RSpec.describe SeedData::Topics do
describe "#create" do
it "creates a missing topic" do
- expect { create_topic }
- .to change { Topic.count }.by(1)
- .and change { Post.count }.by(1)
+ expect { create_topic }.to change { Topic.count }.by(1).and change { Post.count }.by(1)
topic = Topic.last
expect(topic.title).to eq(I18n.t("discourse_welcome_topic.title"))
- expect(topic.first_post.raw).to eq(I18n.t('discourse_welcome_topic.body', base_path: Discourse.base_path).rstrip)
+ expect(topic.first_post.raw).to eq(
+ I18n.t("discourse_welcome_topic.body", base_path: Discourse.base_path).rstrip,
+ )
expect(topic.category_id).to eq(SiteSetting.general_category_id)
expect(topic.user_id).to eq(Discourse::SYSTEM_USER_ID)
expect(topic.pinned_globally).to eq(true)
@@ -35,9 +35,9 @@ RSpec.describe SeedData::Topics do
staff_category = Fabricate(:category, name: "Staff")
SiteSetting.staff_category_id = staff_category.id
- expect { create_topic("privacy_topic_id") }
- .to change { Topic.count }.by(1)
- .and change { Post.count }.by(2)
+ expect { create_topic("privacy_topic_id") }.to change { Topic.count }.by(1).and change {
+ Post.count
+ }.by(2)
topic = Topic.last
expect(topic.category_id).to eq(SiteSetting.staff_category_id)
@@ -82,7 +82,9 @@ RSpec.describe SeedData::Topics do
topic.reload
expect(topic.title).to eq(I18n.t("discourse_welcome_topic.title"))
- expect(topic.first_post.raw).to eq(I18n.t('discourse_welcome_topic.body', base_path: Discourse.base_path).rstrip)
+ expect(topic.first_post.raw).to eq(
+ I18n.t("discourse_welcome_topic.body", base_path: Discourse.base_path).rstrip,
+ )
end
it "updates an existing first reply when `static_first_reply` is true" do
@@ -94,7 +96,9 @@ RSpec.describe SeedData::Topics do
update_topic("privacy_topic_id")
post.reload
- expect(post.raw).to eq(I18n.t("static_topic_first_reply", page_name: I18n.t('privacy_topic.title')).rstrip)
+ expect(post.raw).to eq(
+ I18n.t("static_topic_first_reply", page_name: I18n.t("privacy_topic.title")).rstrip,
+ )
end
it "does not update a change topic and `skip_changed` is true" do
@@ -119,7 +123,7 @@ RSpec.describe SeedData::Topics do
expected_options = [
{ id: "guidelines_topic_id", name: I18n.t("guidelines_topic.title"), selected: true },
- { id: "welcome_topic_id", name: "Changed Topic Title", selected: false }
+ { id: "welcome_topic_id", name: "Changed Topic Title", selected: false },
]
expect(subject.reseed_options).to eq(expected_options)
diff --git a/spec/lib/shrink_uploaded_image_spec.rb b/spec/lib/shrink_uploaded_image_spec.rb
index e3d6fb9ae54..08a533cef85 100644
--- a/spec/lib/shrink_uploaded_image_spec.rb
+++ b/spec/lib/shrink_uploaded_image_spec.rb
@@ -9,11 +9,12 @@ RSpec.describe ShrinkUploadedImage do
post = Fabricate(:post, raw: "/admin " })
- expect(settings.description(:test_setting)).to eq("test description /admin ")
+ I18n.backend.store_translations(
+ :en,
+ site_settings: {
+ test_setting: "test description /admin ",
+ },
+ )
+ expect(settings.description(:test_setting)).to eq(
+ "test description /admin ",
+ )
Discourse.stubs(:base_path).returns("/forum")
- expect(settings.description(:test_setting)).to eq("test description /admin ")
+ expect(settings.description(:test_setting)).to eq(
+ "test description /admin ",
+ )
end
it "should have the correct default" do
@@ -242,9 +245,7 @@ RSpec.describe SiteSettingExtension do
settings.setting("test_setting", 100)
settings.setting("test_setting", nil, client: true)
- message = MessageBus.track_publish('/client_settings') do
- settings.test_setting = 88
- end.first
+ message = MessageBus.track_publish("/client_settings") { settings.test_setting = 88 }.first
expect(message).to be_present
end
@@ -325,9 +326,7 @@ RSpec.describe SiteSettingExtension do
end
context "when overridden" do
- after do
- settings.remove_override!(:test_hello?)
- end
+ after { settings.remove_override!(:test_hello?) }
it "should have the correct override" do
settings.test_hello = true
@@ -358,7 +357,7 @@ RSpec.describe SiteSettingExtension do
end
end
- describe 'int enum' do
+ describe "int enum" do
class TestIntEnumClass
def self.valid_value?(v)
true
@@ -368,24 +367,22 @@ RSpec.describe SiteSettingExtension do
end
end
- it 'should coerce correctly' do
+ it "should coerce correctly" do
settings.setting(:test_int_enum, 1, enum: TestIntEnumClass)
settings.test_int_enum = "2"
settings.refresh!
expect(settings.defaults[:test_int_enum]).to eq(1)
expect(settings.test_int_enum).to eq(2)
end
-
end
- describe 'enum setting' do
-
+ describe "enum setting" do
class TestEnumClass
def self.valid_value?(v)
self.values.include?(v)
end
def self.values
- ['en']
+ ["en"]
end
def self.translate_names?
false
@@ -397,48 +394,50 @@ RSpec.describe SiteSettingExtension do
end
before do
- settings.setting(:test_enum, 'en', enum: test_enum_class)
+ settings.setting(:test_enum, "en", enum: test_enum_class)
settings.refresh!
end
- it 'should have the correct default' do
- expect(settings.test_enum).to eq('en')
+ it "should have the correct default" do
+ expect(settings.test_enum).to eq("en")
end
- it 'should not hose all_settings' do
+ it "should not hose all_settings" do
expect(settings.all_settings.detect { |s| s[:setting] == :test_enum }).to be_present
end
- it 'should report error when being set other values' do
- expect { settings.test_enum = 'not_in_enum' }.to raise_error(Discourse::InvalidParameters)
+ it "should report error when being set other values" do
+ expect { settings.test_enum = "not_in_enum" }.to raise_error(Discourse::InvalidParameters)
end
- context 'when overridden' do
+ context "when overridden" do
after :each do
settings.remove_override!(:validated_setting)
end
- it 'stores valid values' do
- test_enum_class.expects(:valid_value?).with('fr').returns(true)
- settings.test_enum = 'fr'
- expect(settings.test_enum).to eq('fr')
+ it "stores valid values" do
+ test_enum_class.expects(:valid_value?).with("fr").returns(true)
+ settings.test_enum = "fr"
+ expect(settings.test_enum).to eq("fr")
end
- it 'rejects invalid values' do
- test_enum_class.expects(:valid_value?).with('gg').returns(false)
- expect { settings.test_enum = 'gg' }.to raise_error(Discourse::InvalidParameters)
+ it "rejects invalid values" do
+ test_enum_class.expects(:valid_value?).with("gg").returns(false)
+ expect { settings.test_enum = "gg" }.to raise_error(Discourse::InvalidParameters)
end
end
end
- describe 'a setting with a category' do
+ describe "a setting with a category" do
before do
settings.setting(:test_setting, 88, category: :tests)
settings.refresh!
end
it "should return the category in all_settings" do
- expect(settings.all_settings.find { |s| s[:setting] == :test_setting }[:category]).to eq(:tests)
+ expect(settings.all_settings.find { |s| s[:setting] == :test_setting }[:category]).to eq(
+ :tests,
+ )
end
context "when overidden" do
@@ -453,14 +452,16 @@ RSpec.describe SiteSettingExtension do
it "should still have the correct category" do
settings.test_setting = 102
- expect(settings.all_settings.find { |s| s[:setting] == :test_setting }[:category]).to eq(:tests)
+ expect(settings.all_settings.find { |s| s[:setting] == :test_setting }[:category]).to eq(
+ :tests,
+ )
end
end
end
describe "setting with a validator" do
before do
- settings.setting(:validated_setting, "info@example.com", type: 'email')
+ settings.setting(:validated_setting, "info@example.com", type: "email")
settings.refresh!
end
@@ -470,21 +471,21 @@ RSpec.describe SiteSettingExtension do
it "stores valid values" do
EmailSettingValidator.any_instance.expects(:valid_value?).returns(true)
- settings.validated_setting = 'success@example.com'
- expect(settings.validated_setting).to eq('success@example.com')
+ settings.validated_setting = "success@example.com"
+ expect(settings.validated_setting).to eq("success@example.com")
end
it "rejects invalid values" do
expect {
EmailSettingValidator.any_instance.expects(:valid_value?).returns(false)
- settings.validated_setting = 'nope'
+ settings.validated_setting = "nope"
}.to raise_error(Discourse::InvalidParameters)
expect(settings.validated_setting).to eq("info@example.com")
end
it "allows blank values" do
- settings.validated_setting = ''
- expect(settings.validated_setting).to eq('')
+ settings.validated_setting = ""
+ expect(settings.validated_setting).to eq("")
end
end
@@ -492,9 +493,7 @@ RSpec.describe SiteSettingExtension do
it "raises an error" do
settings.setting(:test_setting, 77)
settings.refresh!
- expect {
- settings.set("provider", "haxxed")
- }.to raise_error(Discourse::InvalidParameters)
+ expect { settings.set("provider", "haxxed") }.to raise_error(Discourse::InvalidParameters)
end
end
@@ -505,14 +504,11 @@ RSpec.describe SiteSettingExtension do
end
it "works correctly" do
- expect {
- settings.get("frogs_in_africa")
- }.to raise_error(Discourse::InvalidParameters)
+ expect { settings.get("frogs_in_africa") }.to raise_error(Discourse::InvalidParameters)
expect(settings.get(:title)).to eq("Discourse v1")
expect(settings.get("title")).to eq("Discourse v1")
end
-
end
describe ".set_and_log" do
@@ -523,9 +519,9 @@ RSpec.describe SiteSettingExtension do
end
it "raises an error when set for an invalid setting name" do
- expect {
- settings.set_and_log("provider", "haxxed")
- }.to raise_error(Discourse::InvalidParameters)
+ expect { settings.set_and_log("provider", "haxxed") }.to raise_error(
+ Discourse::InvalidParameters,
+ )
end
it "scrubs secret setting values from logs" do
@@ -561,7 +557,7 @@ RSpec.describe SiteSettingExtension do
describe "hidden" do
before do
- settings.setting(:superman_identity, 'Clark Kent', hidden: true)
+ settings.setting(:superman_identity, "Clark Kent", hidden: true)
settings.refresh!
end
@@ -578,22 +574,24 @@ RSpec.describe SiteSettingExtension do
end
it "is present in all_settings when we ask for hidden" do
- expect(settings.all_settings(include_hidden: true).find { |s| s[:setting] == :superman_identity }).to be_present
+ expect(
+ settings.all_settings(include_hidden: true).find { |s| s[:setting] == :superman_identity },
+ ).to be_present
end
end
describe "global override" do
context "with default_locale" do
it "supports adding a default locale via a global" do
- global_setting :default_locale, 'zh_CN'
- settings.default_locale = 'en'
- expect(settings.default_locale).to eq('zh_CN')
+ global_setting :default_locale, "zh_CN"
+ settings.default_locale = "en"
+ expect(settings.default_locale).to eq("zh_CN")
end
end
context "without global setting" do
before do
- settings.setting(:trout_api_key, 'evil')
+ settings.setting(:trout_api_key, "evil")
settings.refresh!
end
@@ -602,27 +600,26 @@ RSpec.describe SiteSettingExtension do
end
it "can return the default value" do
- expect(settings.trout_api_key).to eq('evil')
+ expect(settings.trout_api_key).to eq("evil")
end
it "can overwrite the default" do
- settings.trout_api_key = 'tophat'
+ settings.trout_api_key = "tophat"
settings.refresh!
- expect(settings.trout_api_key).to eq('tophat')
+ expect(settings.trout_api_key).to eq("tophat")
end
end
context "with blank global setting" do
before do
- GlobalSetting.stubs(:nada).returns('')
- settings.setting(:nada, 'nothing')
+ GlobalSetting.stubs(:nada).returns("")
+ settings.setting(:nada, "nothing")
settings.refresh!
end
it "should return default cause nothing is set" do
- expect(settings.nada).to eq('nothing')
+ expect(settings.nada).to eq("nothing")
end
-
end
context "with a false override" do
@@ -637,36 +634,37 @@ RSpec.describe SiteSettingExtension do
end
it "should not trigger any message bus work if you try to set it" do
- m = MessageBus.track_publish('/site_settings') do
- settings.bool = true
- expect(settings.bool).to eq(false)
- end
+ m =
+ MessageBus.track_publish("/site_settings") do
+ settings.bool = true
+ expect(settings.bool).to eq(false)
+ end
expect(m.length).to eq(0)
end
end
context "with global setting" do
before do
- GlobalSetting.stubs(:trout_api_key).returns('purringcat')
- settings.setting(:trout_api_key, 'evil')
+ GlobalSetting.stubs(:trout_api_key).returns("purringcat")
+ settings.setting(:trout_api_key, "evil")
settings.refresh!
end
it "should return the global setting instead of default" do
- expect(settings.trout_api_key).to eq('purringcat')
+ expect(settings.trout_api_key).to eq("purringcat")
end
it "should return the global setting after a refresh" do
settings.refresh!
- expect(settings.trout_api_key).to eq('purringcat')
+ expect(settings.trout_api_key).to eq("purringcat")
end
it "should add the key to the hidden_settings collection" do
expect(settings.hidden_settings.include?(:trout_api_key)).to eq(true)
- ['', nil].each_with_index do |setting, index|
+ ["", nil].each_with_index do |setting, index|
GlobalSetting.stubs(:"trout_api_key_#{index}").returns(setting)
- settings.setting(:"trout_api_key_#{index}", 'evil')
+ settings.setting(:"trout_api_key_#{index}", "evil")
settings.refresh!
expect(settings.hidden_settings.include?(:"trout_api_key_#{index}")).to eq(false)
end
@@ -680,7 +678,7 @@ RSpec.describe SiteSettingExtension do
describe "secret" do
before do
- settings.setting(:superman_identity, 'Clark Kent', secret: true)
+ settings.setting(:superman_identity, "Clark Kent", secret: true)
settings.refresh!
end
@@ -699,78 +697,74 @@ RSpec.describe SiteSettingExtension do
end
end
- describe 'locale default overrides are respected' do
+ describe "locale default overrides are respected" do
before do
- settings.setting(:test_override, 'default', locale_default: { zh_CN: 'cn' })
+ settings.setting(:test_override, "default", locale_default: { zh_CN: "cn" })
settings.refresh!
end
- after do
- settings.remove_override!(:test_override)
+ after { settings.remove_override!(:test_override) }
+
+ it "ensures the default cache expired after overriding the default_locale" do
+ expect(settings.test_override).to eq("default")
+ settings.default_locale = "zh_CN"
+ expect(settings.test_override).to eq("cn")
end
- it 'ensures the default cache expired after overriding the default_locale' do
- expect(settings.test_override).to eq('default')
- settings.default_locale = 'zh_CN'
- expect(settings.test_override).to eq('cn')
- end
-
- it 'returns the saved setting even locale default exists' do
- expect(settings.test_override).to eq('default')
- settings.default_locale = 'zh_CN'
- settings.test_override = 'saved'
- expect(settings.test_override).to eq('saved')
+ it "returns the saved setting even locale default exists" do
+ expect(settings.test_override).to eq("default")
+ settings.default_locale = "zh_CN"
+ settings.test_override = "saved"
+ expect(settings.test_override).to eq("saved")
end
end
- describe '.requires_refresh?' do
- it 'always refresh default_locale always require refresh' do
+ describe ".requires_refresh?" do
+ it "always refresh default_locale always require refresh" do
expect(settings.requires_refresh?(:default_locale)).to be_truthy
end
end
- describe '.default_locale' do
- it 'is always loaded' do
- expect(settings.default_locale).to eq('en')
+ describe ".default_locale" do
+ it "is always loaded" do
+ expect(settings.default_locale).to eq("en")
end
end
- describe '.default_locale=' do
- it 'can be changed' do
- settings.default_locale = 'zh_CN'
- expect(settings.default_locale).to eq 'zh_CN'
+ describe ".default_locale=" do
+ it "can be changed" do
+ settings.default_locale = "zh_CN"
+ expect(settings.default_locale).to eq "zh_CN"
end
- it 'refresh!' do
+ it "refresh!" do
settings.expects(:refresh!)
- settings.default_locale = 'zh_CN'
+ settings.default_locale = "zh_CN"
end
- it 'expires the cache' do
- settings.default_locale = 'zh_CN'
+ it "expires the cache" do
+ settings.default_locale = "zh_CN"
expect(Discourse.cache.exist?(SiteSettingExtension.client_settings_cache_key)).to be_falsey
end
- it 'refreshes the client' do
+ it "refreshes the client" do
Discourse.expects(:request_refresh!)
- settings.default_locale = 'zh_CN'
+ settings.default_locale = "zh_CN"
end
end
describe "get_hostname" do
-
it "properly extracts the hostname" do
# consider testing this through a public interface, this tests implementation details
expect(settings.send(:get_hostname, "discourse.org")).to eq("discourse.org")
expect(settings.send(:get_hostname, "@discourse.org")).to eq("discourse.org")
expect(settings.send(:get_hostname, "https://discourse.org")).to eq("discourse.org")
end
-
end
- describe '.all_settings' do
- describe 'uploads settings' do
- it 'should return the right values' do
+ describe ".all_settings" do
+ describe "uploads settings" do
+ it "should return the right values" do
negative_upload_id = [(Upload.minimum(:id) || 0) - 1, -10].min
system_upload = Fabricate(:upload, id: negative_upload_id)
settings.setting(:logo, system_upload.id, type: :upload)
@@ -791,41 +785,39 @@ RSpec.describe SiteSettingExtension do
end
end
- describe '.client_settings_json_uncached' do
- it 'should return the right json value' do
+ describe ".client_settings_json_uncached" do
+ it "should return the right json value" do
upload = Fabricate(:upload)
settings.setting(:upload_type, upload.id.to_s, type: :upload, client: true)
- settings.setting(:string_type, 'haha', client: true)
+ settings.setting(:string_type, "haha", client: true)
settings.refresh!
expect(settings.client_settings_json_uncached).to eq(
- %Q|{"default_locale":"#{SiteSetting.default_locale}","upload_type":"#{upload.url}","string_type":"haha"}|
+ %Q|{"default_locale":"#{SiteSetting.default_locale}","upload_type":"#{upload.url}","string_type":"haha"}|,
)
end
- it 'settings with html type are not sanitized' do
- settings.setting(:with_html, 'rest', type: :html, client: true)
+ it "settings with html type are not sanitized" do
+ settings.setting(:with_html, "rest", type: :html, client: true)
client_settings = JSON.parse settings.client_settings_json_uncached
- expect(client_settings['with_html']).to eq('rest')
+ expect(client_settings["with_html"]).to eq("rest")
end
end
- describe '.setup_methods' do
- describe 'for uploads site settings' do
+ describe ".setup_methods" do
+ describe "for uploads site settings" do
fab!(:upload) { Fabricate(:upload) }
fab!(:upload2) { Fabricate(:upload) }
- it 'should return the upload record' do
+ it "should return the upload record" do
settings.setting(:some_upload, upload.id.to_s, type: :upload)
expect(settings.some_upload).to eq(upload)
# Ensure that we cache the upload record
- expect(settings.some_upload.object_id).to eq(
- settings.some_upload.object_id
- )
+ expect(settings.some_upload.object_id).to eq(settings.some_upload.object_id)
settings.some_upload = upload2
diff --git a/spec/lib/site_settings/db_provider_spec.rb b/spec/lib/site_settings/db_provider_spec.rb
index 3aebd3fb0c0..5b7c70dfb34 100644
--- a/spec/lib/site_settings/db_provider_spec.rb
+++ b/spec/lib/site_settings/db_provider_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
RSpec.describe SiteSettings::DbProvider do
-
def expect_same_setting(actual, expected)
expect(actual.name).to eq(expected.name)
expect(actual.value).to eq(expected.value)
diff --git a/spec/lib/site_settings/defaults_provider_spec.rb b/spec/lib/site_settings/defaults_provider_spec.rb
index 5e6e13a1621..eeb7c42e927 100644
--- a/spec/lib/site_settings/defaults_provider_spec.rb
+++ b/spec/lib/site_settings/defaults_provider_spec.rb
@@ -1,107 +1,107 @@
# frozen_string_literal: true
RSpec.describe SiteSettings::DefaultsProvider do
- let(:provider_local) do
- SiteSettings::LocalProcessProvider.new
- end
+ let(:provider_local) { SiteSettings::LocalProcessProvider.new }
- before do
- MessageBus.off
- end
+ before { MessageBus.off }
- after do
- MessageBus.on
- end
+ after { MessageBus.on }
- let(:settings) do
- new_settings(provider_local)
- end
+ let(:settings) { new_settings(provider_local) }
- describe '.db_all' do
- it 'can collect values from db' do
- settings.provider.save('try_a', 1, SiteSetting.types[:integer])
- settings.provider.save('try_b', 2, SiteSetting.types[:integer])
+ describe ".db_all" do
+ it "can collect values from db" do
+ settings.provider.save("try_a", 1, SiteSetting.types[:integer])
+ settings.provider.save("try_b", 2, SiteSetting.types[:integer])
expect(settings.defaults.db_all.count).to eq 2
end
end
- describe 'expose default cache according to locale' do
+ describe "expose default cache according to locale" do
before do
- settings.setting(:test_override, 'default', locale_default: { zh_CN: 'cn' })
+ settings.setting(:test_override, "default", locale_default: { zh_CN: "cn" })
settings.setting(:test_boolean_override, true, locale_default: { zh_CN: false })
- settings.setting(:test_default, 'test', regex: '^\S+$')
+ settings.setting(:test_default, "test", regex: '^\S+$')
settings.refresh!
end
- describe '.all' do
- it 'returns all values according to locale' do
- expect(settings.defaults.all).to eq(test_override: 'default', test_default: 'test', test_boolean_override: true)
- expect(settings.defaults.all('zh_CN')).to eq(test_override: 'cn', test_default: 'test', test_boolean_override: false)
+ describe ".all" do
+ it "returns all values according to locale" do
+ expect(settings.defaults.all).to eq(
+ test_override: "default",
+ test_default: "test",
+ test_boolean_override: true,
+ )
+ expect(settings.defaults.all("zh_CN")).to eq(
+ test_override: "cn",
+ test_default: "test",
+ test_boolean_override: false,
+ )
end
end
- describe '.get' do
- it 'returns the default value to a site setting' do
- expect(settings.defaults.get(:test_override)).to eq 'default'
+ describe ".get" do
+ it "returns the default value to a site setting" do
+ expect(settings.defaults.get(:test_override)).to eq "default"
end
- it 'accepts a string as the parameters' do
- expect(settings.defaults.get('test_override')).to eq 'default'
+ it "accepts a string as the parameters" do
+ expect(settings.defaults.get("test_override")).to eq "default"
end
- it 'returns the locale_default value if it exists' do
- expect(settings.defaults.get(:test_override, :zh_CN)).to eq 'cn'
- expect(settings.defaults.get(:test_override, :de)).to eq 'default'
- expect(settings.defaults.get(:test_default, :zh_CN)).to eq 'test'
+ it "returns the locale_default value if it exists" do
+ expect(settings.defaults.get(:test_override, :zh_CN)).to eq "cn"
+ expect(settings.defaults.get(:test_override, :de)).to eq "default"
+ expect(settings.defaults.get(:test_default, :zh_CN)).to eq "test"
end
- it 'returns the correct locale_default for boolean site settings' do
+ it "returns the correct locale_default for boolean site settings" do
expect(settings.defaults.get(:test_boolean_override, :zh_CN)).to eq false
end
end
- describe '.set_regardless_of_locale' do
- let(:val) { 'env_overridden' }
+ describe ".set_regardless_of_locale" do
+ let(:val) { "env_overridden" }
- it 'sets the default value to a site setting regardless the locale' do
+ it "sets the default value to a site setting regardless the locale" do
settings.defaults.set_regardless_of_locale(:test_override, val)
expect(settings.defaults.get(:test_override)).to eq val
- expect(settings.defaults.get(:test_override, 'zh_CN')).to eq val
+ expect(settings.defaults.get(:test_override, "zh_CN")).to eq val
end
- it 'handles the string' do
- settings.defaults.set_regardless_of_locale('test_override', val)
+ it "handles the string" do
+ settings.defaults.set_regardless_of_locale("test_override", val)
expect(settings.defaults.get(:test_override)).to eq val
end
- it 'converts the data type' do
+ it "converts the data type" do
settings.defaults.set_regardless_of_locale(:test_override, 1)
- expect(settings.defaults.get(:test_override)).to eq '1'
+ expect(settings.defaults.get(:test_override)).to eq "1"
end
- it 'raises when the setting does not exists' do
- expect {
- settings.defaults.set_regardless_of_locale(:not_exist, 1)
- }.to raise_error(ArgumentError)
+ it "raises when the setting does not exists" do
+ expect { settings.defaults.set_regardless_of_locale(:not_exist, 1) }.to raise_error(
+ ArgumentError,
+ )
end
- it 'raises when the value is not valid' do
+ it "raises when the value is not valid" do
expect {
- settings.defaults.set_regardless_of_locale(:test_default, 'regex will fail')
+ settings.defaults.set_regardless_of_locale(:test_default, "regex will fail")
}.to raise_error(Discourse::InvalidParameters)
end
end
end
- describe '.load_setting' do
- it 'adds a setting to the cache correctly' do
- settings.defaults.load_setting('new_a', 1, zh_CN: 7)
+ describe ".load_setting" do
+ it "adds a setting to the cache correctly" do
+ settings.defaults.load_setting("new_a", 1, zh_CN: 7)
expect(settings.defaults[:new_a]).to eq 1
- expect(settings.defaults.get(:new_a, 'zh_CN')).to eq 7
+ expect(settings.defaults.get(:new_a, "zh_CN")).to eq 7
end
end
- describe '.has_setting?' do
+ describe ".has_setting?" do
before do
settings.setting(:r, 1)
settings.setting(:question?, 1)
@@ -112,21 +112,20 @@ RSpec.describe SiteSettings::DefaultsProvider do
end
it '"responds when the arg is string' do
- expect(settings.defaults.has_setting?('r')).to be_truthy
+ expect(settings.defaults.has_setting?("r")).to be_truthy
end
- it 'default_locale always exists' do
+ it "default_locale always exists" do
expect(settings.defaults.has_setting?(:default_locale)).to be_truthy
end
- it 'returns false when the key is not exist' do
- expect(settings.defaults.has_setting?('no_key')).to be_falsey
+ it "returns false when the key is not exist" do
+ expect(settings.defaults.has_setting?("no_key")).to be_falsey
end
- it 'checks name with question mark' do
+ it "checks name with question mark" do
expect(settings.defaults.has_setting?(:question)).to be_truthy
- expect(settings.defaults.has_setting?('question')).to be_truthy
+ expect(settings.defaults.has_setting?("question")).to be_truthy
end
end
-
end
diff --git a/spec/lib/site_settings/local_process_provider_multisite_spec.rb b/spec/lib/site_settings/local_process_provider_multisite_spec.rb
index 187063619d1..369ed8599b9 100644
--- a/spec/lib/site_settings/local_process_provider_multisite_spec.rb
+++ b/spec/lib/site_settings/local_process_provider_multisite_spec.rb
@@ -27,8 +27,6 @@ RSpec.describe SiteSettings::LocalProcessProvider, type: :multisite do
end
it "returns the correct site name" do
- test_multisite_connection("second") do
- expect(provider.current_site).to eq("second")
- end
+ test_multisite_connection("second") { expect(provider.current_site).to eq("second") }
end
end
diff --git a/spec/lib/site_settings/local_process_provider_spec.rb b/spec/lib/site_settings/local_process_provider_spec.rb
index 8b96a7b963e..7f6ae24c704 100644
--- a/spec/lib/site_settings/local_process_provider_spec.rb
+++ b/spec/lib/site_settings/local_process_provider_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
RSpec.describe SiteSettings::LocalProcessProvider do
-
def expect_same_setting(actual, expected)
expect(actual.name).to eq(expected.name)
expect(actual.value).to eq(expected.value)
diff --git a/spec/lib/site_settings/type_supervisor_spec.rb b/spec/lib/site_settings/type_supervisor_spec.rb
index 5e4a0801747..59400f49207 100644
--- a/spec/lib/site_settings/type_supervisor_spec.rb
+++ b/spec/lib/site_settings/type_supervisor_spec.rb
@@ -11,14 +11,17 @@ RSpec.describe SiteSettings::TypeSupervisor do
subject { SiteSettings::TypeSupervisor }
- describe 'constants' do
- it 'validator opts are the subset of consumed opts' do
- expect(Set.new(SiteSettings::TypeSupervisor::CONSUMED_OPTS).superset?(
- Set.new(SiteSettings::TypeSupervisor::VALIDATOR_OPTS))).to be_truthy
+ describe "constants" do
+ it "validator opts are the subset of consumed opts" do
+ expect(
+ Set.new(SiteSettings::TypeSupervisor::CONSUMED_OPTS).superset?(
+ Set.new(SiteSettings::TypeSupervisor::VALIDATOR_OPTS),
+ ),
+ ).to be_truthy
end
end
- describe '#types' do
+ describe "#types" do
context "when verifying enum sequence" do
it "'string' should be at 1st position" do
expect(SiteSettings::TypeSupervisor.types[:string]).to eq(1)
@@ -95,46 +98,45 @@ RSpec.describe SiteSettings::TypeSupervisor do
end
end
- describe '#parse_value_type' do
- it 'returns :null type when the value is nil' do
+ describe "#parse_value_type" do
+ it "returns :null type when the value is nil" do
expect(subject.parse_value_type(nil)).to eq(SiteSetting.types[:null])
end
- it 'returns :integer type when the value is int' do
+ it "returns :integer type when the value is int" do
expect(subject.parse_value_type(2)).to eq(SiteSetting.types[:integer])
end
- it 'returns :integer type when the value is large int' do
- expect(subject.parse_value_type(99999999999999999999999999999999999)).to eq(SiteSetting.types[:integer])
+ it "returns :integer type when the value is large int" do
+ expect(subject.parse_value_type(99_999_999_999_999_999_999_999_999_999_999_999)).to eq(
+ SiteSetting.types[:integer],
+ )
end
- it 'returns :float type when the value is float' do
+ it "returns :float type when the value is float" do
expect(subject.parse_value_type(1.23)).to eq(SiteSetting.types[:float])
end
- it 'returns :bool type when the value is true' do
+ it "returns :bool type when the value is true" do
expect(subject.parse_value_type(true)).to eq(SiteSetting.types[:bool])
end
- it 'returns :bool type when the value is false' do
+ it "returns :bool type when the value is false" do
expect(subject.parse_value_type(false)).to eq(SiteSetting.types[:bool])
end
- it 'raises when the value is not listed' do
- expect {
- subject.parse_value_type(Object.new)
- }.to raise_error ArgumentError
+ it "raises when the value is not listed" do
+ expect { subject.parse_value_type(Object.new) }.to raise_error ArgumentError
end
-
end
- context 'with different data types' do
+ context "with different data types" do
class TestEnumClass
def self.valid_value?(v)
self.values.include?(v)
end
def self.values
- ['en']
+ ["en"]
end
def self.translate_names?
false
@@ -148,23 +150,13 @@ RSpec.describe SiteSettings::TypeSupervisor do
v < 10
end
def error_message
- ''
+ ""
end
end
class TestJsonSchemaClass
def self.schema
- {
- type: "array",
- items: {
- type: "object",
- properties: {
- name: {
- type: "string",
- },
- },
- },
- }
+ { type: "array", items: { type: "object", properties: { name: { type: "string" } } } }
end
end
@@ -174,193 +166,249 @@ RSpec.describe SiteSettings::TypeSupervisor do
settings.setting(:type_true, true)
settings.setting(:type_false, false)
settings.setting(:type_float, 2.3232)
- settings.setting(:type_string, 'string')
- settings.setting(:type_enum_default_string, '2', type: 'enum', choices: ['2'])
- settings.setting(:type_enum_class, 'en', enum: 'TestEnumClass')
- settings.setting(:type_validator, 5, validator: 'TestSmallThanTenValidator')
- settings.setting(:type_mock_validate_method, 'no_value')
- settings.setting(:type_custom, 'custom', type: 'list')
- settings.setting(:type_upload, '', type: 'upload')
- settings.setting(:type_json_schema, "[{\"name\":\"Brett\"}]", json_schema: 'TestJsonSchemaClass')
+ settings.setting(:type_string, "string")
+ settings.setting(:type_enum_default_string, "2", type: "enum", choices: ["2"])
+ settings.setting(:type_enum_class, "en", enum: "TestEnumClass")
+ settings.setting(:type_validator, 5, validator: "TestSmallThanTenValidator")
+ settings.setting(:type_mock_validate_method, "no_value")
+ settings.setting(:type_custom, "custom", type: "list")
+ settings.setting(:type_upload, "", type: "upload")
+ settings.setting(
+ :type_json_schema,
+ "[{\"name\":\"Brett\"}]",
+ json_schema: "TestJsonSchemaClass",
+ )
settings.refresh!
end
- describe '#to_db_value' do
- let(:true_val) { 't' }
- let(:false_val) { 'f' }
+ describe "#to_db_value" do
+ let(:true_val) { "t" }
+ let(:false_val) { "f" }
- it 'returns nil value' do
- expect(settings.type_supervisor.to_db_value(:type_null, nil)).to eq [nil, SiteSetting.types[:null]]
+ it "returns nil value" do
+ expect(settings.type_supervisor.to_db_value(:type_null, nil)).to eq [
+ nil,
+ SiteSetting.types[:null],
+ ]
end
- it 'gives a second chance to guess even told :null type' do
- expect(settings.type_supervisor.to_db_value(:type_null, 1)).to eq [1, SiteSetting.types[:integer]]
+ it "gives a second chance to guess even told :null type" do
+ expect(settings.type_supervisor.to_db_value(:type_null, 1)).to eq [
+ 1,
+ SiteSetting.types[:integer],
+ ]
end
- it 'writes `t` or `f` given the possible bool value' do
- expect(settings.type_supervisor.to_db_value(:type_true, true)).to eq [true_val, SiteSetting.types[:bool]]
- expect(settings.type_supervisor.to_db_value(:type_true, 't')).to eq [true_val, SiteSetting.types[:bool]]
- expect(settings.type_supervisor.to_db_value(:type_true, 'true')).to eq [true_val, SiteSetting.types[:bool]]
- expect(settings.type_supervisor.to_db_value(:type_true, false)).to eq [false_val, SiteSetting.types[:bool]]
+ it "writes `t` or `f` given the possible bool value" do
+ expect(settings.type_supervisor.to_db_value(:type_true, true)).to eq [
+ true_val,
+ SiteSetting.types[:bool],
+ ]
+ expect(settings.type_supervisor.to_db_value(:type_true, "t")).to eq [
+ true_val,
+ SiteSetting.types[:bool],
+ ]
+ expect(settings.type_supervisor.to_db_value(:type_true, "true")).to eq [
+ true_val,
+ SiteSetting.types[:bool],
+ ]
+ expect(settings.type_supervisor.to_db_value(:type_true, false)).to eq [
+ false_val,
+ SiteSetting.types[:bool],
+ ]
end
- it 'writes `f` if given not `true` value' do
- expect(settings.type_supervisor.to_db_value(:type_true, '')).to eq [false_val, SiteSetting.types[:bool]]
- expect(settings.type_supervisor.to_db_value(:type_true, nil)).to eq [false_val, SiteSetting.types[:bool]]
+ it "writes `f` if given not `true` value" do
+ expect(settings.type_supervisor.to_db_value(:type_true, "")).to eq [
+ false_val,
+ SiteSetting.types[:bool],
+ ]
+ expect(settings.type_supervisor.to_db_value(:type_true, nil)).to eq [
+ false_val,
+ SiteSetting.types[:bool],
+ ]
end
- it 'returns floats value' do
- expect(settings.type_supervisor.to_db_value(:type_float, 1.2)).to eq [1.2, SiteSetting.types[:float]]
- expect(settings.type_supervisor.to_db_value(:type_float, 1)).to eq [1.0, SiteSetting.types[:float]]
+ it "returns floats value" do
+ expect(settings.type_supervisor.to_db_value(:type_float, 1.2)).to eq [
+ 1.2,
+ SiteSetting.types[:float],
+ ]
+ expect(settings.type_supervisor.to_db_value(:type_float, 1)).to eq [
+ 1.0,
+ SiteSetting.types[:float],
+ ]
end
- it 'returns string value' do
- expect(settings.type_supervisor.to_db_value(:type_string, 'a')).to eq ['a', SiteSetting.types[:string]]
+ it "returns string value" do
+ expect(settings.type_supervisor.to_db_value(:type_string, "a")).to eq [
+ "a",
+ SiteSetting.types[:string],
+ ]
end
- it 'returns the upload id' do
+ it "returns the upload id" do
upload = Fabricate(:upload)
- expect(settings.type_supervisor.to_db_value(:type_upload, upload))
- .to eq([upload.id, SiteSetting.types[:upload]])
+ expect(settings.type_supervisor.to_db_value(:type_upload, upload)).to eq(
+ [upload.id, SiteSetting.types[:upload]],
+ )
- expect(settings.type_supervisor.to_db_value(:type_upload, 1))
- .to eq([1, SiteSetting.types[:upload]])
+ expect(settings.type_supervisor.to_db_value(:type_upload, 1)).to eq(
+ [1, SiteSetting.types[:upload]],
+ )
end
- it 'returns enum value with string default' do
- expect(settings.type_supervisor.to_db_value(:type_enum_default_string, 2)).to eq ['2', SiteSetting.types[:enum]]
- expect(settings.type_supervisor.to_db_value(:type_enum_default_string, '2')).to eq ['2', SiteSetting.types[:enum]]
+ it "returns enum value with string default" do
+ expect(settings.type_supervisor.to_db_value(:type_enum_default_string, 2)).to eq [
+ "2",
+ SiteSetting.types[:enum],
+ ]
+ expect(settings.type_supervisor.to_db_value(:type_enum_default_string, "2")).to eq [
+ "2",
+ SiteSetting.types[:enum],
+ ]
end
- it 'raises when it does not in the enum choices' do
+ it "raises when it does not in the enum choices" do
expect {
- settings.type_supervisor.to_db_value(:type_enum_default_string, 'random')
+ settings.type_supervisor.to_db_value(:type_enum_default_string, "random")
}.to raise_error Discourse::InvalidParameters
end
- it 'returns enum value for the given enum class' do
- expect(settings.type_supervisor.to_db_value(:type_enum_class, 'en')).to eq ['en', SiteSetting.types[:enum]]
+ it "returns enum value for the given enum class" do
+ expect(settings.type_supervisor.to_db_value(:type_enum_class, "en")).to eq [
+ "en",
+ SiteSetting.types[:enum],
+ ]
end
- it 'raises when it does not in the enum class' do
+ it "raises when it does not in the enum class" do
expect {
- settings.type_supervisor.to_db_value(:type_enum_class, 'random')
+ settings.type_supervisor.to_db_value(:type_enum_class, "random")
}.to raise_error Discourse::InvalidParameters
end
- it 'validates value by validator' do
- expect(settings.type_supervisor.to_db_value(:type_validator, 1)).to eq [1, SiteSetting.types[:integer]]
+ it "validates value by validator" do
+ expect(settings.type_supervisor.to_db_value(:type_validator, 1)).to eq [
+ 1,
+ SiteSetting.types[:integer],
+ ]
end
- it 'raises when the validator says so' do
+ it "raises when the validator says so" do
expect {
settings.type_supervisor.to_db_value(:type_validator, 11)
}.to raise_error Discourse::InvalidParameters
end
- it 'tries invoke validate methods' do
- settings.type_supervisor.expects(:validate_type_mock_validate_method).with('no')
- settings.type_supervisor.to_db_value(:type_mock_validate_method, 'no')
+ it "tries invoke validate methods" do
+ settings.type_supervisor.expects(:validate_type_mock_validate_method).with("no")
+ settings.type_supervisor.to_db_value(:type_mock_validate_method, "no")
end
- it 'raises when there is invalid json in a string with json schema' do
+ it "raises when there is invalid json in a string with json schema" do
expect {
- settings.type_supervisor.to_db_value(:type_json_schema, 'not-json')
+ settings.type_supervisor.to_db_value(:type_json_schema, "not-json")
}.to raise_error Discourse::InvalidParameters
end
- it 'returns value for the given json schema string setting' do
- expect(settings.type_supervisor.to_db_value(:type_json_schema, '{}')).to eq ['{}', SiteSetting.types[:string]]
+ it "returns value for the given json schema string setting" do
+ expect(settings.type_supervisor.to_db_value(:type_json_schema, "{}")).to eq [
+ "{}",
+ SiteSetting.types[:string],
+ ]
end
end
- describe '#to_rb_value' do
- it 'the type can be overridden by a parameter' do
- expect(settings.type_supervisor.to_rb_value(:type_null, '1', SiteSetting.types[:integer])).to eq(1)
+ describe "#to_rb_value" do
+ it "the type can be overridden by a parameter" do
+ expect(
+ settings.type_supervisor.to_rb_value(:type_null, "1", SiteSetting.types[:integer]),
+ ).to eq(1)
end
- it 'returns nil value' do
- expect(settings.type_supervisor.to_rb_value(:type_null, '1')).to eq nil
+ it "returns nil value" do
+ expect(settings.type_supervisor.to_rb_value(:type_null, "1")).to eq nil
expect(settings.type_supervisor.to_rb_value(:type_null, 1)).to eq nil
- expect(settings.type_supervisor.to_rb_value(:type_null, 'null')).to eq nil
- expect(settings.type_supervisor.to_rb_value(:type_null, 'nil')).to eq nil
+ expect(settings.type_supervisor.to_rb_value(:type_null, "null")).to eq nil
+ expect(settings.type_supervisor.to_rb_value(:type_null, "nil")).to eq nil
end
- it 'returns true when it is true or `t` or `true`' do
+ it "returns true when it is true or `t` or `true`" do
expect(settings.type_supervisor.to_rb_value(:type_true, true)).to eq true
- expect(settings.type_supervisor.to_rb_value(:type_true, 't')).to eq true
- expect(settings.type_supervisor.to_rb_value(:type_true, 'true')).to eq true
+ expect(settings.type_supervisor.to_rb_value(:type_true, "t")).to eq true
+ expect(settings.type_supervisor.to_rb_value(:type_true, "true")).to eq true
end
- it 'returns false if not one of `true` value' do
- expect(settings.type_supervisor.to_rb_value(:type_true, 'tr')).to eq false
- expect(settings.type_supervisor.to_rb_value(:type_true, '')).to eq false
+ it "returns false if not one of `true` value" do
+ expect(settings.type_supervisor.to_rb_value(:type_true, "tr")).to eq false
+ expect(settings.type_supervisor.to_rb_value(:type_true, "")).to eq false
expect(settings.type_supervisor.to_rb_value(:type_true, nil)).to eq false
expect(settings.type_supervisor.to_rb_value(:type_true, false)).to eq false
- expect(settings.type_supervisor.to_rb_value(:type_true, 'f')).to eq false
- expect(settings.type_supervisor.to_rb_value(:type_true, 'false')).to eq false
+ expect(settings.type_supervisor.to_rb_value(:type_true, "f")).to eq false
+ expect(settings.type_supervisor.to_rb_value(:type_true, "false")).to eq false
end
- it 'returns float value' do
+ it "returns float value" do
expect(settings.type_supervisor.to_rb_value(:type_float, 1.2)).to eq 1.2
expect(settings.type_supervisor.to_rb_value(:type_float, 1)).to eq 1.0
- expect(settings.type_supervisor.to_rb_value(:type_float, '2.2')).to eq 2.2
- expect(settings.type_supervisor.to_rb_value(:type_float, '2')).to eq 2
+ expect(settings.type_supervisor.to_rb_value(:type_float, "2.2")).to eq 2.2
+ expect(settings.type_supervisor.to_rb_value(:type_float, "2")).to eq 2
end
- it 'returns string value' do
- expect(settings.type_supervisor.to_rb_value(:type_string, 'a')).to eq 'a'
- expect(settings.type_supervisor.to_rb_value(:type_string, 2)).to eq '2'
+ it "returns string value" do
+ expect(settings.type_supervisor.to_rb_value(:type_string, "a")).to eq "a"
+ expect(settings.type_supervisor.to_rb_value(:type_string, 2)).to eq "2"
end
- it 'returns the upload record' do
+ it "returns the upload record" do
upload = Fabricate(:upload)
- expect(settings.type_supervisor.to_rb_value(:type_upload, ''))
- .to eq('')
+ expect(settings.type_supervisor.to_rb_value(:type_upload, "")).to eq("")
- expect(settings.type_supervisor.to_rb_value(:type_upload, upload.id))
- .to eq(upload.id)
+ expect(settings.type_supervisor.to_rb_value(:type_upload, upload.id)).to eq(upload.id)
end
- it 'returns value with string default' do
- expect(settings.type_supervisor.to_rb_value(:type_enum_default_string, 2)).to eq '2'
- expect(settings.type_supervisor.to_rb_value(:type_enum_default_string, '2')).to eq '2'
+ it "returns value with string default" do
+ expect(settings.type_supervisor.to_rb_value(:type_enum_default_string, 2)).to eq "2"
+ expect(settings.type_supervisor.to_rb_value(:type_enum_default_string, "2")).to eq "2"
end
- it 'returns value with a custom type' do
+ it "returns value with a custom type" do
expect(settings.type_supervisor.to_rb_value(:type_custom, 2)).to eq 2
- expect(settings.type_supervisor.to_rb_value(:type_custom, '2|3')).to eq '2|3'
+ expect(settings.type_supervisor.to_rb_value(:type_custom, "2|3")).to eq "2|3"
end
- it 'should not modify the types of settings' do
+ it "should not modify the types of settings" do
types = SiteSettings::TypeSupervisor.types
- settings.type_supervisor.to_rb_value(:default_locale, 'fr', types[:enum])
- expect(settings.type_supervisor.to_db_value(:default_locale, 'en')).to eq(['en', types[:string]])
+ settings.type_supervisor.to_rb_value(:default_locale, "fr", types[:enum])
+ expect(settings.type_supervisor.to_db_value(:default_locale, "en")).to eq(
+ ["en", types[:string]],
+ )
end
end
end
- describe '#get_type' do
+ describe "#get_type" do
before do
settings.setting(:type_null, nil)
- settings.setting(:type_upload, '', type: :upload)
+ settings.setting(:type_upload, "", type: :upload)
end
- it 'should return the right type that has been registered' do
+ it "should return the right type that has been registered" do
expect(settings.type_supervisor.get_type(:type_null)).to eq(:null)
expect(settings.type_supervisor.get_type(:type_upload)).to eq(:upload)
end
end
- describe '.type_hash' do
+ describe ".type_hash" do
class TestEnumClass2
def self.valid_value?(v)
self.values.include?(v)
end
def self.values
- ['a', 'b']
+ %w[a b]
end
def self.translate_names?
false
@@ -372,60 +420,58 @@ RSpec.describe SiteSettings::TypeSupervisor do
settings.setting(:type_int, 1)
settings.setting(:type_true, true)
settings.setting(:type_float, 2.3232)
- settings.setting(:type_string, 'string')
- settings.setting(:type_url_list, 'string', type: 'url_list')
- settings.setting(:type_textarea, 'string', textarea: true)
- settings.setting(:type_enum_choices, '2', type: 'enum', choices: ['1', '2'])
- settings.setting(:type_enum_class, 'a', enum: 'TestEnumClass2')
- settings.setting(:type_list, 'a', type: 'list', choices: ['a', 'b'], list_type: 'compact')
+ settings.setting(:type_string, "string")
+ settings.setting(:type_url_list, "string", type: "url_list")
+ settings.setting(:type_textarea, "string", textarea: true)
+ settings.setting(:type_enum_choices, "2", type: "enum", choices: %w[1 2])
+ settings.setting(:type_enum_class, "a", enum: "TestEnumClass2")
+ settings.setting(:type_list, "a", type: "list", choices: %w[a b], list_type: "compact")
settings.refresh!
end
- it 'returns null type' do
- expect(settings.type_supervisor.type_hash(:type_null)[:type]).to eq 'null'
+ it "returns null type" do
+ expect(settings.type_supervisor.type_hash(:type_null)[:type]).to eq "null"
end
- it 'returns int type' do
- expect(settings.type_supervisor.type_hash(:type_int)[:type]).to eq 'integer'
+ it "returns int type" do
+ expect(settings.type_supervisor.type_hash(:type_int)[:type]).to eq "integer"
end
- it 'returns bool type' do
- expect(settings.type_supervisor.type_hash(:type_true)[:type]).to eq 'bool'
+ it "returns bool type" do
+ expect(settings.type_supervisor.type_hash(:type_true)[:type]).to eq "bool"
end
- it 'returns float type' do
- expect(settings.type_supervisor.type_hash(:type_float)[:type]).to eq 'float'
+ it "returns float type" do
+ expect(settings.type_supervisor.type_hash(:type_float)[:type]).to eq "float"
end
- it 'returns string type' do
- expect(settings.type_supervisor.type_hash(:type_string)[:type]).to eq 'string'
+ it "returns string type" do
+ expect(settings.type_supervisor.type_hash(:type_string)[:type]).to eq "string"
end
- it 'returns url_list type' do
- expect(settings.type_supervisor.type_hash(:type_url_list)[:type]).to eq 'url_list'
+ it "returns url_list type" do
+ expect(settings.type_supervisor.type_hash(:type_url_list)[:type]).to eq "url_list"
end
- it 'returns textarea type' do
+ it "returns textarea type" do
expect(settings.type_supervisor.type_hash(:type_textarea)[:textarea]).to eq true
end
- it 'returns enum type' do
- expect(settings.type_supervisor.type_hash(:type_enum_choices)[:type]).to eq 'enum'
+ it "returns enum type" do
+ expect(settings.type_supervisor.type_hash(:type_enum_choices)[:type]).to eq "enum"
end
- it 'returns list choices' do
- expect(settings.type_supervisor.type_hash(:type_list)[:choices]).to eq ['a', 'b']
+ it "returns list choices" do
+ expect(settings.type_supervisor.type_hash(:type_list)[:choices]).to eq %w[a b]
end
- it 'returns list list_type' do
- expect(settings.type_supervisor.type_hash(:type_list)[:list_type]).to eq 'compact'
+ it "returns list list_type" do
+ expect(settings.type_supervisor.type_hash(:type_list)[:list_type]).to eq "compact"
end
- it 'returns enum choices' do
+ it "returns enum choices" do
hash = settings.type_supervisor.type_hash(:type_enum_choices)
- expect(hash[:valid_values]).to eq [{ name: '1', value: '1' }, { name: '2', value: '2' }]
+ expect(hash[:valid_values]).to eq [{ name: "1", value: "1" }, { name: "2", value: "2" }]
expect(hash[:translate_names]).to eq false
end
- it 'returns enum class' do
+ it "returns enum class" do
hash = settings.type_supervisor.type_hash(:type_enum_class)
- expect(hash[:valid_values]).to eq ['a', 'b']
+ expect(hash[:valid_values]).to eq %w[a b]
expect(hash[:translate_names]).to eq false
end
-
end
-
end
diff --git a/spec/lib/site_settings/validations_spec.rb b/spec/lib/site_settings/validations_spec.rb
index 090e1e7bef1..fea8230d8c6 100644
--- a/spec/lib/site_settings/validations_spec.rb
+++ b/spec/lib/site_settings/validations_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-require 'site_settings/validations'
+require "site_settings/validations"
RSpec.describe SiteSettings::Validations do
subject { Class.new.include(described_class).new }
@@ -13,9 +13,9 @@ RSpec.describe SiteSettings::Validations do
end
it "won't allow you to input junk categories" do
- expect {
- subject.validate_default_categories_watching("junk")
- }.to raise_error(Discourse::InvalidParameters)
+ expect { subject.validate_default_categories_watching("junk") }.to raise_error(
+ Discourse::InvalidParameters,
+ )
expect {
subject.validate_default_categories_watching("#{category.id}|12312323")
@@ -25,9 +25,9 @@ RSpec.describe SiteSettings::Validations do
it "prevents using the same category in more than one default group" do
SiteSetting.default_categories_watching = "#{category.id}"
- expect {
- SiteSetting.default_categories_tracking = "#{category.id}"
- }.to raise_error(Discourse::InvalidParameters)
+ expect { SiteSetting.default_categories_tracking = "#{category.id}" }.to raise_error(
+ Discourse::InvalidParameters,
+ )
end
end
@@ -56,15 +56,24 @@ RSpec.describe SiteSettings::Validations do
it "should raise an error when both buckets are equal" do
change_bucket_value("my-awesome-bucket")
- expect { validate("my-awesome-bucket") }.to raise_error(Discourse::InvalidParameters, error_message)
+ expect { validate("my-awesome-bucket") }.to raise_error(
+ Discourse::InvalidParameters,
+ error_message,
+ )
end
it "should raise an error when both buckets are equal except for a trailing slash" do
change_bucket_value("my-awesome-bucket/")
- expect { validate("my-awesome-bucket") }.to raise_error(Discourse::InvalidParameters, error_message)
+ expect { validate("my-awesome-bucket") }.to raise_error(
+ Discourse::InvalidParameters,
+ error_message,
+ )
change_bucket_value("my-awesome-bucket")
- expect { validate("my-awesome-bucket/") }.to raise_error(Discourse::InvalidParameters, error_message)
+ expect { validate("my-awesome-bucket/") }.to raise_error(
+ Discourse::InvalidParameters,
+ error_message,
+ )
end
end
@@ -97,10 +106,16 @@ RSpec.describe SiteSettings::Validations do
it "should raise an error when the 's3_upload_bucket' is a subdirectory of 's3_backup_bucket'" do
SiteSetting.s3_backup_bucket = "my-awesome-bucket"
- expect { validate("my-awesome-bucket/uploads") }.to raise_error(Discourse::InvalidParameters, error_message)
+ expect { validate("my-awesome-bucket/uploads") }.to raise_error(
+ Discourse::InvalidParameters,
+ error_message,
+ )
SiteSetting.s3_backup_bucket = "my-awesome-bucket/foo"
- expect { validate("my-awesome-bucket/foo/uploads") }.to raise_error(Discourse::InvalidParameters, error_message)
+ expect { validate("my-awesome-bucket/foo/uploads") }.to raise_error(
+ Discourse::InvalidParameters,
+ error_message,
+ )
end
it "cannot be made blank unless the setting is false" do
@@ -117,20 +132,21 @@ RSpec.describe SiteSettings::Validations do
describe "enforce second factor & local/auth provider login interplay" do
describe "#validate_enforce_second_factor" do
context "when local logins are disabled" do
- let(:error_message) { I18n.t("errors.site_settings.second_factor_cannot_be_enforced_with_disabled_local_login") }
- before do
- SiteSetting.enable_local_logins = false
+ let(:error_message) do
+ I18n.t("errors.site_settings.second_factor_cannot_be_enforced_with_disabled_local_login")
end
+ before { SiteSetting.enable_local_logins = false }
it "should raise an error" do
- expect { subject.validate_enforce_second_factor("t") }.to raise_error(Discourse::InvalidParameters, error_message)
+ expect { subject.validate_enforce_second_factor("t") }.to raise_error(
+ Discourse::InvalidParameters,
+ error_message,
+ )
end
end
context "when local logins are enabled" do
- before do
- SiteSetting.enable_local_logins = true
- end
+ before { SiteSetting.enable_local_logins = true }
it "should be ok" do
expect { subject.validate_enforce_second_factor("t") }.not_to raise_error
@@ -138,48 +154,64 @@ RSpec.describe SiteSettings::Validations do
end
context "when social logins are enabled" do
- let(:error_message) { I18n.t("errors.site_settings.second_factor_cannot_enforce_with_socials", auth_provider_names: "facebook, github") }
+ let(:error_message) do
+ I18n.t(
+ "errors.site_settings.second_factor_cannot_enforce_with_socials",
+ auth_provider_names: "facebook, github",
+ )
+ end
before do
SiteSetting.enable_facebook_logins = true
SiteSetting.enable_github_logins = true
end
it "raises and error, and specifies the auth providers" do
- expect { subject.validate_enforce_second_factor("all") }.to raise_error(Discourse::InvalidParameters, error_message)
+ expect { subject.validate_enforce_second_factor("all") }.to raise_error(
+ Discourse::InvalidParameters,
+ error_message,
+ )
end
end
context "when SSO is enabled" do
- let(:error_message) { I18n.t("errors.site_settings.second_factor_cannot_be_enforced_with_discourse_connect_enabled") }
+ let(:error_message) do
+ I18n.t(
+ "errors.site_settings.second_factor_cannot_be_enforced_with_discourse_connect_enabled",
+ )
+ end
before do
SiteSetting.discourse_connect_url = "https://www.example.com/sso"
SiteSetting.enable_discourse_connect = true
end
it "should raise an error" do
- expect { subject.validate_enforce_second_factor("t") }.to raise_error(Discourse::InvalidParameters, error_message)
+ expect { subject.validate_enforce_second_factor("t") }.to raise_error(
+ Discourse::InvalidParameters,
+ error_message,
+ )
end
end
end
describe "#validate_enable_local_logins" do
- let(:error_message) { I18n.t("errors.site_settings.local_login_cannot_be_disabled_if_second_factor_enforced") }
+ let(:error_message) do
+ I18n.t("errors.site_settings.local_login_cannot_be_disabled_if_second_factor_enforced")
+ end
context "when the new value is false" do
context "when enforce second factor is enabled" do
- before do
- SiteSetting.enforce_second_factor = "all"
- end
+ before { SiteSetting.enforce_second_factor = "all" }
it "should raise an error" do
- expect { subject.validate_enable_local_logins("f") }.to raise_error(Discourse::InvalidParameters, error_message)
+ expect { subject.validate_enable_local_logins("f") }.to raise_error(
+ Discourse::InvalidParameters,
+ error_message,
+ )
end
end
context "when enforce second factor is disabled" do
- before do
- SiteSetting.enforce_second_factor = "no"
- end
+ before { SiteSetting.enforce_second_factor = "no" }
it "should be ok" do
expect { subject.validate_enable_local_logins("f") }.not_to raise_error
@@ -195,11 +227,16 @@ RSpec.describe SiteSettings::Validations do
end
describe "#validate_cors_origins" do
- let(:error_message) { I18n.t("errors.site_settings.cors_origins_should_not_have_trailing_slash") }
+ let(:error_message) do
+ I18n.t("errors.site_settings.cors_origins_should_not_have_trailing_slash")
+ end
context "when the new value has trailing slash" do
it "should raise an error" do
- expect { subject.validate_cors_origins("https://www.rainbows.com/") }.to raise_error(Discourse::InvalidParameters, error_message)
+ expect { subject.validate_cors_origins("https://www.rainbows.com/") }.to raise_error(
+ Discourse::InvalidParameters,
+ error_message,
+ )
end
end
end
@@ -212,12 +249,13 @@ RSpec.describe SiteSettings::Validations do
context "if secure uploads is enabled" do
let(:error_message) { I18n.t("errors.site_settings.page_publishing_requirements") }
- before do
- enable_secure_uploads
- end
+ before { enable_secure_uploads }
it "is not ok" do
- expect { subject.validate_enable_page_publishing("t") }.to raise_error(Discourse::InvalidParameters, error_message)
+ expect { subject.validate_enable_page_publishing("t") }.to raise_error(
+ Discourse::InvalidParameters,
+ error_message,
+ )
end
end
end
@@ -227,29 +265,26 @@ RSpec.describe SiteSettings::Validations do
let(:error_message) { I18n.t("errors.site_settings.secure_uploads_requirements") }
context "when the new value is true" do
- context 'if site setting for enable_s3_uploads is enabled' do
- before do
- SiteSetting.enable_s3_uploads = true
- end
+ context "if site setting for enable_s3_uploads is enabled" do
+ before { SiteSetting.enable_s3_uploads = true }
it "should be ok" do
expect { subject.validate_secure_uploads("t") }.not_to raise_error
end
end
- context 'if site setting for enable_s3_uploads is not enabled' do
- before do
- SiteSetting.enable_s3_uploads = false
- end
+ context "if site setting for enable_s3_uploads is not enabled" do
+ before { SiteSetting.enable_s3_uploads = false }
it "is not ok" do
- expect { subject.validate_secure_uploads("t") }.to raise_error(Discourse::InvalidParameters, error_message)
+ expect { subject.validate_secure_uploads("t") }.to raise_error(
+ Discourse::InvalidParameters,
+ error_message,
+ )
end
context "if global s3 setting is enabled" do
- before do
- GlobalSetting.stubs(:use_s3?).returns(true)
- end
+ before { GlobalSetting.stubs(:use_s3?).returns(true) }
it "should be ok" do
expect { subject.validate_secure_uploads("t") }.not_to raise_error
@@ -260,23 +295,24 @@ RSpec.describe SiteSettings::Validations do
end
describe "#validate_enable_s3_uploads" do
- let(:error_message) { I18n.t("errors.site_settings.cannot_enable_s3_uploads_when_s3_enabled_globally") }
+ let(:error_message) do
+ I18n.t("errors.site_settings.cannot_enable_s3_uploads_when_s3_enabled_globally")
+ end
context "when the new value is true" do
context "when s3 uploads are already globally enabled" do
- before do
- GlobalSetting.stubs(:use_s3?).returns(true)
- end
+ before { GlobalSetting.stubs(:use_s3?).returns(true) }
it "is not ok" do
- expect { subject.validate_enable_s3_uploads("t") }.to raise_error(Discourse::InvalidParameters, error_message)
+ expect { subject.validate_enable_s3_uploads("t") }.to raise_error(
+ Discourse::InvalidParameters,
+ error_message,
+ )
end
end
context "when s3 uploads are not already globally enabled" do
- before do
- GlobalSetting.stubs(:use_s3?).returns(false)
- end
+ before { GlobalSetting.stubs(:use_s3?).returns(false) }
it "should be ok" do
expect { subject.validate_enable_s3_uploads("t") }.not_to raise_error
@@ -286,19 +322,18 @@ RSpec.describe SiteSettings::Validations do
context "when the s3_upload_bucket is blank" do
let(:error_message) { I18n.t("errors.site_settings.s3_upload_bucket_is_required") }
- before do
- SiteSetting.s3_upload_bucket = nil
- end
+ before { SiteSetting.s3_upload_bucket = nil }
it "is not ok" do
- expect { subject.validate_enable_s3_uploads("t") }.to raise_error(Discourse::InvalidParameters, error_message)
+ expect { subject.validate_enable_s3_uploads("t") }.to raise_error(
+ Discourse::InvalidParameters,
+ error_message,
+ )
end
end
context "when the s3_upload_bucket is not blank" do
- before do
- SiteSetting.s3_upload_bucket = "some-bucket"
- end
+ before { SiteSetting.s3_upload_bucket = "some-bucket" }
it "should be ok" do
expect { subject.validate_enable_s3_uploads("t") }.not_to raise_error
@@ -310,84 +345,87 @@ RSpec.describe SiteSettings::Validations do
describe "slow_down_crawler_user_agents" do
let(:too_short_message) do
- I18n.t(
- "errors.site_settings.slow_down_crawler_user_agent_must_be_at_least_3_characters"
- )
+ I18n.t("errors.site_settings.slow_down_crawler_user_agent_must_be_at_least_3_characters")
end
let(:popular_browser_message) do
I18n.t(
"errors.site_settings.slow_down_crawler_user_agent_cannot_be_popular_browsers",
- values: SiteSettings::Validations::PROHIBITED_USER_AGENT_STRINGS.join(I18n.t("word_connector.comma"))
+ values:
+ SiteSettings::Validations::PROHIBITED_USER_AGENT_STRINGS.join(
+ I18n.t("word_connector.comma"),
+ ),
)
end
it "cannot contain a user agent that's shorter than 3 characters" do
- expect {
- subject.validate_slow_down_crawler_user_agents("ao|acsw")
- }.to raise_error(Discourse::InvalidParameters, too_short_message)
- expect {
- subject.validate_slow_down_crawler_user_agents("up")
- }.to raise_error(Discourse::InvalidParameters, too_short_message)
- expect {
- subject.validate_slow_down_crawler_user_agents("a|")
- }.to raise_error(Discourse::InvalidParameters, too_short_message)
- expect {
- subject.validate_slow_down_crawler_user_agents("|a")
- }.to raise_error(Discourse::InvalidParameters, too_short_message)
+ expect { subject.validate_slow_down_crawler_user_agents("ao|acsw") }.to raise_error(
+ Discourse::InvalidParameters,
+ too_short_message,
+ )
+ expect { subject.validate_slow_down_crawler_user_agents("up") }.to raise_error(
+ Discourse::InvalidParameters,
+ too_short_message,
+ )
+ expect { subject.validate_slow_down_crawler_user_agents("a|") }.to raise_error(
+ Discourse::InvalidParameters,
+ too_short_message,
+ )
+ expect { subject.validate_slow_down_crawler_user_agents("|a") }.to raise_error(
+ Discourse::InvalidParameters,
+ too_short_message,
+ )
end
it "allows user agents that are 3 characters or longer" do
- expect {
- subject.validate_slow_down_crawler_user_agents("aoc")
- }.not_to raise_error
- expect {
- subject.validate_slow_down_crawler_user_agents("anuq")
- }.not_to raise_error
- expect {
- subject.validate_slow_down_crawler_user_agents("pupsc|kcx")
- }.not_to raise_error
+ expect { subject.validate_slow_down_crawler_user_agents("aoc") }.not_to raise_error
+ expect { subject.validate_slow_down_crawler_user_agents("anuq") }.not_to raise_error
+ expect { subject.validate_slow_down_crawler_user_agents("pupsc|kcx") }.not_to raise_error
end
it "allows the setting to be empty" do
- expect {
- subject.validate_slow_down_crawler_user_agents("")
- }.not_to raise_error
+ expect { subject.validate_slow_down_crawler_user_agents("") }.not_to raise_error
end
it "cannot contain a token of a popular browser user agent" do
- expect {
- subject.validate_slow_down_crawler_user_agents("mOzilla")
- }.to raise_error(Discourse::InvalidParameters, popular_browser_message)
+ expect { subject.validate_slow_down_crawler_user_agents("mOzilla") }.to raise_error(
+ Discourse::InvalidParameters,
+ popular_browser_message,
+ )
- expect {
- subject.validate_slow_down_crawler_user_agents("chRome|badcrawler")
- }.to raise_error(Discourse::InvalidParameters, popular_browser_message)
+ expect { subject.validate_slow_down_crawler_user_agents("chRome|badcrawler") }.to raise_error(
+ Discourse::InvalidParameters,
+ popular_browser_message,
+ )
- expect {
- subject.validate_slow_down_crawler_user_agents("html|badcrawler")
- }.to raise_error(Discourse::InvalidParameters, popular_browser_message)
+ expect { subject.validate_slow_down_crawler_user_agents("html|badcrawler") }.to raise_error(
+ Discourse::InvalidParameters,
+ popular_browser_message,
+ )
end
end
describe "strip image metadata and composer media optimization interplay" do
describe "#validate_strip_image_metadata" do
- let(:error_message) { I18n.t("errors.site_settings.strip_image_metadata_cannot_be_disabled_if_composer_media_optimization_image_enabled") }
+ let(:error_message) do
+ I18n.t(
+ "errors.site_settings.strip_image_metadata_cannot_be_disabled_if_composer_media_optimization_image_enabled",
+ )
+ end
context "when the new value is false" do
context "when composer_media_optimization_image_enabled is enabled" do
- before do
- SiteSetting.composer_media_optimization_image_enabled = true
- end
+ before { SiteSetting.composer_media_optimization_image_enabled = true }
it "should raise an error" do
- expect { subject.validate_strip_image_metadata("f") }.to raise_error(Discourse::InvalidParameters, error_message)
+ expect { subject.validate_strip_image_metadata("f") }.to raise_error(
+ Discourse::InvalidParameters,
+ error_message,
+ )
end
end
context "when composer_media_optimization_image_enabled is disabled" do
- before do
- SiteSetting.composer_media_optimization_image_enabled = false
- end
+ before { SiteSetting.composer_media_optimization_image_enabled = false }
it "should be ok" do
expect { subject.validate_strip_image_metadata("f") }.not_to raise_error
@@ -405,11 +443,12 @@ RSpec.describe SiteSettings::Validations do
describe "#twitter_summary_large_image" do
it "does not allow SVG image files" do
- upload = Fabricate(:upload, url: '/images/logo-dark.svg', extension: "svg")
+ upload = Fabricate(:upload, url: "/images/logo-dark.svg", extension: "svg")
expect { subject.validate_twitter_summary_large_image(upload.id) }.to raise_error(
- Discourse::InvalidParameters, I18n.t("errors.site_settings.twitter_summary_large_image_no_svg")
+ Discourse::InvalidParameters,
+ I18n.t("errors.site_settings.twitter_summary_large_image_no_svg"),
)
- upload.update!(url: '/images/logo-dark.png', extension: 'png')
+ upload.update!(url: "/images/logo-dark.png", extension: "png")
expect { subject.validate_twitter_summary_large_image(upload.id) }.not_to raise_error
expect { subject.validate_twitter_summary_large_image(nil) }.not_to raise_error
end
diff --git a/spec/lib/site_settings/yaml_loader_spec.rb b/spec/lib/site_settings/yaml_loader_spec.rb
index 8c38befb9e1..ee0b8bc0a41 100644
--- a/spec/lib/site_settings/yaml_loader_spec.rb
+++ b/spec/lib/site_settings/yaml_loader_spec.rb
@@ -1,16 +1,15 @@
# frozen_string_literal: true
-require 'site_settings/yaml_loader'
+require "site_settings/yaml_loader"
RSpec.describe SiteSettings::YamlLoader do
-
class Receiver
attr_reader :settings, :client_settings, :categories
def load_yaml(file_arg)
- SiteSettings::YamlLoader.new(file_arg).load do |category, name, default, opts|
- setting(category, name, default, opts)
- end
+ SiteSettings::YamlLoader
+ .new(file_arg)
+ .load { |category, name, default, opts| setting(category, name, default, opts) }
end
def setting(category, name, default = nil, opts = {})
@@ -24,10 +23,10 @@ RSpec.describe SiteSettings::YamlLoader do
end
end
- let!(:receiver) { Receiver.new }
- let(:simple) { "#{Rails.root}/spec/fixtures/site_settings/simple.yml" }
- let(:client) { "#{Rails.root}/spec/fixtures/site_settings/client.yml" }
- let(:enum) { "#{Rails.root}/spec/fixtures/site_settings/enum.yml" }
+ let!(:receiver) { Receiver.new }
+ let(:simple) { "#{Rails.root}/spec/fixtures/site_settings/simple.yml" }
+ let(:client) { "#{Rails.root}/spec/fixtures/site_settings/client.yml" }
+ let(:enum) { "#{Rails.root}/spec/fixtures/site_settings/enum.yml" }
let(:enum_client) { "#{Rails.root}/spec/fixtures/site_settings/enum_client.yml" }
let(:deprecated_env) { "#{Rails.root}/spec/fixtures/site_settings/deprecated_env.yml" }
let(:deprecated_hidden) { "#{Rails.root}/spec/fixtures/site_settings/deprecated_hidden.yml" }
@@ -35,39 +34,47 @@ RSpec.describe SiteSettings::YamlLoader do
let(:nil_default) { "#{Rails.root}/spec/fixtures/site_settings/nil_default.yml" }
it "loads simple settings" do
- receiver.expects(:setting).with('category1', 'title', 'My Site', {}).once
- receiver.expects(:setting).with('category1', 'contact_email', 'webmaster@example.com', {}).once
- receiver.expects(:setting).with('category2', 'editing_grace_period', true, {}).once
- receiver.expects(:setting).with('category3', 'reply_by_email_address', '', {}).once
+ receiver.expects(:setting).with("category1", "title", "My Site", {}).once
+ receiver.expects(:setting).with("category1", "contact_email", "webmaster@example.com", {}).once
+ receiver.expects(:setting).with("category2", "editing_grace_period", true, {}).once
+ receiver.expects(:setting).with("category3", "reply_by_email_address", "", {}).once
receiver.load_yaml(simple)
end
- it 'can take a File argument' do
+ it "can take a File argument" do
receiver.expects(:setting).at_least_once
receiver.load_yaml(File.new(simple))
end
it "maintains order of categories" do
receiver.load_yaml(simple)
- expect(receiver.categories).to eq(['category1', 'category2', 'category3'])
+ expect(receiver.categories).to eq(%w[category1 category2 category3])
end
it "can load client settings" do
- receiver.expects(:setting).with('category1', 'title', 'Discourse', { client: true })
- receiver.expects(:setting).with('category2', 'tos_url', '', { client: true })
- receiver.expects(:setting).with('category2', 'must_approve_users', false, { client: true })
+ receiver.expects(:setting).with("category1", "title", "Discourse", { client: true })
+ receiver.expects(:setting).with("category2", "tos_url", "", { client: true })
+ receiver.expects(:setting).with("category2", "must_approve_users", false, { client: true })
receiver.load_yaml(client)
end
it "can load enum settings" do
- receiver.expects(:setting).with('email', 'default_email_digest_frequency', 7, { enum: 'DigestEmailSiteSetting' })
+ receiver.expects(:setting).with(
+ "email",
+ "default_email_digest_frequency",
+ 7,
+ { enum: "DigestEmailSiteSetting" },
+ )
receiver.load_yaml(enum)
end
it "can load enum client settings" do
- receiver.expects(:setting).with do |category, name, default, opts|
- category == ('basics') && name == ('default_locale') && default == ('en') && opts[:enum] == ('LocaleSiteSetting') && opts[:client] == true
- end
+ receiver
+ .expects(:setting)
+ .with do |category, name, default, opts|
+ category == ("basics") && name == ("default_locale") && default == ("en") &&
+ opts[:enum] == ("LocaleSiteSetting") && opts[:client] == true
+ end
receiver.load_yaml(enum_client)
end
@@ -76,7 +83,12 @@ RSpec.describe SiteSettings::YamlLoader do
end
it "can load settings with locale default" do
- receiver.expects(:setting).with('search', 'min_search_term_length', 3, { min: 2, client: true, locale_default: { zh_CN: 2, zh_TW: 2 } })
+ receiver.expects(:setting).with(
+ "search",
+ "min_search_term_length",
+ 3,
+ { min: 2, client: true, locale_default: { zh_CN: 2, zh_TW: 2 } },
+ )
receiver.load_yaml(locale_default)
end
end
diff --git a/spec/lib/slug_spec.rb b/spec/lib/slug_spec.rb
index 43615d4f3f4..35127c6f266 100644
--- a/spec/lib/slug_spec.rb
+++ b/spec/lib/slug_spec.rb
@@ -1,49 +1,49 @@
# encoding: utf-8
# frozen_string_literal: true
-require 'slug'
+require "slug"
RSpec.describe Slug do
- describe '#for' do
- let(:default_slug) { 'topic' }
+ describe "#for" do
+ let(:default_slug) { "topic" }
- let(:very_long_string) do
- '内容似乎不清晰，这是个完整的句子吗？内容似乎不清晰，这是个完整的句子吗？' * 10
+ let(:very_long_string) { "内容似乎不清晰，这是个完整的句子吗？内容似乎不清晰，这是个完整的句子吗？" * 10 }
+
+ it "returns topic by default" do
+ expect(Slug.for("")).to eq default_slug
end
- it 'returns topic by default' do
- expect(Slug.for('')).to eq default_slug
+ it "return topic by default if the string boils down to a number" do
+ expect(Slug.for("=213=-!(@#+@)(!*_(@#&(!)#")).to eq default_slug
end
- it 'return topic by default if the string boils down to a number' do
- expect(Slug.for('=213=-!(@#+@)(!*_(@#&(!)#')).to eq default_slug
+ it "accepts fallback" do
+ expect(Slug.for("", "king")).to eq "king"
end
- it 'accepts fallback' do
- expect(Slug.for('', 'king')).to eq 'king'
- end
-
- it 'replaces the underscore' do
+ it "replaces the underscore" do
expect(Slug.for("o_o_o")).to eq("o-o-o")
end
- it 'strips emoji string' do
- expect(Slug.for(":smile: To Infinity and beyond! 🚀 :woman:t5:")).to eq("to-infinity-and-beyond")
+ it "strips emoji string" do
+ expect(Slug.for(":smile: To Infinity and beyond! 🚀 :woman:t5:")).to eq(
+ "to-infinity-and-beyond",
+ )
end
- context 'with ascii generator' do
- before { SiteSetting.slug_generation_method = 'ascii' }
+ context "with ascii generator" do
+ before { SiteSetting.slug_generation_method = "ascii" }
- it 'generates the slug' do
- expect(Slug.for("hello world")).to eq('hello-world')
+ it "generates the slug" do
+ expect(Slug.for("hello world")).to eq("hello-world")
end
- it 'generates default slug when nothing' do
- expect(Slug.for('')).to eq(default_slug)
+ it "generates default slug when nothing" do
+ expect(Slug.for("")).to eq(default_slug)
end
it "doesn't generate slugs that are just numbers" do
- expect(Slug.for('123')).to eq(default_slug)
+ expect(Slug.for("123")).to eq(default_slug)
end
it "fallbacks to empty string if it's too long" do
@@ -53,35 +53,39 @@ RSpec.describe Slug do
it "transliterates with the default locale" do
SiteSetting.default_locale = :de
I18n.locale = :en
- expect(Slug.for('löwe')).to eq('loewe')
+ expect(Slug.for("löwe")).to eq("loewe")
end
end
- context 'with encoded generator' do
- before { SiteSetting.slug_generation_method = 'encoded' }
- after { SiteSetting.slug_generation_method = 'ascii' }
+ context "with encoded generator" do
+ before { SiteSetting.slug_generation_method = "encoded" }
+ after { SiteSetting.slug_generation_method = "ascii" }
- it 'generates the slug' do
- expect(Slug.for("熱帶風暴畫眉")).to eq('%E7%86%B1%E5%B8%B6%E9%A2%A8%E6%9A%B4%E7%95%AB%E7%9C%89')
+ it "generates the slug" do
+ expect(Slug.for("熱帶風暴畫眉")).to eq("%E7%86%B1%E5%B8%B6%E9%A2%A8%E6%9A%B4%E7%95%AB%E7%9C%89")
expect(Slug.for("Jeff hate's !~-_|,=#this")).to eq("jeff-hates-this")
end
- it 'generates default slug when nothing' do
- expect(Slug.for('')).to eq(default_slug)
+ it "generates default slug when nothing" do
+ expect(Slug.for("")).to eq(default_slug)
end
it "doesn't generate slugs that are just numbers" do
- expect(Slug.for('123')).to eq(default_slug)
+ expect(Slug.for("123")).to eq(default_slug)
end
it "handles the special characters" do
- expect(Slug.for(
- " - English and Chinese title with special characters / 中文标题 !@:?\\:'`#^& $%&*()` -- "
- )).to eq("english-and-chinese-title-with-special-characters-%E4%B8%AD%E6%96%87%E6%A0%87%E9%A2%98")
+ expect(
+ Slug.for(
+ " - English and Chinese title with special characters / 中文标题 !@:?\\:'`#^& $%&*()` -- ",
+ ),
+ ).to eq(
+ "english-and-chinese-title-with-special-characters-%E4%B8%AD%E6%96%87%E6%A0%87%E9%A2%98",
+ )
end
it "kills the trailing dash" do
- expect(Slug.for("2- -this!~-_|,we-#-=^-")).to eq('2-this-we')
+ expect(Slug.for("2- -this!~-_|,we-#-=^-")).to eq("2-this-we")
end
it "returns a slug that can be used in a valid URL" do
@@ -90,53 +94,53 @@ RSpec.describe Slug do
end
end
- context 'with none generator' do
- before { SiteSetting.slug_generation_method = 'none' }
- after { SiteSetting.slug_generation_method = 'ascii' }
+ context "with none generator" do
+ before { SiteSetting.slug_generation_method = "none" }
+ after { SiteSetting.slug_generation_method = "ascii" }
- it 'generates the slug' do
- expect(Slug.for("hello world", 'category')).to eq('category')
+ it "generates the slug" do
+ expect(Slug.for("hello world", "category")).to eq("category")
expect(Slug.for("hello world")).to eq(default_slug)
- expect(Slug.for('')).to eq(default_slug)
- expect(Slug.for('123')).to eq(default_slug)
+ expect(Slug.for("")).to eq(default_slug)
+ expect(Slug.for("123")).to eq(default_slug)
end
end
end
- describe '#ascii_generator' do
- before { SiteSetting.slug_generation_method = 'ascii' }
+ describe "#ascii_generator" do
+ before { SiteSetting.slug_generation_method = "ascii" }
- it 'replaces spaces with hyphens' do
- expect(Slug.ascii_generator("hello world")).to eq('hello-world')
+ it "replaces spaces with hyphens" do
+ expect(Slug.ascii_generator("hello world")).to eq("hello-world")
end
- it 'changes accented characters' do
- expect(Slug.ascii_generator('àllo')).to eq('allo')
+ it "changes accented characters" do
+ expect(Slug.ascii_generator("àllo")).to eq("allo")
end
- it 'replaces symbols' do
- expect(Slug.ascii_generator('evil#trout')).to eq('evil-trout')
+ it "replaces symbols" do
+ expect(Slug.ascii_generator("evil#trout")).to eq("evil-trout")
end
- it 'handles a.b.c properly' do
+ it "handles a.b.c properly" do
expect(Slug.ascii_generator("a.b.c")).to eq("a-b-c")
end
- it 'handles double dots right' do
+ it "handles double dots right" do
expect(Slug.ascii_generator("a....b.....c")).to eq("a-b-c")
end
- it 'strips trailing punctuation' do
+ it "strips trailing punctuation" do
expect(Slug.ascii_generator("hello...")).to eq("hello")
end
- it 'strips leading punctuation' do
+ it "strips leading punctuation" do
expect(Slug.ascii_generator("...hello")).to eq("hello")
end
- it 'handles our initial transliteration' do
+ it "handles our initial transliteration" do
from = "àáäâčďèéëěêìíïîľĺňòóöôŕřšťůùúüûýžñç"
- to = "aaaacdeeeeeiiiillnoooorrstuuuuuyznc"
+ to = "aaaacdeeeeeiiiillnoooorrstuuuuuyznc"
expect(Slug.ascii_generator(from)).to eq(to)
end
@@ -144,51 +148,55 @@ RSpec.describe Slug do
expect(Slug.ascii_generator("Jeff hate's this")).to eq("jeff-hates-this")
end
- it 'generates null when nothing' do
- expect(Slug.ascii_generator('')).to eq('')
+ it "generates null when nothing" do
+ expect(Slug.ascii_generator("")).to eq("")
end
it "keeps number unchanged" do
- expect(Slug.ascii_generator('123')).to eq('123')
+ expect(Slug.ascii_generator("123")).to eq("123")
end
end
- describe '#encoded_generator' do
- before { SiteSetting.slug_generation_method = 'encoded' }
- after { SiteSetting.slug_generation_method = 'ascii' }
+ describe "#encoded_generator" do
+ before { SiteSetting.slug_generation_method = "encoded" }
+ after { SiteSetting.slug_generation_method = "ascii" }
- it 'generates percentage encoded string' do
+ it "generates percentage encoded string" do
expect(Slug.encoded_generator("뉴스피드")).to eq("%EB%89%B4%EC%8A%A4%ED%94%BC%EB%93%9C")
- expect(Slug.encoded_generator("آموزش اضافه کردن لینک اختیاری به هدر")).to eq("%D8%A2%D9%85%D9%88%D8%B2%D8%B4-%D8%A7%D8%B6%D8%A7%D9%81%D9%87-%DA%A9%D8%B1%D8%AF%D9%86-%D9%84%DB%8C%D9%86%DA%A9-%D8%A7%D8%AE%D8%AA%DB%8C%D8%A7%D8%B1%DB%8C-%D8%A8%D9%87-%D9%87%D8%AF%D8%B1")
- expect(Slug.encoded_generator("熱帶風暴畫眉")).to eq("%E7%86%B1%E5%B8%B6%E9%A2%A8%E6%9A%B4%E7%95%AB%E7%9C%89")
+ expect(Slug.encoded_generator("آموزش اضافه کردن لینک اختیاری به هدر")).to eq(
+ "%D8%A2%D9%85%D9%88%D8%B2%D8%B4-%D8%A7%D8%B6%D8%A7%D9%81%D9%87-%DA%A9%D8%B1%D8%AF%D9%86-%D9%84%DB%8C%D9%86%DA%A9-%D8%A7%D8%AE%D8%AA%DB%8C%D8%A7%D8%B1%DB%8C-%D8%A8%D9%87-%D9%87%D8%AF%D8%B1",
+ )
+ expect(Slug.encoded_generator("熱帶風暴畫眉")).to eq(
+ "%E7%86%B1%E5%B8%B6%E9%A2%A8%E6%9A%B4%E7%95%AB%E7%9C%89",
+ )
end
- it 'reject RFC 3986 reserved character and blank' do
+ it "reject RFC 3986 reserved character and blank" do
expect(Slug.encoded_generator(":/?#[]@!$ &'()*+,;=% -_`~.")).to eq("---") # will be clear by #for
end
- it 'generates null when nothing' do
- expect(Slug.encoded_generator('')).to eq('')
+ it "generates null when nothing" do
+ expect(Slug.encoded_generator("")).to eq("")
end
it "keeps number unchanged" do
- expect(Slug.encoded_generator('123')).to eq('123')
+ expect(Slug.encoded_generator("123")).to eq("123")
end
- it 'downcase the string' do
- expect(Slug.encoded_generator("LoWer")).to eq('lower')
+ it "downcase the string" do
+ expect(Slug.encoded_generator("LoWer")).to eq("lower")
end
end
- describe '#none_generator' do
- before { SiteSetting.slug_generation_method = 'none' }
- after { SiteSetting.slug_generation_method = 'ascii' }
+ describe "#none_generator" do
+ before { SiteSetting.slug_generation_method = "none" }
+ after { SiteSetting.slug_generation_method = "ascii" }
- it 'generates nothing' do
- expect(Slug.none_generator("Jeff hate's this")).to eq('')
- expect(Slug.none_generator(nil)).to eq('')
- expect(Slug.none_generator('')).to eq('')
- expect(Slug.none_generator('31')).to eq('')
+ it "generates nothing" do
+ expect(Slug.none_generator("Jeff hate's this")).to eq("")
+ expect(Slug.none_generator(nil)).to eq("")
+ expect(Slug.none_generator("")).to eq("")
+ expect(Slug.none_generator("31")).to eq("")
end
end
end
diff --git a/spec/lib/spam_handler_spec.rb b/spec/lib/spam_handler_spec.rb
index 06fb08fa904..c01482073ee 100644
--- a/spec/lib/spam_handler_spec.rb
+++ b/spec/lib/spam_handler_spec.rb
@@ -3,9 +3,7 @@
require "spam_handler"
RSpec.describe SpamHandler do
-
describe "#should_prevent_registration_from_ip?" do
-
it "works" do
# max_new_accounts_per_registration_ip = 0 disables the check
SiteSetting.max_new_accounts_per_registration_ip = 0
@@ -20,7 +18,9 @@ RSpec.describe SpamHandler do
Fabricate(:user, ip_address: "42.42.42.42", trust_level: TrustLevel[0])
Fabricate(:user, ip_address: "42.42.42.42", trust_level: TrustLevel[1])
- expect { Fabricate(:user, ip_address: "42.42.42.42", trust_level: TrustLevel[0]) }.to raise_error(ActiveRecord::RecordInvalid)
+ expect {
+ Fabricate(:user, ip_address: "42.42.42.42", trust_level: TrustLevel[0])
+ }.to raise_error(ActiveRecord::RecordInvalid)
end
it "doesn't limit registrations since there is a TL2+ user with that IP" do
@@ -57,7 +57,5 @@ RSpec.describe SpamHandler do
SiteSetting.max_new_accounts_per_registration_ip = 1
Fabricate(:user, ip_address: "42.42.42.42", trust_level: TrustLevel[0])
end
-
end
-
end
diff --git a/spec/lib/stylesheet/compiler_spec.rb b/spec/lib/stylesheet/compiler_spec.rb
index f6631b79a2b..81915f46ad2 100644
--- a/spec/lib/stylesheet/compiler_spec.rb
+++ b/spec/lib/stylesheet/compiler_spec.rb
@@ -1,13 +1,13 @@
# frozen_string_literal: true
-require 'stylesheet/compiler'
+require "stylesheet/compiler"
RSpec.describe Stylesheet::Compiler do
- describe 'compilation' do
+ describe "compilation" do
Dir["#{Rails.root.join("app/assets/stylesheets")}/*.scss"].each do |path|
next if path =~ /ember_cli/
- path = File.basename(path, '.scss')
+ path = File.basename(path, ".scss")
it "can compile '#{path}' css" do
css, _map = Stylesheet::Compiler.compile_asset(path)
@@ -18,13 +18,39 @@ RSpec.describe Stylesheet::Compiler do
context "with a theme" do
let!(:theme) { Fabricate(:theme) }
- let!(:upload) { UploadCreator.new(file_from_fixtures("logo.png"), "logo.png").create_for(Discourse.system_user.id) }
- let!(:upload_theme_field) { ThemeField.create!(theme: theme, target_id: 0, name: "primary", upload: upload, value: "", type_id: ThemeField.types[:theme_upload_var]) }
- let!(:stylesheet_theme_field) { ThemeField.create!(theme: theme, target_id: 0, name: "scss", value: "body { background: $primary }", type_id: ThemeField.types[:scss]) }
+ let!(:upload) do
+ UploadCreator.new(file_from_fixtures("logo.png"), "logo.png").create_for(
+ Discourse.system_user.id,
+ )
+ end
+ let!(:upload_theme_field) do
+ ThemeField.create!(
+ theme: theme,
+ target_id: 0,
+ name: "primary",
+ upload: upload,
+ value: "",
+ type_id: ThemeField.types[:theme_upload_var],
+ )
+ end
+ let!(:stylesheet_theme_field) do
+ ThemeField.create!(
+ theme: theme,
+ target_id: 0,
+ name: "scss",
+ value: "body { background: $primary }",
+ type_id: ThemeField.types[:scss],
+ )
+ end
before { stylesheet_theme_field.save! }
it "theme stylesheet should be able to access theme asset variables" do
- css, _map = Stylesheet::Compiler.compile_asset("desktop_theme", theme_id: theme.id, theme_variables: theme.scss_variables)
+ css, _map =
+ Stylesheet::Compiler.compile_asset(
+ "desktop_theme",
+ theme_id: theme.id,
+ theme_variables: theme.scss_variables,
+ )
expect(css).to include(upload.url)
end
@@ -80,7 +106,7 @@ RSpec.describe Stylesheet::Compiler do
css, _map = Stylesheet::Compiler.compile(scss, "test.scss")
expect(css).to include('url("http://test.localhost/images/favicons/github.png")')
- expect(css).not_to include('absolute-image-url')
+ expect(css).not_to include("absolute-image-url")
end
it "supports absolute-image-url in subfolder" do
@@ -90,7 +116,7 @@ RSpec.describe Stylesheet::Compiler do
css, _map = Stylesheet::Compiler.compile(scss, "test2.scss")
expect(css).to include('url("http://test.localhost/subfo/images/favicons/github.png")')
- expect(css).not_to include('absolute-image-url')
+ expect(css).not_to include("absolute-image-url")
end
it "supports absolute-image-url with CDNs" do
@@ -100,17 +126,20 @@ RSpec.describe Stylesheet::Compiler do
css, _map = Stylesheet::Compiler.compile(scss, "test2.scss")
expect(css).to include('url("https://awesome.com/images/favicons/github.png")')
- expect(css).not_to include('absolute-image-url')
+ expect(css).not_to include("absolute-image-url")
end
it "supports absolute-image-url in plugins" do
set_cdn_url "https://awesome.com"
scss = Stylesheet::Importer.new({}).prepended_scss
- scss += ".body{background-image: absolute-image-url('/plugins/discourse-special/images/somefile.png');}"
+ scss +=
+ ".body{background-image: absolute-image-url('/plugins/discourse-special/images/somefile.png');}"
css, _map = Stylesheet::Compiler.compile(scss, "discourse-special.scss")
- expect(css).to include('url("https://awesome.com/plugins/discourse-special/images/somefile.png")')
- expect(css).not_to include('absolute-image-url')
+ expect(css).to include(
+ 'url("https://awesome.com/plugins/discourse-special/images/somefile.png")',
+ )
+ expect(css).not_to include("absolute-image-url")
end
context "with a color scheme" do
@@ -121,10 +150,15 @@ RSpec.describe Stylesheet::Compiler do
end
it "returns color definitions for a custom color scheme" do
- cs = Fabricate(:color_scheme, name: 'Stylish', color_scheme_colors: [
- Fabricate(:color_scheme_color, name: 'header_primary', hex: '88af8e'),
- Fabricate(:color_scheme_color, name: 'header_background', hex: 'f8745c')
- ])
+ cs =
+ Fabricate(
+ :color_scheme,
+ name: "Stylish",
+ color_scheme_colors: [
+ Fabricate(:color_scheme_color, name: "header_primary", hex: "88af8e"),
+ Fabricate(:color_scheme_color, name: "header_background", hex: "f8745c"),
+ ],
+ )
css, _map = Stylesheet::Compiler.compile_asset("color_definitions", color_scheme_id: cs.id)
@@ -152,27 +186,30 @@ RSpec.describe Stylesheet::Compiler do
expect(css).to include("--plugin-color")
end
end
-
end
describe "indexes" do
it "include all SCSS files in their respective folders" do
refs = []
- Dir.glob(Rails.root.join('app/assets/stylesheets/**/*/')).each do |dir|
- Dir.glob("#{dir}_index.scss").each do |indexfile|
- contents = File.read indexfile
+ Dir
+ .glob(Rails.root.join("app/assets/stylesheets/**/*/"))
+ .each do |dir|
+ Dir
+ .glob("#{dir}_index.scss")
+ .each do |indexfile|
+ contents = File.read indexfile
- files = Dir["#{dir}*.scss"]
- files -= Dir["#{dir}_index.scss"]
- files.each do |path|
- filename = File.basename(path, ".scss")
- if !contents.match(/@import "#{filename}";/)
- refs << "#{filename} import missing in #{indexfile}"
+ files = Dir["#{dir}*.scss"]
+ files -= Dir["#{dir}_index.scss"]
+ files.each do |path|
+ filename = File.basename(path, ".scss")
+ if !contents.match(/@import "#{filename}";/)
+ refs << "#{filename} import missing in #{indexfile}"
+ end
+ end
end
- end
end
- end
expect(refs).to eq([])
end
diff --git a/spec/lib/stylesheet/importer_spec.rb b/spec/lib/stylesheet/importer_spec.rb
index e3d483d7b77..e11ccd4e552 100644
--- a/spec/lib/stylesheet/importer_spec.rb
+++ b/spec/lib/stylesheet/importer_spec.rb
@@ -1,9 +1,8 @@
# frozen_string_literal: true
-require 'stylesheet/importer'
+require "stylesheet/importer"
RSpec.describe Stylesheet::Importer do
-
def compile_css(name)
Stylesheet::Compiler.compile_asset(name)[0]
end
@@ -14,27 +13,37 @@ RSpec.describe Stylesheet::Importer do
background = Fabricate(:upload)
parent_category = Fabricate(:category)
- category = Fabricate(:category, parent_category_id: parent_category.id, uploaded_background: background)
+ category =
+ Fabricate(
+ :category,
+ parent_category_id: parent_category.id,
+ uploaded_background: background,
+ )
- expect(compile_css("color_definitions")).to include("body.category-#{parent_category.slug}-#{category.slug}{background-image:url(#{background.url})}")
+ expect(compile_css("color_definitions")).to include(
+ "body.category-#{parent_category.slug}-#{category.slug}{background-image:url(#{background.url})}",
+ )
GlobalSetting.stubs(:cdn_url).returns("//awesome.cdn")
- expect(compile_css("color_definitions")).to include("body.category-#{parent_category.slug}-#{category.slug}{background-image:url(//awesome.cdn#{background.url})}")
+ expect(compile_css("color_definitions")).to include(
+ "body.category-#{parent_category.slug}-#{category.slug}{background-image:url(//awesome.cdn#{background.url})}",
+ )
end
it "applies S3 CDN to background category images" do
setup_s3
SiteSetting.s3_use_iam_profile = true
- SiteSetting.s3_upload_bucket = 'test'
- SiteSetting.s3_region = 'ap-southeast-2'
+ SiteSetting.s3_upload_bucket = "test"
+ SiteSetting.s3_region = "ap-southeast-2"
SiteSetting.s3_cdn_url = "https://s3.cdn"
background = Fabricate(:upload_s3)
category = Fabricate(:category, uploaded_background: background)
- expect(compile_css("color_definitions")).to include("body.category-#{category.slug}{background-image:url(https://s3.cdn/original")
+ expect(compile_css("color_definitions")).to include(
+ "body.category-#{category.slug}{background-image:url(https://s3.cdn/original",
+ )
end
-
end
describe "#font" do
@@ -52,33 +61,36 @@ RSpec.describe Stylesheet::Importer do
SiteSetting.base_font = base_font[:key]
SiteSetting.heading_font = heading_font[:key]
- expect(compile_css("color_definitions"))
- .to include(":root{--font-family: #{base_font[:stack]}}")
- .and include(":root{--heading-font-family: #{heading_font[:stack]}}")
+ expect(compile_css("color_definitions")).to include(
+ ":root{--font-family: #{base_font[:stack]}}",
+ ).and include(":root{--heading-font-family: #{heading_font[:stack]}}")
set_cdn_url("http://cdn.localhost")
# uses CDN and includes cache-breaking param
- expect(compile_css("color_definitions"))
- .to include("http://cdn.localhost/fonts/#{base_font[:variants][0][:filename]}?v=#{DiscourseFonts::VERSION}")
- .and include("http://cdn.localhost/fonts/#{heading_font[:variants][0][:filename]}?v=#{DiscourseFonts::VERSION}")
+ expect(compile_css("color_definitions")).to include(
+ "http://cdn.localhost/fonts/#{base_font[:variants][0][:filename]}?v=#{DiscourseFonts::VERSION}",
+ ).and include(
+ "http://cdn.localhost/fonts/#{heading_font[:variants][0][:filename]}?v=#{DiscourseFonts::VERSION}",
+ )
end
it "includes all fonts in wizard" do
- expect(compile_css("wizard").scan(/\.body-font-/).count)
- .to eq(DiscourseFonts.fonts.count)
+ expect(compile_css("wizard").scan(/\.body-font-/).count).to eq(DiscourseFonts.fonts.count)
- expect(compile_css("wizard").scan(/\.heading-font-/).count)
- .to eq(DiscourseFonts.fonts.count)
+ expect(compile_css("wizard").scan(/\.heading-font-/).count).to eq(DiscourseFonts.fonts.count)
- expect(compile_css("wizard").scan(/@font-face/).count)
- .to eq(DiscourseFonts.fonts.map { |f| f[:variants]&.count || 0 }.sum)
+ expect(compile_css("wizard").scan(/@font-face/).count).to eq(
+ DiscourseFonts.fonts.map { |f| f[:variants]&.count || 0 }.sum,
+ )
end
end
describe "#import_color_definitions" do
let(:scss) { ":root{--custom-color: green}" }
- let(:scss_child) { "$navy: #000080; :root{--custom-color: red; --custom-color-rgb: \#{hexToRGB($navy)}}" }
+ let(:scss_child) do
+ "$navy: #000080; :root{--custom-color: red; --custom-color-rgb: \#{hexToRGB($navy)}}"
+ end
let(:theme) do
Fabricate(:theme).tap do |t|
@@ -87,10 +99,12 @@ RSpec.describe Stylesheet::Importer do
end
end
- let(:child) { Fabricate(:theme, component: true, name: "Child Theme").tap { |t|
- t.set_field(target: :common, name: "color_definitions", value: scss_child)
- t.save!
- }}
+ let(:child) do
+ Fabricate(:theme, component: true, name: "Child Theme").tap do |t|
+ t.set_field(target: :common, name: "color_definitions", value: scss_child)
+ t.save!
+ end
+ end
it "should include color definitions in the theme" do
styles = Stylesheet::Importer.new({ theme_id: theme.id }).import_color_definitions
@@ -105,7 +119,6 @@ RSpec.describe Stylesheet::Importer do
expect(styles).to include("Color definitions from Child Theme")
expect(styles).to include("--custom-color: red")
expect(styles).to include("--custom-color-rgb: 0,0,128")
-
end
it "should include default theme color definitions" do
@@ -117,13 +130,17 @@ RSpec.describe Stylesheet::Importer do
describe "#import_wcag_overrides" do
it "should do nothing on a regular scheme" do
- scheme = ColorScheme.create_from_base(name: 'Regular')
- expect(Stylesheet::Importer.new({ color_scheme_id: scheme.id }).import_wcag_overrides).to eq("")
+ scheme = ColorScheme.create_from_base(name: "Regular")
+ expect(Stylesheet::Importer.new({ color_scheme_id: scheme.id }).import_wcag_overrides).to eq(
+ "",
+ )
end
it "should include WCAG overrides for WCAG based scheme" do
- scheme = ColorScheme.create_from_base(name: 'WCAG New', base_scheme_id: "WCAG Dark")
- expect(Stylesheet::Importer.new({ color_scheme_id: scheme.id }).import_wcag_overrides).to eq("@import \"wcag\";")
+ scheme = ColorScheme.create_from_base(name: "WCAG New", base_scheme_id: "WCAG Dark")
+ expect(Stylesheet::Importer.new({ color_scheme_id: scheme.id }).import_wcag_overrides).to eq(
+ "@import \"wcag\";",
+ )
end
end
end
diff --git a/spec/lib/stylesheet/manager_spec.rb b/spec/lib/stylesheet/manager_spec.rb
index 0218e675441..dc74ab3a098 100644
--- a/spec/lib/stylesheet/manager_spec.rb
+++ b/spec/lib/stylesheet/manager_spec.rb
@@ -1,57 +1,64 @@
# frozen_string_literal: true
-require 'stylesheet/compiler'
+require "stylesheet/compiler"
RSpec.describe Stylesheet::Manager do
def manager(theme_id = nil)
Stylesheet::Manager.new(theme_id: theme_id)
end
- it 'does not crash for missing theme' do
+ it "does not crash for missing theme" do
Theme.clear_default!
link = manager.stylesheet_link_tag(:embedded_theme)
expect(link).to eq("")
end
it "still returns something for no themes" do
- link = manager.stylesheet_link_tag(:desktop, 'all')
+ link = manager.stylesheet_link_tag(:desktop, "all")
expect(link).not_to eq("")
end
describe "themes with components" do
- let(:child_theme) { Fabricate(:theme, component: true, name: "a component").tap { |c|
- c.set_field(target: :common, name: "scss", value: ".child_common{.scss{color: red;}}")
- c.set_field(target: :desktop, name: "scss", value: ".child_desktop{.scss{color: red;}}")
- c.set_field(target: :mobile, name: "scss", value: ".child_mobile{.scss{color: red;}}")
- c.set_field(target: :common, name: "embedded_scss", value: ".child_embedded{.scss{color: red;}}")
- c.save!
- }}
+ let(:child_theme) do
+ Fabricate(:theme, component: true, name: "a component").tap do |c|
+ c.set_field(target: :common, name: "scss", value: ".child_common{.scss{color: red;}}")
+ c.set_field(target: :desktop, name: "scss", value: ".child_desktop{.scss{color: red;}}")
+ c.set_field(target: :mobile, name: "scss", value: ".child_mobile{.scss{color: red;}}")
+ c.set_field(
+ target: :common,
+ name: "embedded_scss",
+ value: ".child_embedded{.scss{color: red;}}",
+ )
+ c.save!
+ end
+ end
- let(:theme) { Fabricate(:theme).tap { |t|
- t.set_field(target: :common, name: "scss", value: ".common{.scss{color: red;}}")
- t.set_field(target: :desktop, name: "scss", value: ".desktop{.scss{color: red;}}")
- t.set_field(target: :mobile, name: "scss", value: ".mobile{.scss{color: red;}}")
- t.set_field(target: :common, name: "embedded_scss", value: ".embedded{.scss{color: red;}}")
- t.save!
+ let(:theme) do
+ Fabricate(:theme).tap do |t|
+ t.set_field(target: :common, name: "scss", value: ".common{.scss{color: red;}}")
+ t.set_field(target: :desktop, name: "scss", value: ".desktop{.scss{color: red;}}")
+ t.set_field(target: :mobile, name: "scss", value: ".mobile{.scss{color: red;}}")
+ t.set_field(target: :common, name: "embedded_scss", value: ".embedded{.scss{color: red;}}")
+ t.save!
- t.add_relative_theme!(:child, child_theme)
- }}
+ t.add_relative_theme!(:child, child_theme)
+ end
+ end
it "generates the right links for non-theme targets" do
manager = manager(nil)
- hrefs = manager.stylesheet_details(:desktop, 'all')
+ hrefs = manager.stylesheet_details(:desktop, "all")
expect(hrefs.length).to eq(1)
end
- it 'can correctly compile theme css' do
+ it "can correctly compile theme css" do
manager = manager(theme.id)
- old_links = manager.stylesheet_link_tag(:desktop_theme, 'all')
+ old_links = manager.stylesheet_link_tag(:desktop_theme, "all")
- builder = Stylesheet::Manager::Builder.new(
- target: :desktop_theme, theme: theme, manager: manager
- )
+ builder =
+ Stylesheet::Manager::Builder.new(target: :desktop_theme, theme: theme, manager: manager)
builder.compile(force: true)
@@ -65,9 +72,12 @@ RSpec.describe Stylesheet::Manager do
expect(css).not_to match(/child_common/)
expect(css).not_to match(/child_desktop/)
- child_theme_builder = Stylesheet::Manager::Builder.new(
- target: :desktop_theme, theme: child_theme, manager: manager
- )
+ child_theme_builder =
+ Stylesheet::Manager::Builder.new(
+ target: :desktop_theme,
+ theme: child_theme,
+ manager: manager,
+ )
child_theme_builder.compile(force: true)
@@ -80,7 +90,7 @@ RSpec.describe Stylesheet::Manager do
child_theme.set_field(target: :desktop, name: :scss, value: ".nothing{color: green;}")
child_theme.save!
- new_links = manager(theme.id).stylesheet_link_tag(:desktop_theme, 'all')
+ new_links = manager(theme.id).stylesheet_link_tag(:desktop_theme, "all")
expect(new_links).not_to eq(old_links)
@@ -89,12 +99,11 @@ RSpec.describe Stylesheet::Manager do
expect(new_links).to include("/stylesheets/desktop_theme_#{child_theme.id}_")
end
- it 'can correctly compile embedded theme css' do
+ it "can correctly compile embedded theme css" do
manager = manager(theme.id)
- builder = Stylesheet::Manager::Builder.new(
- target: :embedded_theme, theme: theme, manager: manager
- )
+ builder =
+ Stylesheet::Manager::Builder.new(target: :embedded_theme, theme: theme, manager: manager)
builder.compile(force: true)
@@ -102,11 +111,12 @@ RSpec.describe Stylesheet::Manager do
expect(css).to match(/\.embedded/)
expect(css).not_to match(/\.child_embedded/)
- child_theme_builder = Stylesheet::Manager::Builder.new(
- target: :embedded_theme,
- theme: child_theme,
- manager: manager
- )
+ child_theme_builder =
+ Stylesheet::Manager::Builder.new(
+ target: :embedded_theme,
+ theme: child_theme,
+ manager: manager,
+ )
child_theme_builder.compile(force: true)
@@ -114,24 +124,20 @@ RSpec.describe Stylesheet::Manager do
expect(css).to match(/\.child_embedded/)
end
- it 'includes both parent and child theme assets' do
+ it "includes both parent and child theme assets" do
manager = manager(theme.id)
- hrefs = manager.stylesheet_details(:desktop_theme, 'all')
+ hrefs = manager.stylesheet_details(:desktop_theme, "all")
expect(hrefs.count).to eq(2)
- expect(hrefs.map { |href| href[:theme_id] }).to contain_exactly(
- theme.id, child_theme.id
- )
+ expect(hrefs.map { |href| href[:theme_id] }).to contain_exactly(theme.id, child_theme.id)
- hrefs = manager.stylesheet_details(:embedded_theme, 'all')
+ hrefs = manager.stylesheet_details(:embedded_theme, "all")
expect(hrefs.count).to eq(2)
- expect(hrefs.map { |href| href[:theme_id] }).to contain_exactly(
- theme.id, child_theme.id
- )
+ expect(hrefs.map { |href| href[:theme_id] }).to contain_exactly(theme.id, child_theme.id)
end
it "includes the escaped theme name" do
@@ -140,12 +146,8 @@ RSpec.describe Stylesheet::Manager do
theme.update(name: "a strange name\"with a quote in it")
tag = manager.stylesheet_link_tag(:desktop_theme)
- expect(tag).to have_tag("link", with: {
- "data-theme-name" => theme.name.downcase
- })
- expect(tag).to have_tag("link", with: {
- "data-theme-name" => child_theme.name.downcase
- })
+ expect(tag).to have_tag("link", with: { "data-theme-name" => theme.name.downcase })
+ expect(tag).to have_tag("link", with: { "data-theme-name" => child_theme.name.downcase })
end
it "stylesheet_link_tag calls the preload callback when set" do
@@ -153,9 +155,10 @@ RSpec.describe Stylesheet::Manager do
preload_callback = ->(href, type) { preload_list << [href, type] }
manager = manager(theme.id)
- expect {
- manager.stylesheet_link_tag(:desktop_theme, 'all', preload_callback)
- }.to change(preload_list, :size)
+ expect { manager.stylesheet_link_tag(:desktop_theme, "all", preload_callback) }.to change(
+ preload_list,
+ :size,
+ )
end
context "with stylesheet order" do
@@ -175,108 +178,128 @@ RSpec.describe Stylesheet::Manager do
end
end
- it 'output remote child, then sort children alphabetically, then local parent' do
+ it "output remote child, then sort children alphabetically, then local parent" do
theme.add_relative_theme!(:child, z_child_theme)
theme.add_relative_theme!(:child, child_remote)
manager = manager(theme.id)
- hrefs = manager.stylesheet_details(:desktop_theme, 'all')
+ hrefs = manager.stylesheet_details(:desktop_theme, "all")
parent = hrefs.select { |href| href[:theme_id] == theme.id }.first
child_a = hrefs.select { |href| href[:theme_id] == child_theme.id }.first
child_z = hrefs.select { |href| href[:theme_id] == z_child_theme.id }.first
child_r = hrefs.select { |href| href[:theme_id] == child_remote.id }.first
- child_local_A = "hello "
name = "/path/to/templates1"
compiler.append_raw_template("#{name}.raw", template)
@@ -21,49 +21,76 @@ RSpec.describe ThemeJavascriptCompiler do
end
describe "#append_ember_template" do
- it 'maintains module names so that discourse-boot.js can correct them' do
+ it "maintains module names so that discourse-boot.js can correct them" do
compiler.append_ember_template("/connectors/blah-1", "{{var}}")
- expect(compiler.raw_content.to_s).to include("define(\"discourse/theme-1/connectors/blah-1\", [\"exports\", \"@ember/template-factory\"]")
+ expect(compiler.raw_content.to_s).to include(
+ "define(\"discourse/theme-1/connectors/blah-1\", [\"exports\", \"@ember/template-factory\"]",
+ )
compiler.append_ember_template("connectors/blah-2", "{{var}}")
- expect(compiler.raw_content.to_s).to include("define(\"discourse/theme-1/connectors/blah-2\", [\"exports\", \"@ember/template-factory\"]")
+ expect(compiler.raw_content.to_s).to include(
+ "define(\"discourse/theme-1/connectors/blah-2\", [\"exports\", \"@ember/template-factory\"]",
+ )
compiler.append_ember_template("javascripts/connectors/blah-3", "{{var}}")
- expect(compiler.raw_content.to_s).to include("define(\"discourse/theme-1/javascripts/connectors/blah-3\", [\"exports\", \"@ember/template-factory\"]")
+ expect(compiler.raw_content.to_s).to include(
+ "define(\"discourse/theme-1/javascripts/connectors/blah-3\", [\"exports\", \"@ember/template-factory\"]",
+ )
end
end
describe "connector module name handling" do
- it 'separates colocated connectors to avoid module name clash' do
+ it "separates colocated connectors to avoid module name clash" do
# Colocated under `/connectors`
- compiler = ThemeJavascriptCompiler.new(1, 'marks')
- compiler.append_tree({
- "connectors/outlet/blah-1.hbs" => "{{var}}",
- "connectors/outlet/blah-1.js" => "console.log('test')"
- })
+ compiler = ThemeJavascriptCompiler.new(1, "marks")
+ compiler.append_tree(
+ {
+ "connectors/outlet/blah-1.hbs" => "{{var}}",
+ "connectors/outlet/blah-1.js" => "console.log('test')",
+ },
+ )
expect(compiler.raw_content.to_s).to include("discourse/theme-1/connectors/outlet/blah-1")
- expect(compiler.raw_content.to_s).to include("discourse/theme-1/templates/connectors/outlet/blah-1")
- expect(JSON.parse(compiler.source_map)["sources"]).to contain_exactly("connectors/outlet/blah-1.js", "templates/connectors/outlet/blah-1.js")
+ expect(compiler.raw_content.to_s).to include(
+ "discourse/theme-1/templates/connectors/outlet/blah-1",
+ )
+ expect(JSON.parse(compiler.source_map)["sources"]).to contain_exactly(
+ "connectors/outlet/blah-1.js",
+ "templates/connectors/outlet/blah-1.js",
+ )
# Colocated under `/templates/connectors`
- compiler = ThemeJavascriptCompiler.new(1, 'marks')
- compiler.append_tree({
- "templates/connectors/outlet/blah-1.hbs" => "{{var}}",
- "templates/connectors/outlet/blah-1.js" => "console.log('test')"
- })
+ compiler = ThemeJavascriptCompiler.new(1, "marks")
+ compiler.append_tree(
+ {
+ "templates/connectors/outlet/blah-1.hbs" => "{{var}}",
+ "templates/connectors/outlet/blah-1.js" => "console.log('test')",
+ },
+ )
expect(compiler.raw_content.to_s).to include("discourse/theme-1/connectors/outlet/blah-1")
- expect(compiler.raw_content.to_s).to include("discourse/theme-1/templates/connectors/outlet/blah-1")
- expect(JSON.parse(compiler.source_map)["sources"]).to contain_exactly("connectors/outlet/blah-1.js", "templates/connectors/outlet/blah-1.js")
+ expect(compiler.raw_content.to_s).to include(
+ "discourse/theme-1/templates/connectors/outlet/blah-1",
+ )
+ expect(JSON.parse(compiler.source_map)["sources"]).to contain_exactly(
+ "connectors/outlet/blah-1.js",
+ "templates/connectors/outlet/blah-1.js",
+ )
# Not colocated
- compiler = ThemeJavascriptCompiler.new(1, 'marks')
- compiler.append_tree({
- "templates/connectors/outlet/blah-1.hbs" => "{{var}}",
- "connectors/outlet/blah-1.js" => "console.log('test')"
- })
+ compiler = ThemeJavascriptCompiler.new(1, "marks")
+ compiler.append_tree(
+ {
+ "templates/connectors/outlet/blah-1.hbs" => "{{var}}",
+ "connectors/outlet/blah-1.js" => "console.log('test')",
+ },
+ )
expect(compiler.raw_content.to_s).to include("discourse/theme-1/connectors/outlet/blah-1")
- expect(compiler.raw_content.to_s).to include("discourse/theme-1/templates/connectors/outlet/blah-1")
- expect(JSON.parse(compiler.source_map)["sources"]).to contain_exactly("connectors/outlet/blah-1.js", "templates/connectors/outlet/blah-1.js")
+ expect(compiler.raw_content.to_s).to include(
+ "discourse/theme-1/templates/connectors/outlet/blah-1",
+ )
+ expect(JSON.parse(compiler.source_map)["sources"]).to contain_exactly(
+ "connectors/outlet/blah-1.js",
+ "templates/connectors/outlet/blah-1.js",
+ )
end
end
@@ -89,11 +116,13 @@ RSpec.describe ThemeJavascriptCompiler do
import Component from "@glimmer/component";
export default class MyComponent extends Component {}
JS
- "discourse/templates/components/mycomponent.hbs" => "{{my-component-template}}"
- }
+ "discourse/templates/components/mycomponent.hbs" => "{{my-component-template}}",
+ },
)
expect(compiler.raw_content).to include('define("discourse/theme-1/components/mycomponent"')
- expect(compiler.raw_content).to include('define("discourse/theme-1/discourse/templates/components/mycomponent"')
+ expect(compiler.raw_content).to include(
+ 'define("discourse/theme-1/discourse/templates/components/mycomponent"',
+ )
end
it "handles colocated components" do
@@ -103,8 +132,8 @@ RSpec.describe ThemeJavascriptCompiler do
import Component from "@glimmer/component";
export default class MyComponent extends Component {}
JS
- "discourse/components/mycomponent.hbs" => "{{my-component-template}}"
- }
+ "discourse/components/mycomponent.hbs" => "{{my-component-template}}",
+ },
)
expect(compiler.raw_content).to include("__COLOCATED_TEMPLATE__ =")
expect(compiler.raw_content).to include("setComponentTemplate")
@@ -117,17 +146,17 @@ RSpec.describe ThemeJavascriptCompiler do
import Component from "@glimmer/component";
export default class MyComponent extends Component {}
JS
- "admin/components/mycomponent.hbs" => "{{my-component-template}}"
- }
+ "admin/components/mycomponent.hbs" => "{{my-component-template}}",
+ },
)
expect(compiler.raw_content).to include("__COLOCATED_TEMPLATE__ =")
expect(compiler.raw_content).to include("setComponentTemplate")
end
it "applies theme AST transforms to colocated components" do
- compiler = ThemeJavascriptCompiler.new(12345678910, 'my theme name')
+ compiler = ThemeJavascriptCompiler.new(12_345_678_910, "my theme name")
compiler.append_tree(
- { "discourse/components/mycomponent.hbs" => '{{theme-i18n "my_translation_key"}}' }
+ { "discourse/components/mycomponent.hbs" => '{{theme-i18n "my_translation_key"}}' },
)
template_compiled_line = compiler.raw_content.lines.find { |l| l.include?('"block":') }
expect(template_compiled_line).to include("12345678910")
@@ -140,8 +169,8 @@ RSpec.describe ThemeJavascriptCompiler do
import Component from "@glimmer/component";
class MyComponent extends Component {}
JS
- "discourse/components/mycomponent.hbs" => "{{my-component-template}}"
- }
+ "discourse/components/mycomponent.hbs" => "{{my-component-template}}",
+ },
)
expect(compiler.raw_content).to include("__COLOCATED_TEMPLATE__ =")
expect(compiler.raw_content).to include("throw new Error")
@@ -149,9 +178,7 @@ RSpec.describe ThemeJavascriptCompiler do
it "handles template-only components" do
compiler.append_tree(
- {
- "discourse/components/mycomponent.hbs" => "{{my-component-template}}"
- }
+ { "discourse/components/mycomponent.hbs" => "{{my-component-template}}" },
)
expect(compiler.raw_content).to include("__COLOCATED_TEMPLATE__ =")
expect(compiler.raw_content).to include("setComponentTemplate")
@@ -163,7 +190,7 @@ RSpec.describe ThemeJavascriptCompiler do
it "applies terser and provides sourcemaps" do
sources = {
"multiply.js" => "let multiply = (firstValue, secondValue) => firstValue * secondValue;",
- "add.js" => "let add = (firstValue, secondValue) => firstValue + secondValue;"
+ "add.js" => "let add = (firstValue, secondValue) => firstValue + secondValue;",
}
compiler.append_tree(sources)
@@ -181,7 +208,7 @@ RSpec.describe ThemeJavascriptCompiler do
it "handles invalid JS" do
compiler.append_raw_script("filename.js", "if(someCondition")
expect(compiler.content).to include('console.error("[THEME 1')
- expect(compiler.content).to include('Unexpected token')
+ expect(compiler.content).to include("Unexpected token")
end
end
end
diff --git a/spec/lib/theme_settings_manager_spec.rb b/spec/lib/theme_settings_manager_spec.rb
index 11c1599dcef..f1ec48b6dd5 100644
--- a/spec/lib/theme_settings_manager_spec.rb
+++ b/spec/lib/theme_settings_manager_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-require 'theme_settings_manager'
+require "theme_settings_manager"
RSpec.describe ThemeSettingsManager do
let!(:theme) { Fabricate(:theme) }
@@ -156,7 +156,9 @@ RSpec.describe ThemeSettingsManager do
upload_setting.value = upload.url
theme.reload
- expect(ThemeSetting.exists?(theme_id: theme.id, name: "upload_setting", value: upload.id.to_s)).to be_truthy
+ expect(
+ ThemeSetting.exists?(theme_id: theme.id, name: "upload_setting", value: upload.id.to_s),
+ ).to be_truthy
end
it "returns the CDN URL" do
diff --git a/spec/lib/theme_settings_parser_spec.rb b/spec/lib/theme_settings_parser_spec.rb
index 5590bbf529b..a5f95603d7d 100644
--- a/spec/lib/theme_settings_parser_spec.rb
+++ b/spec/lib/theme_settings_parser_spec.rb
@@ -1,11 +1,9 @@
# frozen_string_literal: true
-require 'theme_settings_parser'
+require "theme_settings_parser"
RSpec.describe ThemeSettingsParser do
- after do
- ThemeField.destroy_all
- end
+ after { ThemeField.destroy_all }
def types
ThemeSetting.types
@@ -21,9 +19,9 @@ RSpec.describe ThemeSettingsParser do
yaml = File.read("#{Rails.root}/spec/fixtures/theme_settings/valid_settings.yaml")
field = ThemeField.create!(theme_id: 1, target_id: 3, name: "yaml", value: yaml)
- ThemeSettingsParser.new(field).load do |name, default, type, opts|
- @settings << setting(name, default, type, opts)
- end
+ ThemeSettingsParser
+ .new(field)
+ .load { |name, default, type, opts| @settings << setting(name, default, type, opts) }
end
def setting(name, default, type, opts = {})
@@ -38,14 +36,14 @@ RSpec.describe ThemeSettingsParser do
let(:loader) { Loader.new }
it "guesses types correctly" do
- expect(loader.find_by_name(:boolean_setting)[:type]).to eq(types[:bool])
- expect(loader.find_by_name(:boolean_setting_02)[:type]).to eq(types[:bool])
- expect(loader.find_by_name(:string_setting)[:type]).to eq(types[:string])
- expect(loader.find_by_name(:integer_setting)[:type]).to eq(types[:integer])
- expect(loader.find_by_name(:integer_setting_03)[:type]).to eq(types[:integer])
- expect(loader.find_by_name(:float_setting)[:type]).to eq(types[:float])
- expect(loader.find_by_name(:list_setting)[:type]).to eq(types[:list])
- expect(loader.find_by_name(:enum_setting)[:type]).to eq(types[:enum])
+ expect(loader.find_by_name(:boolean_setting)[:type]).to eq(types[:bool])
+ expect(loader.find_by_name(:boolean_setting_02)[:type]).to eq(types[:bool])
+ expect(loader.find_by_name(:string_setting)[:type]).to eq(types[:string])
+ expect(loader.find_by_name(:integer_setting)[:type]).to eq(types[:integer])
+ expect(loader.find_by_name(:integer_setting_03)[:type]).to eq(types[:integer])
+ expect(loader.find_by_name(:float_setting)[:type]).to eq(types[:float])
+ expect(loader.find_by_name(:list_setting)[:type]).to eq(types[:list])
+ expect(loader.find_by_name(:enum_setting)[:type]).to eq(types[:enum])
end
describe "description locale" do
diff --git a/spec/lib/theme_store/git_importer_spec.rb b/spec/lib/theme_store/git_importer_spec.rb
index dc45410303c..0a89a6105c7 100644
--- a/spec/lib/theme_store/git_importer_spec.rb
+++ b/spec/lib/theme_store/git_importer_spec.rb
@@ -1,12 +1,14 @@
# encoding: utf-8
# frozen_string_literal: true
-require 'theme_store/git_importer'
+require "theme_store/git_importer"
RSpec.describe ThemeStore::GitImporter do
describe "#import" do
let(:url) { "https://github.com/example/example.git" }
- let(:first_fetch_url) { "https://github.com/example/example.git/info/refs?service=git-upload-pack" }
+ let(:first_fetch_url) do
+ "https://github.com/example/example.git/info/refs?service=git-upload-pack"
+ end
let(:trailing_slash_url) { "https://github.com/example/example/" }
let(:ssh_url) { "git@github.com:example/example.git" }
let(:branch) { "dev" }
@@ -25,24 +27,37 @@ RSpec.describe ThemeStore::GitImporter do
end
it "imports ssh urls" do
- Discourse::Utils
- .expects(:execute_command)
- .with(
- { "GIT_SSH_COMMAND" => "ssh -i #{@ssh_folder}/id_rsa -o IdentitiesOnly=yes -o IdentityFile=#{@ssh_folder}/id_rsa -o StrictHostKeyChecking=no" },
- "git", "clone", "ssh://git@github.com/example/example.git", @temp_folder, timeout: 20
- )
+ Discourse::Utils.expects(:execute_command).with(
+ {
+ "GIT_SSH_COMMAND" =>
+ "ssh -i #{@ssh_folder}/id_rsa -o IdentitiesOnly=yes -o IdentityFile=#{@ssh_folder}/id_rsa -o StrictHostKeyChecking=no",
+ },
+ "git",
+ "clone",
+ "ssh://git@github.com/example/example.git",
+ @temp_folder,
+ timeout: 20,
+ )
importer = ThemeStore::GitImporter.new(ssh_url, private_key: "private_key")
importer.import!
end
it "imports ssh urls with a particular branch" do
- Discourse::Utils
- .expects(:execute_command)
- .with(
- { "GIT_SSH_COMMAND" => "ssh -i #{@ssh_folder}/id_rsa -o IdentitiesOnly=yes -o IdentityFile=#{@ssh_folder}/id_rsa -o StrictHostKeyChecking=no" },
- "git", "clone", "--single-branch", "-b", branch, "ssh://git@github.com/example/example.git", @temp_folder, timeout: 20
- )
+ Discourse::Utils.expects(:execute_command).with(
+ {
+ "GIT_SSH_COMMAND" =>
+ "ssh -i #{@ssh_folder}/id_rsa -o IdentitiesOnly=yes -o IdentityFile=#{@ssh_folder}/id_rsa -o StrictHostKeyChecking=no",
+ },
+ "git",
+ "clone",
+ "--single-branch",
+ "-b",
+ branch,
+ "ssh://git@github.com/example/example.git",
+ @temp_folder,
+ timeout: 20,
+ )
importer = ThemeStore::GitImporter.new(ssh_url, private_key: "private_key", branch: branch)
importer.import!
@@ -53,16 +68,26 @@ RSpec.describe ThemeStore::GitImporter do
FinalDestination
.stubs(:resolve)
.with(first_fetch_url, http_verb: :get)
- .returns(URI.parse("https://github.com/redirected/example.git/info/refs?service=git-upload-pack"))
+ .returns(
+ URI.parse(
+ "https://github.com/redirected/example.git/info/refs?service=git-upload-pack",
+ ),
+ )
end
it "imports http urls" do
- Discourse::Utils
- .expects(:execute_command)
- .with(
- { "GIT_TERMINAL_PROMPT" => "0" },
- "git", "-c", "http.followRedirects=false", "-c", "http.curloptResolve=github.com:443:192.0.2.100", "clone", "https://github.com/redirected/example.git", @temp_folder, timeout: 20
- )
+ Discourse::Utils.expects(:execute_command).with(
+ { "GIT_TERMINAL_PROMPT" => "0" },
+ "git",
+ "-c",
+ "http.followRedirects=false",
+ "-c",
+ "http.curloptResolve=github.com:443:192.0.2.100",
+ "clone",
+ "https://github.com/redirected/example.git",
+ @temp_folder,
+ timeout: 20,
+ )
importer = ThemeStore::GitImporter.new(url)
importer.import!
@@ -80,36 +105,57 @@ RSpec.describe ThemeStore::GitImporter do
end
it "imports http urls" do
- Discourse::Utils
- .expects(:execute_command)
- .with(
- { "GIT_TERMINAL_PROMPT" => "0" },
- "git", "-c", "http.followRedirects=false", "-c", "http.curloptResolve=github.com:443:192.0.2.100", "clone", "https://github.com/example/example.git", @temp_folder, timeout: 20
- )
+ Discourse::Utils.expects(:execute_command).with(
+ { "GIT_TERMINAL_PROMPT" => "0" },
+ "git",
+ "-c",
+ "http.followRedirects=false",
+ "-c",
+ "http.curloptResolve=github.com:443:192.0.2.100",
+ "clone",
+ "https://github.com/example/example.git",
+ @temp_folder,
+ timeout: 20,
+ )
importer = ThemeStore::GitImporter.new(url)
importer.import!
end
it "imports when the url has a trailing slash" do
- Discourse::Utils
- .expects(:execute_command)
- .with(
- { "GIT_TERMINAL_PROMPT" => "0" },
- "git", "-c", "http.followRedirects=false", "-c", "http.curloptResolve=github.com:443:192.0.2.100", "clone", "https://github.com/example/example.git", @temp_folder, timeout: 20
- )
+ Discourse::Utils.expects(:execute_command).with(
+ { "GIT_TERMINAL_PROMPT" => "0" },
+ "git",
+ "-c",
+ "http.followRedirects=false",
+ "-c",
+ "http.curloptResolve=github.com:443:192.0.2.100",
+ "clone",
+ "https://github.com/example/example.git",
+ @temp_folder,
+ timeout: 20,
+ )
importer = ThemeStore::GitImporter.new(trailing_slash_url)
importer.import!
end
it "imports http urls with a particular branch" do
- Discourse::Utils
- .expects(:execute_command)
- .with(
- { "GIT_TERMINAL_PROMPT" => "0" },
- "git", "-c", "http.followRedirects=false", "-c", "http.curloptResolve=github.com:443:192.0.2.100", "clone", "--single-branch", "-b", branch, "https://github.com/example/example.git", @temp_folder, timeout: 20
- )
+ Discourse::Utils.expects(:execute_command).with(
+ { "GIT_TERMINAL_PROMPT" => "0" },
+ "git",
+ "-c",
+ "http.followRedirects=false",
+ "-c",
+ "http.curloptResolve=github.com:443:192.0.2.100",
+ "clone",
+ "--single-branch",
+ "-b",
+ branch,
+ "https://github.com/example/example.git",
+ @temp_folder,
+ timeout: 20,
+ )
importer = ThemeStore::GitImporter.new(url, branch: branch)
importer.import!
diff --git a/spec/lib/theme_store/zip_exporter_spec.rb b/spec/lib/theme_store/zip_exporter_spec.rb
index 05d468bb6b1..5c885f8ee86 100644
--- a/spec/lib/theme_store/zip_exporter_spec.rb
+++ b/spec/lib/theme_store/zip_exporter_spec.rb
@@ -1,38 +1,65 @@
# frozen_string_literal: true
-require 'theme_store/zip_exporter'
+require "theme_store/zip_exporter"
RSpec.describe ThemeStore::ZipExporter do
- let(:rand_hex) do
- +"X" << SecureRandom.hex
- end
+ let(:rand_hex) { +"X" << SecureRandom.hex }
let!(:theme) do
Fabricate(:theme, name: "Header Icons").tap do |theme|
theme.set_field(target: :common, name: :body_tag, value: "testtheme1 ")
theme.set_field(target: :settings, name: :yaml, value: "somesetting: #{rand_hex}")
- theme.set_field(target: :mobile, name: :scss, value: 'body {background-color: $background_color; font-size: $font-size}')
- theme.set_field(target: :translations, name: :en, value: { en: { key: "value" } }.deep_stringify_keys.to_yaml)
+ theme.set_field(
+ target: :mobile,
+ name: :scss,
+ value: "body {background-color: $background_color; font-size: $font-size}",
+ )
+ theme.set_field(
+ target: :translations,
+ name: :en,
+ value: { en: { key: "value" } }.deep_stringify_keys.to_yaml,
+ )
image = file_from_fixtures("logo.png")
upload = UploadCreator.new(image, "logo.png").create_for(Discourse::SYSTEM_USER_ID)
theme.set_field(target: :common, name: :logo, upload_id: upload.id, type: :theme_upload_var)
image = file_from_fixtures("logo.png")
_other_upload = UploadCreator.new(image, "logo.png").create_for(Discourse::SYSTEM_USER_ID)
- theme.set_field(target: :common, name: "other_logo", upload_id: upload.id, type: :theme_upload_var)
- theme.build_remote_theme(remote_url: "", about_url: "abouturl", license_url: "licenseurl",
- authors: "David Taylor", theme_version: "1.0", minimum_discourse_version: "1.0.0",
- maximum_discourse_version: "3.0.0.beta1")
+ theme.set_field(
+ target: :common,
+ name: "other_logo",
+ upload_id: upload.id,
+ type: :theme_upload_var,
+ )
+ theme.build_remote_theme(
+ remote_url: "",
+ about_url: "abouturl",
+ license_url: "licenseurl",
+ authors: "David Taylor",
+ theme_version: "1.0",
+ minimum_discourse_version: "1.0.0",
+ maximum_discourse_version: "3.0.0.beta1",
+ )
- cs1 = Fabricate(:color_scheme, name: 'Orphan Color Scheme', color_scheme_colors: [
- Fabricate(:color_scheme_color, name: 'header_primary', hex: 'F0F0F0'),
- Fabricate(:color_scheme_color, name: 'header_background', hex: '1E1E1E'),
- Fabricate(:color_scheme_color, name: 'tertiary', hex: '858585')
- ])
+ cs1 =
+ Fabricate(
+ :color_scheme,
+ name: "Orphan Color Scheme",
+ color_scheme_colors: [
+ Fabricate(:color_scheme_color, name: "header_primary", hex: "F0F0F0"),
+ Fabricate(:color_scheme_color, name: "header_background", hex: "1E1E1E"),
+ Fabricate(:color_scheme_color, name: "tertiary", hex: "858585"),
+ ],
+ )
- cs2 = Fabricate(:color_scheme, name: 'Theme Color Scheme', color_scheme_colors: [
- Fabricate(:color_scheme_color, name: 'header_primary', hex: 'F0F0F0'),
- Fabricate(:color_scheme_color, name: 'header_background', hex: '1E1E1E'),
- Fabricate(:color_scheme_color, name: 'tertiary', hex: '858585')
- ])
+ cs2 =
+ Fabricate(
+ :color_scheme,
+ name: "Theme Color Scheme",
+ color_scheme_colors: [
+ Fabricate(:color_scheme_color, name: "header_primary", hex: "F0F0F0"),
+ Fabricate(:color_scheme_color, name: "header_background", hex: "1E1E1E"),
+ Fabricate(:color_scheme_color, name: "tertiary", hex: "858585"),
+ ],
+ )
theme.color_scheme = cs1
cs2.update(theme_id: theme.id)
@@ -48,9 +75,7 @@ RSpec.describe ThemeStore::ZipExporter do
dir
end
- after do
- FileUtils.rm_rf(dir)
- end
+ after { FileUtils.rm_rf(dir) }
let(:package) do
exporter = ThemeStore::ZipExporter.new(theme)
@@ -62,7 +87,7 @@ RSpec.describe ThemeStore::ZipExporter do
it "exports the theme correctly" do
package
- file = 'discourse-header-icons.zip'
+ file = "discourse-header-icons.zip"
Dir.chdir(dir) do
available_size = SiteSetting.decompressed_theme_max_file_size_mb
Compression::Zip.new.decompress(dir, file, available_size)
@@ -72,41 +97,54 @@ RSpec.describe ThemeStore::ZipExporter do
expect(folders).to contain_exactly("assets", "common", "locales", "mobile")
files = Dir.glob("**/*").reject { |f| File.directory?(f) }
- expect(files).to contain_exactly("about.json", "assets/logo.png", "assets/other_logo.png", "common/body_tag.html", "locales/en.yml", "mobile/mobile.scss", "settings.yml")
+ expect(files).to contain_exactly(
+ "about.json",
+ "assets/logo.png",
+ "assets/other_logo.png",
+ "common/body_tag.html",
+ "locales/en.yml",
+ "mobile/mobile.scss",
+ "settings.yml",
+ )
- expect(JSON.parse(File.read('about.json')).deep_symbolize_keys).to eq(
- "name": "Header Icons",
- "about_url": "abouturl",
- "license_url": "licenseurl",
- "component": false,
- "assets": {
- "logo": "assets/logo.png",
- "other_logo": "assets/other_logo.png"
+ expect(JSON.parse(File.read("about.json")).deep_symbolize_keys).to eq(
+ name: "Header Icons",
+ about_url: "abouturl",
+ license_url: "licenseurl",
+ component: false,
+ assets: {
+ logo: "assets/logo.png",
+ other_logo: "assets/other_logo.png",
},
- "authors": "David Taylor",
- "minimum_discourse_version": "1.0.0",
- "maximum_discourse_version": "3.0.0.beta1",
- "theme_version": "1.0",
- "color_schemes": {
+ authors: "David Taylor",
+ minimum_discourse_version: "1.0.0",
+ maximum_discourse_version: "3.0.0.beta1",
+ theme_version: "1.0",
+ color_schemes: {
"Orphan Color Scheme": {
- "header_primary": "F0F0F0",
- "header_background": "1E1E1E",
- "tertiary": "858585"
+ header_primary: "F0F0F0",
+ header_background: "1E1E1E",
+ tertiary: "858585",
},
"Theme Color Scheme": {
- "header_primary": "F0F0F0",
- "header_background": "1E1E1E",
- "tertiary": "858585"
- }
+ header_primary: "F0F0F0",
+ header_background: "1E1E1E",
+ tertiary: "858585",
+ },
},
- "modifiers": {},
- "learn_more": "https://meta.discourse.org/t/beginners-guide-to-using-discourse-themes/91966"
+ modifiers: {
+ },
+ learn_more: "https://meta.discourse.org/t/beginners-guide-to-using-discourse-themes/91966",
)
expect(File.read("common/body_tag.html")).to eq("testtheme1 ")
- expect(File.read("mobile/mobile.scss")).to eq("body {background-color: $background_color; font-size: $font-size}")
+ expect(File.read("mobile/mobile.scss")).to eq(
+ "body {background-color: $background_color; font-size: $font-size}",
+ )
expect(File.read("settings.yml")).to eq("somesetting: #{rand_hex}")
- expect(File.read("locales/en.yml")).to eq({ en: { key: "value" } }.deep_stringify_keys.to_yaml)
+ expect(File.read("locales/en.yml")).to eq(
+ { en: { key: "value" } }.deep_stringify_keys.to_yaml,
+ )
theme.update!(name: "Discourse Header Icons")
exporter = ThemeStore::ZipExporter.new(theme)
@@ -126,5 +164,4 @@ RSpec.describe ThemeStore::ZipExporter do
package
end.to raise_error(RuntimeError)
end
-
end
diff --git a/spec/lib/theme_store/zip_importer_spec.rb b/spec/lib/theme_store/zip_importer_spec.rb
index fa0a1f32cf7..a87c34b9434 100644
--- a/spec/lib/theme_store/zip_importer_spec.rb
+++ b/spec/lib/theme_store/zip_importer_spec.rb
@@ -1,8 +1,7 @@
-
# encoding: utf-8
# frozen_string_literal: true
-require 'theme_store/zip_importer'
+require "theme_store/zip_importer"
RSpec.describe ThemeStore::ZipImporter do
before do
@@ -10,23 +9,21 @@ RSpec.describe ThemeStore::ZipImporter do
FileUtils.mkdir(@temp_folder)
Dir.chdir(@temp_folder) do
- FileUtils.mkdir_p('test/a')
+ FileUtils.mkdir_p("test/a")
File.write("test/hello.txt", "hello world")
File.write("test/a/inner", "hello world inner")
end
end
- after do
- FileUtils.rm_rf @temp_folder
- end
+ after { FileUtils.rm_rf @temp_folder }
it "can import a simple zipped theme" do
Dir.chdir(@temp_folder) do
- Compression::Zip.new.compress(@temp_folder, 'test')
- FileUtils.rm_rf('test/')
+ Compression::Zip.new.compress(@temp_folder, "test")
+ FileUtils.rm_rf("test/")
end
- file_name = 'test.zip'
+ file_name = "test.zip"
importer = ThemeStore::ZipImporter.new("#{@temp_folder}/#{file_name}", file_name)
importer.import!
@@ -37,11 +34,9 @@ RSpec.describe ThemeStore::ZipImporter do
end
it "can import a simple gzipped theme" do
- Dir.chdir(@temp_folder) do
- `tar -cvzf test.tar.gz test/* 2> /dev/null`
- end
+ Dir.chdir(@temp_folder) { `tar -cvzf test.tar.gz test/* 2> /dev/null` }
- file_name = 'test.tar.gz'
+ file_name = "test.tar.gz"
importer = ThemeStore::ZipImporter.new("#{@temp_folder}/#{file_name}", file_name)
importer.import!
diff --git a/spec/lib/timeline_lookup_spec.rb b/spec/lib/timeline_lookup_spec.rb
index cc59e3cda0e..16a666dc445 100644
--- a/spec/lib/timeline_lookup_spec.rb
+++ b/spec/lib/timeline_lookup_spec.rb
@@ -25,7 +25,9 @@ RSpec.describe TimelineLookup do
result = TimelineLookup.build(input, 5)
# even if max_value is 5 we might get 6 (5 + 1)
# to ensure the last tuple is captured
- expect(result).to eq([[1, 99], [21, 79], [41, 59], [61, 39], [81, 19], [input.size, input.last[1]]])
+ expect(result).to eq(
+ [[1, 99], [21, 79], [41, 59], [61, 39], [81, 19], [input.size, input.last[1]]],
+ )
end
it "respects an uneven `max_values` setting" do
@@ -37,5 +39,4 @@ RSpec.describe TimelineLookup do
expect(result.size).to eq(4)
expect(result).to eq([[1, 99], [35, 65], [69, 31], [input.size, input.last[1]]])
end
-
end
diff --git a/spec/lib/tiny_japanese_segmenter_spec.rb b/spec/lib/tiny_japanese_segmenter_spec.rb
index 8fbef10fce0..e88400abae4 100644
--- a/spec/lib/tiny_japanese_segmenter_spec.rb
+++ b/spec/lib/tiny_japanese_segmenter_spec.rb
@@ -1,11 +1,11 @@
# frozen_string_literal: true
RSpec.describe TinyJapaneseSegmenter do
- describe '.segment' do
- it 'generates the segments for a given japanese text' do
- expect(TinyJapaneseSegmenter.segment("TinySegmenterはJavascriptだけ書かれた極めてコンパクトな日本語分かち書きソフトウェアです。")).to eq(
- %w{TinySegmenter は Javascript だけ 書か れ た 極め て コンパクト な 日本 語分 かち 書き ソフトウェア です 。}
- )
+ describe ".segment" do
+ it "generates the segments for a given japanese text" do
+ expect(
+ TinyJapaneseSegmenter.segment("TinySegmenterはJavascriptだけ書かれた極めてコンパクトな日本語分かち書きソフトウェアです。"),
+ ).to eq(%w[TinySegmenter は Javascript だけ 書か れ た 極め て コンパクト な 日本 語分 かち 書き ソフトウェア です 。])
end
end
end
diff --git a/spec/lib/topic_creator_spec.rb b/spec/lib/topic_creator_spec.rb
index d815a6292a3..6b128267452 100644
--- a/spec/lib/topic_creator_spec.rb
+++ b/spec/lib/topic_creator_spec.rb
@@ -1,24 +1,31 @@
# frozen_string_literal: true
RSpec.describe TopicCreator do
- fab!(:user) { Fabricate(:user, trust_level: TrustLevel[2]) }
+ fab!(:user) { Fabricate(:user, trust_level: TrustLevel[2]) }
fab!(:moderator) { Fabricate(:moderator) }
- fab!(:admin) { Fabricate(:admin) }
+ fab!(:admin) { Fabricate(:admin) }
let(:valid_attrs) { Fabricate.attributes_for(:topic) }
- let(:pm_valid_attrs) { { raw: 'this is a new post', title: 'this is a new title', archetype: Archetype.private_message, target_usernames: moderator.username } }
-
- let(:pm_to_email_valid_attrs) do
+ let(:pm_valid_attrs) do
{
- raw: 'this is a new email',
- title: 'this is a new subject',
+ raw: "this is a new post",
+ title: "this is a new title",
archetype: Archetype.private_message,
- target_emails: 'moderator@example.com'
+ target_usernames: moderator.username,
}
end
- describe '#create' do
- context 'with topic success cases' do
+ let(:pm_to_email_valid_attrs) do
+ {
+ raw: "this is a new email",
+ title: "this is a new subject",
+ archetype: Archetype.private_message,
+ target_emails: "moderator@example.com",
+ }
+ end
+
+ describe "#create" do
+ context "with topic success cases" do
before do
TopicCreator.any_instance.expects(:save_topic).returns(true)
TopicCreator.any_instance.expects(:watch_topic).returns(true)
@@ -34,10 +41,15 @@ RSpec.describe TopicCreator do
end
it "supports both meta_data and custom_fields" do
- opts = valid_attrs.merge(
- meta_data: { import_topic_id: "foo" },
- custom_fields: { import_id: "bar" }
- )
+ opts =
+ valid_attrs.merge(
+ meta_data: {
+ import_topic_id: "foo",
+ },
+ custom_fields: {
+ import_id: "bar",
+ },
+ )
topic = TopicCreator.create(admin, Guardian.new(admin), opts)
@@ -45,7 +57,7 @@ RSpec.describe TopicCreator do
expect(topic.custom_fields["import_id"]).to eq("bar")
end
- context 'with regular user' do
+ context "with regular user" do
before { SiteSetting.min_trust_to_create_topic = TrustLevel[0] }
it "should be possible for a regular user to create a topic" do
@@ -53,35 +65,45 @@ RSpec.describe TopicCreator do
end
it "should be possible for a regular user to create a topic with blank auto_close_time" do
- expect(TopicCreator.create(user, Guardian.new(user), valid_attrs.merge(auto_close_time: ''))).to be_valid
+ expect(
+ TopicCreator.create(user, Guardian.new(user), valid_attrs.merge(auto_close_time: "")),
+ ).to be_valid
end
it "ignores auto_close_time without raising an error" do
- topic = TopicCreator.create(user, Guardian.new(user), valid_attrs.merge(auto_close_time: '24'))
+ topic =
+ TopicCreator.create(user, Guardian.new(user), valid_attrs.merge(auto_close_time: "24"))
expect(topic).to be_valid
expect(topic.public_topic_timer).to eq(nil)
end
it "can create a topic in a category" do
category = Fabricate(:category, name: "Neil's Blog")
- topic = TopicCreator.create(user, Guardian.new(user), valid_attrs.merge(category: category.id))
+ topic =
+ TopicCreator.create(user, Guardian.new(user), valid_attrs.merge(category: category.id))
expect(topic).to be_valid
expect(topic.category).to eq(category)
end
it "ignores participant_count without raising an error" do
- topic = TopicCreator.create(user, Guardian.new(user), valid_attrs.merge(participant_count: 3))
+ topic =
+ TopicCreator.create(user, Guardian.new(user), valid_attrs.merge(participant_count: 3))
expect(topic.participant_count).to eq(1)
end
it "accepts participant_count in import mode" do
- topic = TopicCreator.create(user, Guardian.new(user), valid_attrs.merge(import_mode: true, participant_count: 3))
+ topic =
+ TopicCreator.create(
+ user,
+ Guardian.new(user),
+ valid_attrs.merge(import_mode: true, participant_count: 3),
+ )
expect(topic.participant_count).to eq(3)
end
end
end
- context 'with tags' do
+ context "with tags" do
fab!(:tag1) { Fabricate(:tag, name: "fun") }
fab!(:tag2) { Fabricate(:tag, name: "fun2") }
fab!(:tag3) { Fabricate(:tag, name: "fun3") }
@@ -96,74 +118,106 @@ RSpec.describe TopicCreator do
SiteSetting.min_trust_level_to_tag_topics = 0
end
- context 'with regular tags' do
+ context "with regular tags" do
it "user can add tags to topic" do
- topic = TopicCreator.create(user, Guardian.new(user), valid_attrs.merge(tags: [tag1.name]))
+ topic =
+ TopicCreator.create(user, Guardian.new(user), valid_attrs.merge(tags: [tag1.name]))
expect(topic).to be_valid
expect(topic.tags.length).to eq(1)
end
end
- context 'when assigned via matched watched words' do
- fab!(:word1) { Fabricate(:watched_word, action: WatchedWord.actions[:tag], replacement: tag1.name) }
- fab!(:word2) { Fabricate(:watched_word, action: WatchedWord.actions[:tag], replacement: tag2.name) }
- fab!(:word3) { Fabricate(:watched_word, action: WatchedWord.actions[:tag], replacement: tag3.name, case_sensitive: true) }
-
- it 'adds watched words as tags' do
- topic = TopicCreator.create(
- user,
- Guardian.new(user),
- valid_attrs.merge(
- title: "This is a #{word1.word} title",
- raw: "#{word2.word.upcase} is not the same as #{word3.word.upcase}")
+ context "when assigned via matched watched words" do
+ fab!(:word1) do
+ Fabricate(:watched_word, action: WatchedWord.actions[:tag], replacement: tag1.name)
+ end
+ fab!(:word2) do
+ Fabricate(:watched_word, action: WatchedWord.actions[:tag], replacement: tag2.name)
+ end
+ fab!(:word3) do
+ Fabricate(
+ :watched_word,
+ action: WatchedWord.actions[:tag],
+ replacement: tag3.name,
+ case_sensitive: true,
)
+ end
+
+ it "adds watched words as tags" do
+ topic =
+ TopicCreator.create(
+ user,
+ Guardian.new(user),
+ valid_attrs.merge(
+ title: "This is a #{word1.word} title",
+ raw: "#{word2.word.upcase} is not the same as #{word3.word.upcase}",
+ ),
+ )
expect(topic).to be_valid
expect(topic.tags).to contain_exactly(tag1, tag2)
end
end
- context 'with staff-only tags' do
- before do
- create_staff_only_tags(['alpha'])
- end
+ context "with staff-only tags" do
+ before { create_staff_only_tags(["alpha"]) }
it "regular users can't add staff-only tags" do
expect do
- TopicCreator.create(user, Guardian.new(user), valid_attrs.merge(tags: ['alpha']))
+ TopicCreator.create(user, Guardian.new(user), valid_attrs.merge(tags: ["alpha"]))
end.to raise_error(ActiveRecord::Rollback)
end
- it 'staff can add staff-only tags' do
- topic = TopicCreator.create(admin, Guardian.new(admin), valid_attrs.merge(tags: ['alpha']))
+ it "staff can add staff-only tags" do
+ topic =
+ TopicCreator.create(admin, Guardian.new(admin), valid_attrs.merge(tags: ["alpha"]))
expect(topic).to be_valid
expect(topic.tags.length).to eq(1)
end
end
- context 'when minimum_required_tags is present' do
+ context "when minimum_required_tags is present" do
fab!(:category) { Fabricate(:category, name: "beta", minimum_required_tags: 2) }
it "fails for regular user if minimum_required_tags is not satisfied" do
expect(
- TopicCreator.new(user, Guardian.new(user), valid_attrs.merge(category: category.id)).valid?
+ TopicCreator.new(
+ user,
+ Guardian.new(user),
+ valid_attrs.merge(category: category.id),
+ ).valid?,
).to be_falsy
end
it "lets admin create a topic regardless of minimum_required_tags" do
- topic = TopicCreator.create(admin, Guardian.new(admin), valid_attrs.merge(tags: [tag1.name], category: category.id))
+ topic =
+ TopicCreator.create(
+ admin,
+ Guardian.new(admin),
+ valid_attrs.merge(tags: [tag1.name], category: category.id),
+ )
expect(topic).to be_valid
expect(topic.tags.length).to eq(1)
end
it "works for regular user if minimum_required_tags is satisfied" do
- topic = TopicCreator.create(user, Guardian.new(user), valid_attrs.merge(tags: [tag1.name, tag2.name], category: category.id))
+ topic =
+ TopicCreator.create(
+ user,
+ Guardian.new(user),
+ valid_attrs.merge(tags: [tag1.name, tag2.name], category: category.id),
+ )
expect(topic).to be_valid
expect(topic.tags.length).to eq(2)
end
it "minimum_required_tags is satisfying for new tags if user can create" do
- topic = TopicCreator.create(user, Guardian.new(user), valid_attrs.merge(tags: ["new tag", "another tag"], category: category.id))
+ topic =
+ TopicCreator.create(
+ user,
+ Guardian.new(user),
+ valid_attrs.merge(tags: ["new tag", "another tag"], category: category.id),
+ )
expect(topic).to be_valid
expect(topic.tags.length).to eq(2)
end
@@ -171,36 +225,65 @@ RSpec.describe TopicCreator do
it "lets new user create a topic if they don't have sufficient trust level to tag topics" do
SiteSetting.min_trust_level_to_tag_topics = 1
new_user = Fabricate(:newuser)
- topic = TopicCreator.create(new_user, Guardian.new(new_user), valid_attrs.merge(category: category.id))
+ topic =
+ TopicCreator.create(
+ new_user,
+ Guardian.new(new_user),
+ valid_attrs.merge(category: category.id),
+ )
expect(topic).to be_valid
end
end
- context 'with required tag group' do
+ context "with required tag group" do
fab!(:tag_group) { Fabricate(:tag_group, tags: [tag1]) }
- fab!(:category) { Fabricate(:category, name: "beta", category_required_tag_groups: [CategoryRequiredTagGroup.new(tag_group: tag_group, min_count: 1)]) }
+ fab!(:category) do
+ Fabricate(
+ :category,
+ name: "beta",
+ category_required_tag_groups: [
+ CategoryRequiredTagGroup.new(tag_group: tag_group, min_count: 1),
+ ],
+ )
+ end
it "when no tags are not present" do
expect(
- TopicCreator.new(user, Guardian.new(user), valid_attrs.merge(category: category.id)).valid?
+ TopicCreator.new(
+ user,
+ Guardian.new(user),
+ valid_attrs.merge(category: category.id),
+ ).valid?,
).to be_falsy
end
it "when tags are not part of the tag group" do
expect(
- TopicCreator.new(user, Guardian.new(user), valid_attrs.merge(category: category.id, tags: ['nope'])).valid?
+ TopicCreator.new(
+ user,
+ Guardian.new(user),
+ valid_attrs.merge(category: category.id, tags: ["nope"]),
+ ).valid?,
).to be_falsy
end
it "when requirement is met" do
expect(
- TopicCreator.new(user, Guardian.new(user), valid_attrs.merge(category: category.id, tags: [tag1.name, tag2.name])).valid?
+ TopicCreator.new(
+ user,
+ Guardian.new(user),
+ valid_attrs.merge(category: category.id, tags: [tag1.name, tag2.name]),
+ ).valid?,
).to be_truthy
end
it "lets staff ignore the restriction" do
expect(
- TopicCreator.new(user, Guardian.new(admin), valid_attrs.merge(category: category.id)).valid?
+ TopicCreator.new(
+ user,
+ Guardian.new(admin),
+ valid_attrs.merge(category: category.id),
+ ).valid?,
).to be_truthy
end
end
@@ -209,13 +292,14 @@ RSpec.describe TopicCreator do
fab!(:category) { Fabricate(:category, tags: [tag3], tag_groups: [tag_group1]) }
it "allows topics without any tags" do
- tc = TopicCreator.new(
- user,
- Guardian.new(user),
- title: "hello this is a test topic without tags",
- raw: "hello this is a test topic without tags",
- category: category.id,
- )
+ tc =
+ TopicCreator.new(
+ user,
+ Guardian.new(user),
+ title: "hello this is a test topic without tags",
+ raw: "hello this is a test topic without tags",
+ category: category.id,
+ )
expect(tc.valid?).to eq(true)
expect(tc.errors).to be_empty
topic = tc.create
@@ -223,14 +307,15 @@ RSpec.describe TopicCreator do
end
it "allows topics if they use tags only from the tags set that the category restricts" do
- tc = TopicCreator.new(
- user,
- Guardian.new(user),
- title: "hello this is a test topic with tags",
- raw: "hello this is a test topic with tags",
- category: category.id,
- tags: [tag1.name, tag3.name]
- )
+ tc =
+ TopicCreator.new(
+ user,
+ Guardian.new(user),
+ title: "hello this is a test topic with tags",
+ raw: "hello this is a test topic with tags",
+ category: category.id,
+ tags: [tag1.name, tag3.name],
+ )
expect(tc.valid?).to eq(true)
expect(tc.errors).to be_empty
topic = tc.create
@@ -239,107 +324,113 @@ RSpec.describe TopicCreator do
it "allows topics to use tags that are restricted in multiple categories" do
category2 = Fabricate(:category, tags: [tag5], tag_groups: [tag_group1])
- tc = TopicCreator.new(
- user,
- Guardian.new(user),
- title: "hello this is a test topic with tags",
- raw: "hello this is a test topic with tags",
- category: category2.id,
- tags: [tag1.name, tag5.name]
- )
+ tc =
+ TopicCreator.new(
+ user,
+ Guardian.new(user),
+ title: "hello this is a test topic with tags",
+ raw: "hello this is a test topic with tags",
+ category: category2.id,
+ tags: [tag1.name, tag5.name],
+ )
expect(tc.valid?).to eq(true)
expect(tc.errors).to be_empty
topic = tc.create
expect(topic.tags).to contain_exactly(tag1, tag5)
- tc = TopicCreator.new(
- user,
- Guardian.new(user),
- title: "hello this is a test topic with tags 1",
- raw: "hello this is a test topic with tags",
- category: category.id,
- tags: [tag1.name, tag3.name]
- )
+ tc =
+ TopicCreator.new(
+ user,
+ Guardian.new(user),
+ title: "hello this is a test topic with tags 1",
+ raw: "hello this is a test topic with tags",
+ category: category.id,
+ tags: [tag1.name, tag3.name],
+ )
expect(tc.valid?).to eq(true)
expect(tc.errors).to be_empty
topic = tc.create
expect(topic.tags).to contain_exactly(tag1, tag3)
- tc = TopicCreator.new(
- user,
- Guardian.new(user),
- title: "hello this is a test topic with tags 2",
- raw: "hello this is a test topic with tags",
- category: category.id,
- tags: [tag1.name, tag5.name]
- )
+ tc =
+ TopicCreator.new(
+ user,
+ Guardian.new(user),
+ title: "hello this is a test topic with tags 2",
+ raw: "hello this is a test topic with tags",
+ category: category.id,
+ tags: [tag1.name, tag5.name],
+ )
expect(tc.valid?).to eq(false)
expect(tc.errors.full_messages).to contain_exactly(
I18n.t(
"tags.forbidden.restricted_tags_cannot_be_used_in_category",
count: 1,
tags: tag5.name,
- category: category.name
- )
+ category: category.name,
+ ),
)
end
it "rejects topics if they use a tag outside the set of tags that the category restricts" do
- tc = TopicCreator.new(
- user,
- Guardian.new(user),
- title: "hello this is a test topic with tags",
- raw: "hello this is a test topic with tags",
- category: category.id,
- tags: [tag2.name, tag1.name]
- )
+ tc =
+ TopicCreator.new(
+ user,
+ Guardian.new(user),
+ title: "hello this is a test topic with tags",
+ raw: "hello this is a test topic with tags",
+ category: category.id,
+ tags: [tag2.name, tag1.name],
+ )
expect(tc.valid?).to eq(false)
expect(tc.errors.full_messages).to contain_exactly(
I18n.t(
"tags.forbidden.category_does_not_allow_tags",
count: 1,
tags: tag2.name,
- category: category.name
- )
+ category: category.name,
+ ),
)
- tc = TopicCreator.new(
- user,
- Guardian.new(user),
- title: "hello this is a test topic with tags",
- raw: "hello this is a test topic with tags",
- category: category.id,
- tags: [tag2.name, tag5.name, tag3.name]
- )
+ tc =
+ TopicCreator.new(
+ user,
+ Guardian.new(user),
+ title: "hello this is a test topic with tags",
+ raw: "hello this is a test topic with tags",
+ category: category.id,
+ tags: [tag2.name, tag5.name, tag3.name],
+ )
expect(tc.valid?).to eq(false)
expect(tc.errors.full_messages).to contain_exactly(
I18n.t(
"tags.forbidden.category_does_not_allow_tags",
count: 2,
tags: [tag2, tag5].map(&:name).sort.join(", "),
- category: category.name
- )
+ category: category.name,
+ ),
)
end
it "rejects topics in other categories if a restricted tag of a category are used" do
category2 = Fabricate(:category)
- tc = TopicCreator.new(
- user,
- Guardian.new(user),
- title: "hello this is a test topic with tags",
- raw: "hello this is a test topic with tags",
- category: category2.id,
- tags: [tag1.name, tag2.name]
- )
+ tc =
+ TopicCreator.new(
+ user,
+ Guardian.new(user),
+ title: "hello this is a test topic with tags",
+ raw: "hello this is a test topic with tags",
+ category: category2.id,
+ tags: [tag1.name, tag2.name],
+ )
expect(tc.valid?).to eq(false)
expect(tc.errors.full_messages).to contain_exactly(
I18n.t(
"tags.forbidden.restricted_tags_cannot_be_used_in_category",
count: 1,
tags: tag1.name,
- category: category2.name
- )
+ category: category2.name,
+ ),
)
end
@@ -347,14 +438,15 @@ RSpec.describe TopicCreator do
before { category.update!(allow_global_tags: true) }
it "allows topics to use tags that aren't restricted by any category" do
- tc = TopicCreator.new(
- user,
- Guardian.new(user),
- title: "hello this is a test topic with tags",
- raw: "hello this is a test topic with tags",
- category: category.id,
- tags: [tag1.name, tag2.name, tag3.name, tag5.name]
- )
+ tc =
+ TopicCreator.new(
+ user,
+ Guardian.new(user),
+ title: "hello this is a test topic with tags",
+ raw: "hello this is a test topic with tags",
+ category: category.id,
+ tags: [tag1.name, tag2.name, tag3.name, tag5.name],
+ )
expect(tc.valid?).to eq(true)
expect(tc.errors).to be_empty
topic = tc.create
@@ -363,48 +455,50 @@ RSpec.describe TopicCreator do
it "rejects topics if they use restricted tags of another category" do
Fabricate(:category, tags: [tag5], tag_groups: [tag_group2])
- tc = TopicCreator.new(
- user,
- Guardian.new(user),
- title: "hello this is a test topic with tags",
- raw: "hello this is a test topic with tags",
- category: category.id,
- tags: [tag1.name, tag5.name]
- )
+ tc =
+ TopicCreator.new(
+ user,
+ Guardian.new(user),
+ title: "hello this is a test topic with tags",
+ raw: "hello this is a test topic with tags",
+ category: category.id,
+ tags: [tag1.name, tag5.name],
+ )
expect(tc.valid?).to eq(false)
expect(tc.errors.full_messages).to contain_exactly(
I18n.t(
"tags.forbidden.restricted_tags_cannot_be_used_in_category",
count: 1,
tags: tag5.name,
- category: category.name
- )
+ category: category.name,
+ ),
)
- tc = TopicCreator.new(
- user,
- Guardian.new(user),
- title: "hello this is a test topic with tags",
- raw: "hello this is a test topic with tags",
- category: category.id,
- tags: [tag1.name, tag2.name, tag5.name]
- )
+ tc =
+ TopicCreator.new(
+ user,
+ Guardian.new(user),
+ title: "hello this is a test topic with tags",
+ raw: "hello this is a test topic with tags",
+ category: category.id,
+ tags: [tag1.name, tag2.name, tag5.name],
+ )
expect(tc.valid?).to eq(false)
expect(tc.errors.full_messages).to contain_exactly(
I18n.t(
"tags.forbidden.restricted_tags_cannot_be_used_in_category",
count: 2,
tags: [tag2, tag5].map(&:name).sort.join(", "),
- category: category.name
- )
+ category: category.name,
+ ),
)
end
end
end
end
- context 'with personal message' do
- context 'with success cases' do
+ context "with personal message" do
+ context "with success cases" do
before do
TopicCreator.any_instance.expects(:save_topic).returns(true)
TopicCreator.any_instance.expects(:watch_topic).returns(true)
@@ -424,11 +518,17 @@ RSpec.describe TopicCreator do
it "personal_message_enabled_groups setting should not be checked when sending private messages to staff via flag" do
SiteSetting.personal_message_enabled_groups = Group::AUTO_GROUPS[:staff]
- expect(TopicCreator.create(user, Guardian.new(user), pm_valid_attrs.merge(subtype: TopicSubtype.notify_moderators))).to be_valid
+ expect(
+ TopicCreator.create(
+ user,
+ Guardian.new(user),
+ pm_valid_attrs.merge(subtype: TopicSubtype.notify_moderators),
+ ),
+ ).to be_valid
end
end
- context 'with failure cases' do
+ context "with failure cases" do
it "should be rollback the changes when email is invalid" do
SiteSetting.manual_polling_enabled = true
SiteSetting.reply_by_email_address = "sam+%{reply_key}@sam.com"
@@ -437,9 +537,9 @@ RSpec.describe TopicCreator do
attrs = pm_to_email_valid_attrs.dup
attrs[:target_emails] = "t" * 256
- expect do
- TopicCreator.create(user, Guardian.new(user), attrs)
- end.to raise_error(ActiveRecord::Rollback)
+ expect do TopicCreator.create(user, Guardian.new(user), attrs) end.to raise_error(
+ ActiveRecord::Rollback,
+ )
end
it "personal_message_enabled_groups setting should be checked when sending private message" do
@@ -451,71 +551,82 @@ RSpec.describe TopicCreator do
end
end
- context 'with to emails' do
- before do
- Group.refresh_automatic_groups!
+ context "with to emails" do
+ before { Group.refresh_automatic_groups! }
+
+ it "works for staff" do
+ SiteSetting.min_trust_to_send_email_messages = "staff"
+ expect(
+ TopicCreator.create(admin, Guardian.new(admin), pm_to_email_valid_attrs),
+ ).to be_valid
end
- it 'works for staff' do
- SiteSetting.min_trust_to_send_email_messages = 'staff'
- expect(TopicCreator.create(admin, Guardian.new(admin), pm_to_email_valid_attrs)).to be_valid
- end
-
- it 'work for trusted users' do
+ it "work for trusted users" do
SiteSetting.min_trust_to_send_email_messages = 3
user.update!(trust_level: 3)
expect(TopicCreator.create(user, Guardian.new(user), pm_to_email_valid_attrs)).to be_valid
end
- it 'does not work for non-staff' do
- SiteSetting.min_trust_to_send_email_messages = 'staff'
- expect { TopicCreator.create(user, Guardian.new(user), pm_to_email_valid_attrs) }.to raise_error(ActiveRecord::Rollback)
+ it "does not work for non-staff" do
+ SiteSetting.min_trust_to_send_email_messages = "staff"
+ expect {
+ TopicCreator.create(user, Guardian.new(user), pm_to_email_valid_attrs)
+ }.to raise_error(ActiveRecord::Rollback)
end
- it 'does not work for untrusted users' do
+ it "does not work for untrusted users" do
SiteSetting.min_trust_to_send_email_messages = 3
user.update!(trust_level: 2)
- expect { TopicCreator.create(user, Guardian.new(user), pm_to_email_valid_attrs) }.to raise_error(ActiveRecord::Rollback)
+ expect {
+ TopicCreator.create(user, Guardian.new(user), pm_to_email_valid_attrs)
+ }.to raise_error(ActiveRecord::Rollback)
end
end
end
- context 'when setting timestamps' do
- it 'supports Time instances' do
+ context "when setting timestamps" do
+ it "supports Time instances" do
freeze_time
- topic = TopicCreator.create(user, Guardian.new(user), valid_attrs.merge(
- created_at: 1.week.ago,
- pinned_at: 3.days.ago
- ))
+ topic =
+ TopicCreator.create(
+ user,
+ Guardian.new(user),
+ valid_attrs.merge(created_at: 1.week.ago, pinned_at: 3.days.ago),
+ )
expect(topic.created_at).to eq_time(1.week.ago)
expect(topic.pinned_at).to eq_time(3.days.ago)
end
- it 'supports strings' do
+ it "supports strings" do
freeze_time
- time1 = Time.zone.parse('2019-09-02')
- time2 = Time.zone.parse('2020-03-10 15:17')
+ time1 = Time.zone.parse("2019-09-02")
+ time2 = Time.zone.parse("2020-03-10 15:17")
- topic = TopicCreator.create(user, Guardian.new(user), valid_attrs.merge(
- created_at: '2019-09-02',
- pinned_at: '2020-03-10 15:17'
- ))
+ topic =
+ TopicCreator.create(
+ user,
+ Guardian.new(user),
+ valid_attrs.merge(created_at: "2019-09-02", pinned_at: "2020-03-10 15:17"),
+ )
expect(topic.created_at).to eq_time(time1)
expect(topic.pinned_at).to eq_time(time2)
end
end
- context 'with external_id' do
- it 'adds external_id' do
- topic = TopicCreator.create(user, Guardian.new(user), valid_attrs.merge(
- external_id: 'external_id'
- ))
+ context "with external_id" do
+ it "adds external_id" do
+ topic =
+ TopicCreator.create(
+ user,
+ Guardian.new(user),
+ valid_attrs.merge(external_id: "external_id"),
+ )
- expect(topic.external_id).to eq('external_id')
+ expect(topic.external_id).to eq("external_id")
end
end
@@ -523,9 +634,9 @@ RSpec.describe TopicCreator do
let(:unlisted_attrs) { valid_attrs.merge(visible: false) }
it "throws an exception for a non-staff user" do
- expect do
- TopicCreator.create(user, Guardian.new(user), unlisted_attrs)
- end.to raise_error(ActiveRecord::Rollback)
+ expect do TopicCreator.create(user, Guardian.new(user), unlisted_attrs) end.to raise_error(
+ ActiveRecord::Rollback,
+ )
end
it "is invalid for a non-staff user" do
diff --git a/spec/lib/topic_publisher_spec.rb b/spec/lib/topic_publisher_spec.rb
index fc17d51134b..a1d42085e84 100644
--- a/spec/lib/topic_publisher_spec.rb
+++ b/spec/lib/topic_publisher_spec.rb
@@ -1,15 +1,13 @@
# frozen_string_literal: true
-require 'topic_publisher'
+require "topic_publisher"
RSpec.describe TopicPublisher do
describe "shared drafts" do
fab!(:shared_drafts_category) { Fabricate(:category) }
fab!(:category) { Fabricate(:category) }
- before do
- SiteSetting.shared_drafts_category = shared_drafts_category.id
- end
+ before { SiteSetting.shared_drafts_category = shared_drafts_category.id }
context "when publishing" do
fab!(:topic) { Fabricate(:topic, category: shared_drafts_category, visible: false) }
@@ -37,10 +35,12 @@ RSpec.describe TopicPublisher do
expect(topic.updated_at).to eq_time(published_at)
expect(topic.shared_draft).to be_blank
- expect(UserHistory.where(
- acting_user_id: moderator.id,
- action: UserHistory.actions[:topic_published]
- )).to be_present
+ expect(
+ UserHistory.where(
+ acting_user_id: moderator.id,
+ action: UserHistory.actions[:topic_published],
+ ),
+ ).to be_present
op.reload
@@ -60,13 +60,14 @@ RSpec.describe TopicPublisher do
TagUser.create!(
user_id: user.id,
tag_id: tag.id,
- notification_level: NotificationLevels.topic_levels[:watching]
+ notification_level: NotificationLevels.topic_levels[:watching],
)
topic.update!(tags: [tag])
- expect { TopicPublisher.new(topic, moderator, shared_draft.category_id).publish! }
- .to change { Notification.count }.by(1)
+ expect {
+ TopicPublisher.new(topic, moderator, shared_draft.category_id).publish!
+ }.to change { Notification.count }.by(1)
topic.reload
expect(topic.tags).to contain_exactly(tag)
diff --git a/spec/lib/topic_query/private_message_lists_spec.rb b/spec/lib/topic_query/private_message_lists_spec.rb
index aeecaf31aa0..402e7a303ef 100644
--- a/spec/lib/topic_query/private_message_lists_spec.rb
+++ b/spec/lib/topic_query/private_message_lists_spec.rb
@@ -7,27 +7,21 @@ RSpec.describe TopicQuery::PrivateMessageLists do
fab!(:user_3) { Fabricate(:user) }
fab!(:user_4) { Fabricate(:user) }
- before_all do
- Group.refresh_automatic_groups!
- end
+ before_all { Group.refresh_automatic_groups! }
fab!(:group) do
- Fabricate(:group, messageable_level: Group::ALIAS_LEVELS[:everyone]).tap do |g|
- g.add(user_2)
- end
+ Fabricate(:group, messageable_level: Group::ALIAS_LEVELS[:everyone]).tap { |g| g.add(user_2) }
end
fab!(:group_2) do
- Fabricate(:group, messageable_level: Group::ALIAS_LEVELS[:everyone]).tap do |g|
- g.add(user_4)
- end
+ Fabricate(:group, messageable_level: Group::ALIAS_LEVELS[:everyone]).tap { |g| g.add(user_4) }
end
fab!(:group_message) do
create_post(
user: user,
target_group_names: [group.name],
- archetype: Archetype.private_message
+ archetype: Archetype.private_message,
).topic
end
@@ -35,7 +29,7 @@ RSpec.describe TopicQuery::PrivateMessageLists do
create_post(
user: user_3,
target_group_names: [group_2.name],
- archetype: Archetype.private_message
+ archetype: Archetype.private_message,
).topic
end
@@ -43,12 +37,12 @@ RSpec.describe TopicQuery::PrivateMessageLists do
create_post(
user: user,
target_usernames: [user_2.username],
- archetype: Archetype.private_message
+ archetype: Archetype.private_message,
).topic
end
- describe '#list_private_messages' do
- it 'returns a list of all private messages that a user has access to' do
+ describe "#list_private_messages" do
+ it "returns a list of all private messages that a user has access to" do
topics = TopicQuery.new(nil).list_private_messages(user_2).topics
expect(topics).to contain_exactly(private_message)
@@ -61,44 +55,48 @@ RSpec.describe TopicQuery::PrivateMessageLists do
pm.add_moderator_post(admin, "Thank you for your flag")
- expect(TopicQuery.new(user_4).list_private_messages(user_4).topics)
- .to contain_exactly(pm)
+ expect(TopicQuery.new(user_4).list_private_messages(user_4).topics).to contain_exactly(pm)
end
end
- describe '#list_private_messages_group' do
- it 'should return the right list for a group user' do
+ describe "#list_private_messages_group" do
+ it "should return the right list for a group user" do
group.add(user_2)
- topics = TopicQuery.new(nil, group_name: group.name)
- .list_private_messages_group(user_2)
- .topics
+ topics =
+ TopicQuery.new(nil, group_name: group.name).list_private_messages_group(user_2).topics
expect(topics).to contain_exactly(group_message)
end
- it 'should return the right list for an admin not part of the group' do
+ it "should return the right list for an admin not part of the group" do
group.update!(name: group.name.capitalize)
- topics = TopicQuery.new(nil, group_name: group.name.upcase)
- .list_private_messages_group(Fabricate(:admin))
- .topics
+ topics =
+ TopicQuery
+ .new(nil, group_name: group.name.upcase)
+ .list_private_messages_group(Fabricate(:admin))
+ .topics
expect(topics).to contain_exactly(group_message)
end
it "should not allow a moderator not part of the group to view the group's messages" do
- topics = TopicQuery.new(nil, group_name: group.name)
- .list_private_messages_group(Fabricate(:moderator))
- .topics
+ topics =
+ TopicQuery
+ .new(nil, group_name: group.name)
+ .list_private_messages_group(Fabricate(:moderator))
+ .topics
expect(topics).to eq([])
end
it "should not allow a user not part of the group to view the group's messages" do
- topics = TopicQuery.new(nil, group_name: group.name)
- .list_private_messages_group(Fabricate(:user))
- .topics
+ topics =
+ TopicQuery
+ .new(nil, group_name: group.name)
+ .list_private_messages_group(Fabricate(:user))
+ .topics
expect(topics).to eq([])
end
@@ -110,76 +108,71 @@ RSpec.describe TopicQuery::PrivateMessageLists do
end
let(:listed_message) do
- TopicQuery.new(nil, group_name: group.name)
- .list_private_messages_group(user)
- .topics.first
+ TopicQuery.new(nil, group_name: group.name).list_private_messages_group(user).topics.first
end
- it 'returns the last read post number' do
- topic_group = TopicGroup.create!(
- topic: group_message, group: group, last_read_post_number: 10
- )
+ it "returns the last read post number" do
+ topic_group =
+ TopicGroup.create!(topic: group_message, group: group, last_read_post_number: 10)
expect(listed_message.last_read_post_number).to eq(topic_group.last_read_post_number)
end
end
end
- describe '#list_private_messages_group_new' do
- it 'returns a list of new private messages for a group that user is a part of' do
- topics = TopicQuery.new(nil, group_name: group.name)
- .list_private_messages_group_new(user_2)
- .topics
+ describe "#list_private_messages_group_new" do
+ it "returns a list of new private messages for a group that user is a part of" do
+ topics =
+ TopicQuery.new(nil, group_name: group.name).list_private_messages_group_new(user_2).topics
expect(topics).to contain_exactly(group_message)
end
- it 'returns a list of new private messages for a group accounting for dismissed topics' do
+ it "returns a list of new private messages for a group accounting for dismissed topics" do
Fabricate(:dismissed_topic_user, topic: group_message, user: user_2)
- topics = TopicQuery.new(nil, group_name: group.name)
- .list_private_messages_group_new(user_2)
- .topics
+ topics =
+ TopicQuery.new(nil, group_name: group.name).list_private_messages_group_new(user_2).topics
expect(topics).to eq([])
end
end
- describe '#list_private_messages_group_unread' do
- it 'returns a list of unread private messages for a group that user is a part of' do
- topics = TopicQuery.new(nil, group_name: group.name)
- .list_private_messages_group_unread(user_2)
- .topics
+ describe "#list_private_messages_group_unread" do
+ it "returns a list of unread private messages for a group that user is a part of" do
+ topics =
+ TopicQuery
+ .new(nil, group_name: group.name)
+ .list_private_messages_group_unread(user_2)
+ .topics
expect(topics).to eq([])
- TopicUser.find_by(user: user_2, topic: group_message).update!(
- last_read_post_number: 1
- )
+ TopicUser.find_by(user: user_2, topic: group_message).update!(last_read_post_number: 1)
create_post(user: user, topic: group_message)
- topics = TopicQuery.new(nil, group_name: group.name)
- .list_private_messages_group_unread(user_2)
- .topics
+ topics =
+ TopicQuery
+ .new(nil, group_name: group.name)
+ .list_private_messages_group_unread(user_2)
+ .topics
expect(topics).to contain_exactly(group_message)
end
end
- describe '#list_private_messages_unread' do
+ describe "#list_private_messages_unread" do
fab!(:user) { Fabricate(:user) }
fab!(:user_2) { Fabricate(:user) }
- before_all do
- Group.refresh_automatic_groups!
- end
+ before_all { Group.refresh_automatic_groups! }
fab!(:pm) do
create_post(
user: user,
target_usernames: [user_2.username],
- archetype: Archetype.private_message
+ archetype: Archetype.private_message,
).topic
end
@@ -187,7 +180,7 @@ RSpec.describe TopicQuery::PrivateMessageLists do
create_post(
user: user,
target_usernames: [user_2.username],
- archetype: Archetype.private_message
+ archetype: Archetype.private_message,
).topic
end
@@ -195,38 +188,35 @@ RSpec.describe TopicQuery::PrivateMessageLists do
create_post(
user: user,
target_usernames: [user_2.username],
- archetype: Archetype.private_message
+ archetype: Archetype.private_message,
).topic
end
- it 'returns a list of private messages with unread posts that user is at least tracking' do
+ it "returns a list of private messages with unread posts that user is at least tracking" do
freeze_time 1.minute.from_now do
create_post(user: user_2, topic_id: pm.id)
create_post(user: user_2, topic_id: pm_3.id)
end
TopicUser.find_by(user: user, topic: pm_3).update!(
- notification_level: TopicUser.notification_levels[:regular]
+ notification_level: TopicUser.notification_levels[:regular],
)
- expect(TopicQuery.new(user).list_private_messages_unread(user).topics)
- .to contain_exactly(pm)
+ expect(TopicQuery.new(user).list_private_messages_unread(user).topics).to contain_exactly(pm)
end
end
- describe '#list_private_messages_new' do
+ describe "#list_private_messages_new" do
fab!(:user) { Fabricate(:user) }
fab!(:user_2) { Fabricate(:user) }
- before_all do
- Group.refresh_automatic_groups!
- end
+ before_all { Group.refresh_automatic_groups! }
fab!(:pm) do
create_post(
user: user,
target_usernames: [user_2.username],
- archetype: Archetype.private_message
+ archetype: Archetype.private_message,
).topic
end
@@ -234,16 +224,18 @@ RSpec.describe TopicQuery::PrivateMessageLists do
create_post(
user: user,
target_usernames: [user_2.username],
- archetype: Archetype.private_message
+ archetype: Archetype.private_message,
).topic
end
- it 'returns a list of new private messages' do
- expect(TopicQuery.new(user_2).list_private_messages_new(user_2).topics)
- .to contain_exactly(pm, pm_2)
+ it "returns a list of new private messages" do
+ expect(TopicQuery.new(user_2).list_private_messages_new(user_2).topics).to contain_exactly(
+ pm,
+ pm_2,
+ )
end
- it 'returns a list of new private messages accounting for muted tags' do
+ it "returns a list of new private messages accounting for muted tags" do
tag = Fabricate(:tag)
pm.tags << tag
@@ -251,79 +243,81 @@ RSpec.describe TopicQuery::PrivateMessageLists do
TagUser.create!(
tag: tag,
user: user_2,
- notification_level: TopicUser.notification_levels[:muted]
+ notification_level: TopicUser.notification_levels[:muted],
)
- expect(TopicQuery.new(user_2).list_private_messages_new(user_2).topics)
- .to contain_exactly(pm_2)
+ expect(TopicQuery.new(user_2).list_private_messages_new(user_2).topics).to contain_exactly(
+ pm_2,
+ )
end
- it 'returns a list of new private messages accounting for dismissed topics' do
+ it "returns a list of new private messages accounting for dismissed topics" do
Fabricate(:dismissed_topic_user, topic: pm, user: user_2)
- expect(TopicQuery.new(user_2).list_private_messages_new(user_2).topics)
- .to contain_exactly(pm_2)
+ expect(TopicQuery.new(user_2).list_private_messages_new(user_2).topics).to contain_exactly(
+ pm_2,
+ )
end
end
- describe '#private_messages_for' do
- it 'returns a list of group private messages for a given user' do
- expect(
- TopicQuery
- .new(user, group_name: group.name)
- .private_messages_for(user, :group)
- ).to eq([])
+ describe "#private_messages_for" do
+ it "returns a list of group private messages for a given user" do
+ expect(TopicQuery.new(user, group_name: group.name).private_messages_for(user, :group)).to eq(
+ [],
+ )
expect(
- TopicQuery
- .new(user_2, group_name: group.name)
- .private_messages_for(user_2, :group)
+ TopicQuery.new(user_2, group_name: group.name).private_messages_for(user_2, :group),
).to contain_exactly(group_message)
expect(
- TopicQuery
- .new(user_3, group_name: group_2.name)
- .private_messages_for(user_3, :group)
+ TopicQuery.new(user_3, group_name: group_2.name).private_messages_for(user_3, :group),
).to eq([])
expect(
- TopicQuery
- .new(user_4, group_name: group_2.name)
- .private_messages_for(user_4, :group)
+ TopicQuery.new(user_4, group_name: group_2.name).private_messages_for(user_4, :group),
).to contain_exactly(group_message_2)
end
- it 'returns a list of personal private messages for a given user' do
- expect(TopicQuery.new(user).private_messages_for(user, :user))
- .to contain_exactly(private_message, group_message)
+ it "returns a list of personal private messages for a given user" do
+ expect(TopicQuery.new(user).private_messages_for(user, :user)).to contain_exactly(
+ private_message,
+ group_message,
+ )
- expect(TopicQuery.new(user_2).private_messages_for(user_2, :user))
- .to contain_exactly(private_message)
+ expect(TopicQuery.new(user_2).private_messages_for(user_2, :user)).to contain_exactly(
+ private_message,
+ )
- expect(TopicQuery.new(user_3).private_messages_for(user_3, :user))
- .to contain_exactly(group_message_2)
+ expect(TopicQuery.new(user_3).private_messages_for(user_3, :user)).to contain_exactly(
+ group_message_2,
+ )
- expect(TopicQuery.new(user_4).private_messages_for(user_4, :user))
- .to eq([])
+ expect(TopicQuery.new(user_4).private_messages_for(user_4, :user)).to eq([])
end
- it 'returns a list of all private messages for a given user' do
- expect(TopicQuery.new(user).private_messages_for(user, :all))
- .to contain_exactly(private_message, group_message)
+ it "returns a list of all private messages for a given user" do
+ expect(TopicQuery.new(user).private_messages_for(user, :all)).to contain_exactly(
+ private_message,
+ group_message,
+ )
- expect(TopicQuery.new(user_2).private_messages_for(user_2, :all))
- .to contain_exactly(private_message, group_message)
+ expect(TopicQuery.new(user_2).private_messages_for(user_2, :all)).to contain_exactly(
+ private_message,
+ group_message,
+ )
- expect(TopicQuery.new(user_3).private_messages_for(user_3, :all))
- .to contain_exactly(group_message_2)
+ expect(TopicQuery.new(user_3).private_messages_for(user_3, :all)).to contain_exactly(
+ group_message_2,
+ )
- expect(TopicQuery.new(user_4).private_messages_for(user_4, :all))
- .to contain_exactly(group_message_2)
+ expect(TopicQuery.new(user_4).private_messages_for(user_4, :all)).to contain_exactly(
+ group_message_2,
+ )
group_2.remove(user_4)
- expect(TopicQuery.new(user_4).private_messages_for(user_4, :all))
- .to eq([])
+ expect(TopicQuery.new(user_4).private_messages_for(user_4, :all)).to eq([])
end
end
end
diff --git a/spec/lib/topic_query_spec.rb b/spec/lib/topic_query_spec.rb
index 03d970820c1..ffd62eaa1d0 100644
--- a/spec/lib/topic_query_spec.rb
+++ b/spec/lib/topic_query_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-require 'topic_view'
+require "topic_view"
RSpec.describe TopicQuery do
# TODO:
@@ -19,7 +19,7 @@ RSpec.describe TopicQuery do
fab!(:moderator) { Fabricate(:moderator) }
fab!(:admin) { Fabricate(:admin) }
- describe 'secure category' do
+ describe "secure category" do
it "filters categories out correctly" do
category = Fabricate(:category_with_definition)
group = Fabricate(:group)
@@ -53,10 +53,12 @@ RSpec.describe TopicQuery do
_topic2 = Fabricate(:topic)
TopicQuery.add_custom_filter(:only_topic_id) do |results, topic_query|
- results = results.where('topics.id = ?', topic_query.options[:only_topic_id])
+ results = results.where("topics.id = ?", topic_query.options[:only_topic_id])
end
- expect(TopicQuery.new(nil, only_topic_id: topic1.id).list_latest.topics.map(&:id)).to eq([topic1.id])
+ expect(TopicQuery.new(nil, only_topic_id: topic1.id).list_latest.topics.map(&:id)).to eq(
+ [topic1.id],
+ )
TopicQuery.remove_custom_filter(:only_topic_id)
end
@@ -70,7 +72,6 @@ RSpec.describe TopicQuery do
expect(TopicQuery.new(nil).list_topics_by(user).topics.count).to eq(1)
expect(TopicQuery.new(user).list_topics_by(user).topics.count).to eq(2)
end
-
end
describe "#prioritize_pinned_topics" do
@@ -79,39 +80,39 @@ RSpec.describe TopicQuery do
per_page = 3
topics = []
- (num_topics - 1).downto(0).each do |i|
- topics[i] = freeze_time(i.seconds.ago) { Fabricate(:topic) }
- end
+ (num_topics - 1)
+ .downto(0)
+ .each { |i| topics[i] = freeze_time(i.seconds.ago) { Fabricate(:topic) } }
topic_query = TopicQuery.new(user)
results = topic_query.send(:default_results)
- expect(topic_query.prioritize_pinned_topics(results,
- per_page: per_page,
- page: 0)
- ).to eq(topics[0...per_page])
+ expect(topic_query.prioritize_pinned_topics(results, per_page: per_page, page: 0)).to eq(
+ topics[0...per_page],
+ )
- expect(topic_query.prioritize_pinned_topics(results,
- per_page: per_page,
- page: 1)
- ).to eq(topics[per_page...num_topics])
+ expect(topic_query.prioritize_pinned_topics(results, per_page: per_page, page: 1)).to eq(
+ topics[per_page...num_topics],
+ )
end
it "orders globally pinned topics by pinned_at rather than bumped_at" do
- pinned1 = Fabricate(
- :topic,
- bumped_at: 3.hour.ago,
- pinned_at: 1.hours.ago,
- pinned_until: 10.days.from_now,
- pinned_globally: true
- )
- pinned2 = Fabricate(
- :topic,
- bumped_at: 2.hour.ago,
- pinned_at: 4.hours.ago,
- pinned_until: 10.days.from_now,
- pinned_globally: true
- )
+ pinned1 =
+ Fabricate(
+ :topic,
+ bumped_at: 3.hour.ago,
+ pinned_at: 1.hours.ago,
+ pinned_until: 10.days.from_now,
+ pinned_globally: true,
+ )
+ pinned2 =
+ Fabricate(
+ :topic,
+ bumped_at: 2.hour.ago,
+ pinned_at: 4.hours.ago,
+ pinned_until: 10.days.from_now,
+ pinned_globally: true,
+ )
unpinned1 = Fabricate(:topic, bumped_at: 2.hour.ago)
unpinned2 = Fabricate(:topic, bumped_at: 3.hour.ago)
@@ -119,28 +120,29 @@ RSpec.describe TopicQuery do
results = topic_query.send(:default_results)
expected_order = [pinned1, pinned2, unpinned1, unpinned2].map(&:id)
- expect(topic_query
- .prioritize_pinned_topics(results, per_page: 10, page: 0)
- .pluck(:id)
- ).to eq(expected_order)
+ expect(topic_query.prioritize_pinned_topics(results, per_page: 10, page: 0).pluck(:id)).to eq(
+ expected_order,
+ )
end
it "orders pinned topics within a category by pinned_at rather than bumped_at" do
cat = Fabricate(:category)
- pinned1 = Fabricate(
- :topic,
- category: cat,
- bumped_at: 3.hour.ago,
- pinned_at: 1.hours.ago,
- pinned_until: 10.days.from_now,
- )
- pinned2 = Fabricate(
- :topic,
- category: cat,
- bumped_at: 2.hour.ago,
- pinned_at: 4.hours.ago,
- pinned_until: 10.days.from_now,
- )
+ pinned1 =
+ Fabricate(
+ :topic,
+ category: cat,
+ bumped_at: 3.hour.ago,
+ pinned_at: 1.hours.ago,
+ pinned_until: 10.days.from_now,
+ )
+ pinned2 =
+ Fabricate(
+ :topic,
+ category: cat,
+ bumped_at: 2.hour.ago,
+ pinned_at: 4.hours.ago,
+ pinned_until: 10.days.from_now,
+ )
unpinned1 = Fabricate(:topic, category: cat, bumped_at: 2.hour.ago)
unpinned2 = Fabricate(:topic, category: cat, bumped_at: 3.hour.ago)
@@ -148,14 +150,18 @@ RSpec.describe TopicQuery do
results = topic_query.send(:default_results)
expected_order = [pinned1, pinned2, unpinned1, unpinned2].map(&:id)
- expect(topic_query
- .prioritize_pinned_topics(results, per_page: 10, page: 0, category_id: cat.id)
- .pluck(:id)
+ expect(
+ topic_query.prioritize_pinned_topics(
+ results,
+ per_page: 10,
+ page: 0,
+ category_id: cat.id,
+ ).pluck(:id),
).to eq(expected_order)
end
end
- describe 'tracked' do
+ describe "tracked" do
it "filters tracked topics correctly" do
SiteSetting.tagging_enabled = true
@@ -163,28 +169,29 @@ RSpec.describe TopicQuery do
topic = Fabricate(:topic, tags: [tag])
topic2 = Fabricate(:topic)
- query = TopicQuery.new(user, filter: 'tracked').list_latest
+ query = TopicQuery.new(user, filter: "tracked").list_latest
expect(query.topics.length).to eq(0)
TagUser.create!(
tag_id: tag.id,
user_id: user.id,
- notification_level: NotificationLevels.all[:watching]
+ notification_level: NotificationLevels.all[:watching],
)
- cu = CategoryUser.create!(
- category_id: topic2.category_id,
- user_id: user.id,
- notification_level: NotificationLevels.all[:regular]
- )
+ cu =
+ CategoryUser.create!(
+ category_id: topic2.category_id,
+ user_id: user.id,
+ notification_level: NotificationLevels.all[:regular],
+ )
- query = TopicQuery.new(user, filter: 'tracked').list_latest
+ query = TopicQuery.new(user, filter: "tracked").list_latest
expect(query.topics.map(&:id)).to contain_exactly(topic.id)
cu.update!(notification_level: NotificationLevels.all[:tracking])
- query = TopicQuery.new(user, filter: 'tracked').list_latest
+ query = TopicQuery.new(user, filter: "tracked").list_latest
expect(query.topics.map(&:id)).to contain_exactly(topic.id, topic2.id)
@@ -200,16 +207,16 @@ RSpec.describe TopicQuery do
CategoryUser.create!(
category_id: parent_category.id,
user_id: user.id,
- notification_level: NotificationLevels.all[:tracking]
+ notification_level: NotificationLevels.all[:tracking],
)
CategoryUser.create!(
category_id: sub_category_2.id,
user_id: user.id,
- notification_level: NotificationLevels.all[:tracking]
+ notification_level: NotificationLevels.all[:tracking],
)
- query = TopicQuery.new(user, filter: 'tracked').list_latest
+ query = TopicQuery.new(user, filter: "tracked").list_latest
expect(query.topics.map(&:id)).to contain_exactly(topic.id, topic2.id, topic3.id, topic4.id)
@@ -218,13 +225,19 @@ RSpec.describe TopicQuery do
sub_sub_category = Fabricate(:category, parent_category_id: sub_category.id)
topic5 = Fabricate(:topic, category_id: sub_sub_category.id)
- query = TopicQuery.new(user, filter: 'tracked').list_latest
+ query = TopicQuery.new(user, filter: "tracked").list_latest
- expect(query.topics.map(&:id)).to contain_exactly(topic.id, topic2.id, topic3.id, topic4.id, topic5.id)
+ expect(query.topics.map(&:id)).to contain_exactly(
+ topic.id,
+ topic2.id,
+ topic3.id,
+ topic4.id,
+ topic5.id,
+ )
end
end
- describe 'deleted filter' do
+ describe "deleted filter" do
it "filters deleted topics correctly" do
SiteSetting.enable_category_group_moderation = true
group_moderator = Fabricate(:user)
@@ -233,15 +246,21 @@ RSpec.describe TopicQuery do
category = Fabricate(:category, reviewable_by_group: group)
topic = Fabricate(:topic, category: category, deleted_at: 1.year.ago)
- expect(TopicQuery.new(admin, status: 'deleted').list_latest.topics.size).to eq(1)
- expect(TopicQuery.new(moderator, status: 'deleted').list_latest.topics.size).to eq(1)
- expect(TopicQuery.new(group_moderator, status: 'deleted', category: category.id).list_latest.topics.size).to eq(1)
- expect(TopicQuery.new(user, status: 'deleted').list_latest.topics.size).to eq(0)
- expect(TopicQuery.new(nil, status: 'deleted').list_latest.topics.size).to eq(0)
+ expect(TopicQuery.new(admin, status: "deleted").list_latest.topics.size).to eq(1)
+ expect(TopicQuery.new(moderator, status: "deleted").list_latest.topics.size).to eq(1)
+ expect(
+ TopicQuery
+ .new(group_moderator, status: "deleted", category: category.id)
+ .list_latest
+ .topics
+ .size,
+ ).to eq(1)
+ expect(TopicQuery.new(user, status: "deleted").list_latest.topics.size).to eq(0)
+ expect(TopicQuery.new(nil, status: "deleted").list_latest.topics.size).to eq(0)
end
end
- describe 'include_pms option' do
+ describe "include_pms option" do
it "includes users own pms in regular topic lists" do
topic = Fabricate(:topic)
own_pm = Fabricate(:private_message_topic, user: user)
@@ -249,11 +268,14 @@ RSpec.describe TopicQuery do
expect(TopicQuery.new(user).list_latest.topics).to contain_exactly(topic)
expect(TopicQuery.new(admin).list_latest.topics).to contain_exactly(topic)
- expect(TopicQuery.new(user, include_pms: true).list_latest.topics).to contain_exactly(topic, own_pm)
+ expect(TopicQuery.new(user, include_pms: true).list_latest.topics).to contain_exactly(
+ topic,
+ own_pm,
+ )
end
end
- describe 'include_all_pms option' do
+ describe "include_all_pms option" do
it "includes all pms in regular topic lists for admins" do
topic = Fabricate(:topic)
own_pm = Fabricate(:private_message_topic, user: user)
@@ -261,12 +283,19 @@ RSpec.describe TopicQuery do
expect(TopicQuery.new(user).list_latest.topics).to contain_exactly(topic)
expect(TopicQuery.new(admin).list_latest.topics).to contain_exactly(topic)
- expect(TopicQuery.new(user, include_all_pms: true).list_latest.topics).to contain_exactly(topic, own_pm)
- expect(TopicQuery.new(admin, include_all_pms: true).list_latest.topics).to contain_exactly(topic, own_pm, other_pm)
+ expect(TopicQuery.new(user, include_all_pms: true).list_latest.topics).to contain_exactly(
+ topic,
+ own_pm,
+ )
+ expect(TopicQuery.new(admin, include_all_pms: true).list_latest.topics).to contain_exactly(
+ topic,
+ own_pm,
+ other_pm,
+ )
end
end
- describe 'category filter' do
+ describe "category filter" do
let(:category) { Fabricate(:category_with_definition) }
let(:diff_category) { Fabricate(:category_with_definition, name: "Different Category") }
@@ -275,19 +304,23 @@ RSpec.describe TopicQuery do
# Filter by slug
expect(TopicQuery.new(moderator, category: category.slug).list_latest.topics.size).to eq(1)
- expect(TopicQuery.new(moderator, category: "#{category.id}-category").list_latest.topics.size).to eq(1)
+ expect(
+ TopicQuery.new(moderator, category: "#{category.id}-category").list_latest.topics.size,
+ ).to eq(1)
list = TopicQuery.new(moderator, category: diff_category.slug).list_latest
expect(list.topics.size).to eq(1)
expect(list.preload_key).to eq("topic_list")
# Defaults to no category filter when slug does not exist
- expect(TopicQuery.new(moderator, category: 'made up slug').list_latest.topics.size).to eq(2)
+ expect(TopicQuery.new(moderator, category: "made up slug").list_latest.topics.size).to eq(2)
end
- context 'with subcategories' do
+ context "with subcategories" do
let!(:subcategory) { Fabricate(:category_with_definition, parent_category_id: category.id) }
- let(:subsubcategory) { Fabricate(:category_with_definition, parent_category_id: subcategory.id) }
+ let(:subsubcategory) do
+ Fabricate(:category_with_definition, parent_category_id: subcategory.id)
+ end
# Not used in assertions but fabricated to ensure we're not leaking topics
# across categories
@@ -296,21 +329,18 @@ RSpec.describe TopicQuery do
it "works with subcategories" do
expect(
- TopicQuery
- .new(moderator, category: category.id)
- .list_latest.topics
+ TopicQuery.new(moderator, category: category.id).list_latest.topics,
).to contain_exactly(category.topic)
expect(
- TopicQuery
- .new(moderator, category: subcategory.id)
- .list_latest.topics
+ TopicQuery.new(moderator, category: subcategory.id).list_latest.topics,
).to contain_exactly(subcategory.topic)
expect(
TopicQuery
.new(moderator, category: category.id, no_subcategories: true)
- .list_latest.topics
+ .list_latest
+ .topics,
).to contain_exactly(category.topic)
end
@@ -318,9 +348,7 @@ RSpec.describe TopicQuery do
SiteSetting.show_category_definitions_in_topic_lists = true
expect(
- TopicQuery
- .new(moderator, category: category.id)
- .list_latest.topics
+ TopicQuery.new(moderator, category: category.id).list_latest.topics,
).to contain_exactly(category.topic, subcategory.topic)
end
@@ -334,67 +362,45 @@ RSpec.describe TopicQuery do
SiteSetting.max_category_nesting = 2
expect(
- TopicQuery
- .new(moderator, category: category.id)
- .list_latest.topics
+ TopicQuery.new(moderator, category: category.id).list_latest.topics,
).to contain_exactly(category.topic, category_topic, subcategory_topic)
expect(
- TopicQuery
- .new(moderator, category: subcategory.id)
- .list_latest.topics
- ).to contain_exactly(
- subcategory.topic,
- subcategory_topic,
- subsubcategory_topic
- )
+ TopicQuery.new(moderator, category: subcategory.id).list_latest.topics,
+ ).to contain_exactly(subcategory.topic, subcategory_topic, subsubcategory_topic)
expect(
- TopicQuery
- .new(moderator, category: subsubcategory.id)
- .list_latest.topics
+ TopicQuery.new(moderator, category: subsubcategory.id).list_latest.topics,
).to contain_exactly(subsubcategory.topic, subsubcategory_topic)
SiteSetting.max_category_nesting = 3
expect(
- TopicQuery
- .new(moderator, category: category.id)
- .list_latest.topics
+ TopicQuery.new(moderator, category: category.id).list_latest.topics,
).to contain_exactly(
category.topic,
category_topic,
subcategory_topic,
- subsubcategory_topic
+ subsubcategory_topic,
)
expect(
- TopicQuery
- .new(moderator, category: subcategory.id)
- .list_latest.topics
- ).to contain_exactly(
- subcategory.topic,
- subcategory_topic,
- subsubcategory_topic
- )
+ TopicQuery.new(moderator, category: subcategory.id).list_latest.topics,
+ ).to contain_exactly(subcategory.topic, subcategory_topic, subsubcategory_topic)
expect(
- TopicQuery
- .new(moderator, category: subsubcategory.id)
- .list_latest.topics
+ TopicQuery.new(moderator, category: subsubcategory.id).list_latest.topics,
).to contain_exactly(subsubcategory.topic, subsubcategory_topic)
end
end
end
- describe 'tag filter' do
- fab!(:tag) { Fabricate(:tag) }
+ describe "tag filter" do
+ fab!(:tag) { Fabricate(:tag) }
fab!(:other_tag) { Fabricate(:tag) }
fab!(:uppercase_tag) { Fabricate(:tag, name: "HeLlO") }
- before do
- SiteSetting.tagging_enabled = true
- end
+ before { SiteSetting.tagging_enabled = true }
context "with no category filter" do
fab!(:tagged_topic1) { Fabricate(:topic, tags: [tag]) }
@@ -402,7 +408,7 @@ RSpec.describe TopicQuery do
fab!(:tagged_topic3) { Fabricate(:topic, tags: [tag, other_tag]) }
fab!(:tagged_topic4) { Fabricate(:topic, tags: [uppercase_tag]) }
fab!(:no_tags_topic) { Fabricate(:topic) }
- let(:synonym) { Fabricate(:tag, target_tag: tag, name: 'synonym') }
+ let(:synonym) { Fabricate(:tag, target_tag: tag, name: "synonym") }
it "excludes a tag if desired" do
topics = TopicQuery.new(moderator, exclude_tag: tag.name).list_latest.topics
@@ -410,71 +416,100 @@ RSpec.describe TopicQuery do
end
it "returns topics with the tag when filtered to it" do
- expect(TopicQuery.new(moderator, tags: tag.name).list_latest.topics)
- .to contain_exactly(tagged_topic1, tagged_topic3)
-
- expect(TopicQuery.new(moderator, tags: [tag.id]).list_latest.topics)
- .to contain_exactly(tagged_topic1, tagged_topic3)
-
- expect(TopicQuery.new(
- moderator, tags: [tag.name, other_tag.name]
- ).list_latest.topics).to contain_exactly(
- tagged_topic1, tagged_topic2, tagged_topic3
+ expect(TopicQuery.new(moderator, tags: tag.name).list_latest.topics).to contain_exactly(
+ tagged_topic1,
+ tagged_topic3,
)
- expect(TopicQuery.new(moderator, tags: [tag.id, other_tag.id]).list_latest.topics)
- .to contain_exactly(tagged_topic1, tagged_topic2, tagged_topic3)
+ expect(TopicQuery.new(moderator, tags: [tag.id]).list_latest.topics).to contain_exactly(
+ tagged_topic1,
+ tagged_topic3,
+ )
- expect(TopicQuery.new(moderator, tags: ["hElLo"]).list_latest.topics)
- .to contain_exactly(tagged_topic4)
+ expect(
+ TopicQuery.new(moderator, tags: [tag.name, other_tag.name]).list_latest.topics,
+ ).to contain_exactly(tagged_topic1, tagged_topic2, tagged_topic3)
+
+ expect(
+ TopicQuery.new(moderator, tags: [tag.id, other_tag.id]).list_latest.topics,
+ ).to contain_exactly(tagged_topic1, tagged_topic2, tagged_topic3)
+
+ expect(TopicQuery.new(moderator, tags: ["hElLo"]).list_latest.topics).to contain_exactly(
+ tagged_topic4,
+ )
end
it "can return topics with all specified tags" do
- expect(TopicQuery.new(moderator, tags: [tag.name, other_tag.name], match_all_tags: true).list_latest.topics.map(&:id)).to eq([tagged_topic3.id])
+ expect(
+ TopicQuery
+ .new(moderator, tags: [tag.name, other_tag.name], match_all_tags: true)
+ .list_latest
+ .topics
+ .map(&:id),
+ ).to eq([tagged_topic3.id])
end
it "can return topics with tag intersections using truthy/falsey values" do
- expect(TopicQuery.new(moderator, tags: [tag.name, other_tag.name], match_all_tags: "false").list_latest.topics.map(&:id).sort).to eq([tagged_topic1.id, tagged_topic2.id, tagged_topic3.id].sort)
+ expect(
+ TopicQuery
+ .new(moderator, tags: [tag.name, other_tag.name], match_all_tags: "false")
+ .list_latest
+ .topics
+ .map(&:id)
+ .sort,
+ ).to eq([tagged_topic1.id, tagged_topic2.id, tagged_topic3.id].sort)
end
it "returns an empty relation when an invalid tag is passed" do
- expect(TopicQuery.new(moderator, tags: [tag.name, 'notatag'], match_all_tags: true).list_latest.topics).to be_empty
+ expect(
+ TopicQuery
+ .new(moderator, tags: [tag.name, "notatag"], match_all_tags: true)
+ .list_latest
+ .topics,
+ ).to be_empty
end
it "can return topics with no tags" do
- expect(TopicQuery.new(moderator, no_tags: true).list_latest.topics.map(&:id)).to eq([no_tags_topic.id])
+ expect(TopicQuery.new(moderator, no_tags: true).list_latest.topics.map(&:id)).to eq(
+ [no_tags_topic.id],
+ )
end
it "can filter using a synonym" do
- expect(TopicQuery.new(moderator, tags: synonym.name).list_latest.topics)
- .to contain_exactly(tagged_topic1, tagged_topic3)
-
- expect(TopicQuery.new(moderator, tags: [synonym.id]).list_latest.topics)
- .to contain_exactly(tagged_topic1, tagged_topic3)
-
- expect(TopicQuery.new(
- moderator, tags: [synonym.name, other_tag.name]
- ).list_latest.topics).to contain_exactly(
- tagged_topic1, tagged_topic2, tagged_topic3
+ expect(TopicQuery.new(moderator, tags: synonym.name).list_latest.topics).to contain_exactly(
+ tagged_topic1,
+ tagged_topic3,
)
- expect(TopicQuery.new(moderator, tags: [synonym.id, other_tag.id]).list_latest.topics)
- .to contain_exactly(tagged_topic1, tagged_topic2, tagged_topic3)
+ expect(TopicQuery.new(moderator, tags: [synonym.id]).list_latest.topics).to contain_exactly(
+ tagged_topic1,
+ tagged_topic3,
+ )
- expect(TopicQuery.new(moderator, tags: ["SYnonYM"]).list_latest.topics)
- .to contain_exactly(tagged_topic1, tagged_topic3)
+ expect(
+ TopicQuery.new(moderator, tags: [synonym.name, other_tag.name]).list_latest.topics,
+ ).to contain_exactly(tagged_topic1, tagged_topic2, tagged_topic3)
+
+ expect(
+ TopicQuery.new(moderator, tags: [synonym.id, other_tag.id]).list_latest.topics,
+ ).to contain_exactly(tagged_topic1, tagged_topic2, tagged_topic3)
+
+ expect(TopicQuery.new(moderator, tags: ["SYnonYM"]).list_latest.topics).to contain_exactly(
+ tagged_topic1,
+ tagged_topic3,
+ )
end
end
- context 'when remove_muted_tags is enabled' do
+ context "when remove_muted_tags is enabled" do
fab!(:topic) { Fabricate(:topic, tags: [tag]) }
before do
- SiteSetting.remove_muted_tags_from_latest = 'always'
+ SiteSetting.remove_muted_tags_from_latest = "always"
SiteSetting.default_tags_muted = tag.name
end
- it 'removes default muted tag topics for anonymous users' do
+ it "removes default muted tag topics for anonymous users" do
expect(TopicQuery.new(nil).list_latest.topics.map(&:id)).not_to include(topic.id)
end
end
@@ -489,19 +524,34 @@ RSpec.describe TopicQuery do
tagged_topic3 = Fabricate(:topic, category: category1, tags: [tag, other_tag])
_no_tags_topic = Fabricate(:topic, category: category1)
- expect(TopicQuery.new(moderator, category: category1.id, tags: [tag.name]).list_latest.topics.map(&:id).sort).to eq([tagged_topic1.id, tagged_topic3.id].sort)
- expect(TopicQuery.new(moderator, category: category2.id, tags: [other_tag.name]).list_latest.topics.size).to eq(0)
+ expect(
+ TopicQuery
+ .new(moderator, category: category1.id, tags: [tag.name])
+ .list_latest
+ .topics
+ .map(&:id)
+ .sort,
+ ).to eq([tagged_topic1.id, tagged_topic3.id].sort)
+ expect(
+ TopicQuery
+ .new(moderator, category: category2.id, tags: [other_tag.name])
+ .list_latest
+ .topics
+ .size,
+ ).to eq(0)
end
end
end
- describe 'muted categories' do
- it 'is removed from top, new and latest lists' do
+ describe "muted categories" do
+ it "is removed from top, new and latest lists" do
category = Fabricate(:category_with_definition)
topic = Fabricate(:topic, category: category)
- CategoryUser.create!(user_id: user.id,
- category_id: category.id,
- notification_level: CategoryUser.notification_levels[:muted])
+ CategoryUser.create!(
+ user_id: user.id,
+ category_id: category.id,
+ notification_level: CategoryUser.notification_levels[:muted],
+ )
expect(topic_query.list_new.topics.map(&:id)).not_to include(topic.id)
expect(topic_query.list_latest.topics.map(&:id)).not_to include(topic.id)
TopTopic.create!(topic: topic, all_score: 1)
@@ -523,65 +573,64 @@ RSpec.describe TopicQuery do
expect { topic_query.list_top_for(:monthly) }.not_to raise_error
expect { topic_query.list_top_for(:weekly) }.not_to raise_error
expect { topic_query.list_top_for(:daily) }.not_to raise_error
- expect { topic_query.list_top_for("some bad input") }.to raise_error(Discourse::InvalidParameters)
+ expect { topic_query.list_top_for("some bad input") }.to raise_error(
+ Discourse::InvalidParameters,
+ )
end
end
- describe 'mute_all_categories_by_default' do
+ describe "mute_all_categories_by_default" do
fab!(:category) { Fabricate(:category_with_definition) }
fab!(:topic) { Fabricate(:topic, category: category) }
- before do
- SiteSetting.mute_all_categories_by_default = true
- end
+ before { SiteSetting.mute_all_categories_by_default = true }
- it 'should remove all topics from new and latest lists by default' do
+ it "should remove all topics from new and latest lists by default" do
expect(topic_query.list_new.topics.map(&:id)).not_to include(topic.id)
expect(topic_query.list_latest.topics.map(&:id)).not_to include(topic.id)
end
- it 'should include tracked category topics in new and latest lists' do
+ it "should include tracked category topics in new and latest lists" do
topic = Fabricate(:topic, category: category)
- CategoryUser.create!(user_id: user.id,
- category_id: category.id,
- notification_level: CategoryUser.notification_levels[:tracking])
+ CategoryUser.create!(
+ user_id: user.id,
+ category_id: category.id,
+ notification_level: CategoryUser.notification_levels[:tracking],
+ )
expect(topic_query.list_new.topics.map(&:id)).to include(topic.id)
expect(topic_query.list_latest.topics.map(&:id)).to include(topic.id)
end
- it 'should include default watched category topics in latest list for anonymous users' do
+ it "should include default watched category topics in latest list for anonymous users" do
SiteSetting.default_categories_watching = category.id.to_s
expect(TopicQuery.new.list_latest.topics.map(&:id)).to include(topic.id)
end
- it 'should include default regular category topics in latest list for anonymous users' do
+ it "should include default regular category topics in latest list for anonymous users" do
SiteSetting.default_categories_normal = category.id.to_s
expect(TopicQuery.new.list_latest.topics.map(&:id)).to include(topic.id)
end
- it 'should include topics when filtered by category' do
+ it "should include topics when filtered by category" do
topic_query = TopicQuery.new(user, category: topic.category_id)
expect(topic_query.list_latest.topics.map(&:id)).to include(topic.id)
end
end
- describe 'already seen topics' do
- it 'is removed from new and visible on latest lists' do
+ describe "already seen topics" do
+ it "is removed from new and visible on latest lists" do
category = Fabricate(:category_with_definition)
topic = Fabricate(:topic, category: category)
- DismissedTopicUser.create!(user_id: user.id,
- topic_id: topic.id,
- created_at: Time.zone.now
- )
+ DismissedTopicUser.create!(user_id: user.id, topic_id: topic.id, created_at: Time.zone.now)
expect(topic_query.list_new.topics.map(&:id)).not_to include(topic.id)
expect(topic_query.list_latest.topics.map(&:id)).to include(topic.id)
end
end
- describe 'muted tags' do
- it 'is removed from new and latest lists' do
+ describe "muted tags" do
+ it "is removed from new and latest lists" do
SiteSetting.tagging_enabled = true
- SiteSetting.remove_muted_tags_from_latest = 'always'
+ SiteSetting.remove_muted_tags_from_latest = "always"
muted_tag, other_tag = Fabricate(:tag), Fabricate(:tag)
@@ -590,9 +639,11 @@ RSpec.describe TopicQuery do
muted_tagged_topic = Fabricate(:topic, tags: [muted_tag, other_tag])
untagged_topic = Fabricate(:topic)
- TagUser.create!(user_id: user.id,
- tag_id: muted_tag.id,
- notification_level: CategoryUser.notification_levels[:muted])
+ TagUser.create!(
+ user_id: user.id,
+ tag_id: muted_tag.id,
+ notification_level: CategoryUser.notification_levels[:muted],
+ )
topic_ids = topic_query.list_latest.topics.map(&:id)
expect(topic_ids).to contain_exactly(tagged_topic.id, untagged_topic.id)
@@ -600,28 +651,48 @@ RSpec.describe TopicQuery do
topic_ids = topic_query.list_new.topics.map(&:id)
expect(topic_ids).to contain_exactly(tagged_topic.id, untagged_topic.id)
- SiteSetting.remove_muted_tags_from_latest = 'only_muted'
+ SiteSetting.remove_muted_tags_from_latest = "only_muted"
topic_ids = topic_query.list_latest.topics.map(&:id)
- expect(topic_ids).to contain_exactly(tagged_topic.id, muted_tagged_topic.id, untagged_topic.id)
+ expect(topic_ids).to contain_exactly(
+ tagged_topic.id,
+ muted_tagged_topic.id,
+ untagged_topic.id,
+ )
topic_ids = topic_query.list_new.topics.map(&:id)
- expect(topic_ids).to contain_exactly(tagged_topic.id, muted_tagged_topic.id, untagged_topic.id)
+ expect(topic_ids).to contain_exactly(
+ tagged_topic.id,
+ muted_tagged_topic.id,
+ untagged_topic.id,
+ )
- SiteSetting.remove_muted_tags_from_latest = 'never'
+ SiteSetting.remove_muted_tags_from_latest = "never"
topic_ids = topic_query.list_latest.topics.map(&:id)
- expect(topic_ids).to contain_exactly(muted_topic.id, tagged_topic.id, muted_tagged_topic.id, untagged_topic.id)
+ expect(topic_ids).to contain_exactly(
+ muted_topic.id,
+ tagged_topic.id,
+ muted_tagged_topic.id,
+ untagged_topic.id,
+ )
topic_ids = topic_query.list_new.topics.map(&:id)
- expect(topic_ids).to contain_exactly(muted_topic.id, tagged_topic.id, muted_tagged_topic.id, untagged_topic.id)
+ expect(topic_ids).to contain_exactly(
+ muted_topic.id,
+ tagged_topic.id,
+ muted_tagged_topic.id,
+ untagged_topic.id,
+ )
end
- it 'is not removed from the tag page itself' do
+ it "is not removed from the tag page itself" do
muted_tag = Fabricate(:tag)
- TagUser.create!(user_id: user.id,
- tag_id: muted_tag.id,
- notification_level: CategoryUser.notification_levels[:muted])
+ TagUser.create!(
+ user_id: user.id,
+ tag_id: muted_tag.id,
+ notification_level: CategoryUser.notification_levels[:muted],
+ )
muted_topic = Fabricate(:topic, tags: [muted_tag])
@@ -634,72 +705,92 @@ RSpec.describe TopicQuery do
end
end
- describe 'a bunch of topics' do
+ describe "a bunch of topics" do
fab!(:regular_topic) do
- Fabricate(:topic, title: 'this is a regular topic',
- user: creator,
- views: 100,
- like_count: 66,
- posts_count: 3,
- participant_count: 11,
- bumped_at: 15.minutes.ago)
+ Fabricate(
+ :topic,
+ title: "this is a regular topic",
+ user: creator,
+ views: 100,
+ like_count: 66,
+ posts_count: 3,
+ participant_count: 11,
+ bumped_at: 15.minutes.ago,
+ )
end
fab!(:pinned_topic) do
- Fabricate(:topic, title: 'this is a pinned topic',
- user: creator,
- views: 10,
- like_count: 100,
- posts_count: 5,
- participant_count: 12,
- pinned_at: 10.minutes.ago,
- pinned_globally: true,
- bumped_at: 10.minutes.ago)
+ Fabricate(
+ :topic,
+ title: "this is a pinned topic",
+ user: creator,
+ views: 10,
+ like_count: 100,
+ posts_count: 5,
+ participant_count: 12,
+ pinned_at: 10.minutes.ago,
+ pinned_globally: true,
+ bumped_at: 10.minutes.ago,
+ )
end
fab!(:archived_topic) do
- Fabricate(:topic, title: 'this is an archived topic',
- user: creator,
- views: 50,
- like_count: 30,
- posts_count: 4,
- archived: true,
- participant_count: 1,
- bumped_at: 6.minutes.ago)
+ Fabricate(
+ :topic,
+ title: "this is an archived topic",
+ user: creator,
+ views: 50,
+ like_count: 30,
+ posts_count: 4,
+ archived: true,
+ participant_count: 1,
+ bumped_at: 6.minutes.ago,
+ )
end
fab!(:invisible_topic) do
- Fabricate(:topic, title: 'this is an invisible topic',
- user: creator,
- views: 1,
- like_count: 5,
- posts_count: 2,
- visible: false,
- participant_count: 3,
- bumped_at: 5.minutes.ago)
+ Fabricate(
+ :topic,
+ title: "this is an invisible topic",
+ user: creator,
+ views: 1,
+ like_count: 5,
+ posts_count: 2,
+ visible: false,
+ participant_count: 3,
+ bumped_at: 5.minutes.ago,
+ )
end
fab!(:closed_topic) do
- Fabricate(:topic, title: 'this is a closed topic',
- user: creator,
- views: 2,
- like_count: 1,
- posts_count: 1,
- closed: true,
- participant_count: 2,
- bumped_at: 1.minute.ago)
+ Fabricate(
+ :topic,
+ title: "this is a closed topic",
+ user: creator,
+ views: 2,
+ like_count: 1,
+ posts_count: 1,
+ closed: true,
+ participant_count: 2,
+ bumped_at: 1.minute.ago,
+ )
end
fab!(:future_topic) do
- Fabricate(:topic, title: 'this is a topic in far future',
- user: creator,
- views: 30,
- like_count: 11,
- posts_count: 6,
- participant_count: 5,
- bumped_at: 1000.years.from_now)
+ Fabricate(
+ :topic,
+ title: "this is a topic in far future",
+ user: creator,
+ views: 30,
+ like_count: 11,
+ posts_count: 6,
+ participant_count: 5,
+ bumped_at: 1000.years.from_now,
+ )
end
let(:topics) { topic_query.list_latest.topics }
- context 'with list_latest' do
+ context "with list_latest" do
it "returns the topics in the correct order" do
- expect(topics.map(&:id)).to eq([pinned_topic, future_topic, closed_topic, archived_topic, regular_topic].map(&:id))
+ expect(topics.map(&:id)).to eq(
+ [pinned_topic, future_topic, closed_topic, archived_topic, regular_topic].map(&:id),
+ )
# includes the invisible topic if you're a moderator
expect(TopicQuery.new(moderator).list_latest.topics.include?(invisible_topic)).to eq(true)
@@ -708,35 +799,111 @@ RSpec.describe TopicQuery do
expect(TopicQuery.new(admin).list_latest.topics.include?(invisible_topic)).to eq(true)
end
- context 'with sort_order' do
+ context "with sort_order" do
def ids_in_order(order, descending = true)
- TopicQuery.new(admin, order: order, ascending: descending ? 'false' : 'true').list_latest.topics.map(&:id)
+ TopicQuery
+ .new(admin, order: order, ascending: descending ? "false" : "true")
+ .list_latest
+ .topics
+ .map(&:id)
end
it "returns the topics in correct order" do
# returns the topics in likes order if requested
- expect(ids_in_order('posts')).to eq([future_topic, pinned_topic, archived_topic, regular_topic, invisible_topic, closed_topic].map(&:id))
+ expect(ids_in_order("posts")).to eq(
+ [
+ future_topic,
+ pinned_topic,
+ archived_topic,
+ regular_topic,
+ invisible_topic,
+ closed_topic,
+ ].map(&:id),
+ )
# returns the topics in reverse likes order if requested
- expect(ids_in_order('posts', false)).to eq([closed_topic, invisible_topic, regular_topic, archived_topic, pinned_topic, future_topic].map(&:id))
+ expect(ids_in_order("posts", false)).to eq(
+ [
+ closed_topic,
+ invisible_topic,
+ regular_topic,
+ archived_topic,
+ pinned_topic,
+ future_topic,
+ ].map(&:id),
+ )
# returns the topics in likes order if requested
- expect(ids_in_order('likes')).to eq([pinned_topic, regular_topic, archived_topic, future_topic, invisible_topic, closed_topic].map(&:id))
+ expect(ids_in_order("likes")).to eq(
+ [
+ pinned_topic,
+ regular_topic,
+ archived_topic,
+ future_topic,
+ invisible_topic,
+ closed_topic,
+ ].map(&:id),
+ )
# returns the topics in reverse likes order if requested
- expect(ids_in_order('likes', false)).to eq([closed_topic, invisible_topic, future_topic, archived_topic, regular_topic, pinned_topic].map(&:id))
+ expect(ids_in_order("likes", false)).to eq(
+ [
+ closed_topic,
+ invisible_topic,
+ future_topic,
+ archived_topic,
+ regular_topic,
+ pinned_topic,
+ ].map(&:id),
+ )
# returns the topics in views order if requested
- expect(ids_in_order('views')).to eq([regular_topic, archived_topic, future_topic, pinned_topic, closed_topic, invisible_topic].map(&:id))
+ expect(ids_in_order("views")).to eq(
+ [
+ regular_topic,
+ archived_topic,
+ future_topic,
+ pinned_topic,
+ closed_topic,
+ invisible_topic,
+ ].map(&:id),
+ )
# returns the topics in reverse views order if requested" do
- expect(ids_in_order('views', false)).to eq([invisible_topic, closed_topic, pinned_topic, future_topic, archived_topic, regular_topic].map(&:id))
+ expect(ids_in_order("views", false)).to eq(
+ [
+ invisible_topic,
+ closed_topic,
+ pinned_topic,
+ future_topic,
+ archived_topic,
+ regular_topic,
+ ].map(&:id),
+ )
# returns the topics in posters order if requested" do
- expect(ids_in_order('posters')).to eq([pinned_topic, regular_topic, future_topic, invisible_topic, closed_topic, archived_topic].map(&:id))
+ expect(ids_in_order("posters")).to eq(
+ [
+ pinned_topic,
+ regular_topic,
+ future_topic,
+ invisible_topic,
+ closed_topic,
+ archived_topic,
+ ].map(&:id),
+ )
# returns the topics in reverse posters order if requested" do
- expect(ids_in_order('posters', false)).to eq([archived_topic, closed_topic, invisible_topic, future_topic, regular_topic, pinned_topic].map(&:id))
+ expect(ids_in_order("posters", false)).to eq(
+ [
+ archived_topic,
+ closed_topic,
+ invisible_topic,
+ future_topic,
+ regular_topic,
+ pinned_topic,
+ ].map(&:id),
+ )
# sets a custom field for each topic to emulate a plugin
regular_topic.custom_fields["sheep"] = 26
@@ -758,108 +925,154 @@ RSpec.describe TopicQuery do
SORTABLE_MAPPING["sheep"] = "custom_fields.sheep"
end
# returns the topics in the sheep order if requested" do
- expect(ids_in_order('sheep')).to eq([archived_topic, future_topic, pinned_topic, closed_topic, regular_topic, invisible_topic].map(&:id))
+ expect(ids_in_order("sheep")).to eq(
+ [
+ archived_topic,
+ future_topic,
+ pinned_topic,
+ closed_topic,
+ regular_topic,
+ invisible_topic,
+ ].map(&:id),
+ )
# returns the topics in reverse sheep order if requested" do
- expect(ids_in_order('sheep', false)).to eq([invisible_topic, regular_topic, closed_topic, pinned_topic, future_topic, archived_topic].map(&:id))
+ expect(ids_in_order("sheep", false)).to eq(
+ [
+ invisible_topic,
+ regular_topic,
+ closed_topic,
+ pinned_topic,
+ future_topic,
+ archived_topic,
+ ].map(&:id),
+ )
end
end
end
- context 'after clearing a pinned topic' do
- before do
- pinned_topic.clear_pin_for(user)
- end
+ context "after clearing a pinned topic" do
+ before { pinned_topic.clear_pin_for(user) }
it "no longer shows the pinned topic at the top" do
- expect(topics).to eq([future_topic, closed_topic, archived_topic, pinned_topic, regular_topic])
+ expect(topics).to eq(
+ [future_topic, closed_topic, archived_topic, pinned_topic, regular_topic],
+ )
end
end
end
- describe 'categorized' do
+ describe "categorized" do
fab!(:category) { Fabricate(:category_with_definition) }
let(:topic_category) { category.topic }
fab!(:topic_no_cat) { Fabricate(:topic) }
- fab!(:topic_in_cat1) { Fabricate(:topic, category: category,
- bumped_at: 10.minutes.ago,
- created_at: 10.minutes.ago) }
+ fab!(:topic_in_cat1) do
+ Fabricate(:topic, category: category, bumped_at: 10.minutes.ago, created_at: 10.minutes.ago)
+ end
fab!(:topic_in_cat2) { Fabricate(:topic, category: category) }
- describe '#list_new_in_category' do
- it 'returns the topic category and the categorized topic' do
- expect(
- topic_query.list_new_in_category(category).topics.map(&:id)
- ).to eq([topic_in_cat2.id, topic_category.id, topic_in_cat1.id])
+ describe "#list_new_in_category" do
+ it "returns the topic category and the categorized topic" do
+ expect(topic_query.list_new_in_category(category).topics.map(&:id)).to eq(
+ [topic_in_cat2.id, topic_category.id, topic_in_cat1.id],
+ )
end
end
describe "category default sort order" do
it "can use category's default sort order" do
- category.update!(sort_order: 'created', sort_ascending: true)
+ category.update!(sort_order: "created", sort_ascending: true)
topic_ids = TopicQuery.new(user, category: category.id).list_latest.topics.map(&:id)
expect(topic_ids - [topic_category.id]).to eq([topic_in_cat1.id, topic_in_cat2.id])
end
it "should apply default sort order to latest and unseen filters only" do
- category.update!(sort_order: 'created', sort_ascending: true)
+ category.update!(sort_order: "created", sort_ascending: true)
- topic1 = Fabricate(:topic, category: category, like_count: 1000, posts_count: 100, created_at: 1.day.ago)
- topic2 = Fabricate(:topic, category: category, like_count: 5200, posts_count: 500, created_at: 1.hour.ago)
+ topic1 =
+ Fabricate(
+ :topic,
+ category: category,
+ like_count: 1000,
+ posts_count: 100,
+ created_at: 1.day.ago,
+ )
+ topic2 =
+ Fabricate(
+ :topic,
+ category: category,
+ like_count: 5200,
+ posts_count: 500,
+ created_at: 1.hour.ago,
+ )
TopTopic.refresh!
- topic_ids = TopicQuery.new(user, category: category.id).list_top_for(:monthly).topics.map(&:id)
+ topic_ids =
+ TopicQuery.new(user, category: category.id).list_top_for(:monthly).topics.map(&:id)
expect(topic_ids).to eq([topic2.id, topic1.id])
end
it "ignores invalid order value" do
- category.update!(sort_order: 'funny')
+ category.update!(sort_order: "funny")
topic_ids = TopicQuery.new(user, category: category.id).list_latest.topics.map(&:id)
expect(topic_ids - [topic_category.id]).to eq([topic_in_cat2.id, topic_in_cat1.id])
end
it "can be overridden" do
- category.update!(sort_order: 'created', sort_ascending: true)
- topic_ids = TopicQuery.new(user, category: category.id, order: 'activity').list_latest.topics.map(&:id)
+ category.update!(sort_order: "created", sort_ascending: true)
+ topic_ids =
+ TopicQuery
+ .new(user, category: category.id, order: "activity")
+ .list_latest
+ .topics
+ .map(&:id)
expect(topic_ids - [topic_category.id]).to eq([topic_in_cat2.id, topic_in_cat1.id])
end
end
end
- describe 'unread / read topics' do
- context 'with no data' do
+ describe "unread / read topics" do
+ context "with no data" do
it "has no unread topics" do
expect(topic_query.list_unread.topics).to be_blank
end
end
- context 'with whispers' do
- before do
- SiteSetting.whispers_allowed_groups = "#{Group::AUTO_GROUPS[:staff]}"
- end
+ context "with whispers" do
+ before { SiteSetting.whispers_allowed_groups = "#{Group::AUTO_GROUPS[:staff]}" }
- it 'correctly shows up in unread for staff' do
+ it "correctly shows up in unread for staff" do
+ first = create_post(raw: "this is the first post", title: "super amazing title")
- first = create_post(raw: 'this is the first post', title: 'super amazing title')
-
- _whisper = create_post(topic_id: first.topic.id,
- post_type: Post.types[:whisper],
- raw: 'this is a whispered reply')
+ _whisper =
+ create_post(
+ topic_id: first.topic.id,
+ post_type: Post.types[:whisper],
+ raw: "this is a whispered reply",
+ )
topic_id = first.topic.id
TopicUser.update_last_read(user, topic_id, first.post_number, 1, 1)
TopicUser.update_last_read(admin, topic_id, first.post_number, 1, 1)
- TopicUser.change(user.id, topic_id, notification_level: TopicUser.notification_levels[:tracking])
- TopicUser.change(admin.id, topic_id, notification_level: TopicUser.notification_levels[:tracking])
+ TopicUser.change(
+ user.id,
+ topic_id,
+ notification_level: TopicUser.notification_levels[:tracking],
+ )
+ TopicUser.change(
+ admin.id,
+ topic_id,
+ notification_level: TopicUser.notification_levels[:tracking],
+ )
expect(TopicQuery.new(user).list_unread.topics).to eq([])
expect(TopicQuery.new(admin).list_unread.topics).to eq([first.topic])
end
end
- context 'with read data' do
+ context "with read data" do
fab!(:partially_read) { Fabricate(:post, user: creator).topic }
fab!(:fully_read) { Fabricate(:post, user: creator).topic }
@@ -868,8 +1081,8 @@ RSpec.describe TopicQuery do
TopicUser.update_last_read(user, fully_read.id, 1, 1, 0)
end
- context 'with list_unread' do
- it 'lists topics correctly' do
+ context "with list_unread" do
+ it "lists topics correctly" do
_new_topic = Fabricate(:post, user: creator).topic
expect(topic_query.list_unread.topics).to eq([])
@@ -877,40 +1090,40 @@ RSpec.describe TopicQuery do
end
end
- context 'with user with auto_track_topics list_unread' do
+ context "with user with auto_track_topics list_unread" do
before do
user.user_option.auto_track_topics_after_msecs = 0
user.user_option.save
end
- it 'only contains the partially read topic' do
+ it "only contains the partially read topic" do
expect(topic_query.list_unread.topics).to eq([partially_read])
end
end
end
end
- describe '#list_new' do
- context 'without a new topic' do
+ describe "#list_new" do
+ context "without a new topic" do
it "has no new topics" do
expect(topic_query.list_new.topics).to be_blank
end
end
- context 'when preloading api' do
+ context "when preloading api" do
it "preloads data correctly" do
TopicList.preloaded_custom_fields << "tag"
TopicList.preloaded_custom_fields << "age"
TopicList.preloaded_custom_fields << "foo"
topic = Fabricate.build(:topic, user: creator, bumped_at: 10.minutes.ago)
- topic.custom_fields["tag"] = ["a", "b", "c"]
+ topic.custom_fields["tag"] = %w[a b c]
topic.custom_fields["age"] = 22
topic.save
new_topic = topic_query.list_new.topics.first
- expect(new_topic.custom_fields["tag"].sort).to eq(["a", "b", "c"])
+ expect(new_topic.custom_fields["tag"].sort).to eq(%w[a b c])
expect(new_topic.custom_fields["age"]).to eq("22")
expect(new_topic.custom_field_preloaded?("tag")).to eq(true)
@@ -925,28 +1138,30 @@ RSpec.describe TopicQuery do
end
end
- context 'when preloading associations' do
+ context "when preloading associations" do
it "preloads associations" do
- DiscoursePluginRegistry.register_topic_preloader_association(:first_post, Plugin::Instance.new)
+ DiscoursePluginRegistry.register_topic_preloader_association(
+ :first_post,
+ Plugin::Instance.new,
+ )
topic = Fabricate(:topic)
Fabricate(:post, topic: topic)
new_topic = topic_query.list_new.topics.first
expect(new_topic.association(:image_upload).loaded?).to eq(true) # Preloaded by default
- expect(new_topic.association(:first_post).loaded?).to eq(true) # Testing a user-defined preloaded association
- expect(new_topic.association(:user).loaded?).to eq(false) # Testing the negative
+ expect(new_topic.association(:first_post).loaded?).to eq(true) # Testing a user-defined preloaded association
+ expect(new_topic.association(:user).loaded?).to eq(false) # Testing the negative
DiscoursePluginRegistry.reset_register!(:topic_preloader_associations)
end
end
- context 'with a new topic' do
+ context "with a new topic" do
let!(:new_topic) { Fabricate(:topic, user: creator, bumped_at: 10.minutes.ago) }
let(:topics) { topic_query.list_new.topics }
it "contains no new topics for a user that has missed the window" do
-
expect(topic_query.list_new.topics).to eq([new_topic])
user.user_option.new_topic_duration_minutes = 5
@@ -957,19 +1172,15 @@ RSpec.describe TopicQuery do
end
context "with muted topics" do
- before do
- new_topic.notify_muted!(user)
- end
+ before { new_topic.notify_muted!(user) }
it "returns an empty set" do
expect(topics).to be_blank
expect(topic_query.list_latest.topics).to be_blank
end
- context 'when un-muted' do
- before do
- new_topic.notify_tracking!(user)
- end
+ context "when un-muted" do
+ before { new_topic.notify_tracking!(user) }
it "returns the topic again" do
expect(topics).to eq([new_topic])
@@ -980,14 +1191,14 @@ RSpec.describe TopicQuery do
end
end
- describe '#list_posted' do
+ describe "#list_posted" do
let(:topics) { topic_query.list_posted.topics }
it "returns blank when there are no posted topics" do
expect(topics).to be_blank
end
- context 'with created topics' do
+ context "with created topics" do
let!(:created_topic) { create_post(user: user).topic }
it "includes the created topic" do
@@ -1033,7 +1244,7 @@ RSpec.describe TopicQuery do
end
end
- describe '#list_unseen' do
+ describe "#list_unseen" do
it "returns an empty list when there aren't topics" do
expect(topic_query.list_unseen.topics).to be_blank
end
@@ -1084,7 +1295,7 @@ RSpec.describe TopicQuery do
end
end
- describe '#list_related_for' do
+ describe "#list_related_for" do
let(:user) { Fabricate(:user) }
let(:sender) { Fabricate(:user) }
@@ -1105,7 +1316,7 @@ RSpec.describe TopicQuery do
end
def read(user, topic, post_number)
- TopicUser.update_last_read(user, topic, post_number, post_number, 10000)
+ TopicUser.update_last_read(user, topic, post_number, post_number, 10_000)
end
before do
@@ -1113,7 +1324,7 @@ RSpec.describe TopicQuery do
sender.change_trust_level!(4)
end
- it 'returns the correct suggestions' do
+ it "returns the correct suggestions" do
pm_to_group = create_pm(sender, target_group_names: [group_with_user.name])
pm_to_user = create_pm(sender, target_usernames: [user.username])
@@ -1129,11 +1340,11 @@ RSpec.describe TopicQuery do
read(user, related_by_group_pm, 1)
expect(TopicQuery.new(user).list_related_for(pm_to_group).topics.map(&:id)).to(
- eq([related_by_group_pm.id])
+ eq([related_by_group_pm.id]),
)
expect(TopicQuery.new(user).list_related_for(pm_to_user).topics.map(&:id)).to(
- eq([related_by_user_pm.id])
+ eq([related_by_user_pm.id]),
)
SiteSetting.personal_message_enabled_groups = Group::AUTO_GROUPS[:staff]
@@ -1142,16 +1353,14 @@ RSpec.describe TopicQuery do
end
end
- describe 'suggested_for' do
+ describe "suggested_for" do
def clear_cache!
- Discourse.redis.keys('random_topic_cache*').each { |k| Discourse.redis.del k }
+ Discourse.redis.keys("random_topic_cache*").each { |k| Discourse.redis.del k }
end
- before do
- clear_cache!
- end
+ before { clear_cache! }
- context 'when anonymous' do
+ context "when anonymous" do
let(:topic) { Fabricate(:topic) }
let!(:new_topic) { Fabricate(:post, user: creator).topic }
@@ -1172,28 +1381,28 @@ RSpec.describe TopicQuery do
end
end
- context 'when logged in' do
+ context "when logged in" do
def suggested_for(topic)
topic_query.list_suggested_for(topic)&.topics&.map { |t| t.id }
end
let(:topic) { Fabricate(:topic) }
- let(:suggested_topics) {
+ let(:suggested_topics) do
tt = topic
# lets clear cache once category is created - working around caching is hard
clear_cache!
suggested_for(tt)
- }
+ end
it "should return empty results when there is nothing to find" do
expect(suggested_topics).to be_blank
end
- context 'with random suggested' do
+ context "with random suggested" do
let!(:new_topic) { Fabricate(:topic, created_at: 2.days.ago) }
let!(:old_topic) { Fabricate(:topic, created_at: 3.years.ago) }
- it 'respects suggested_topics_max_days_old' do
+ it "respects suggested_topics_max_days_old" do
SiteSetting.suggested_topics_max_days_old = 1365
tt = topic
@@ -1206,7 +1415,7 @@ RSpec.describe TopicQuery do
expect(topic_query.list_suggested_for(tt).topics.length).to eq(1)
end
- it 'removes muted topics' do
+ it "removes muted topics" do
SiteSetting.suggested_topics_max_days_old = 1365
tt = topic
TopicNotifier.new(old_topic).mute!(user)
@@ -1219,40 +1428,35 @@ RSpec.describe TopicQuery do
end
end
- context 'with private messages' do
+ context "with private messages" do
let(:group_user) { Fabricate(:user) }
let(:group) { Fabricate(:group) }
let(:another_group) { Fabricate(:group) }
let!(:topic) do
- Fabricate(:private_message_topic,
- topic_allowed_users: [
- Fabricate.build(:topic_allowed_user, user: user)
- ],
- topic_allowed_groups: [
- Fabricate.build(:topic_allowed_group, group: group)
- ]
+ Fabricate(
+ :private_message_topic,
+ topic_allowed_users: [Fabricate.build(:topic_allowed_user, user: user)],
+ topic_allowed_groups: [Fabricate.build(:topic_allowed_group, group: group)],
)
end
let!(:private_message) do
- Fabricate(:private_message_topic,
- topic_allowed_users: [
- Fabricate.build(:topic_allowed_user, user: user)
- ],
+ Fabricate(
+ :private_message_topic,
+ topic_allowed_users: [Fabricate.build(:topic_allowed_user, user: user)],
topic_allowed_groups: [
Fabricate.build(:topic_allowed_group, group: group),
Fabricate.build(:topic_allowed_group, group: another_group),
- ]
+ ],
)
end
let!(:private_group_topic) do
- Fabricate(:private_message_topic,
+ Fabricate(
+ :private_message_topic,
user: Fabricate(:user),
- topic_allowed_groups: [
- Fabricate.build(:topic_allowed_group, group: group)
- ]
+ topic_allowed_groups: [Fabricate.build(:topic_allowed_group, group: group)],
)
end
@@ -1263,18 +1467,18 @@ RSpec.describe TopicQuery do
Group.user_trust_level_change!(group_user.id, group_user.trust_level)
end
- context 'as user not part of group' do
+ context "as user not part of group" do
let!(:user) { Fabricate(:user) }
- it 'should not return topics by the group user' do
+ it "should not return topics by the group user" do
expect(suggested_topics).to eq([private_message.id])
end
end
- context 'as user part of group' do
+ context "as user part of group" do
let!(:user) { group_user }
- it 'should return the group topics' do
+ it "should return the group topics" do
expect(suggested_topics).to match_array([private_group_topic.id, private_message.id])
end
@@ -1283,7 +1487,7 @@ RSpec.describe TopicQuery do
SiteSetting.personal_message_enabled_groups = Group::AUTO_GROUPS[:trust_level_4]
end
- it 'should not return topics by the group user' do
+ it "should not return topics by the group user" do
expect(suggested_topics).to eq(nil)
end
end
@@ -1293,27 +1497,29 @@ RSpec.describe TopicQuery do
let(:tag) { Fabricate(:tag) }
let!(:user) { group_user }
- it 'should return only tagged topics' do
+ it "should return only tagged topics" do
Fabricate(:topic_tag, topic: private_message, tag: tag)
Fabricate(:topic_tag, topic: private_group_topic)
- expect(TopicQuery.new(user, tags: [tag.name]).list_private_messages_tag(user).topics).to eq([private_message])
+ expect(
+ TopicQuery.new(user, tags: [tag.name]).list_private_messages_tag(user).topics,
+ ).to eq([private_message])
end
end
end
- context 'with some existing topics' do
- let!(:old_partially_read) {
+ context "with some existing topics" do
+ let!(:old_partially_read) do
topic = Fabricate(:post, user: creator).topic
Fabricate(:post, user: creator, topic: topic)
topic
- }
+ end
- let!(:partially_read) {
+ let!(:partially_read) do
topic = Fabricate(:post, user: creator).topic
Fabricate(:post, user: creator, topic: topic)
topic
- }
+ end
let!(:new_topic) { Fabricate(:post, user: creator).topic }
let!(:fully_read) { Fabricate(:post, user: creator).topic }
@@ -1326,7 +1532,7 @@ RSpec.describe TopicQuery do
before do
user.user_option.update!(
auto_track_topics_after_msecs: 0,
- new_topic_duration_minutes: User::NewTopicDuration::ALWAYS
+ new_topic_duration_minutes: User::NewTopicDuration::ALWAYS,
)
freeze_time 3.weeks.from_now
@@ -1344,7 +1550,6 @@ RSpec.describe TopicQuery do
old_partially_read.update!(updated_at: 2.weeks.ago)
partially_read.update!(updated_at: Time.now)
-
end
it "operates correctly" do
@@ -1356,7 +1561,11 @@ RSpec.describe TopicQuery do
SiteSetting.suggested_topics_unread_max_days_old = 7
expect(suggested_topics[0]).to eq(partially_read.id)
- expect(suggested_topics[1, 3]).to contain_exactly(new_topic.id, closed_topic.id, archived_topic.id)
+ expect(suggested_topics[1, 3]).to contain_exactly(
+ new_topic.id,
+ closed_topic.id,
+ archived_topic.id,
+ )
expect(suggested_topics.length).to eq(4)
@@ -1369,7 +1578,7 @@ RSpec.describe TopicQuery do
end
end
- describe '#list_group_topics' do
+ describe "#list_group_topics" do
fab!(:group) { Fabricate(:group) }
let(:user) do
@@ -1386,9 +1595,7 @@ RSpec.describe TopicQuery do
fab!(:user3) { Fabricate(:user) }
- fab!(:private_category) do
- Fabricate(:private_category_with_definition, group: group)
- end
+ fab!(:private_category) { Fabricate(:private_category_with_definition, group: group) }
let!(:private_message_topic) { Fabricate(:private_message_post, user: user).topic }
let!(:topic1) { Fabricate(:topic, user: user) }
@@ -1398,13 +1605,13 @@ RSpec.describe TopicQuery do
let!(:topic5) { Fabricate(:topic, user: user, visible: false) }
let!(:topic6) { Fabricate(:topic, user: user2) }
- it 'should return the right lists for anon user' do
+ it "should return the right lists for anon user" do
topics = TopicQuery.new.list_group_topics(group).topics
expect(topics).to contain_exactly(topic1, topic2, topic6)
end
- it 'should return the right list for users in the same group' do
+ it "should return the right list for users in the same group" do
topics = TopicQuery.new(user).list_group_topics(group).topics
expect(topics).to contain_exactly(topic1, topic2, topic3, topic6)
@@ -1414,7 +1621,7 @@ RSpec.describe TopicQuery do
expect(topics).to contain_exactly(topic1, topic2, topic3, topic6)
end
- it 'should return the right list for user no in the group' do
+ it "should return the right list for user no in the group" do
topics = TopicQuery.new(user3).list_group_topics(group).topics
expect(topics).to contain_exactly(topic1, topic2, topic6)
@@ -1448,7 +1655,7 @@ RSpec.describe TopicQuery do
expect(list.topics).to include(topic)
end
- it 'allow group members with enough trust level to query destination_category_id' do
+ it "allow group members with enough trust level to query destination_category_id" do
member = Fabricate(:user, trust_level: TrustLevel[3])
group.add(member)
@@ -1498,11 +1705,15 @@ RSpec.describe TopicQuery do
topic = Fabricate(:topic, category: shared_drafts_category)
Fabricate(:post, user: creator, topic: topic).topic
TopicUser.update_last_read(admin, topic.id, 0, 0, 0)
- TopicUser.change(admin.id, topic.id, notification_level: TopicUser.notification_levels[:tracking])
+ TopicUser.change(
+ admin.id,
+ topic.id,
+ notification_level: TopicUser.notification_levels[:tracking],
+ )
topic
end
- it 'does not remove topics from unread' do
+ it "does not remove topics from unread" do
expect(TopicQuery.new(admin).list_latest.topics).not_to include(partially_read) # Check we set up the topic/category correctly
expect(TopicQuery.new(admin).list_unread.topics).to include(partially_read)
end
diff --git a/spec/lib/topic_retriever_spec.rb b/spec/lib/topic_retriever_spec.rb
index df3e3c5e6b5..984b28d34f9 100644
--- a/spec/lib/topic_retriever_spec.rb
+++ b/spec/lib/topic_retriever_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
RSpec.describe TopicRetriever do
-
let(:embed_url) { "http://eviltrout.com/2013/02/10/why-discourse-uses-emberjs.html" }
let(:author_username) { "eviltrout" }
let(:topic_retriever) { TopicRetriever.new(embed_url, author_username: author_username) }
@@ -13,9 +12,7 @@ RSpec.describe TopicRetriever do
describe "#retrieve" do
context "when host is invalid" do
- before do
- topic_retriever.stubs(:invalid_url?).returns(true)
- end
+ before { topic_retriever.stubs(:invalid_url?).returns(true) }
it "does not perform_retrieve" do
topic_retriever.expects(:perform_retrieve).never
@@ -24,9 +21,7 @@ RSpec.describe TopicRetriever do
end
context "when topics have been retrieved recently" do
- before do
- topic_retriever.stubs(:retrieved_recently?).returns(true)
- end
+ before { topic_retriever.stubs(:retrieved_recently?).returns(true) }
it "does not perform_retrieve" do
topic_retriever.expects(:perform_retrieve).never
@@ -35,14 +30,10 @@ RSpec.describe TopicRetriever do
end
context "when host is valid" do
- before do
- Fabricate(:embeddable_host, host: 'http://eviltrout.com/')
- end
+ before { Fabricate(:embeddable_host, host: "http://eviltrout.com/") }
context "when topics have been retrieved recently" do
- before do
- topic_retriever.stubs(:retrieved_recently?).returns(true)
- end
+ before { topic_retriever.stubs(:retrieved_recently?).returns(true) }
it "does not perform_retrieve" do
topic_retriever.expects(:perform_retrieve).never
@@ -51,9 +42,7 @@ RSpec.describe TopicRetriever do
end
context "when topics have not been retrieved recently" do
- before do
- topic_retriever.stubs(:retrieved_recently?).returns(false)
- end
+ before { topic_retriever.stubs(:retrieved_recently?).returns(false) }
it "does perform_retrieve" do
topic_retriever.expects(:perform_retrieve).once
@@ -63,9 +52,7 @@ RSpec.describe TopicRetriever do
end
context "when host is invalid" do
- before do
- Fabricate(:embeddable_host, host: 'http://not-eviltrout.com/')
- end
+ before { Fabricate(:embeddable_host, host: "http://not-eviltrout.com/") }
it "does not perform_retrieve" do
topic_retriever.expects(:perform_retrieve).never
@@ -74,9 +61,7 @@ RSpec.describe TopicRetriever do
end
it "works with URLs with whitespaces" do
- expect { TopicRetriever.new(" https://example.com ").retrieve }
- .not_to raise_error
+ expect { TopicRetriever.new(" https://example.com ").retrieve }.not_to raise_error
end
end
-
end
diff --git a/spec/lib/topic_upload_security_manager_spec.rb b/spec/lib/topic_upload_security_manager_spec.rb
index fdd6e915dac..41c4db69a2a 100644
--- a/spec/lib/topic_upload_security_manager_spec.rb
+++ b/spec/lib/topic_upload_security_manager_spec.rb
@@ -40,9 +40,7 @@ RSpec.describe TopicUploadSecurityManager do
end
context "when changing the topic to a non-private category" do
- before do
- topic.update(category: Fabricate(:category))
- end
+ before { topic.update(category: Fabricate(:category)) }
it "changes the upload secure statuses to false and updates ACLs and rebakes" do
expect_upload_status_to_change_and_rebake
end
@@ -72,9 +70,7 @@ RSpec.describe TopicUploadSecurityManager do
end
context "when making the PM into a public topic" do
- before do
- topic.update(archetype: Archetype.default)
- end
+ before { topic.update(archetype: Archetype.default) }
it "changes the upload secure statuses to false and updates ACLs and rebakes" do
expect_upload_status_to_change_and_rebake
end
@@ -98,9 +94,7 @@ RSpec.describe TopicUploadSecurityManager do
end
context "when login required is enabled" do
- before do
- SiteSetting.login_required = true
- end
+ before { SiteSetting.login_required = true }
it "does not change any upload statuses or update ACLs or rebake" do
expect_upload_status_not_to_change
@@ -108,9 +102,7 @@ RSpec.describe TopicUploadSecurityManager do
end
context "when login required is not enabled" do
- before do
- SiteSetting.login_required = false
- end
+ before { SiteSetting.login_required = false }
it "changes the upload secure statuses to false and updates ACLs and rebakes" do
expect_upload_status_to_change_and_rebake
@@ -131,9 +123,7 @@ RSpec.describe TopicUploadSecurityManager do
end
context "when this is the first post the upload has appeared in" do
- before do
- UploadReference.create(upload: upload3, target: post4)
- end
+ before { UploadReference.create(upload: upload3, target: post4) }
it "changes the upload secure status to true and changes the ACL and rebakes the post and sets the access control post" do
Post.any_instance.expects(:rebake!).once
@@ -143,9 +133,7 @@ RSpec.describe TopicUploadSecurityManager do
end
context "when secure uploads is not enabled" do
- before do
- SiteSetting.secure_uploads = false
- end
+ before { SiteSetting.secure_uploads = false }
it "does not change the upload secure status and does not set the access control post" do
subject.run
diff --git a/spec/lib/topic_view_spec.rb b/spec/lib/topic_view_spec.rb
index f31def4d8c3..560993003a8 100644
--- a/spec/lib/topic_view_spec.rb
+++ b/spec/lib/topic_view_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-require 'topic_view'
+require "topic_view"
RSpec.describe TopicView do
fab!(:user) { Fabricate(:user) }
@@ -16,9 +16,7 @@ RSpec.describe TopicView do
describe "preload" do
it "allows preloading of data" do
preloaded_topic_view = nil
- preloader = lambda do |view|
- preloaded_topic_view = view
- end
+ preloader = lambda { |view| preloaded_topic_view = view }
TopicView.on_preload(&preloader)
@@ -31,7 +29,7 @@ RSpec.describe TopicView do
end
it "raises a not found error if the topic doesn't exist" do
- expect { TopicView.new(1231232, evil_trout) }.to raise_error(Discourse::NotFound)
+ expect { TopicView.new(1_231_232, evil_trout) }.to raise_error(Discourse::NotFound)
end
it "accepts a topic or a topic id" do
@@ -70,26 +68,23 @@ RSpec.describe TopicView do
end
end
- describe 'custom filters' do
+ describe "custom filters" do
fab!(:p0) { Fabricate(:post, topic: topic) }
fab!(:p1) { Fabricate(:post, topic: topic, wiki: true) }
- it 'allows to register custom filters' do
- tv = TopicView.new(topic.id, evil_trout, { filter: 'wiki' })
+ it "allows to register custom filters" do
+ tv = TopicView.new(topic.id, evil_trout, { filter: "wiki" })
expect(tv.filter_posts({ filter: "wiki" })).to eq([p0, p1])
- TopicView.add_custom_filter("wiki") do |posts, topic_view|
- posts.where(wiki: true)
- end
+ TopicView.add_custom_filter("wiki") { |posts, topic_view| posts.where(wiki: true) }
- tv = TopicView.new(topic.id, evil_trout, { filter: 'wiki' })
+ tv = TopicView.new(topic.id, evil_trout, { filter: "wiki" })
expect(tv.filter_posts).to eq([p1])
- tv = TopicView.new(topic.id, evil_trout, { filter: 'whatever' })
+ tv = TopicView.new(topic.id, evil_trout, { filter: "whatever" })
expect(tv.filter_posts).to eq([p0, p1])
-
- ensure
- TopicView.instance_variable_set(:@custom_filters, {})
+ ensure
+ TopicView.instance_variable_set(:@custom_filters, {})
end
end
@@ -139,7 +134,9 @@ RSpec.describe TopicView do
context "when a staff user is ignored" do
let!(:admin) { Fabricate(:user, admin: true) }
- let!(:admin_ignored_user) { Fabricate(:ignored_user, user: evil_trout, ignored_user: admin) }
+ let!(:admin_ignored_user) do
+ Fabricate(:ignored_user, user: evil_trout, ignored_user: admin)
+ end
let!(:post4) { Fabricate(:post, topic: topic, user: admin) }
it "filters out ignored user excluding the staff user" do
@@ -172,7 +169,7 @@ RSpec.describe TopicView do
expect(best2.posts[0].id).to eq(p2.id)
expect(best2.posts[1].id).to eq(p3.id)
- topic.update_status('closed', true, admin)
+ topic.update_status("closed", true, admin)
expect(topic.posts.count).to eq(4)
# should not get the status post
@@ -196,11 +193,25 @@ RSpec.describe TopicView do
# should punch through posts if the score is high enough
p2.update_column(:score, 100)
- best = TopicView.new(topic.id, nil, best: 99, bypass_trust_level_score: 100, min_trust_level: evil_trout.trust_level + 1)
+ best =
+ TopicView.new(
+ topic.id,
+ nil,
+ best: 99,
+ bypass_trust_level_score: 100,
+ min_trust_level: evil_trout.trust_level + 1,
+ )
expect(best.posts.count).to eq(1)
# 0 means ignore
- best = TopicView.new(topic.id, nil, best: 99, bypass_trust_level_score: 0, min_trust_level: evil_trout.trust_level + 1)
+ best =
+ TopicView.new(
+ topic.id,
+ nil,
+ best: 99,
+ bypass_trust_level_score: 0,
+ min_trust_level: evil_trout.trust_level + 1,
+ )
expect(best.posts.count).to eq(0)
# If we restrict to posts a moderator liked, return none
@@ -223,7 +234,7 @@ RSpec.describe TopicView do
expect { TopicView.new(topic.id, nil) }.to raise_error(Discourse::NotLoggedIn)
end
- context 'when log_check_personal_message is enabled' do
+ context "when log_check_personal_message is enabled" do
fab!(:group) { Fabricate(:group) }
fab!(:private_message) { Fabricate(:private_message_topic, allowed_groups: [group]) }
@@ -235,37 +246,51 @@ RSpec.describe TopicView do
it "logs view if Admin views personal message for other user/group" do
allowed_user = private_message.topic_allowed_users.first.user
TopicView.new(private_message.id, allowed_user)
- expect(UserHistory.where(action: UserHistory.actions[:check_personal_message]).count).to eq(0)
+ expect(UserHistory.where(action: UserHistory.actions[:check_personal_message]).count).to eq(
+ 0,
+ )
TopicView.new(private_message.id, evil_trout)
- expect(UserHistory.where(action: UserHistory.actions[:check_personal_message]).count).to eq(1)
+ expect(UserHistory.where(action: UserHistory.actions[:check_personal_message]).count).to eq(
+ 1,
+ )
end
it "does not log personal message view for group he belongs to" do
group.users << evil_trout
TopicView.new(private_message.id, evil_trout)
- expect(UserHistory.where(action: UserHistory.actions[:check_personal_message]).count).to eq(0)
+ expect(UserHistory.where(action: UserHistory.actions[:check_personal_message]).count).to eq(
+ 0,
+ )
end
it "does not log personal message view for his own personal message" do
private_message.allowed_users << evil_trout
TopicView.new(private_message.id, evil_trout)
- expect(UserHistory.where(action: UserHistory.actions[:check_personal_message]).count).to eq(0)
+ expect(UserHistory.where(action: UserHistory.actions[:check_personal_message]).count).to eq(
+ 0,
+ )
end
it "does not log personal message view if user can't see the message" do
expect { TopicView.new(private_message.id, user) }.to raise_error(Discourse::InvalidAccess)
- expect(UserHistory.where(action: UserHistory.actions[:check_personal_message]).count).to eq(0)
+ expect(UserHistory.where(action: UserHistory.actions[:check_personal_message]).count).to eq(
+ 0,
+ )
end
it "does not log personal message view if there exists a similar log in previous hour" do
2.times { TopicView.new(private_message.id, evil_trout) }
- expect(UserHistory.where(action: UserHistory.actions[:check_personal_message]).count).to eq(1)
+ expect(UserHistory.where(action: UserHistory.actions[:check_personal_message]).count).to eq(
+ 1,
+ )
freeze_time (2.hours.from_now)
TopicView.new(private_message.id, evil_trout)
- expect(UserHistory.where(action: UserHistory.actions[:check_personal_message]).count).to eq(2)
+ expect(UserHistory.where(action: UserHistory.actions[:check_personal_message]).count).to eq(
+ 2,
+ )
end
end
@@ -273,10 +298,12 @@ RSpec.describe TopicView do
expect(topic_view.absolute_url).to eq("http://test.localhost/t/#{topic.slug}/#{topic.id}")
end
- context 'with subfolder' do
+ context "with subfolder" do
it "provides the correct absolute url" do
set_subfolder "/forum"
- expect(topic_view.absolute_url).to eq("http://test.localhost/forum/t/#{topic.slug}/#{topic.id}")
+ expect(topic_view.absolute_url).to eq(
+ "http://test.localhost/forum/t/#{topic.slug}/#{topic.id}",
+ )
end
end
@@ -301,8 +328,9 @@ RSpec.describe TopicView do
it "generates a canonical correctly for paged results" do
5.times { |i| Fabricate(:post, post_number: i + 1, topic: topic) }
- expect(TopicView.new(1234, user, post_number: 5, limit: 2)
- .canonical_path).to eql("/1234?page=3")
+ expect(TopicView.new(1234, user, post_number: 5, limit: 2).canonical_path).to eql(
+ "/1234?page=3",
+ )
end
it "generates canonical path correctly by skipping whisper posts" do
@@ -310,8 +338,9 @@ RSpec.describe TopicView do
2.times { |i| Fabricate(:whisper, post_number: i + 3, topic: topic) }
Fabricate(:post, post_number: 5, topic: topic)
- expect(TopicView.new(1234, user, post_number: 5, limit: 2)
- .canonical_path).to eql("/1234?page=2")
+ expect(TopicView.new(1234, user, post_number: 5, limit: 2).canonical_path).to eql(
+ "/1234?page=2",
+ )
end
it "generates canonical path correctly for mega topics" do
@@ -319,8 +348,9 @@ RSpec.describe TopicView do
2.times { |i| Fabricate(:whisper, post_number: i + 3, topic: topic) }
Fabricate(:post, post_number: 5, topic: topic)
- expect(TopicView.new(1234, user, post_number: 5, limit: 2, is_mega_topic: true)
- .canonical_path).to eql("/1234?page=3")
+ expect(
+ TopicView.new(1234, user, post_number: 5, limit: 2, is_mega_topic: true).canonical_path,
+ ).to eql("/1234?page=3")
end
end
@@ -331,25 +361,33 @@ RSpec.describe TopicView do
let!(:post4) { Fabricate(:post, topic: topic, user: user) }
let!(:post5) { Fabricate(:post, topic: topic, user: user) }
- before do
- TopicView.stubs(:chunk_size).returns(2)
- end
+ before { TopicView.stubs(:chunk_size).returns(2) }
it "should return the next page" do
expect(TopicView.new(topic.id, user, { post_number: post.post_number }).next_page).to eql(3)
end
end
- describe '.post_counts_by_user' do
- it 'returns the two posters with their appropriate counts' do
+ describe ".post_counts_by_user" do
+ it "returns the two posters with their appropriate counts" do
SiteSetting.whispers_allowed_groups = "#{Group::AUTO_GROUPS[:staff]}"
Fabricate(:post, topic: topic, user: evil_trout, post_type: Post.types[:whisper])
# Should not be counted
- Fabricate(:post, topic: topic, user: evil_trout, post_type: Post.types[:whisper], action_code: 'assign')
+ Fabricate(
+ :post,
+ topic: topic,
+ user: evil_trout,
+ post_type: Post.types[:whisper],
+ action_code: "assign",
+ )
- expect(TopicView.new(topic.id, admin).post_counts_by_user.to_a).to match_array([[first_poster.id, 2], [evil_trout.id, 2]])
+ expect(TopicView.new(topic.id, admin).post_counts_by_user.to_a).to match_array(
+ [[first_poster.id, 2], [evil_trout.id, 2]],
+ )
- expect(TopicView.new(topic.id, first_poster).post_counts_by_user.to_a).to match_array([[first_poster.id, 2], [evil_trout.id, 1]])
+ expect(TopicView.new(topic.id, first_poster).post_counts_by_user.to_a).to match_array(
+ [[first_poster.id, 2], [evil_trout.id, 1]],
+ )
end
it "doesn't return counts for posts with authors who have been deleted" do
@@ -360,25 +398,27 @@ RSpec.describe TopicView do
end
end
- describe '.participants' do
- it 'returns the two participants hashed by id' do
- expect(topic_view.participants.to_a).to match_array([[first_poster.id, first_poster], [evil_trout.id, evil_trout]])
+ describe ".participants" do
+ it "returns the two participants hashed by id" do
+ expect(topic_view.participants.to_a).to match_array(
+ [[first_poster.id, first_poster], [evil_trout.id, evil_trout]],
+ )
end
end
- describe '.all_post_actions' do
- it 'is blank at first' do
+ describe ".all_post_actions" do
+ it "is blank at first" do
expect(topic_view.all_post_actions).to be_blank
end
- it 'returns the like' do
+ it "returns the like" do
PostActionCreator.like(evil_trout, p1)
expect(topic_view.all_post_actions[p1.id][PostActionType.types[:like]]).to be_present
end
end
- describe '.read?' do
- it 'tracks correctly' do
+ describe ".read?" do
+ it "tracks correctly" do
# anon is assumed to have read everything
expect(TopicView.new(topic.id).read?(1)).to eq(true)
@@ -396,13 +436,17 @@ RSpec.describe TopicView do
describe "#bookmarks" do
let!(:user) { Fabricate(:user) }
- let!(:bookmark1) { Fabricate(:bookmark, bookmarkable: Fabricate(:post, topic: topic), user: user) }
- let!(:bookmark2) { Fabricate(:bookmark, bookmarkable: Fabricate(:post, topic: topic), user: user) }
+ let!(:bookmark1) do
+ Fabricate(:bookmark, bookmarkable: Fabricate(:post, topic: topic), user: user)
+ end
+ let!(:bookmark2) do
+ Fabricate(:bookmark, bookmarkable: Fabricate(:post, topic: topic), user: user)
+ end
let!(:bookmark3) { Fabricate(:bookmark, bookmarkable: Fabricate(:post, topic: topic)) }
it "returns all the bookmarks in the topic for a user" do
expect(TopicView.new(topic.id, user).bookmarks.pluck(:id)).to match_array(
- [bookmark1.id, bookmark2.id]
+ [bookmark1.id, bookmark2.id],
)
end
@@ -413,8 +457,16 @@ RSpec.describe TopicView do
describe "#bookmarks" do
let!(:user) { Fabricate(:user) }
- let!(:bookmark1) { Fabricate(:bookmark_next_business_day_reminder, bookmarkable: topic.first_post, user: user) }
- let!(:bookmark2) { Fabricate(:bookmark_next_business_day_reminder, bookmarkable: topic.posts.order(:post_number)[1], user: user) }
+ let!(:bookmark1) do
+ Fabricate(:bookmark_next_business_day_reminder, bookmarkable: topic.first_post, user: user)
+ end
+ let!(:bookmark2) do
+ Fabricate(
+ :bookmark_next_business_day_reminder,
+ bookmarkable: topic.posts.order(:post_number)[1],
+ user: user,
+ )
+ end
it "gets the first post bookmark reminder at for the user" do
topic_view = TopicView.new(topic.id, user)
@@ -451,20 +503,20 @@ RSpec.describe TopicView do
end
end
- describe '.topic_user' do
- it 'returns nil when there is no user' do
+ describe ".topic_user" do
+ it "returns nil when there is no user" do
expect(TopicView.new(topic.id, nil).topic_user).to be_blank
end
end
- describe '#recent_posts' do
+ describe "#recent_posts" do
before do
24.times do |t| # our let()s have already created 3
Fabricate(:post, topic: topic, user: first_poster, created_at: t.seconds.from_now)
end
end
- it 'returns at most 25 recent posts ordered newest first' do
+ it "returns at most 25 recent posts ordered newest first" do
recent_posts = topic_view.recent_posts
# count
@@ -478,7 +530,7 @@ RSpec.describe TopicView do
end
end
- describe 'whispers' do
+ describe "whispers" do
it "handles their visibility properly" do
SiteSetting.whispers_allowed_groups = "#{Group::AUTO_GROUPS[:staff]}"
p1 = Fabricate(:post, topic: topic, user: evil_trout)
@@ -496,7 +548,7 @@ RSpec.describe TopicView do
end
end
- describe '#posts' do
+ describe "#posts" do
# Create the posts in a different order than the sort_order
let!(:p5) { Fabricate(:post, topic: topic, user: evil_trout) }
let!(:p2) { Fabricate(:post, topic: topic, user: evil_trout) }
@@ -523,9 +575,11 @@ RSpec.describe TopicView do
# does not contain contains_gaps with default filtering
expect(topic_view.contains_gaps?).to eq(false)
# contains contains_gaps when filtered by username" do
- expect(TopicView.new(topic.id, evil_trout, username_filters: ['eviltrout']).contains_gaps?).to eq(true)
+ expect(
+ TopicView.new(topic.id, evil_trout, username_filters: ["eviltrout"]).contains_gaps?,
+ ).to eq(true)
# contains contains_gaps when filtered by summary
- expect(TopicView.new(topic.id, evil_trout, filter: 'summary').contains_gaps?).to eq(true)
+ expect(TopicView.new(topic.id, evil_trout, filter: "summary").contains_gaps?).to eq(true)
# contains contains_gaps when filtered by best
expect(TopicView.new(topic.id, evil_trout, best: 5).contains_gaps?).to eq(true)
end
@@ -541,18 +595,17 @@ RSpec.describe TopicView do
topic.category_id = category.id
topic.save!
- expect {
- TopicView.new(topic.id, evil_trout).posts.count
- }.to raise_error(Discourse::InvalidAccess)
+ expect { TopicView.new(topic.id, evil_trout).posts.count }.to raise_error(
+ Discourse::InvalidAccess,
+ )
expect(TopicView.new(t2.id, evil_trout, post_ids: [p1.id, p2.id]).posts.count).to eq(0)
-
end
- describe '#filter_posts_paged' do
+ describe "#filter_posts_paged" do
before { TopicView.stubs(:chunk_size).returns(2) }
- it 'returns correct posts for all pages' do
+ it "returns correct posts for all pages" do
expect(topic_view.filter_posts_paged(1)).to eq([p1, p2])
expect(topic_view.filter_posts_paged(2)).to eq([p3, p5])
expect(topic_view.filter_posts_paged(3)).to eq([])
@@ -560,20 +613,15 @@ RSpec.describe TopicView do
end
end
- describe '#filter_posts_by_post_number' do
+ describe "#filter_posts_by_post_number" do
def create_topic_view(post_number)
- TopicView.new(
- topic.id,
- evil_trout,
- filter_post_number: post_number,
- asc: asc
- )
+ TopicView.new(topic.id, evil_trout, filter_post_number: post_number, asc: asc)
end
- describe 'ascending' do
+ describe "ascending" do
let(:asc) { true }
- it 'should return the right posts' do
+ it "should return the right posts" do
topic_view = create_topic_view(p3.post_number)
expect(topic_view.posts).to eq([p5])
@@ -583,10 +631,10 @@ RSpec.describe TopicView do
end
end
- describe 'descending' do
+ describe "descending" do
let(:asc) { false }
- it 'should return the right posts' do
+ it "should return the right posts" do
topic_view = create_topic_view(p7.post_number)
expect(topic_view.posts).to eq([p5, p3, p2])
@@ -600,7 +648,12 @@ RSpec.describe TopicView do
describe "filter_posts_near" do
def topic_view_near(post, show_deleted = false)
- TopicView.new(topic.id, evil_trout, post_number: post.post_number, show_deleted: show_deleted)
+ TopicView.new(
+ topic.id,
+ evil_trout,
+ post_number: post.post_number,
+ show_deleted: show_deleted,
+ )
end
it "snaps to the lower boundary" do
@@ -624,11 +677,9 @@ RSpec.describe TopicView do
expect(near_view.contains_gaps?).to eq(false)
end
- describe 'when post_number is too large' do
+ describe "when post_number is too large" do
it "snaps to the lower boundary" do
- near_view = TopicView.new(topic.id, evil_trout,
- post_number: 99999999,
- )
+ near_view = TopicView.new(topic.id, evil_trout, post_number: 99_999_999)
expect(near_view.desired_post).to eq(p2)
expect(near_view.posts).to eq([p2, p3, p5])
@@ -674,13 +725,13 @@ RSpec.describe TopicView do
context "when 'posts per page' exceeds the number of posts" do
before { TopicView.stubs(:chunk_size).returns(100) }
- it 'returns all the posts' do
+ it "returns all the posts" do
near_view = topic_view_near(p5)
expect(near_view.posts).to eq([p1, p2, p3, p5])
expect(near_view.contains_gaps?).to eq(false)
end
- it 'gaps deleted posts to admins' do
+ it "gaps deleted posts to admins" do
evil_trout.admin = true
near_view = topic_view_near(p5)
expect(near_view.posts).to eq([p1, p2, p3, p5])
@@ -688,7 +739,7 @@ RSpec.describe TopicView do
expect(near_view.gaps.after).to eq(p5.id => [p6.id, p7.id])
end
- it 'returns deleted posts to admins' do
+ it "returns deleted posts to admins" do
evil_trout.admin = true
near_view = topic_view_near(p5, true)
expect(near_view.posts).to eq([p1, p2, p3, p4, p5, p6, p7])
@@ -808,34 +859,26 @@ RSpec.describe TopicView do
end
end
- describe '#filtered_post_stream' do
+ describe "#filtered_post_stream" do
let!(:post) { Fabricate(:post, topic: topic, user: first_poster, created_at: 18.hours.ago) }
let!(:post2) { Fabricate(:post, topic: topic, user: evil_trout, created_at: 6.hours.ago) }
let!(:post3) { Fabricate(:post, topic: topic, user: first_poster) }
- it 'should return the right columns' do
- expect(topic_view.filtered_post_stream).to eq([
- [post.id, 1],
- [post2.id, 0],
- [post3.id, 0]
- ])
+ it "should return the right columns" do
+ expect(topic_view.filtered_post_stream).to eq([[post.id, 1], [post2.id, 0], [post3.id, 0]])
end
- describe 'for mega topics' do
- it 'should return the right columns' do
+ describe "for mega topics" do
+ it "should return the right columns" do
stub_const(TopicView, "MEGA_TOPIC_POSTS_COUNT", 2) do
- expect(topic_view.filtered_post_stream).to eq([
- post.id,
- post2.id,
- post3.id
- ])
+ expect(topic_view.filtered_post_stream).to eq([post.id, post2.id, post3.id])
end
end
end
end
- describe '#filtered_post_id' do
- it 'should return the right id' do
+ describe "#filtered_post_id" do
+ it "should return the right id" do
post = Fabricate(:post, topic: topic)
expect(topic_view.filtered_post_id(nil)).to eq(nil)
@@ -843,31 +886,31 @@ RSpec.describe TopicView do
end
end
- describe '#last_post_id' do
+ describe "#last_post_id" do
let!(:p3) { Fabricate(:post, topic: topic) }
let!(:p2) { Fabricate(:post, topic: topic) }
let!(:p1) { Fabricate(:post, topic: topic) }
- before do
- [p1, p2, p3].each_with_index do |post, index|
- post.update!(sort_order: index + 1)
- end
- end
+ before { [p1, p2, p3].each_with_index { |post, index| post.update!(sort_order: index + 1) } }
- it 'should return the right id' do
+ it "should return the right id" do
expect(topic_view.last_post_id).to eq(p3.id)
end
end
- describe '#read_time' do
+ describe "#read_time" do
let!(:post) { Fabricate(:post, topic: topic) }
before do
- PostCreator.create!(Discourse.system_user, topic_id: topic.id, raw: "")
+ PostCreator.create!(
+ Discourse.system_user,
+ topic_id: topic.id,
+ raw: "",
+ )
topic_view.topic.reload
end
- it 'should return the right read time' do
+ it "should return the right read time" do
SiteSetting.read_time_word_count = 500
expect(topic_view.read_time).to eq(1)
@@ -876,13 +919,17 @@ RSpec.describe TopicView do
end
end
- describe '#image_url' do
+ describe "#image_url" do
fab!(:op_upload) { Fabricate(:image_upload) }
fab!(:post3_upload) { Fabricate(:image_upload) }
fab!(:post1) { Fabricate(:post, topic: topic) }
fab!(:post2) { Fabricate(:post, topic: topic) }
- fab!(:post3) { Fabricate(:post, topic: topic).tap { |p| p.update_column(:image_upload_id, post3_upload.id) }.reload }
+ fab!(:post3) do
+ Fabricate(:post, topic: topic)
+ .tap { |p| p.update_column(:image_upload_id, post3_upload.id) }
+ .reload
+ end
def topic_view_for_post(post_number)
TopicView.new(topic.id, evil_trout, post_number: post_number)
@@ -910,7 +957,7 @@ RSpec.describe TopicView do
end
end
- describe '#show_read_indicator?' do
+ describe "#show_read_indicator?" do
let(:topic) { Fabricate(:topic) }
let(:pm_topic) { Fabricate(:private_message_topic) }
@@ -936,17 +983,18 @@ RSpec.describe TopicView do
end
end
- describe '#reviewable_counts' do
- it 'exclude posts queued because the category needs approval' do
+ describe "#reviewable_counts" do
+ it "exclude posts queued because the category needs approval" do
category = Fabricate.build(:category, user: admin)
category.custom_fields[Category::REQUIRE_TOPIC_APPROVAL] = true
category.save!
- manager = NewPostManager.new(
- user,
- raw: 'to the handler I say enqueue me!',
- title: 'this is the title of the queued post',
- category: category.id
- )
+ manager =
+ NewPostManager.new(
+ user,
+ raw: "to the handler I say enqueue me!",
+ title: "this is the title of the queued post",
+ category: category.id,
+ )
result = manager.perform
reviewable = result.reviewable
reviewable.perform(admin, :approve_post)
@@ -956,13 +1004,14 @@ RSpec.describe TopicView do
expect(topic_view.reviewable_counts).to be_empty
end
- it 'include posts queued for other reasons' do
+ it "include posts queued for other reasons" do
Fabricate(:watched_word, word: "darn", action: WatchedWord.actions[:require_approval])
- manager = NewPostManager.new(
- user,
- raw: 'this is darn new post content',
- title: 'this is the title of the queued post'
- )
+ manager =
+ NewPostManager.new(
+ user,
+ raw: "this is darn new post content",
+ title: "this is the title of the queued post",
+ )
result = manager.perform
reviewable = result.reviewable
reviewable.perform(admin, :approve_post)
@@ -973,15 +1022,13 @@ RSpec.describe TopicView do
end
end
- describe '.apply_custom_default_scope' do
+ describe ".apply_custom_default_scope" do
fab!(:post) { Fabricate(:post, topic: topic, created_at: 2.hours.ago) }
fab!(:post_2) { Fabricate(:post, topic: topic, created_at: 1.hour.ago) }
- after do
- TopicView.reset_custom_default_scopes
- end
+ after { TopicView.reset_custom_default_scopes }
- it 'allows a custom default scope to be configured' do
+ it "allows a custom default scope to be configured" do
topic_view = TopicView.new(topic, admin)
expect(topic_view.filtered_post_ids).to eq([post.id, post_2.id])
@@ -1003,9 +1050,7 @@ RSpec.describe TopicView do
let(:user) { Fabricate(:user) }
let(:category) { topic.category }
- before do
- NewPostManager.stubs(:queue_enabled?).returns(queue_enabled)
- end
+ before { NewPostManager.stubs(:queue_enabled?).returns(queue_enabled) }
context "when queue is enabled globally" do
let(:queue_enabled) { true }
@@ -1017,9 +1062,7 @@ RSpec.describe TopicView do
let(:queue_enabled) { false }
context "when category is moderated" do
- before do
- category.custom_fields[Category::REQUIRE_REPLY_APPROVAL] = true
- end
+ before { category.custom_fields[Category::REQUIRE_REPLY_APPROVAL] = true }
it { expect(topic_view.queued_posts_enabled?).to be(true) }
end
diff --git a/spec/lib/topics_bulk_action_spec.rb b/spec/lib/topics_bulk_action_spec.rb
index 06b4380a692..b6af276f982 100644
--- a/spec/lib/topics_bulk_action_spec.rb
+++ b/spec/lib/topics_bulk_action_spec.rb
@@ -9,11 +9,9 @@ RSpec.describe TopicsBulkAction do
fab!(:topic2) { Fabricate(:topic, category: category, created_at: 60.minutes.ago) }
fab!(:topic3) { Fabricate(:topic, category: category, created_at: 120.minutes.ago) }
- before do
- topic.destroy!
- end
+ before { topic.destroy! }
- it 'dismisses private messages' do
+ it "dismisses private messages" do
pm = Fabricate(:private_message_topic)
TopicsBulkAction.new(user, [pm.id], type: "dismiss_topics").perform!
@@ -21,17 +19,19 @@ RSpec.describe TopicsBulkAction do
expect(DismissedTopicUser.exists?(topic: pm)).to eq(true)
end
- it 'dismisses two topics' do
- expect { TopicsBulkAction.new(user, [Topic.all.pluck(:id)], type: "dismiss_topics").perform! }.to change { DismissedTopicUser.count }.by(2)
+ it "dismisses two topics" do
+ expect {
+ TopicsBulkAction.new(user, [Topic.all.pluck(:id)], type: "dismiss_topics").perform!
+ }.to change { DismissedTopicUser.count }.by(2)
end
- it 'returns dismissed topic ids' do
- expect(TopicsBulkAction.new(user, [Topic.all.pluck(:id)], type: "dismiss_topics").perform!.sort).to match_array(
- [topic2.id, topic3.id]
- )
+ it "returns dismissed topic ids" do
+ expect(
+ TopicsBulkAction.new(user, [Topic.all.pluck(:id)], type: "dismiss_topics").perform!.sort,
+ ).to match_array([topic2.id, topic3.id])
end
- it 'respects max_new_topics limit' do
+ it "respects max_new_topics limit" do
SiteSetting.max_new_topics = 1
expect do
TopicsBulkAction.new(user, [Topic.all.pluck(:id)], type: "dismiss_topics").perform!
@@ -44,7 +44,7 @@ RSpec.describe TopicsBulkAction do
expect(dismissed_topic_user.created_at).not_to be_nil
end
- it 'respects seen topics' do
+ it "respects seen topics" do
Fabricate(:topic_user, user: user, topic: topic2, last_read_post_number: 1)
Fabricate(:topic_user, user: user, topic: topic3, last_read_post_number: 1)
expect do
@@ -52,7 +52,7 @@ RSpec.describe TopicsBulkAction do
end.not_to change { DismissedTopicUser.count }
end
- it 'dismisses when topic user without last_read_post_number' do
+ it "dismisses when topic user without last_read_post_number" do
Fabricate(:topic_user, user: user, topic: topic2, last_read_post_number: nil)
Fabricate(:topic_user, user: user, topic: topic3, last_read_post_number: nil)
expect do
@@ -60,7 +60,7 @@ RSpec.describe TopicsBulkAction do
end.to change { DismissedTopicUser.count }.by(2)
end
- it 'respects new_topic_duration_minutes' do
+ it "respects new_topic_duration_minutes" do
user.user_option.update!(new_topic_duration_minutes: 70)
expect do
@@ -83,7 +83,7 @@ RSpec.describe TopicsBulkAction do
PostDestroyer.new(Fabricate(:admin), p).destroy
- TopicsBulkAction.new(post1.user, [post1.topic_id], type: 'dismiss_posts').perform!
+ TopicsBulkAction.new(post1.user, [post1.topic_id], type: "dismiss_posts").perform!
tu = TopicUser.find_by(user_id: post1.user_id, topic_id: post1.topic_id)
@@ -100,14 +100,15 @@ RSpec.describe TopicsBulkAction do
p = create_post(topic_id: post1.topic_id)
create_post(topic_id: post1.topic_id)
- whisper = PostCreator.new(
- user,
- topic_id: post1.topic.id,
- post_type: Post.types[:whisper],
- raw: 'this is a whispered reply'
- ).create
+ whisper =
+ PostCreator.new(
+ user,
+ topic_id: post1.topic.id,
+ post_type: Post.types[:whisper],
+ raw: "this is a whispered reply",
+ ).create
- TopicsBulkAction.new(user, [post1.topic_id], type: 'dismiss_posts').perform!
+ TopicsBulkAction.new(user, [post1.topic_id], type: "dismiss_posts").perform!
tu = TopicUser.find_by(user_id: user.id, topic_id: post1.topic_id)
@@ -121,7 +122,7 @@ RSpec.describe TopicsBulkAction do
let(:user) { Fabricate.build(:user) }
it "raises an error with an invalid operation" do
- tba = TopicsBulkAction.new(user, [1], type: 'rm_root')
+ tba = TopicsBulkAction.new(user, [1], type: "rm_root")
expect { tba.perform! }.to raise_error(Discourse::InvalidParameters)
end
end
@@ -132,13 +133,17 @@ RSpec.describe TopicsBulkAction do
context "when the user can edit the topic" do
context "with 'create_revision_on_bulk_topic_moves' setting enabled" do
- before do
- SiteSetting.create_revision_on_bulk_topic_moves = true
- end
+ before { SiteSetting.create_revision_on_bulk_topic_moves = true }
it "changes the category, creates a post revision and returns the topic_id" do
old_category_id = topic.category_id
- tba = TopicsBulkAction.new(topic.user, [topic.id], type: 'change_category', category_id: category.id)
+ tba =
+ TopicsBulkAction.new(
+ topic.user,
+ [topic.id],
+ type: "change_category",
+ category_id: category.id,
+ )
topic_ids = tba.perform!
expect(topic_ids).to eq([topic.id])
topic.reload
@@ -150,7 +155,13 @@ RSpec.describe TopicsBulkAction do
end
it "doesn't do anything when category stays the same" do
- tba = TopicsBulkAction.new(topic.user, [topic.id], type: 'change_category', category_id: topic.category_id)
+ tba =
+ TopicsBulkAction.new(
+ topic.user,
+ [topic.id],
+ type: "change_category",
+ category_id: topic.category_id,
+ )
topic_ids = tba.perform!
expect(topic_ids).to be_empty
@@ -161,12 +172,16 @@ RSpec.describe TopicsBulkAction do
end
context "with 'create_revision_on_bulk_topic_moves' setting disabled" do
- before do
- SiteSetting.create_revision_on_bulk_topic_moves = false
- end
+ before { SiteSetting.create_revision_on_bulk_topic_moves = false }
it "changes the category, doesn't create a post revision and returns the topic_id" do
- tba = TopicsBulkAction.new(topic.user, [topic.id], type: 'change_category', category_id: category.id)
+ tba =
+ TopicsBulkAction.new(
+ topic.user,
+ [topic.id],
+ type: "change_category",
+ category_id: category.id,
+ )
topic_ids = tba.perform!
expect(topic_ids).to eq([topic.id])
topic.reload
@@ -177,7 +192,13 @@ RSpec.describe TopicsBulkAction do
end
it "doesn't do anything when category stays the same" do
- tba = TopicsBulkAction.new(topic.user, [topic.id], type: 'change_category', category_id: topic.category_id)
+ tba =
+ TopicsBulkAction.new(
+ topic.user,
+ [topic.id],
+ type: "change_category",
+ category_id: topic.category_id,
+ )
topic_ids = tba.perform!
expect(topic_ids).to be_empty
end
@@ -187,7 +208,13 @@ RSpec.describe TopicsBulkAction do
context "when the user can't edit the topic" do
it "doesn't change the category" do
Guardian.any_instance.expects(:can_edit?).returns(false)
- tba = TopicsBulkAction.new(topic.user, [topic.id], type: 'change_category', category_id: category.id)
+ tba =
+ TopicsBulkAction.new(
+ topic.user,
+ [topic.id],
+ type: "change_category",
+ category_id: category.id,
+ )
topic_ids = tba.perform!
expect(topic_ids).to eq([])
topic.reload
@@ -199,12 +226,10 @@ RSpec.describe TopicsBulkAction do
describe "destroy_post_timing" do
fab!(:fist_post) { Fabricate(:post, topic: topic) }
- before do
- PostTiming.process_timings(topic.user, topic.id, 10, [[1, 10]])
- end
+ before { PostTiming.process_timings(topic.user, topic.id, 10, [[1, 10]]) }
it "delegates to PostTiming.destroy_for" do
- tba = TopicsBulkAction.new(topic.user, [topic.id], type: 'destroy_post_timing')
+ tba = TopicsBulkAction.new(topic.user, [topic.id], type: "destroy_post_timing")
topic_ids = nil
expect { topic_ids = tba.perform! }.to change { PostTiming.count }.by(-1)
expect(topic_ids).to contain_exactly(topic.id)
@@ -216,7 +241,7 @@ RSpec.describe TopicsBulkAction do
fab!(:moderator) { Fabricate(:moderator) }
it "deletes the topic" do
- tba = TopicsBulkAction.new(moderator, [topic.id], type: 'delete')
+ tba = TopicsBulkAction.new(moderator, [topic.id], type: "delete")
tba.perform!
topic.reload
expect(topic).to be_trashed
@@ -226,7 +251,13 @@ RSpec.describe TopicsBulkAction do
describe "change_notification_level" do
context "when the user can see the topic" do
it "updates the notification level" do
- tba = TopicsBulkAction.new(topic.user, [topic.id], type: 'change_notification_level', notification_level_id: 2)
+ tba =
+ TopicsBulkAction.new(
+ topic.user,
+ [topic.id],
+ type: "change_notification_level",
+ notification_level_id: 2,
+ )
topic_ids = tba.perform!
expect(topic_ids).to eq([topic.id])
expect(TopicUser.get(topic, topic.user).notification_level).to eq(2)
@@ -236,7 +267,13 @@ RSpec.describe TopicsBulkAction do
context "when the user can't see the topic" do
it "doesn't change the level" do
Guardian.any_instance.expects(:can_see?).returns(false)
- tba = TopicsBulkAction.new(topic.user, [topic.id], type: 'change_notification_level', notification_level_id: 2)
+ tba =
+ TopicsBulkAction.new(
+ topic.user,
+ [topic.id],
+ type: "change_notification_level",
+ notification_level_id: 2,
+ )
topic_ids = tba.perform!
expect(topic_ids).to eq([])
expect(TopicUser.get(topic, topic.user)).to be_blank
@@ -249,7 +286,7 @@ RSpec.describe TopicsBulkAction do
it "closes the topic and returns the topic_id" do
Guardian.any_instance.expects(:can_moderate?).returns(true)
Guardian.any_instance.expects(:can_create?).returns(true)
- tba = TopicsBulkAction.new(topic.user, [topic.id], type: 'close')
+ tba = TopicsBulkAction.new(topic.user, [topic.id], type: "close")
topic_ids = tba.perform!
expect(topic_ids).to eq([topic.id])
topic.reload
@@ -260,7 +297,7 @@ RSpec.describe TopicsBulkAction do
context "when the user can't edit the topic" do
it "doesn't close the topic" do
Guardian.any_instance.expects(:can_moderate?).returns(false)
- tba = TopicsBulkAction.new(topic.user, [topic.id], type: 'close')
+ tba = TopicsBulkAction.new(topic.user, [topic.id], type: "close")
topic_ids = tba.perform!
expect(topic_ids).to be_blank
topic.reload
@@ -274,7 +311,7 @@ RSpec.describe TopicsBulkAction do
it "archives the topic and returns the topic_id" do
Guardian.any_instance.expects(:can_moderate?).returns(true)
Guardian.any_instance.expects(:can_create?).returns(true)
- tba = TopicsBulkAction.new(topic.user, [topic.id], type: 'archive')
+ tba = TopicsBulkAction.new(topic.user, [topic.id], type: "archive")
topic_ids = tba.perform!
expect(topic_ids).to eq([topic.id])
topic.reload
@@ -285,7 +322,7 @@ RSpec.describe TopicsBulkAction do
context "when the user can't edit the topic" do
it "doesn't archive the topic" do
Guardian.any_instance.expects(:can_moderate?).returns(false)
- tba = TopicsBulkAction.new(topic.user, [topic.id], type: 'archive')
+ tba = TopicsBulkAction.new(topic.user, [topic.id], type: "archive")
topic_ids = tba.perform!
expect(topic_ids).to be_blank
topic.reload
@@ -299,7 +336,7 @@ RSpec.describe TopicsBulkAction do
it "unlists the topic and returns the topic_id" do
Guardian.any_instance.expects(:can_moderate?).returns(true)
Guardian.any_instance.expects(:can_create?).returns(true)
- tba = TopicsBulkAction.new(topic.user, [topic.id], type: 'unlist')
+ tba = TopicsBulkAction.new(topic.user, [topic.id], type: "unlist")
topic_ids = tba.perform!
expect(topic_ids).to eq([topic.id])
topic.reload
@@ -310,7 +347,7 @@ RSpec.describe TopicsBulkAction do
context "when the user can't edit the topic" do
it "doesn't unlist the topic" do
Guardian.any_instance.expects(:can_moderate?).returns(false)
- tba = TopicsBulkAction.new(topic.user, [topic.id], type: 'unlist')
+ tba = TopicsBulkAction.new(topic.user, [topic.id], type: "unlist")
topic_ids = tba.perform!
expect(topic_ids).to be_blank
topic.reload
@@ -326,7 +363,7 @@ RSpec.describe TopicsBulkAction do
create_post(topic_id: topic.id, created_at: post_created_at)
topic.update!(bumped_at: 1.hour.ago)
Guardian.any_instance.expects(:can_update_bumped_at?).returns(true)
- tba = TopicsBulkAction.new(topic.user, [topic.id], type: 'reset_bump_dates')
+ tba = TopicsBulkAction.new(topic.user, [topic.id], type: "reset_bump_dates")
topic_ids = tba.perform!
expect(topic_ids).to eq([topic.id])
expect(topic.reload.bumped_at).to eq_time(post_created_at)
@@ -339,7 +376,7 @@ RSpec.describe TopicsBulkAction do
bumped_at = 1.hour.ago
topic.update!(bumped_at: bumped_at)
Guardian.any_instance.expects(:can_update_bumped_at?).returns(false)
- tba = TopicsBulkAction.new(topic.user, [topic.id], type: 'reset_bump_dates')
+ tba = TopicsBulkAction.new(topic.user, [topic.id], type: "reset_bump_dates")
topic_ids = tba.perform!
expect(topic_ids).to eq([])
expect(topic.reload.bumped_at).to eq_time(bumped_at)
@@ -348,8 +385,8 @@ RSpec.describe TopicsBulkAction do
end
describe "change_tags" do
- fab!(:tag1) { Fabricate(:tag) }
- fab!(:tag2) { Fabricate(:tag) }
+ fab!(:tag1) { Fabricate(:tag) }
+ fab!(:tag2) { Fabricate(:tag) }
before do
SiteSetting.tagging_enabled = true
@@ -359,16 +396,28 @@ RSpec.describe TopicsBulkAction do
it "can change the tags, and can create new tags" do
SiteSetting.min_trust_to_create_tag = 0
- tba = TopicsBulkAction.new(topic.user, [topic.id], type: 'change_tags', tags: ['newtag', tag1.name])
+ tba =
+ TopicsBulkAction.new(
+ topic.user,
+ [topic.id],
+ type: "change_tags",
+ tags: ["newtag", tag1.name],
+ )
topic_ids = tba.perform!
expect(topic_ids).to eq([topic.id])
topic.reload
- expect(topic.tags.map(&:name)).to contain_exactly('newtag', tag1.name)
+ expect(topic.tags.map(&:name)).to contain_exactly("newtag", tag1.name)
end
it "can change the tags but not create new ones" do
SiteSetting.min_trust_to_create_tag = 4
- tba = TopicsBulkAction.new(topic.user, [topic.id], type: 'change_tags', tags: ['newtag', tag1.name])
+ tba =
+ TopicsBulkAction.new(
+ topic.user,
+ [topic.id],
+ type: "change_tags",
+ tags: ["newtag", tag1.name],
+ )
topic_ids = tba.perform!
expect(topic_ids).to eq([topic.id])
topic.reload
@@ -376,7 +425,7 @@ RSpec.describe TopicsBulkAction do
end
it "can remove all tags" do
- tba = TopicsBulkAction.new(topic.user, [topic.id], type: 'change_tags', tags: [])
+ tba = TopicsBulkAction.new(topic.user, [topic.id], type: "change_tags", tags: [])
topic_ids = tba.perform!
expect(topic_ids).to eq([topic.id])
topic.reload
@@ -384,12 +433,16 @@ RSpec.describe TopicsBulkAction do
end
context "when user can't edit topic" do
- before do
- Guardian.any_instance.expects(:can_edit?).returns(false)
- end
+ before { Guardian.any_instance.expects(:can_edit?).returns(false) }
it "doesn't change the tags" do
- tba = TopicsBulkAction.new(topic.user, [topic.id], type: 'change_tags', tags: ['newtag', tag1.name])
+ tba =
+ TopicsBulkAction.new(
+ topic.user,
+ [topic.id],
+ type: "change_tags",
+ tags: ["newtag", tag1.name],
+ )
topic_ids = tba.perform!
expect(topic_ids).to eq([])
topic.reload
@@ -399,9 +452,9 @@ RSpec.describe TopicsBulkAction do
end
describe "append tags" do
- fab!(:tag1) { Fabricate(:tag) }
- fab!(:tag2) { Fabricate(:tag) }
- fab!(:tag3) { Fabricate(:tag) }
+ fab!(:tag1) { Fabricate(:tag) }
+ fab!(:tag2) { Fabricate(:tag) }
+ fab!(:tag3) { Fabricate(:tag) }
before do
SiteSetting.tagging_enabled = true
@@ -411,15 +464,21 @@ RSpec.describe TopicsBulkAction do
it "can append new or existing tags" do
SiteSetting.min_trust_to_create_tag = 0
- tba = TopicsBulkAction.new(topic.user, [topic.id], type: 'append_tags', tags: [tag1.name, tag3.name, 'newtag'])
+ tba =
+ TopicsBulkAction.new(
+ topic.user,
+ [topic.id],
+ type: "append_tags",
+ tags: [tag1.name, tag3.name, "newtag"],
+ )
topic_ids = tba.perform!
expect(topic_ids).to eq([topic.id])
topic.reload
- expect(topic.tags.map(&:name)).to contain_exactly(tag1.name, tag2.name, tag3.name, 'newtag')
+ expect(topic.tags.map(&:name)).to contain_exactly(tag1.name, tag2.name, tag3.name, "newtag")
end
it "can append empty tags" do
- tba = TopicsBulkAction.new(topic.user, [topic.id], type: 'append_tags', tags: [])
+ tba = TopicsBulkAction.new(topic.user, [topic.id], type: "append_tags", tags: [])
topic_ids = tba.perform!
expect(topic_ids).to eq([topic.id])
topic.reload
@@ -427,12 +486,16 @@ RSpec.describe TopicsBulkAction do
end
context "when the user can't create new topics" do
- before do
- SiteSetting.min_trust_to_create_tag = 4
- end
+ before { SiteSetting.min_trust_to_create_tag = 4 }
it "can append existing tags but doesn't append new tags" do
- tba = TopicsBulkAction.new(topic.user, [topic.id], type: 'append_tags', tags: [tag3.name, 'newtag'])
+ tba =
+ TopicsBulkAction.new(
+ topic.user,
+ [topic.id],
+ type: "append_tags",
+ tags: [tag3.name, "newtag"],
+ )
topic_ids = tba.perform!
expect(topic_ids).to eq([topic.id])
topic.reload
@@ -441,12 +504,16 @@ RSpec.describe TopicsBulkAction do
end
context "when user can't edit topic" do
- before do
- Guardian.any_instance.expects(:can_edit?).returns(false)
- end
+ before { Guardian.any_instance.expects(:can_edit?).returns(false) }
it "doesn't change the tags" do
- tba = TopicsBulkAction.new(topic.user, [topic.id], type: 'append_tags', tags: ['newtag', tag3.name])
+ tba =
+ TopicsBulkAction.new(
+ topic.user,
+ [topic.id],
+ type: "append_tags",
+ tags: ["newtag", tag3.name],
+ )
topic_ids = tba.perform!
expect(topic_ids).to eq([])
topic.reload
@@ -456,8 +523,8 @@ RSpec.describe TopicsBulkAction do
end
describe "remove_tags" do
- fab!(:tag1) { Fabricate(:tag) }
- fab!(:tag2) { Fabricate(:tag) }
+ fab!(:tag1) { Fabricate(:tag) }
+ fab!(:tag2) { Fabricate(:tag) }
before do
SiteSetting.tagging_enabled = true
@@ -466,7 +533,7 @@ RSpec.describe TopicsBulkAction do
end
it "can remove all tags" do
- tba = TopicsBulkAction.new(topic.user, [topic.id], type: 'remove_tags')
+ tba = TopicsBulkAction.new(topic.user, [topic.id], type: "remove_tags")
topic_ids = tba.perform!
expect(topic_ids).to eq([topic.id])
topic.reload
@@ -474,12 +541,10 @@ RSpec.describe TopicsBulkAction do
end
context "when user can't edit topic" do
- before do
- Guardian.any_instance.expects(:can_edit?).returns(false)
- end
+ before { Guardian.any_instance.expects(:can_edit?).returns(false) }
it "doesn't remove the tags" do
- tba = TopicsBulkAction.new(topic.user, [topic.id], type: 'remove_tags')
+ tba = TopicsBulkAction.new(topic.user, [topic.id], type: "remove_tags")
topic_ids = tba.perform!
expect(topic_ids).to eq([])
topic.reload
@@ -487,5 +552,4 @@ RSpec.describe TopicsBulkAction do
end
end
end
-
end
diff --git a/spec/lib/trust_level_spec.rb b/spec/lib/trust_level_spec.rb
index c64f64f5245..fee48f56369 100644
--- a/spec/lib/trust_level_spec.rb
+++ b/spec/lib/trust_level_spec.rb
@@ -1,11 +1,9 @@
# frozen_string_literal: true
RSpec.describe TrustLevel do
- describe 'levels' do
+ describe "levels" do
context "when verifying enum sequence" do
- before do
- @levels = TrustLevel.levels
- end
+ before { @levels = TrustLevel.levels }
it "'newuser' should be at 0 position" do
expect(@levels[:newuser]).to eq(0)
diff --git a/spec/lib/twitter_api_spec.rb b/spec/lib/twitter_api_spec.rb
index 4a54a47427d..7468470991a 100644
--- a/spec/lib/twitter_api_spec.rb
+++ b/spec/lib/twitter_api_spec.rb
@@ -1,16 +1,16 @@
# frozen_string_literal: true
RSpec.describe TwitterApi do
- describe '.link_handles_in' do
- it 'correctly replaces handles' do
+ describe ".link_handles_in" do
+ it "correctly replaces handles" do
expect(TwitterApi.send(:link_handles_in, "@foo @foobar")).to match_html <<~HTML
@foo @foobar
HTML
end
end
- describe '.link_hashtags_in' do
- it 'correctly replaces hashtags' do
+ describe ".link_hashtags_in" do
+ it "correctly replaces hashtags" do
expect(TwitterApi.send(:link_hashtags_in, "#foo #foobar")).to match_html <<~HTML
#foo #foobar
HTML
diff --git a/spec/lib/unread_spec.rb b/spec/lib/unread_spec.rb
index b817454c7b7..c5409fe9a23 100644
--- a/spec/lib/unread_spec.rb
+++ b/spec/lib/unread_spec.rb
@@ -1,23 +1,20 @@
# frozen_string_literal: true
-require 'unread'
+require "unread"
RSpec.describe Unread do
let(:whisperers_group) { Fabricate(:group) }
let(:user) { Fabricate(:user, groups: [whisperers_group]) }
let(:topic) do
- Fabricate(:topic,
- posts_count: 13,
- highest_staff_post_number: 15,
- highest_post_number: 13,
- )
+ Fabricate(:topic, posts_count: 13, highest_staff_post_number: 15, highest_post_number: 13)
end
let(:topic_user) do
- Fabricate(:topic_user,
+ Fabricate(
+ :topic_user,
notification_level: TopicUser.notification_levels[:tracking],
topic_id: topic.id,
- user_id: user.id
+ user_id: user.id,
)
end
@@ -25,8 +22,8 @@ RSpec.describe Unread do
Unread.new(topic, topic_user, Guardian.new(user))
end
- describe 'staff counts' do
- it 'should correctly return based on staff post number' do
+ describe "staff counts" do
+ it "should correctly return based on staff post number" do
SiteSetting.whispers_allowed_groups = "#{Group::AUTO_GROUPS[:staff]}"
user.grant_admin!
@@ -36,42 +33,42 @@ RSpec.describe Unread do
end
end
- describe 'unread_posts' do
- it 'should have 0 unread posts if the user has read all posts' do
+ describe "unread_posts" do
+ it "should have 0 unread posts if the user has read all posts" do
topic_user.last_read_post_number = 13
expect(unread.unread_posts).to eq(0)
end
- it 'returns the right unread posts for a user' do
+ it "returns the right unread posts for a user" do
topic_user.last_read_post_number = 10
expect(unread.unread_posts).to eq(3)
end
- it 'returns the right unread posts for a staff user' do
+ it "returns the right unread posts for a staff user" do
SiteSetting.whispers_allowed_groups = "#{Group::AUTO_GROUPS[:staff]}"
user.grant_admin!
topic_user.last_read_post_number = 10
expect(unread.unread_posts).to eq(5)
end
- it 'returns the right unread posts for a whisperer user' do
+ it "returns the right unread posts for a whisperer user" do
SiteSetting.whispers_allowed_groups = "#{whisperers_group.id}"
topic_user.last_read_post_number = 10
expect(unread.unread_posts).to eq(5)
end
- it 'should have 0 unread posts if the user has read more posts than exist (deleted)' do
+ it "should have 0 unread posts if the user has read more posts than exist (deleted)" do
topic_user.last_read_post_number = 14
expect(unread.unread_posts).to eq(0)
end
- it 'has 0 unread posts if the user has read 10 posts but is not tracking' do
+ it "has 0 unread posts if the user has read 10 posts but is not tracking" do
topic_user.last_read_post_number = 10
topic_user.notification_level = TopicUser.notification_levels[:regular]
expect(unread.unread_posts).to eq(0)
end
- it 'has 0 unread posts if the user has not seen the topic' do
+ it "has 0 unread posts if the user has not seen the topic" do
topic_user.last_read_post_number = nil
expect(unread.unread_posts).to eq(0)
end
diff --git a/spec/lib/upload_creator_spec.rb b/spec/lib/upload_creator_spec.rb
index cdeef0fce9e..7965a5f6dbb 100644
--- a/spec/lib/upload_creator_spec.rb
+++ b/spec/lib/upload_creator_spec.rb
@@ -1,37 +1,35 @@
# frozen_string_literal: true
-require 'file_store/s3_store'
+require "file_store/s3_store"
RSpec.describe UploadCreator do
fab!(:user) { Fabricate(:user) }
- describe '#create_for' do
- describe 'when upload is not an image' do
- before do
- SiteSetting.authorized_extensions = 'txt|long-FileExtension'
- end
+ describe "#create_for" do
+ describe "when upload is not an image" do
+ before { SiteSetting.authorized_extensions = "txt|long-FileExtension" }
let(:filename) { "utf-8.txt" }
let(:file) { file_from_fixtures(filename, "encodings") }
- it 'should store the upload with the right extension' do
- expect do
- UploadCreator.new(file, "utf-8\n.txt").create_for(user.id)
- end.to change { Upload.count }.by(1)
+ it "should store the upload with the right extension" do
+ expect do UploadCreator.new(file, "utf-8\n.txt").create_for(user.id) end.to change {
+ Upload.count
+ }.by(1)
upload = Upload.last
- expect(upload.extension).to eq('txt')
- expect(File.extname(upload.url)).to eq('.txt')
- expect(upload.original_filename).to eq('utf-8.txt')
+ expect(upload.extension).to eq("txt")
+ expect(File.extname(upload.url)).to eq(".txt")
+ expect(upload.original_filename).to eq("utf-8.txt")
expect(user.user_uploads.count).to eq(1)
expect(upload.user_uploads.count).to eq(1)
user2 = Fabricate(:user)
- expect do
- UploadCreator.new(file, "utf-8\n.txt").create_for(user2.id)
- end.not_to change { Upload.count }
+ expect do UploadCreator.new(file, "utf-8\n.txt").create_for(user2.id) end.not_to change {
+ Upload.count
+ }
expect(user.user_uploads.count).to eq(1)
expect(user2.user_uploads.count).to eq(1)
@@ -41,30 +39,29 @@ RSpec.describe UploadCreator do
let(:longextension) { "fake.long-FileExtension" }
let(:file2) { file_from_fixtures(longextension) }
- it 'should truncate long extension names' do
+ it "should truncate long extension names" do
expect do
UploadCreator.new(file2, "fake.long-FileExtension").create_for(user.id)
end.to change { Upload.count }.by(1)
upload = Upload.last
- expect(upload.extension).to eq('long-FileE')
+ expect(upload.extension).to eq("long-FileE")
end
end
- describe 'when image is not authorized' do
- describe 'when image is for site setting' do
- let(:filename) { 'logo.png' }
+ describe "when image is not authorized" do
+ describe "when image is for site setting" do
+ let(:filename) { "logo.png" }
let(:file) { file_from_fixtures(filename) }
- before do
- SiteSetting.authorized_extensions = 'jpg'
- end
+ before { SiteSetting.authorized_extensions = "jpg" }
- it 'should create the right upload' do
- upload = UploadCreator.new(file, filename,
- for_site_setting: true
- ).create_for(Discourse.system_user.id)
+ it "should create the right upload" do
+ upload =
+ UploadCreator.new(file, filename, for_site_setting: true).create_for(
+ Discourse.system_user.id,
+ )
expect(upload.persisted?).to eq(true)
expect(upload.original_filename).to eq(filename)
@@ -72,71 +69,70 @@ RSpec.describe UploadCreator do
end
end
- describe 'when image has the wrong extension' do
+ describe "when image has the wrong extension" do
let(:filename) { "png_as.bin" }
let(:file) { file_from_fixtures(filename) }
- it 'should store the upload with the right extension' do
+ it "should store the upload with the right extension" do
expect do
- UploadCreator.new(file, filename,
+ UploadCreator.new(
+ file,
+ filename,
force_optimize: true,
- type: UploadCreator::TYPES_TO_CROP.first
+ type: UploadCreator::TYPES_TO_CROP.first,
).create_for(user.id)
end.to change { Upload.count }.by(1)
upload = Upload.last
- expect(upload.extension).to eq('png')
- expect(File.extname(upload.url)).to eq('.png')
- expect(upload.original_filename).to eq('png_as.png')
+ expect(upload.extension).to eq("png")
+ expect(File.extname(upload.url)).to eq(".png")
+ expect(upload.original_filename).to eq("png_as.png")
end
- describe 'for tiff format' do
- before do
- SiteSetting.authorized_extensions = '.tiff|.bin'
- end
+ describe "for tiff format" do
+ before { SiteSetting.authorized_extensions = ".tiff|.bin" }
let(:filename) { "tiff_as.bin" }
let(:file) { file_from_fixtures(filename) }
- it 'should not correct the coerce filename' do
- expect do
- UploadCreator.new(file, filename).create_for(user.id)
- end.to change { Upload.count }.by(1)
+ it "should not correct the coerce filename" do
+ expect do UploadCreator.new(file, filename).create_for(user.id) end.to change {
+ Upload.count
+ }.by(1)
upload = Upload.last
- expect(upload.extension).to eq('bin')
- expect(File.extname(upload.url)).to eq('.bin')
- expect(upload.original_filename).to eq('tiff_as.bin')
+ expect(upload.extension).to eq("bin")
+ expect(File.extname(upload.url)).to eq(".bin")
+ expect(upload.original_filename).to eq("tiff_as.bin")
end
end
end
context "when image is too big" do
- let(:filename) { 'logo.png' }
+ let(:filename) { "logo.png" }
let(:file) { file_from_fixtures(filename) }
it "adds an error to the upload" do
SiteSetting.max_image_size_kb = 1
- upload = UploadCreator.new(
- file, filename, force_optimize: true
- ).create_for(Discourse.system_user.id)
+ upload =
+ UploadCreator.new(file, filename, force_optimize: true).create_for(
+ Discourse.system_user.id,
+ )
expect(upload.errors.full_messages.first).to eq(
- "#{I18n.t("upload.images.too_large_humanized", max_size: "1 KB")}"
+ "#{I18n.t("upload.images.too_large_humanized", max_size: "1 KB")}",
)
end
end
- describe 'pngquant' do
+ describe "pngquant" do
let(:filename) { "pngquant.png" }
let(:file) { file_from_fixtures(filename) }
- it 'should apply pngquant to optimized images' do
- upload = UploadCreator.new(file, filename,
- pasted: true,
- force_optimize: true
- ).create_for(user.id)
+ it "should apply pngquant to optimized images" do
+ upload =
+ UploadCreator.new(file, filename, pasted: true, force_optimize: true).create_for(user.id)
# no optimisation possible without losing details
expect(upload.filesize).to eq(9202)
@@ -148,9 +144,9 @@ RSpec.describe UploadCreator do
end
end
- describe 'converting to jpeg' do
+ describe "converting to jpeg" do
def image_quality(path)
- local_path = File.join(Rails.root, 'public', path)
+ local_path = File.join(Rails.root, "public", path)
Discourse::Utils.execute_command("identify", "-format", "%Q", local_path).to_i
end
@@ -169,50 +165,53 @@ RSpec.describe UploadCreator do
let(:animated_webp_filename) { "animated.webp" }
let(:animated_webp_file) { file_from_fixtures(animated_webp_filename) }
- before do
- SiteSetting.png_to_jpg_quality = 1
- end
+ before { SiteSetting.png_to_jpg_quality = 1 }
- it 'should not store file as jpeg if it does not meet absolute byte saving requirements' do
+ it "should not store file as jpeg if it does not meet absolute byte saving requirements" do
# logo.png is 2297 bytes, converting to jpeg saves 30% but does not meet
# the absolute savings required of 25_000 bytes, if you save less than that
# skip this
expect do
- UploadCreator.new(small_file, small_filename,
+ UploadCreator.new(
+ small_file,
+ small_filename,
pasted: true,
- force_optimize: true
+ force_optimize: true,
).create_for(user.id)
end.to change { Upload.count }.by(1)
upload = Upload.last
- expect(upload.extension).to eq('png')
- expect(File.extname(upload.url)).to eq('.png')
- expect(upload.original_filename).to eq('logo.png')
+ expect(upload.extension).to eq("png")
+ expect(File.extname(upload.url)).to eq(".png")
+ expect(upload.original_filename).to eq("logo.png")
end
- it 'should store the upload with the right extension' do
+ it "should store the upload with the right extension" do
expect do
- UploadCreator.new(file, filename,
- pasted: true,
- force_optimize: true
- ).create_for(user.id)
+ UploadCreator.new(file, filename, pasted: true, force_optimize: true).create_for(user.id)
end.to change { Upload.count }.by(1)
upload = Upload.last
- expect(upload.extension).to eq('jpeg')
- expect(File.extname(upload.url)).to eq('.jpeg')
- expect(upload.original_filename).to eq('should_be_jpeg.jpg')
+ expect(upload.extension).to eq("jpeg")
+ expect(File.extname(upload.url)).to eq(".jpeg")
+ expect(upload.original_filename).to eq("should_be_jpeg.jpg")
end
it "should not convert to jpeg when the image is uploaded from site setting" do
- upload = UploadCreator.new(large_file, large_filename, for_site_setting: true, force_optimize: true).create_for(user.id)
+ upload =
+ UploadCreator.new(
+ large_file,
+ large_filename,
+ for_site_setting: true,
+ force_optimize: true,
+ ).create_for(user.id)
- expect(upload.extension).to eq('png')
- expect(File.extname(upload.url)).to eq('.png')
- expect(upload.original_filename).to eq('large_and_unoptimized.png')
+ expect(upload.extension).to eq("png")
+ expect(File.extname(upload.url)).to eq(".png")
+ expect(upload.original_filename).to eq("large_and_unoptimized.png")
end
context "with jpeg image quality settings" do
@@ -222,7 +221,7 @@ RSpec.describe UploadCreator do
SiteSetting.image_preview_jpg_quality = 10
end
- it 'should alter the image quality' do
+ it "should alter the image quality" do
upload = UploadCreator.new(file, filename, force_optimize: true).create_for(user.id)
expect(image_quality(upload.url)).to eq(SiteSetting.recompress_original_jpg_quality)
@@ -230,21 +229,23 @@ RSpec.describe UploadCreator do
upload.create_thumbnail!(100, 100)
upload.reload
- expect(image_quality(upload.optimized_images.first.url)).to eq(SiteSetting.image_preview_jpg_quality)
+ expect(image_quality(upload.optimized_images.first.url)).to eq(
+ SiteSetting.image_preview_jpg_quality,
+ )
end
- it 'should not convert animated images' do
+ it "should not convert animated images" do
expect do
- UploadCreator.new(animated_file, animated_filename,
- force_optimize: true
- ).create_for(user.id)
+ UploadCreator.new(animated_file, animated_filename, force_optimize: true).create_for(
+ user.id,
+ )
end.to change { Upload.count }.by(1)
upload = Upload.last
- expect(upload.extension).to eq('gif')
- expect(File.extname(upload.url)).to eq('.gif')
- expect(upload.original_filename).to eq('animated.gif')
+ expect(upload.extension).to eq("gif")
+ expect(File.extname(upload.url)).to eq(".gif")
+ expect(upload.original_filename).to eq("animated.gif")
end
context "with png image quality settings" do
@@ -255,48 +256,53 @@ RSpec.describe UploadCreator do
end
it "should not convert to jpeg when png_to_jpg_quality is 100" do
- upload = UploadCreator.new(large_file, large_filename, force_optimize: true).create_for(user.id)
+ upload =
+ UploadCreator.new(large_file, large_filename, force_optimize: true).create_for(
+ user.id,
+ )
- expect(upload.extension).to eq('png')
- expect(File.extname(upload.url)).to eq('.png')
- expect(upload.original_filename).to eq('large_and_unoptimized.png')
+ expect(upload.extension).to eq("png")
+ expect(File.extname(upload.url)).to eq(".png")
+ expect(upload.original_filename).to eq("large_and_unoptimized.png")
end
end
- it 'should not convert animated WEBP images' do
+ it "should not convert animated WEBP images" do
expect do
- UploadCreator.new(animated_webp_file, animated_webp_filename,
- force_optimize: true
+ UploadCreator.new(
+ animated_webp_file,
+ animated_webp_filename,
+ force_optimize: true,
).create_for(user.id)
end.to change { Upload.count }.by(1)
upload = Upload.last
- expect(upload.extension).to eq('webp')
- expect(File.extname(upload.url)).to eq('.webp')
- expect(upload.original_filename).to eq('animated.webp')
+ expect(upload.extension).to eq("webp")
+ expect(File.extname(upload.url)).to eq(".webp")
+ expect(upload.original_filename).to eq("animated.webp")
end
end
end
- describe 'converting HEIF to jpeg' do
+ describe "converting HEIF to jpeg" do
let(:filename) { "should_be_jpeg.heic" }
let(:file) { file_from_fixtures(filename, "images") }
- it 'should store the upload with the right extension' do
- expect do
- UploadCreator.new(file, filename).create_for(user.id)
- end.to change { Upload.count }.by(1)
+ it "should store the upload with the right extension" do
+ expect do UploadCreator.new(file, filename).create_for(user.id) end.to change {
+ Upload.count
+ }.by(1)
upload = Upload.last
- expect(upload.extension).to eq('jpeg')
- expect(File.extname(upload.url)).to eq('.jpeg')
- expect(upload.original_filename).to eq('should_be_jpeg.jpg')
+ expect(upload.extension).to eq("jpeg")
+ expect(File.extname(upload.url)).to eq(".jpeg")
+ expect(upload.original_filename).to eq("should_be_jpeg.jpg")
end
end
- describe 'secure attachments' do
+ describe "secure attachments" do
let(:filename) { "small.pdf" }
let(:file) { file_from_fixtures(filename, "pdf") }
let(:opts) { { type: "composer" } }
@@ -306,17 +312,17 @@ RSpec.describe UploadCreator do
stub_s3_store
SiteSetting.secure_uploads = true
- SiteSetting.authorized_extensions = 'pdf|svg|jpg'
+ SiteSetting.authorized_extensions = "pdf|svg|jpg"
end
- it 'should mark attachments as secure' do
+ it "should mark attachments as secure" do
upload = UploadCreator.new(file, filename, opts).create_for(user.id)
stored_upload = Upload.last
expect(stored_upload.secure?).to eq(true)
end
- it 'should not mark theme uploads as secure' do
+ it "should not mark theme uploads as secure" do
fname = "custom-theme-icon-sprite.svg"
upload = UploadCreator.new(file_from_fixtures(fname), fname, for_theme: true).create_for(-1)
@@ -329,11 +335,13 @@ RSpec.describe UploadCreator do
expect(stored_upload.secure?).to eq(true)
expect(stored_upload.security_last_changed_at).not_to eq(nil)
- expect(stored_upload.security_last_changed_reason).to eq("uploading via the composer | source: upload creator")
+ expect(stored_upload.security_last_changed_reason).to eq(
+ "uploading via the composer | source: upload creator",
+ )
end
end
- context 'when uploading to s3' do
+ context "when uploading to s3" do
let(:filename) { "should_be_jpeg.png" }
let(:file) { file_from_fixtures(filename) }
let(:pdf_filename) { "small.pdf" }
@@ -345,18 +353,18 @@ RSpec.describe UploadCreator do
stub_s3_store
end
- it 'should store the file and return etag' do
- expect {
- UploadCreator.new(file, filename).create_for(user.id)
- }.to change { Upload.count }.by(1)
+ it "should store the file and return etag" do
+ expect { UploadCreator.new(file, filename).create_for(user.id) }.to change {
+ Upload.count
+ }.by(1)
upload = Upload.last
- expect(upload.etag).to eq('ETag')
+ expect(upload.etag).to eq("ETag")
end
- it 'should return signed URL for secure attachments in S3' do
- SiteSetting.authorized_extensions = 'pdf'
+ it "should return signed URL for secure attachments in S3" do
+ SiteSetting.authorized_extensions = "pdf"
SiteSetting.secure_uploads = true
upload = UploadCreator.new(pdf_file, pdf_filename, opts).create_for(user.id)
@@ -389,9 +397,7 @@ RSpec.describe UploadCreator do
end
context "when the existing upload URL is blank (it has failed)" do
- before do
- existing_upload.update(url: '')
- end
+ before { existing_upload.update(url: "") }
it "destroys the existing upload" do
result
@@ -433,31 +439,62 @@ RSpec.describe UploadCreator do
context "when uploading in a public context (theme, site setting, avatar, custom_emoji, profile_background, card_background)" do
def expect_no_public_context_uploads_to_be_secure
- upload = UploadCreator.new(file_from_fixtures(filename), filename, for_site_setting: true).create_for(user.id)
+ upload =
+ UploadCreator.new(
+ file_from_fixtures(filename),
+ filename,
+ for_site_setting: true,
+ ).create_for(user.id)
expect(upload.secure).to eq(false)
upload.destroy!
- upload = UploadCreator.new(file_from_fixtures(filename), filename, for_gravatar: true).create_for(user.id)
+ upload =
+ UploadCreator.new(
+ file_from_fixtures(filename),
+ filename,
+ for_gravatar: true,
+ ).create_for(user.id)
expect(upload.secure).to eq(false)
upload.destroy!
- upload = UploadCreator.new(file_from_fixtures(filename), filename, for_theme: true).create_for(user.id)
+ upload =
+ UploadCreator.new(file_from_fixtures(filename), filename, for_theme: true).create_for(
+ user.id,
+ )
expect(upload.secure).to eq(false)
upload.destroy!
- upload = UploadCreator.new(file_from_fixtures(filename), filename, type: "avatar").create_for(user.id)
+ upload =
+ UploadCreator.new(file_from_fixtures(filename), filename, type: "avatar").create_for(
+ user.id,
+ )
expect(upload.secure).to eq(false)
upload.destroy!
- upload = UploadCreator.new(file_from_fixtures(filename), filename, type: "custom_emoji").create_for(user.id)
+ upload =
+ UploadCreator.new(
+ file_from_fixtures(filename),
+ filename,
+ type: "custom_emoji",
+ ).create_for(user.id)
expect(upload.secure).to eq(false)
upload.destroy!
- upload = UploadCreator.new(file_from_fixtures(filename), filename, type: "profile_background").create_for(user.id)
+ upload =
+ UploadCreator.new(
+ file_from_fixtures(filename),
+ filename,
+ type: "profile_background",
+ ).create_for(user.id)
expect(upload.secure).to eq(false)
upload.destroy!
- upload = UploadCreator.new(file_from_fixtures(filename), filename, type: "card_background").create_for(user.id)
+ upload =
+ UploadCreator.new(
+ file_from_fixtures(filename),
+ filename,
+ type: "card_background",
+ ).create_for(user.id)
expect(upload.secure).to eq(false)
upload.destroy!
end
@@ -467,9 +504,7 @@ RSpec.describe UploadCreator do
end
context "when login required" do
- before do
- SiteSetting.login_required = true
- end
+ before { SiteSetting.login_required = true }
it "does not set the upload to secure" do
expect_no_public_context_uploads_to_be_secure
@@ -502,9 +537,7 @@ RSpec.describe UploadCreator do
end
context "if SiteSetting.login_required" do
- before do
- SiteSetting.login_required = true
- end
+ before { SiteSetting.login_required = true }
it "sets the upload to secure and sets the original_sha1" do
expect(result.secure).to eq(true)
expect(result.original_sha1).not_to eq(nil)
@@ -513,69 +546,61 @@ RSpec.describe UploadCreator do
end
end
- context 'with custom emojis' do
+ context "with custom emojis" do
let(:animated_filename) { "animated.gif" }
let(:animated_file) { file_from_fixtures(animated_filename) }
- it 'should not be cropped if animated' do
- upload = UploadCreator.new(animated_file, animated_filename,
- force_optimize: true,
- type: 'custom_emoji'
- ).create_for(user.id)
+ it "should not be cropped if animated" do
+ upload =
+ UploadCreator.new(
+ animated_file,
+ animated_filename,
+ force_optimize: true,
+ type: "custom_emoji",
+ ).create_for(user.id)
expect(upload.animated).to eq(true)
expect(FastImage.size(Discourse.store.path_for(upload))).to eq([320, 320])
end
end
- describe 'skip validations' do
+ describe "skip validations" do
let(:filename) { "small.pdf" }
let(:file) { file_from_fixtures(filename, "pdf") }
- before do
- SiteSetting.authorized_extensions = 'png|jpg'
- end
+ before { SiteSetting.authorized_extensions = "png|jpg" }
- it 'creates upload when skip_validations is true' do
- upload = UploadCreator.new(file, filename,
- skip_validations: true
- ).create_for(user.id)
+ it "creates upload when skip_validations is true" do
+ upload = UploadCreator.new(file, filename, skip_validations: true).create_for(user.id)
expect(upload.persisted?).to eq(true)
expect(upload.original_filename).to eq(filename)
end
- it 'does not create upload when skip_validations is false' do
- upload = UploadCreator.new(file, filename,
- skip_validations: false
- ).create_for(user.id)
+ it "does not create upload when skip_validations is false" do
+ upload = UploadCreator.new(file, filename, skip_validations: false).create_for(user.id)
expect(upload.persisted?).to eq(false)
end
end
end
- describe '#convert_favicon_to_png!' do
+ describe "#convert_favicon_to_png!" do
let(:filename) { "smallest.ico" }
let(:file) { file_from_fixtures(filename, "images") }
- before do
- SiteSetting.authorized_extensions = 'png|jpg|ico'
- end
+ before { SiteSetting.authorized_extensions = "png|jpg|ico" }
- it 'converts to png' do
+ it "converts to png" do
upload = UploadCreator.new(file, filename).create_for(user.id)
expect(upload.persisted?).to eq(true)
- expect(upload.extension).to eq('png')
+ expect(upload.extension).to eq("png")
end
-
end
- describe '#clean_svg!' do
- let(:b64) do
- Base64.encode64('test "
+ raw: "test ",
)
upload_recovery.recover
end
end
- it 'accepts a custom ActiveRecord relation' do
+ it "accepts a custom ActiveRecord relation" do
post.update!(updated_at: 2.days.ago)
upload.destroy!
@@ -70,57 +58,43 @@ RSpec.describe UploadRecovery do
upload_recovery.recover(Post.where("updated_at >= ?", 1.day.ago))
end
- describe 'for a missing attachment' do
- let(:post) do
- Fabricate(:post,
- raw: <<~SQL,
+ describe "for a missing attachment" do
+ let(:post) { Fabricate(:post, raw: <<~SQL, user: user).tap(&:link_post_uploads) }
some.pdf
blank
SQL
- user: user
- ).tap(&:link_post_uploads)
- end
- it 'recovers the attachment' do
- expect do
- upload2.destroy!
- end.to change { post.reload.uploads.count }.from(1).to(0)
+ it "recovers the attachment" do
+ expect do upload2.destroy! end.to change { post.reload.uploads.count }.from(1).to(0)
- expect do
- upload_recovery.recover
- end.to change { post.reload.uploads.count }.from(0).to(1)
+ expect do upload_recovery.recover end.to change { post.reload.uploads.count }.from(0).to(1)
- expect(File.read(Discourse.store.path_for(post.uploads.first)))
- .to eq(File.read(file_from_fixtures("small.pdf", "pdf")))
+ expect(File.read(Discourse.store.path_for(post.uploads.first))).to eq(
+ File.read(file_from_fixtures("small.pdf", "pdf")),
+ )
end
end
- it 'recovers uploads and attachments' do
- stub_request(:get, "http://test.localhost#{upload.url}")
- .to_return(status: 200)
+ it "recovers uploads and attachments" do
+ stub_request(:get, "http://test.localhost#{upload.url}").to_return(status: 200)
- expect do
- upload.destroy!
- end.to change { post.reload.uploads.count }.from(1).to(0)
+ expect do upload.destroy! end.to change { post.reload.uploads.count }.from(1).to(0)
- expect do
- upload_recovery.recover
- end.to change { post.reload.uploads.count }.from(0).to(1)
+ expect do upload_recovery.recover end.to change { post.reload.uploads.count }.from(0).to(1)
- expect(File.read(Discourse.store.path_for(post.uploads.first)))
- .to eq(File.read(file_from_fixtures("smallest.png")))
+ expect(File.read(Discourse.store.path_for(post.uploads.first))).to eq(
+ File.read(file_from_fixtures("smallest.png")),
+ )
end
- describe 'S3 store' do
+ describe "S3 store" do
before do
setup_s3
stub_s3_store
end
- it 'recovers the upload' do
- expect do
- upload.destroy!
- end.to change { post.reload.uploads.count }.from(1).to(0)
+ it "recovers the upload" do
+ expect do upload.destroy! end.to change { post.reload.uploads.count }.from(1).to(0)
original_key = Discourse.store.get_path_for_upload(upload)
tombstone_key = original_key.sub("original", "tombstone/original")
@@ -129,19 +103,26 @@ RSpec.describe UploadRecovery do
tombstone_copy.expects(:key).returns(tombstone_key)
Discourse.store.s3_helper.expects(:list).with("original").returns([])
- Discourse.store.s3_helper.expects(:list).with("#{FileStore::S3Store::TOMBSTONE_PREFIX}original").returns([tombstone_copy])
- Discourse.store.s3_helper.expects(:copy).with(tombstone_key, original_key, options: { acl: "public-read" })
+ Discourse
+ .store
+ .s3_helper
+ .expects(:list)
+ .with("#{FileStore::S3Store::TOMBSTONE_PREFIX}original")
+ .returns([tombstone_copy])
+ Discourse
+ .store
+ .s3_helper
+ .expects(:copy)
+ .with(tombstone_key, original_key, options: { acl: "public-read" })
FileHelper.expects(:download).returns(file_from_fixtures("smallest.png"))
stub_request(:get, upload.url).to_return(body: file_from_fixtures("smallest.png"))
- expect do
- upload_recovery.recover
- end.to change { post.reload.uploads.count }.from(0).to(1)
+ expect do upload_recovery.recover end.to change { post.reload.uploads.count }.from(0).to(1)
end
- describe 'when the upload exists but its file is missing' do
- it 'recovers the file' do
+ describe "when the upload exists but its file is missing" do
+ it "recovers the file" do
upload.verification_status = Upload.verification_statuses[:invalid_etag]
upload.save!
@@ -152,15 +133,24 @@ RSpec.describe UploadRecovery do
tombstone_copy.expects(:key).returns(tombstone_key)
Discourse.store.s3_helper.expects(:list).with("original").returns([])
- Discourse.store.s3_helper.expects(:list).with("#{FileStore::S3Store::TOMBSTONE_PREFIX}original").returns([tombstone_copy])
- Discourse.store.s3_helper.expects(:copy).with(tombstone_key, original_key, options: { acl: "public-read" })
+ Discourse
+ .store
+ .s3_helper
+ .expects(:list)
+ .with("#{FileStore::S3Store::TOMBSTONE_PREFIX}original")
+ .returns([tombstone_copy])
+ Discourse
+ .store
+ .s3_helper
+ .expects(:copy)
+ .with(tombstone_key, original_key, options: { acl: "public-read" })
- expect do
- upload_recovery.recover
- end.to_not change { [post.reload.uploads.count, Upload.count] }
+ expect do upload_recovery.recover end.to_not change {
+ [post.reload.uploads.count, Upload.count]
+ }
end
- it 'does not create a duplicate upload when secure uploads are enabled' do
+ it "does not create a duplicate upload when secure uploads are enabled" do
SiteSetting.secure_uploads = true
upload.verification_status = Upload.verification_statuses[:invalid_etag]
upload.save!
@@ -172,94 +162,76 @@ RSpec.describe UploadRecovery do
tombstone_copy.expects(:key).returns(tombstone_key)
Discourse.store.s3_helper.expects(:list).with("original").returns([])
- Discourse.store.s3_helper.expects(:list).with("#{FileStore::S3Store::TOMBSTONE_PREFIX}original").returns([tombstone_copy])
- Discourse.store.s3_helper.expects(:copy).with(tombstone_key, original_key, options: { acl: "public-read" })
+ Discourse
+ .store
+ .s3_helper
+ .expects(:list)
+ .with("#{FileStore::S3Store::TOMBSTONE_PREFIX}original")
+ .returns([tombstone_copy])
+ Discourse
+ .store
+ .s3_helper
+ .expects(:copy)
+ .with(tombstone_key, original_key, options: { acl: "public-read" })
- expect do
- upload_recovery.recover
- end.to_not change { [post.reload.uploads.count, Upload.count] }
+ expect do upload_recovery.recover end.to_not change {
+ [post.reload.uploads.count, Upload.count]
+ }
end
end
end
- describe 'image tag' do
- let(:post) do
- Fabricate(:post,
- raw: <<~SQL,
+ describe "image tag" do
+ let(:post) { Fabricate(:post, raw: <<~SQL, user: user).tap(&:link_post_uploads) }
@@ -42,20 +42,14 @@ RSpec.describe GroupSmtpMailer do
How are you doing?
EMAIL
- end
let(:receiver) do
- receiver = Email::Receiver.new(
- email,
- destinations: [group],
- uid_validity: 1,
- uid: 10000
- )
+ receiver = Email::Receiver.new(email, destinations: [group], uid_validity: 1, uid: 10_000)
receiver.process!
receiver
end
- let(:raw) { 'hello, how are you doing?' }
+ let(:raw) { "hello, how are you doing?" }
before do
SiteSetting.enable_smtp = true
@@ -66,19 +60,16 @@ RSpec.describe GroupSmtpMailer do
SiteSetting.reply_by_email_enabled = true
end
- it 'sends an email as reply' do
- post = PostCreator.create(user,
- topic_id: receiver.incoming_email.topic.id,
- raw: raw
- )
+ it "sends an email as reply" do
+ post = PostCreator.create(user, topic_id: receiver.incoming_email.topic.id, raw: raw)
expect(ActionMailer::Base.deliveries.size).to eq(1)
sent_mail = ActionMailer::Base.deliveries[0]
- expect(sent_mail.to).to contain_exactly('john@doe.com')
- expect(sent_mail.cc).to contain_exactly('someotherperson@test.com')
+ expect(sent_mail.to).to contain_exactly("john@doe.com")
+ expect(sent_mail.cc).to contain_exactly("someotherperson@test.com")
expect(sent_mail.reply_to).to eq(nil)
- expect(sent_mail.subject).to eq('Re: Hello from John')
+ expect(sent_mail.subject).to eq("Re: Hello from John")
expect(sent_mail.to_s).to include(raw)
end
@@ -92,17 +83,16 @@ RSpec.describe GroupSmtpMailer do
expect(ActionMailer::Base.deliveries.size).to eq(1)
sent_mail = ActionMailer::Base.deliveries[0]
- expect(sent_mail.to_s).to include("[Testers Group (1)](http://test.localhost/g/Testers), james.bond@gmail.com")
+ expect(sent_mail.to_s).to include(
+ "[Testers Group (1)](http://test.localhost/g/Testers), james.bond@gmail.com",
+ )
end
it "uses the OP incoming email subject for the subject over topic title" do
receiver.incoming_email.topic.update(title: "blah")
- post = PostCreator.create(user,
- topic_id: receiver.incoming_email.topic.id,
- raw: raw
- )
+ post = PostCreator.create(user, topic_id: receiver.incoming_email.topic.id, raw: raw)
sent_mail = ActionMailer::Base.deliveries[0]
- expect(sent_mail.subject).to eq('Re: Hello from John')
+ expect(sent_mail.subject).to eq("Re: Hello from John")
end
context "when the site has a reply by email address configured" do
@@ -112,11 +102,8 @@ RSpec.describe GroupSmtpMailer do
SiteSetting.reply_by_email_enabled = true
end
- it 'uses the correct IMAP/SMTP reply to address and does not create a post reply key' do
- post = PostCreator.create(user,
- topic_id: receiver.incoming_email.topic.id,
- raw: raw
- )
+ it "uses the correct IMAP/SMTP reply to address and does not create a post reply key" do
+ post = PostCreator.create(user, topic_id: receiver.incoming_email.topic.id, raw: raw)
expect(ActionMailer::Base.deliveries.size).to eq(1)
@@ -124,34 +111,24 @@ RSpec.describe GroupSmtpMailer do
sent_mail = ActionMailer::Base.deliveries[0]
expect(sent_mail.reply_to).to eq(nil)
- expect(sent_mail.from).to contain_exactly('bugs@gmail.com')
+ expect(sent_mail.from).to contain_exactly("bugs@gmail.com")
end
context "when IMAP is disabled for the group" do
- before do
- group.update(imap_enabled: false)
- end
+ before { group.update(imap_enabled: false) }
it "does send the email" do
- post = PostCreator.create(user,
- topic_id: receiver.incoming_email.topic.id,
- raw: raw
- )
+ post = PostCreator.create(user, topic_id: receiver.incoming_email.topic.id, raw: raw)
expect(ActionMailer::Base.deliveries.size).to eq(1)
end
end
context "when SMTP is disabled for the group" do
- before do
- group.update(smtp_enabled: false)
- end
+ before { group.update(smtp_enabled: false) }
it "does not send the email" do
- post = PostCreator.create(user,
- topic_id: receiver.incoming_email.topic.id,
- raw: raw
- )
+ post = PostCreator.create(user, topic_id: receiver.incoming_email.topic.id, raw: raw)
expect(ActionMailer::Base.deliveries.size).to eq(0)
end
diff --git a/spec/mailers/invite_mailer_spec.rb b/spec/mailers/invite_mailer_spec.rb
index bc4e994ffb4..42249f39999 100644
--- a/spec/mailers/invite_mailer_spec.rb
+++ b/spec/mailers/invite_mailer_spec.rb
@@ -7,115 +7,125 @@ RSpec.describe InviteMailer do
fab!(:invite) { Fabricate(:invite) }
let(:invite_mail) { InviteMailer.send_invite(invite) }
- it 'renders the invitee email' do
+ it "renders the invitee email" do
expect(invite_mail.to).to eql([invite.email])
end
- it 'renders the subject' do
+ it "renders the subject" do
expect(invite_mail.subject).to be_present
end
- it 'renders site domain name in subject' do
+ it "renders site domain name in subject" do
expect(invite_mail.subject).to match(Discourse.current_hostname)
end
- it 'renders the body' do
+ it "renders the body" do
expect(invite_mail.body).to be_present
end
- it 'renders the inviter email' do
+ it "renders the inviter email" do
expect(invite_mail.from).to eql([SiteSetting.notification_email])
end
- it 'renders invite link' do
- expect(invite_mail.body.encoded).to match("#{Discourse.base_url}/invites/#{invite.invite_key}")
+ it "renders invite link" do
+ expect(invite_mail.body.encoded).to match(
+ "#{Discourse.base_url}/invites/#{invite.invite_key}",
+ )
end
end
context "with custom invite message" do
- fab!(:invite) {
- Fabricate(
- :invite,
- custom_message: "Hey, you should join this forum!\n\nWelcome!"
- )
- }
+ fab!(:invite) do
+ Fabricate(:invite, custom_message: "Hey, you should join this forum!\n\nWelcome!")
+ end
context "when custom message includes invite link" do
let(:custom_invite_mail) { InviteMailer.send_invite(invite) }
- it 'renders the invitee email' do
+ it "renders the invitee email" do
expect(custom_invite_mail.to).to eql([invite.email])
end
- it 'renders the subject' do
+ it "renders the subject" do
expect(custom_invite_mail.subject).to be_present
end
- it 'renders site domain name in subject' do
+ it "renders site domain name in subject" do
expect(custom_invite_mail.subject).to match(Discourse.current_hostname)
end
- it 'renders the body' do
+ it "renders the body" do
expect(custom_invite_mail.body).to be_present
end
- it 'renders custom_message, stripping HTML' do
- expect(custom_invite_mail.body.encoded).to match("Hey, you should join this forum! Welcome!")
+ it "renders custom_message, stripping HTML" do
+ expect(custom_invite_mail.body.encoded).to match(
+ "Hey, you should join this forum! Welcome!",
+ )
end
- it 'renders the inviter email' do
+ it "renders the inviter email" do
expect(custom_invite_mail.from).to eql([SiteSetting.notification_email])
end
- it 'renders invite link' do
- expect(custom_invite_mail.body.encoded).to match("#{Discourse.base_url}/invites/#{invite.invite_key}")
+ it "renders invite link" do
+ expect(custom_invite_mail.body.encoded).to match(
+ "#{Discourse.base_url}/invites/#{invite.invite_key}",
+ )
end
-
end
end
end
context "when inviting to topic" do
let(:trust_level_2) { build(:user, trust_level: 2) }
- let(:topic) { Fabricate(:topic, excerpt: "Topic invite support is now available in Discourse!", user: trust_level_2) }
+ let(:topic) do
+ Fabricate(
+ :topic,
+ excerpt: "Topic invite support is now available in Discourse!",
+ user: trust_level_2,
+ )
+ end
context "with default invite message" do
let(:invite) do
- topic.invite(topic.user, 'name@example.com')
+ topic.invite(topic.user, "name@example.com")
Invite.find_by(invited_by_id: topic.user.id)
end
let(:invite_mail) { InviteMailer.send_invite(invite, invite_to_topic: true) }
- it 'renders the invitee email' do
- expect(invite_mail.to).to eql(['name@example.com'])
+ it "renders the invitee email" do
+ expect(invite_mail.to).to eql(["name@example.com"])
end
- it 'renders the subject' do
+ it "renders the subject" do
expect(invite_mail.subject).to be_present
end
- it 'renders topic title in subject' do
+ it "renders topic title in subject" do
expect(invite_mail.subject).to match(topic.title)
end
- it 'renders site domain name in subject' do
+ it "renders site domain name in subject" do
expect(invite_mail.subject).to match(Discourse.current_hostname)
end
- it 'renders the body' do
+ it "renders the body" do
expect(invite_mail.body).to be_present
end
- it 'renders the inviter email' do
+ it "renders the inviter email" do
expect(invite_mail.from).to eql([SiteSetting.notification_email])
end
- it 'renders invite link' do
- expect(invite_mail.body.encoded).to match("#{Discourse.base_url}/invites/#{invite.invite_key}")
+ it "renders invite link" do
+ expect(invite_mail.body.encoded).to match(
+ "#{Discourse.base_url}/invites/#{invite.invite_key}",
+ )
end
- it 'renders topic title' do
+ it "renders topic title" do
expect(invite_mail.body.encoded).to match(topic.title)
end
@@ -132,21 +142,25 @@ RSpec.describe InviteMailer do
let(:invite) do
topic.invite(
topic.user,
- 'name@example.com',
+ "name@example.com",
nil,
- "Hey, I thought you might enjoy this topic!"
+ "Hey, I thought you might enjoy this topic!",
)
Invite.find_by(invited_by_id: topic.user.id)
end
let(:custom_invite_mail) { InviteMailer.send_invite(invite) }
- it 'renders custom_message' do
- expect(custom_invite_mail.body.encoded).to match("Hey, I thought you might enjoy this topic!")
+ it "renders custom_message" do
+ expect(custom_invite_mail.body.encoded).to match(
+ "Hey, I thought you might enjoy this topic!",
+ )
end
- it 'renders invite link' do
- expect(custom_invite_mail.body.encoded).to match("#{Discourse.base_url}/invites/#{invite.invite_key}")
+ it "renders invite link" do
+ expect(custom_invite_mail.body.encoded).to match(
+ "#{Discourse.base_url}/invites/#{invite.invite_key}",
+ )
end
end
end
diff --git a/spec/mailers/rejection_mailer_spec.rb b/spec/mailers/rejection_mailer_spec.rb
index 279c4c3ee45..aa132d26fc7 100644
--- a/spec/mailers/rejection_mailer_spec.rb
+++ b/spec/mailers/rejection_mailer_spec.rb
@@ -2,24 +2,30 @@
RSpec.describe RejectionMailer do
describe "send_rejection" do
- context 'when sending rejection email' do
- fab! (:user) { Fabricate(:user) }
- let (:template_args) { { former_title: "Mail Subject", destination: user.email, site_name: SiteSetting.title } }
- let (:reject_mail) { RejectionMailer.send_rejection("email_reject_topic_not_found", user.email, template_args) }
+ context "when sending rejection email" do
+ fab! (:user) {
+ Fabricate(:user)
+ }
+ let (:template_args) {
+ { former_title: "Mail Subject", destination: user.email, site_name: SiteSetting.title }
+ }
+ let (:reject_mail) {
+ RejectionMailer.send_rejection("email_reject_topic_not_found", user.email, template_args)
+ }
- it 'renders the senders email' do
+ it "renders the senders email" do
expect(reject_mail.to).to eql([user.email])
end
- it 'renders the subject' do
+ it "renders the subject" do
expect(reject_mail.subject).to be_present
end
- it 'renders site title in subject' do
+ it "renders site title in subject" do
expect(reject_mail.subject).to match(SiteSetting.title)
end
- it 'renders the body' do
+ it "renders the body" do
expect(reject_mail.body).to be_present
end
end
diff --git a/spec/mailers/subscription_mailer_spec.rb b/spec/mailers/subscription_mailer_spec.rb
index 4e9210ceb60..e61e0657380 100644
--- a/spec/mailers/subscription_mailer_spec.rb
+++ b/spec/mailers/subscription_mailer_spec.rb
@@ -6,6 +6,8 @@ RSpec.describe SubscriptionMailer do
subject { SubscriptionMailer.confirm_unsubscribe(user) }
it "contains the right URL" do
- expect(subject.body).to include("#{Discourse.base_url}/email/unsubscribe/#{UnsubscribeKey.last.key}")
+ expect(subject.body).to include(
+ "#{Discourse.base_url}/email/unsubscribe/#{UnsubscribeKey.last.key}",
+ )
end
end
diff --git a/spec/mailers/test_mailer_spec.rb b/spec/mailers/test_mailer_spec.rb
index 51c16cd14a3..f612d283dfd 100644
--- a/spec/mailers/test_mailer_spec.rb
+++ b/spec/mailers/test_mailer_spec.rb
@@ -1,18 +1,14 @@
# frozen_string_literal: true
RSpec.describe TestMailer do
-
describe "send_test" do
-
it "works" do
- test_mailer = TestMailer.send_test('marcheline@adventuretime.ooo')
+ test_mailer = TestMailer.send_test("marcheline@adventuretime.ooo")
expect(test_mailer.from).to eq([SiteSetting.notification_email])
- expect(test_mailer.to).to eq(['marcheline@adventuretime.ooo'])
+ expect(test_mailer.to).to eq(["marcheline@adventuretime.ooo"])
expect(test_mailer.subject).to be_present
expect(test_mailer.body).to be_present
end
-
end
-
end
diff --git a/spec/mailers/user_notifications_spec.rb b/spec/mailers/user_notifications_spec.rb
index 6111bdde8f5..d4eab5c1a3f 100644
--- a/spec/mailers/user_notifications_spec.rb
+++ b/spec/mailers/user_notifications_spec.rb
@@ -36,14 +36,20 @@ RSpec.describe UserNotifications do
topic_user = TopicUser.find_by(user_id: user.id, topic_id: post1.topic_id)
# to avoid reloads after update_columns
user = topic_user.user
- user.user_option.update_columns(email_previous_replies: UserOption.previous_replies_type[:unless_emailed])
+ user.user_option.update_columns(
+ email_previous_replies: UserOption.previous_replies_type[:unless_emailed],
+ )
expect(UserNotifications.get_context_posts(post3, topic_user, user).count).to eq(1)
- user.user_option.update_columns(email_previous_replies: UserOption.previous_replies_type[:never])
+ user.user_option.update_columns(
+ email_previous_replies: UserOption.previous_replies_type[:never],
+ )
expect(UserNotifications.get_context_posts(post3, topic_user, user).count).to eq(0)
- user.user_option.update_columns(email_previous_replies: UserOption.previous_replies_type[:always])
+ user.user_option.update_columns(
+ email_previous_replies: UserOption.previous_replies_type[:always],
+ )
expect(UserNotifications.get_context_posts(post3, topic_user, user).count).to eq(2)
SiteSetting.private_email = true
@@ -73,11 +79,12 @@ RSpec.describe UserNotifications do
end
end
- describe '.post_approved' do
+ describe ".post_approved" do
fab!(:post) { Fabricate(:post) }
- it 'works' do
- subject = UserNotifications.post_approved(user, { notification_data_hash: { post_url: post.url } })
+ it "works" do
+ subject =
+ UserNotifications.post_approved(user, { notification_data_hash: { post_url: post.url } })
expect(subject.to).to eq([user.email])
expect(subject.subject).to be_present
@@ -87,9 +94,7 @@ RSpec.describe UserNotifications do
end
describe ".confirm_new_email" do
- let(:opts) do
- { requested_by_admin: requested_by_admin, email_token: token }
- end
+ let(:opts) { { requested_by_admin: requested_by_admin, email_token: token } }
let(:token) { "test123" }
context "when requested by admin" do
@@ -97,7 +102,7 @@ RSpec.describe UserNotifications do
it "uses the requested by admin template" do
expect(UserNotifications.confirm_new_email(user, opts).body).to include(
- "This email change was requested by a site admin."
+ "This email change was requested by a site admin.",
)
end
end
@@ -107,51 +112,64 @@ RSpec.describe UserNotifications do
it "uses the normal template" do
expect(UserNotifications.confirm_new_email(user, opts).body).not_to include(
- "This email change was requested by a site admin."
+ "This email change was requested by a site admin.",
)
end
end
end
- describe '.email_login' do
- let(:email_token) { Fabricate(:email_token, user: user, scope: EmailToken.scopes[:email_login]).token }
+ describe ".email_login" do
+ let(:email_token) do
+ Fabricate(:email_token, user: user, scope: EmailToken.scopes[:email_login]).token
+ end
subject { UserNotifications.email_login(user, email_token: email_token) }
it "generates the right email" do
expect(subject.to).to eq([user.email])
expect(subject.from).to eq([SiteSetting.notification_email])
- expect(subject.subject).to eq(I18n.t(
- 'user_notifications.email_login.subject_template',
- email_prefix: SiteSetting.title
- ))
+ expect(subject.subject).to eq(
+ I18n.t("user_notifications.email_login.subject_template", email_prefix: SiteSetting.title),
+ )
- expect(subject.body.to_s).to match(I18n.t(
- 'user_notifications.email_login.text_body_template',
- site_name: SiteSetting.title,
- base_url: Discourse.base_url,
- email_token: email_token
- ))
+ expect(subject.body.to_s).to match(
+ I18n.t(
+ "user_notifications.email_login.text_body_template",
+ site_name: SiteSetting.title,
+ base_url: Discourse.base_url,
+ email_token: email_token,
+ ),
+ )
end
end
- describe '.digest' do
+ describe ".digest" do
subject { UserNotifications.digest(user) }
- after do
- Discourse.redis.keys('summary-new-users:*').each { |key| Discourse.redis.del(key) }
- end
+ after { Discourse.redis.keys("summary-new-users:*").each { |key| Discourse.redis.del(key) } }
context "without new topics" do
it "doesn't send the email" do
expect(subject.to).to be_blank
end
-
end
context "with topics only from new users" do
- let!(:new_today) { Fabricate(:topic, user: Fabricate(:user, trust_level: TrustLevel[0], created_at: 10.minutes.ago), title: "Hey everyone look at me") }
- let!(:new_yesterday) { Fabricate(:topic, user: Fabricate(:user, trust_level: TrustLevel[0], created_at: 25.hours.ago), created_at: 25.hours.ago, title: "This topic is of interest to you") }
+ let!(:new_today) do
+ Fabricate(
+ :topic,
+ user: Fabricate(:user, trust_level: TrustLevel[0], created_at: 10.minutes.ago),
+ title: "Hey everyone look at me",
+ )
+ end
+ let!(:new_yesterday) do
+ Fabricate(
+ :topic,
+ user: Fabricate(:user, trust_level: TrustLevel[0], created_at: 25.hours.ago),
+ created_at: 25.hours.ago,
+ title: "This topic is of interest to you",
+ )
+ end
it "returns topics from new users if they're more than 24 hours old" do
expect(subject.to).to eq([user.email])
@@ -162,7 +180,9 @@ RSpec.describe UserNotifications do
end
context "with new topics" do
- let!(:popular_topic) { Fabricate(:topic, user: Fabricate(:coding_horror), created_at: 1.hour.ago) }
+ let!(:popular_topic) do
+ Fabricate(:topic, user: Fabricate(:coding_horror), created_at: 1.hour.ago)
+ end
it "works" do
expect(subject.to).to eq([user.email])
@@ -171,19 +191,19 @@ RSpec.describe UserNotifications do
expect(subject.html_part.body.to_s).to be_present
expect(subject.text_part.body.to_s).to be_present
expect(subject.header["List-Unsubscribe"].to_s).to match(/\/email\/unsubscribe\/\h{64}/)
- expect(subject.html_part.body.to_s).to include('New Users')
+ expect(subject.html_part.body.to_s).to include("New Users")
end
it "doesn't include new user count if digest_after_minutes is low" do
user.user_option.digest_after_minutes = 60
- expect(subject.html_part.body.to_s).to_not include('New Users')
+ expect(subject.html_part.body.to_s).to_not include("New Users")
end
it "works with min_date string" do
digest = UserNotifications.digest(user, since: 1.month.ago.to_date.to_s)
expect(digest.html_part.body.to_s).to be_present
expect(digest.text_part.body.to_s).to be_present
- expect(digest.html_part.body.to_s).to include('New Users')
+ expect(digest.html_part.body.to_s).to include("New Users")
end
it "includes email_prefix in email subject instead of site title" do
@@ -195,8 +215,22 @@ RSpec.describe UserNotifications do
end
it "excludes deleted topics and their posts" do
- deleted = Fabricate(:topic, user: Fabricate(:user), title: "Delete this topic plz", created_at: 1.hour.ago)
- post = Fabricate(:post, topic: deleted, score: 100.0, post_number: 2, raw: "Your wish is my command", created_at: 1.hour.ago)
+ deleted =
+ Fabricate(
+ :topic,
+ user: Fabricate(:user),
+ title: "Delete this topic plz",
+ created_at: 1.hour.ago,
+ )
+ post =
+ Fabricate(
+ :post,
+ topic: deleted,
+ score: 100.0,
+ post_number: 2,
+ raw: "Your wish is my command",
+ created_at: 1.hour.ago,
+ )
deleted.trash!
html = subject.html_part.body.to_s
expect(html).to_not include deleted.title
@@ -206,25 +240,60 @@ RSpec.describe UserNotifications do
it "excludes shared drafts" do
cat = Fabricate(:category)
SiteSetting.shared_drafts_category = cat.id
- topic = Fabricate(:topic, title: "This is a draft", category_id: cat.id, created_at: 1.hour.ago)
- post = Fabricate(
- :post,
- topic: topic,
- score: 100.0,
- post_number: 2,
- raw: "secret draft content",
- created_at: 1.hour.ago
- )
+ topic =
+ Fabricate(:topic, title: "This is a draft", category_id: cat.id, created_at: 1.hour.ago)
+ post =
+ Fabricate(
+ :post,
+ topic: topic,
+ score: 100.0,
+ post_number: 2,
+ raw: "secret draft content",
+ created_at: 1.hour.ago,
+ )
html = subject.html_part.body.to_s
expect(html).to_not include topic.title
expect(html).to_not include post.raw
end
it "excludes whispers and other post types that don't belong" do
- t = Fabricate(:topic, user: Fabricate(:user), title: "Who likes the same stuff I like?", created_at: 1.hour.ago)
- whisper = Fabricate(:post, topic: t, score: 100.0, post_number: 2, raw: "You like weird stuff", post_type: Post.types[:whisper], created_at: 1.hour.ago)
- mod_action = Fabricate(:post, topic: t, score: 100.0, post_number: 3, raw: "This topic unlisted", post_type: Post.types[:moderator_action], created_at: 1.hour.ago)
- small_action = Fabricate(:post, topic: t, score: 100.0, post_number: 4, raw: "A small action", post_type: Post.types[:small_action], created_at: 1.hour.ago)
+ t =
+ Fabricate(
+ :topic,
+ user: Fabricate(:user),
+ title: "Who likes the same stuff I like?",
+ created_at: 1.hour.ago,
+ )
+ whisper =
+ Fabricate(
+ :post,
+ topic: t,
+ score: 100.0,
+ post_number: 2,
+ raw: "You like weird stuff",
+ post_type: Post.types[:whisper],
+ created_at: 1.hour.ago,
+ )
+ mod_action =
+ Fabricate(
+ :post,
+ topic: t,
+ score: 100.0,
+ post_number: 3,
+ raw: "This topic unlisted",
+ post_type: Post.types[:moderator_action],
+ created_at: 1.hour.ago,
+ )
+ small_action =
+ Fabricate(
+ :post,
+ topic: t,
+ score: 100.0,
+ post_number: 4,
+ raw: "A small action",
+ post_type: Post.types[:small_action],
+ created_at: 1.hour.ago,
+ )
html = subject.html_part.body.to_s
expect(html).to_not include whisper.raw
expect(html).to_not include mod_action.raw
@@ -232,10 +301,45 @@ RSpec.describe UserNotifications do
end
it "excludes deleted and hidden posts" do
- t = Fabricate(:topic, user: Fabricate(:user), title: "Post objectionable stuff here", created_at: 1.hour.ago)
- deleted = Fabricate(:post, topic: t, score: 100.0, post_number: 2, raw: "This post is uncalled for", deleted_at: 5.minutes.ago, created_at: 1.hour.ago)
- hidden = Fabricate(:post, topic: t, score: 100.0, post_number: 3, raw: "Try to find this post", hidden: true, hidden_at: 5.minutes.ago, hidden_reason_id: Post.hidden_reasons[:flagged_by_tl3_user], created_at: 1.hour.ago)
- user_deleted = Fabricate(:post, topic: t, score: 100.0, post_number: 4, raw: "I regret this post", user_deleted: true, created_at: 1.hour.ago)
+ t =
+ Fabricate(
+ :topic,
+ user: Fabricate(:user),
+ title: "Post objectionable stuff here",
+ created_at: 1.hour.ago,
+ )
+ deleted =
+ Fabricate(
+ :post,
+ topic: t,
+ score: 100.0,
+ post_number: 2,
+ raw: "This post is uncalled for",
+ deleted_at: 5.minutes.ago,
+ created_at: 1.hour.ago,
+ )
+ hidden =
+ Fabricate(
+ :post,
+ topic: t,
+ score: 100.0,
+ post_number: 3,
+ raw: "Try to find this post",
+ hidden: true,
+ hidden_at: 5.minutes.ago,
+ hidden_reason_id: Post.hidden_reasons[:flagged_by_tl3_user],
+ created_at: 1.hour.ago,
+ )
+ user_deleted =
+ Fabricate(
+ :post,
+ topic: t,
+ score: 100.0,
+ post_number: 4,
+ raw: "I regret this post",
+ user_deleted: true,
+ created_at: 1.hour.ago,
+ )
html = subject.html_part.body.to_s
expect(html).to_not include deleted.raw
expect(html).to_not include hidden.raw
@@ -244,28 +348,44 @@ RSpec.describe UserNotifications do
it "excludes posts that are newer than editing grace period" do
SiteSetting.editing_grace_period = 5.minutes
- too_new = Fabricate(:topic, user: Fabricate(:user), title: "Oops I need to edit this", created_at: 1.minute.ago)
- _too_new_post = Fabricate(:post, user: too_new.user, topic: too_new, score: 100.0, post_number: 1, created_at: 1.minute.ago)
+ too_new =
+ Fabricate(
+ :topic,
+ user: Fabricate(:user),
+ title: "Oops I need to edit this",
+ created_at: 1.minute.ago,
+ )
+ _too_new_post =
+ Fabricate(
+ :post,
+ user: too_new.user,
+ topic: too_new,
+ score: 100.0,
+ post_number: 1,
+ created_at: 1.minute.ago,
+ )
html = subject.html_part.body.to_s
expect(html).to_not include too_new.title
end
it "uses theme color" do
- cs = Fabricate(:color_scheme, name: 'Fancy', color_scheme_colors: [
- Fabricate(:color_scheme_color, name: 'header_primary', hex: 'F0F0F0'),
- Fabricate(:color_scheme_color, name: 'header_background', hex: '1E1E1E')
- ])
- theme = Fabricate(:theme,
- user_selectable: true,
- user: Fabricate(:admin),
- color_scheme_id: cs.id
- )
+ cs =
+ Fabricate(
+ :color_scheme,
+ name: "Fancy",
+ color_scheme_colors: [
+ Fabricate(:color_scheme_color, name: "header_primary", hex: "F0F0F0"),
+ Fabricate(:color_scheme_color, name: "header_background", hex: "1E1E1E"),
+ ],
+ )
+ theme =
+ Fabricate(:theme, user_selectable: true, user: Fabricate(:admin), color_scheme_id: cs.id)
theme.set_default!
html = subject.html_part.body.to_s
- expect(html).to include 'F0F0F0'
- expect(html).to include '1E1E1E'
+ expect(html).to include "F0F0F0"
+ expect(html).to include "1E1E1E"
end
it "supports subfolder" do
@@ -276,7 +396,9 @@ RSpec.describe UserNotifications do
expect(text).to be_present
expect(html).to_not include("/forum/forum")
expect(text).to_not include("/forum/forum")
- expect(subject.header["List-Unsubscribe"].to_s).to match(/http:\/\/test.localhost\/forum\/email\/unsubscribe\/\h{64}/)
+ expect(subject.header["List-Unsubscribe"].to_s).to match(
+ /http:\/\/test.localhost\/forum\/email\/unsubscribe\/\h{64}/,
+ )
topic_url = "http://test.localhost/forum/t/#{popular_topic.slug}/#{popular_topic.id}"
expect(html).to include(topic_url)
@@ -293,40 +415,48 @@ RSpec.describe UserNotifications do
end
end
- describe '.user_replied' do
+ describe ".user_replied" do
let(:response_by_user) { Fabricate(:user, name: "John Doe") }
- let(:category) { Fabricate(:category, name: 'India') }
- let(:tag1) { Fabricate(:tag, name: 'Taggo') }
- let(:tag2) { Fabricate(:tag, name: 'Taggie') }
+ let(:category) { Fabricate(:category, name: "India") }
+ let(:tag1) { Fabricate(:tag, name: "Taggo") }
+ let(:tag2) { Fabricate(:tag, name: "Taggie") }
let(:hidden_tag) { Fabricate(:tag, name: "hidden") }
let!(:hidden_tag_group) do
Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name])
end
- let(:topic) { Fabricate(:topic, category: category, tags: [tag1, tag2, hidden_tag], title: "Super cool topic") }
- let(:post) { Fabricate(:post, topic: topic, raw: 'This is My super duper cool topic') }
+ let(:topic) do
+ Fabricate(
+ :topic,
+ category: category,
+ tags: [tag1, tag2, hidden_tag],
+ title: "Super cool topic",
+ )
+ end
+ let(:post) { Fabricate(:post, topic: topic, raw: "This is My super duper cool topic") }
let(:response) { Fabricate(:basic_reply, topic: post.topic, user: response_by_user) }
let(:user) { Fabricate(:user) }
let(:notification) { Fabricate(:replied_notification, user: user, post: response) }
- it 'generates a correct email' do
-
+ it "generates a correct email" do
SiteSetting.default_email_in_reply_to = true
# Fabricator is not fabricating this ...
- SiteSetting.email_subject = "[%{site_name}] %{optional_pm}%{optional_cat}%{optional_tags}%{topic_title}"
+ SiteSetting.email_subject =
+ "[%{site_name}] %{optional_pm}%{optional_cat}%{optional_tags}%{topic_title}"
SiteSetting.enable_names = true
SiteSetting.display_name_on_posts = true
- mail = UserNotifications.user_replied(
- user,
- post: response,
- notification_type: notification.notification_type,
- notification_data_hash: notification.data_hash
- )
+ mail =
+ UserNotifications.user_replied(
+ user,
+ post: response,
+ notification_type: notification.notification_type,
+ notification_data_hash: notification.data_hash,
+ )
# from should include full user name
- expect(mail[:from].display_names).to eql(['John Doe via Discourse'])
+ expect(mail[:from].display_names).to eql(["John Doe via Discourse"])
# subject should include category name
expect(mail.subject).to match(/India/)
@@ -355,12 +485,13 @@ RSpec.describe UserNotifications do
# no In Reply To if user opts out
user.user_option.email_in_reply_to = false
- mail = UserNotifications.user_replied(
- user,
- post: response,
- notification_type: notification.notification_type,
- notification_data_hash: notification.data_hash
- )
+ mail =
+ UserNotifications.user_replied(
+ user,
+ post: response,
+ notification_type: notification.notification_type,
+ notification_data_hash: notification.data_hash,
+ )
expect(mail.html_part.body.to_s.scan(/In Reply To/).count).to eq(0)
@@ -372,12 +503,13 @@ RSpec.describe UserNotifications do
response.user.name = "Bob Marley"
response.user.save
- mail = UserNotifications.user_replied(
- user,
- post: response,
- notification_type: notification.notification_type,
- notification_data_hash: notification.data_hash
- )
+ mail =
+ UserNotifications.user_replied(
+ user,
+ post: response,
+ notification_type: notification.notification_type,
+ notification_data_hash: notification.data_hash,
+ )
mail_html = mail.html_part.body.to_s
expect(mail_html.scan(/>Bob Marley/).count).to eq(1)
@@ -388,12 +520,13 @@ RSpec.describe UserNotifications do
SiteSetting.prioritize_username_in_ux = true
- mail = UserNotifications.user_replied(
- user,
- post: response,
- notification_type: notification.notification_type,
- notification_data_hash: notification.data_hash
- )
+ mail =
+ UserNotifications.user_replied(
+ user,
+ post: response,
+ notification_type: notification.notification_type,
+ notification_data_hash: notification.data_hash,
+ )
mail_html = mail.html_part.body.to_s
expect(mail_html.scan(/>Bob Marley/).count).to eq(0)
@@ -401,26 +534,29 @@ RSpec.describe UserNotifications do
end
it "the number of tags shown in subject should match max_tags_per_topic" do
- SiteSetting.email_subject = "[%{site_name}] %{optional_pm}%{optional_cat}%{optional_tags}%{topic_title}"
+ SiteSetting.email_subject =
+ "[%{site_name}] %{optional_pm}%{optional_cat}%{optional_tags}%{topic_title}"
SiteSetting.max_tags_per_topic = 1
- mail = UserNotifications.user_replied(
- user,
- post: response,
- notification_type: notification.notification_type,
- notification_data_hash: notification.data_hash
- )
+ mail =
+ UserNotifications.user_replied(
+ user,
+ post: response,
+ notification_type: notification.notification_type,
+ notification_data_hash: notification.data_hash,
+ )
expect(mail.subject).to match(/Taggo/)
expect(mail.subject).not_to match(/Taggie/)
end
it "doesn't include details when private_email is enabled" do
SiteSetting.private_email = true
- mail = UserNotifications.user_replied(
- user,
- post: response,
- notification_type: notification.notification_type,
- notification_data_hash: notification.data_hash
- )
+ mail =
+ UserNotifications.user_replied(
+ user,
+ post: response,
+ notification_type: notification.notification_type,
+ notification_data_hash: notification.data_hash,
+ )
expect(mail.html_part.body.to_s).to_not include(response.raw)
expect(mail.html_part.body.to_s).to_not include(topic.url)
@@ -431,24 +567,25 @@ RSpec.describe UserNotifications do
it "includes excerpt when post_excerpts_in_emails is enabled" do
paragraphs = [
"This is the first paragraph, but you should read more.",
- "And here is its friend, the second paragraph."
+ "And here is its friend, the second paragraph.",
]
SiteSetting.post_excerpts_in_emails = true
SiteSetting.post_excerpt_maxlength = paragraphs.first.length
response.update!(raw: paragraphs.join("\n\n"))
- mail = UserNotifications.user_replied(
- user,
- post: response,
- notification_type: notification.notification_type,
- notification_data_hash: notification.data_hash
- )
+ mail =
+ UserNotifications.user_replied(
+ user,
+ post: response,
+ notification_type: notification.notification_type,
+ notification_data_hash: notification.data_hash,
+ )
mail_html = mail.html_part.body.to_s
expect(mail_html.scan(/#{paragraphs[0]}/).count).to eq(1)
expect(mail_html.scan(/#{paragraphs[1]}/).count).to eq(0)
end
end
- describe '.user_posted' do
+ describe ".user_posted" do
let(:response_by_user) { Fabricate(:user, name: "John Doe", username: "john") }
let(:topic) { Fabricate(:topic, title: "Super cool topic") }
let(:post) { Fabricate(:post, topic: topic) }
@@ -456,20 +593,21 @@ RSpec.describe UserNotifications do
let(:user) { Fabricate(:user) }
let(:notification) { Fabricate(:posted_notification, user: user, post: response) }
- it 'generates a correct email' do
+ it "generates a correct email" do
SiteSetting.enable_names = false
- mail = UserNotifications.user_posted(
- user,
- post: response,
- notification_type: notification.notification_type,
- notification_data_hash: notification.data_hash
- )
+ mail =
+ UserNotifications.user_posted(
+ user,
+ post: response,
+ notification_type: notification.notification_type,
+ notification_data_hash: notification.data_hash,
+ )
# from should not include full user name if "show user full names" is disabled
- expect(mail[:from].display_names).to_not eql(['John Doe'])
+ expect(mail[:from].display_names).to_not eql(["John Doe"])
# from should include username if "show user full names" is disabled
- expect(mail[:from].display_names).to eql(['john via Discourse'])
+ expect(mail[:from].display_names).to eql(["john via Discourse"])
# subject should not include category name
expect(mail.subject).not_to match(/Uncategorized/)
@@ -487,57 +625,62 @@ RSpec.describe UserNotifications do
it "doesn't include details when private_email is enabled" do
SiteSetting.private_email = true
- mail = UserNotifications.user_posted(
- user,
- post: response,
- notification_type: notification.notification_type,
- notification_data_hash: notification.data_hash
- )
+ mail =
+ UserNotifications.user_posted(
+ user,
+ post: response,
+ notification_type: notification.notification_type,
+ notification_data_hash: notification.data_hash,
+ )
expect(mail.html_part.body.to_s).to_not include(response.raw)
expect(mail.text_part.to_s).to_not include(response.raw)
end
it "uses the original subject for staged users" do
- incoming_email = Fabricate(
- :incoming_email,
- subject: "Original Subject",
- post: post,
- topic: post.topic,
- user: user
- )
+ incoming_email =
+ Fabricate(
+ :incoming_email,
+ subject: "Original Subject",
+ post: post,
+ topic: post.topic,
+ user: user,
+ )
- mail = UserNotifications.user_posted(
- user,
- post: response,
- notification_type: notification.notification_type,
- notification_data_hash: notification.data_hash
- )
+ mail =
+ UserNotifications.user_posted(
+ user,
+ post: response,
+ notification_type: notification.notification_type,
+ notification_data_hash: notification.data_hash,
+ )
expect(mail.subject).to match(/Super cool topic/)
user.update!(staged: true)
- mail = UserNotifications.user_posted(
- user,
- post: response,
- notification_type: notification.notification_type,
- notification_data_hash: notification.data_hash
- )
+ mail =
+ UserNotifications.user_posted(
+ user,
+ post: response,
+ notification_type: notification.notification_type,
+ notification_data_hash: notification.data_hash,
+ )
expect(mail.subject).to eq("Re: Original Subject")
another_post = Fabricate(:post, topic: topic)
incoming_email.update!(post_id: another_post.id)
- mail = UserNotifications.user_private_message(
- user,
- post: response,
- notification_type: notification.notification_type,
- notification_data_hash: notification.data_hash
- )
+ mail =
+ UserNotifications.user_private_message(
+ user,
+ post: response,
+ notification_type: notification.notification_type,
+ notification_data_hash: notification.data_hash,
+ )
expect(mail.subject).to match(/Super cool topic/)
end
end
- describe '.user_private_message' do
+ describe ".user_private_message" do
let(:response_by_user) { Fabricate(:user, name: "", username: "john") }
let(:topic) { Fabricate(:private_message_topic, title: "Super cool topic") }
let(:post) { Fabricate(:post, topic: topic) }
@@ -545,17 +688,18 @@ RSpec.describe UserNotifications do
let(:user) { Fabricate(:user) }
let(:notification) { Fabricate(:private_message_notification, user: user, post: response) }
- it 'generates a correct email' do
+ it "generates a correct email" do
SiteSetting.enable_names = true
- mail = UserNotifications.user_private_message(
- user,
- post: response,
- notification_type: notification.notification_type,
- notification_data_hash: notification.data_hash
- )
+ mail =
+ UserNotifications.user_private_message(
+ user,
+ post: response,
+ notification_type: notification.notification_type,
+ notification_data_hash: notification.data_hash,
+ )
# from should include username if full user name is not provided
- expect(mail[:from].display_names).to eql(['john via Discourse'])
+ expect(mail[:from].display_names).to eql(["john via Discourse"])
# subject should include "[PM]"
expect(mail.subject).to include("[PM] ")
@@ -576,12 +720,13 @@ RSpec.describe UserNotifications do
it "doesn't include details when private_email is enabled" do
SiteSetting.private_email = true
- mail = UserNotifications.user_private_message(
- user,
- post: response,
- notification_type: notification.notification_type,
- notification_data_hash: notification.data_hash
- )
+ mail =
+ UserNotifications.user_private_message(
+ user,
+ post: response,
+ notification_type: notification.notification_type,
+ notification_data_hash: notification.data_hash,
+ )
expect(mail.html_part.body.to_s).to_not include(response.raw)
expect(mail.html_part.body.to_s).to_not include(topic.url)
@@ -592,12 +737,13 @@ RSpec.describe UserNotifications do
it "doesn't include group name in subject" do
group = Fabricate(:group)
topic.allowed_groups = [group]
- mail = UserNotifications.user_private_message(
- user,
- post: response,
- notification_type: notification.notification_type,
- notification_data_hash: notification.data_hash
- )
+ mail =
+ UserNotifications.user_private_message(
+ user,
+ post: response,
+ notification_type: notification.notification_type,
+ notification_data_hash: notification.data_hash,
+ )
expect(mail.subject).to include("[PM] ")
end
@@ -612,20 +758,21 @@ RSpec.describe UserNotifications do
topic.allowed_users = [user, user1, user2]
topic.allowed_groups = [group1, group2]
- mail = UserNotifications.user_private_message(
- user,
- post: response,
- notification_type: notification.notification_type,
- notification_data_hash: notification.data_hash
- )
+ mail =
+ UserNotifications.user_private_message(
+ user,
+ post: response,
+ notification_type: notification.notification_type,
+ notification_data_hash: notification.data_hash,
+ )
- expect(mail.body).to include("[group1 (2)](http://test.localhost/g/group1), [group2 (1)](http://test.localhost/g/group2), [one](http://test.localhost/u/one), [two](http://test.localhost/u/two)")
+ expect(mail.body).to include(
+ "[group1 (2)](http://test.localhost/g/group1), [group2 (1)](http://test.localhost/g/group2), [one](http://test.localhost/u/one), [two](http://test.localhost/u/two)",
+ )
end
context "when SiteSetting.group_name_in_subject is true" do
- before do
- SiteSetting.group_in_subject = true
- end
+ before { SiteSetting.group_in_subject = true }
let(:group) { Fabricate(:group, name: "my_group") }
let(:mail) do
@@ -633,7 +780,7 @@ RSpec.describe UserNotifications do
user,
post: response,
notification_type: notification.notification_type,
- notification_data_hash: notification.data_hash
+ notification_data_hash: notification.data_hash,
)
end
@@ -652,9 +799,7 @@ RSpec.describe UserNotifications do
end
context "with one group in pm" do
- before do
- topic.allowed_groups = [group]
- end
+ before { topic.allowed_groups = [group] }
include_examples "includes first group name"
end
@@ -662,9 +807,7 @@ RSpec.describe UserNotifications do
context "with multiple groups in pm" do
let(:group2) { Fabricate(:group) }
- before do
- topic.allowed_groups = [group, group2]
- end
+ before { topic.allowed_groups = [group, group2] }
include_examples "includes first group name"
end
@@ -677,71 +820,73 @@ RSpec.describe UserNotifications do
end
it "uses the original subject for staged users when topic was started via email" do
- incoming_email = Fabricate(
- :incoming_email,
- subject: "Original Subject",
- post: post,
- topic: topic,
- user: user
- )
+ incoming_email =
+ Fabricate(
+ :incoming_email,
+ subject: "Original Subject",
+ post: post,
+ topic: topic,
+ user: user,
+ )
- mail = UserNotifications.user_private_message(
- user,
- post: response,
- notification_type: notification.notification_type,
- notification_data_hash: notification.data_hash
- )
+ mail =
+ UserNotifications.user_private_message(
+ user,
+ post: response,
+ notification_type: notification.notification_type,
+ notification_data_hash: notification.data_hash,
+ )
expect(mail.subject).to match(/Super cool topic/)
user.update!(staged: true)
- mail = UserNotifications.user_private_message(
- user,
- post: response,
- notification_type: notification.notification_type,
- notification_data_hash: notification.data_hash
- )
+ mail =
+ UserNotifications.user_private_message(
+ user,
+ post: response,
+ notification_type: notification.notification_type,
+ notification_data_hash: notification.data_hash,
+ )
expect(mail.subject).to eq("Re: Original Subject")
another_post = Fabricate(:post, topic: topic)
incoming_email.update!(post_id: another_post.id)
- mail = UserNotifications.user_private_message(
- user,
- post: response,
- notification_type: notification.notification_type,
- notification_data_hash: notification.data_hash
- )
+ mail =
+ UserNotifications.user_private_message(
+ user,
+ post: response,
+ notification_type: notification.notification_type,
+ notification_data_hash: notification.data_hash,
+ )
expect(mail.subject).to match(/Super cool topic/)
end
end
- it 'adds a warning when mail limit is reached' do
+ it "adds a warning when mail limit is reached" do
SiteSetting.max_emails_per_day_per_user = 2
user = Fabricate(:user)
- user.email_logs.create!(
- email_type: 'blah',
- to_address: user.email,
- user_id: user.id
- )
+ user.email_logs.create!(email_type: "blah", to_address: user.email, user_id: user.id)
post = Fabricate(:post)
reply = Fabricate(:post, topic_id: post.topic_id)
- notification = Fabricate(
- :notification,
- topic_id: post.topic_id,
- post_number: reply.post_number,
- user: post.user,
- data: { original_username: 'bob' }.to_json
- )
+ notification =
+ Fabricate(
+ :notification,
+ topic_id: post.topic_id,
+ post_number: reply.post_number,
+ user: post.user,
+ data: { original_username: "bob" }.to_json,
+ )
- mail = UserNotifications.user_replied(
- user,
- post: reply,
- notification_type: notification.notification_type,
- notification_data_hash: notification.data_hash
- )
+ mail =
+ UserNotifications.user_replied(
+ user,
+ post: reply,
+ notification_type: notification.notification_type,
+ notification_data_hash: notification.data_hash,
+ )
# WARNING: you reached the limit of 100 email notifications per day. Further emails will be suppressed.
# Consider watching less topics or disabling mailing list mode.
@@ -751,12 +896,14 @@ RSpec.describe UserNotifications do
def expects_build_with(condition)
UserNotifications.any_instance.expects(:build_email).with(user.email, condition)
- mailer = UserNotifications.public_send(
- mail_type, user,
- notification_type: Notification.types[notification.notification_type],
- notification_data_hash: notification.data_hash,
- post: notification.post
- )
+ mailer =
+ UserNotifications.public_send(
+ mail_type,
+ user,
+ notification_type: Notification.types[notification.notification_type],
+ notification_data_hash: notification.data_hash,
+ post: notification.post,
+ )
mailer.message
end
@@ -782,13 +929,14 @@ RSpec.describe UserNotifications do
it "doesn't support reply by email" do
SiteSetting.private_email = true
- mailer = UserNotifications.public_send(
- mail_type,
- user,
- notification_type: Notification.types[notification.notification_type],
- notification_data_hash: notification.data_hash,
- post: notification.post
- )
+ mailer =
+ UserNotifications.public_send(
+ mail_type,
+ user,
+ notification_type: Notification.types[notification.notification_type],
+ notification_data_hash: notification.data_hash,
+ post: notification.post,
+ )
message = mailer.message
topic = notification.post.topic
@@ -815,15 +963,17 @@ RSpec.describe UserNotifications do
let(:mail_template) { "user_notifications.#{mail_type}" }
let(:username) { "walterwhite" }
let(:notification) do
- Fabricate(:notification,
- user: user,
- topic: post.topic,
- notification_type: Notification.types[notification_type],
- post_number: post.post_number,
- data: { original_username: username }.to_json)
+ Fabricate(
+ :notification,
+ user: user,
+ topic: post.topic,
+ notification_type: Notification.types[notification_type],
+ post_number: post.post_number,
+ data: { original_username: username }.to_json,
+ )
end
- describe 'email building' do
+ describe "email building" do
it "has a username" do
expects_build_with(has_entry(:username, username))
end
@@ -899,7 +1049,7 @@ RSpec.describe UserNotifications do
TranslationOverride.upsert!(
SiteSetting.default_locale,
"#{mail_template}.text_body_template",
- custom_body
+ custom_body,
)
end
@@ -1010,7 +1160,8 @@ RSpec.describe UserNotifications do
let(:invitee) { Fabricate(:user) }
let(:notification) do
- Fabricate(:notification,
+ Fabricate(
+ :notification,
notification_type: Notification.types[:invited_to_topic],
user: invitee,
topic: post.topic,
@@ -1019,8 +1170,8 @@ RSpec.describe UserNotifications do
topic_title: post.topic.title,
display_username: inviter.username,
original_user_id: inviter.id,
- original_username: inviter.username
- }.to_json
+ original_username: inviter.username,
+ }.to_json,
)
end
@@ -1030,18 +1181,22 @@ RSpec.describe UserNotifications do
invitee,
notification_type: Notification.types[notification.notification_type],
notification_data_hash: notification.data_hash,
- post: notification.post
+ post: notification.post,
)
end
it "sends the email as the inviter" do
SiteSetting.enable_names = false
- expect(mailer.message.to_s).to include("From: #{inviter.username} via #{SiteSetting.title} <#{SiteSetting.notification_email}>")
+ expect(mailer.message.to_s).to include(
+ "From: #{inviter.username} via #{SiteSetting.title} <#{SiteSetting.notification_email}>",
+ )
end
it "sends the email as the inviter" do
- expect(mailer.message.to_s).to include("From: #{inviter.name} via #{SiteSetting.title} <#{SiteSetting.notification_email}>")
+ expect(mailer.message.to_s).to include(
+ "From: #{inviter.name} via #{SiteSetting.title} <#{SiteSetting.notification_email}>",
+ )
end
end
end
@@ -1064,12 +1219,18 @@ RSpec.describe UserNotifications do
describe "notifications from template" do
context "when user locale is allowed" do
- before do
- SiteSetting.allow_user_locale = true
- end
+ before { SiteSetting.allow_user_locale = true }
- %w(signup signup_after_approval confirm_old_email notify_old_email confirm_new_email
- forgot_password admin_login account_created).each do |mail_type|
+ %w[
+ signup
+ signup_after_approval
+ confirm_old_email
+ notify_old_email
+ confirm_new_email
+ forgot_password
+ admin_login
+ account_created
+ ].each do |mail_type|
include_examples "with notification derived from template" do
let(:locale) { "fr" }
let(:mail_type) { mail_type }
@@ -1081,12 +1242,18 @@ RSpec.describe UserNotifications do
end
context "when user locale is not allowed" do
- before do
- SiteSetting.allow_user_locale = false
- end
+ before { SiteSetting.allow_user_locale = false }
- %w(signup signup_after_approval notify_old_email confirm_old_email confirm_new_email
- forgot_password admin_login account_created).each do |mail_type|
+ %w[
+ signup
+ signup_after_approval
+ notify_old_email
+ confirm_old_email
+ confirm_new_email
+ forgot_password
+ admin_login
+ account_created
+ ].each do |mail_type|
include_examples "with notification derived from template" do
let(:locale) { "fr" }
let(:mail_type) { mail_type }
@@ -1096,7 +1263,6 @@ RSpec.describe UserNotifications do
end
end
end
-
end
describe "#participants" do
@@ -1123,34 +1289,44 @@ RSpec.describe UserNotifications do
Fabricate(:small_action, topic: topic, post_number: 4, user: admin),
Fabricate(:post, topic: topic, post_number: 5, user: user4),
Fabricate(:post, topic: topic, post_number: 6, user: user3),
- Fabricate(:post, topic: topic, post_number: 7, user: user4)
+ Fabricate(:post, topic: topic, post_number: 7, user: user4),
]
end
it "returns a list of participants (except for the recipient), groups first, followed by users in order of their last reply" do
- expect(UserNotifications.participants(posts.last, user3)).to eq("[group1 (3)](http://test.localhost/g/group1), " \
- "[four](http://test.localhost/u/four), [two](http://test.localhost/u/two), [one](http://test.localhost/u/one), " \
- "[admin](http://test.localhost/u/admin)")
+ expect(UserNotifications.participants(posts.last, user3)).to eq(
+ "[group1 (3)](http://test.localhost/g/group1), " \
+ "[four](http://test.localhost/u/four), [two](http://test.localhost/u/two), [one](http://test.localhost/u/one), " \
+ "[admin](http://test.localhost/u/admin)",
+ )
end
it "caps the list according to site setting" do
SiteSetting.max_participant_names = 3
- list = "[group1 (3)](http://test.localhost/g/group1), [four](http://test.localhost/u/four), [two](http://test.localhost/u/two)"
- expect(UserNotifications.participants(posts.last, user3)).to eq(I18n.t("user_notifications.more_pm_participants", participants: list, count: 2))
+ list =
+ "[group1 (3)](http://test.localhost/g/group1), [four](http://test.localhost/u/four), [two](http://test.localhost/u/two)"
+ expect(UserNotifications.participants(posts.last, user3)).to eq(
+ I18n.t("user_notifications.more_pm_participants", participants: list, count: 2),
+ )
end
it "orders groups by user count" do
SiteSetting.max_participant_names = 3
topic.allowed_groups = [group1, group2, group3]
- list = "[group1 (3)](http://test.localhost/g/group1), [group3 (2)](http://test.localhost/g/group3), [group2 (1)](http://test.localhost/g/group2)"
- expect(UserNotifications.participants(posts.last, user3)).to eq(I18n.t("user_notifications.more_pm_participants", participants: list, count: 4))
+ list =
+ "[group1 (3)](http://test.localhost/g/group1), [group3 (2)](http://test.localhost/g/group3), [group2 (1)](http://test.localhost/g/group2)"
+ expect(UserNotifications.participants(posts.last, user3)).to eq(
+ I18n.t("user_notifications.more_pm_participants", participants: list, count: 4),
+ )
end
it "orders users by their last reply and user id" do
- expect(UserNotifications.participants(posts[-3], user4)).to eq("[group1 (3)](http://test.localhost/g/group1), " \
- "[two](http://test.localhost/u/two), [one](http://test.localhost/u/one), [three](http://test.localhost/u/three), " \
- "[admin](http://test.localhost/u/admin)")
+ expect(UserNotifications.participants(posts[-3], user4)).to eq(
+ "[group1 (3)](http://test.localhost/g/group1), " \
+ "[two](http://test.localhost/u/two), [one](http://test.localhost/u/one), [three](http://test.localhost/u/three), " \
+ "[admin](http://test.localhost/u/admin)",
+ )
end
it "prefers full group names when available" do
@@ -1159,8 +1335,11 @@ RSpec.describe UserNotifications do
group2.update!(full_name: "Awesome Group")
- list = "[group1 (3)](http://test.localhost/g/group1), [Awesome Group (1)](http://test.localhost/g/group2)"
- expect(UserNotifications.participants(posts.last, user3)).to eq(I18n.t("user_notifications.more_pm_participants", participants: list, count: 4))
+ list =
+ "[group1 (3)](http://test.localhost/g/group1), [Awesome Group (1)](http://test.localhost/g/group2)"
+ expect(UserNotifications.participants(posts.last, user3)).to eq(
+ I18n.t("user_notifications.more_pm_participants", participants: list, count: 4),
+ )
end
it "always uses usernames when prioritize_username_in_ux is enabled" do
@@ -1168,14 +1347,18 @@ RSpec.describe UserNotifications do
user1.update!(name: "Indiana Jones")
SiteSetting.prioritize_username_in_ux = true
- expect(UserNotifications.participants(posts.last, user3)).to eq("[group1 (3)](http://test.localhost/g/group1), " \
- "[four](http://test.localhost/u/four), [two](http://test.localhost/u/two), [one](http://test.localhost/u/one), " \
- "[admin](http://test.localhost/u/admin)")
+ expect(UserNotifications.participants(posts.last, user3)).to eq(
+ "[group1 (3)](http://test.localhost/g/group1), " \
+ "[four](http://test.localhost/u/four), [two](http://test.localhost/u/two), [one](http://test.localhost/u/one), " \
+ "[admin](http://test.localhost/u/admin)",
+ )
SiteSetting.prioritize_username_in_ux = false
- expect(UserNotifications.participants(posts.last, user3)).to eq("[group1 (3)](http://test.localhost/g/group1), " \
- "[James Bond](http://test.localhost/u/four), [two](http://test.localhost/u/two), [Indiana Jones](http://test.localhost/u/one), " \
- "[admin](http://test.localhost/u/admin)")
+ expect(UserNotifications.participants(posts.last, user3)).to eq(
+ "[group1 (3)](http://test.localhost/g/group1), " \
+ "[James Bond](http://test.localhost/u/four), [two](http://test.localhost/u/two), [Indiana Jones](http://test.localhost/u/one), " \
+ "[admin](http://test.localhost/u/admin)",
+ )
end
it "reveals the email address of staged users if enabled" do
@@ -1183,17 +1366,20 @@ RSpec.describe UserNotifications do
user1.update!(staged: true, email: "indiana.jones@example.com")
SiteSetting.prioritize_username_in_ux = true
- expect(UserNotifications.participants(posts.last, user3, reveal_staged_email: true)).to eq( \
+ expect(UserNotifications.participants(posts.last, user3, reveal_staged_email: true)).to eq(
"[group1 (3)](http://test.localhost/g/group1), james.bond@mi6.invalid, [two](http://test.localhost/u/two), " \
- "indiana.jones@example.com, [admin](http://test.localhost/u/admin)")
+ "indiana.jones@example.com, [admin](http://test.localhost/u/admin)",
+ )
end
it "does only include human users" do
topic.allowed_users << Discourse.system_user
- expect(UserNotifications.participants(posts.last, user3)).to eq("[group1 (3)](http://test.localhost/g/group1), " \
- "[four](http://test.localhost/u/four), [two](http://test.localhost/u/two), [one](http://test.localhost/u/one), " \
- "[admin](http://test.localhost/u/admin)")
+ expect(UserNotifications.participants(posts.last, user3)).to eq(
+ "[group1 (3)](http://test.localhost/g/group1), " \
+ "[four](http://test.localhost/u/four), [two](http://test.localhost/u/two), [one](http://test.localhost/u/one), " \
+ "[admin](http://test.localhost/u/admin)",
+ )
end
end
@@ -1210,9 +1396,7 @@ RSpec.describe UserNotifications do
end
context "when user doesn't have timezone set" do
- before do
- user.user_option.timezone = nil
- end
+ before { user.user_option.timezone = nil }
it "doesn't raise error" do
expect { UserNotifications.account_silenced(user) }.not_to raise_error
@@ -1242,9 +1426,7 @@ RSpec.describe UserNotifications do
end
context "when user doesn't have timezone set" do
- before do
- user.user_option.timezone = nil
- end
+ before { user.user_option.timezone = nil }
it "doesn't raise error" do
expect { UserNotifications.account_suspended(user) }.not_to raise_error
diff --git a/spec/mailers/version_mailer_spec.rb b/spec/mailers/version_mailer_spec.rb
index 8819df6ee16..59c047ba9d4 100644
--- a/spec/mailers/version_mailer_spec.rb
+++ b/spec/mailers/version_mailer_spec.rb
@@ -3,19 +3,19 @@
RSpec.describe VersionMailer do
subject { VersionMailer.send_notice }
- context 'when contact_email is blank' do
- before { SiteSetting.contact_email = '' }
+ context "when contact_email is blank" do
+ before { SiteSetting.contact_email = "" }
it "doesn't send the email" do
expect(subject.to).to be_blank
end
end
- context 'when contact_email is set' do
- before { SiteSetting.contact_email = 'me@example.com' }
+ context "when contact_email is set" do
+ before { SiteSetting.contact_email = "me@example.com" }
it "works" do
- expect(subject.to).to eq(['me@example.com'])
+ expect(subject.to).to eq(["me@example.com"])
expect(subject.subject).to be_present
expect(subject.from).to eq([SiteSetting.notification_email])
expect(subject.body).to be_present
diff --git a/spec/models/about_spec.rb b/spec/models/about_spec.rb
index a3f172b2897..0bb92230c25 100644
--- a/spec/models/about_spec.rb
+++ b/spec/models/about_spec.rb
@@ -1,73 +1,58 @@
# frozen_string_literal: true
RSpec.describe About do
-
- describe 'stats cache' do
- include_examples 'stats cacheable'
+ describe "stats cache" do
+ include_examples "stats cacheable"
end
describe "#stats" do
- after do
- About.clear_plugin_stat_groups
- end
+ after { About.clear_plugin_stat_groups }
it "adds plugin stats to the output" do
- stats = { last_day: 1, "7_days" => 10, "30_days" => 100, count: 1000 }
- About.add_plugin_stat_group("some_group", show_in_ui: true) do
- stats
- end
+ stats = { :last_day => 1, "7_days" => 10, "30_days" => 100, :count => 1000 }
+ About.add_plugin_stat_group("some_group", show_in_ui: true) { stats }
expect(described_class.new.stats.with_indifferent_access).to match(
hash_including(
some_group_last_day: 1,
some_group_7_days: 10,
some_group_30_days: 100,
some_group_count: 1000,
- )
+ ),
)
end
it "does not add plugin stats to the output if they are missing one of the required keys" do
- stats = { "7_days" => 10, "30_days" => 100, count: 1000 }
- About.add_plugin_stat_group("some_group", show_in_ui: true) do
- stats
- end
+ stats = { "7_days" => 10, "30_days" => 100, :count => 1000 }
+ About.add_plugin_stat_group("some_group", show_in_ui: true) { stats }
expect(described_class.new.stats).not_to match(
hash_including(
some_group_last_day: 1,
some_group_7_days: 10,
some_group_30_days: 100,
some_group_count: 1000,
- )
+ ),
)
end
it "does not error if any of the plugin stat blocks throw an error and still adds the non-errored stats to output" do
- stats = { last_day: 1, "7_days" => 10, "30_days" => 100, count: 1000 }
- About.add_plugin_stat_group("some_group", show_in_ui: true) do
- stats
- end
- About.add_plugin_stat_group("other_group", show_in_ui: true) do
- raise StandardError
- end
+ stats = { :last_day => 1, "7_days" => 10, "30_days" => 100, :count => 1000 }
+ About.add_plugin_stat_group("some_group", show_in_ui: true) { stats }
+ About.add_plugin_stat_group("other_group", show_in_ui: true) { raise StandardError }
expect(described_class.new.stats.with_indifferent_access).to match(
hash_including(
some_group_last_day: 1,
some_group_7_days: 10,
some_group_30_days: 100,
some_group_count: 1000,
- )
+ ),
)
expect { described_class.new.stats.with_indifferent_access }.not_to raise_error
end
it "does not allow duplicate displayed stat groups" do
- stats = { last_day: 1, "7_days" => 10, "30_days" => 100, count: 1000 }
- About.add_plugin_stat_group("some_group", show_in_ui: true) do
- stats
- end
- About.add_plugin_stat_group("some_group", show_in_ui: true) do
- stats
- end
+ stats = { :last_day => 1, "7_days" => 10, "30_days" => 100, :count => 1000 }
+ About.add_plugin_stat_group("some_group", show_in_ui: true) { stats }
+ About.add_plugin_stat_group("some_group", show_in_ui: true) { stats }
expect(described_class.displayed_plugin_stat_groups).to eq(["some_group"])
end
end
@@ -96,7 +81,9 @@ RSpec.describe About do
end
let!(:public_cat) { Fabricate(:category, reviewable_by_group: public_group) }
- let!(:private_cat) { Fabricate(:private_category, group: private_group, reviewable_by_group: private_group) }
+ let!(:private_cat) do
+ Fabricate(:private_category, group: private_group, reviewable_by_group: private_group)
+ end
it "lists moderators of the category that the current user can see" do
results = About.new(private_cat_moderator).category_moderators
@@ -105,17 +92,15 @@ RSpec.describe About do
public_cat_moderator.id,
common_moderator.id,
common_moderator_2.id,
- private_cat_moderator.id
+ private_cat_moderator.id,
)
[public_cat_moderator, user, nil].each do |u|
results = About.new(u).category_moderators
expect(results.map(&:category_id)).to contain_exactly(public_cat.id)
- expect(results.map(&:moderators).flatten.map(&:id)).to eq([
- public_cat_moderator.id,
- common_moderator.id,
- common_moderator_2.id
- ])
+ expect(results.map(&:moderators).flatten.map(&:id)).to eq(
+ [public_cat_moderator.id, common_moderator.id, common_moderator_2.id],
+ )
end
end
@@ -124,9 +109,7 @@ RSpec.describe About do
about.category_mods_limit = 4
results = about.category_moderators
expect(results.size).to eq(2)
- results.each do |res|
- expect(res.moderators.size).to eq(2)
- end
+ results.each { |res| expect(res.moderators.size).to eq(2) }
end
end
end
diff --git a/spec/models/admin_dashboard_data_spec.rb b/spec/models/admin_dashboard_data_spec.rb
index 79203d25ffd..7dc061cebbc 100644
--- a/spec/models/admin_dashboard_data_spec.rb
+++ b/spec/models/admin_dashboard_data_spec.rb
@@ -11,7 +11,9 @@ RSpec.describe AdminDashboardData do
it "adds the message and returns it when the problems are fetched" do
AdminDashboardData.add_problem_message("dashboard.bad_favicon_url")
problems = AdminDashboardData.fetch_problems.map(&:to_s)
- expect(problems).to include(I18n.t("dashboard.bad_favicon_url", { base_path: Discourse.base_path }))
+ expect(problems).to include(
+ I18n.t("dashboard.bad_favicon_url", { base_path: Discourse.base_path }),
+ )
end
it "does not allow adding of arbitrary problem messages, they must exist in AdminDashboardData.problem_messages" do
@@ -22,21 +24,20 @@ RSpec.describe AdminDashboardData do
end
describe "adding new checks" do
- it 'calls the passed block' do
- AdminDashboardData.add_problem_check do
- "a problem was found"
- end
+ it "calls the passed block" do
+ AdminDashboardData.add_problem_check { "a problem was found" }
problems = AdminDashboardData.fetch_problems
expect(problems.map(&:to_s)).to include("a problem was found")
end
- it 'calls the passed method' do
- klass = Class.new(AdminDashboardData) do
- def my_test_method
- "a problem was found"
+ it "calls the passed method" do
+ klass =
+ Class.new(AdminDashboardData) do
+ def my_test_method
+ "a problem was found"
+ end
end
- end
klass.add_problem_check :my_test_method
@@ -49,9 +50,7 @@ RSpec.describe AdminDashboardData do
describe "adding scheduled checks" do
it "adds the passed block to the scheduled checks" do
called = false
- AdminDashboardData.add_scheduled_problem_check(:test_identifier) do
- called = true
- end
+ AdminDashboardData.add_scheduled_problem_check(:test_identifier) { called = true }
AdminDashboardData.execute_scheduled_checks
expect(called).to eq(true)
@@ -73,7 +72,9 @@ RSpec.describe AdminDashboardData do
prob2 = AdminDashboardData::Problem.new("test problem 2", identifier: "test")
AdminDashboardData.add_found_scheduled_check_problem(prob1)
AdminDashboardData.add_found_scheduled_check_problem(prob2)
- expect(AdminDashboardData.load_found_scheduled_check_problems.map(&:to_s)).to eq(["test problem"])
+ expect(AdminDashboardData.load_found_scheduled_check_problems.map(&:to_s)).to eq(
+ ["test problem"],
+ )
end
it "does not error when loading malformed problems saved in redis" do
@@ -96,207 +97,206 @@ RSpec.describe AdminDashboardData do
end
end
- describe 'stats cache' do
- include_examples 'stats cacheable'
+ describe "stats cache" do
+ include_examples "stats cacheable"
end
- describe '#problem_message_check' do
+ describe "#problem_message_check" do
let(:key) { AdminDashboardData.problem_messages.first }
- after do
- described_class.clear_problem_message(key)
- end
+ after { described_class.clear_problem_message(key) }
- it 'returns nil if message has not been added' do
+ it "returns nil if message has not been added" do
expect(described_class.problem_message_check(key)).to be_nil
end
- it 'returns a message if it was added' do
+ it "returns a message if it was added" do
described_class.add_problem_message(key)
- expect(described_class.problem_message_check(key)).to eq(I18n.t(key, base_path: Discourse.base_path))
+ expect(described_class.problem_message_check(key)).to eq(
+ I18n.t(key, base_path: Discourse.base_path),
+ )
end
- it 'returns a message if it was added with an expiry' do
+ it "returns a message if it was added with an expiry" do
described_class.add_problem_message(key, 300)
- expect(described_class.problem_message_check(key)).to eq(I18n.t(key, base_path: Discourse.base_path))
+ expect(described_class.problem_message_check(key)).to eq(
+ I18n.t(key, base_path: Discourse.base_path),
+ )
end
end
describe "rails_env_check" do
subject { described_class.new.rails_env_check }
- it 'returns nil when running in production mode' do
- Rails.stubs(env: ActiveSupport::StringInquirer.new('production'))
+ it "returns nil when running in production mode" do
+ Rails.stubs(env: ActiveSupport::StringInquirer.new("production"))
expect(subject).to be_nil
end
- it 'returns a string when running in development mode' do
- Rails.stubs(env: ActiveSupport::StringInquirer.new('development'))
+ it "returns a string when running in development mode" do
+ Rails.stubs(env: ActiveSupport::StringInquirer.new("development"))
expect(subject).to_not be_nil
end
- it 'returns a string when running in test mode' do
- Rails.stubs(env: ActiveSupport::StringInquirer.new('test'))
+ it "returns a string when running in test mode" do
+ Rails.stubs(env: ActiveSupport::StringInquirer.new("test"))
expect(subject).to_not be_nil
end
end
- describe 'host_names_check' do
+ describe "host_names_check" do
subject { described_class.new.host_names_check }
- it 'returns nil when host_names is set' do
- Discourse.stubs(:current_hostname).returns('something.com')
+ it "returns nil when host_names is set" do
+ Discourse.stubs(:current_hostname).returns("something.com")
expect(subject).to be_nil
end
- it 'returns a string when host_name is localhost' do
- Discourse.stubs(:current_hostname).returns('localhost')
+ it "returns a string when host_name is localhost" do
+ Discourse.stubs(:current_hostname).returns("localhost")
expect(subject).to_not be_nil
end
- it 'returns a string when host_name is production.localhost' do
- Discourse.stubs(:current_hostname).returns('production.localhost')
+ it "returns a string when host_name is production.localhost" do
+ Discourse.stubs(:current_hostname).returns("production.localhost")
expect(subject).to_not be_nil
end
end
- describe 'sidekiq_check' do
+ describe "sidekiq_check" do
subject { described_class.new.sidekiq_check }
- it 'returns nil when sidekiq processed a job recently' do
+ it "returns nil when sidekiq processed a job recently" do
Jobs.stubs(:last_job_performed_at).returns(1.minute.ago)
Jobs.stubs(:queued).returns(0)
expect(subject).to be_nil
end
- it 'returns nil when last job processed was a long time ago, but no jobs are queued' do
+ it "returns nil when last job processed was a long time ago, but no jobs are queued" do
Jobs.stubs(:last_job_performed_at).returns(7.days.ago)
Jobs.stubs(:queued).returns(0)
expect(subject).to be_nil
end
- it 'returns nil when no jobs have ever been processed, but no jobs are queued' do
+ it "returns nil when no jobs have ever been processed, but no jobs are queued" do
Jobs.stubs(:last_job_performed_at).returns(nil)
Jobs.stubs(:queued).returns(0)
expect(subject).to be_nil
end
- it 'returns a string when no jobs were processed recently and some jobs are queued' do
+ it "returns a string when no jobs were processed recently and some jobs are queued" do
Jobs.stubs(:last_job_performed_at).returns(20.minutes.ago)
Jobs.stubs(:queued).returns(1)
expect(subject).to_not be_nil
end
- it 'returns a string when no jobs have ever been processed, and some jobs are queued' do
+ it "returns a string when no jobs have ever been processed, and some jobs are queued" do
Jobs.stubs(:last_job_performed_at).returns(nil)
Jobs.stubs(:queued).returns(1)
expect(subject).to_not be_nil
end
end
- describe 'ram_check' do
+ describe "ram_check" do
subject { described_class.new.ram_check }
- it 'returns nil when total ram is 1 GB' do
- MemInfo.any_instance.stubs(:mem_total).returns(1025272)
+ it "returns nil when total ram is 1 GB" do
+ MemInfo.any_instance.stubs(:mem_total).returns(1_025_272)
expect(subject).to be_nil
end
- it 'returns nil when total ram cannot be determined' do
+ it "returns nil when total ram cannot be determined" do
MemInfo.any_instance.stubs(:mem_total).returns(nil)
expect(subject).to be_nil
end
- it 'returns a string when total ram is less than 1 GB' do
- MemInfo.any_instance.stubs(:mem_total).returns(512636)
+ it "returns a string when total ram is less than 1 GB" do
+ MemInfo.any_instance.stubs(:mem_total).returns(512_636)
expect(subject).to_not be_nil
end
end
- describe 'auth_config_checks' do
-
- shared_examples 'problem detection for login providers' do
- context 'when disabled' do
- it 'returns nil' do
+ describe "auth_config_checks" do
+ shared_examples "problem detection for login providers" do
+ context "when disabled" do
+ it "returns nil" do
SiteSetting.set(enable_setting, false)
expect(subject).to be_nil
end
end
- context 'when enabled' do
- before do
- SiteSetting.set(enable_setting, true)
- end
+ context "when enabled" do
+ before { SiteSetting.set(enable_setting, true) }
- it 'returns nil when key and secret are set' do
- SiteSetting.set(key, '12313213')
- SiteSetting.set(secret, '12312313123')
+ it "returns nil when key and secret are set" do
+ SiteSetting.set(key, "12313213")
+ SiteSetting.set(secret, "12312313123")
expect(subject).to be_nil
end
- it 'returns a string when key is not set' do
- SiteSetting.set(key, '')
- SiteSetting.set(secret, '12312313123')
+ it "returns a string when key is not set" do
+ SiteSetting.set(key, "")
+ SiteSetting.set(secret, "12312313123")
expect(subject).to_not be_nil
end
- it 'returns a string when secret is not set' do
- SiteSetting.set(key, '123123')
- SiteSetting.set(secret, '')
+ it "returns a string when secret is not set" do
+ SiteSetting.set(key, "123123")
+ SiteSetting.set(secret, "")
expect(subject).to_not be_nil
end
- it 'returns a string when key and secret are not set' do
- SiteSetting.set(key, '')
- SiteSetting.set(secret, '')
+ it "returns a string when key and secret are not set" do
+ SiteSetting.set(key, "")
+ SiteSetting.set(secret, "")
expect(subject).to_not be_nil
end
end
end
- describe 'facebook' do
+ describe "facebook" do
subject { described_class.new.facebook_config_check }
let(:enable_setting) { :enable_facebook_logins }
let(:key) { :facebook_app_id }
let(:secret) { :facebook_app_secret }
- include_examples 'problem detection for login providers'
+ include_examples "problem detection for login providers"
end
- describe 'twitter' do
+ describe "twitter" do
subject { described_class.new.twitter_config_check }
let(:enable_setting) { :enable_twitter_logins }
let(:key) { :twitter_consumer_key }
let(:secret) { :twitter_consumer_secret }
- include_examples 'problem detection for login providers'
+ include_examples "problem detection for login providers"
end
- describe 'github' do
+ describe "github" do
subject { described_class.new.github_config_check }
let(:enable_setting) { :enable_github_logins }
let(:key) { :github_client_id }
let(:secret) { :github_client_secret }
- include_examples 'problem detection for login providers'
+ include_examples "problem detection for login providers"
end
end
- describe 'force_https_check' do
+ describe "force_https_check" do
subject { described_class.new(check_force_https: true).force_https_check }
- it 'returns nil if force_https site setting enabled' do
+ it "returns nil if force_https site setting enabled" do
SiteSetting.force_https = true
expect(subject).to be_nil
end
- it 'returns nil if force_https site setting not enabled' do
+ it "returns nil if force_https site setting not enabled" do
SiteSetting.force_https = false
- expect(subject).to eq(I18n.t('dashboard.force_https_warning', base_path: Discourse.base_path))
+ expect(subject).to eq(I18n.t("dashboard.force_https_warning", base_path: Discourse.base_path))
end
end
- describe 'ignore force_https_check' do
+ describe "ignore force_https_check" do
subject { described_class.new(check_force_https: false).force_https_check }
- it 'returns nil' do
+ it "returns nil" do
SiteSetting.force_https = true
expect(subject).to be_nil
@@ -305,7 +305,7 @@ RSpec.describe AdminDashboardData do
end
end
- describe '#out_of_date_themes' do
+ describe "#out_of_date_themes" do
let(:remote) { RemoteTheme.create!(remote_url: "https://github.com/org/testtheme") }
let!(:theme) { Fabricate(:theme, remote_theme: remote, name: "Test< Theme") }
@@ -313,7 +313,8 @@ RSpec.describe AdminDashboardData do
remote.update!(local_version: "old version", remote_version: "new version", commits_behind: 2)
dashboard_data = described_class.new
expect(dashboard_data.out_of_date_themes).to eq(
- I18n.t("dashboard.out_of_date_themes") + ""
+ I18n.t("dashboard.out_of_date_themes") +
+ "",
)
remote.update!(local_version: "new version", commits_behind: 0)
@@ -321,14 +322,20 @@ RSpec.describe AdminDashboardData do
end
end
- describe '#unreachable_themes' do
- let(:remote) { RemoteTheme.create!(remote_url: "https://github.com/org/testtheme", last_error_text: "can't reach repo :'(") }
+ describe "#unreachable_themes" do
+ let(:remote) do
+ RemoteTheme.create!(
+ remote_url: "https://github.com/org/testtheme",
+ last_error_text: "can't reach repo :'(",
+ )
+ end
let!(:theme) { Fabricate(:theme, remote_theme: remote, name: "Test< Theme") }
it "outputs correctly formatted html" do
dashboard_data = described_class.new
expect(dashboard_data.unreachable_themes).to eq(
- I18n.t("dashboard.unreachable_themes") + ""
+ I18n.t("dashboard.unreachable_themes") +
+ "",
)
remote.update!(last_error_text: nil)
diff --git a/spec/models/api_key_scope_spec.rb b/spec/models/api_key_scope_spec.rb
index a293f1157e2..f2577fb7c05 100644
--- a/spec/models/api_key_scope_spec.rb
+++ b/spec/models/api_key_scope_spec.rb
@@ -1,10 +1,11 @@
# frozen_string_literal: true
RSpec.describe ApiKeyScope do
- describe '.find_urls' do
- it 'should return the right urls' do
- expect(ApiKeyScope.find_urls(actions: ["posts#create"], methods: []))
- .to contain_exactly("/posts (POST)")
+ describe ".find_urls" do
+ it "should return the right urls" do
+ expect(ApiKeyScope.find_urls(actions: ["posts#create"], methods: [])).to contain_exactly(
+ "/posts (POST)",
+ )
end
end
end
diff --git a/spec/models/api_key_spec.rb b/spec/models/api_key_spec.rb
index a2ea29543a4..330b4b103cb 100644
--- a/spec/models/api_key_spec.rb
+++ b/spec/models/api_key_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe ApiKey do
it { is_expected.to belong_to :user }
it { is_expected.to belong_to :created_by }
- it 'generates a key when saving' do
+ it "generates a key when saving" do
api_key = ApiKey.new
api_key.save!
initial_key = api_key.key
@@ -19,7 +19,7 @@ RSpec.describe ApiKey do
expect(api_key.reload.key).to eq(initial_key)
end
- it 'does not have the key when loading later from the database' do
+ it "does not have the key when loading later from the database" do
api_key = ApiKey.create!
expect(api_key.key_available?).to eq(true)
expect(api_key.key.length).to eq(64)
@@ -77,8 +77,8 @@ RSpec.describe ApiKey do
expect(used_recently.revoked_at).to eq(nil)
end
- describe 'API Key scope mappings' do
- it 'maps api_key permissions' do
+ describe "API Key scope mappings" do
+ it "maps api_key permissions" do
api_key_mappings = ApiKeyScope.scope_mappings[:topics]
assert_responds_to(api_key_mappings.dig(:write, :actions))
@@ -88,7 +88,7 @@ RSpec.describe ApiKey do
def assert_responds_to(mappings)
mappings.each do |m|
- controller, method = m.split('#')
+ controller, method = m.split("#")
controller_name = "#{controller.capitalize}Controller"
expect(controller_name.constantize.method_defined?(method)).to eq(true)
end
@@ -96,70 +96,68 @@ RSpec.describe ApiKey do
end
describe "#request_allowed?" do
- let(:request) {
+ let(:request) do
ActionDispatch::TestRequest.create.tap do |request|
request.path_parameters = { controller: "topics", action: "show", topic_id: "3" }
request.remote_addr = "133.45.67.99"
end
- }
+ end
let(:env) { request.env }
let(:key) { ApiKey.new(api_key_scopes: [scope]) }
- context 'with regular scopes' do
+ context "with regular scopes" do
let(:scope) do
- ApiKeyScope.new(resource: 'topics', action: 'read', allowed_parameters: { topic_id: '3' })
+ ApiKeyScope.new(resource: "topics", action: "read", allowed_parameters: { topic_id: "3" })
end
- it 'allows the request if there are no allowed IPs' do
+ it "allows the request if there are no allowed IPs" do
key.allowed_ips = nil
key.api_key_scopes = []
expect(key.request_allowed?(env)).to eq(true)
end
- it 'rejects the request if the IP is not allowed' do
+ it "rejects the request if the IP is not allowed" do
key.allowed_ips = %w[115.65.76.87]
expect(key.request_allowed?(env)).to eq(false)
end
- it 'allow the request if there are not allowed params' do
+ it "allow the request if there are not allowed params" do
scope.allowed_parameters = nil
expect(key.request_allowed?(env)).to eq(true)
end
- it 'rejects the request when params are different' do
+ it "rejects the request when params are different" do
request.path_parameters = { controller: "topics", action: "show", topic_id: "4" }
expect(key.request_allowed?(env)).to eq(false)
end
- it 'accepts the request if one of the parameters match' do
+ it "accepts the request if one of the parameters match" do
request.path_parameters = { controller: "topics", action: "show", topic_id: "4" }
scope.allowed_parameters = { topic_id: %w[3 4] }
expect(key.request_allowed?(env)).to eq(true)
end
- it 'allow the request when the scope has an alias' do
+ it "allow the request when the scope has an alias" do
request.path_parameters = { controller: "topics", action: "show", id: "3" }
expect(key.request_allowed?(env)).to eq(true)
end
- it 'rejects the request when the main parameter and the alias are both used' do
+ it "rejects the request when the main parameter and the alias are both used" do
request.path_parameters = { controller: "topics", action: "show", topic_id: "3", id: "3" }
expect(key.request_allowed?(env)).to eq(false)
end
end
- context 'with global:read scope' do
- let(:scope) do
- ApiKeyScope.new(resource: 'global', action: 'read')
- end
+ context "with global:read scope" do
+ let(:scope) { ApiKeyScope.new(resource: "global", action: "read") }
- it 'allows only GET requests for global:read' do
- request.request_method = 'GET'
+ it "allows only GET requests for global:read" do
+ request.request_method = "GET"
expect(key.request_allowed?(env)).to eq(true)
- request.request_method = 'POST'
+ request.request_method = "POST"
expect(key.request_allowed?(env)).to eq(false)
end
end
diff --git a/spec/models/application_request_spec.rb b/spec/models/application_request_spec.rb
index e3d4f305d25..0fa324e8f6c 100644
--- a/spec/models/application_request_spec.rb
+++ b/spec/models/application_request_spec.rb
@@ -20,9 +20,7 @@ RSpec.describe ApplicationRequest do
freeze_time
d1 = Time.now.utc.to_date
- 4.times do
- inc("http_2xx")
- end
+ 4.times { inc("http_2xx") }
inc("http_background")
@@ -39,7 +37,5 @@ RSpec.describe ApplicationRequest do
expect(ApplicationRequest.find_by(date: d2, req_type: "page_view_crawler").count).to eq(1)
expect(ApplicationRequest.find_by(date: d2, req_type: "http_2xx").count).to eq(1)
-
end
-
end
diff --git a/spec/models/associated_group_spec.rb b/spec/models/associated_group_spec.rb
index 916927504a4..2bdbad13169 100644
--- a/spec/models/associated_group_spec.rb
+++ b/spec/models/associated_group_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe AssociatedGroup do
it "detects whether any auth providers provide associated groups" do
SiteSetting.enable_google_oauth2_logins = true
- SiteSetting.google_oauth2_hd = 'domain.com'
+ SiteSetting.google_oauth2_hd = "domain.com"
SiteSetting.google_oauth2_hd_groups = false
SiteSetting.google_oauth2_hd_groups_service_account_admin_email = "test@example.com"
SiteSetting.google_oauth2_hd_groups_service_account_json = "{}"
diff --git a/spec/models/badge_spec.rb b/spec/models/badge_spec.rb
index cc153942a09..60bd7a2a7a0 100644
--- a/spec/models/badge_spec.rb
+++ b/spec/models/badge_spec.rb
@@ -1,20 +1,18 @@
# frozen_string_literal: true
RSpec.describe Badge do
- it 'has a valid system attribute for new badges' do
+ it "has a valid system attribute for new badges" do
expect(Badge.create!(name: "test", badge_type_id: 1).system?).to be false
end
- it 'auto translates name' do
+ it "auto translates name" do
badge = Badge.find_by_name("Basic User")
name_english = badge.name
- I18n.with_locale(:fr) do
- expect(badge.display_name).not_to eq(name_english)
- end
+ I18n.with_locale(:fr) { expect(badge.display_name).not_to eq(name_english) }
end
- it 'handles changes on badge description and long description correctly for system badges' do
+ it "handles changes on badge description and long description correctly for system badges" do
badge = Badge.find_by_name("Basic User")
badge.description = badge.description.dup
badge.long_description = badge.long_description.dup
@@ -34,13 +32,18 @@ RSpec.describe Badge do
expect(badge[:long_description]).to eq("testing it")
end
- it 'can ensure consistency' do
+ it "can ensure consistency" do
b = Badge.first
b.grant_count = 100
b.save
UserBadge.create!(user_id: -100, badge_id: b.id, granted_at: 1.minute.ago, granted_by_id: -1)
- UserBadge.create!(user_id: User.first.id, badge_id: b.id, granted_at: 1.minute.ago, granted_by_id: -1)
+ UserBadge.create!(
+ user_id: User.first.id,
+ badge_id: b.id,
+ granted_at: 1.minute.ago,
+ granted_by_id: -1,
+ )
Badge.ensure_consistency!
@@ -48,7 +51,7 @@ RSpec.describe Badge do
expect(b.grant_count).to eq(1)
end
- it 'sanitizes the description' do
+ it "sanitizes the description" do
xss = "click me! "
badge = Fabricate(:badge)
@@ -57,28 +60,28 @@ RSpec.describe Badge do
expect(badge.description).to eq("click me! alert('TEST');")
end
- describe '#manually_grantable?' do
- fab!(:badge) { Fabricate(:badge, name: 'Test Badge') }
+ describe "#manually_grantable?" do
+ fab!(:badge) { Fabricate(:badge, name: "Test Badge") }
subject { badge.manually_grantable? }
- context 'when system badge' do
+ context "when system badge" do
before { badge.system = true }
it { is_expected.to be false }
end
- context 'when has query' do
- before { badge.query = 'SELECT id FROM users' }
+ context "when has query" do
+ before { badge.query = "SELECT id FROM users" }
it { is_expected.to be false }
end
- context 'when neither system nor has query' do
+ context "when neither system nor has query" do
before { badge.update_columns(system: false, query: nil) }
it { is_expected.to be true }
end
end
- describe '#image_url' do
- it 'has CDN url' do
+ describe "#image_url" do
+ it "has CDN url" do
SiteSetting.enable_s3_uploads = true
SiteSetting.s3_cdn_url = "https://some-s3-cdn.amzn.com"
upload = Fabricate(:upload_s3)
@@ -87,45 +90,43 @@ RSpec.describe Badge do
end
end
- describe '.i18n_name' do
- it 'transforms to lower case letters, and replaces spaces with underscores' do
- expect(Badge.i18n_name('Basic User')).to eq('basic_user')
+ describe ".i18n_name" do
+ it "transforms to lower case letters, and replaces spaces with underscores" do
+ expect(Badge.i18n_name("Basic User")).to eq("basic_user")
end
end
- describe '.display_name' do
- it 'fetches from translations when i18n_name key exists' do
- expect(Badge.display_name('basic_user')).to eq('Basic')
- expect(Badge.display_name('Basic User')).to eq('Basic')
+ describe ".display_name" do
+ it "fetches from translations when i18n_name key exists" do
+ expect(Badge.display_name("basic_user")).to eq("Basic")
+ expect(Badge.display_name("Basic User")).to eq("Basic")
end
- it 'fallbacks to argument value when translation does not exist' do
- expect(Badge.display_name('Not In Translations')).to eq('Not In Translations')
+ it "fallbacks to argument value when translation does not exist" do
+ expect(Badge.display_name("Not In Translations")).to eq("Not In Translations")
end
end
- describe '.find_system_badge_id_from_translation_key' do
- let(:translation_key) { 'badges.regular.name' }
+ describe ".find_system_badge_id_from_translation_key" do
+ let(:translation_key) { "badges.regular.name" }
- it 'uses a translation key to get a system badge id, mainly to find which badge a translation override corresponds to' do
- expect(Badge.find_system_badge_id_from_translation_key(translation_key)).to eq(
- Badge::Regular
- )
+ it "uses a translation key to get a system badge id, mainly to find which badge a translation override corresponds to" do
+ expect(Badge.find_system_badge_id_from_translation_key(translation_key)).to eq(Badge::Regular)
end
- context 'when the translation key is snake case' do
- let(:translation_key) { 'badges.crazy_in_love.name' }
+ context "when the translation key is snake case" do
+ let(:translation_key) { "badges.crazy_in_love.name" }
- it 'works to get the badge' do
+ it "works to get the badge" do
expect(Badge.find_system_badge_id_from_translation_key(translation_key)).to eq(
- Badge::CrazyInLove
+ Badge::CrazyInLove,
)
end
end
- context 'when a translation key not for a badge is provided' do
- let(:translation_key) { 'reports.flags.title' }
- it 'returns nil' do
+ context "when a translation key not for a badge is provided" do
+ let(:translation_key) { "reports.flags.title" }
+ it "returns nil" do
expect(Badge.find_system_badge_id_from_translation_key(translation_key)).to eq(nil)
end
end
@@ -140,9 +141,7 @@ RSpec.describe Badge do
end
describe "First Quote" do
- let(:quoted_post_badge) do
- Badge.find(Badge::FirstQuote)
- end
+ let(:quoted_post_badge) { Badge.find(Badge::FirstQuote) }
it "Awards at the correct award date" do
freeze_time
@@ -181,9 +180,7 @@ RSpec.describe Badge do
end
describe "PopularLink badge" do
- let(:popular_link_badge) do
- Badge.find(Badge::PopularLink)
- end
+ let(:popular_link_badge) { Badge.find(Badge::PopularLink) }
before do
popular_link_badge.query = BadgeQueries.linking_badge(2)
@@ -193,11 +190,21 @@ RSpec.describe Badge do
it "is awarded" do
post = create_post(raw: "https://www.discourse.org/")
- TopicLinkClick.create_from(url: "https://www.discourse.org/", post_id: post.id, topic_id: post.topic.id, ip: "192.168.0.100")
+ TopicLinkClick.create_from(
+ url: "https://www.discourse.org/",
+ post_id: post.id,
+ topic_id: post.topic.id,
+ ip: "192.168.0.100",
+ )
BadgeGranter.backfill(popular_link_badge)
expect(UserBadge.where(user_id: post.user.id, badge_id: Badge::PopularLink).count).to eq(0)
- TopicLinkClick.create_from(url: "https://www.discourse.org/", post_id: post.id, topic_id: post.topic.id, ip: "192.168.0.101")
+ TopicLinkClick.create_from(
+ url: "https://www.discourse.org/",
+ post_id: post.id,
+ topic_id: post.topic.id,
+ ip: "192.168.0.101",
+ )
BadgeGranter.backfill(popular_link_badge)
expect(UserBadge.where(user_id: post.user.id, badge_id: Badge::PopularLink).count).to eq(1)
end
@@ -209,8 +216,18 @@ RSpec.describe Badge do
category.set_permissions({})
category.save!
- TopicLinkClick.create_from(url: "https://www.discourse.org/", post_id: post.id, topic_id: post.topic.id, ip: "192.168.0.100")
- TopicLinkClick.create_from(url: "https://www.discourse.org/", post_id: post.id, topic_id: post.topic.id, ip: "192.168.0.101")
+ TopicLinkClick.create_from(
+ url: "https://www.discourse.org/",
+ post_id: post.id,
+ topic_id: post.topic.id,
+ ip: "192.168.0.100",
+ )
+ TopicLinkClick.create_from(
+ url: "https://www.discourse.org/",
+ post_id: post.id,
+ topic_id: post.topic.id,
+ ip: "192.168.0.101",
+ )
BadgeGranter.backfill(popular_link_badge)
expect(UserBadge.where(user_id: post.user.id, badge_id: Badge::PopularLink).count).to eq(0)
end
diff --git a/spec/models/badge_type_spec.rb b/spec/models/badge_type_spec.rb
index 99c27b9c04e..b0dcccf9718 100644
--- a/spec/models/badge_type_spec.rb
+++ b/spec/models/badge_type_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
RSpec.describe BadgeType do
-
it { is_expected.to have_many :badges }
it { is_expected.to validate_presence_of :name }
it { is_expected.to validate_uniqueness_of :name }
diff --git a/spec/models/bookmark_spec.rb b/spec/models/bookmark_spec.rb
index 7c89b6a41ad..362c1ee1ead 100644
--- a/spec/models/bookmark_spec.rb
+++ b/spec/models/bookmark_spec.rb
@@ -7,9 +7,13 @@ RSpec.describe Bookmark do
it "does not allow a user to create a bookmark with only one polymorphic column" do
user = Fabricate(:user)
bm = Bookmark.create(bookmarkable_id: post.id, user: user)
- expect(bm.errors.full_messages).to include(I18n.t("bookmarks.errors.bookmarkable_id_type_required"))
+ expect(bm.errors.full_messages).to include(
+ I18n.t("bookmarks.errors.bookmarkable_id_type_required"),
+ )
bm = Bookmark.create(bookmarkable_type: "Post", user: user)
- expect(bm.errors.full_messages).to include(I18n.t("bookmarks.errors.bookmarkable_id_type_required"))
+ expect(bm.errors.full_messages).to include(
+ I18n.t("bookmarks.errors.bookmarkable_id_type_required"),
+ )
bm = Bookmark.create(bookmarkable_type: "Post", bookmarkable_id: post.id, user: user)
expect(bm.errors.full_messages).to be_empty
end
@@ -18,13 +22,17 @@ RSpec.describe Bookmark do
user = Fabricate(:user)
Bookmark.create(bookmarkable_type: "Post", bookmarkable_id: post.id, user: user)
bm = Bookmark.create(bookmarkable_type: "Post", bookmarkable_id: post.id, user: user)
- expect(bm.errors.full_messages).to include(I18n.t("bookmarks.errors.already_bookmarked", type: "Post"))
+ expect(bm.errors.full_messages).to include(
+ I18n.t("bookmarks.errors.already_bookmarked", type: "Post"),
+ )
end
it "does not allow a user to create a bookmarkable for a type that has not been registered" do
user = Fabricate(:user)
bm = Bookmark.create(bookmarkable_type: "User", bookmarkable: Fabricate(:user), user: user)
- expect(bm.errors.full_messages).to include(I18n.t("bookmarks.errors.invalid_bookmarkable", type: "User"))
+ expect(bm.errors.full_messages).to include(
+ I18n.t("bookmarks.errors.invalid_bookmarkable", type: "User"),
+ )
register_test_bookmarkable
expect(bm.valid?).to eq(true)
end
@@ -105,40 +113,39 @@ RSpec.describe Bookmark do
let!(:bookmark1) { Fabricate(:bookmark, created_at: 1.day.ago) }
let!(:bookmark2) { Fabricate(:bookmark, created_at: 2.days.ago) }
let!(:bookmark3) { Fabricate(:bookmark, created_at: 3.days.ago) }
- let!(:bookmark4) { Fabricate(:bookmark, bookmarkable: Fabricate(:post, topic: topic_in_category), created_at: 3.days.ago) }
+ let!(:bookmark4) do
+ Fabricate(
+ :bookmark,
+ bookmarkable: Fabricate(:post, topic: topic_in_category),
+ created_at: 3.days.ago,
+ )
+ end
let!(:bookmark5) { Fabricate(:bookmark, created_at: 40.days.ago) }
it "gets the count of bookmarks grouped by date within the last 30 days by default" do
- expect(Bookmark.count_per_day).to eq({
- 1.day.ago.to_date => 1,
- 2.days.ago.to_date => 1,
- 3.days.ago.to_date => 2
- })
+ expect(Bookmark.count_per_day).to eq(
+ { 1.day.ago.to_date => 1, 2.days.ago.to_date => 1, 3.days.ago.to_date => 2 },
+ )
end
it "respects the start_date option" do
- expect(Bookmark.count_per_day(start_date: 1.day.ago - 1.hour)).to eq({
- 1.day.ago.to_date => 1,
- })
+ expect(Bookmark.count_per_day(start_date: 1.day.ago - 1.hour)).to eq(
+ { 1.day.ago.to_date => 1 },
+ )
end
it "respects the since_days_ago option" do
- expect(Bookmark.count_per_day(since_days_ago: 2)).to eq({
- 1.day.ago.to_date => 1,
- })
+ expect(Bookmark.count_per_day(since_days_ago: 2)).to eq({ 1.day.ago.to_date => 1 })
end
it "respects the end_date option" do
- expect(Bookmark.count_per_day(end_date: 2.days.ago)).to eq({
- 2.days.ago.to_date => 1,
- 3.days.ago.to_date => 2,
- })
+ expect(Bookmark.count_per_day(end_date: 2.days.ago)).to eq(
+ { 2.days.ago.to_date => 1, 3.days.ago.to_date => 2 },
+ )
end
it "respects the category_id option" do
- expect(Bookmark.count_per_day(category_id: category.id)).to eq({
- 3.days.ago.to_date => 1,
- })
+ expect(Bookmark.count_per_day(category_id: category.id)).to eq({ 3.days.ago.to_date => 1 })
end
it "does not include deleted posts or topics" do
diff --git a/spec/models/category_featured_topic_spec.rb b/spec/models/category_featured_topic_spec.rb
index 3d41bbd1c34..0ee721b1ba6 100644
--- a/spec/models/category_featured_topic_spec.rb
+++ b/spec/models/category_featured_topic_spec.rb
@@ -4,10 +4,17 @@ RSpec.describe CategoryFeaturedTopic do
it { is_expected.to belong_to :category }
it { is_expected.to belong_to :topic }
- describe '.feature_topics_for' do
- fab!(:user) { Fabricate(:user) }
- fab!(:category) { Fabricate(:category) }
- let!(:category_post) { PostCreator.create(user, raw: "I put this post in the category", title: "categorize THIS", category: category.id) }
+ describe ".feature_topics_for" do
+ fab!(:user) { Fabricate(:user) }
+ fab!(:category) { Fabricate(:category) }
+ let!(:category_post) do
+ PostCreator.create(
+ user,
+ raw: "I put this post in the category",
+ title: "categorize THIS",
+ category: category.id,
+ )
+ end
it "works in batched mode" do
category2 = Fabricate(:category)
@@ -16,7 +23,7 @@ RSpec.describe CategoryFeaturedTopic do
CategoryFeaturedTopic.destroy_all
CategoryFeaturedTopic.clear_batch!
- size = Category.order(:id).where('id < ?', category.id).count + 1
+ size = Category.order(:id).where("id < ?", category.id).count + 1
CategoryFeaturedTopic.feature_topics(batched: true, batch_size: size)
@@ -29,43 +36,53 @@ RSpec.describe CategoryFeaturedTopic do
end
it "should feature topics for a secure category" do
-
# so much dancing, I am thinking fixures make sense here.
user.change_trust_level!(TrustLevel[1])
category.set_permissions(trust_level_1: :full)
category.save
- _uncategorized_post = PostCreator.create(user, raw: "this is my new post 123 post", title: "hello world")
+ _uncategorized_post =
+ PostCreator.create(user, raw: "this is my new post 123 post", title: "hello world")
CategoryFeaturedTopic.feature_topics_for(category)
expect(CategoryFeaturedTopic.count).to be(1)
-
- end
-
- it 'should not include invisible topics' do
- invisible_post = PostCreator.create(user, raw: "Don't look at this post because it's awful.", title: "not visible to anyone", category: category.id)
- invisible_post.topic.update_status('visible', false, Fabricate(:admin))
- CategoryFeaturedTopic.feature_topics_for(category)
- expect(CategoryFeaturedTopic.count).to be(1)
end
- it 'should feature stuff in the correct order' do
+ it "should not include invisible topics" do
+ invisible_post =
+ PostCreator.create(
+ user,
+ raw: "Don't look at this post because it's awful.",
+ title: "not visible to anyone",
+ category: category.id,
+ )
+ invisible_post.topic.update_status("visible", false, Fabricate(:admin))
+ CategoryFeaturedTopic.feature_topics_for(category)
+ expect(CategoryFeaturedTopic.count).to be(1)
+ end
+
+ it "should feature stuff in the correct order" do
category = Fabricate(:category, num_featured_topics: 2)
_t5 = Fabricate(:topic, category_id: category.id, bumped_at: 12.minutes.ago)
t4 = Fabricate(:topic, category_id: category.id, bumped_at: 10.minutes.ago)
t3 = Fabricate(:topic, category_id: category.id, bumped_at: 7.minutes.ago)
t2 = Fabricate(:topic, category_id: category.id, bumped_at: 4.minutes.ago)
t1 = Fabricate(:topic, category_id: category.id, bumped_at: 5.minutes.ago)
- pinned = Fabricate(:topic, category_id: category.id, pinned_at: 10.minutes.ago, bumped_at: 10.minutes.ago)
+ pinned =
+ Fabricate(
+ :topic,
+ category_id: category.id,
+ pinned_at: 10.minutes.ago,
+ bumped_at: 10.minutes.ago,
+ )
CategoryFeaturedTopic.feature_topics_for(category)
# Should find more than we need: pinned topics first, then num_featured_topics * 2
expect(
- CategoryFeaturedTopic.where(category_id: category.id).order('rank asc').pluck(:topic_id)
+ CategoryFeaturedTopic.where(category_id: category.id).order("rank asc").pluck(:topic_id),
).to eq([pinned.id, t2.id, t1.id, t3.id, t4.id])
-
end
end
end
diff --git a/spec/models/category_group_spec.rb b/spec/models/category_group_spec.rb
index 723ac6f098c..aec4466085b 100644
--- a/spec/models/category_group_spec.rb
+++ b/spec/models/category_group_spec.rb
@@ -1,11 +1,9 @@
# frozen_string_literal: true
RSpec.describe CategoryGroup do
- describe '#permission_types' do
+ describe "#permission_types" do
context "when verifying enum sequence" do
- before do
- @permission_types = CategoryGroup.permission_types
- end
+ before { @permission_types = CategoryGroup.permission_types }
it "'full' should be at 1st position" do
expect(@permission_types[:full]).to eq(1)
diff --git a/spec/models/category_list_spec.rb b/spec/models/category_list_spec.rb
index 73475088249..e712d1ea378 100644
--- a/spec/models/category_list_spec.rb
+++ b/spec/models/category_list_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-require 'category_list'
+require "category_list"
RSpec.describe CategoryList do
before do
@@ -45,14 +45,52 @@ RSpec.describe CategoryList do
CategoryFeaturedTopic.feature_topics
- expect(CategoryList.new(Guardian.new(admin), include_topics: true).categories.find { |x| x.name == public_cat.name }.displayable_topics.count).to eq(3)
- expect(CategoryList.new(Guardian.new(admin), include_topics: true).categories.find { |x| x.name == private_cat.name }.displayable_topics.count).to eq(1)
+ expect(
+ CategoryList
+ .new(Guardian.new(admin), include_topics: true)
+ .categories
+ .find { |x| x.name == public_cat.name }
+ .displayable_topics
+ .count,
+ ).to eq(3)
+ expect(
+ CategoryList
+ .new(Guardian.new(admin), include_topics: true)
+ .categories
+ .find { |x| x.name == private_cat.name }
+ .displayable_topics
+ .count,
+ ).to eq(1)
- expect(CategoryList.new(Guardian.new(user), include_topics: true).categories.find { |x| x.name == public_cat.name }.displayable_topics.count).to eq(2)
- expect(CategoryList.new(Guardian.new(user), include_topics: true).categories.find { |x| x.name == private_cat.name }).to eq(nil)
+ expect(
+ CategoryList
+ .new(Guardian.new(user), include_topics: true)
+ .categories
+ .find { |x| x.name == public_cat.name }
+ .displayable_topics
+ .count,
+ ).to eq(2)
+ expect(
+ CategoryList
+ .new(Guardian.new(user), include_topics: true)
+ .categories
+ .find { |x| x.name == private_cat.name },
+ ).to eq(nil)
- expect(CategoryList.new(Guardian.new(nil), include_topics: true).categories.find { |x| x.name == public_cat.name }.displayable_topics.count).to eq(1)
- expect(CategoryList.new(Guardian.new(nil), include_topics: true).categories.find { |x| x.name == private_cat.name }).to eq(nil)
+ expect(
+ CategoryList
+ .new(Guardian.new(nil), include_topics: true)
+ .categories
+ .find { |x| x.name == public_cat.name }
+ .displayable_topics
+ .count,
+ ).to eq(1)
+ expect(
+ CategoryList
+ .new(Guardian.new(nil), include_topics: true)
+ .categories
+ .find { |x| x.name == private_cat.name },
+ ).to eq(nil)
end
it "doesn't show muted topics" do
@@ -61,31 +99,52 @@ RSpec.describe CategoryList do
CategoryFeaturedTopic.feature_topics
- expect(CategoryList.new(Guardian.new(user), include_topics: true).categories.find { |x| x.name == cat.name }.displayable_topics.count).to eq(1)
+ expect(
+ CategoryList
+ .new(Guardian.new(user), include_topics: true)
+ .categories
+ .find { |x| x.name == cat.name }
+ .displayable_topics
+ .count,
+ ).to eq(1)
TopicUser.change(user.id, topic.id, notification_level: TopicUser.notification_levels[:muted])
- expect(CategoryList.new(Guardian.new(user), include_topics: true).categories.find { |x| x.name == cat.name }.displayable_topics.count).to eq(0)
+ expect(
+ CategoryList
+ .new(Guardian.new(user), include_topics: true)
+ .categories
+ .find { |x| x.name == cat.name }
+ .displayable_topics
+ .count,
+ ).to eq(0)
end
-
end
context "when mute_all_categories_by_default enabled" do
fab!(:category) { Fabricate(:category) }
- before do
- SiteSetting.mute_all_categories_by_default = true
- end
+ before { SiteSetting.mute_all_categories_by_default = true }
it "returns correct notification level for user tracking category" do
- CategoryUser.set_notification_level_for_category(user, NotificationLevels.all[:tracking], category.id)
- notification_level = category_list.categories.find { |c| c.id == category.id }.notification_level
+ CategoryUser.set_notification_level_for_category(
+ user,
+ NotificationLevels.all[:tracking],
+ category.id,
+ )
+ notification_level =
+ category_list.categories.find { |c| c.id == category.id }.notification_level
expect(notification_level).to eq(CategoryUser.notification_levels[:tracking])
end
it "returns correct notification level in default categories for anonymous" do
SiteSetting.default_categories_watching = category.id.to_s
- notification_level = CategoryList.new(Guardian.new).categories.find { |c| c.id == category.id }.notification_level
+ notification_level =
+ CategoryList
+ .new(Guardian.new)
+ .categories
+ .find { |c| c.id == category.id }
+ .notification_level
expect(notification_level).to eq(CategoryUser.notification_levels[:regular])
end
end
@@ -108,7 +167,14 @@ RSpec.describe CategoryList do
let!(:topic1) { Fabricate(:topic, category: topic_category, bumped_at: 8.minutes.ago) }
let!(:topic2) { Fabricate(:topic, category: topic_category, bumped_at: 5.minutes.ago) }
let!(:topic3) { Fabricate(:topic, category: topic_category, bumped_at: 2.minutes.ago) }
- let!(:pinned) { Fabricate(:topic, category: topic_category, pinned_at: 10.minutes.ago, bumped_at: 10.minutes.ago) }
+ let!(:pinned) do
+ Fabricate(
+ :topic,
+ category: topic_category,
+ pinned_at: 10.minutes.ago,
+ bumped_at: 10.minutes.ago,
+ )
+ end
let!(:dismissed_topic_user) { Fabricate(:dismissed_topic_user, topic: topic2, user: user) }
def displayable_topics
@@ -135,7 +201,11 @@ RSpec.describe CategoryList do
end
it "returns the users notification level" do
- CategoryUser.set_notification_level_for_category(user, NotificationLevels.all[:watching], topic_category.id)
+ CategoryUser.set_notification_level_for_category(
+ user,
+ NotificationLevels.all[:watching],
+ topic_category.id,
+ )
category_list = CategoryList.new(Guardian.new(user))
category = category_list.categories.find { |c| c.id == topic_category.id }
@@ -151,11 +221,12 @@ RSpec.describe CategoryList do
end
end
- describe 'category order' do
+ describe "category order" do
def ordered_category_list(some_user)
categories = Category.secured(Guardian.new(some_user))
subcategories = categories.where.not(parent_category_id: nil).pluck(:id)
- CategoryList.order_categories(categories).pluck(:id) - subcategories.push(SiteSetting.uncategorized_category_id)
+ CategoryList.order_categories(categories).pluck(:id) -
+ subcategories.push(SiteSetting.uncategorized_category_id)
end
let(:category_ids_admin) { ordered_category_list(admin) }
@@ -167,10 +238,8 @@ RSpec.describe CategoryList do
uncategorized.save
end
- context 'when fixed_category_positions is enabled' do
- before do
- SiteSetting.fixed_category_positions = true
- end
+ context "when fixed_category_positions is enabled" do
+ before { SiteSetting.fixed_category_positions = true }
it "returns categories in specified order" do
cat1 = Fabricate(:category_with_definition, position: 1)
@@ -191,10 +260,8 @@ RSpec.describe CategoryList do
end
end
- context 'when fixed_category_positions is disabled' do
- before do
- SiteSetting.fixed_category_positions = false
- end
+ context "when fixed_category_positions is disabled" do
+ before { SiteSetting.fixed_category_positions = false }
it "returns categories in order of activity" do
cat1 = Fabricate(:category_with_definition, position: 0)
@@ -238,19 +305,25 @@ RSpec.describe CategoryList do
end
end
- context 'when some categories are muted' do
+ context "when some categories are muted" do
let!(:cat1) { Fabricate(:category_with_definition) }
let!(:muted_cat) { Fabricate(:category_with_definition) }
let!(:cat3) { Fabricate(:category_with_definition) }
before do
- CategoryUser.set_notification_level_for_category(user, NotificationLevels.all[:muted], muted_cat.id)
+ CategoryUser.set_notification_level_for_category(
+ user,
+ NotificationLevels.all[:muted],
+ muted_cat.id,
+ )
end
it "returns muted categories at the end of the list" do
category_list = CategoryList.new(Guardian.new user).categories.pluck(:id)
- expect(category_list).to eq([SiteSetting.uncategorized_category_id, cat1.id, cat3.id, muted_cat.id])
+ expect(category_list).to eq(
+ [SiteSetting.uncategorized_category_id, cat1.id, cat3.id, muted_cat.id],
+ )
end
end
end
diff --git a/spec/models/category_spec.rb b/spec/models/category_spec.rb
index da0cf3bb4a4..ecabfc50c68 100644
--- a/spec/models/category_spec.rb
+++ b/spec/models/category_spec.rb
@@ -7,12 +7,12 @@ RSpec.describe Category do
it { is_expected.to validate_presence_of :user_id }
it { is_expected.to validate_presence_of :name }
- it 'validates uniqueness of name' do
+ it "validates uniqueness of name" do
Fabricate(:category_with_definition)
is_expected.to validate_uniqueness_of(:name).scoped_to(:parent_category_id).case_insensitive
end
- it 'validates inclusion of search_priority' do
+ it "validates inclusion of search_priority" do
category = Fabricate.build(:category, user: user)
expect(category.valid?).to eq(true)
@@ -23,20 +23,23 @@ RSpec.describe Category do
expect(category.errors.to_hash.keys).to contain_exactly(:search_priority)
end
- it 'validates uniqueness in case insensitive way' do
+ it "validates uniqueness in case insensitive way" do
Fabricate(:category_with_definition, name: "Cats")
cats = Fabricate.build(:category, name: "cats")
expect(cats).to_not be_valid
expect(cats.errors[:name]).to be_present
end
- describe 'Associations' do
- it 'should delete associated sidebar_section_links when category is destroyed' do
+ describe "Associations" do
+ it "should delete associated sidebar_section_links when category is destroyed" do
category_sidebar_section_link = Fabricate(:category_sidebar_section_link)
- category_sidebar_section_link_2 = Fabricate(:category_sidebar_section_link, linkable: category_sidebar_section_link.linkable)
+ category_sidebar_section_link_2 =
+ Fabricate(:category_sidebar_section_link, linkable: category_sidebar_section_link.linkable)
tag_sidebar_section_link = Fabricate(:tag_sidebar_section_link)
- expect { category_sidebar_section_link.linkable.destroy! }.to change { SidebarSectionLink.count }.from(3).to(1)
+ expect { category_sidebar_section_link.linkable.destroy! }.to change {
+ SidebarSectionLink.count
+ }.from(3).to(1)
expect(SidebarSectionLink.first).to eq(tag_sidebar_section_link)
end
end
@@ -81,11 +84,14 @@ RSpec.describe Category do
it "will add the group to the reviewable even if created manually" do
SiteSetting.enable_category_group_moderation = true
- reviewable = ReviewableFlaggedPost.create!(
- created_by: user,
- payload: { raw: 'test raw' },
- category: category
- )
+ reviewable =
+ ReviewableFlaggedPost.create!(
+ created_by: user,
+ payload: {
+ raw: "test raw",
+ },
+ category: category,
+ )
expect(reviewable.reviewable_by_group_id).to eq(group.id)
end
@@ -149,10 +155,8 @@ RSpec.describe Category do
let(:admin_guardian) { Guardian.new(admin) }
let(:anon_guardian) { Guardian.new(nil) }
- context 'when disabling uncategorized' do
- before do
- SiteSetting.allow_uncategorized_topics = false
- end
+ context "when disabling uncategorized" do
+ before { SiteSetting.allow_uncategorized_topics = false }
it "allows everything to admins unconditionally" do
count = Category.count
@@ -163,7 +167,6 @@ RSpec.describe Category do
end
it "allows normal users correct access to all categories" do
-
# Sam: I am mixed here, once disabling uncategorized maybe users should no
# longer be allowed to know about it so all counts should go down?
expect(Category.secured(user_guardian).count).to eq(5)
@@ -204,7 +207,6 @@ RSpec.describe Category do
# anonymous has permission to create no topics
expect(Category.scoped_to_permissions(user_guardian, [:readonly]).count).to eq(3)
end
-
end
describe "security" do
@@ -244,7 +246,9 @@ RSpec.describe Category do
category_2.save!
expect(Category.secured).to match_array([uncategorized])
- expect(Category.secured(Guardian.new(user))).to match_array([uncategorized, category, category_2])
+ expect(Category.secured(Guardian.new(user))).to match_array(
+ [uncategorized, category, category_2],
+ )
end
end
@@ -277,21 +281,21 @@ RSpec.describe Category do
end
describe "short name" do
- fab!(:category) { Fabricate(:category_with_definition, name: 'xx') }
+ fab!(:category) { Fabricate(:category_with_definition, name: "xx") }
it "creates the category" do
expect(category).to be_present
end
- it 'has one topic' do
+ it "has one topic" do
expect(Topic.where(category_id: category.id).count).to eq(1)
end
end
- describe 'non-english characters' do
- context 'when using ascii slug generator' do
+ describe "non-english characters" do
+ context "when using ascii slug generator" do
before do
- SiteSetting.slug_generation_method = 'ascii'
+ SiteSetting.slug_generation_method = "ascii"
@category = Fabricate(:category_with_definition, name: "测试")
end
after { @category.destroy }
@@ -302,13 +306,13 @@ RSpec.describe Category do
end
end
- context 'when using none slug generator' do
+ context "when using none slug generator" do
before do
- SiteSetting.slug_generation_method = 'none'
+ SiteSetting.slug_generation_method = "none"
@category = Fabricate(:category_with_definition, name: "测试")
end
after do
- SiteSetting.slug_generation_method = 'ascii'
+ SiteSetting.slug_generation_method = "ascii"
@category.destroy
end
@@ -318,13 +322,13 @@ RSpec.describe Category do
end
end
- context 'when using encoded slug generator' do
+ context "when using encoded slug generator" do
before do
- SiteSetting.slug_generation_method = 'encoded'
+ SiteSetting.slug_generation_method = "encoded"
@category = Fabricate(:category_with_definition, name: "测试")
end
after do
- SiteSetting.slug_generation_method = 'ascii'
+ SiteSetting.slug_generation_method = "ascii"
@category.destroy
end
@@ -341,23 +345,23 @@ RSpec.describe Category do
end
end
- describe 'slug would be a number' do
+ describe "slug would be a number" do
let(:category) { Fabricate.build(:category, name: "2") }
- it 'creates a blank slug' do
+ it "creates a blank slug" do
expect(category.slug).to be_blank
expect(category.slug_for_url).to eq("#{category.id}-category")
end
end
- describe 'custom slug can be provided' do
- it 'can be sanitized' do
+ describe "custom slug can be provided" do
+ it "can be sanitized" do
@c = Fabricate(:category_with_definition, name: "Fun Cats", slug: "fun-cats")
@cat = Fabricate(:category_with_definition, name: "love cats", slug: "love-cats")
- @c.slug = ' invalid slug'
+ @c.slug = " invalid slug"
@c.save
- expect(@c.slug).to eq('invalid-slug')
+ expect(@c.slug).to eq("invalid-slug")
c = Fabricate.build(:category, name: "More Fun Cats", slug: "love-cats")
expect(c).not_to be_valid
@@ -372,12 +376,10 @@ RSpec.describe Category do
expect(@cat.errors[:slug]).not_to be_present
end
- context 'if SiteSettings.slug_generation_method = ascii' do
- before do
- SiteSetting.slug_generation_method = 'ascii'
- end
+ context "if SiteSettings.slug_generation_method = ascii" do
+ before { SiteSetting.slug_generation_method = "ascii" }
- it 'fails if slug contains non-ascii characters' do
+ it "fails if slug contains non-ascii characters" do
c = Fabricate.build(:category, name: "Sem acentuação", slug: "sem-acentuação")
expect(c).not_to be_valid
@@ -386,8 +388,8 @@ RSpec.describe Category do
end
end
- describe 'description_text' do
- it 'correctly generates text description as needed' do
+ describe "description_text" do
+ it "correctly generates text description as needed" do
c = Category.new
expect(c.description_text).to be_nil
c.description = "<hello test ."
@@ -395,14 +397,14 @@ RSpec.describe Category do
end
end
- describe 'after create' do
+ describe "after create" do
before do
- @category = Fabricate(:category_with_definition, name: 'Amazing Category')
+ @category = Fabricate(:category_with_definition, name: "Amazing Category")
@topic = @category.topic
end
- it 'is created correctly' do
- expect(@category.slug).to eq('amazing-category')
+ it "is created correctly" do
+ expect(@category.slug).to eq("amazing-category")
expect(@category.slug_for_url).to eq(@category.slug)
expect(@category.description).to be_blank
@@ -433,67 +435,73 @@ RSpec.describe Category do
end
it "cooks the definition" do
- category = Category.create(
- name: 'little-test',
- user_id: Discourse.system_user.id,
- description: "click the link [here](https://fakeurl.com)"
- )
+ category =
+ Category.create(
+ name: "little-test",
+ user_id: Discourse.system_user.id,
+ description: "click the link [here](https://fakeurl.com)",
+ )
expect(category.description.include?("[here]")).to eq(false)
expect(category.description).to eq(category.topic.first_post.cooked)
end
it "renames the definition when renamed" do
- @category.update(name: 'Troutfishing')
+ @category.update(name: "Troutfishing")
@topic.reload
expect(@topic.title).to match(/Troutfishing/)
expect(@topic.fancy_title).to match(/Troutfishing/)
end
it "doesn't raise an error if there is no definition topic to rename (uncategorized)" do
- expect { @category.update(name: 'Troutfishing', topic_id: nil) }.to_not raise_error
+ expect { @category.update(name: "Troutfishing", topic_id: nil) }.to_not raise_error
end
it "creates permalink when category slug is changed" do
- @category.update(slug: 'new-category')
+ @category.update(slug: "new-category")
expect(Permalink.count).to eq(1)
end
it "reuses existing permalink when category slug is changed" do
permalink = Permalink.create!(url: "c/#{@category.slug}/#{@category.id}", category_id: 42)
- expect { @category.update(slug: 'new-slug') }.to_not change { Permalink.count }
+ expect { @category.update(slug: "new-slug") }.to_not change { Permalink.count }
expect(permalink.reload.category_id).to eq(@category.id)
end
it "creates permalink when sub category slug is changed" do
- sub_category = Fabricate(:category_with_definition, slug: 'sub-category', parent_category_id: @category.id)
- sub_category.update(slug: 'new-sub-category')
+ sub_category =
+ Fabricate(:category_with_definition, slug: "sub-category", parent_category_id: @category.id)
+ sub_category.update(slug: "new-sub-category")
expect(Permalink.count).to eq(1)
end
it "deletes permalink when category slug is reused" do
Fabricate(:permalink, url: "/c/bikeshed-category")
- Fabricate(:category_with_definition, slug: 'bikeshed-category')
+ Fabricate(:category_with_definition, slug: "bikeshed-category")
expect(Permalink.count).to eq(0)
end
it "deletes permalink when sub category slug is reused" do
Fabricate(:permalink, url: "/c/main-category/sub-category")
- main_category = Fabricate(:category_with_definition, slug: 'main-category')
- Fabricate(:category_with_definition, slug: 'sub-category', parent_category_id: main_category.id)
+ main_category = Fabricate(:category_with_definition, slug: "main-category")
+ Fabricate(
+ :category_with_definition,
+ slug: "sub-category",
+ parent_category_id: main_category.id,
+ )
expect(Permalink.count).to eq(0)
end
it "correctly creates permalink when category slug is changed in subfolder install" do
- set_subfolder '/forum'
+ set_subfolder "/forum"
old_url = @category.url
- @category.update(slug: 'new-category')
+ @category.update(slug: "new-category")
permalink = Permalink.last
expect(permalink.url).to eq(old_url[1..-1])
end
it "should not set its description topic to auto-close" do
- category = Fabricate(:category_with_definition, name: 'Closing Topics', auto_close_hours: 1)
+ category = Fabricate(:category_with_definition, name: "Closing Topics", auto_close_hours: 1)
expect(category.topic.public_topic_timer).to eq(nil)
end
@@ -505,22 +513,27 @@ RSpec.describe Category do
end
it "doesn't have a blank slug if not at the same level" do
- parent = Fabricate(:category_with_definition, name: 'Other parent')
- category = Fabricate(:category_with_definition, name: "Amazing Categóry", parent_category_id: parent.id)
- expect(category.slug).to eq('amazing-category')
+ parent = Fabricate(:category_with_definition, name: "Other parent")
+ category =
+ Fabricate(
+ :category_with_definition,
+ name: "Amazing Categóry",
+ parent_category_id: parent.id,
+ )
+ expect(category.slug).to eq("amazing-category")
expect(category.slug_for_url).to eq("amazing-category")
end
end
describe "trying to change the category topic's category" do
before do
- @new_cat = Fabricate(:category_with_definition, name: '2nd Category', user: @category.user)
+ @new_cat = Fabricate(:category_with_definition, name: "2nd Category", user: @category.user)
@topic.change_category_to_id(@new_cat.id)
@topic.reload
@category.reload
end
- it 'does not cause changes' do
+ it "does not cause changes" do
expect(@category.topic_count).to eq(0)
expect(@topic.category).to eq(@category)
expect(@category.topic).to eq(@topic)
@@ -528,10 +541,10 @@ RSpec.describe Category do
end
end
- describe 'new' do
+ describe "new" do
subject { Fabricate.build(:category, user: Fabricate(:user)) }
- it 'triggers a extensibility event' do
+ it "triggers a extensibility event" do
event = DiscourseEvent.track_events { subject.save! }.last
expect(event[:event_name]).to eq(:category_created)
@@ -549,7 +562,7 @@ RSpec.describe Category do
end
end
- describe 'destroy' do
+ describe "destroy" do
before do
@category = Fabricate(:category_with_definition)
@category_id = @category.id
@@ -557,14 +570,14 @@ RSpec.describe Category do
SiteSetting.shared_drafts_category = @category.id.to_s
end
- it 'is deleted correctly' do
+ it "is deleted correctly" do
@category.destroy
expect(Category.exists?(id: @category_id)).to be false
expect(Topic.with_deleted.where.not(deleted_at: nil).exists?(id: @topic_id)).to be true
expect(SiteSetting.shared_drafts_category).to be_blank
end
- it 'triggers a extensibility event' do
+ it "triggers a extensibility event" do
event = DiscourseEvent.track(:category_destroyed) { @category.destroy }
expect(event[:event_name]).to eq(:category_destroyed)
@@ -572,8 +585,8 @@ RSpec.describe Category do
end
end
- describe 'latest' do
- it 'should be updated correctly' do
+ describe "latest" do
+ it "should be updated correctly" do
category = freeze_time(1.minute.ago) { Fabricate(:category_with_definition) }
post = create_post(category: category.id, created_at: 15.seconds.ago)
@@ -598,19 +611,17 @@ RSpec.describe Category do
end
end
- describe 'update_stats' do
- before do
- @category = Fabricate(:category_with_definition)
- end
+ describe "update_stats" do
+ before { @category = Fabricate(:category_with_definition) }
- context 'with regular topics' do
+ context "with regular topics" do
before do
create_post(user: @category.user, category: @category.id)
Category.update_stats
@category.reload
end
- it 'updates topic stats' do
+ it "updates topic stats" do
expect(@category.topics_week).to eq(1)
expect(@category.topics_month).to eq(1)
expect(@category.topics_year).to eq(1)
@@ -620,18 +631,16 @@ RSpec.describe Category do
expect(@category.posts_month).to eq(1)
expect(@category.posts_week).to eq(1)
end
-
end
- context 'with deleted topics' do
+ context "with deleted topics" do
before do
- @category.topics << Fabricate(:deleted_topic,
- user: @category.user)
+ @category.topics << Fabricate(:deleted_topic, user: @category.user)
Category.update_stats
@category.reload
end
- it 'does not count deleted topics' do
+ it "does not count deleted topics" do
expect(@category.topics_week).to eq(0)
expect(@category.topic_count).to eq(0)
expect(@category.topics_month).to eq(0)
@@ -643,12 +652,12 @@ RSpec.describe Category do
end
end
- context 'with revised post' do
+ context "with revised post" do
before do
post = create_post(user: @category.user, category: @category.id)
SiteSetting.editing_grace_period = 1.minute
- post.revise(post.user, { raw: 'updated body' }, revised_at: post.updated_at + 2.minutes)
+ post.revise(post.user, { raw: "updated body" }, revised_at: post.updated_at + 2.minutes)
Category.update_stats
@category.reload
@@ -662,7 +671,7 @@ RSpec.describe Category do
end
end
- context 'for uncategorized category' do
+ context "for uncategorized category" do
before do
@uncategorized = Category.find(SiteSetting.uncategorized_category_id)
create_post(user: Fabricate(:user), category: @uncategorized.id)
@@ -670,7 +679,7 @@ RSpec.describe Category do
@uncategorized.reload
end
- it 'updates topic stats' do
+ it "updates topic stats" do
expect(@uncategorized.topics_week).to eq(1)
expect(@uncategorized.topics_month).to eq(1)
expect(@uncategorized.topics_year).to eq(1)
@@ -682,10 +691,10 @@ RSpec.describe Category do
end
end
- context 'when there are no topics left' do
+ context "when there are no topics left" do
let!(:topic) { create_post(user: @category.user, category: @category.id).reload.topic }
- it 'can update the topic count to zero' do
+ it "can update the topic count to zero" do
@category.reload
expect(@category.topic_count).to eq(1)
expect(@category.topics.count).to eq(2)
@@ -700,26 +709,14 @@ RSpec.describe Category do
end
describe "#url" do
- before_all do
- SiteSetting.max_category_nesting = 3
- end
+ before_all { SiteSetting.max_category_nesting = 3 }
fab!(:category) { Fabricate(:category, name: "root") }
- fab!(:sub_category) do
- Fabricate(
- :category,
- name: "child",
- parent_category_id: category.id,
- )
- end
+ fab!(:sub_category) { Fabricate(:category, name: "child", parent_category_id: category.id) }
fab!(:sub_sub_category) do
- Fabricate(
- :category,
- name: "child_of_child",
- parent_category_id: sub_category.id,
- )
+ Fabricate(:category, name: "child_of_child", parent_category_id: sub_category.id)
end
describe "for normal categories" do
@@ -736,8 +733,7 @@ RSpec.describe Category do
describe "for sub-sub-categories" do
it "builds a url" do
- expect(sub_sub_category.url)
- .to eq("/c/root/child/child-of-child/#{sub_sub_category.id}")
+ expect(sub_sub_category.url).to eq("/c/root/child/child-of-child/#{sub_sub_category.id}")
end
end
end
@@ -772,8 +768,10 @@ RSpec.describe Category do
end
it "cannot have a category two levels deep" do
- sub_category = Fabricate(:category_with_definition, parent_category_id: parent_category.id, user: user)
- nested_sub_category = Fabricate.build(:category, parent_category_id: sub_category.id, user: user)
+ sub_category =
+ Fabricate(:category_with_definition, parent_category_id: parent_category.id, user: user)
+ nested_sub_category =
+ Fabricate.build(:category, parent_category_id: sub_category.id, user: user)
expect(nested_sub_category).to_not be_valid
end
@@ -786,57 +784,60 @@ RSpec.describe Category do
describe ".query_category" do
it "should return the category" do
- category = Fabricate(:category_with_definition, name: "Amazing Category", parent_category_id: parent_category.id, user: user)
+ category =
+ Fabricate(
+ :category_with_definition,
+ name: "Amazing Category",
+ parent_category_id: parent_category.id,
+ user: user,
+ )
parent_category.name = "Amazing Parent Category"
expect(category).to eq(Category.query_category(category.slug, parent_category.id))
end
end
-
end
describe "find_by_email" do
it "is case insensitive" do
- c1 = Fabricate(:category_with_definition, email_in: 'lower@example.com')
- c2 = Fabricate(:category_with_definition, email_in: 'UPPER@EXAMPLE.COM')
- c3 = Fabricate(:category_with_definition, email_in: 'Mixed.Case@Example.COM')
- expect(Category.find_by_email('LOWER@EXAMPLE.COM')).to eq(c1)
- expect(Category.find_by_email('upper@example.com')).to eq(c2)
- expect(Category.find_by_email('mixed.case@example.com')).to eq(c3)
- expect(Category.find_by_email('MIXED.CASE@EXAMPLE.COM')).to eq(c3)
+ c1 = Fabricate(:category_with_definition, email_in: "lower@example.com")
+ c2 = Fabricate(:category_with_definition, email_in: "UPPER@EXAMPLE.COM")
+ c3 = Fabricate(:category_with_definition, email_in: "Mixed.Case@Example.COM")
+ expect(Category.find_by_email("LOWER@EXAMPLE.COM")).to eq(c1)
+ expect(Category.find_by_email("upper@example.com")).to eq(c2)
+ expect(Category.find_by_email("mixed.case@example.com")).to eq(c3)
+ expect(Category.find_by_email("MIXED.CASE@EXAMPLE.COM")).to eq(c3)
end
end
describe "find_by_slug" do
- fab!(:category) do
- Fabricate(:category_with_definition, slug: 'awesome-category')
- end
+ fab!(:category) { Fabricate(:category_with_definition, slug: "awesome-category") }
fab!(:subcategory) do
Fabricate(
:category_with_definition,
parent_category_id: category.id,
- slug: 'awesome-sub-category'
+ slug: "awesome-sub-category",
)
end
it "finds a category that exists" do
- expect(Category.find_by_slug('awesome-category')).to eq(category)
+ expect(Category.find_by_slug("awesome-category")).to eq(category)
end
it "finds a subcategory that exists" do
- expect(Category.find_by_slug('awesome-sub-category', 'awesome-category')).to eq(subcategory)
+ expect(Category.find_by_slug("awesome-sub-category", "awesome-category")).to eq(subcategory)
end
it "produces nil if the parent doesn't exist" do
- expect(Category.find_by_slug('awesome-sub-category', 'no-such-category')).to eq(nil)
+ expect(Category.find_by_slug("awesome-sub-category", "no-such-category")).to eq(nil)
end
it "produces nil if the parent doesn't exist and the requested category is a root category" do
- expect(Category.find_by_slug('awesome-category', 'no-such-category')).to eq(nil)
+ expect(Category.find_by_slug("awesome-category", "no-such-category")).to eq(nil)
end
it "produces nil if the subcategory doesn't exist" do
- expect(Category.find_by_slug('no-such-category', 'awesome-category')).to eq(nil)
+ expect(Category.find_by_slug("no-such-category", "awesome-category")).to eq(nil)
end
end
@@ -844,40 +845,48 @@ RSpec.describe Category do
fab!(:user) { Fabricate(:user) }
it "works with a valid email" do
- expect(Category.new(name: 'test', user: user, email_in: 'test@example.com').valid?).to eq(true)
+ expect(Category.new(name: "test", user: user, email_in: "test@example.com").valid?).to eq(
+ true,
+ )
end
it "adds an error with an invalid email" do
- category = Category.new(name: 'test', user: user, email_in: 'test ')
+ category = Category.new(name: "test", user: user, email_in: "test ")
expect(category.valid?).to eq(false)
expect(category.errors.full_messages.join).not_to match(//)
end
context "with a duplicate email in a group" do
- fab!(:group) { Fabricate(:group, name: 'testgroup', incoming_email: 'test@example.com') }
+ fab!(:group) { Fabricate(:group, name: "testgroup", incoming_email: "test@example.com") }
it "adds an error with an invalid email" do
- category = Category.new(name: 'test', user: user, email_in: group.incoming_email)
+ category = Category.new(name: "test", user: user, email_in: group.incoming_email)
expect(category.valid?).to eq(false)
end
end
context "with duplicate email in a category" do
- fab!(:category) { Fabricate(:category_with_definition, user: user, name: 'cool ', email_in: 'test@example.com') }
+ fab!(:category) do
+ Fabricate(
+ :category_with_definition,
+ user: user,
+ name: "cool ",
+ email_in: "test@example.com",
+ )
+ end
it "adds an error with an invalid email" do
- category = Category.new(name: 'test', user: user, email_in: "test@example.com")
+ category = Category.new(name: "test", user: user, email_in: "test@example.com")
expect(category.valid?).to eq(false)
expect(category.errors.full_messages.join).not_to match(//)
end
end
-
end
- describe 'require topic/post approval' do
+ describe "require topic/post approval" do
fab!(:category) { Fabricate(:category_with_definition) }
- describe '#require_topic_approval?' do
+ describe "#require_topic_approval?" do
before do
category.custom_fields[Category::REQUIRE_TOPIC_APPROVAL] = true
category.save
@@ -886,7 +895,7 @@ RSpec.describe Category do
it { expect(category.reload.require_topic_approval?).to eq(true) }
end
- describe '#require_reply_approval?' do
+ describe "#require_reply_approval?" do
before do
category.custom_fields[Category::REQUIRE_REPLY_APPROVAL] = true
category.save
@@ -896,8 +905,8 @@ RSpec.describe Category do
end
end
- describe 'auto bump' do
- it 'should correctly automatically bump topics' do
+ describe "auto bump" do
+ it "should correctly automatically bump topics" do
freeze_time
category = Fabricate(:category_with_definition, created_at: 1.minute.ago)
category.clear_auto_bump_cache!
@@ -942,7 +951,7 @@ RSpec.describe Category do
expect(Category.auto_bump_topic!).to eq(false)
end
- it 'should not automatically bump topics with a bump scheduled' do
+ it "should not automatically bump topics with a bump scheduled" do
freeze_time
category = Fabricate(:category_with_definition, created_at: 1.second.ago)
category.clear_auto_bump_cache!
@@ -966,10 +975,12 @@ RSpec.describe Category do
user_id: -1,
topic: topic,
execute_at: 1.hour.from_now,
- status_type: TopicTimer.types[:bump]
+ status_type: TopicTimer.types[:bump],
)
- expect(Topic.joins(:topic_timers).where(topic_timers: { status_type: 6, deleted_at: nil }).count).to eq(1)
+ expect(
+ Topic.joins(:topic_timers).where(topic_timers: { status_type: 6, deleted_at: nil }).count,
+ ).to eq(1)
expect(category.auto_bump_topic!).to eq(false)
expect(Topic.where(bumped_at: time).count).to eq(0)
@@ -983,7 +994,9 @@ RSpec.describe Category do
fab!(:group) { Fabricate(:group) }
fab!(:group2) { Fabricate(:group) }
fab!(:parent_category) { Fabricate(:category_with_definition, name: "parent") }
- fab!(:subcategory) { Fabricate(:category_with_definition, name: "child1", parent_category_id: parent_category.id) }
+ fab!(:subcategory) do
+ Fabricate(:category_with_definition, name: "child1", parent_category_id: parent_category.id)
+ end
context "when changing subcategory permissions" do
it "it is not valid if permissions are less restrictive" do
@@ -996,7 +1009,9 @@ RSpec.describe Category do
subcategory.set_permissions(group => :full, group2 => :readonly)
expect(subcategory.valid?).to eq(false)
- expect(subcategory.errors.full_messages).to contain_exactly(I18n.t("category.errors.permission_conflict", group_names: group2.name))
+ expect(subcategory.errors.full_messages).to contain_exactly(
+ I18n.t("category.errors.permission_conflict", group_names: group2.name),
+ )
end
it "is valid if permissions are same or more restrictive" do
@@ -1022,7 +1037,9 @@ RSpec.describe Category do
end
context "when changing parent category permissions" do
- fab!(:subcategory2) { Fabricate(:category_with_definition, name: "child2", parent_category_id: parent_category.id) }
+ fab!(:subcategory2) do
+ Fabricate(:category_with_definition, name: "child2", parent_category_id: parent_category.id)
+ end
it "is not valid if subcategory permissions are less restrictive" do
subcategory.set_permissions(group => :create_post)
@@ -1033,7 +1050,9 @@ RSpec.describe Category do
parent_category.set_permissions(group => :readonly)
expect(parent_category.valid?).to eq(false)
- expect(parent_category.errors.full_messages).to contain_exactly(I18n.t("category.errors.permission_conflict", group_names: group2.name))
+ expect(parent_category.errors.full_messages).to contain_exactly(
+ I18n.t("category.errors.permission_conflict", group_names: group2.name),
+ )
end
it "is not valid if the subcategory has no category groups, but the parent does" do
@@ -1051,7 +1070,6 @@ RSpec.describe Category do
parent_category.set_permissions(group => :full, group2 => :create_post)
expect(parent_category.valid?).to eq(true)
-
end
it "is valid if everyone has access to parent category" do
@@ -1065,29 +1083,16 @@ RSpec.describe Category do
end
describe "tree metrics" do
- fab!(:category) do
- Category.create!(
- user: user,
- name: "foo"
- )
- end
+ fab!(:category) { Category.create!(user: user, name: "foo") }
- fab!(:subcategory) do
- Category.create!(
- user: user,
- name: "bar",
- parent_category: category
- )
- end
+ fab!(:subcategory) { Category.create!(user: user, name: "bar", parent_category: category) }
context "with a self-parent" do
- before_all do
- DB.exec(<<-SQL, id: category.id)
+ before_all { DB.exec(<<-SQL, id: category.id) }
UPDATE categories
SET parent_category_id = :id
WHERE id = :id
SQL
- end
describe "#depth_of_descendants" do
it "should produce max_depth" do
@@ -1103,9 +1108,7 @@ RSpec.describe Category do
end
context "with a prospective self-parent" do
- before do
- category.parent_category_id = category.id
- end
+ before { category.parent_category_id = category.id }
describe "#depth_of_descendants" do
it "should produce max_depth" do
@@ -1121,9 +1124,7 @@ RSpec.describe Category do
end
context "with a prospective loop" do
- before do
- category.parent_category_id = subcategory.id
- end
+ before { category.parent_category_id = subcategory.id }
describe "#depth_of_descendants" do
it "should produce max_depth" do
@@ -1163,9 +1164,7 @@ RSpec.describe Category do
it "does not publish notification level when publishing to /categories" do
category = Fabricate(:category)
category.name = "Amazing category"
- messages = MessageBus.track_publish("/categories") do
- category.save!
- end
+ messages = MessageBus.track_publish("/categories") { category.save! }
expect(messages.length).to eq(1)
message = messages.first
@@ -1179,7 +1178,6 @@ RSpec.describe Category do
describe "#ensure_consistency!" do
it "creates category topic" do
-
# corrupt a category topic
uncategorized = Category.find(SiteSetting.uncategorized_category_id)
uncategorized.create_category_definition
@@ -1211,86 +1209,90 @@ RSpec.describe Category do
end
describe "#find_by_slug_path" do
- it 'works for categories with slugs' do
- category = Fabricate(:category, slug: 'cat1')
+ it "works for categories with slugs" do
+ category = Fabricate(:category, slug: "cat1")
- expect(Category.find_by_slug_path(['cat1'])).to eq(category)
+ expect(Category.find_by_slug_path(["cat1"])).to eq(category)
end
- it 'works for categories without slugs' do
- SiteSetting.slug_generation_method = 'none'
+ it "works for categories without slugs" do
+ SiteSetting.slug_generation_method = "none"
- category = Fabricate(:category, slug: 'cat1')
+ category = Fabricate(:category, slug: "cat1")
expect(Category.find_by_slug_path(["#{category.id}-category"])).to eq(category)
end
- it 'works for subcategories with slugs' do
- category = Fabricate(:category, slug: 'cat1')
- subcategory = Fabricate(:category, slug: 'cat2', parent_category: category)
+ it "works for subcategories with slugs" do
+ category = Fabricate(:category, slug: "cat1")
+ subcategory = Fabricate(:category, slug: "cat2", parent_category: category)
- expect(Category.find_by_slug_path(['cat1', 'cat2'])).to eq(subcategory)
+ expect(Category.find_by_slug_path(%w[cat1 cat2])).to eq(subcategory)
end
- it 'works for subcategories without slugs' do
- SiteSetting.slug_generation_method = 'none'
+ it "works for subcategories without slugs" do
+ SiteSetting.slug_generation_method = "none"
- category = Fabricate(:category, slug: 'cat1')
- subcategory = Fabricate(:category, slug: 'cat2', parent_category: category)
+ category = Fabricate(:category, slug: "cat1")
+ subcategory = Fabricate(:category, slug: "cat2", parent_category: category)
- expect(Category.find_by_slug_path(['cat1', "#{subcategory.id}-category"])).to eq(subcategory)
- expect(Category.find_by_slug_path(["#{category.id}-category", "#{subcategory.id}-category"])).to eq(subcategory)
+ expect(Category.find_by_slug_path(["cat1", "#{subcategory.id}-category"])).to eq(subcategory)
+ expect(
+ Category.find_by_slug_path(["#{category.id}-category", "#{subcategory.id}-category"]),
+ ).to eq(subcategory)
end
end
- describe '#cannot_delete_reason' do
+ describe "#cannot_delete_reason" do
fab!(:admin) { Fabricate(:admin) }
let(:guardian) { Guardian.new(admin) }
fab!(:category) { Fabricate(:category) }
- describe 'when category is uncategorized' do
- it 'should return the reason' do
+ describe "when category is uncategorized" do
+ it "should return the reason" do
category = Category.find(SiteSetting.uncategorized_category_id)
- expect(category.cannot_delete_reason).to eq(
- I18n.t('category.cannot_delete.uncategorized')
- )
+ expect(category.cannot_delete_reason).to eq(I18n.t("category.cannot_delete.uncategorized"))
end
end
- describe 'when category has subcategories' do
- it 'should return the right reason' do
+ describe "when category has subcategories" do
+ it "should return the right reason" do
category.subcategories << Fabricate(:category)
expect(category.cannot_delete_reason).to eq(
- I18n.t('category.cannot_delete.has_subcategories')
+ I18n.t("category.cannot_delete.has_subcategories"),
)
end
end
- describe 'when category has topics' do
- it 'should return the right reason' do
- topic = Fabricate(:topic,
- title: '',
- category: category
- )
+ describe "when category has topics" do
+ it "should return the right reason" do
+ topic =
+ Fabricate(
+ :topic,
+ title: " ",
+ category: category,
+ )
category.reload
expect(category.cannot_delete_reason).to eq(
- I18n.t('category.cannot_delete.topic_exists',
+ I18n.t(
+ "category.cannot_delete.topic_exists",
count: 1,
- topic_link: " </a><script>alert(document.cookie);</script><a> "
- )
+ topic_link:
+ "</a><script>alert(document.cookie);</script><a> ",
+ ),
)
end
end
end
- describe '#deleting the general category' do
+ describe "#deleting the general category" do
fab!(:category) { Fabricate(:category) }
- it 'should empty out the general_category_id site_setting' do
+ it "should empty out the general_category_id site_setting" do
SiteSetting.general_category_id = category.id
category.destroy
diff --git a/spec/models/category_user_spec.rb b/spec/models/category_user_spec.rb
index 5e0a7b9e579..e3771884551 100644
--- a/spec/models/category_user_spec.rb
+++ b/spec/models/category_user_spec.rb
@@ -12,13 +12,13 @@ RSpec.describe CategoryUser do
CategoryUser.notification_levels[:regular]
end
- describe '#batch_set' do
+ describe "#batch_set" do
fab!(:category) { Fabricate(:category) }
def category_ids_at_level(level)
CategoryUser.where(
user_id: user.id,
- notification_level: CategoryUser.notification_levels[level]
+ notification_level: CategoryUser.notification_levels[level],
).pluck(:category_id)
end
@@ -32,7 +32,7 @@ RSpec.describe CategoryUser do
CategoryUser.create!(
user_id: user.id,
category_id: category.id,
- notification_level: CategoryUser.notification_levels[:muted]
+ notification_level: CategoryUser.notification_levels[:muted],
)
CategoryUser.batch_set(user, :watching, [category.id])
@@ -45,7 +45,7 @@ RSpec.describe CategoryUser do
CategoryUser.create!(
user_id: user.id,
category_id: category.id,
- notification_level: CategoryUser.notification_levels[:watching]
+ notification_level: CategoryUser.notification_levels[:watching],
)
CategoryUser.batch_set(user, :watching, [])
@@ -64,56 +64,84 @@ RSpec.describe CategoryUser do
end
end
- it 'should correctly auto_track' do
+ it "should correctly auto_track" do
tracking_user = Fabricate(:user)
topic = Fabricate(:post).topic
TopicUser.change(user.id, topic.id, total_msecs_viewed: 10)
TopicUser.change(tracking_user.id, topic.id, total_msecs_viewed: 10)
- CategoryUser.create!(user: tracking_user, category: topic.category, notification_level: tracking)
+ CategoryUser.create!(
+ user: tracking_user,
+ category: topic.category,
+ notification_level: tracking,
+ )
CategoryUser.auto_track(user_id: tracking_user.id)
expect(TopicUser.get(topic, tracking_user).notification_level).to eq(tracking)
expect(TopicUser.get(topic, user).notification_level).to eq(regular)
end
- it 'allows updating notification level' do
+ it "allows updating notification level" do
category = Fabricate(:category)
- CategoryUser.set_notification_level_for_category(user,
- NotificationLevels.all[:watching_first_post],
- category.id)
+ CategoryUser.set_notification_level_for_category(
+ user,
+ NotificationLevels.all[:watching_first_post],
+ category.id,
+ )
- expect(CategoryUser.where(user_id: user.id,
- category_id: category.id,
- notification_level: NotificationLevels.all[:watching_first_post]).exists?).to eq(true)
+ expect(
+ CategoryUser.where(
+ user_id: user.id,
+ category_id: category.id,
+ notification_level: NotificationLevels.all[:watching_first_post],
+ ).exists?,
+ ).to eq(true)
- CategoryUser.set_notification_level_for_category(user,
- NotificationLevels.all[:regular],
- category.id)
+ CategoryUser.set_notification_level_for_category(
+ user,
+ NotificationLevels.all[:regular],
+ category.id,
+ )
- expect(CategoryUser.where(user_id: user.id,
- category_id: category.id,
- notification_level: NotificationLevels.all[:regular]).exists?).to eq(true)
+ expect(
+ CategoryUser.where(
+ user_id: user.id,
+ category_id: category.id,
+ notification_level: NotificationLevels.all[:regular],
+ ).exists?,
+ ).to eq(true)
end
- describe 'integration' do
+ describe "integration" do
before do
Jobs.run_immediately!
NotificationEmailer.enable
end
- it 'should operate correctly' do
+ it "should operate correctly" do
watched_category = Fabricate(:category)
muted_category = Fabricate(:category)
tracked_category = Fabricate(:category)
early_watched_post = create_post(category: watched_category)
- CategoryUser.create!(user: user, category: watched_category, notification_level: CategoryUser.notification_levels[:watching])
- CategoryUser.create!(user: user, category: muted_category, notification_level: CategoryUser.notification_levels[:muted])
- CategoryUser.create!(user: user, category: tracked_category, notification_level: CategoryUser.notification_levels[:tracking])
+ CategoryUser.create!(
+ user: user,
+ category: watched_category,
+ notification_level: CategoryUser.notification_levels[:watching],
+ )
+ CategoryUser.create!(
+ user: user,
+ category: muted_category,
+ notification_level: CategoryUser.notification_levels[:muted],
+ )
+ CategoryUser.create!(
+ user: user,
+ category: tracked_category,
+ notification_level: CategoryUser.notification_levels[:tracking],
+ )
watched_post = create_post(category: watched_category)
_muted_post = create_post(category: muted_category)
@@ -122,7 +150,9 @@ RSpec.describe CategoryUser do
create_post(topic_id: early_watched_post.topic_id)
expect(Notification.where(user_id: user.id, topic_id: watched_post.topic_id).count).to eq 1
- expect(Notification.where(user_id: user.id, topic_id: early_watched_post.topic_id).count).to eq 1
+ expect(
+ Notification.where(user_id: user.id, topic_id: early_watched_post.topic_id).count,
+ ).to eq 1
expect(Notification.where(user_id: user.id, topic_id: tracked_post.topic_id).count).to eq 0
# we must create a record so tracked flicks over
@@ -140,7 +170,11 @@ RSpec.describe CategoryUser do
tu = TopicUser.get(first_post.topic, user)
expect(tu.notification_level).to eq TopicUser.notification_levels[:regular]
- CategoryUser.set_notification_level_for_category(user, CategoryUser.notification_levels[:tracking], tracked_category.id)
+ CategoryUser.set_notification_level_for_category(
+ user,
+ CategoryUser.notification_levels[:tracking],
+ tracked_category.id,
+ )
tu = TopicUser.get(first_post.topic, user)
expect(tu.notification_level).to eq TopicUser.notification_levels[:tracking]
@@ -148,7 +182,11 @@ RSpec.describe CategoryUser do
it "unwatches categories that have been changed" do
watched_category = Fabricate(:category)
- CategoryUser.create!(user: user, category: watched_category, notification_level: CategoryUser.notification_levels[:watching])
+ CategoryUser.create!(
+ user: user,
+ category: watched_category,
+ notification_level: CategoryUser.notification_levels[:watching],
+ )
post = create_post(category: watched_category)
tu = TopicUser.get(post.topic, user)
@@ -160,7 +198,9 @@ RSpec.describe CategoryUser do
# Now, change the topic's category
unwatched_category = Fabricate(:category)
post.topic.change_category_to_id(unwatched_category.id)
- expect(TopicUser.get(post.topic, user).notification_level).to eq TopicUser.notification_levels[:tracking]
+ expect(
+ TopicUser.get(post.topic, user).notification_level,
+ ).to eq TopicUser.notification_levels[:tracking]
end
it "does not delete TopicUser record when topic category is changed, and new category has same notification level" do
@@ -173,29 +213,53 @@ RSpec.describe CategoryUser do
post = create_post(category: watched_category_1)
- CategoryUser.create!(user: user, category: watched_category_1, notification_level: CategoryUser.notification_levels[:watching])
- CategoryUser.create!(user: user, category: watched_category_2, notification_level: CategoryUser.notification_levels[:watching])
+ CategoryUser.create!(
+ user: user,
+ category: watched_category_1,
+ notification_level: CategoryUser.notification_levels[:watching],
+ )
+ CategoryUser.create!(
+ user: user,
+ category: watched_category_2,
+ notification_level: CategoryUser.notification_levels[:watching],
+ )
# we must have a topic user record otherwise it will be watched implicitly
TopicUser.change(user.id, post.topic_id, total_msecs_viewed: 10)
- expect(TopicUser.get(post.topic, user).notification_level).to eq TopicUser.notification_levels[:watching]
+ expect(
+ TopicUser.get(post.topic, user).notification_level,
+ ).to eq TopicUser.notification_levels[:watching]
post.topic.change_category_to_id(category_3.id)
- expect(TopicUser.get(post.topic, user).notification_level).to eq TopicUser.notification_levels[:tracking]
+ expect(
+ TopicUser.get(post.topic, user).notification_level,
+ ).to eq TopicUser.notification_levels[:tracking]
post.topic.change_category_to_id(watched_category_2.id)
- expect(TopicUser.get(post.topic, user).notification_level).to eq TopicUser.notification_levels[:watching]
+ expect(
+ TopicUser.get(post.topic, user).notification_level,
+ ).to eq TopicUser.notification_levels[:watching]
post.topic.change_category_to_id(watched_category_1.id)
- expect(TopicUser.get(post.topic, user).notification_level).to eq TopicUser.notification_levels[:watching]
+ expect(
+ TopicUser.get(post.topic, user).notification_level,
+ ).to eq TopicUser.notification_levels[:watching]
end
it "deletes TopicUser record when topic category is changed, and new category has different notification level" do
watched_category = Fabricate(:category)
tracked_category = Fabricate(:category)
- CategoryUser.create!(user: user, category: watched_category, notification_level: CategoryUser.notification_levels[:watching])
- CategoryUser.create!(user: user, category: tracked_category, notification_level: CategoryUser.notification_levels[:tracking])
+ CategoryUser.create!(
+ user: user,
+ category: watched_category,
+ notification_level: CategoryUser.notification_levels[:watching],
+ )
+ CategoryUser.create!(
+ user: user,
+ category: tracked_category,
+ notification_level: CategoryUser.notification_levels[:tracking],
+ )
post = create_post(category: watched_category)
tu = TopicUser.get(post.topic, user)
@@ -203,13 +267,19 @@ RSpec.describe CategoryUser do
# Now, change the topic's category
post.topic.change_category_to_id(tracked_category.id)
- expect(TopicUser.get(post.topic, user).notification_level).to eq TopicUser.notification_levels[:tracking]
+ expect(
+ TopicUser.get(post.topic, user).notification_level,
+ ).to eq TopicUser.notification_levels[:tracking]
end
it "is destroyed when a user is deleted" do
category = Fabricate(:category)
- CategoryUser.create!(user: user, category: category, notification_level: CategoryUser.notification_levels[:watching])
+ CategoryUser.create!(
+ user: user,
+ category: category,
+ notification_level: CategoryUser.notification_levels[:watching],
+ )
expect(CategoryUser.where(user_id: user.id).count).to eq(1)
@@ -247,11 +317,31 @@ RSpec.describe CategoryUser do
context "for a user" do
before do
- CategoryUser.create(user: user, category: category1, notification_level: CategoryUser.notification_levels[:watching])
- CategoryUser.create(user: user, category: category2, notification_level: CategoryUser.notification_levels[:tracking])
- CategoryUser.create(user: user, category: category3, notification_level: CategoryUser.notification_levels[:watching_first_post])
- CategoryUser.create(user: user, category: category4, notification_level: CategoryUser.notification_levels[:regular])
- CategoryUser.create(user: user, category: category5, notification_level: CategoryUser.notification_levels[:muted])
+ CategoryUser.create(
+ user: user,
+ category: category1,
+ notification_level: CategoryUser.notification_levels[:watching],
+ )
+ CategoryUser.create(
+ user: user,
+ category: category2,
+ notification_level: CategoryUser.notification_levels[:tracking],
+ )
+ CategoryUser.create(
+ user: user,
+ category: category3,
+ notification_level: CategoryUser.notification_levels[:watching_first_post],
+ )
+ CategoryUser.create(
+ user: user,
+ category: category4,
+ notification_level: CategoryUser.notification_levels[:regular],
+ )
+ CategoryUser.create(
+ user: user,
+ category: category5,
+ notification_level: CategoryUser.notification_levels[:muted],
+ )
end
it "gets the category_user notification levels for all categories the user is tracking and does not
include categories the user is not tracking at all" do
@@ -277,13 +367,33 @@ RSpec.describe CategoryUser do
expect(CategoryUser.indirectly_muted_category_ids(user)).to eq([])
expect(CategoryUser.muted_category_ids(user)).to eq([])
- category_user = CategoryUser.create!(user: user, category: category1, notification_level: CategoryUser.notification_levels[:muted])
- expect(CategoryUser.indirectly_muted_category_ids(user)).to contain_exactly(category2.id, category3.id)
- expect(CategoryUser.muted_category_ids(user)).to contain_exactly(category1.id, category2.id, category3.id)
+ category_user =
+ CategoryUser.create!(
+ user: user,
+ category: category1,
+ notification_level: CategoryUser.notification_levels[:muted],
+ )
+ expect(CategoryUser.indirectly_muted_category_ids(user)).to contain_exactly(
+ category2.id,
+ category3.id,
+ )
+ expect(CategoryUser.muted_category_ids(user)).to contain_exactly(
+ category1.id,
+ category2.id,
+ category3.id,
+ )
- CategoryUser.create!(user: user, category: category3, notification_level: CategoryUser.notification_levels[:muted])
+ CategoryUser.create!(
+ user: user,
+ category: category3,
+ notification_level: CategoryUser.notification_levels[:muted],
+ )
expect(CategoryUser.indirectly_muted_category_ids(user)).to contain_exactly(category2.id)
- expect(CategoryUser.muted_category_ids(user)).to contain_exactly(category1.id, category2.id, category3.id)
+ expect(CategoryUser.muted_category_ids(user)).to contain_exactly(
+ category1.id,
+ category2.id,
+ category3.id,
+ )
category_user.update!(notification_level: CategoryUser.notification_levels[:regular])
expect(CategoryUser.indirectly_muted_category_ids(user)).to eq([])
@@ -305,18 +415,47 @@ RSpec.describe CategoryUser do
it "calculates muted categories based on parent category state" do
expect(CategoryUser.indirectly_muted_category_ids(user)).to eq([])
- CategoryUser.create!(user: user, category: category1, notification_level: CategoryUser.notification_levels[:muted])
- expect(CategoryUser.indirectly_muted_category_ids(user)).to contain_exactly(category2.id, category3.id)
- expect(CategoryUser.muted_category_ids(user)).to contain_exactly(category1.id, category2.id, category3.id)
+ CategoryUser.create!(
+ user: user,
+ category: category1,
+ notification_level: CategoryUser.notification_levels[:muted],
+ )
+ expect(CategoryUser.indirectly_muted_category_ids(user)).to contain_exactly(
+ category2.id,
+ category3.id,
+ )
+ expect(CategoryUser.muted_category_ids(user)).to contain_exactly(
+ category1.id,
+ category2.id,
+ category3.id,
+ )
- category_user3 = CategoryUser.create!(user: user, category: category3, notification_level: CategoryUser.notification_levels[:muted])
+ category_user3 =
+ CategoryUser.create!(
+ user: user,
+ category: category3,
+ notification_level: CategoryUser.notification_levels[:muted],
+ )
expect(CategoryUser.indirectly_muted_category_ids(user)).to contain_exactly(category2.id)
- expect(CategoryUser.muted_category_ids(user)).to contain_exactly(category1.id, category2.id, category3.id)
+ expect(CategoryUser.muted_category_ids(user)).to contain_exactly(
+ category1.id,
+ category2.id,
+ category3.id,
+ )
category_user3.destroy!
- category_user2 = CategoryUser.create!(user: user, category: category2, notification_level: CategoryUser.notification_levels[:muted])
+ category_user2 =
+ CategoryUser.create!(
+ user: user,
+ category: category2,
+ notification_level: CategoryUser.notification_levels[:muted],
+ )
expect(CategoryUser.indirectly_muted_category_ids(user)).to contain_exactly(category3.id)
- expect(CategoryUser.muted_category_ids(user)).to contain_exactly(category1.id, category2.id, category3.id)
+ expect(CategoryUser.muted_category_ids(user)).to contain_exactly(
+ category1.id,
+ category2.id,
+ category3.id,
+ )
category_user2.update!(notification_level: CategoryUser.notification_levels[:regular])
expect(CategoryUser.indirectly_muted_category_ids(user)).to eq([])
diff --git a/spec/models/child_theme_spec.rb b/spec/models/child_theme_spec.rb
index 609dd3c6fbe..7eb944fb025 100644
--- a/spec/models/child_theme_spec.rb
+++ b/spec/models/child_theme_spec.rb
@@ -13,12 +13,16 @@ RSpec.describe ChildTheme do
grandchild = Fabricate(:theme, component: true)
child_theme = ChildTheme.new(parent_theme: child, child_theme: grandchild)
expect(child_theme.valid?).to eq(false)
- expect(child_theme.errors.full_messages).to contain_exactly(I18n.t("themes.errors.no_multilevels_components"))
+ expect(child_theme.errors.full_messages).to contain_exactly(
+ I18n.t("themes.errors.no_multilevels_components"),
+ )
grandparent = Fabricate(:theme)
child_theme = ChildTheme.new(parent_theme: grandparent, child_theme: theme)
expect(child_theme.valid?).to eq(false)
- expect(child_theme.errors.full_messages).to contain_exactly(I18n.t("themes.errors.no_multilevels_components"))
+ expect(child_theme.errors.full_messages).to contain_exactly(
+ I18n.t("themes.errors.no_multilevels_components"),
+ )
end
end
end
diff --git a/spec/models/color_scheme_color_spec.rb b/spec/models/color_scheme_color_spec.rb
index 3d555057f08..356d6118a34 100644
--- a/spec/models/color_scheme_color_spec.rb
+++ b/spec/models/color_scheme_color_spec.rb
@@ -1,9 +1,7 @@
# frozen_string_literal: true
RSpec.describe ColorSchemeColor do
- after do
- ColorScheme.hex_cache.clear
- end
+ after { ColorScheme.hex_cache.clear }
def test_invalid_hex(hex)
c = described_class.new(hex: hex)
@@ -12,11 +10,20 @@ RSpec.describe ColorSchemeColor do
end
it "validates hex value" do
- ['fff', 'ffffff', '333333', '333', '0BeeF0'].each do |hex|
+ %w[fff ffffff 333333 333 0BeeF0].each do |hex|
expect(described_class.new(hex: hex)).to be_valid
end
- ['fffff', 'ffff', 'ff', 'f', '00000', '00', 'cheese', '#666666', '#666', '555 666'].each do |hex|
- test_invalid_hex(hex)
- end
+ [
+ "fffff",
+ "ffff",
+ "ff",
+ "f",
+ "00000",
+ "00",
+ "cheese",
+ "#666666",
+ "#666",
+ "555 666",
+ ].each { |hex| test_invalid_hex(hex) }
end
end
diff --git a/spec/models/color_scheme_spec.rb b/spec/models/color_scheme_spec.rb
index ae526a5253d..7e1bd06e16a 100644
--- a/spec/models/color_scheme_spec.rb
+++ b/spec/models/color_scheme_spec.rb
@@ -1,28 +1,28 @@
# frozen_string_literal: true
RSpec.describe ColorScheme do
- after do
- ColorScheme.hex_cache.clear
- end
+ after { ColorScheme.hex_cache.clear }
let(:valid_params) { { name: "Best Colors Evar", colors: valid_colors } }
- let(:valid_colors) { [
- { name: '$primary_background_color', hex: 'FFBB00' },
- { name: '$secondary_background_color', hex: '888888' }
- ]}
+ let(:valid_colors) do
+ [
+ { name: "$primary_background_color", hex: "FFBB00" },
+ { name: "$secondary_background_color", hex: "888888" },
+ ]
+ end
it "correctly invalidates theme css when changed" do
- scheme = ColorScheme.create_from_base(name: 'Bob')
+ scheme = ColorScheme.create_from_base(name: "Bob")
theme = Fabricate(:theme, color_scheme_id: scheme.id)
- theme.set_field(name: :scss, target: :desktop, value: '.bob {color: $primary;}')
+ theme.set_field(name: :scss, target: :desktop, value: ".bob {color: $primary;}")
theme.save!
manager = Stylesheet::Manager.new(theme_id: theme.id)
href = manager.stylesheet_data(:desktop_theme)[0][:new_href]
colors_href = manager.color_scheme_stylesheet_details(scheme.id, "all")
- ColorSchemeRevisor.revise(scheme, colors: [{ name: 'primary', hex: 'bbb' }])
+ ColorSchemeRevisor.revise(scheme, colors: [{ name: "primary", hex: "bbb" }])
href2 = manager.stylesheet_data(:desktop_theme)[0][:new_href]
colors_href2 = manager.color_scheme_stylesheet_details(scheme.id, "all")
@@ -36,63 +36,82 @@ RSpec.describe ColorScheme do
c = ColorScheme.new(valid_params)
expect(c.colors.size).to eq valid_colors.size
expect(c.colors.first).to be_a(ColorSchemeColor)
- expect {
- expect(c.save).to eq true
- }.to change { ColorSchemeColor.count }.by(valid_colors.size)
+ expect { expect(c.save).to eq true }.to change { ColorSchemeColor.count }.by(
+ valid_colors.size,
+ )
end
end
describe "create_from_base" do
- let(:base_colors) { { first_one: 'AAAAAA', second_one: '333333', third_one: 'BEEBEE' } }
- let!(:base) { Fabricate(:color_scheme, name: 'Base', color_scheme_colors: [
- Fabricate(:color_scheme_color, name: 'first_one', hex: base_colors[:first_one]),
- Fabricate(:color_scheme_color, name: 'second_one', hex: base_colors[:second_one]),
- Fabricate(:color_scheme_color, name: 'third_one', hex: base_colors[:third_one])]) }
-
- before do
- ColorScheme.stubs(:base).returns(base)
+ let(:base_colors) { { first_one: "AAAAAA", second_one: "333333", third_one: "BEEBEE" } }
+ let!(:base) do
+ Fabricate(
+ :color_scheme,
+ name: "Base",
+ color_scheme_colors: [
+ Fabricate(:color_scheme_color, name: "first_one", hex: base_colors[:first_one]),
+ Fabricate(:color_scheme_color, name: "second_one", hex: base_colors[:second_one]),
+ Fabricate(:color_scheme_color, name: "third_one", hex: base_colors[:third_one]),
+ ],
+ )
end
+ before { ColorScheme.stubs(:base).returns(base) }
+
it "creates a new color scheme" do
- c = described_class.create_from_base(name: 'Yellow', colors: { first_one: 'FFFF00', third_one: 'F00D33' })
+ c =
+ described_class.create_from_base(
+ name: "Yellow",
+ colors: {
+ first_one: "FFFF00",
+ third_one: "F00D33",
+ },
+ )
expect(c.colors.size).to eq base_colors.size
- first = c.colors.find { |x| x.name == 'first_one' }
- second = c.colors.find { |x| x.name == 'second_one' }
- third = c.colors.find { |x| x.name == 'third_one' }
- expect(first.hex).to eq 'FFFF00'
+ first = c.colors.find { |x| x.name == "first_one" }
+ second = c.colors.find { |x| x.name == "second_one" }
+ third = c.colors.find { |x| x.name == "third_one" }
+ expect(first.hex).to eq "FFFF00"
expect(second.hex).to eq base_colors[:second_one]
- expect(third.hex).to eq 'F00D33'
+ expect(third.hex).to eq "F00D33"
end
context "with hex_for_name without anything enabled" do
- before do
- ColorScheme.hex_cache.clear
- end
+ before { ColorScheme.hex_cache.clear }
it "returns nil for a missing attribute" do
- expect(ColorScheme.hex_for_name('undefined')).to eq nil
+ expect(ColorScheme.hex_for_name("undefined")).to eq nil
end
it "returns the base color for an attribute of a specified scheme" do
scheme = ColorScheme.create_from_base(name: "test scheme")
- ColorSchemeRevisor.revise(scheme, colors: [{ name: "header_background", hex: "9dc927", default_hex: "949493" }])
+ ColorSchemeRevisor.revise(
+ scheme,
+ colors: [{ name: "header_background", hex: "9dc927", default_hex: "949493" }],
+ )
scheme.reload
expect(ColorScheme.hex_for_name("header_background", scheme.id)).to eq("9dc927")
end
it "returns the base color for an attribute" do
- expect(ColorScheme.hex_for_name('second_one')).to eq base_colors[:second_one]
+ expect(ColorScheme.hex_for_name("second_one")).to eq base_colors[:second_one]
end
end
end
describe "is_dark?" do
it "works as expected" do
- scheme = ColorScheme.create_from_base(name: 'Tester')
- ColorSchemeRevisor.revise(scheme, colors: [{ name: 'primary', hex: '333333' }, { name: 'secondary', hex: 'DDDDDD' }])
+ scheme = ColorScheme.create_from_base(name: "Tester")
+ ColorSchemeRevisor.revise(
+ scheme,
+ colors: [{ name: "primary", hex: "333333" }, { name: "secondary", hex: "DDDDDD" }],
+ )
expect(scheme.is_dark?).to eq(false)
- ColorSchemeRevisor.revise(scheme, colors: [{ name: 'primary', hex: 'F8F8F8' }, { name: 'secondary', hex: '232323' }])
+ ColorSchemeRevisor.revise(
+ scheme,
+ colors: [{ name: "primary", hex: "F8F8F8" }, { name: "secondary", hex: "232323" }],
+ )
expect(scheme.is_dark?).to eq(true)
end
@@ -104,11 +123,15 @@ RSpec.describe ColorScheme do
describe "is_wcag?" do
it "works as expected" do
- expect(ColorScheme.create_from_base(name: 'Nope').is_wcag?).to eq(nil)
- expect(ColorScheme.create_from_base(name: 'Nah', base_scheme_id: "Dark").is_wcag?).to eq(false)
+ expect(ColorScheme.create_from_base(name: "Nope").is_wcag?).to eq(nil)
+ expect(ColorScheme.create_from_base(name: "Nah", base_scheme_id: "Dark").is_wcag?).to eq(
+ false,
+ )
- expect(ColorScheme.create_from_base(name: 'Yup', base_scheme_id: "WCAG").is_wcag?).to eq(true)
- expect(ColorScheme.create_from_base(name: 'Yup', base_scheme_id: "WCAG Dark").is_wcag?).to eq(true)
+ expect(ColorScheme.create_from_base(name: "Yup", base_scheme_id: "WCAG").is_wcag?).to eq(true)
+ expect(ColorScheme.create_from_base(name: "Yup", base_scheme_id: "WCAG Dark").is_wcag?).to eq(
+ true,
+ )
end
end
end
diff --git a/spec/models/digest_email_site_setting_spec.rb b/spec/models/digest_email_site_setting_spec.rb
index 94b4e65a27c..19aed04384e 100644
--- a/spec/models/digest_email_site_setting_spec.rb
+++ b/spec/models/digest_email_site_setting_spec.rb
@@ -1,17 +1,17 @@
# frozen_string_literal: true
RSpec.describe DigestEmailSiteSetting do
- describe 'valid_value?' do
- it 'returns true for a valid value as an int' do
+ describe "valid_value?" do
+ it "returns true for a valid value as an int" do
expect(DigestEmailSiteSetting.valid_value?(1440)).to eq true
end
- it 'returns true for a valid value as a string' do
- expect(DigestEmailSiteSetting.valid_value?('1440')).to eq true
+ it "returns true for a valid value as a string" do
+ expect(DigestEmailSiteSetting.valid_value?("1440")).to eq true
end
- it 'returns false for an invalid value' do
- expect(DigestEmailSiteSetting.valid_value?('7 dogs')).to eq false
+ it "returns false for an invalid value" do
+ expect(DigestEmailSiteSetting.valid_value?("7 dogs")).to eq false
end
end
end
diff --git a/spec/models/directory_item_spec.rb b/spec/models/directory_item_spec.rb
index ae46e29e29d..05fedf0da0c 100644
--- a/spec/models/directory_item_spec.rb
+++ b/spec/models/directory_item_spec.rb
@@ -1,11 +1,9 @@
# frozen_string_literal: true
RSpec.describe DirectoryItem do
- describe '#period_types' do
+ describe "#period_types" do
context "when verifying enum sequence" do
- before do
- @period_types = DirectoryItem.period_types
- end
+ before { @period_types = DirectoryItem.period_types }
it "'all' should be at 1st position" do
expect(@period_types[:all]).to eq(1)
@@ -17,8 +15,8 @@ RSpec.describe DirectoryItem do
end
end
- describe 'inactive and silenced users' do
- it 'removes silenced users correctly' do
+ describe "inactive and silenced users" do
+ it "removes silenced users correctly" do
post = create_post
DirectoryItem.refresh_period!(:daily)
@@ -42,13 +40,12 @@ RSpec.describe DirectoryItem do
count = DirectoryItem.where(user_id: post.user_id).count
expect(count).to eq(0)
-
end
end
- describe '.refresh!' do
+ describe ".refresh!" do
before do
- freeze_time DateTime.parse('2017-02-02 12:00')
+ freeze_time DateTime.parse("2017-02-02 12:00")
UserActionManager.enable
end
@@ -62,8 +59,10 @@ RSpec.describe DirectoryItem do
DirectoryItem.refresh!
- item1 = DirectoryItem.find_by(period_type: DirectoryItem.period_types[:all], user_id: post.user_id)
- item2 = DirectoryItem.find_by(period_type: DirectoryItem.period_types[:all], user_id: user2.id)
+ item1 =
+ DirectoryItem.find_by(period_type: DirectoryItem.period_types[:all], user_id: post.user_id)
+ item2 =
+ DirectoryItem.find_by(period_type: DirectoryItem.period_types[:all], user_id: user2.id)
expect(item1.topic_count).to eq(1)
expect(item1.likes_received).to eq(1)
@@ -75,8 +74,10 @@ RSpec.describe DirectoryItem do
DirectoryItem.refresh!
- item1 = DirectoryItem.find_by(period_type: DirectoryItem.period_types[:all], user_id: post.user_id)
- item2 = DirectoryItem.find_by(period_type: DirectoryItem.period_types[:all], user_id: user2.id)
+ item1 =
+ DirectoryItem.find_by(period_type: DirectoryItem.period_types[:all], user_id: post.user_id)
+ item2 =
+ DirectoryItem.find_by(period_type: DirectoryItem.period_types[:all], user_id: user2.id)
expect(item1.likes_given).to eq(0)
expect(item1.likes_received).to eq(0)
@@ -96,57 +97,84 @@ RSpec.describe DirectoryItem do
freeze_time(2.years.from_now)
DirectoryItem.refresh!
- [:yearly, :monthly, :weekly, :daily, :quarterly].each do |period|
- directory_item = DirectoryItem
- .where(period_type: DirectoryItem.period_types[period])
- .where(user_id: post.user.id)
- .first
+ %i[yearly monthly weekly daily quarterly].each do |period|
+ directory_item =
+ DirectoryItem
+ .where(period_type: DirectoryItem.period_types[period])
+ .where(user_id: post.user.id)
+ .first
expect(directory_item.topic_count).to eq(0)
expect(directory_item.post_count).to eq(0)
end
- directory_item = DirectoryItem
- .where(period_type: DirectoryItem.period_types[:all])
- .where(user_id: post.user.id)
- .first
+ directory_item =
+ DirectoryItem
+ .where(period_type: DirectoryItem.period_types[:all])
+ .where(user_id: post.user.id)
+ .first
expect(directory_item.topic_count).to eq(1)
end
it "creates directory item with correct activity count per period_type" do
user = Fabricate(:user)
- UserVisit.create(user_id: user.id, visited_at: 1.minute.ago, posts_read: 1, mobile: false, time_read: 1)
- UserVisit.create(user_id: user.id, visited_at: 2.days.ago, posts_read: 1, mobile: false, time_read: 1)
- UserVisit.create(user_id: user.id, visited_at: 1.week.ago, posts_read: 1, mobile: false, time_read: 1)
- UserVisit.create(user_id: user.id, visited_at: 1.month.ago, posts_read: 1, mobile: false, time_read: 1)
+ UserVisit.create(
+ user_id: user.id,
+ visited_at: 1.minute.ago,
+ posts_read: 1,
+ mobile: false,
+ time_read: 1,
+ )
+ UserVisit.create(
+ user_id: user.id,
+ visited_at: 2.days.ago,
+ posts_read: 1,
+ mobile: false,
+ time_read: 1,
+ )
+ UserVisit.create(
+ user_id: user.id,
+ visited_at: 1.week.ago,
+ posts_read: 1,
+ mobile: false,
+ time_read: 1,
+ )
+ UserVisit.create(
+ user_id: user.id,
+ visited_at: 1.month.ago,
+ posts_read: 1,
+ mobile: false,
+ time_read: 1,
+ )
DirectoryItem.refresh!
- daily_directory_item = DirectoryItem
- .where(period_type: DirectoryItem.period_types[:daily])
- .where(user_id: user.id)
- .first
+ daily_directory_item =
+ DirectoryItem
+ .where(period_type: DirectoryItem.period_types[:daily])
+ .where(user_id: user.id)
+ .first
expect(daily_directory_item.days_visited).to eq(1)
- weekly_directory_item = DirectoryItem
- .where(period_type: DirectoryItem.period_types[:weekly])
- .where(user_id: user.id)
- .first
+ weekly_directory_item =
+ DirectoryItem
+ .where(period_type: DirectoryItem.period_types[:weekly])
+ .where(user_id: user.id)
+ .first
expect(weekly_directory_item.days_visited).to eq(2)
- monthly_directory_item = DirectoryItem
- .where(period_type: DirectoryItem.period_types[:monthly])
- .where(user_id: user.id)
- .first
+ monthly_directory_item =
+ DirectoryItem
+ .where(period_type: DirectoryItem.period_types[:monthly])
+ .where(user_id: user.id)
+ .first
expect(monthly_directory_item.days_visited).to eq(3)
end
- context 'when must_approve_users is true' do
- before do
- SiteSetting.must_approve_users = true
- end
+ context "when must_approve_users is true" do
+ before { SiteSetting.must_approve_users = true }
it "doesn't include user who hasn't been approved" do
user = Fabricate(:user, approved: false)
diff --git a/spec/models/discourse_connect_spec.rb b/spec/models/discourse_connect_spec.rb
index 81a679ba33e..b43464ca845 100644
--- a/spec/models/discourse_connect_spec.rb
+++ b/spec/models/discourse_connect_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe DiscourseConnect do
SiteSetting.discourse_connect_url = @discourse_connect_url
SiteSetting.enable_discourse_connect = true
SiteSetting.discourse_connect_secret = @discourse_connect_secret
- SiteSetting.reserved_usernames = ''
+ SiteSetting.reserved_usernames = ""
Jobs.run_immediately!
end
@@ -86,22 +86,22 @@ RSpec.describe DiscourseConnect do
sso.external_id = " "
- expect do
- sso.lookup_or_create_user(ip_address)
- end.to raise_error(DiscourseConnect::BlankExternalId)
+ expect do sso.lookup_or_create_user(ip_address) end.to raise_error(
+ DiscourseConnect::BlankExternalId,
+ )
sso.external_id = nil
- expect do
- sso.lookup_or_create_user(ip_address)
- end.to raise_error(DiscourseConnect::BlankExternalId)
+ expect do sso.lookup_or_create_user(ip_address) end.to raise_error(
+ DiscourseConnect::BlankExternalId,
+ )
# going for slight duplication here so our intent is crystal clear
- %w{none nil Blank null}.each do |word|
+ %w[none nil Blank null].each do |word|
sso.external_id = word
- expect do
- sso.lookup_or_create_user(ip_address)
- end.to raise_error(DiscourseConnect::BannedExternalId)
+ expect do sso.lookup_or_create_user(ip_address) end.to raise_error(
+ DiscourseConnect::BannedExternalId,
+ )
end
end
@@ -180,15 +180,15 @@ RSpec.describe DiscourseConnect do
user = sso.lookup_or_create_user(ip_address)
staff_group.reload
- expect(mod_group.users.where('users.id = ?', user.id).exists?).to eq(true)
- expect(staff_group.users.where('users.id = ?', user.id).exists?).to eq(true)
- expect(admin_group.users.where('users.id = ?', user.id).exists?).to eq(true)
+ expect(mod_group.users.where("users.id = ?", user.id).exists?).to eq(true)
+ expect(staff_group.users.where("users.id = ?", user.id).exists?).to eq(true)
+ expect(admin_group.users.where("users.id = ?", user.id).exists?).to eq(true)
end
it "can force a list of groups with the groups attribute" do
user = Fabricate(:user)
- group1 = Fabricate(:group, name: 'group1')
- group2 = Fabricate(:group, name: 'group2')
+ group1 = Fabricate(:group, name: "group1")
+ group2 = Fabricate(:group, name: "group2")
sso = new_discourse_sso
sso.username = "bobsky"
@@ -229,14 +229,13 @@ RSpec.describe DiscourseConnect do
end
it "can specify groups" do
-
user = Fabricate(:user)
- add_group1 = Fabricate(:group, name: 'group1')
- add_group2 = Fabricate(:group, name: 'group2')
- existing_group = Fabricate(:group, name: 'group3')
- add_group4 = Fabricate(:group, name: 'GROUP4')
- existing_group2 = Fabricate(:group, name: 'GRoup5')
+ add_group1 = Fabricate(:group, name: "group1")
+ add_group2 = Fabricate(:group, name: "group2")
+ existing_group = Fabricate(:group, name: "group3")
+ add_group4 = Fabricate(:group, name: "GROUP4")
+ existing_group2 = Fabricate(:group, name: "GRoup5")
[existing_group, existing_group2].each do |g|
g.add(user)
@@ -273,9 +272,9 @@ RSpec.describe DiscourseConnect do
expect(add_group4.usernames).to eq(user.username)
end
- it 'creates group logs when users are added to groups' do
+ it "creates group logs when users are added to groups" do
user = Fabricate(:user)
- group = Fabricate(:group, name: 'group1')
+ group = Fabricate(:group, name: "group1")
sso = new_discourse_sso
sso.username = "bobsky"
@@ -289,16 +288,18 @@ RSpec.describe DiscourseConnect do
sso.lookup_or_create_user(ip_address)
expect(group.reload.usernames).to eq(user.username)
- expect(GroupHistory.exists?(
- target_user_id: user.id,
- acting_user: Discourse.system_user.id,
- action: GroupHistory.actions[:add_user_to_group]
- )).to eq(true)
+ expect(
+ GroupHistory.exists?(
+ target_user_id: user.id,
+ acting_user: Discourse.system_user.id,
+ action: GroupHistory.actions[:add_user_to_group],
+ ),
+ ).to eq(true)
end
- it 'creates group logs when users are removed from groups' do
+ it "creates group logs when users are removed from groups" do
user = Fabricate(:user)
- group = Fabricate(:group, name: 'group1')
+ group = Fabricate(:group, name: "group1")
group.add(user)
sso = new_discourse_sso
@@ -313,18 +314,20 @@ RSpec.describe DiscourseConnect do
sso.lookup_or_create_user(ip_address)
expect(group.reload.usernames).to be_blank
- expect(GroupHistory.exists?(
- target_user_id: user.id,
- acting_user: Discourse.system_user.id,
- action: GroupHistory.actions[:remove_user_from_group]
- )).to eq(true)
+ expect(
+ GroupHistory.exists?(
+ target_user_id: user.id,
+ acting_user: Discourse.system_user.id,
+ action: GroupHistory.actions[:remove_user_from_group],
+ ),
+ ).to eq(true)
end
- it 'creates group logs when users are added to groups when discourse_connect_overrides_groups setting is true' do
+ it "creates group logs when users are added to groups when discourse_connect_overrides_groups setting is true" do
SiteSetting.discourse_connect_overrides_groups = true
user = Fabricate(:user)
- group = Fabricate(:group, name: 'group1')
+ group = Fabricate(:group, name: "group1")
sso = new_discourse_sso
sso.username = "bobsky"
@@ -338,18 +341,20 @@ RSpec.describe DiscourseConnect do
sso.lookup_or_create_user(ip_address)
expect(group.reload.usernames).to eq(user.username)
- expect(GroupHistory.exists?(
- target_user_id: user.id,
- acting_user: Discourse.system_user.id,
- action: GroupHistory.actions[:add_user_to_group]
- )).to eq(true)
+ expect(
+ GroupHistory.exists?(
+ target_user_id: user.id,
+ acting_user: Discourse.system_user.id,
+ action: GroupHistory.actions[:add_user_to_group],
+ ),
+ ).to eq(true)
end
- it 'creates group logs when users are removed from groups when discourse_connect_overrides_groups setting is true' do
+ it "creates group logs when users are removed from groups when discourse_connect_overrides_groups setting is true" do
SiteSetting.discourse_connect_overrides_groups = true
user = Fabricate(:user)
- group = Fabricate(:group, name: 'group1')
+ group = Fabricate(:group, name: "group1")
group.add(user)
sso = new_discourse_sso
@@ -364,14 +369,16 @@ RSpec.describe DiscourseConnect do
sso.lookup_or_create_user(ip_address)
expect(group.reload.usernames).to be_blank
- expect(GroupHistory.exists?(
- target_user_id: user.id,
- acting_user: Discourse.system_user.id,
- action: GroupHistory.actions[:remove_user_from_group]
- )).to eq(true)
+ expect(
+ GroupHistory.exists?(
+ target_user_id: user.id,
+ acting_user: Discourse.system_user.id,
+ action: GroupHistory.actions[:remove_user_from_group],
+ ),
+ ).to eq(true)
end
- it 'behaves properly when auth_overrides_username is set but username is missing or blank' do
+ it "behaves properly when auth_overrides_username is set but username is missing or blank" do
SiteSetting.auth_overrides_username = true
sso = new_discourse_sso
@@ -392,7 +399,7 @@ RSpec.describe DiscourseConnect do
expect(user.username).to eq "testuser"
# set username in payload to blank
- sso.username = ''
+ sso.username = ""
user = sso.lookup_or_create_user(ip_address)
expect(user.username).to eq "testuser"
end
@@ -432,7 +439,7 @@ RSpec.describe DiscourseConnect do
expect(admin.name).to eq "Louis C.K."
end
- it 'can override username properly when only the case changes' do
+ it "can override username properly when only the case changes" do
SiteSetting.auth_overrides_username = true
sso = new_discourse_sso
@@ -453,7 +460,7 @@ RSpec.describe DiscourseConnect do
expect(user.username).to eq "TestUser"
end
- it 'do not override username when a new username after fixing is the same' do
+ it "do not override username when a new username after fixing is the same" do
SiteSetting.auth_overrides_username = true
sso = new_discourse_sso
@@ -472,7 +479,7 @@ RSpec.describe DiscourseConnect do
expect(user.username).to eq "testuser"
end
- it 'should preserve username when several users login with the same username' do
+ it "should preserve username when several users login with the same username" do
SiteSetting.auth_overrides_username = true
# if several users have username "bill" on the external site,
@@ -582,7 +589,7 @@ RSpec.describe DiscourseConnect do
sso.email = "mail@mail.com"
user = sso.lookup_or_create_user(ip_address)
- expect(user.username).to eq I18n.t('fallback_username')
+ expect(user.username).to eq I18n.t("fallback_username")
end
it "uses email as a source for username suggestions if enabled" do
@@ -701,7 +708,7 @@ RSpec.describe DiscourseConnect do
sso = make_sso
sso.sso_url = "http://tcdev7.wpengine.com/?action=showlogin"
- expect(sso.to_url.split('?').size).to eq 2
+ expect(sso.to_url.split("?").size).to eq 2
url, payload = sso.to_url.split("?")
expect(url).to eq "http://tcdev7.wpengine.com/"
@@ -711,12 +718,13 @@ RSpec.describe DiscourseConnect do
end
it "validates nonce" do
- _ , payload = DiscourseConnect.generate_url(secure_session: secure_session).split("?")
+ _, payload = DiscourseConnect.generate_url(secure_session: secure_session).split("?")
sso = DiscourseConnect.parse(payload, secure_session: secure_session)
expect(sso.nonce_valid?).to eq true
- other_session_sso = DiscourseConnect.parse(payload, secure_session: SecureSession.new("differentsession"))
+ other_session_sso =
+ DiscourseConnect.parse(payload, secure_session: SecureSession.new("differentsession"))
expect(other_session_sso.nonce_valid?).to eq false
sso.expire_nonce!
@@ -726,12 +734,13 @@ RSpec.describe DiscourseConnect do
it "allows disabling CSRF protection" do
SiteSetting.discourse_connect_csrf_protection = false
- _ , payload = DiscourseConnect.generate_url(secure_session: secure_session).split("?")
+ _, payload = DiscourseConnect.generate_url(secure_session: secure_session).split("?")
sso = DiscourseConnect.parse(payload, secure_session: secure_session)
expect(sso.nonce_valid?).to eq true
- other_session_sso = DiscourseConnect.parse(payload, secure_session: SecureSession.new("differentsession"))
+ other_session_sso =
+ DiscourseConnect.parse(payload, secure_session: SecureSession.new("differentsession"))
expect(other_session_sso.nonce_valid?).to eq true
sso.expire_nonce!
@@ -747,9 +756,9 @@ RSpec.describe DiscourseConnect do
expect(sso.nonce).to_not be_nil
end
- describe 'nonce error' do
+ describe "nonce error" do
it "generates correct error message when nonce has already been used" do
- _ , payload = DiscourseConnect.generate_url(secure_session: secure_session).split("?")
+ _, payload = DiscourseConnect.generate_url(secure_session: secure_session).split("?")
sso = DiscourseConnect.parse(payload, secure_session: secure_session)
expect(sso.nonce_valid?).to eq true
@@ -759,18 +768,20 @@ RSpec.describe DiscourseConnect do
end
it "generates correct error message when nonce is expired" do
- _ , payload = DiscourseConnect.generate_url(secure_session: secure_session).split("?")
+ _, payload = DiscourseConnect.generate_url(secure_session: secure_session).split("?")
sso = DiscourseConnect.parse(payload, secure_session: secure_session)
expect(sso.nonce_valid?).to eq true
Discourse.cache.delete(sso.used_nonce_key)
- expect(sso.nonce_error).to eq("Nonce is incorrect, was generated in a different browser session, or has expired")
+ expect(sso.nonce_error).to eq(
+ "Nonce is incorrect, was generated in a different browser session, or has expired",
+ )
end
it "generates correct error message when nonce is expired, and csrf protection disabled" do
SiteSetting.discourse_connect_csrf_protection = false
- _ , payload = DiscourseConnect.generate_url(secure_session: secure_session).split("?")
+ _, payload = DiscourseConnect.generate_url(secure_session: secure_session).split("?")
sso = DiscourseConnect.parse(payload, secure_session: secure_session)
expect(sso.nonce_valid?).to eq true
@@ -780,8 +791,8 @@ RSpec.describe DiscourseConnect do
end
end
- describe 'user locale' do
- it 'sets default user locale if specified' do
+ describe "user locale" do
+ it "sets default user locale if specified" do
SiteSetting.allow_user_locale = true
sso = new_discourse_sso
@@ -810,7 +821,7 @@ RSpec.describe DiscourseConnect do
end
end
- describe 'trusting emails' do
+ describe "trusting emails" do
let(:sso) do
sso = new_discourse_sso
sso.username = "test"
@@ -821,12 +832,12 @@ RSpec.describe DiscourseConnect do
sso
end
- it 'activates users by default' do
+ it "activates users by default" do
user = sso.lookup_or_create_user(ip_address)
expect(user.active).to eq(true)
end
- it 'does not activate user when asked not to' do
+ it "does not activate user when asked not to" do
sso.require_activation = true
user = sso.lookup_or_create_user(ip_address)
expect(user.active).to eq(false)
@@ -835,13 +846,12 @@ RSpec.describe DiscourseConnect do
sso.external_id = "B"
- expect do
- sso.lookup_or_create_user(ip_address)
- end.to raise_error(ActiveRecord::RecordInvalid)
-
+ expect do sso.lookup_or_create_user(ip_address) end.to raise_error(
+ ActiveRecord::RecordInvalid,
+ )
end
- it 'does not deactivate user if email provided is capitalized' do
+ it "does not deactivate user if email provided is capitalized" do
SiteSetting.email_editable = false
SiteSetting.auth_overrides_email = true
sso.require_activation = true
@@ -858,8 +868,7 @@ RSpec.describe DiscourseConnect do
expect(user.active).to eq(true)
end
- it 'deactivates accounts that have updated email address' do
-
+ it "deactivates accounts that have updated email address" do
SiteSetting.email_editable = false
SiteSetting.auth_overrides_email = true
sso.require_activation = true
@@ -873,25 +882,23 @@ RSpec.describe DiscourseConnect do
user = sso.lookup_or_create_user(ip_address)
expect(user.active).to eq(true)
- user.primary_email.update_columns(email: 'xXx@themovie.com')
+ user.primary_email.update_columns(email: "xXx@themovie.com")
user = sso.lookup_or_create_user(ip_address)
expect(user.email).to eq(old_email)
expect(user.active).to eq(false)
-
end
-
end
- describe 'welcome emails' do
- let(:sso) {
+ describe "welcome emails" do
+ let(:sso) do
sso = new_discourse_sso
sso.username = "test"
sso.name = "test"
sso.email = "test@example.com"
sso.external_id = "A"
sso
- }
+ end
it "sends a welcome email by default" do
User.any_instance.expects(:enqueue_welcome_message).once
@@ -905,18 +912,18 @@ RSpec.describe DiscourseConnect do
end
end
- describe 'setting title for a user' do
- let(:sso) {
+ describe "setting title for a user" do
+ let(:sso) do
sso = new_discourse_sso
- sso.username = 'test'
- sso.name = 'test'
- sso.email = 'test@test.com'
- sso.external_id = '100'
+ sso.username = "test"
+ sso.name = "test"
+ sso.email = "test@test.com"
+ sso.external_id = "100"
sso.title = "The User's Title"
sso
- }
+ end
- it 'sets title correctly' do
+ it "sets title correctly" do
user = sso.lookup_or_create_user(ip_address)
expect(user.title).to eq(sso.title)
@@ -932,7 +939,7 @@ RSpec.describe DiscourseConnect do
end
end
- describe 'setting bio for a user' do
+ describe "setting bio for a user" do
let(:sso) do
sso = new_discourse_sso
sso.username = "test"
@@ -944,7 +951,7 @@ RSpec.describe DiscourseConnect do
sso
end
- it 'can set bio if supplied on new users or users with empty bio' do
+ it "can set bio if supplied on new users or users with empty bio" do
# new account
user = sso.lookup_or_create_user(ip_address)
expect(user.user_profile.bio_cooked).to match_html(" This is the bio
")
@@ -956,7 +963,7 @@ RSpec.describe DiscourseConnect do
expect(user.user_profile.bio_cooked).to match_html("This is the bio
")
# yes override for blank
- user.user_profile.update!(bio_raw: '')
+ user.user_profile.update!(bio_raw: "")
user = sso.lookup_or_create_user(ip_address)
expect(user.user_profile.bio_cooked).to match_html("new profile
")
@@ -968,11 +975,9 @@ RSpec.describe DiscourseConnect do
user = sso.lookup_or_create_user(ip_address)
expect(user.user_profile.bio_cooked).to match_html("new profile 2 email @test.com" }
- let(:escaped_email) { "<b onmouseover=alert('wufff!')>email</b><script>alert('test');</script>@test.com" }
+ let(:xss_email) do
+ "email @test.com"
+ end
+ let(:escaped_email) do
+ "<b onmouseover=alert('wufff!')>email</b><script>alert('test');</script>@test.com"
+ end
- describe 'Validators' do
+ describe "Validators" do
it { is_expected.to validate_presence_of :invited_by_id }
it { is_expected.to rate_limit }
- it 'allows invites with valid emails' do
- invite = Fabricate.build(:invite, email: 'test@example.com', invited_by: user)
+ it "allows invites with valid emails" do
+ invite = Fabricate.build(:invite, email: "test@example.com", invited_by: user)
expect(invite).to be_valid
end
- it 'escapes the invalid email before attaching the error message' do
+ it "escapes the invalid email before attaching the error message" do
invite = Fabricate.build(:invite, email: xss_email)
expect(invite.valid?).to eq(false)
- expect(invite.errors.full_messages).to include(I18n.t('invite.invalid_email', email: escaped_email))
+ expect(invite.errors.full_messages).to include(
+ I18n.t("invite.invalid_email", email: escaped_email),
+ )
end
- it 'does not allow an invite with the same email as an existing user' do
+ it "does not allow an invite with the same email as an existing user" do
invite = Fabricate.build(:invite, email: Fabricate(:user).email, invited_by: user)
expect(invite).not_to be_valid
@@ -29,56 +35,62 @@ RSpec.describe Invite do
expect(invite).not_to be_valid
end
- it 'does not allow an invite with blocked email' do
- invite = Invite.create(email: 'test@mailinator.com', invited_by: user)
+ it "does not allow an invite with blocked email" do
+ invite = Invite.create(email: "test@mailinator.com", invited_by: user)
expect(invite).not_to be_valid
end
- it 'does not allow an invalid email address' do
- invite = Fabricate.build(:invite, email: 'asjdso')
+ it "does not allow an invalid email address" do
+ invite = Fabricate.build(:invite, email: "asjdso")
expect(invite.valid?).to eq(false)
- expect(invite.errors.full_messages).to include(I18n.t('invite.invalid_email', email: invite.email))
+ expect(invite.errors.full_messages).to include(
+ I18n.t("invite.invalid_email", email: invite.email),
+ )
end
- it 'allows only valid domains' do
- invite = Fabricate.build(:invite, email: nil, domain: 'example', invited_by: user)
+ it "allows only valid domains" do
+ invite = Fabricate.build(:invite, email: nil, domain: "example", invited_by: user)
expect(invite).not_to be_valid
- invite = Fabricate.build(:invite, email: nil, domain: 'example.com', invited_by: user)
+ invite = Fabricate.build(:invite, email: nil, domain: "example.com", invited_by: user)
expect(invite).to be_valid
end
- it 'allows only email or only domain to be present' do
+ it "allows only email or only domain to be present" do
invite = Fabricate.build(:invite, email: nil, invited_by: user)
expect(invite).to be_valid
- invite = Fabricate.build(:invite, email: nil, domain: 'example.com', invited_by: user)
+ invite = Fabricate.build(:invite, email: nil, domain: "example.com", invited_by: user)
expect(invite).to be_valid
- invite = Fabricate.build(:invite, email: 'test@example.com', invited_by: user)
+ invite = Fabricate.build(:invite, email: "test@example.com", invited_by: user)
expect(invite).to be_valid
- invite = Fabricate.build(:invite, email: 'test@example.com', domain: 'example.com', invited_by: user)
+ invite =
+ Fabricate.build(:invite, email: "test@example.com", domain: "example.com", invited_by: user)
expect(invite).not_to be_valid
- expect(invite.errors.full_messages).to include(I18n.t('invite.email_xor_domain'))
+ expect(invite.errors.full_messages).to include(I18n.t("invite.email_xor_domain"))
end
- it 'checks if redemption_count is less or equal than max_redemptions_allowed' do
- invite = Fabricate.build(:invite, redemption_count: 2, max_redemptions_allowed: 1, invited_by: user)
+ it "checks if redemption_count is less or equal than max_redemptions_allowed" do
+ invite =
+ Fabricate.build(:invite, redemption_count: 2, max_redemptions_allowed: 1, invited_by: user)
expect(invite).not_to be_valid
- expect(invite.errors.full_messages.first).to include(I18n.t('invite.redemption_count_less_than_max', max_redemptions_allowed: 1))
+ expect(invite.errors.full_messages.first).to include(
+ I18n.t("invite.redemption_count_less_than_max", max_redemptions_allowed: 1),
+ )
end
end
- describe 'before_save' do
- it 'regenerates the email token when email is changed' do
- invite = Fabricate(:invite, email: 'test@example.com')
+ describe "before_save" do
+ it "regenerates the email token when email is changed" do
+ invite = Fabricate(:invite, email: "test@example.com")
token = invite.email_token
- invite.update!(email: 'test@example.com')
+ invite.update!(email: "test@example.com")
expect(invite.email_token).to eq(token)
- invite.update!(email: 'test2@example.com')
+ invite.update!(email: "test2@example.com")
expect(invite.email_token).not_to eq(token)
invite.update!(email: nil)
@@ -86,114 +98,118 @@ RSpec.describe Invite do
end
end
- describe '.generate' do
- it 'saves an invites' do
- invite = Invite.generate(user, email: 'TEST@EXAMPLE.COM')
+ describe ".generate" do
+ it "saves an invites" do
+ invite = Invite.generate(user, email: "TEST@EXAMPLE.COM")
expect(invite.invite_key).to be_present
- expect(invite.email).to eq('test@example.com')
+ expect(invite.email).to eq("test@example.com")
end
- it 'can succeed for staged users emails' do
- Fabricate(:staged, email: 'test@example.com')
- invite = Invite.generate(user, email: 'test@example.com')
- expect(invite.email).to eq('test@example.com')
+ it "can succeed for staged users emails" do
+ Fabricate(:staged, email: "test@example.com")
+ invite = Invite.generate(user, email: "test@example.com")
+ expect(invite.email).to eq("test@example.com")
end
- it 'raises an error when inviting an existing user' do
- expect { Invite.generate(user, email: user.email) }
- .to raise_error(Invite::UserExists)
+ it "raises an error when inviting an existing user" do
+ expect { Invite.generate(user, email: user.email) }.to raise_error(Invite::UserExists)
end
- it 'escapes the email_address when raising an existing user error' do
+ it "escapes the email_address when raising an existing user error" do
user.email = xss_email
user.save(validate: false)
- expect { Invite.generate(user, email: user.email) }
- .to raise_error(
- Invite::UserExists,
- I18n.t('invite.user_exists', email: escaped_email)
- )
+ expect { Invite.generate(user, email: user.email) }.to raise_error(
+ Invite::UserExists,
+ I18n.t("invite.user_exists", email: escaped_email),
+ )
end
- context 'with email' do
- it 'can be created and a job is enqueued to email the invite' do
- invite = Invite.generate(user, email: 'test@example.com')
- expect(invite.email).to eq('test@example.com')
+ context "with email" do
+ it "can be created and a job is enqueued to email the invite" do
+ invite = Invite.generate(user, email: "test@example.com")
+ expect(invite.email).to eq("test@example.com")
expect(invite.emailed_status).to eq(Invite.emailed_status_types[:sending])
expect(invite.email_token).not_to eq(nil)
expect(Jobs::InviteEmail.jobs.size).to eq(1)
end
- it 'can skip the job to email the invite' do
- invite = Invite.generate(user, email: 'test@example.com', skip_email: true)
+ it "can skip the job to email the invite" do
+ invite = Invite.generate(user, email: "test@example.com", skip_email: true)
expect(invite.emailed_status).to eq(Invite.emailed_status_types[:not_required])
expect(Jobs::InviteEmail.jobs.size).to eq(0)
end
- it 'can invite the same user after their invite was destroyed' do
- Invite.generate(user, email: 'test@example.com').destroy!
- invite = Invite.generate(user, email: 'test@example.com')
+ it "can invite the same user after their invite was destroyed" do
+ Invite.generate(user, email: "test@example.com").destroy!
+ invite = Invite.generate(user, email: "test@example.com")
expect(invite).to be_present
end
end
- context 'with link' do
- it 'does not enqueue a job to email the invite' do
+ context "with link" do
+ it "does not enqueue a job to email the invite" do
invite = Invite.generate(user, skip_email: true)
expect(invite.emailed_status).to eq(Invite.emailed_status_types[:not_required])
expect(Jobs::InviteEmail.jobs.size).to eq(0)
end
- it 'can be created' do
+ it "can be created" do
invite = Invite.generate(user, max_redemptions_allowed: 5)
expect(invite.max_redemptions_allowed).to eq(5)
- expect(invite.expires_at.to_date).to eq(SiteSetting.invite_expiry_days.days.from_now.to_date)
+ expect(invite.expires_at.to_date).to eq(
+ SiteSetting.invite_expiry_days.days.from_now.to_date,
+ )
expect(invite.emailed_status).to eq(Invite.emailed_status_types[:not_required])
expect(invite.is_invite_link?).to eq(true)
expect(invite.email_token).to eq(nil)
end
- it 'checks for max_redemptions_allowed range' do
+ it "checks for max_redemptions_allowed range" do
SiteSetting.invite_link_max_redemptions_limit_users = 3
- expect { Invite.generate(user, max_redemptions_allowed: 4) }.to raise_error(ActiveRecord::RecordInvalid)
+ expect { Invite.generate(user, max_redemptions_allowed: 4) }.to raise_error(
+ ActiveRecord::RecordInvalid,
+ )
SiteSetting.invite_link_max_redemptions_limit = 3
- expect { Invite.generate(Fabricate(:admin), max_redemptions_allowed: 4) }.to raise_error(ActiveRecord::RecordInvalid)
+ expect { Invite.generate(Fabricate(:admin), max_redemptions_allowed: 4) }.to raise_error(
+ ActiveRecord::RecordInvalid,
+ )
end
end
- context 'when sending an invite to the same user' do
- fab!(:invite) { Invite.generate(user, email: 'test@example.com') }
+ context "when sending an invite to the same user" do
+ fab!(:invite) { Invite.generate(user, email: "test@example.com") }
- it 'returns the original invite' do
- %w{test@EXAMPLE.com TEST@example.com}.each do |email|
+ it "returns the original invite" do
+ %w[test@EXAMPLE.com TEST@example.com].each do |email|
expect(Invite.generate(user, email: email)).to eq(invite)
end
end
- it 'updates timestamp of existing invite' do
+ it "updates timestamp of existing invite" do
freeze_time
invite.update!(created_at: 10.days.ago)
- resend_invite = Invite.generate(user, email: 'test@example.com')
+ resend_invite = Invite.generate(user, email: "test@example.com")
expect(resend_invite).to eq(invite)
expect(resend_invite.created_at).to eq_time(Time.zone.now)
end
- it 'returns a new invite if the other has expired' do
+ it "returns a new invite if the other has expired" do
SiteSetting.invite_expiry_days = 1
invite.update!(expires_at: 2.days.ago)
- new_invite = Invite.generate(user, email: 'test@example.com')
+ new_invite = Invite.generate(user, email: "test@example.com")
expect(new_invite).not_to eq(invite)
expect(new_invite).not_to be_expired
end
- it 'returns a new invite when invited by a different user' do
- invite = Invite.generate(user, email: 'test@example.com')
- expect(invite.email).to eq('test@example.com')
+ it "returns a new invite when invited by a different user" do
+ invite = Invite.generate(user, email: "test@example.com")
+ expect(invite.email).to eq("test@example.com")
- another_invite = Invite.generate(Fabricate(:user), email: 'test@example.com')
- expect(another_invite.email).to eq('test@example.com')
+ another_invite = Invite.generate(Fabricate(:user), email: "test@example.com")
+ expect(another_invite.email).to eq("test@example.com")
expect(invite.invite_key).not_to eq(another_invite.invite_key)
end
@@ -201,36 +217,33 @@ RSpec.describe Invite do
context "when email is already invited 3 times" do
before do
RateLimiter.enable
- 3.times do
- Invite.generate(user, email: "test@example.com")
- end
+ 3.times { Invite.generate(user, email: "test@example.com") }
end
- after do
- RateLimiter.clear_all!
- end
+ after { RateLimiter.clear_all! }
it "raises an error" do
- expect { Invite.generate(user, email: "test@example.com") }
- .to raise_error(RateLimiter::LimitExceeded)
+ expect { Invite.generate(user, email: "test@example.com") }.to raise_error(
+ RateLimiter::LimitExceeded,
+ )
end
end
end
- context 'when inviting to a topic' do
+ context "when inviting to a topic" do
fab!(:topic) { Fabricate(:topic) }
- let(:invite) { Invite.generate(topic.user, email: 'test@example.com', topic: topic) }
+ let(:invite) { Invite.generate(topic.user, email: "test@example.com", topic: topic) }
- it 'belongs to the topic' do
+ it "belongs to the topic" do
expect(topic.invites).to contain_exactly(invite)
expect(invite.topics).to contain_exactly(topic)
end
- context 'when adding to another topic' do
+ context "when adding to another topic" do
fab!(:another_topic) { Fabricate(:topic, user: topic.user) }
- it 'should be the same invite' do
- new_invite = Invite.generate(topic.user, email: 'test@example.com', topic: another_topic)
+ it "should be the same invite" do
+ new_invite = Invite.generate(topic.user, email: "test@example.com", topic: another_topic)
expect(invite).to eq(new_invite)
expect(invite.topics).to contain_exactly(topic, another_topic)
expect(topic.invites).to contain_exactly(invite)
@@ -240,10 +253,10 @@ RSpec.describe Invite do
end
end
- describe '#redeem' do
+ describe "#redeem" do
fab!(:invite) { Fabricate(:invite) }
- it 'works' do
+ it "works" do
user = invite.redeem
expect(invite.invited_users.map(&:user)).to contain_exactly(user)
expect(user.is_a?(User)).to eq(true)
@@ -254,38 +267,39 @@ RSpec.describe Invite do
expect(invite.redeem).to be_blank
end
- it 'keeps custom fields' do
+ it "keeps custom fields" do
user_field = Fabricate(:user_field)
staged_user = Fabricate(:user, staged: true, email: invite.email)
- staged_user.set_user_field(user_field.id, 'some value')
+ staged_user.set_user_field(user_field.id, "some value")
staged_user.save_custom_fields
expect(invite.redeem).to eq(staged_user)
- expect(staged_user.reload.user_fields[user_field.id.to_s]).to eq('some value')
+ expect(staged_user.reload.user_fields[user_field.id.to_s]).to eq("some value")
end
- it 'creates a notification for the invitee' do
+ it "creates a notification for the invitee" do
expect { invite.redeem }.to change { Notification.count }
end
- it 'does not work with expired invites' do
+ it "does not work with expired invites" do
invite.update!(expires_at: 1.day.ago)
expect(invite.redeem).to be_blank
end
- it 'does not work with deleted invites' do
+ it "does not work with deleted invites" do
invite.trash!
expect(invite.redeem).to be_blank
end
- it 'does not work with invalidated invites' do
+ it "does not work with invalidated invites" do
invite.update!(invalidated_at: 1.day.ago)
expect(invite.redeem).to be_blank
end
- it 'deletes duplicate invite' do
+ it "deletes duplicate invite" do
another_invite = Fabricate(:invite, email: invite.email, invited_by: Fabricate(:user))
- another_redeemed_invite = Fabricate(:invite, email: invite.email, invited_by: Fabricate(:user))
+ another_redeemed_invite =
+ Fabricate(:invite, email: invite.email, invited_by: Fabricate(:user))
Fabricate(:invited_user, invite: another_redeemed_invite)
user = invite.redeem
@@ -294,15 +308,15 @@ RSpec.describe Invite do
expect(Invite.find_by(id: another_redeemed_invite.id)).not_to eq(nil)
end
- context 'as a moderator' do
- it 'will give the user a moderator flag' do
+ context "as a moderator" do
+ it "will give the user a moderator flag" do
invite.update!(moderator: true, invited_by: Fabricate(:admin))
user = invite.redeem
expect(user).to be_moderator
end
- it 'will not give the user a moderator flag if the inviter is not staff' do
+ it "will not give the user a moderator flag if the inviter is not staff" do
invite.update!(moderator: true)
user = invite.redeem
@@ -310,8 +324,8 @@ RSpec.describe Invite do
end
end
- context 'when inviting to groups' do
- it 'add the user to the correct groups' do
+ context "when inviting to groups" do
+ it "add the user to the correct groups" do
group = Fabricate(:group)
group.add_owner(invite.invited_by)
invite.invited_groups.create!(group_id: group.id)
@@ -321,15 +335,13 @@ RSpec.describe Invite do
end
end
- context 'when inviting to a topic' do
+ context "when inviting to a topic" do
fab!(:topic) { Fabricate(:private_message_topic) }
fab!(:another_topic) { Fabricate(:private_message_topic) }
- before do
- invite.topic_invites.create!(topic: topic)
- end
+ before { invite.topic_invites.create!(topic: topic) }
- it 'adds the user to topic_users' do
+ it "adds the user to topic_users" do
invited_user = invite.redeem
expect(invited_user).not_to eq(nil)
expect(topic.reload.allowed_users.include?(invited_user)).to eq(true)
@@ -338,129 +350,160 @@ RSpec.describe Invite do
end
end
- describe '#redeem_for_existing_user' do
- fab!(:invite) { Fabricate(:invite, email: 'test@example.com') }
+ describe "#redeem_for_existing_user" do
+ fab!(:invite) { Fabricate(:invite, email: "test@example.com") }
fab!(:user) { Fabricate(:user, email: invite.email) }
- it 'redeems the invite from email' do
+ it "redeems the invite from email" do
Invite.redeem_for_existing_user(user)
expect(invite.reload).to be_redeemed
end
- it 'does not redeem the invite if email does not match' do
- user.update!(email: 'test2@example.com')
+ it "does not redeem the invite if email does not match" do
+ user.update!(email: "test2@example.com")
Invite.redeem_for_existing_user(user)
expect(invite.reload).not_to be_redeemed
end
- it 'does not work with expired invites' do
+ it "does not work with expired invites" do
invite.update!(expires_at: 1.day.ago)
Invite.redeem_for_existing_user(user)
expect(invite).not_to be_redeemed
end
- it 'does not work with deleted invites' do
+ it "does not work with deleted invites" do
invite.trash!
Invite.redeem_for_existing_user(user)
expect(invite).not_to be_redeemed
end
- it 'does not work with invalidated invites' do
+ it "does not work with invalidated invites" do
invite.update!(invalidated_at: 1.day.ago)
Invite.redeem_for_existing_user(user)
expect(invite).not_to be_redeemed
end
end
- describe 'scopes' do
+ describe "scopes" do
fab!(:inviter) { Fabricate(:user) }
- fab!(:pending_invite) { Fabricate(:invite, invited_by: inviter, email: 'pending@example.com') }
- fab!(:pending_link_invite) { Fabricate(:invite, invited_by: inviter, email: nil, max_redemptions_allowed: 5) }
+ fab!(:pending_invite) { Fabricate(:invite, invited_by: inviter, email: "pending@example.com") }
+ fab!(:pending_link_invite) do
+ Fabricate(:invite, invited_by: inviter, email: nil, max_redemptions_allowed: 5)
+ end
fab!(:pending_invite_from_another_user) { Fabricate(:invite) }
- fab!(:expired_invite) { Fabricate(:invite, invited_by: inviter, email: 'expired@example.com', expires_at: 1.day.ago) }
+ fab!(:expired_invite) do
+ Fabricate(:invite, invited_by: inviter, email: "expired@example.com", expires_at: 1.day.ago)
+ end
- fab!(:redeemed_invite) { Fabricate(:invite, invited_by: inviter, email: 'redeemed@example.com') }
+ fab!(:redeemed_invite) do
+ Fabricate(:invite, invited_by: inviter, email: "redeemed@example.com")
+ end
let!(:redeemed_invite_user) { redeemed_invite.redeem }
- fab!(:partially_redeemed_invite) { Fabricate(:invite, invited_by: inviter, email: nil, max_redemptions_allowed: 5) }
- let!(:partially_redeemed_invite_user) { partially_redeemed_invite.redeem(email: 'partially_redeemed_invite@example.com') }
+ fab!(:partially_redeemed_invite) do
+ Fabricate(:invite, invited_by: inviter, email: nil, max_redemptions_allowed: 5)
+ end
+ let!(:partially_redeemed_invite_user) do
+ partially_redeemed_invite.redeem(email: "partially_redeemed_invite@example.com")
+ end
- fab!(:redeemed_and_expired_invite) { Fabricate(:invite, invited_by: inviter, email: 'redeemed_and_expired@example.com') }
+ fab!(:redeemed_and_expired_invite) do
+ Fabricate(:invite, invited_by: inviter, email: "redeemed_and_expired@example.com")
+ end
let!(:redeemed_and_expired_invite_user) do
user = redeemed_and_expired_invite.redeem
redeemed_and_expired_invite.update!(expires_at: 1.day.ago)
user
end
- fab!(:partially_redeemed_and_expired_invite) { Fabricate(:invite, invited_by: inviter, email: nil, max_redemptions_allowed: 5) }
+ fab!(:partially_redeemed_and_expired_invite) do
+ Fabricate(:invite, invited_by: inviter, email: nil, max_redemptions_allowed: 5)
+ end
let!(:partially_redeemed_and_expired_invite_user) do
- user = partially_redeemed_and_expired_invite.redeem(email: 'partially_redeemed_and_expired_invite@example.com')
+ user =
+ partially_redeemed_and_expired_invite.redeem(
+ email: "partially_redeemed_and_expired_invite@example.com",
+ )
partially_redeemed_and_expired_invite.update!(expires_at: 1.day.ago)
user
end
- describe '#pending' do
- it 'returns pending invites only' do
+ describe "#pending" do
+ it "returns pending invites only" do
expect(Invite.pending(inviter)).to contain_exactly(
- pending_invite, pending_link_invite, partially_redeemed_invite
+ pending_invite,
+ pending_link_invite,
+ partially_redeemed_invite,
)
end
end
- describe '#expired' do
- it 'returns expired invites only' do
+ describe "#expired" do
+ it "returns expired invites only" do
expect(Invite.expired(inviter)).to contain_exactly(
- expired_invite, partially_redeemed_and_expired_invite
+ expired_invite,
+ partially_redeemed_and_expired_invite,
)
end
end
- describe '#redeemed_users' do
- it 'returns redeemed users' do
+ describe "#redeemed_users" do
+ it "returns redeemed users" do
expect(Invite.redeemed_users(inviter).map(&:user)).to contain_exactly(
- redeemed_invite_user, partially_redeemed_invite_user, redeemed_and_expired_invite_user, partially_redeemed_and_expired_invite_user
+ redeemed_invite_user,
+ partially_redeemed_invite_user,
+ redeemed_and_expired_invite_user,
+ partially_redeemed_and_expired_invite_user,
)
end
- it 'returns redeemed users for trashed invites' do
- [redeemed_invite, partially_redeemed_invite, redeemed_and_expired_invite, partially_redeemed_and_expired_invite].each(&:trash!)
+ it "returns redeemed users for trashed invites" do
+ [
+ redeemed_invite,
+ partially_redeemed_invite,
+ redeemed_and_expired_invite,
+ partially_redeemed_and_expired_invite,
+ ].each(&:trash!)
expect(Invite.redeemed_users(inviter).map(&:user)).to contain_exactly(
- redeemed_invite_user, partially_redeemed_invite_user, redeemed_and_expired_invite_user, partially_redeemed_and_expired_invite_user
+ redeemed_invite_user,
+ partially_redeemed_invite_user,
+ redeemed_and_expired_invite_user,
+ partially_redeemed_and_expired_invite_user,
)
end
end
end
- describe '#invalidate_for_email' do
- it 'returns nil if there is no invite for the given email' do
- invite = Invite.invalidate_for_email('test@example.com')
+ describe "#invalidate_for_email" do
+ it "returns nil if there is no invite for the given email" do
+ invite = Invite.invalidate_for_email("test@example.com")
expect(invite).to eq(nil)
end
- it 'sets the matching invite to be invalid' do
- invite = Fabricate(:invite, invited_by: Fabricate(:user), email: 'test@example.com')
- result = Invite.invalidate_for_email('test@example.com')
+ it "sets the matching invite to be invalid" do
+ invite = Fabricate(:invite, invited_by: Fabricate(:user), email: "test@example.com")
+ result = Invite.invalidate_for_email("test@example.com")
expect(result).to eq(invite)
expect(result.link_valid?).to eq(false)
end
- it 'sets the matching invite to be invalid without being case-sensitive' do
- invite = Fabricate(:invite, invited_by: Fabricate(:user), email: 'test@Example.COM')
- result = Invite.invalidate_for_email('test@EXAMPLE.com')
+ it "sets the matching invite to be invalid without being case-sensitive" do
+ invite = Fabricate(:invite, invited_by: Fabricate(:user), email: "test@Example.COM")
+ result = Invite.invalidate_for_email("test@EXAMPLE.com")
expect(result).to eq(invite)
expect(result.link_valid?).to eq(false)
end
end
- describe '#resend_email' do
+ describe "#resend_email" do
fab!(:invite) { Fabricate(:invite) }
- it 'resets expiry of a resent invite' do
+ it "resets expiry of a resent invite" do
invite.update!(invalidated_at: 10.days.ago, expires_at: 10.days.ago)
expect(invite).to be_expired
diff --git a/spec/models/javascript_cache_spec.rb b/spec/models/javascript_cache_spec.rb
index b7af1fc6627..a2fec064570 100644
--- a/spec/models/javascript_cache_spec.rb
+++ b/spec/models/javascript_cache_spec.rb
@@ -1,11 +1,14 @@
# frozen_string_literal: true
RSpec.describe JavascriptCache, type: :model do
let!(:theme) { Fabricate(:theme) }
- let(:theme_field) { ThemeField.create!(theme: theme, target_id: 0, name: "header", value: "html ") }
+ let(:theme_field) do
+ ThemeField.create!(theme: theme, target_id: 0, name: "header", value: "html ")
+ end
- describe '#save' do
- it 'updates the digest only if the content has changed' do
- javascript_cache = JavascriptCache.create!(content: 'console.log("hello");', theme_field: theme_field)
+ describe "#save" do
+ it "updates the digest only if the content has changed" do
+ javascript_cache =
+ JavascriptCache.create!(content: 'console.log("hello");', theme_field: theme_field)
expect(javascript_cache.digest).to_not be_empty
expect { javascript_cache.save! }.to_not change { javascript_cache.reload.digest }
@@ -16,10 +19,11 @@ RSpec.describe JavascriptCache, type: :model do
end.to change { javascript_cache.reload.digest }
end
- it 'allows content to be empty, but not nil' do
- javascript_cache = JavascriptCache.create!(content: 'console.log("hello");', theme_field: theme_field)
+ it "allows content to be empty, but not nil" do
+ javascript_cache =
+ JavascriptCache.create!(content: 'console.log("hello");', theme_field: theme_field)
- javascript_cache.content = ''
+ javascript_cache.content = ""
expect(javascript_cache.valid?).to eq(true)
javascript_cache.content = nil
@@ -28,9 +32,10 @@ RSpec.describe JavascriptCache, type: :model do
end
end
- describe 'url' do
- it 'works with multisite' do
- javascript_cache = JavascriptCache.create!(content: 'console.log("hello");', theme_field: theme_field)
+ describe "url" do
+ it "works with multisite" do
+ javascript_cache =
+ JavascriptCache.create!(content: 'console.log("hello");', theme_field: theme_field)
expect(javascript_cache.url).to include("?__ws=test.localhost")
end
end
diff --git a/spec/models/locale_site_setting_spec.rb b/spec/models/locale_site_setting_spec.rb
index 2e21338c285..87d555e8986 100644
--- a/spec/models/locale_site_setting_spec.rb
+++ b/spec/models/locale_site_setting_spec.rb
@@ -2,8 +2,8 @@
RSpec.describe LocaleSiteSetting do
def core_locales
- pattern = File.join(Rails.root, 'config', 'locales', 'client.*.yml')
- Dir.glob(pattern).map { |x| x.split('.')[-2] }
+ pattern = File.join(Rails.root, "config", "locales", "client.*.yml")
+ Dir.glob(pattern).map { |x| x.split(".")[-2] }
end
def native_locale_name(locale)
@@ -11,34 +11,43 @@ RSpec.describe LocaleSiteSetting do
value[:name]
end
- describe '.valid_value?' do
- it 'returns true for a locale that we have translations for' do
- expect(LocaleSiteSetting.valid_value?('en')).to eq(true)
+ describe ".valid_value?" do
+ it "returns true for a locale that we have translations for" do
+ expect(LocaleSiteSetting.valid_value?("en")).to eq(true)
end
- it 'returns false for a locale that we do not have translations for' do
- expect(LocaleSiteSetting.valid_value?('swedish-chef')).to eq(false)
+ it "returns false for a locale that we do not have translations for" do
+ expect(LocaleSiteSetting.valid_value?("swedish-chef")).to eq(false)
end
end
- describe '.values' do
- it 'returns all the locales that we have translations for' do
+ describe ".values" do
+ it "returns all the locales that we have translations for" do
expect(LocaleSiteSetting.values.map { |x| x[:value] }).to include(*core_locales)
end
- it 'returns native names' do
- expect(native_locale_name('de')).to eq('Deutsch')
- expect(native_locale_name('zh_CN')).to eq('简体中文')
- expect(native_locale_name('zh_TW')).to eq('繁體中文')
+ it "returns native names" do
+ expect(native_locale_name("de")).to eq("Deutsch")
+ expect(native_locale_name("zh_CN")).to eq("简体中文")
+ expect(native_locale_name("zh_TW")).to eq("繁體中文")
end
end
- context 'with locales from plugin' do
+ context "with locales from plugin" do
before do
DiscoursePluginRegistry.register_locale("foo", name: "Foo", nativeName: "Native Foo")
DiscoursePluginRegistry.register_locale("bar", name: "Bar", nativeName: "Native Bar")
- DiscoursePluginRegistry.register_locale("de", name: "Renamed German", nativeName: "Native renamed German")
- DiscoursePluginRegistry.register_locale("de_AT", name: "German (Austria)", nativeName: "Österreichisch", fallbackLocale: "de")
+ DiscoursePluginRegistry.register_locale(
+ "de",
+ name: "Renamed German",
+ nativeName: "Native renamed German",
+ )
+ DiscoursePluginRegistry.register_locale(
+ "de_AT",
+ name: "German (Austria)",
+ nativeName: "Österreichisch",
+ fallbackLocale: "de",
+ )
DiscoursePluginRegistry.register_locale("tlh")
# Plugins normally register a locale before LocaleSiteSetting is initialized.
@@ -51,52 +60,52 @@ RSpec.describe LocaleSiteSetting do
LocaleSiteSetting.reset!
end
- describe '.valid_value?' do
- it 'returns true for locales from core' do
- expect(LocaleSiteSetting.valid_value?('en')).to eq(true)
- expect(LocaleSiteSetting.valid_value?('de')).to eq(true)
+ describe ".valid_value?" do
+ it "returns true for locales from core" do
+ expect(LocaleSiteSetting.valid_value?("en")).to eq(true)
+ expect(LocaleSiteSetting.valid_value?("de")).to eq(true)
end
- it 'returns true for locales added by plugins' do
- expect(LocaleSiteSetting.valid_value?('foo')).to eq(true)
- expect(LocaleSiteSetting.valid_value?('bar')).to eq(true)
+ it "returns true for locales added by plugins" do
+ expect(LocaleSiteSetting.valid_value?("foo")).to eq(true)
+ expect(LocaleSiteSetting.valid_value?("bar")).to eq(true)
end
end
- describe '.values' do
- it 'returns native names added by plugin' do
- expect(native_locale_name('foo')).to eq('Native Foo')
- expect(native_locale_name('bar')).to eq('Native Bar')
+ describe ".values" do
+ it "returns native names added by plugin" do
+ expect(native_locale_name("foo")).to eq("Native Foo")
+ expect(native_locale_name("bar")).to eq("Native Bar")
end
- it 'does not allow plugins to override native names that exist in core' do
- expect(native_locale_name('de')).to eq('Deutsch')
+ it "does not allow plugins to override native names that exist in core" do
+ expect(native_locale_name("de")).to eq("Deutsch")
end
- it 'returns the language code when no nativeName is set' do
- expect(native_locale_name('tlh')).to eq('tlh')
+ it "returns the language code when no nativeName is set" do
+ expect(native_locale_name("tlh")).to eq("tlh")
end
end
- describe '.fallback_locale' do
- it 'returns the fallback locale registered by plugin' do
- expect(LocaleSiteSetting.fallback_locale('de_AT')).to eq(:de)
+ describe ".fallback_locale" do
+ it "returns the fallback locale registered by plugin" do
+ expect(LocaleSiteSetting.fallback_locale("de_AT")).to eq(:de)
expect(LocaleSiteSetting.fallback_locale(:de_AT)).to eq(:de)
end
- it 'returns nothing when no fallback locale was registered' do
- expect(LocaleSiteSetting.fallback_locale('foo')).to be_nil
+ it "returns nothing when no fallback locale was registered" do
+ expect(LocaleSiteSetting.fallback_locale("foo")).to be_nil
end
- it 'returns English for English (UK)' do
- expect(LocaleSiteSetting.fallback_locale('en_GB')).to eq(:en)
+ it "returns English for English (UK)" do
+ expect(LocaleSiteSetting.fallback_locale("en_GB")).to eq(:en)
end
end
end
- describe '.fallback_locale' do
- it 'returns English for English (UK)' do
- expect(LocaleSiteSetting.fallback_locale('en_GB')).to eq(:en)
+ describe ".fallback_locale" do
+ it "returns English for English (UK)" do
+ expect(LocaleSiteSetting.fallback_locale("en_GB")).to eq(:en)
end
end
end
diff --git a/spec/models/mailing_list_mode_site_setting_spec.rb b/spec/models/mailing_list_mode_site_setting_spec.rb
index 0013cbe7c1c..c2cc01d19b7 100644
--- a/spec/models/mailing_list_mode_site_setting_spec.rb
+++ b/spec/models/mailing_list_mode_site_setting_spec.rb
@@ -1,19 +1,17 @@
# frozen_string_literal: true
RSpec.describe MailingListModeSiteSetting do
- describe 'valid_value?' do
- it 'returns true for a valid value as an int' do
+ describe "valid_value?" do
+ it "returns true for a valid value as an int" do
expect(MailingListModeSiteSetting.valid_value?(1)).to eq(true)
end
- it 'returns true for a valid value as a string' do
- expect(MailingListModeSiteSetting.valid_value?('1')).to eq(true)
+ it "returns true for a valid value as a string" do
+ expect(MailingListModeSiteSetting.valid_value?("1")).to eq(true)
end
- it 'returns false for an out of range value' do
- [0, 3].each do |value|
- expect(MailingListModeSiteSetting.valid_value?(value)).to eq(false)
- end
+ it "returns false for an out of range value" do
+ [0, 3].each { |value| expect(MailingListModeSiteSetting.valid_value?(value)).to eq(false) }
end
end
end
diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb
index 173d8de0eaf..ee3c09c4d9b 100644
--- a/spec/models/notification_spec.rb
+++ b/spec/models/notification_spec.rb
@@ -4,9 +4,7 @@ RSpec.describe Notification do
fab!(:user) { Fabricate(:user) }
fab!(:coding_horror) { Fabricate(:coding_horror) }
- before do
- NotificationEmailer.enable
- end
+ before { NotificationEmailer.enable }
it { is_expected.to validate_presence_of :notification_type }
it { is_expected.to validate_presence_of :data }
@@ -14,11 +12,9 @@ RSpec.describe Notification do
it { is_expected.to belong_to :user }
it { is_expected.to belong_to :topic }
- describe '#types' do
+ describe "#types" do
context "when verifying enum sequence" do
- before do
- @types = Notification.types
- end
+ before { @types = Notification.types }
it "has a correct position for each type" do
expect(@types[:mentioned]).to eq(1)
@@ -56,22 +52,18 @@ RSpec.describe Notification do
end
end
- describe 'post' do
+ describe "post" do
let(:topic) { Fabricate(:topic) }
- let(:post_args) do
- { user: topic.user, topic: topic }
- end
+ let(:post_args) { { user: topic.user, topic: topic } }
- describe 'replies' do
+ describe "replies" do
def process_alerts(post)
PostAlerter.post_created(post)
end
- let(:post) {
- process_alerts(Fabricate(:post, post_args.merge(raw: "Hello @CodingHorror")))
- }
+ let(:post) { process_alerts(Fabricate(:post, post_args.merge(raw: "Hello @CodingHorror"))) }
- it 'notifies the poster on reply' do
+ it "notifies the poster on reply" do
expect {
reply = Fabricate(:basic_reply, user: coding_horror, topic: post.topic)
process_alerts(reply)
@@ -86,7 +78,7 @@ RSpec.describe Notification do
end
end
- describe 'watching' do
+ describe "watching" do
it "does notify watching users of new posts" do
post = PostAlerter.post_created(Fabricate(:post, post_args))
user2 = coding_horror
@@ -97,7 +89,7 @@ RSpec.describe Notification do
end
end
- describe 'muting' do
+ describe "muting" do
it "does not notify users of new posts" do
post = Fabricate(:post, post_args)
user = post_args[:user]
@@ -105,93 +97,144 @@ RSpec.describe Notification do
post_args[:topic].notify_muted!(user)
expect {
- Fabricate(:post, user: user2, topic: post.topic, raw: 'hello @' + user.username)
+ Fabricate(:post, user: user2, topic: post.topic, raw: "hello @" + user.username)
}.not_to change(user.notifications, :count)
end
end
end
- describe 'high priority creation' do
+ describe "high priority creation" do
fab!(:user) { Fabricate(:user) }
it "automatically marks the notification as high priority if it is a high priority type" do
- notif = Notification.create(user: user, notification_type: Notification.types[:bookmark_reminder], data: {})
+ notif =
+ Notification.create(
+ user: user,
+ notification_type: Notification.types[:bookmark_reminder],
+ data: {
+ },
+ )
expect(notif.high_priority).to eq(true)
- notif = Notification.create(user: user, notification_type: Notification.types[:private_message], data: {})
+ notif =
+ Notification.create(
+ user: user,
+ notification_type: Notification.types[:private_message],
+ data: {
+ },
+ )
expect(notif.high_priority).to eq(true)
- notif = Notification.create(user: user, notification_type: Notification.types[:liked], data: {})
+ notif =
+ Notification.create(user: user, notification_type: Notification.types[:liked], data: {})
expect(notif.high_priority).to eq(false)
end
it "allows manually specifying a notification is high priority" do
- notif = Notification.create(user: user, notification_type: Notification.types[:liked], data: {}, high_priority: true)
+ notif =
+ Notification.create(
+ user: user,
+ notification_type: Notification.types[:liked],
+ data: {
+ },
+ high_priority: true,
+ )
expect(notif.high_priority).to eq(true)
end
end
- describe 'unread counts' do
+ describe "unread counts" do
fab!(:user) { Fabricate(:user) }
- context 'with a regular notification' do
- it 'increases unread_notifications' do
- expect { Fabricate(:notification, user: user); user.reload }.to change(user, :unread_notifications)
+ context "with a regular notification" do
+ it "increases unread_notifications" do
+ expect {
+ Fabricate(:notification, user: user)
+ user.reload
+ }.to change(user, :unread_notifications)
end
- it 'increases total_unread_notifications' do
- expect { Fabricate(:notification, user: user); user.reload }.to change(user, :total_unread_notifications)
+ it "increases total_unread_notifications" do
+ expect {
+ Fabricate(:notification, user: user)
+ user.reload
+ }.to change(user, :total_unread_notifications)
end
it "doesn't increase unread_private_messages" do
- expect { Fabricate(:notification, user: user); user.reload }.not_to change(user, :unread_private_messages)
+ expect {
+ Fabricate(:notification, user: user)
+ user.reload
+ }.not_to change(user, :unread_private_messages)
end
end
- context 'with a private message' do
+ context "with a private message" do
it "doesn't increase unread_notifications" do
- expect { Fabricate(:private_message_notification, user: user); user.reload }.not_to change(user, :unread_notifications)
+ expect {
+ Fabricate(:private_message_notification, user: user)
+ user.reload
+ }.not_to change(user, :unread_notifications)
end
- it 'increases total_unread_notifications' do
- expect { Fabricate(:notification, user: user); user.reload }.to change(user, :total_unread_notifications)
+ it "increases total_unread_notifications" do
+ expect {
+ Fabricate(:notification, user: user)
+ user.reload
+ }.to change(user, :total_unread_notifications)
end
it "increases unread_private_messages" do
- expect { Fabricate(:private_message_notification, user: user); user.reload }.to change(user, :unread_private_messages)
+ expect {
+ Fabricate(:private_message_notification, user: user)
+ user.reload
+ }.to change(user, :unread_private_messages)
end
it "increases unread_high_priority_notifications" do
- expect { Fabricate(:private_message_notification, user: user); user.reload }.to change(user, :unread_high_priority_notifications)
+ expect {
+ Fabricate(:private_message_notification, user: user)
+ user.reload
+ }.to change(user, :unread_high_priority_notifications)
end
end
- context 'with a bookmark reminder message' do
+ context "with a bookmark reminder message" do
it "doesn't increase unread_notifications" do
- expect { Fabricate(:bookmark_reminder_notification, user: user); user.reload }.not_to change(user, :unread_notifications)
+ expect {
+ Fabricate(:bookmark_reminder_notification, user: user)
+ user.reload
+ }.not_to change(user, :unread_notifications)
end
- it 'increases total_unread_notifications' do
- expect { Fabricate(:notification, user: user); user.reload }.to change(user, :total_unread_notifications)
+ it "increases total_unread_notifications" do
+ expect {
+ Fabricate(:notification, user: user)
+ user.reload
+ }.to change(user, :total_unread_notifications)
end
it "increases unread_high_priority_notifications" do
- expect { Fabricate(:bookmark_reminder_notification, user: user); user.reload }.to change(user, :unread_high_priority_notifications)
+ expect {
+ Fabricate(:bookmark_reminder_notification, user: user)
+ user.reload
+ }.to change(user, :unread_high_priority_notifications)
end
end
end
- describe 'message bus' do
+ describe "message bus" do
fab!(:user) { Fabricate(:user, last_seen_at: 1.day.ago) }
- it 'updates the notification count on create' do
+ it "updates the notification count on create" do
Notification.any_instance.expects(:refresh_notification_count).returns(nil)
Fabricate(:notification)
end
- it 'works' do
- messages = MessageBus.track_publish do
- user.notifications.create!(notification_type: Notification.types[:mentioned], data: '{}')
- user.notifications.create!(notification_type: Notification.types[:mentioned], data: '{}')
- end
+ it "works" do
+ messages =
+ MessageBus.track_publish do
+ user.notifications.create!(notification_type: Notification.types[:mentioned], data: "{}")
+ user.notifications.create!(notification_type: Notification.types[:mentioned], data: "{}")
+ end
expect(messages.size).to eq(2)
expect(messages[0].channel).to eq("/notification/#{user.id}")
@@ -200,36 +243,44 @@ RSpec.describe Notification do
expect(messages[1].data[:unread_notifications]).to eq(2)
end
- it 'works for partial model instances' do
+ it "works for partial model instances" do
NotificationEmailer.disable
partial_user = User.select(:id).find_by(id: user.id)
- partial_user.notifications.create!(notification_type: Notification.types[:mentioned], data: '{}')
+ partial_user.notifications.create!(
+ notification_type: Notification.types[:mentioned],
+ data: "{}",
+ )
end
- context 'when destroying' do
+ context "when destroying" do
let!(:notification) { Fabricate(:notification) }
- it 'updates the notification count on destroy' do
+ it "updates the notification count on destroy" do
Notification.any_instance.expects(:refresh_notification_count).returns(nil)
notification.destroy!
end
-
end
end
- describe 'private message' do
+ describe "private message" do
before do
@topic = Fabricate(:private_message_topic)
@post = Fabricate(:post, topic: @topic, user: @topic.user)
@target = @post.topic.topic_allowed_users.reject { |a| a.user_id == @post.user_id }[0].user
- TopicUser.change(@target.id, @topic.id, notification_level: TopicUser.notification_levels[:watching])
+ TopicUser.change(
+ @target.id,
+ @topic.id,
+ notification_level: TopicUser.notification_levels[:watching],
+ )
PostAlerter.post_created(@post)
end
- it 'should create and rollup private message notifications' do
- expect(@target.notifications.first.notification_type).to eq(Notification.types[:private_message])
+ it "should create and rollup private message notifications" do
+ expect(@target.notifications.first.notification_type).to eq(
+ Notification.types[:private_message],
+ )
expect(@post.user.unread_notifications).to eq(0)
expect(@post.user.total_unread_notifications).to eq(0)
expect(@target.unread_private_messages).to eq(1)
@@ -238,56 +289,62 @@ RSpec.describe Notification do
@target.reload
expect(@target.unread_private_messages).to eq(1)
end
-
end
- describe '.post' do
-
+ describe ".post" do
let(:post) { Fabricate(:post) }
- let!(:notification) { Fabricate(:notification, user: post.user, topic: post.topic, post_number: post.post_number) }
-
- it 'returns the post' do
- expect(notification.post).to eq(post)
+ let!(:notification) do
+ Fabricate(:notification, user: post.user, topic: post.topic, post_number: post.post_number)
end
+ it "returns the post" do
+ expect(notification.post).to eq(post)
+ end
end
- describe 'data' do
+ describe "data" do
let(:notification) { Fabricate.build(:notification) }
- it 'should have a data hash' do
+ it "should have a data hash" do
expect(notification.data_hash).to be_present
end
- it 'should have the data within the json' do
- expect(notification.data_hash[:poison]).to eq('ivy')
+ it "should have the data within the json" do
+ expect(notification.data_hash[:poison]).to eq("ivy")
end
end
- describe 'saw_regular_notification_id' do
- it 'correctly updates the read state' do
+ describe "saw_regular_notification_id" do
+ it "correctly updates the read state" do
t = Fabricate(:topic)
- Notification.create!(read: false,
- user_id: user.id,
- topic_id: t.id,
- post_number: 1,
- data: '{}',
- notification_type: Notification.types[:private_message])
+ Notification.create!(
+ read: false,
+ user_id: user.id,
+ topic_id: t.id,
+ post_number: 1,
+ data: "{}",
+ notification_type: Notification.types[:private_message],
+ )
- Notification.create!(read: false,
- user_id: user.id,
- topic_id: t.id,
- post_number: 1,
- data: '{}',
- notification_type: Notification.types[:bookmark_reminder])
+ Notification.create!(
+ read: false,
+ user_id: user.id,
+ topic_id: t.id,
+ post_number: 1,
+ data: "{}",
+ notification_type: Notification.types[:bookmark_reminder],
+ )
- other = Notification.create!(read: false,
- user_id: user.id,
- topic_id: t.id,
- post_number: 1,
- data: '{}',
- notification_type: Notification.types[:mentioned])
+ other =
+ Notification.create!(
+ read: false,
+ user_id: user.id,
+ topic_id: t.id,
+ post_number: 1,
+ data: "{}",
+ notification_type: Notification.types[:mentioned],
+ )
user.bump_last_seen_notification!
user.reload
@@ -301,34 +358,73 @@ RSpec.describe Notification do
end
end
- describe 'mark_posts_read' do
+ describe "mark_posts_read" do
it "marks multiple posts as read if needed" do
(1..3).map do |i|
- Notification.create!(read: false, user_id: user.id, topic_id: 2, post_number: i, data: '{}', notification_type: 1)
+ Notification.create!(
+ read: false,
+ user_id: user.id,
+ topic_id: 2,
+ post_number: i,
+ data: "{}",
+ notification_type: 1,
+ )
end
- Notification.create!(read: true, user_id: user.id, topic_id: 2, post_number: 4, data: '{}', notification_type: 1)
+ Notification.create!(
+ read: true,
+ user_id: user.id,
+ topic_id: 2,
+ post_number: 4,
+ data: "{}",
+ notification_type: 1,
+ )
- expect { Notification.mark_posts_read(user, 2, [1, 2, 3, 4]) }.to change { Notification.where(read: true).count }.by(3)
+ expect { Notification.mark_posts_read(user, 2, [1, 2, 3, 4]) }.to change {
+ Notification.where(read: true).count
+ }.by(3)
end
end
- describe '#ensure_consistency!' do
- it 'deletes notifications if post is missing or deleted' do
-
+ describe "#ensure_consistency!" do
+ it "deletes notifications if post is missing or deleted" do
NotificationEmailer.disable
p = Fabricate(:post)
p2 = Fabricate(:post)
- Notification.create!(read: false, user_id: p.user_id, topic_id: p.topic_id, post_number: p.post_number, data: '[]',
- notification_type: Notification.types[:private_message])
- Notification.create!(read: false, user_id: p2.user_id, topic_id: p2.topic_id, post_number: p2.post_number, data: '[]',
- notification_type: Notification.types[:private_message])
- Notification.create!(read: false, user_id: p2.user_id, topic_id: p2.topic_id, post_number: p2.post_number, data: '[]',
- notification_type: Notification.types[:bookmark_reminder])
+ Notification.create!(
+ read: false,
+ user_id: p.user_id,
+ topic_id: p.topic_id,
+ post_number: p.post_number,
+ data: "[]",
+ notification_type: Notification.types[:private_message],
+ )
+ Notification.create!(
+ read: false,
+ user_id: p2.user_id,
+ topic_id: p2.topic_id,
+ post_number: p2.post_number,
+ data: "[]",
+ notification_type: Notification.types[:private_message],
+ )
+ Notification.create!(
+ read: false,
+ user_id: p2.user_id,
+ topic_id: p2.topic_id,
+ post_number: p2.post_number,
+ data: "[]",
+ notification_type: Notification.types[:bookmark_reminder],
+ )
- Notification.create!(read: false, user_id: p2.user_id, topic_id: p2.topic_id, post_number: p2.post_number, data: '[]',
- notification_type: Notification.types[:liked])
+ Notification.create!(
+ read: false,
+ user_id: p2.user_id,
+ topic_id: p2.topic_id,
+ post_number: p2.post_number,
+ data: "[]",
+ notification_type: Notification.types[:liked],
+ )
p2.trash!(p.user)
# we may want to make notification "trashable" but for now we nuke pm notifications from deleted topics/posts
@@ -337,27 +433,53 @@ RSpec.describe Notification do
expect(Notification.count).to eq(2)
end
- it 'does not delete notifications that do not have a topic_id' do
- Notification.create!(read: false, user_id: user.id, topic_id: nil, post_number: nil, data: '[]',
- notification_type: Notification.types[:chat_mention], high_priority: true)
- expect {
- Notification.ensure_consistency!
- }.to_not change { Notification.count }
+ it "does not delete notifications that do not have a topic_id" do
+ Notification.create!(
+ read: false,
+ user_id: user.id,
+ topic_id: nil,
+ post_number: nil,
+ data: "[]",
+ notification_type: Notification.types[:chat_mention],
+ high_priority: true,
+ )
+ expect { Notification.ensure_consistency! }.to_not change { Notification.count }
end
end
describe "do not disturb" do
it "calls NotificationEmailer.process_notification when user is not in 'do not disturb'" do
- notification = Notification.new(read: false, user_id: user.id, topic_id: 2, post_number: 1, data: '{}', notification_type: 1)
+ notification =
+ Notification.new(
+ read: false,
+ user_id: user.id,
+ topic_id: 2,
+ post_number: 1,
+ data: "{}",
+ notification_type: 1,
+ )
NotificationEmailer.expects(:process_notification).with(notification)
notification.save!
end
it "doesn't call NotificationEmailer.process_notification when user is in 'do not disturb'" do
freeze_time
- Fabricate(:do_not_disturb_timing, user: user, starts_at: Time.zone.now, ends_at: 1.day.from_now)
+ Fabricate(
+ :do_not_disturb_timing,
+ user: user,
+ starts_at: Time.zone.now,
+ ends_at: 1.day.from_now,
+ )
- notification = Notification.new(read: false, user_id: user.id, topic_id: 2, post_number: 1, data: '{}', notification_type: 1)
+ notification =
+ Notification.new(
+ read: false,
+ user_id: user.id,
+ topic_id: 2,
+ post_number: 1,
+ data: "{}",
+ notification_type: 1,
+ )
NotificationEmailer.expects(:process_notification).with(notification).never
notification.save!
end
@@ -368,52 +490,71 @@ end
RSpec.describe Notification do
fab!(:user) { Fabricate(:user) }
- describe '.prioritized_list' do
+ describe ".prioritized_list" do
def create(**opts)
opts[:user] = user if !opts[:user]
Fabricate(:notification, user: user, **opts)
end
- fab!(:unread_high_priority_1) { create(high_priority: true, read: false, created_at: 8.minutes.ago) }
- fab!(:read_high_priority_1) { create(high_priority: true, read: true, created_at: 7.minutes.ago) }
+ fab!(:unread_high_priority_1) do
+ create(high_priority: true, read: false, created_at: 8.minutes.ago)
+ end
+ fab!(:read_high_priority_1) do
+ create(high_priority: true, read: true, created_at: 7.minutes.ago)
+ end
fab!(:unread_regular_1) { create(high_priority: false, read: false, created_at: 6.minutes.ago) }
fab!(:read_regular_1) { create(high_priority: false, read: true, created_at: 5.minutes.ago) }
- fab!(:unread_like) { create(high_priority: false, read: false, created_at: 130.seconds.ago, notification_type: Notification.types[:liked]) }
+ fab!(:unread_like) do
+ create(
+ high_priority: false,
+ read: false,
+ created_at: 130.seconds.ago,
+ notification_type: Notification.types[:liked],
+ )
+ end
- fab!(:unread_high_priority_2) { create(high_priority: true, read: false, created_at: 1.minutes.ago) }
- fab!(:read_high_priority_2) { create(high_priority: true, read: true, created_at: 2.minutes.ago) }
+ fab!(:unread_high_priority_2) do
+ create(high_priority: true, read: false, created_at: 1.minutes.ago)
+ end
+ fab!(:read_high_priority_2) do
+ create(high_priority: true, read: true, created_at: 2.minutes.ago)
+ end
fab!(:unread_regular_2) { create(high_priority: false, read: false, created_at: 3.minutes.ago) }
fab!(:read_regular_2) { create(high_priority: false, read: true, created_at: 4.minutes.ago) }
it "puts unread high_priority on top followed by unread normal notifications and then everything else in reverse chronological order" do
- expect(Notification.prioritized_list(user).map(&:id)).to eq([
- unread_high_priority_2,
- unread_high_priority_1,
- unread_regular_2,
- unread_regular_1,
- read_high_priority_2,
- unread_like,
- read_regular_2,
- read_regular_1,
- read_high_priority_1,
- ].map(&:id))
+ expect(Notification.prioritized_list(user).map(&:id)).to eq(
+ [
+ unread_high_priority_2,
+ unread_high_priority_1,
+ unread_regular_2,
+ unread_regular_1,
+ read_high_priority_2,
+ unread_like,
+ read_regular_2,
+ read_regular_1,
+ read_high_priority_1,
+ ].map(&:id),
+ )
end
it "doesn't include notifications from other users" do
another_user_notification = create(high_priority: true, read: false, user: Fabricate(:user))
- expect(Notification.prioritized_list(user).map(&:id)).to contain_exactly(*[
- unread_high_priority_2,
- unread_high_priority_1,
- unread_regular_2,
- unread_regular_1,
- read_high_priority_2,
- unread_like,
- read_regular_2,
- read_regular_1,
- read_high_priority_1,
- ].map(&:id))
+ expect(Notification.prioritized_list(user).map(&:id)).to contain_exactly(
+ *[
+ unread_high_priority_2,
+ unread_high_priority_1,
+ unread_regular_2,
+ unread_regular_1,
+ read_high_priority_2,
+ unread_like,
+ read_regular_2,
+ read_regular_1,
+ read_high_priority_1,
+ ].map(&:id),
+ )
expect(
- Notification.prioritized_list(another_user_notification.user).map(&:id)
+ Notification.prioritized_list(another_user_notification.user).map(&:id),
).to contain_exactly(another_user_notification.id)
end
@@ -421,79 +562,89 @@ RSpec.describe Notification do
unread_high_priority_1.topic.trash!
unread_regular_2.topic.trash!
read_regular_1.topic.trash!
- expect(Notification.prioritized_list(user).map(&:id)).to contain_exactly(*[
- unread_high_priority_2,
- unread_regular_1,
- read_high_priority_2,
- unread_like,
- read_regular_2,
- read_high_priority_1,
- ].map(&:id))
+ expect(Notification.prioritized_list(user).map(&:id)).to contain_exactly(
+ *[
+ unread_high_priority_2,
+ unread_regular_1,
+ read_high_priority_2,
+ unread_like,
+ read_regular_2,
+ read_high_priority_1,
+ ].map(&:id),
+ )
end
it "doesn't include like notifications if the user doesn't want like notifications" do
user.user_option.update!(
- like_notification_frequency:
- UserOption.like_notification_frequency_type[:never]
+ like_notification_frequency: UserOption.like_notification_frequency_type[:never],
)
unread_regular_1.update!(notification_type: Notification.types[:liked])
read_regular_2.update!(notification_type: Notification.types[:liked_consolidated])
- expect(Notification.prioritized_list(user).map(&:id)).to eq([
- unread_high_priority_2,
- unread_high_priority_1,
- unread_regular_2,
- read_high_priority_2,
- read_regular_1,
- read_high_priority_1,
- ].map(&:id))
+ expect(Notification.prioritized_list(user).map(&:id)).to eq(
+ [
+ unread_high_priority_2,
+ unread_high_priority_1,
+ unread_regular_2,
+ read_high_priority_2,
+ read_regular_1,
+ read_high_priority_1,
+ ].map(&:id),
+ )
end
it "respects the count param" do
- expect(Notification.prioritized_list(user, count: 1).map(&:id)).to eq([
- unread_high_priority_2,
- ].map(&:id))
- expect(Notification.prioritized_list(user, count: 3).map(&:id)).to eq([
- unread_high_priority_2,
- unread_high_priority_1,
- unread_regular_2,
- ].map(&:id))
+ expect(Notification.prioritized_list(user, count: 1).map(&:id)).to eq(
+ [unread_high_priority_2].map(&:id),
+ )
+ expect(Notification.prioritized_list(user, count: 3).map(&:id)).to eq(
+ [unread_high_priority_2, unread_high_priority_1, unread_regular_2].map(&:id),
+ )
end
it "can filter the list by specific types" do
unread_regular_1.update!(notification_type: Notification.types[:liked])
read_regular_2.update!(notification_type: Notification.types[:liked_consolidated])
- expect(Notification.prioritized_list(
- user,
- types: [Notification.types[:liked], Notification.types[:liked_consolidated]]
- ).map(&:id)).to eq([unread_like, unread_regular_1, read_regular_2].map(&:id))
+ expect(
+ Notification.prioritized_list(
+ user,
+ types: [Notification.types[:liked], Notification.types[:liked_consolidated]],
+ ).map(&:id),
+ ).to eq([unread_like, unread_regular_1, read_regular_2].map(&:id))
end
it "includes like notifications when filtering by like types even if the user doesn't want like notifications" do
user.user_option.update!(
- like_notification_frequency:
- UserOption.like_notification_frequency_type[:never]
+ like_notification_frequency: UserOption.like_notification_frequency_type[:never],
)
unread_regular_1.update!(notification_type: Notification.types[:liked])
read_regular_2.update!(notification_type: Notification.types[:liked_consolidated])
- expect(Notification.prioritized_list(
- user,
- types: [Notification.types[:liked], Notification.types[:liked_consolidated]]
- ).map(&:id)).to eq([unread_like, unread_regular_1, read_regular_2].map(&:id))
- expect(Notification.prioritized_list(
- user,
- types: [Notification.types[:liked]]
- ).map(&:id)).to contain_exactly(unread_like.id, unread_regular_1.id)
+ expect(
+ Notification.prioritized_list(
+ user,
+ types: [Notification.types[:liked], Notification.types[:liked_consolidated]],
+ ).map(&:id),
+ ).to eq([unread_like, unread_regular_1, read_regular_2].map(&:id))
+ expect(
+ Notification.prioritized_list(user, types: [Notification.types[:liked]]).map(&:id),
+ ).to contain_exactly(unread_like.id, unread_regular_1.id)
end
end
- describe '#recent_report' do
+ describe "#recent_report" do
let(:post) { Fabricate(:post) }
def fab(type, read)
@i ||= 0
@i += 1
- Notification.create!(read: read, user_id: user.id, topic_id: post.topic_id, post_number: post.post_number, data: '[]',
- notification_type: type, created_at: @i.days.from_now)
+ Notification.create!(
+ read: read,
+ user_id: user.id,
+ topic_id: post.topic_id,
+ post_number: post.post_number,
+ data: "[]",
+ notification_type: type,
+ created_at: @i.days.from_now,
+ )
end
def unread_pm
@@ -516,14 +667,14 @@ RSpec.describe Notification do
fab(Notification.types[:liked_consolidated], true)
end
- it 'correctly finds visible notifications' do
+ it "correctly finds visible notifications" do
pm
expect(Notification.visible.count).to eq(1)
post.topic.trash!
expect(Notification.visible.count).to eq(0)
end
- it 'orders stuff by creation descending, bumping unread high priority (pms, bookmark reminders) to top' do
+ it "orders stuff by creation descending, bumping unread high priority (pms, bookmark reminders) to top" do
# note we expect the final order to read bottom-up for this list of variables,
# with unread pm + bookmark reminder at the top of that list
a = unread_pm
@@ -534,14 +685,12 @@ RSpec.describe Notification do
notifications = Notification.recent_report(user, 4)
expect(notifications.map { |n| n.id }).to eq([b.id, a.id, d.id, c.id])
-
end
- describe 'for a user that does not want to be notify on liked' do
+ describe "for a user that does not want to be notify on liked" do
before do
user.user_option.update!(
- like_notification_frequency:
- UserOption.like_notification_frequency_type[:never]
+ like_notification_frequency: UserOption.like_notification_frequency_type[:never],
)
end
@@ -554,7 +703,7 @@ RSpec.describe Notification do
end
end
- describe '#consolidate_membership_requests' do
+ describe "#consolidate_membership_requests" do
fab!(:group) { Fabricate(:group, name: "XXsssssddd") }
fab!(:user) { Fabricate(:user) }
fab!(:post) { Fabricate(:post) }
@@ -564,11 +713,11 @@ RSpec.describe Notification do
notification_type: Notification.types[:private_message],
user_id: user.id,
data: {
- topic_title: I18n.t('groups.request_membership_pm.title', group_name: group.name),
- original_post_id: post.id
+ topic_title: I18n.t("groups.request_membership_pm.title", group_name: group.name),
+ original_post_id: post.id,
}.to_json,
updated_at: Time.zone.now,
- created_at: Time.zone.now
+ created_at: Time.zone.now,
)
end
@@ -577,14 +726,16 @@ RSpec.describe Notification do
2.times { create_membership_request_notification }
end
- it 'should consolidate membership requests to a new notification' do
+ it "should consolidate membership requests to a new notification" do
original_notification = create_membership_request_notification
starting_count = SiteSetting.notification_consolidation_threshold
consolidated_notification = create_membership_request_notification
expect { original_notification.reload }.to raise_error(ActiveRecord::RecordNotFound)
- expect(consolidated_notification.notification_type).to eq(Notification.types[:membership_request_consolidated])
+ expect(consolidated_notification.notification_type).to eq(
+ Notification.types[:membership_request_consolidated],
+ )
data = consolidated_notification.data_hash
expect(data[:group_name]).to eq(group.name)
@@ -602,7 +753,9 @@ RSpec.describe Notification do
create_membership_request_notification
notification = Notification.last
- expect(notification.notification_type).to eq(Notification.types[:membership_request_consolidated])
+ expect(notification.notification_type).to eq(
+ Notification.types[:membership_request_consolidated],
+ )
expect(notification.shelved_notification).to be_present
end
end
@@ -626,7 +779,10 @@ RSpec.describe Notification do
SiteSetting.max_notifications_per_user = 2
Notification.purge_old!
- expect(Notification.where(user_id: user.id).pluck(:id)).to contain_exactly(notification4.id, notification3.id)
+ expect(Notification.where(user_id: user.id).pluck(:id)).to contain_exactly(
+ notification4.id,
+ notification3.id,
+ )
end
end
@@ -635,12 +791,28 @@ RSpec.describe Notification do
it "creates a shelved_notification record when created while user is in DND" do
user.do_not_disturb_timings.create(starts_at: Time.now, ends_at: 3.days.from_now)
- notification = Notification.create(read: false, user_id: user.id, topic_id: 2, post_number: 1, data: '{}', notification_type: 1)
+ notification =
+ Notification.create(
+ read: false,
+ user_id: user.id,
+ topic_id: 2,
+ post_number: 1,
+ data: "{}",
+ notification_type: 1,
+ )
expect(notification.shelved_notification).to be_present
end
it "doesn't create a shelved_notification record when created while user is isn't DND" do
- notification = Notification.create(read: false, user_id: user.id, topic_id: 2, post_number: 1, data: '{}', notification_type: 1)
+ notification =
+ Notification.create(
+ read: false,
+ user_id: user.id,
+ topic_id: 2,
+ post_number: 1,
+ data: "{}",
+ notification_type: 1,
+ )
expect(notification.shelved_notification).to be_nil
end
end
diff --git a/spec/models/optimized_image_spec.rb b/spec/models/optimized_image_spec.rb
index 813a153529a..4b3c6eb9624 100644
--- a/spec/models/optimized_image_spec.rb
+++ b/spec/models/optimized_image_spec.rb
@@ -4,8 +4,8 @@ RSpec.describe OptimizedImage do
let(:upload) { build(:upload) }
before { upload.id = 42 }
- describe '.crop' do
- it 'should produce cropped images (requires ImageMagick 7)' do
+ describe ".crop" do
+ it "should produce cropped images (requires ImageMagick 7)" do
tmp_path = "/tmp/cropped.png"
desired_width = 5
desired_height = 5
@@ -15,7 +15,7 @@ RSpec.describe OptimizedImage do
"#{Rails.root}/spec/fixtures/images/logo.png",
tmp_path,
desired_width,
- desired_height
+ desired_height,
)
w, h = FastImage.size(tmp_path)
@@ -25,13 +25,12 @@ RSpec.describe OptimizedImage do
cropped_size = File.size(tmp_path)
expect(cropped_size).to be < 200
expect(cropped_size).to be > 50
-
ensure
File.delete(tmp_path) if File.exist?(tmp_path)
end
end
- it 'should correctly crop images vertically' do
+ it "should correctly crop images vertically" do
tmp_path = "/tmp/cropped.png"
desired_width = 100
desired_height = 66
@@ -41,20 +40,19 @@ RSpec.describe OptimizedImage do
"#{Rails.root}/spec/fixtures/images/logo.png", # 244x66px
tmp_path,
desired_width,
- desired_height
+ desired_height,
)
w, h = FastImage.size(tmp_path)
expect(w).to eq(desired_width)
expect(h).to eq(desired_height)
-
ensure
File.delete(tmp_path) if File.exist?(tmp_path)
end
end
- it 'should correctly crop images horizontally' do
+ it "should correctly crop images horizontally" do
tmp_path = "/tmp/cropped.png"
desired_width = 244
desired_height = 500
@@ -64,14 +62,13 @@ RSpec.describe OptimizedImage do
"#{Rails.root}/spec/fixtures/images/logo.png", # 244x66px
tmp_path,
desired_width,
- desired_height
+ desired_height,
)
w, h = FastImage.size(tmp_path)
expect(w).to eq(desired_width)
expect(h).to eq(desired_height)
-
ensure
File.delete(tmp_path) if File.exist?(tmp_path)
end
@@ -82,20 +79,18 @@ RSpec.describe OptimizedImage do
it "doesn't return any color options by default" do
instructions = described_class.resize_instructions(image, image, "50x50")
- expect(instructions).to_not include('-colors')
+ expect(instructions).to_not include("-colors")
end
it "supports an optional color option" do
instructions = described_class.resize_instructions(image, image, "50x50", colors: 12)
- expect(instructions).to include('-colors')
+ expect(instructions).to include("-colors")
end
-
end
- describe '.resize' do
- it 'should work correctly when extension is bad' do
-
- original_path = Dir::Tmpname.create(['origin', '.bin']) { nil }
+ describe ".resize" do
+ it "should work correctly when extension is bad" do
+ original_path = Dir::Tmpname.create(%w[origin .bin]) { nil }
begin
FileUtils.cp "#{Rails.root}/spec/fixtures/images/logo.png", original_path
@@ -105,25 +100,17 @@ RSpec.describe OptimizedImage do
orig_size = File.size(original_path)
- OptimizedImage.resize(
- original_path,
- original_path,
- 5,
- 5,
- filename: "test.png"
- )
+ OptimizedImage.resize(original_path, original_path, 5, 5, filename: "test.png")
new_size = File.size(original_path)
expect(orig_size).to be > new_size
expect(new_size).not_to eq(0)
-
ensure
File.delete(original_path) if File.exist?(original_path)
end
end
- it 'should work correctly' do
-
+ it "should work correctly" do
file = File.open("#{Rails.root}/spec/fixtures/images/resized.png")
upload = UploadCreator.new(file, "test.bin").create_for(-1)
@@ -154,8 +141,8 @@ RSpec.describe OptimizedImage do
expect(thumb.filesize).to be > 200
end
- describe 'when an svg with a href is masked as a png' do
- it 'should not trigger the external request' do
+ describe "when an svg with a href is masked as a png" do
+ it "should not trigger the external request" do
tmp_path = "/tmp/resized.png"
begin
@@ -165,7 +152,7 @@ RSpec.describe OptimizedImage do
tmp_path,
5,
5,
- raise_on_error: true
+ raise_on_error: true,
)
end.to raise_error(RuntimeError, /improper image header/)
ensure
@@ -175,21 +162,20 @@ RSpec.describe OptimizedImage do
end
end
- describe '.downsize' do
- it 'should downsize logo (requires ImageMagick 7)' do
+ describe ".downsize" do
+ it "should downsize logo (requires ImageMagick 7)" do
tmp_path = "/tmp/downsized.png"
begin
OptimizedImage.downsize(
"#{Rails.root}/spec/fixtures/images/logo.png",
tmp_path,
- "100x100\>"
+ "100x100\>",
)
info = FastImage.new(tmp_path)
expect(info.size).to eq([100, 27])
expect(File.size(tmp_path)).to be < 2300
-
ensure
File.delete(tmp_path) if File.exist?(tmp_path)
end
@@ -198,7 +184,6 @@ RSpec.describe OptimizedImage do
end
describe ".safe_path?" do
-
it "correctly detects unsafe paths" do
expect(OptimizedImage.safe_path?("/path/A-AA/22_00.JPG")).to eq(true)
expect(OptimizedImage.safe_path?("/path/AAA/2200.JPG")).to eq(true)
@@ -212,25 +197,21 @@ RSpec.describe OptimizedImage do
expect(OptimizedImage.safe_path?("/path/x.png y.png")).to eq(false)
expect(OptimizedImage.safe_path?(nil)).to eq(false)
end
-
end
describe "ensure_safe_paths!" do
it "raises nothing on safe paths" do
- expect {
- OptimizedImage.ensure_safe_paths!("/a.png", "/b.png")
- }.not_to raise_error
+ expect { OptimizedImage.ensure_safe_paths!("/a.png", "/b.png") }.not_to raise_error
end
it "raises InvalidAccess error on paths" do
- expect {
- OptimizedImage.ensure_safe_paths!("/a.png", "/b.png", "c.png")
- }.to raise_error(Discourse::InvalidAccess)
+ expect { OptimizedImage.ensure_safe_paths!("/a.png", "/b.png", "c.png") }.to raise_error(
+ Discourse::InvalidAccess,
+ )
end
end
describe ".local?" do
-
def local(url)
OptimizedImage.new(url: url).local?
end
@@ -246,7 +227,7 @@ RSpec.describe OptimizedImage do
describe ".create_for" do
context "with versioning" do
- let(:filename) { 'logo.png' }
+ let(:filename) { "logo.png" }
let(:file) { file_from_fixtures(filename) }
it "is able to update optimized images on version change" do
@@ -275,14 +256,16 @@ RSpec.describe OptimizedImage do
# we don't really optimize anything, we simply copy
# but at least this confirms this actually works
- SiteSetting.authorized_extensions = 'svg'
- svg = file_from_fixtures('image.svg')
- upload = UploadCreator.new(svg, 'image.svg').create_for(Discourse.system_user.id)
+ SiteSetting.authorized_extensions = "svg"
+ svg = file_from_fixtures("image.svg")
+ upload = UploadCreator.new(svg, "image.svg").create_for(Discourse.system_user.id)
resized = upload.get_optimized_image(50, 50, {})
# we perform some basic svg mangling but expect the string Discourse to be there
expect(File.read(Discourse.store.path_for(resized))).to include("Discourse")
- expect(File.read(Discourse.store.path_for(resized))).to eq(File.read(Discourse.store.path_for(upload)))
+ expect(File.read(Discourse.store.path_for(resized))).to eq(
+ File.read(Discourse.store.path_for(upload)),
+ )
end
context "when using an internal store" do
@@ -290,7 +273,6 @@ RSpec.describe OptimizedImage do
before { Discourse.stubs(:store).returns(store) }
context "when an error happened while generating the thumbnail" do
-
it "returns nil" do
OptimizedImage.expects(:resize).returns(false)
expect(OptimizedImage.create_for(upload, 100, 200)).to eq(nil)
@@ -298,9 +280,7 @@ RSpec.describe OptimizedImage do
end
context "when the thumbnail is properly generated" do
- before do
- OptimizedImage.expects(:resize).returns(true)
- end
+ before { OptimizedImage.expects(:resize).returns(true) }
it "does not download a copy of the original image" do
store.expects(:download).never
@@ -322,16 +302,14 @@ RSpec.describe OptimizedImage do
end
it "is able to change the format" do
- oi = OptimizedImage.create_for(upload, 100, 200, format: 'gif')
+ oi = OptimizedImage.create_for(upload, 100, 200, format: "gif")
expect(oi.url).to eq("/internally/stored/optimized/image.gif")
end
end
end
describe "external store" do
- before do
- setup_s3
- end
+ before { setup_s3 }
context "when we have a bad file returned" do
it "returns nil" do
@@ -350,9 +328,14 @@ RSpec.describe OptimizedImage do
before do
stub_request(:head, "http://#{s3_upload.url}").to_return(status: 200)
- stub_request(:get, "http://#{s3_upload.url}").to_return(status: 200, body: file_from_fixtures("logo.png"))
- stub_request(:put, %r{https://#{SiteSetting.s3_upload_bucket}\.s3\.#{SiteSetting.s3_region}\.amazonaws.com#{optimized_path}})
- .to_return(status: 200, headers: { "ETag" => "someetag" })
+ stub_request(:get, "http://#{s3_upload.url}").to_return(
+ status: 200,
+ body: file_from_fixtures("logo.png"),
+ )
+ stub_request(
+ :put,
+ %r{https://#{SiteSetting.s3_upload_bucket}\.s3\.#{SiteSetting.s3_region}\.amazonaws.com#{optimized_path}},
+ ).to_return(status: 200, headers: { "ETag" => "someetag" })
end
it "downloads a copy of the original image" do
@@ -362,7 +345,9 @@ RSpec.describe OptimizedImage do
expect(oi.extension).to eq(".png")
expect(oi.width).to eq(100)
expect(oi.height).to eq(200)
- expect(oi.url).to match(%r{//#{SiteSetting.s3_upload_bucket}\.s3\.dualstack\.us-west-1\.amazonaws\.com#{optimized_path}})
+ expect(oi.url).to match(
+ %r{//#{SiteSetting.s3_upload_bucket}\.s3\.dualstack\.us-west-1\.amazonaws\.com#{optimized_path}},
+ )
expect(oi.filesize).to be > 0
oi.filesize = nil
@@ -379,9 +364,9 @@ RSpec.describe OptimizedImage do
end
end
- describe '#destroy' do
- describe 'when upload_id is no longer valid' do
- it 'should still destroy the record' do
+ describe "#destroy" do
+ describe "when upload_id is no longer valid" do
+ it "should still destroy the record" do
image = Fabricate(:optimized_image)
image.upload.delete
image.reload.destroy
@@ -393,7 +378,6 @@ RSpec.describe OptimizedImage do
end
class FakeInternalStore
-
def external?
false
end
@@ -405,5 +389,4 @@ class FakeInternalStore
def store_optimized_image(file, optimized_image, content_type = nil, secure: false)
"/internally/stored/optimized/image#{optimized_image.extension}"
end
-
end
diff --git a/spec/models/permalink_spec.rb b/spec/models/permalink_spec.rb
index fb5f4cdc54a..c22c49d1ad2 100644
--- a/spec/models/permalink_spec.rb
+++ b/spec/models/permalink_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
RSpec.describe Permalink do
-
describe "normalization" do
it "correctly normalizes" do
normalizer = Permalink::Normalizer.new("/(\\/hello.*)\\?.*/\\1|/(\\/bye.*)\\?.*/\\1")
@@ -25,13 +24,12 @@ RSpec.describe Permalink do
end
describe "target_url" do
-
- let(:permalink) { Fabricate.build(:permalink) }
- let(:topic) { Fabricate(:topic) }
- let(:post) { Fabricate(:post, topic: topic) }
- let(:category) { Fabricate(:category) }
- let(:tag) { Fabricate(:tag) }
- subject(:target_url) { permalink.target_url }
+ let(:permalink) { Fabricate.build(:permalink) }
+ let(:topic) { Fabricate(:topic) }
+ let(:post) { Fabricate(:post, topic: topic) }
+ let(:category) { Fabricate(:category) }
+ let(:tag) { Fabricate(:tag) }
+ subject(:target_url) { permalink.target_url }
it "returns a topic url when topic_id is set" do
permalink.topic_id = topic.id
@@ -39,7 +37,7 @@ RSpec.describe Permalink do
end
it "returns nil when topic_id is set but topic is not found" do
- permalink.topic_id = 99999
+ permalink.topic_id = 99_999
expect(target_url).to eq(nil)
end
@@ -49,7 +47,7 @@ RSpec.describe Permalink do
end
it "returns nil when post_id is set but post is not found" do
- permalink.post_id = 99999
+ permalink.post_id = 99_999
expect(target_url).to eq(nil)
end
@@ -65,7 +63,7 @@ RSpec.describe Permalink do
end
it "returns nil when category_id is set but category is not found" do
- permalink.category_id = 99999
+ permalink.category_id = 99_999
expect(target_url).to eq(nil)
end
@@ -82,7 +80,7 @@ RSpec.describe Permalink do
end
it "returns nil when tag_id is set but tag is not found" do
- permalink.tag_id = 99999
+ permalink.tag_id = 99_999
expect(target_url).to eq(nil)
end
diff --git a/spec/models/plugin_store_spec.rb b/spec/models/plugin_store_spec.rb
index 40e506d5816..bd91e471af9 100644
--- a/spec/models/plugin_store_spec.rb
+++ b/spec/models/plugin_store_spec.rb
@@ -52,15 +52,12 @@ RSpec.describe PluginStore do
set("hello_int", 1)
set("hello_bool", true)
- expect(get_all(["hello_str", "hello_int", "hello_bool"])).to eq({
- "hello_str": "world",
- "hello_int": 1,
- "hello_bool": true,
- }.stringify_keys)
+ expect(get_all(%w[hello_str hello_int hello_bool])).to eq(
+ { hello_str: "world", hello_int: 1, hello_bool: true }.stringify_keys,
+ )
end
it "handles hashes correctly" do
-
val = { "hi" => "there", "1" => 1 }
set("hello", val)
result = get("hello")
@@ -72,7 +69,6 @@ RSpec.describe PluginStore do
end
it "handles nested hashes correctly" do
-
val = { "hi" => "there", "nested" => { "a" => "b", "with list" => ["a", "b", 3] } }
set("hello", val)
result = get("hello")
@@ -86,7 +82,6 @@ RSpec.describe PluginStore do
end
it "handles arrays correctly" do
-
val = ["a", "b", { "hash" => "inside", "c" => 1 }]
set("hello", val)
result = get("hello")
@@ -96,7 +91,6 @@ RSpec.describe PluginStore do
# ensure indiff access holds
expect(result[2][:hash]).to eq("inside")
expect(result[2]["c"]).to eq(1)
-
end
it "removes correctly" do
@@ -104,5 +98,4 @@ RSpec.describe PluginStore do
remove_row("hello")
expect(get("hello")).to eq(nil)
end
-
end
diff --git a/spec/models/post_action_spec.rb b/spec/models/post_action_spec.rb
index 584a543d5ba..74dcfe23f5f 100644
--- a/spec/models/post_action_spec.rb
+++ b/spec/models/post_action_spec.rb
@@ -16,7 +16,8 @@ RSpec.describe PostAction do
it "disallows the same action from happening twice" do
PostAction.create(user: eviltrout, post: post, post_action_type_id: PostActionType.types[:like])
- pa = PostAction.new(user: eviltrout, post: post, post_action_type_id: PostActionType.types[:like])
+ pa =
+ PostAction.new(user: eviltrout, post: post, post_action_type_id: PostActionType.types[:like])
expect(pa).not_to be_valid
end
@@ -26,16 +27,15 @@ RSpec.describe PostAction do
mod = moderator
Group.refresh_automatic_groups!
- result = PostActionCreator.notify_moderators(
- codinghorror,
- post,
- "this is my special long message"
- )
+ result =
+ PostActionCreator.notify_moderators(codinghorror, post, "this is my special long message")
- posts = Post.joins(:topic)
- .select('posts.id, topics.subtype, posts.topic_id')
- .where('topics.archetype' => Archetype.private_message)
- .to_a
+ posts =
+ Post
+ .joins(:topic)
+ .select("posts.id, topics.subtype, posts.topic_id")
+ .where("topics.archetype" => Archetype.private_message)
+ .to_a
expect(posts.count).to eq(1)
expect(result.post_action.related_post_id).to eq(posts[0].id.to_i)
@@ -49,14 +49,20 @@ RSpec.describe PostAction do
expect(topic_user_ids).to include(codinghorror.id)
expect(topic_user_ids).to include(mod.id)
- expect(topic.topic_users.where(user_id: mod.id)
- .pluck_first(:notification_level)).to eq(TopicUser.notification_levels[:tracking])
+ expect(topic.topic_users.where(user_id: mod.id).pluck_first(:notification_level)).to eq(
+ TopicUser.notification_levels[:tracking],
+ )
- expect(topic.topic_users.where(user_id: codinghorror.id)
- .pluck_first(:notification_level)).to eq(TopicUser.notification_levels[:watching])
+ expect(
+ topic.topic_users.where(user_id: codinghorror.id).pluck_first(:notification_level),
+ ).to eq(TopicUser.notification_levels[:watching])
# reply to PM should not clear flag
- PostCreator.new(mod, topic_id: posts[0].topic_id, raw: "This is my test reply to the user, it should clear flags").create
+ PostCreator.new(
+ mod,
+ topic_id: posts[0].topic_id,
+ raw: "This is my test reply to the user, it should clear flags",
+ ).create
result.post_action.reload
expect(result.post_action.deleted_at).to eq(nil)
@@ -98,11 +104,8 @@ RSpec.describe PostAction do
end
it "notifies via pm" do
- result = PostActionCreator.notify_moderators(
- codinghorror,
- post,
- "this is my special long message"
- )
+ result =
+ PostActionCreator.notify_moderators(codinghorror, post, "this is my special long message")
readable_by_groups = result.reviewable_score.meta_topic.topic_allowed_groups.map(&:group_id)
expect(readable_by_groups).to include(group.id)
@@ -144,12 +147,10 @@ RSpec.describe PostAction do
end
end
- describe 'when a user likes something' do
- before do
- PostActionNotifier.enable
- end
+ describe "when a user likes something" do
+ before { PostActionNotifier.enable }
- it 'should generate and remove notifications correctly' do
+ it "should generate and remove notifications correctly" do
PostActionCreator.like(codinghorror, post)
expect(Notification.count).to eq(1)
@@ -173,28 +174,24 @@ RSpec.describe PostAction do
expect(notification.notification_type).to eq(Notification.types[:liked])
end
- it 'should not notify when never is selected' do
+ it "should not notify when never is selected" do
post.user.user_option.update!(
- like_notification_frequency:
- UserOption.like_notification_frequency_type[:never]
+ like_notification_frequency: UserOption.like_notification_frequency_type[:never],
)
- expect do
- PostActionCreator.like(codinghorror, post)
- end.to_not change { Notification.count }
+ expect do PostActionCreator.like(codinghorror, post) end.to_not change { Notification.count }
end
- it 'notifies on likes correctly' do
+ it "notifies on likes correctly" do
SiteSetting.post_undo_action_window_mins = 120
PostActionCreator.like(eviltrout, post)
PostActionCreator.like(admin, post)
# one like
- expect(Notification.where(post_number: 1, topic_id: post.topic_id).count)
- .to eq(1)
+ expect(Notification.where(post_number: 1, topic_id: post.topic_id).count).to eq(1)
post.user.user_option.update!(
- like_notification_frequency: UserOption.like_notification_frequency_type[:always]
+ like_notification_frequency: UserOption.like_notification_frequency_type[:always],
)
admin2 = Fabricate(:admin)
@@ -202,15 +199,10 @@ RSpec.describe PostAction do
# Travel 1 hour in time to test that order post_actions by `created_at`
freeze_time 1.hour.from_now
- expect do
- PostActionCreator.like(admin2, post)
- end.to_not change { Notification.count }
+ expect do PostActionCreator.like(admin2, post) end.to_not change { Notification.count }
# adds info to the notification
- notification = Notification.find_by(
- post_number: 1,
- topic_id: post.topic_id
- )
+ notification = Notification.find_by(post_number: 1, topic_id: post.topic_id)
expect(notification.data_hash["count"].to_i).to eq(2)
expect(notification.data_hash["username2"]).to eq(eviltrout.username)
@@ -219,13 +211,9 @@ RSpec.describe PostAction do
PostActionDestroyer.destroy(eviltrout, post, :like)
# rebuilds the missing notification
- expect(Notification.where(post_number: 1, topic_id: post.topic_id).count)
- .to eq(1)
+ expect(Notification.where(post_number: 1, topic_id: post.topic_id).count).to eq(1)
- notification = Notification.find_by(
- post_number: 1,
- topic_id: post.topic_id
- )
+ notification = Notification.find_by(post_number: 1, topic_id: post.topic_id)
expect(notification.data_hash["count"]).to eq(2)
expect(notification.data_hash["username"]).to eq(admin2.username)
@@ -233,7 +221,7 @@ RSpec.describe PostAction do
post.user.user_option.update!(
like_notification_frequency:
- UserOption.like_notification_frequency_type[:first_time_and_daily]
+ UserOption.like_notification_frequency_type[:first_time_and_daily],
)
# this gets skipped
@@ -246,11 +234,10 @@ RSpec.describe PostAction do
PostActionCreator.like(admin4, post)
# first happened within the same day, no need to notify
- expect(Notification.where(post_number: 1, topic_id: post.topic_id).count)
- .to eq(2)
+ expect(Notification.where(post_number: 1, topic_id: post.topic_id).count).to eq(2)
end
- describe 'likes consolidation' do
+ describe "likes consolidation" do
fab!(:liker) { Fabricate(:user) }
fab!(:liker2) { Fabricate(:user) }
fab!(:likee) { Fabricate(:user) }
@@ -258,39 +245,35 @@ RSpec.describe PostAction do
it "can be disabled" do
SiteSetting.notification_consolidation_threshold = 0
- expect do
- PostActionCreator.like(liker, Fabricate(:post, user: likee))
- end.to change { likee.reload.notifications.count }.by(1)
+ expect do PostActionCreator.like(liker, Fabricate(:post, user: likee)) end.to change {
+ likee.reload.notifications.count
+ }.by(1)
SiteSetting.notification_consolidation_threshold = 1
- expect do
- PostActionCreator.like(liker, Fabricate(:post, user: likee))
- end.to_not change { likee.reload.notifications.count }
+ expect do PostActionCreator.like(liker, Fabricate(:post, user: likee)) end.to_not change {
+ likee.reload.notifications.count
+ }
end
- describe 'frequency first_time_and_daily' do
+ describe "frequency first_time_and_daily" do
before do
likee.user_option.update!(
like_notification_frequency:
- UserOption.like_notification_frequency_type[:first_time_and_daily]
+ UserOption.like_notification_frequency_type[:first_time_and_daily],
)
end
- it 'should consolidate likes notification when the threshold is reached' do
+ it "should consolidate likes notification when the threshold is reached" do
SiteSetting.notification_consolidation_threshold = 2
expect do
- 3.times do
- PostActionCreator.like(liker, Fabricate(:post, user: likee))
- end
+ 3.times { PostActionCreator.like(liker, Fabricate(:post, user: likee)) }
end.to change { likee.reload.notifications.count }.by(1)
notification = likee.notifications.last
- expect(notification.notification_type).to eq(
- Notification.types[:liked_consolidated]
- )
+ expect(notification.notification_type).to eq(Notification.types[:liked_consolidated])
data = JSON.parse(notification.data)
@@ -301,9 +284,7 @@ RSpec.describe PostAction do
notification.update!(read: true)
expect do
- 2.times do
- PostActionCreator.like(liker, Fabricate(:post, user: likee))
- end
+ 2.times { PostActionCreator.like(liker, Fabricate(:post, user: likee)) }
end.to_not change { likee.reload.notifications.count }
data = JSON.parse(notification.reload.data)
@@ -318,18 +299,13 @@ RSpec.describe PostAction do
notification = likee.notifications.last
- expect(notification.notification_type).to eq(
- Notification.types[:liked]
- )
+ expect(notification.notification_type).to eq(Notification.types[:liked])
- freeze_time((
- SiteSetting.likes_notification_consolidation_window_mins.minutes +
- 1
- ).since)
+ freeze_time((SiteSetting.likes_notification_consolidation_window_mins.minutes + 1).since)
- expect do
- PostActionCreator.like(liker, Fabricate(:post, user: likee))
- end.to change { likee.reload.notifications.count }.by(1)
+ expect do PostActionCreator.like(liker, Fabricate(:post, user: likee)) end.to change {
+ likee.reload.notifications.count
+ }.by(1)
notification = likee.notifications.last
@@ -337,23 +313,20 @@ RSpec.describe PostAction do
end
end
- describe 'frequency always' do
+ describe "frequency always" do
before do
likee.user_option.update!(
- like_notification_frequency:
- UserOption.like_notification_frequency_type[:always]
+ like_notification_frequency: UserOption.like_notification_frequency_type[:always],
)
end
- it 'should consolidate liked notifications when threshold is reached' do
+ it "should consolidate liked notifications when threshold is reached" do
SiteSetting.notification_consolidation_threshold = 2
post = Fabricate(:post, user: likee)
expect do
- [liker2, liker].each do |user|
- PostActionCreator.like(user, post)
- end
+ [liker2, liker].each { |user| PostActionCreator.like(user, post) }
end.to change { likee.reload.notifications.count }.by(1)
notification = likee.notifications.last
@@ -364,23 +337,20 @@ RSpec.describe PostAction do
expect(data_hash["count"].to_i).to eq(2)
expect do
- 2.times do
- PostActionCreator.like(liker, Fabricate(:post, user: likee))
- end
+ 2.times { PostActionCreator.like(liker, Fabricate(:post, user: likee)) }
end.to change { likee.reload.notifications.count }.by(2)
- expect(likee.notifications.pluck(:notification_type).uniq)
- .to contain_exactly(Notification.types[:liked])
+ expect(likee.notifications.pluck(:notification_type).uniq).to contain_exactly(
+ Notification.types[:liked],
+ )
- expect do
- PostActionCreator.like(liker, Fabricate(:post, user: likee))
- end.to change { likee.reload.notifications.count }.by(-1)
+ expect do PostActionCreator.like(liker, Fabricate(:post, user: likee)) end.to change {
+ likee.reload.notifications.count
+ }.by(-1)
notification = likee.notifications.last
- expect(notification.notification_type).to eq(
- Notification.types[:liked_consolidated]
- )
+ expect(notification.notification_type).to eq(Notification.types[:liked_consolidated])
expect(notification.data_hash["count"].to_i).to eq(3)
expect(notification.data_hash["username"]).to eq(liker.username)
@@ -392,33 +362,26 @@ RSpec.describe PostAction do
mutee = Fabricate(:user)
MutedUser.create!(user_id: post.user.id, muted_user_id: mutee.id)
- expect do
- PostActionCreator.like(mutee, post)
- end.to_not change { Notification.count }
+ expect do PostActionCreator.like(mutee, post) end.to_not change { Notification.count }
end
- it 'should not generate a notification if liker has the topic muted' do
+ it "should not generate a notification if liker has the topic muted" do
post = Fabricate(:post, user: eviltrout)
TopicUser.create!(
topic: post.topic,
user: eviltrout,
- notification_level: TopicUser.notification_levels[:muted]
+ notification_level: TopicUser.notification_levels[:muted],
)
- expect do
- PostActionCreator.like(codinghorror, post)
- end.to_not change { Notification.count }
+ expect do PostActionCreator.like(codinghorror, post) end.to_not change { Notification.count }
end
it "should generate a notification if liker is an admin irregardless of \
muting" do
-
MutedUser.create!(user_id: post.user.id, muted_user_id: admin.id)
- expect do
- PostActionCreator.like(admin, post)
- end.to change { Notification.count }.by(1)
+ expect do PostActionCreator.like(admin, post) end.to change { Notification.count }.by(1)
notification = Notification.last
@@ -426,7 +389,7 @@ RSpec.describe PostAction do
expect(notification.notification_type).to eq(Notification.types[:liked])
end
- it 'should not increase topic like count when liking a whisper' do
+ it "should not increase topic like count when liking a whisper" do
SiteSetting.whispers_allowed_groups = "#{Group::AUTO_GROUPS[:staff]}"
post.revise(admin, post_type: Post.types[:whisper])
@@ -436,7 +399,7 @@ RSpec.describe PostAction do
expect(post.topic.like_count).to eq(0)
end
- it 'should increase the `like_count` and `like_score` when a user likes something' do
+ it "should increase the `like_count` and `like_score` when a user likes something" do
freeze_time Date.today
PostActionCreator.like(codinghorror, post)
@@ -481,29 +444,30 @@ RSpec.describe PostAction do
PostActionCreator.create(codinghorror, post, type_name)
actual_count = value_for(codinghorror.id, Date.today)
expected_count = type_name == :like ? 2 : 1
- expect(actual_count).to eq(expected_count), "Expected likes_given to be #{expected_count} when adding '#{type_name}', but got #{actual_count}"
+ expect(actual_count).to eq(expected_count),
+ "Expected likes_given to be #{expected_count} when adding '#{type_name}', but got #{actual_count}"
PostActionDestroyer.new(codinghorror, post, type_id).perform
actual_count = value_for(codinghorror.id, Date.today)
- expect(actual_count).to eq(1), "Expected likes_given to be 1 when removing '#{type_name}', but got #{actual_count}"
+ expect(actual_count).to eq(1),
+ "Expected likes_given to be 1 when removing '#{type_name}', but got #{actual_count}"
end
end
end
- describe 'flagging' do
-
- it 'does not allow you to flag stuff twice, even if the reason is different' do
+ describe "flagging" do
+ it "does not allow you to flag stuff twice, even if the reason is different" do
expect(PostActionCreator.spam(eviltrout, post)).to be_success
expect(PostActionCreator.off_topic(eviltrout, post)).to be_failed
end
- it 'allows you to flag stuff again if your previous flag was removed' do
+ it "allows you to flag stuff again if your previous flag was removed" do
PostActionCreator.spam(eviltrout, post)
PostActionDestroyer.destroy(eviltrout, post, :spam)
expect(PostActionCreator.spam(eviltrout, post)).to be_success
end
- it 'should update counts when you clear flags' do
+ it "should update counts when you clear flags" do
reviewable = PostActionCreator.spam(eviltrout, post).reviewable
expect(post.reload.spam_count).to eq(1)
@@ -558,7 +522,7 @@ RSpec.describe PostAction do
expect(post.hidden).to eq(false)
end
- it 'should follow the rules for automatic hiding workflow' do
+ it "should follow the rules for automatic hiding workflow" do
post = create_post
walterwhite = Fabricate(:walter_white)
@@ -639,27 +603,29 @@ RSpec.describe PostAction do
it "can flag the topic instead of a post" do
post1 = create_post
create_post(topic: post1.topic)
- result = PostActionCreator.new(
- Fabricate(:user),
- post1,
- PostActionType.types[:spam],
- flag_topic: true
- ).perform
+ result =
+ PostActionCreator.new(
+ Fabricate(:user),
+ post1,
+ PostActionType.types[:spam],
+ flag_topic: true,
+ ).perform
expect(result.post_action.targets_topic).to eq(true)
- expect(result.reviewable.payload['targets_topic']).to eq(true)
+ expect(result.reviewable.payload["targets_topic"]).to eq(true)
end
it "will flag the first post if you flag a topic but there is only one post in the topic" do
post = create_post
- result = PostActionCreator.new(
- Fabricate(:user),
- post,
- PostActionType.types[:spam],
- flag_topic: true
- ).perform
+ result =
+ PostActionCreator.new(
+ Fabricate(:user),
+ post,
+ PostActionType.types[:spam],
+ flag_topic: true,
+ ).perform
expect(result.post_action.targets_topic).to eq(false)
expect(result.post_action.post_id).to eq(post.id)
- expect(result.reviewable.payload['targets_topic']).to eq(false)
+ expect(result.reviewable.payload["targets_topic"]).to eq(false)
end
it "will unhide the post when a moderator undoes the flag on which s/he took action" do
@@ -698,9 +664,7 @@ RSpec.describe PostAction do
freeze_time
# reaching `num_flaggers_to_close_topic` isn't enough
- [flagger1, flagger2].each do |flagger|
- PostActionCreator.inappropriate(flagger, post1)
- end
+ [flagger1, flagger2].each { |flagger| PostActionCreator.inappropriate(flagger, post1) }
expect(topic.reload.closed).to eq(false)
@@ -708,9 +672,7 @@ RSpec.describe PostAction do
PostAction.where(post: post1).delete_all
# reaching `num_flags_to_close_topic` isn't enough
- [post1, post2, post3].each do |post|
- PostActionCreator.inappropriate(flagger1, post)
- end
+ [post1, post2, post3].each { |post| PostActionCreator.inappropriate(flagger1, post) }
expect(topic.reload.closed).to eq(false)
@@ -719,9 +681,7 @@ RSpec.describe PostAction do
# reaching both should close the topic
[flagger1, flagger2].each do |flagger|
- [post1, post2, post3].each do |post|
- PostActionCreator.inappropriate(flagger, post)
- end
+ [post1, post2, post3].each { |post| PostActionCreator.inappropriate(flagger, post) }
end
expect(topic.reload.closed).to eq(true)
@@ -739,9 +699,7 @@ RSpec.describe PostAction do
it "will not close topics opened by staff" do
[flagger1, flagger2].each do |flagger|
- [post1, post2, post3].each do |post|
- PostActionCreator.inappropriate(flagger, post)
- end
+ [post1, post2, post3].each { |post| PostActionCreator.inappropriate(flagger, post) }
end
expect(topic.reload.closed).to eq(false)
@@ -782,9 +740,7 @@ RSpec.describe PostAction do
it "will reopen topic after the flags are auto handled" do
freeze_time
[flagger1, flagger2].each do |flagger|
- [post1, post2, post3].each do |post|
- PostActionCreator.inappropriate(flagger, post)
- end
+ [post1, post2, post3].each { |post| PostActionCreator.inappropriate(flagger, post) }
end
expect(topic.reload.closed).to eq(true)
@@ -796,13 +752,13 @@ RSpec.describe PostAction do
expect(topic.reload.closed).to eq(false)
end
end
-
end
it "prevents user to act twice at the same time" do
Group.refresh_automatic_groups!
# flags are already being tested
- all_types_except_flags = PostActionType.types.except(*PostActionType.flag_types_without_custom.keys)
+ all_types_except_flags =
+ PostActionType.types.except(*PostActionType.flag_types_without_custom.keys)
all_types_except_flags.values.each do |action|
expect(PostActionCreator.new(eviltrout, post, action).perform).to be_success
expect(PostActionCreator.new(eviltrout, post, action).perform).to be_failed
@@ -817,14 +773,15 @@ RSpec.describe PostAction do
expect(result.reviewable_score.meta_topic_id).to be_nil
end
- [:notify_moderators, :notify_user, :spam].each do |post_action_type|
+ %i[notify_moderators notify_user spam].each do |post_action_type|
it "creates a message for #{post_action_type}" do
- result = PostActionCreator.new(
- Discourse.system_user,
- post,
- PostActionType.types[post_action_type],
- message: 'WAT'
- ).perform
+ result =
+ PostActionCreator.new(
+ Discourse.system_user,
+ post,
+ PostActionType.types[post_action_type],
+ message: "WAT",
+ ).perform
expect(result).to be_success
expect(result.post_action.related_post_id).to be_present
end
@@ -834,16 +791,16 @@ RSpec.describe PostAction do
user = Fabricate(:user)
UserSilencer.new(user, Discourse.system_user).silence
- result = PostActionCreator.notify_moderators(user, post, 'testing')
+ result = PostActionCreator.notify_moderators(user, post, "testing")
expect(result).to be_failed
end
it "should succeed even with low max title length" do
SiteSetting.max_topic_title_length = 50
- post.topic.title = 'This is a test topic ' * 2
+ post.topic.title = "This is a test topic " * 2
post.topic.save!
- result = PostActionCreator.notify_moderators(Discourse.system_user, post, 'WAT')
+ result = PostActionCreator.notify_moderators(Discourse.system_user, post, "WAT")
expect(result).to be_success
expect(result.post_action.related_post_id).to be_present
end
@@ -860,7 +817,6 @@ RSpec.describe PostAction do
end
describe "#add_moderator_post_if_needed" do
-
it "should not add a moderator post when it's disabled" do
post = create_post
@@ -907,7 +863,6 @@ RSpec.describe PostAction do
end
describe "rate limiting" do
-
def limiter(tl, type)
user = Fabricate.build(:user)
user.trust_level = tl
@@ -918,9 +873,15 @@ RSpec.describe PostAction do
it "should scale up likes limits depending on trust level" do
expect(limiter(0, :like).max).to eq SiteSetting.max_likes_per_day
expect(limiter(1, :like).max).to eq SiteSetting.max_likes_per_day
- expect(limiter(2, :like).max).to eq (SiteSetting.max_likes_per_day * SiteSetting.tl2_additional_likes_per_day_multiplier).to_i
- expect(limiter(3, :like).max).to eq (SiteSetting.max_likes_per_day * SiteSetting.tl3_additional_likes_per_day_multiplier).to_i
- expect(limiter(4, :like).max).to eq (SiteSetting.max_likes_per_day * SiteSetting.tl4_additional_likes_per_day_multiplier).to_i
+ expect(limiter(2, :like).max).to eq (
+ SiteSetting.max_likes_per_day * SiteSetting.tl2_additional_likes_per_day_multiplier
+ ).to_i
+ expect(limiter(3, :like).max).to eq (
+ SiteSetting.max_likes_per_day * SiteSetting.tl3_additional_likes_per_day_multiplier
+ ).to_i
+ expect(limiter(4, :like).max).to eq (
+ SiteSetting.max_likes_per_day * SiteSetting.tl4_additional_likes_per_day_multiplier
+ ).to_i
SiteSetting.tl2_additional_likes_per_day_multiplier = -1
expect(limiter(2, :like).max).to eq SiteSetting.max_likes_per_day
@@ -933,14 +894,20 @@ RSpec.describe PostAction do
end
it "should scale up flag limits depending on trust level" do
- %i(off_topic inappropriate spam notify_moderators).each do |type|
+ %i[off_topic inappropriate spam notify_moderators].each do |type|
SiteSetting.tl2_additional_flags_per_day_multiplier = 1.5
expect(limiter(0, type).max).to eq SiteSetting.max_flags_per_day
expect(limiter(1, type).max).to eq SiteSetting.max_flags_per_day
- expect(limiter(2, type).max).to eq (SiteSetting.max_flags_per_day * SiteSetting.tl2_additional_flags_per_day_multiplier).to_i
- expect(limiter(3, type).max).to eq (SiteSetting.max_flags_per_day * SiteSetting.tl3_additional_flags_per_day_multiplier).to_i
- expect(limiter(4, type).max).to eq (SiteSetting.max_flags_per_day * SiteSetting.tl4_additional_flags_per_day_multiplier).to_i
+ expect(limiter(2, type).max).to eq (
+ SiteSetting.max_flags_per_day * SiteSetting.tl2_additional_flags_per_day_multiplier
+ ).to_i
+ expect(limiter(3, type).max).to eq (
+ SiteSetting.max_flags_per_day * SiteSetting.tl3_additional_flags_per_day_multiplier
+ ).to_i
+ expect(limiter(4, type).max).to eq (
+ SiteSetting.max_flags_per_day * SiteSetting.tl4_additional_flags_per_day_multiplier
+ ).to_i
SiteSetting.tl2_additional_flags_per_day_multiplier = -1
expect(limiter(2, type).max).to eq SiteSetting.max_flags_per_day
@@ -952,29 +919,22 @@ RSpec.describe PostAction do
expect(limiter(2, type).max).to eq SiteSetting.max_flags_per_day
end
end
-
end
- describe '#is_flag?' do
- describe 'when post action is a flag' do
- it 'should return true' do
+ describe "#is_flag?" do
+ describe "when post action is a flag" do
+ it "should return true" do
PostActionType.notify_flag_types.each do |_type, id|
- post_action = PostAction.new(
- user: codinghorror,
- post_action_type_id: id
- )
+ post_action = PostAction.new(user: codinghorror, post_action_type_id: id)
expect(post_action.is_flag?).to eq(true)
end
end
end
- describe 'when post action is not a flag' do
- it 'should return false' do
- post_action = PostAction.new(
- user: codinghorror,
- post_action_type_id: 99
- )
+ describe "when post action is not a flag" do
+ it "should return false" do
+ post_action = PostAction.new(user: codinghorror, post_action_type_id: 99)
expect(post_action.is_flag?).to eq(false)
end
@@ -982,7 +942,7 @@ RSpec.describe PostAction do
end
describe "triggers Discourse events" do
- it 'triggers a flag_created event' do
+ it "triggers a flag_created event" do
event = DiscourseEvent.track(:flag_created) { PostActionCreator.spam(eviltrout, post) }
expect(event).to be_present
end
@@ -992,7 +952,7 @@ RSpec.describe PostAction do
let(:post_action) { result.post_action }
let(:reviewable) { result.reviewable }
- it 'creates events for agreed' do
+ it "creates events for agreed" do
events = DiscourseEvent.track_events { reviewable.perform(moderator, :agree_and_keep) }
reviewed_event = events.find { |e| e[:event_name] == :flag_reviewed }
@@ -1003,7 +963,7 @@ RSpec.describe PostAction do
expect(event[:params]).to eq([post_action])
end
- it 'creates events for disagreed' do
+ it "creates events for disagreed" do
events = DiscourseEvent.track_events { reviewable.perform(moderator, :disagree) }
reviewed_event = events.find { |e| e[:event_name] == :flag_reviewed }
@@ -1014,7 +974,7 @@ RSpec.describe PostAction do
expect(event[:params]).to eq([post_action])
end
- it 'creates events for ignored' do
+ it "creates events for ignored" do
events = DiscourseEvent.track_events { reviewable.perform(moderator, :ignore) }
reviewed_event = events.find { |e| e[:event_name] == :flag_reviewed }
diff --git a/spec/models/post_action_type_spec.rb b/spec/models/post_action_type_spec.rb
index 1fe7429819c..201a83ff503 100644
--- a/spec/models/post_action_type_spec.rb
+++ b/spec/models/post_action_type_spec.rb
@@ -2,14 +2,14 @@
RSpec.describe PostActionType do
describe "Callbacks" do
- describe '#expiry_cache' do
- it 'should clear the cache on save' do
+ describe "#expiry_cache" do
+ it "should clear the cache on save" do
cache = ApplicationSerializer.fragment_cache
- cache["post_action_types_#{I18n.locale}"] = 'test'
- cache["post_action_flag_types_#{I18n.locale}"] = 'test2'
+ cache["post_action_types_#{I18n.locale}"] = "test"
+ cache["post_action_flag_types_#{I18n.locale}"] = "test2"
- PostActionType.new(name_key: 'some_key').save!
+ PostActionType.new(name_key: "some_key").save!
expect(cache["post_action_types_#{I18n.locale}"]).to eq(nil)
expect(cache["post_action_flag_types_#{I18n.locale}"]).to eq(nil)
@@ -19,11 +19,9 @@ RSpec.describe PostActionType do
end
end
- describe '#types' do
+ describe "#types" do
context "when verifying enum sequence" do
- before do
- @types = PostActionType.types
- end
+ before { @types = PostActionType.types }
it "'spam' should be at 8th position" do
expect(@types[:spam]).to eq(8)
diff --git a/spec/models/post_analyzer_spec.rb b/spec/models/post_analyzer_spec.rb
index fa873cabb2c..274b6c2d1da 100644
--- a/spec/models/post_analyzer_spec.rb
+++ b/spec/models/post_analyzer_spec.rb
@@ -2,31 +2,31 @@
RSpec.describe PostAnalyzer do
let(:default_topic_id) { 12 }
- let(:url) { 'https://twitter.com/evil_trout/status/345954894420787200' }
+ let(:url) { "https://twitter.com/evil_trout/status/345954894420787200" }
- describe '#cook' do
- let(:post_analyzer) { PostAnalyzer.new nil, nil }
+ describe "#cook" do
+ let(:post_analyzer) { PostAnalyzer.new nil, nil }
let(:raw) { "Here's a tweet:\n#{url}" }
let(:options) { {} }
before { Oneboxer.stubs(:onebox) }
- it 'fetches the cached onebox for any urls in the post' do
- Oneboxer.expects(:cached_onebox).with(url).returns('something')
+ it "fetches the cached onebox for any urls in the post" do
+ Oneboxer.expects(:cached_onebox).with(url).returns("something")
post_analyzer.cook(raw, options)
expect(post_analyzer.found_oneboxes?).to be(true)
end
- it 'does not invalidate the onebox cache' do
+ it "does not invalidate the onebox cache" do
Oneboxer.expects(:invalidate).with(url).never
post_analyzer.cook(raw, options)
end
- context 'when invalidating oneboxes' do
+ context "when invalidating oneboxes" do
let(:options) { { invalidate_oneboxes: true } }
- it 'invalidates the oneboxes for urls in the post' do
+ it "invalidates the oneboxes for urls in the post" do
Oneboxer.expects(:invalidate).with url
InlineOneboxer.expects(:invalidate).with url
post_analyzer.cook(raw, options)
@@ -34,33 +34,39 @@ RSpec.describe PostAnalyzer do
end
it "does nothing when the cook_method is 'raw_html'" do
- cooked = post_analyzer.cook('Hello
world', cook_method: Post.cook_methods[:raw_html])
- expect(cooked).to eq('Hello
world')
+ cooked = post_analyzer.cook("Hello
world", cook_method: Post.cook_methods[:raw_html])
+ expect(cooked).to eq("Hello
world")
end
it "does not interpret Markdown when cook_method is 'email' and raw contains plaintext" do
- cooked = post_analyzer.cook("[plaintext]\n*this is not italic* and here is a link: https://www.example.com\n[/plaintext]", cook_method: Post.cook_methods[:email])
- expect(cooked).to eq('*this is not italic* and here is a link: https://www.example.com ')
+ cooked =
+ post_analyzer.cook(
+ "[plaintext]\n*this is not italic* and here is a link: https://www.example.com\n[/plaintext]",
+ cook_method: Post.cook_methods[:email],
+ )
+ expect(cooked).to eq(
+ '*this is not italic* and here is a link: https://www.example.com ',
+ )
end
it "does interpret Markdown when cook_method is 'email' and raw does not contain plaintext" do
- cooked = post_analyzer.cook('*this is italic*', cook_method: Post.cook_methods[:email])
- expect(cooked).to eq('this is italic
')
+ cooked = post_analyzer.cook("*this is italic*", cook_method: Post.cook_methods[:email])
+ expect(cooked).to eq("this is italic
")
end
it "does interpret Markdown when cook_method is 'regular'" do
- cooked = post_analyzer.cook('*this is italic*', cook_method: Post.cook_methods[:regular])
- expect(cooked).to eq('this is italic
')
+ cooked = post_analyzer.cook("*this is italic*", cook_method: Post.cook_methods[:regular])
+ expect(cooked).to eq("this is italic
")
end
it "does interpret Markdown when not cook_method is set" do
- cooked = post_analyzer.cook('*this is italic*')
- expect(cooked).to eq('this is italic
')
+ cooked = post_analyzer.cook("*this is italic*")
+ expect(cooked).to eq("this is italic
")
end
- it 'should respect SiteSetting.max_oneboxes_per_post' do
+ it "should respect SiteSetting.max_oneboxes_per_post" do
SiteSetting.max_oneboxes_per_post = 2
- Oneboxer.expects(:cached_onebox).with(url).returns('something').twice
+ Oneboxer.expects(:cached_onebox).with(url).returns("something").twice
cooked = post_analyzer.cook(<<~RAW)
#{url}
@@ -81,9 +87,15 @@ RSpec.describe PostAnalyzer do
describe "links" do
let(:raw_no_links) { "hello world my name is evil trout" }
let(:raw_one_link_md) { "[jlawr](http://www.imdb.com/name/nm2225369)" }
- let(:raw_two_links_html) { "disney reddit " }
- let(:raw_three_links) { "http://discourse.org and http://discourse.org/another_url and http://www.imdb.com/name/nm2225369" }
- let(:raw_elided) { "\n··· \nhttp://discourse.org\n " }
+ let(:raw_two_links_html) do
+ "disney reddit "
+ end
+ let(:raw_three_links) do
+ "http://discourse.org and http://discourse.org/another_url and http://www.imdb.com/name/nm2225369"
+ end
+ let(:raw_elided) do
+ "\n··· \nhttp://discourse.org\n "
+ end
describe "raw_links" do
it "returns a blank collection for a post with no links" do
@@ -98,17 +110,27 @@ RSpec.describe PostAnalyzer do
it "can find two links from html" do
post_analyzer = PostAnalyzer.new(raw_two_links_html, default_topic_id)
- expect(post_analyzer.raw_links).to eq(["http://disneyland.disney.go.com/", "http://reddit.com"])
+ expect(post_analyzer.raw_links).to eq(
+ %w[http://disneyland.disney.go.com/ http://reddit.com],
+ )
end
it "can find three links without markup" do
post_analyzer = PostAnalyzer.new(raw_three_links, default_topic_id)
- expect(post_analyzer.raw_links).to eq(["http://discourse.org", "http://discourse.org/another_url", "http://www.imdb.com/name/nm2225369"])
+ expect(post_analyzer.raw_links).to eq(
+ %w[
+ http://discourse.org
+ http://discourse.org/another_url
+ http://www.imdb.com/name/nm2225369
+ ],
+ )
end
it "doesn't extract links from elided part" do
post_analyzer = PostAnalyzer.new(raw_elided, default_topic_id)
- post_analyzer.expects(:cook).returns("\n··· \ndiscourse.org \n
")
+ post_analyzer.expects(:cook).returns(
+ "\n··· \ndiscourse.org \n
",
+ )
expect(post_analyzer.raw_links).to be_blank
end
end
@@ -133,12 +155,20 @@ RSpec.describe PostAnalyzer do
describe "embedded_media_count" do
let(:raw_post_one_image_md) { "" }
- let(:raw_post_two_images_html) { "discourse twitter " }
+ let(:raw_post_two_links_html) do
+ "discourse twitter "
+ end
let(:raw_post_with_mentions) { "hello @novemberkilo how are you doing?" }
let(:raw_post_with_anchors) { "# hello world" }
- let(:raw_post_with_hashtags) { "a category #{Fabricate(:category).slug} and a tag #{Fabricate(:tag).name}" }
+ let(:raw_post_with_hashtags) do
+ "a category #{Fabricate(:category).slug} and a tag #{Fabricate(:tag).name}"
+ end
it "returns 0 links for an empty post" do
post_analyzer = PostAnalyzer.new("Hello world", nil)
@@ -234,7 +268,6 @@ RSpec.describe PostAnalyzer do
end
describe "raw_mentions" do
-
it "returns an empty array with no matches" do
post_analyzer = PostAnalyzer.new("Hello Jake and Finn!", default_topic_id)
expect(post_analyzer.raw_mentions).to eq([])
@@ -242,62 +275,66 @@ RSpec.describe PostAnalyzer do
it "returns lowercase unique versions of the mentions" do
post_analyzer = PostAnalyzer.new("@Jake @Finn @Jake", default_topic_id)
- expect(post_analyzer.raw_mentions).to eq(['jake', 'finn'])
+ expect(post_analyzer.raw_mentions).to eq(%w[jake finn])
end
it "ignores pre" do
# note, CommonMark has rules for dealing with HTML, if your paragraph starts with it
# it will no longer be an "inline" so this means that @Finn in this case would not be a mention
post_analyzer = PostAnalyzer.new(". @Jake @Finn", default_topic_id)
- expect(post_analyzer.raw_mentions).to eq(['finn'])
+ expect(post_analyzer.raw_mentions).to eq(["finn"])
end
it "catches content between pre tags" do
post_analyzer = PostAnalyzer.new(". hello @Finn Hello @Jake @Finn
")
- expect(post_analyzer.raw_mentions).to eq(['jake'])
+ post_analyzer.stubs(:cook).returns(
+ "Hello @Jake @Finn
",
+ )
+ expect(post_analyzer.raw_mentions).to eq(["jake"])
end
it "handles underscore in username" do
post_analyzer = PostAnalyzer.new("@Jake @Finn @Jake_Old", default_topic_id)
- expect(post_analyzer.raw_mentions).to eq(['jake', 'finn', 'jake_old'])
+ expect(post_analyzer.raw_mentions).to eq(%w[jake finn jake_old])
end
it "handles hyphen in groupname" do
post_analyzer = PostAnalyzer.new("@org-board", default_topic_id)
- expect(post_analyzer.raw_mentions).to eq(['org-board'])
+ expect(post_analyzer.raw_mentions).to eq(["org-board"])
end
it "ignores emails" do
post_analyzer = PostAnalyzer.new("1@test.com 1@best.com @best @not", default_topic_id)
- expect(post_analyzer.raw_mentions).to eq(['best', 'not'])
+ expect(post_analyzer.raw_mentions).to eq(%w[best not])
end
end
end
diff --git a/spec/models/post_mover_spec.rb b/spec/models/post_mover_spec.rb
index 59ac9a11080..247731f8cfb 100644
--- a/spec/models/post_mover_spec.rb
+++ b/spec/models/post_mover_spec.rb
@@ -4,11 +4,9 @@ RSpec.describe PostMover do
fab!(:admin) { Fabricate(:admin) }
fab!(:evil_trout) { Fabricate(:evil_trout) }
- describe '#move_types' do
+ describe "#move_types" do
context "when verifying enum sequence" do
- before do
- @move_types = PostMover.move_types
- end
+ before { @move_types = PostMover.move_types }
it "'new_topic' should be at 1st position" do
expect(@move_types[:new_topic]).to eq(1)
@@ -20,15 +18,17 @@ RSpec.describe PostMover do
end
end
- describe 'move_posts' do
- context 'with topics' do
+ describe "move_posts" do
+ context "with topics" do
before { freeze_time }
fab!(:user) { Fabricate(:user, admin: true) }
fab!(:another_user) { evil_trout }
fab!(:category) { Fabricate(:category, user: user) }
fab!(:topic) { Fabricate(:topic, user: user, created_at: 4.hours.ago) }
- fab!(:p1) { Fabricate(:post, topic: topic, user: user, created_at: 3.hours.ago, reply_count: 2) }
+ fab!(:p1) do
+ Fabricate(:post, topic: topic, user: user, created_at: 3.hours.ago, reply_count: 2)
+ end
fab!(:p2) do
Fabricate(
@@ -38,12 +38,28 @@ RSpec.describe PostMover do
raw: "Has a link to [evil trout](http://eviltrout.com) which is a cool site.",
reply_to_post_number: p1.post_number,
reply_count: 1,
- created_at: 2.hours.ago
+ created_at: 2.hours.ago,
)
end
- fab!(:p3) { Fabricate(:post, topic: topic, reply_to_post_number: p1.post_number, user: user, created_at: 1.hour.ago) }
- fab!(:p4) { Fabricate(:post, topic: topic, reply_to_post_number: p2.post_number, user: user, created_at: 45.minutes.ago) }
+ fab!(:p3) do
+ Fabricate(
+ :post,
+ topic: topic,
+ reply_to_post_number: p1.post_number,
+ user: user,
+ created_at: 1.hour.ago,
+ )
+ end
+ fab!(:p4) do
+ Fabricate(
+ :post,
+ topic: topic,
+ reply_to_post_number: p2.post_number,
+ user: user,
+ created_at: 45.minutes.ago,
+ )
+ end
fab!(:p5) { Fabricate(:post, created_at: 30.minutes.ago) }
let(:p6) { Fabricate(:post, topic: topic, created_at: 15.minutes.ago) }
@@ -57,15 +73,10 @@ RSpec.describe PostMover do
end
def add_moderator_post_to(topic, post_type)
- topic.add_moderator_post(
- user,
- "message",
- post_type: post_type,
- action_code: "split_topic")
+ topic.add_moderator_post(user, "message", post_type: post_type, action_code: "split_topic")
end
- context 'with success' do
-
+ context "with success" do
it "correctly handles notifications and bread crumbs" do
old_topic = p2.topic
@@ -78,17 +89,21 @@ RSpec.describe PostMover do
expect(p2.reply_to_post_number).to eq(nil)
expect(p2.reply_to_user_id).to eq(nil)
- notification = p2.user.notifications.where(notification_type: Notification.types[:moved_post]).first
+ notification =
+ p2.user.notifications.where(notification_type: Notification.types[:moved_post]).first
expect(notification.topic_id).to eq(p2.topic_id)
expect(notification.topic_id).not_to eq(old_topic_id)
expect(notification.post_number).to eq(1)
# no message for person who made the move
- expect(p4.user.notifications.where(notification_type: Notification.types[:moved_post]).length).to eq(0)
+ expect(
+ p4.user.notifications.where(notification_type: Notification.types[:moved_post]).length,
+ ).to eq(0)
# notify at the right spot in the stream
- notification = p6.user.notifications.where(notification_type: Notification.types[:moved_post]).first
+ notification =
+ p6.user.notifications.where(notification_type: Notification.types[:moved_post]).first
expect(notification.topic_id).to eq(p2.topic_id)
expect(notification.topic_id).not_to eq(old_topic_id)
@@ -114,12 +129,11 @@ RSpec.describe PostMover do
p3.update!(raw: raw)
p3.rebake!
- expect { topic.move_posts(user, [p2.id], title: "new testing topic name") }
- .to change { p2.reload.topic_id }
- .and change { p2.post_number }
- .and change { p3.reload.raw }
- .and change { p2.baked_version }.to(nil)
- .and change { p3.baked_version }.to(nil)
+ expect { topic.move_posts(user, [p2.id], title: "new testing topic name") }.to change {
+ p2.reload.topic_id
+ }.and change { p2.post_number }.and change { p3.reload.raw }.and change {
+ p2.baked_version
+ }.to(nil).and change { p3.baked_version }.to(nil)
expect(p3.raw).to include("post:#{p2.post_number}, topic:#{p2.topic_id}")
end
@@ -128,14 +142,16 @@ RSpec.describe PostMover do
context "with errors" do
it "raises an error when one of the posts doesn't exist" do
non_existent_post_id = Post.maximum(:id)&.next || 1
- expect { topic.move_posts(user, [non_existent_post_id], title: "new testing topic name") }.to raise_error(Discourse::InvalidParameters)
+ expect {
+ topic.move_posts(user, [non_existent_post_id], title: "new testing topic name")
+ }.to raise_error(Discourse::InvalidParameters)
end
it "raises an error and does not create a topic if no posts were moved" do
Topic.count.tap do |original_topic_count|
- expect {
- topic.move_posts(user, [], title: "new testing topic name")
- }.to raise_error(Discourse::InvalidParameters)
+ expect { topic.move_posts(user, [], title: "new testing topic name") }.to raise_error(
+ Discourse::InvalidParameters,
+ )
expect(Topic.count).to eq original_topic_count
end
@@ -153,7 +169,7 @@ RSpec.describe PostMover do
topic_id: post.topic_id,
user_id: user.id,
post_number: post.post_number,
- msecs: msecs
+ msecs: msecs,
)
end
@@ -163,7 +179,8 @@ RSpec.describe PostMover do
topic.move_posts(
user,
[p2.id],
- title: 'GOT is a very addictive show', category_id: category.id
+ title: "GOT is a very addictive show",
+ category_id: category.id,
)
expect(p2.reload.replies).to eq([])
@@ -174,7 +191,8 @@ RSpec.describe PostMover do
topic.move_posts(
user,
[p2.id],
- title: 'GOT is a very addictive show', category_id: category.id
+ title: "GOT is a very addictive show",
+ category_id: category.id,
)
expect(p2.reload.replies).to eq([])
@@ -183,19 +201,21 @@ RSpec.describe PostMover do
describe "when replies of a post have been moved" do
it "should update post replies correctly" do
- p5 = Fabricate(
- :post,
- topic: topic,
- reply_to_post_number: p2.post_number,
- user: another_user
- )
+ p5 =
+ Fabricate(
+ :post,
+ topic: topic,
+ reply_to_post_number: p2.post_number,
+ user: another_user,
+ )
p2.replies << p5
topic.move_posts(
user,
[p4.id],
- title: 'GOT is a very addictive show', category_id: category.id
+ title: "GOT is a very addictive show",
+ category_id: category.id,
)
expect(p2.reload.replies).to eq([p5])
@@ -204,19 +224,21 @@ RSpec.describe PostMover do
context "when only one reply is left behind" do
it "should update post replies correctly" do
- p5 = Fabricate(
- :post,
- topic: topic,
- reply_to_post_number: p2.post_number,
- user: another_user
- )
+ p5 =
+ Fabricate(
+ :post,
+ topic: topic,
+ reply_to_post_number: p2.post_number,
+ user: another_user,
+ )
p2.replies << p5
topic.move_posts(
user,
[p2.id, p4.id],
- title: 'GOT is a very addictive show', category_id: category.id
+ title: "GOT is a very addictive show",
+ category_id: category.id,
)
expect(p2.reload.replies).to eq([p4])
@@ -227,9 +249,18 @@ RSpec.describe PostMover do
context "when moved to a new topic" do
it "works correctly" do
topic.expects(:add_moderator_post).once
- new_topic = topic.move_posts(user, [p2.id, p4.id], title: "new testing topic name", category_id: category.id, tags: ["tag1", "tag2"])
+ new_topic =
+ topic.move_posts(
+ user,
+ [p2.id, p4.id],
+ title: "new testing topic name",
+ category_id: category.id,
+ tags: %w[tag1 tag2],
+ )
- expect(TopicUser.find_by(user_id: user.id, topic_id: topic.id).last_read_post_number).to eq(p3.post_number)
+ expect(
+ TopicUser.find_by(user_id: user.id, topic_id: topic.id).last_read_post_number,
+ ).to eq(p3.post_number)
expect(new_topic).to be_present
expect(new_topic.featured_user1_id).to eq(p4.user_id)
@@ -268,52 +299,80 @@ RSpec.describe PostMover do
action = UserAction.find_by(user_id: another_user.id)
expect(action.target_topic_id).to eq(new_topic.id)
- expect(TopicUser.exists?(
- user_id: another_user,
- topic_id: new_topic.id,
- notification_level: TopicUser.notification_levels[:watching],
- notifications_reason_id: TopicUser.notification_reasons[:created_topic]
- )).to eq(true)
+ expect(
+ TopicUser.exists?(
+ user_id: another_user,
+ topic_id: new_topic.id,
+ notification_level: TopicUser.notification_levels[:watching],
+ notifications_reason_id: TopicUser.notification_reasons[:created_topic],
+ ),
+ ).to eq(true)
expect(TopicUser.exists?(user_id: user, topic_id: new_topic.id)).to eq(true)
end
it "moving all posts will close the topic" do
topic.expects(:add_moderator_post).twice
- new_topic = topic.move_posts(user, [p1.id, p2.id, p3.id, p4.id], title: "new testing topic name", category_id: category.id)
+ new_topic =
+ topic.move_posts(
+ user,
+ [p1.id, p2.id, p3.id, p4.id],
+ title: "new testing topic name",
+ category_id: category.id,
+ )
expect(new_topic).to be_present
topic.reload
expect(topic.closed).to eq(true)
end
- it 'does not move posts that do not belong to the existing topic' do
- new_topic = topic.move_posts(
- user, [p2.id, p3.id, p5.id], title: 'Logan is a pretty good movie'
- )
+ it "does not move posts that do not belong to the existing topic" do
+ new_topic =
+ topic.move_posts(user, [p2.id, p3.id, p5.id], title: "Logan is a pretty good movie")
expect(new_topic.posts.pluck(:id).sort).to eq([p2.id, p3.id].sort)
end
it "uses default locale for moderator post" do
- I18n.locale = 'de'
+ I18n.locale = "de"
- new_topic = topic.move_posts(user, [p2.id, p4.id], title: "new testing topic name", category_id: category.id)
+ new_topic =
+ topic.move_posts(
+ user,
+ [p2.id, p4.id],
+ title: "new testing topic name",
+ category_id: category.id,
+ )
post = Post.find_by(topic_id: topic.id, post_type: Post.types[:small_action])
- expected_text = I18n.with_locale(:en) do
- I18n.t("move_posts.new_topic_moderator_post",
- count: 2,
- topic_link: "[#{new_topic.title}](#{new_topic.relative_url})")
- end
+ expected_text =
+ I18n.with_locale(:en) do
+ I18n.t(
+ "move_posts.new_topic_moderator_post",
+ count: 2,
+ topic_link: "[#{new_topic.title}](#{new_topic.relative_url})",
+ )
+ end
expect(post.raw).to eq(expected_text)
end
it "does not try to move small action posts" do
- small_action = Fabricate(:post, topic: topic, raw: "A small action", post_type: Post.types[:small_action])
+ small_action =
+ Fabricate(
+ :post,
+ topic: topic,
+ raw: "A small action",
+ post_type: Post.types[:small_action],
+ )
hidden_small_action = Fabricate(:post, topic: topic, post_type: Post.types[:whisper])
hidden_small_action.update_attribute(:raw, "")
- new_topic = topic.move_posts(user, [p2.id, p4.id, small_action.id, hidden_small_action.id], title: "new testing topic name", category_id: category.id)
+ new_topic =
+ topic.move_posts(
+ user,
+ [p2.id, p4.id, small_action.id, hidden_small_action.id],
+ title: "new testing topic name",
+ category_id: category.id,
+ )
expect(new_topic.posts_count).to eq(2)
expect(small_action.topic_id).to eq(topic.id)
@@ -324,16 +383,24 @@ RSpec.describe PostMover do
end
it "forces resulting topic owner to watch the new topic" do
- new_topic = topic.move_posts(user, [p2.id, p4.id], title: "new testing topic name", category_id: category.id)
+ new_topic =
+ topic.move_posts(
+ user,
+ [p2.id, p4.id],
+ title: "new testing topic name",
+ category_id: category.id,
+ )
expect(new_topic.posts_count).to eq(2)
- expect(TopicUser.exists?(
- user_id: another_user,
- topic_id: new_topic.id,
- notification_level: TopicUser.notification_levels[:watching],
- notifications_reason_id: TopicUser.notification_reasons[:created_topic]
- )).to eq(true)
+ expect(
+ TopicUser.exists?(
+ user_id: another_user,
+ topic_id: new_topic.id,
+ notification_level: TopicUser.notification_levels[:watching],
+ notifications_reason_id: TopicUser.notification_reasons[:created_topic],
+ ),
+ ).to eq(true)
end
it "updates existing notifications" do
@@ -369,7 +436,12 @@ RSpec.describe PostMover do
user_notification = Fabricate(:mentioned_notification, post: p3, user: another_user)
admin_notification = Fabricate(:mentioned_notification, post: p3, user: another_admin)
- topic.move_posts(user, [p3.id], title: "new testing topic name", category_id: staff_category.id)
+ topic.move_posts(
+ user,
+ [p3.id],
+ title: "new testing topic name",
+ category_id: staff_category.id,
+ )
expect(Notification.exists?(user_notification.id)).to eq(false)
expect(Notification.exists?(admin_notification.id)).to eq(true)
@@ -384,11 +456,19 @@ RSpec.describe PostMover do
new_topic = topic.move_posts(user, [p1.id, p4.id], title: "new testing topic name")
- expect(PostTiming.where(topic_id: topic.id, user_id: some_user.id).pluck(:post_number, :msecs))
- .to contain_exactly([1, 500], [2, 1000], [3, 1500])
+ expect(
+ PostTiming.where(topic_id: topic.id, user_id: some_user.id).pluck(
+ :post_number,
+ :msecs,
+ ),
+ ).to contain_exactly([1, 500], [2, 1000], [3, 1500])
- expect(PostTiming.where(topic_id: new_topic.id, user_id: some_user.id).pluck(:post_number, :msecs))
- .to contain_exactly([1, 500], [2, 750])
+ expect(
+ PostTiming.where(topic_id: new_topic.id, user_id: some_user.id).pluck(
+ :post_number,
+ :msecs,
+ ),
+ ).to contain_exactly([1, 500], [2, 750])
end
it "makes sure the topic_user.bookmarked value is reflected for users in the source and destination topic" do
@@ -402,24 +482,26 @@ RSpec.describe PostMover do
bookmark3 = Fabricate(:bookmark, bookmarkable: p3, user: user2)
bookmark4 = Fabricate(:bookmark, bookmarkable: p4, user: user2)
- tu1 = Fabricate(
- :topic_user,
- user: user1,
- topic: p1.topic,
- bookmarked: true,
- notification_level: TopicUser.notification_levels[:watching],
- last_read_post_number: 4,
- last_emailed_post_number: 3
- )
- tu2 = Fabricate(
- :topic_user,
- user: user2,
- topic: p1.topic,
- bookmarked: true,
- notification_level: TopicUser.notification_levels[:watching],
- last_read_post_number: 4,
- last_emailed_post_number: 3
- )
+ tu1 =
+ Fabricate(
+ :topic_user,
+ user: user1,
+ topic: p1.topic,
+ bookmarked: true,
+ notification_level: TopicUser.notification_levels[:watching],
+ last_read_post_number: 4,
+ last_emailed_post_number: 3,
+ )
+ tu2 =
+ Fabricate(
+ :topic_user,
+ user: user2,
+ topic: p1.topic,
+ bookmarked: true,
+ notification_level: TopicUser.notification_levels[:watching],
+ last_read_post_number: 4,
+ last_emailed_post_number: 3,
+ )
new_topic = topic.move_posts(user, [p1.id, p4.id], title: "new testing topic name")
new_topic_user1 = TopicUser.find_by(topic: new_topic, user: user1)
@@ -439,11 +521,14 @@ RSpec.describe PostMover do
def create_topic_user(user, opts = {})
notification_level = opts.delete(:notification_level) || :regular
- Fabricate(:topic_user, opts.merge(
- notification_level: TopicUser.notification_levels[notification_level],
- topic: topic,
- user: user
- ))
+ Fabricate(
+ :topic_user,
+ opts.merge(
+ notification_level: TopicUser.notification_levels[notification_level],
+ topic: topic,
+ user: user,
+ ),
+ )
end
fab!(:user1) { Fabricate(:user) }
@@ -457,90 +542,85 @@ RSpec.describe PostMover do
user1,
last_read_post_number: 4,
last_emailed_post_number: 3,
- notification_level: :tracking
+ notification_level: :tracking,
)
create_topic_user(
user2,
last_read_post_number: 2,
last_emailed_post_number: 2,
- notification_level: :tracking
+ notification_level: :tracking,
)
create_topic_user(
user3,
last_read_post_number: 1,
last_emailed_post_number: 4,
- notification_level: :watching
+ notification_level: :watching,
)
p2.update!(user_id: user2.id)
new_topic = topic.move_posts(user, [p1.id, p2.id], title: "new testing topic name")
expect(TopicUser.where(topic_id: topic.id).count).to eq(4)
- expect(TopicUser.find_by(topic: topic, user: user))
- .to have_attributes(
- last_read_post_number: 4,
- last_emailed_post_number: nil,
- notification_level: TopicUser.notification_levels[:tracking]
- )
- expect(TopicUser.find_by(topic: topic, user: user1))
- .to have_attributes(
- last_read_post_number: 4,
- last_emailed_post_number: 3,
- notification_level: TopicUser.notification_levels[:tracking]
- )
- expect(TopicUser.find_by(topic: topic, user: user2))
- .to have_attributes(
- last_read_post_number: 2,
- last_emailed_post_number: 2,
- notification_level: TopicUser.notification_levels[:tracking]
- )
- expect(TopicUser.find_by(topic: topic, user: user3))
- .to have_attributes(
- last_read_post_number: 1,
- last_emailed_post_number: 4,
- notification_level: TopicUser.notification_levels[:watching]
- )
+ expect(TopicUser.find_by(topic: topic, user: user)).to have_attributes(
+ last_read_post_number: 4,
+ last_emailed_post_number: nil,
+ notification_level: TopicUser.notification_levels[:tracking],
+ )
+ expect(TopicUser.find_by(topic: topic, user: user1)).to have_attributes(
+ last_read_post_number: 4,
+ last_emailed_post_number: 3,
+ notification_level: TopicUser.notification_levels[:tracking],
+ )
+ expect(TopicUser.find_by(topic: topic, user: user2)).to have_attributes(
+ last_read_post_number: 2,
+ last_emailed_post_number: 2,
+ notification_level: TopicUser.notification_levels[:tracking],
+ )
+ expect(TopicUser.find_by(topic: topic, user: user3)).to have_attributes(
+ last_read_post_number: 1,
+ last_emailed_post_number: 4,
+ notification_level: TopicUser.notification_levels[:watching],
+ )
expect(TopicUser.where(topic_id: new_topic.id).count).to eq(4)
- expect(TopicUser.find_by(topic: new_topic, user: user))
- .to have_attributes(
- last_read_post_number: 1,
- last_emailed_post_number: nil,
- notification_level: TopicUser.notification_levels[:watching],
- posted: true
- )
- expect(TopicUser.find_by(topic: new_topic, user: user1))
- .to have_attributes(
- last_read_post_number: 2,
- last_emailed_post_number: 2,
- notification_level: TopicUser.notification_levels[:tracking],
- posted: false
- )
- expect(TopicUser.find_by(topic: new_topic, user: user2))
- .to have_attributes(
- last_read_post_number: 2,
- last_emailed_post_number: 2,
- notification_level: TopicUser.notification_levels[:tracking],
- posted: true
- )
- expect(TopicUser.find_by(topic: new_topic, user: user3))
- .to have_attributes(
- last_read_post_number: 1,
- last_emailed_post_number: 2,
- notification_level: TopicUser.notification_levels[:watching],
- posted: false
- )
+ expect(TopicUser.find_by(topic: new_topic, user: user)).to have_attributes(
+ last_read_post_number: 1,
+ last_emailed_post_number: nil,
+ notification_level: TopicUser.notification_levels[:watching],
+ posted: true,
+ )
+ expect(TopicUser.find_by(topic: new_topic, user: user1)).to have_attributes(
+ last_read_post_number: 2,
+ last_emailed_post_number: 2,
+ notification_level: TopicUser.notification_levels[:tracking],
+ posted: false,
+ )
+ expect(TopicUser.find_by(topic: new_topic, user: user2)).to have_attributes(
+ last_read_post_number: 2,
+ last_emailed_post_number: 2,
+ notification_level: TopicUser.notification_levels[:tracking],
+ posted: true,
+ )
+ expect(TopicUser.find_by(topic: new_topic, user: user3)).to have_attributes(
+ last_read_post_number: 1,
+ last_emailed_post_number: 2,
+ notification_level: TopicUser.notification_levels[:watching],
+ posted: false,
+ )
end
end
end
context "when moved to an existing topic" do
fab!(:destination_topic) { Fabricate(:topic, user: another_user) }
- fab!(:destination_op) { Fabricate(:post, topic: destination_topic, user: another_user, created_at: 1.day.ago) }
+ fab!(:destination_op) do
+ Fabricate(:post, topic: destination_topic, user: another_user, created_at: 1.day.ago)
+ end
it "works correctly" do
topic.expects(:add_moderator_post).once
- moved_to = topic.move_posts(user, [p2.id, p4.id], destination_topic_id: destination_topic.id)
+ moved_to =
+ topic.move_posts(user, [p2.id, p4.id], destination_topic_id: destination_topic.id)
expect(moved_to).to eq(destination_topic)
# Check out new topic
@@ -580,19 +660,23 @@ RSpec.describe PostMover do
expect(topic.highest_post_number).to eq(p3.post_number)
# Should notify correctly
- notification = p2.user.notifications.where(notification_type: Notification.types[:moved_post]).first
+ notification =
+ p2.user.notifications.where(notification_type: Notification.types[:moved_post]).first
expect(notification.topic_id).to eq(destination_topic.id)
expect(notification.post_number).to eq(p2.post_number)
# Should update last reads
- expect(TopicUser.find_by(user_id: user.id, topic_id: topic.id).last_read_post_number).to eq(p3.post_number)
+ expect(
+ TopicUser.find_by(user_id: user.id, topic_id: topic.id).last_read_post_number,
+ ).to eq(p3.post_number)
end
it "moving all posts will close the topic" do
topic.expects(:add_moderator_post).twice
posts_to_move = [p1.id, p2.id, p3.id, p4.id]
- moved_to = topic.move_posts(user, posts_to_move, destination_topic_id: destination_topic.id)
+ moved_to =
+ topic.move_posts(user, posts_to_move, destination_topic_id: destination_topic.id)
expect(moved_to).to be_present
topic.reload
@@ -602,7 +686,8 @@ RSpec.describe PostMover do
it "doesn't close the topic when not all posts were moved" do
topic.expects(:add_moderator_post).once
posts_to_move = [p2.id, p3.id]
- moved_to = topic.move_posts(user, posts_to_move, destination_topic_id: destination_topic.id)
+ moved_to =
+ topic.move_posts(user, posts_to_move, destination_topic_id: destination_topic.id)
expect(moved_to).to be_present
topic.reload
@@ -612,7 +697,8 @@ RSpec.describe PostMover do
it "doesn't close the topic when all posts except the first one were moved" do
topic.expects(:add_moderator_post).once
posts_to_move = [p2.id, p3.id, p4.id]
- moved_to = topic.move_posts(user, posts_to_move, destination_topic_id: destination_topic.id)
+ moved_to =
+ topic.move_posts(user, posts_to_move, destination_topic_id: destination_topic.id)
expect(moved_to).to be_present
topic.reload
@@ -625,7 +711,8 @@ RSpec.describe PostMover do
topic.expects(:add_moderator_post).twice
posts_to_move = [p1.id, p2.id, p3.id, p4.id]
- moved_to = topic.move_posts(user, posts_to_move, destination_topic_id: destination_topic.id)
+ moved_to =
+ topic.move_posts(user, posts_to_move, destination_topic_id: destination_topic.id)
expect(moved_to).to be_present
timer = topic.topic_timers.find_by(status_type: TopicTimer.types[:delete])
@@ -638,7 +725,8 @@ RSpec.describe PostMover do
topic.expects(:add_moderator_post).once
posts_to_move = [p1.id, p2.id, p3.id]
- moved_to = topic.move_posts(user, posts_to_move, destination_topic_id: destination_topic.id)
+ moved_to =
+ topic.move_posts(user, posts_to_move, destination_topic_id: destination_topic.id)
expect(moved_to).to be_present
timer = topic.topic_timers.find_by(status_type: TopicTimer.types[:delete])
@@ -650,7 +738,8 @@ RSpec.describe PostMover do
topic.expects(:add_moderator_post).twice
posts_to_move = [p1.id, p2.id, p3.id, p4.id]
- moved_to = topic.move_posts(user, posts_to_move, destination_topic_id: destination_topic.id)
+ moved_to =
+ topic.move_posts(user, posts_to_move, destination_topic_id: destination_topic.id)
expect(moved_to).to be_present
timer = topic.topic_timers.find_by(status_type: TopicTimer.types[:delete])
@@ -669,8 +758,19 @@ RSpec.describe PostMover do
end
it "does not try to move small action posts" do
- small_action = Fabricate(:post, topic: topic, raw: "A small action", post_type: Post.types[:small_action])
- moved_to = topic.move_posts(user, [p1.id, p2.id, p3.id, p4.id, small_action.id], destination_topic_id: destination_topic.id)
+ small_action =
+ Fabricate(
+ :post,
+ topic: topic,
+ raw: "A small action",
+ post_type: Post.types[:small_action],
+ )
+ moved_to =
+ topic.move_posts(
+ user,
+ [p1.id, p2.id, p3.id, p4.id, small_action.id],
+ destination_topic_id: destination_topic.id,
+ )
moved_to.reload
expect(moved_to.posts_count).to eq(5)
@@ -718,13 +818,22 @@ RSpec.describe PostMover do
create_post_timing(p3, some_user, 1500)
create_post_timing(p4, some_user, 750)
- moved_to = topic.move_posts(user, [p1.id, p4.id], destination_topic_id: destination_topic.id)
+ moved_to =
+ topic.move_posts(user, [p1.id, p4.id], destination_topic_id: destination_topic.id)
- expect(PostTiming.where(topic_id: topic.id, user_id: some_user.id).pluck(:post_number, :msecs))
- .to contain_exactly([1, 500], [2, 1000], [3, 1500])
+ expect(
+ PostTiming.where(topic_id: topic.id, user_id: some_user.id).pluck(
+ :post_number,
+ :msecs,
+ ),
+ ).to contain_exactly([1, 500], [2, 1000], [3, 1500])
- expect(PostTiming.where(topic_id: moved_to.id, user_id: some_user.id).pluck(:post_number, :msecs))
- .to contain_exactly([2, 500], [3, 750])
+ expect(
+ PostTiming.where(topic_id: moved_to.id, user_id: some_user.id).pluck(
+ :post_number,
+ :msecs,
+ ),
+ ).to contain_exactly([2, 500], [3, 750])
end
it "moves timings when post timing exists in destination topic" do
@@ -732,21 +841,31 @@ RSpec.describe PostMover do
topic_id: destination_topic.id,
user_id: some_user.id,
post_number: 2,
- msecs: 800
+ msecs: 800,
)
create_post_timing(p1, some_user, 500)
moved_to = topic.move_posts(user, [p1.id], destination_topic_id: destination_topic.id)
- expect(PostTiming.where(topic_id: moved_to.id, user_id: some_user.id).pluck(:post_number, :msecs))
- .to contain_exactly([2, 500])
+ expect(
+ PostTiming.where(topic_id: moved_to.id, user_id: some_user.id).pluck(
+ :post_number,
+ :msecs,
+ ),
+ ).to contain_exactly([2, 500])
end
end
it "updates topic_user.liked values for both source and destination topics" do
expect(TopicUser.find_by(topic: topic, user: user).liked).to eq(false)
- like = Fabricate(:post_action, post: p3, user: user, post_action_type_id: PostActionType.types[:like])
+ like =
+ Fabricate(
+ :post_action,
+ post: p3,
+ user: user,
+ post_action_type_id: PostActionType.types[:like],
+ )
expect(TopicUser.find_by(topic: topic, user: user).liked).to eq(true)
expect(TopicUser.find_by(topic: destination_topic, user: user)).to eq(nil)
@@ -760,11 +879,14 @@ RSpec.describe PostMover do
def create_topic_user(user, topic, opts = {})
notification_level = opts.delete(:notification_level) || :regular
- Fabricate(:topic_user, opts.merge(
- notification_level: TopicUser.notification_levels[notification_level],
- topic: topic,
- user: user
- ))
+ Fabricate(
+ :topic_user,
+ opts.merge(
+ notification_level: TopicUser.notification_levels[notification_level],
+ topic: topic,
+ user: user,
+ ),
+ )
end
fab!(:user1) { Fabricate(:user) }
@@ -781,133 +903,134 @@ RSpec.describe PostMover do
expect(destination_topic.highest_post_number).to eq(2)
expect(destination_topic.highest_staff_post_number).to eq(3)
+ create_topic_user(user1, topic, last_read_post_number: 3, last_emailed_post_number: 3)
create_topic_user(
- user1, topic,
- last_read_post_number: 3,
- last_emailed_post_number: 3
- )
- create_topic_user(
- user1, destination_topic,
+ user1,
+ destination_topic,
last_read_post_number: 1,
- last_emailed_post_number: 1
+ last_emailed_post_number: 1,
)
+ create_topic_user(user2, topic, last_read_post_number: 3, last_emailed_post_number: 3)
create_topic_user(
- user2, topic,
- last_read_post_number: 3,
- last_emailed_post_number: 3
- )
- create_topic_user(
- user2, destination_topic,
+ user2,
+ destination_topic,
last_read_post_number: 2,
- last_emailed_post_number: 2
+ last_emailed_post_number: 2,
)
create_topic_user(
- admin1, topic,
+ admin1,
+ topic,
last_read_post_number: 3,
- last_emailed_post_number: 3
+ last_emailed_post_number: 3,
)
create_topic_user(
- admin1, destination_topic,
+ admin1,
+ destination_topic,
last_read_post_number: 2,
- last_emailed_post_number: 1
+ last_emailed_post_number: 1,
)
create_topic_user(
- admin2, topic,
+ admin2,
+ topic,
last_read_post_number: 3,
- last_emailed_post_number: 3
+ last_emailed_post_number: 3,
)
create_topic_user(
- admin2, destination_topic,
+ admin2,
+ destination_topic,
last_read_post_number: 3,
- last_emailed_post_number: 3
+ last_emailed_post_number: 3,
)
- moved_to_topic = topic.move_posts(user, [p1.id, p2.id], destination_topic_id: destination_topic.id)
+ moved_to_topic =
+ topic.move_posts(user, [p1.id, p2.id], destination_topic_id: destination_topic.id)
- expect(TopicUser.find_by(topic: moved_to_topic, user: user1))
- .to have_attributes(
- last_read_post_number: 1,
- last_emailed_post_number: 1
- )
+ expect(TopicUser.find_by(topic: moved_to_topic, user: user1)).to have_attributes(
+ last_read_post_number: 1,
+ last_emailed_post_number: 1,
+ )
- expect(TopicUser.find_by(topic: moved_to_topic, user: user2))
- .to have_attributes(
- last_read_post_number: 5,
- last_emailed_post_number: 5
- )
+ expect(TopicUser.find_by(topic: moved_to_topic, user: user2)).to have_attributes(
+ last_read_post_number: 5,
+ last_emailed_post_number: 5,
+ )
- expect(TopicUser.find_by(topic: moved_to_topic, user: admin1))
- .to have_attributes(
- last_read_post_number: 2,
- last_emailed_post_number: 1
- )
+ expect(TopicUser.find_by(topic: moved_to_topic, user: admin1)).to have_attributes(
+ last_read_post_number: 2,
+ last_emailed_post_number: 1,
+ )
- expect(TopicUser.find_by(topic: moved_to_topic, user: admin2))
- .to have_attributes(
- last_read_post_number: 5,
- last_emailed_post_number: 5
- )
+ expect(TopicUser.find_by(topic: moved_to_topic, user: admin2)).to have_attributes(
+ last_read_post_number: 5,
+ last_emailed_post_number: 5,
+ )
end
it "correctly updates existing topic_user records" do
destination_topic.update!(created_at: 1.day.ago)
- original_topic_user1 = create_topic_user(
- user1, topic,
- last_read_post_number: 5,
- first_visited_at: 5.hours.ago,
- last_visited_at: 30.minutes.ago,
- notification_level: :tracking
- ).reload
- destination_topic_user1 = create_topic_user(
- user1, destination_topic,
- last_read_post_number: 5,
- first_visited_at: 7.hours.ago,
- last_visited_at: 2.hours.ago,
- notification_level: :watching
- ).reload
+ original_topic_user1 =
+ create_topic_user(
+ user1,
+ topic,
+ last_read_post_number: 5,
+ first_visited_at: 5.hours.ago,
+ last_visited_at: 30.minutes.ago,
+ notification_level: :tracking,
+ ).reload
+ destination_topic_user1 =
+ create_topic_user(
+ user1,
+ destination_topic,
+ last_read_post_number: 5,
+ first_visited_at: 7.hours.ago,
+ last_visited_at: 2.hours.ago,
+ notification_level: :watching,
+ ).reload
- original_topic_user2 = create_topic_user(
- user2, topic,
- last_read_post_number: 5,
- first_visited_at: 3.hours.ago,
- last_visited_at: 1.hour.ago,
- notification_level: :watching
- ).reload
- destination_topic_user2 = create_topic_user(
- user2, destination_topic,
- last_read_post_number: 5,
- first_visited_at: 2.hours.ago,
- last_visited_at: 1.hour.ago,
- notification_level: :tracking
- ).reload
+ original_topic_user2 =
+ create_topic_user(
+ user2,
+ topic,
+ last_read_post_number: 5,
+ first_visited_at: 3.hours.ago,
+ last_visited_at: 1.hour.ago,
+ notification_level: :watching,
+ ).reload
+ destination_topic_user2 =
+ create_topic_user(
+ user2,
+ destination_topic,
+ last_read_post_number: 5,
+ first_visited_at: 2.hours.ago,
+ last_visited_at: 1.hour.ago,
+ notification_level: :tracking,
+ ).reload
- new_topic = topic.move_posts(user, [p1.id, p2.id], destination_topic_id: destination_topic.id)
+ new_topic =
+ topic.move_posts(user, [p1.id, p2.id], destination_topic_id: destination_topic.id)
- expect(TopicUser.find_by(topic: new_topic, user: user))
- .to have_attributes(
- notification_level: TopicUser.notification_levels[:tracking],
- posted: true
- )
+ expect(TopicUser.find_by(topic: new_topic, user: user)).to have_attributes(
+ notification_level: TopicUser.notification_levels[:tracking],
+ posted: true,
+ )
- expect(TopicUser.find_by(topic: new_topic, user: user1))
- .to have_attributes(
- first_visited_at: destination_topic_user1.first_visited_at,
- last_visited_at: original_topic_user1.last_visited_at,
- notification_level: destination_topic_user1.notification_level,
- posted: false
- )
+ expect(TopicUser.find_by(topic: new_topic, user: user1)).to have_attributes(
+ first_visited_at: destination_topic_user1.first_visited_at,
+ last_visited_at: original_topic_user1.last_visited_at,
+ notification_level: destination_topic_user1.notification_level,
+ posted: false,
+ )
- expect(TopicUser.find_by(topic: new_topic, user: user2))
- .to have_attributes(
- first_visited_at: original_topic_user2.first_visited_at,
- last_visited_at: destination_topic_user2.last_visited_at,
- notification_level: destination_topic_user2.notification_level,
- posted: false
- )
+ expect(TopicUser.find_by(topic: new_topic, user: user2)).to have_attributes(
+ first_visited_at: original_topic_user2.first_visited_at,
+ last_visited_at: destination_topic_user2.last_visited_at,
+ notification_level: destination_topic_user2.notification_level,
+ posted: false,
+ )
end
end
end
@@ -915,9 +1038,17 @@ RSpec.describe PostMover do
context "when moved to a message" do
it "works correctly" do
topic.expects(:add_moderator_post).once
- new_topic = topic.move_posts(user, [p2.id, p4.id], title: "new testing topic name", archetype: "private_message")
+ new_topic =
+ topic.move_posts(
+ user,
+ [p2.id, p4.id],
+ title: "new testing topic name",
+ archetype: "private_message",
+ )
- expect(TopicUser.find_by(user_id: user.id, topic_id: topic.id).last_read_post_number).to eq(p3.post_number)
+ expect(
+ TopicUser.find_by(user_id: user.id, topic_id: topic.id).last_read_post_number,
+ ).to eq(p3.post_number)
expect(new_topic).to be_present
expect(new_topic.featured_user1_id).to eq(p4.user_id)
@@ -955,20 +1086,23 @@ RSpec.describe PostMover do
action = UserAction.find_by(user_id: another_user.id)
expect(action.target_topic_id).to eq(new_topic.id)
- expect(TopicUser.exists?(
- user_id: another_user,
- topic_id: new_topic.id,
- notification_level: TopicUser.notification_levels[:watching],
- notifications_reason_id: TopicUser.notification_reasons[:created_topic]
- )).to eq(true)
- expect(TopicUser.exists?(
- user_id: user,
- topic_id: new_topic.id,
- notification_level: TopicUser.notification_levels[:watching],
- notifications_reason_id: TopicUser.notification_reasons[:created_post]
- )).to eq(true)
+ expect(
+ TopicUser.exists?(
+ user_id: another_user,
+ topic_id: new_topic.id,
+ notification_level: TopicUser.notification_levels[:watching],
+ notifications_reason_id: TopicUser.notification_reasons[:created_topic],
+ ),
+ ).to eq(true)
+ expect(
+ TopicUser.exists?(
+ user_id: user,
+ topic_id: new_topic.id,
+ notification_level: TopicUser.notification_levels[:watching],
+ notifications_reason_id: TopicUser.notification_reasons[:created_post],
+ ),
+ ).to eq(true)
end
-
end
shared_examples "moves email related stuff" do
@@ -983,35 +1117,25 @@ RSpec.describe PostMover do
expect(email.topic_id).to eq(new_topic.id)
expect(email.post_id).to eq(new_post.id)
- expect(old_post.reload.incoming_email).to_not be_present unless old_post.id == new_post.id
+ unless old_post.id == new_post.id
+ expect(old_post.reload.incoming_email).to_not be_present
+ end
end
it "moves email log entries" do
old_topic = old_post.topic
2.times do
- Fabricate(:email_log,
- user: old_post.user,
- post: old_post,
- email_type: :mailing_list
- )
+ Fabricate(:email_log, user: old_post.user, post: old_post, email_type: :mailing_list)
end
some_post = Fabricate(:post)
- Fabricate(:email_log,
- user: some_post.user,
- post: some_post,
- email_type: :mailing_list
- )
+ Fabricate(:email_log, user: some_post.user, post: some_post, email_type: :mailing_list)
expect(EmailLog.where(post_id: old_post.id).count).to eq(2)
- new_topic = old_topic.move_posts(
- user,
- [old_post.id],
- title: "new testing topic name"
- )
+ new_topic = old_topic.move_posts(user, [old_post.id], title: "new testing topic name")
new_post = new_topic.first_post
@@ -1019,9 +1143,14 @@ RSpec.describe PostMover do
end
it "preserves post attributes" do
- old_post.update_columns(cook_method: Post.cook_methods[:email], via_email: true, raw_email: "raw email content")
+ old_post.update_columns(
+ cook_method: Post.cook_methods[:email],
+ via_email: true,
+ raw_email: "raw email content",
+ )
- new_topic = old_post.topic.move_posts(user, [old_post.id], title: "new testing topic name")
+ new_topic =
+ old_post.topic.move_posts(user, [old_post.id], title: "new testing topic name")
new_post = new_topic.first_post
expect(new_post.cook_method).to eq(Post.cook_methods[:email])
@@ -1065,7 +1194,9 @@ RSpec.describe PostMover do
expect(topic.highest_post_number).to eq(p4.post_number)
# updates replies for posts moved to same topic
- expect(PostReply.where(reply_post_id: p2.id).pluck(:post_id)).to contain_exactly(new_first.id)
+ expect(PostReply.where(reply_post_id: p2.id).pluck(:post_id)).to contain_exactly(
+ new_first.id,
+ )
# leaves replies to the first post of the original topic unchanged
expect(PostReply.where(reply_post_id: p3.id).pluck(:post_id)).to contain_exactly(p1.id)
@@ -1083,7 +1214,7 @@ RSpec.describe PostMover do
end
it "preserves the custom_fields in the new post" do
- custom_fields = { "some_field" => 'payload' }
+ custom_fields = { "some_field" => "payload" }
p1.custom_fields = custom_fields
p1.save_custom_fields
@@ -1104,14 +1235,16 @@ RSpec.describe PostMover do
end
context "when moving to an existing topic with a deleted post" do
- before do
- topic.expects(:add_moderator_post)
- end
+ before { topic.expects(:add_moderator_post) }
fab!(:destination_topic) { Fabricate(:topic, user: user) }
fab!(:destination_op) { Fabricate(:post, topic: destination_topic, user: user) }
- fab!(:destination_deleted_reply) { Fabricate(:post, topic: destination_topic, user: another_user) }
- let(:moved_to) { topic.move_posts(user, [p2.id, p4.id], destination_topic_id: destination_topic.id) }
+ fab!(:destination_deleted_reply) do
+ Fabricate(:post, topic: destination_topic, user: another_user)
+ end
+ let(:moved_to) do
+ topic.move_posts(user, [p2.id, p4.id], destination_topic_id: destination_topic.id)
+ end
it "works correctly" do
destination_deleted_reply.trash!
@@ -1143,7 +1276,8 @@ RSpec.describe PostMover do
fab!(:destination_topic) { Fabricate(:topic, closed: true) }
it "works correctly for admin" do
- moved_to = topic.move_posts(admin, [p1.id, p2.id], destination_topic_id: destination_topic.id)
+ moved_to =
+ topic.move_posts(admin, [p1.id, p2.id], destination_topic_id: destination_topic.id)
expect(moved_to).to be_present
moved_to.reload
@@ -1179,20 +1313,48 @@ RSpec.describe PostMover do
end
end
- context 'with messages' do
+ context "with messages" do
fab!(:user) { Fabricate(:user) }
fab!(:another_user) { Fabricate(:user) }
fab!(:regular_user) { Fabricate(:trust_level_4) }
fab!(:personal_message) { Fabricate(:private_message_topic, user: evil_trout) }
fab!(:p1) { Fabricate(:post, topic: personal_message, user: user, created_at: 4.hours.ago) }
- fab!(:p2) { Fabricate(:post, topic: personal_message, reply_to_post_number: p1.post_number, user: another_user, created_at: 3.hours.ago) }
- fab!(:p3) { Fabricate(:post, topic: personal_message, reply_to_post_number: p1.post_number, user: user, created_at: 2.hours.ago) }
- fab!(:p4) { Fabricate(:post, topic: personal_message, reply_to_post_number: p2.post_number, user: user, created_at: 1.hour.ago) }
- fab!(:p5) { Fabricate(:post, topic: personal_message, user: evil_trout, created_at: 30.minutes.ago) }
+ fab!(:p2) do
+ Fabricate(
+ :post,
+ topic: personal_message,
+ reply_to_post_number: p1.post_number,
+ user: another_user,
+ created_at: 3.hours.ago,
+ )
+ end
+ fab!(:p3) do
+ Fabricate(
+ :post,
+ topic: personal_message,
+ reply_to_post_number: p1.post_number,
+ user: user,
+ created_at: 2.hours.ago,
+ )
+ end
+ fab!(:p4) do
+ Fabricate(
+ :post,
+ topic: personal_message,
+ reply_to_post_number: p2.post_number,
+ user: user,
+ created_at: 1.hour.ago,
+ )
+ end
+ fab!(:p5) do
+ Fabricate(:post, topic: personal_message, user: evil_trout, created_at: 30.minutes.ago)
+ end
let(:another_personal_message) do
- Fabricate(:private_message_topic, user: user, topic_allowed_users: [
- Fabricate.build(:topic_allowed_user, user: admin)
- ])
+ Fabricate(
+ :private_message_topic,
+ user: user,
+ topic_allowed_users: [Fabricate.build(:topic_allowed_user, user: admin)],
+ )
end
let!(:p6) { Fabricate(:post, topic: another_personal_message, user: evil_trout) }
@@ -1205,37 +1367,63 @@ RSpec.describe PostMover do
@like = PostActionCreator.like(another_user, p4)
end
- context 'when moving to new message' do
+ context "when moving to new message" do
it "adds post users as topic allowed users" do
- TopicUser.change(user, personal_message, notification_level: TopicUser.notification_levels[:muted])
- TopicUser.change(another_user, personal_message, notification_level: TopicUser.notification_levels[:tracking])
+ TopicUser.change(
+ user,
+ personal_message,
+ notification_level: TopicUser.notification_levels[:muted],
+ )
+ TopicUser.change(
+ another_user,
+ personal_message,
+ notification_level: TopicUser.notification_levels[:tracking],
+ )
- personal_message.move_posts(admin, [p2.id, p3.id, p4.id, p5.id], title: "new testing message name", tags: ["tag1", "tag2"], archetype: "private_message")
+ personal_message.move_posts(
+ admin,
+ [p2.id, p3.id, p4.id, p5.id],
+ title: "new testing message name",
+ tags: %w[tag1 tag2],
+ archetype: "private_message",
+ )
p2.reload
destination_topic = p2.topic
expect(destination_topic.archetype).to eq(Archetype.private_message)
expect(destination_topic.topic_allowed_users.where(user_id: user.id).count).to eq(1)
- expect(destination_topic.topic_allowed_users.where(user_id: another_user.id).count).to eq(1)
+ expect(destination_topic.topic_allowed_users.where(user_id: another_user.id).count).to eq(
+ 1,
+ )
expect(destination_topic.topic_allowed_users.where(user_id: evil_trout.id).count).to eq(1)
expect(destination_topic.tags.pluck(:name)).to eq([])
- expect(TopicUser.exists?(
- user_id: another_user,
- topic_id: destination_topic.id,
- notification_level: TopicUser.notification_levels[:tracking],
- notifications_reason_id: TopicUser.notification_reasons[:created_topic]
- )).to eq(true)
- expect(TopicUser.exists?(
- user_id: user,
- topic_id: destination_topic.id,
- notification_level: TopicUser.notification_levels[:muted],
- notifications_reason_id: TopicUser.notification_reasons[:created_post]
- )).to eq(true)
+ expect(
+ TopicUser.exists?(
+ user_id: another_user,
+ topic_id: destination_topic.id,
+ notification_level: TopicUser.notification_levels[:tracking],
+ notifications_reason_id: TopicUser.notification_reasons[:created_topic],
+ ),
+ ).to eq(true)
+ expect(
+ TopicUser.exists?(
+ user_id: user,
+ topic_id: destination_topic.id,
+ notification_level: TopicUser.notification_levels[:muted],
+ notifications_reason_id: TopicUser.notification_reasons[:created_post],
+ ),
+ ).to eq(true)
end
it "can add tags to new message when staff group is included in pm_tags_allowed_for_groups" do
SiteSetting.pm_tags_allowed_for_groups = "1|2|3"
- personal_message.move_posts(admin, [p2.id, p5.id], title: "new testing message name", tags: ["tag1", "tag2"], archetype: "private_message")
+ personal_message.move_posts(
+ admin,
+ [p2.id, p5.id],
+ title: "new testing message name",
+ tags: %w[tag1 tag2],
+ archetype: "private_message",
+ )
p2.reload
expect(p2.topic.tags.pluck(:name)).to contain_exactly("tag1", "tag2")
@@ -1245,21 +1433,29 @@ RSpec.describe PostMover do
old_message = p2.topic
old_message_id = p2.topic_id
- personal_message.move_posts(admin, [p2.id, p4.id], title: "new testing message name", archetype: "private_message")
+ personal_message.move_posts(
+ admin,
+ [p2.id, p4.id],
+ title: "new testing message name",
+ archetype: "private_message",
+ )
p2.reload
expect(p2.topic_id).not_to eq(old_message_id)
expect(p2.reply_to_post_number).to eq(nil)
expect(p2.reply_to_user_id).to eq(nil)
- notification = p2.user.notifications.where(notification_type: Notification.types[:moved_post]).first
+ notification =
+ p2.user.notifications.where(notification_type: Notification.types[:moved_post]).first
expect(notification.topic_id).to eq(p2.topic_id)
expect(notification.topic_id).not_to eq(old_message_id)
expect(notification.post_number).to eq(1)
# no message for person who made the move
- expect(admin.notifications.where(notification_type: Notification.types[:moved_post]).length).to eq(0)
+ expect(
+ admin.notifications.where(notification_type: Notification.types[:moved_post]).length,
+ ).to eq(0)
old_message.reload
move_message = old_message.posts.find_by(post_number: 2)
@@ -1268,25 +1464,46 @@ RSpec.describe PostMover do
end
end
- context 'when moving to existing message' do
+ context "when moving to existing message" do
it "adds post users as topic allowed users" do
- personal_message.move_posts(admin, [p2.id, p5.id], destination_topic_id: another_personal_message.id, archetype: "private_message")
+ personal_message.move_posts(
+ admin,
+ [p2.id, p5.id],
+ destination_topic_id: another_personal_message.id,
+ archetype: "private_message",
+ )
p2.reload
expect(p2.topic_id).to eq(another_personal_message.id)
another_personal_message.reload
- expect(another_personal_message.topic_allowed_users.where(user_id: another_user.id).count).to eq(1)
- expect(another_personal_message.topic_allowed_users.where(user_id: evil_trout.id).count).to eq(1)
+ expect(
+ another_personal_message.topic_allowed_users.where(user_id: another_user.id).count,
+ ).to eq(1)
+ expect(
+ another_personal_message.topic_allowed_users.where(user_id: evil_trout.id).count,
+ ).to eq(1)
end
it "can add additional participants" do
- personal_message.move_posts(admin, [p2.id, p5.id], destination_topic_id: another_personal_message.id, participants: [regular_user.username], archetype: "private_message")
+ personal_message.move_posts(
+ admin,
+ [p2.id, p5.id],
+ destination_topic_id: another_personal_message.id,
+ participants: [regular_user.username],
+ archetype: "private_message",
+ )
another_personal_message.reload
- expect(another_personal_message.topic_allowed_users.where(user_id: another_user.id).count).to eq(1)
- expect(another_personal_message.topic_allowed_users.where(user_id: evil_trout.id).count).to eq(1)
- expect(another_personal_message.topic_allowed_users.where(user_id: regular_user.id).count).to eq(1)
+ expect(
+ another_personal_message.topic_allowed_users.where(user_id: another_user.id).count,
+ ).to eq(1)
+ expect(
+ another_personal_message.topic_allowed_users.where(user_id: evil_trout.id).count,
+ ).to eq(1)
+ expect(
+ another_personal_message.topic_allowed_users.where(user_id: regular_user.id).count,
+ ).to eq(1)
end
it "does not allow moving regular topic posts in personal message" do
@@ -1298,7 +1515,13 @@ RSpec.describe PostMover do
end
it "moving all posts will close the message" do
- moved_to = personal_message.move_posts(admin, [p1.id, p2.id, p3.id, p4.id, p5.id], destination_topic_id: another_personal_message.id, archetype: "private_message")
+ moved_to =
+ personal_message.move_posts(
+ admin,
+ [p1.id, p2.id, p3.id, p4.id, p5.id],
+ destination_topic_id: another_personal_message.id,
+ archetype: "private_message",
+ )
expect(moved_to).to be_present
personal_message.reload
@@ -1307,30 +1530,44 @@ RSpec.describe PostMover do
end
it "uses the correct small action post" do
- moved_to = personal_message.move_posts(admin, [p2.id], destination_topic_id: another_personal_message.id, archetype: "private_message")
+ moved_to =
+ personal_message.move_posts(
+ admin,
+ [p2.id],
+ destination_topic_id: another_personal_message.id,
+ archetype: "private_message",
+ )
post = Post.find_by(topic_id: personal_message.id, post_type: Post.types[:whisper])
- expected_text = I18n.t(
- "move_posts.existing_message_moderator_post",
- count: 1,
- topic_link: "[#{moved_to.title}](#{p2.reload.url})",
- locale: :en
- )
+ expected_text =
+ I18n.t(
+ "move_posts.existing_message_moderator_post",
+ count: 1,
+ topic_link: "[#{moved_to.title}](#{p2.reload.url})",
+ locale: :en,
+ )
expect(post.raw).to eq(expected_text)
end
end
end
- context 'with banner topic' do
+ context "with banner topic" do
fab!(:regular_user) { Fabricate(:trust_level_4) }
fab!(:topic) { Fabricate(:topic) }
fab!(:personal_message) { Fabricate(:private_message_topic, user: regular_user) }
fab!(:banner_topic) { Fabricate(:banner_topic, user: evil_trout) }
fab!(:p1) { Fabricate(:post, topic: banner_topic, user: evil_trout) }
- fab!(:p2) { Fabricate(:post, topic: banner_topic, reply_to_post_number: p1.post_number, user: regular_user) }
+ fab!(:p2) do
+ Fabricate(
+ :post,
+ topic: banner_topic,
+ reply_to_post_number: p1.post_number,
+ user: regular_user,
+ )
+ end
- context 'when moving to existing topic' do
+ context "when moving to existing topic" do
it "allows moving banner topic posts in regular topic" do
banner_topic.move_posts(admin, [p2.id], destination_topic_id: topic.id)
expect(p2.reload.topic_id).to eq(topic.id)
diff --git a/spec/models/post_reply_key_spec.rb b/spec/models/post_reply_key_spec.rb
index d390d4ed54b..e93c0b4442d 100644
--- a/spec/models/post_reply_key_spec.rb
+++ b/spec/models/post_reply_key_spec.rb
@@ -4,16 +4,12 @@ RSpec.describe PostReplyKey do
describe "#reply_key" do
it "should format the reply_key correctly" do
hex = SecureRandom.hex
- post_reply_key = Fabricate(:post_reply_key,
- reply_key: hex
- )
+ post_reply_key = Fabricate(:post_reply_key, reply_key: hex)
- raw_key = PostReplyKey.where(id: post_reply_key.id)
- .pluck("reply_key::text")
- .first
+ raw_key = PostReplyKey.where(id: post_reply_key.id).pluck("reply_key::text").first
expect(raw_key).to_not eq(hex)
- expect(raw_key.delete('-')).to eq(hex)
+ expect(raw_key.delete("-")).to eq(hex)
expect(PostReplyKey.find(post_reply_key.id).reply_key).to eq(hex)
end
end
diff --git a/spec/models/post_reply_spec.rb b/spec/models/post_reply_spec.rb
index b09482a84a7..31d5484f71d 100644
--- a/spec/models/post_reply_spec.rb
+++ b/spec/models/post_reply_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe PostReply do
expect(post_reply).to_not be_valid
expect(post_reply.errors[:base]).to include(
- I18n.t("activerecord.errors.models.post_reply.base.different_topic")
+ I18n.t("activerecord.errors.models.post_reply.base.different_topic"),
)
end
end
diff --git a/spec/models/post_revision_spec.rb b/spec/models/post_revision_spec.rb
index 28dc11accf2..4cfb8eb8f4e 100644
--- a/spec/models/post_revision_spec.rb
+++ b/spec/models/post_revision_spec.rb
@@ -18,9 +18,9 @@ RSpec.describe PostRevision do
{
"last_version_at" => [
Time.parse("2013-12-12 21:40:13.225239000 Z"),
- Time.parse("2013-12-12 22:10:51.433689320 Z")
- ]
- }
+ Time.parse("2013-12-12 22:10:51.433689320 Z"),
+ ],
+ },
)
end
@@ -28,10 +28,6 @@ RSpec.describe PostRevision do
# Plugins may store symbolized values in this column
pr = Fabricate(:post_revision, modifications: { key: :value })
pr.reload
- expect(pr.modifications).to eq(
- {
- key: :value
- }
- )
+ expect(pr.modifications).to eq({ key: :value })
end
end
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index 54fc03cd9b3..deb5e637f9e 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -7,11 +7,9 @@ RSpec.describe Post do
let(:upload_path) { Discourse.store.upload_path }
- describe '#hidden_reasons' do
+ describe "#hidden_reasons" do
context "when verifying enum sequence" do
- before do
- @hidden_reasons = Post.hidden_reasons
- end
+ before { @hidden_reasons = Post.hidden_reasons }
it "'flag_threshold_reached' should be at 1st position" do
expect(@hidden_reasons[:flag_threshold_reached]).to eq(1)
@@ -23,11 +21,9 @@ RSpec.describe Post do
end
end
- describe '#types' do
+ describe "#types" do
context "when verifying enum sequence" do
- before do
- @types = Post.types
- end
+ before { @types = Post.types }
it "'regular' should be at 1st position" do
expect(@types[:regular]).to eq(1)
@@ -39,11 +35,9 @@ RSpec.describe Post do
end
end
- describe '#cook_methods' do
+ describe "#cook_methods" do
context "when verifying enum sequence" do
- before do
- @cook_methods = Post.cook_methods
- end
+ before { @cook_methods = Post.cook_methods }
it "'regular' should be at 1st position" do
expect(@cook_methods[:regular]).to eq(1)
@@ -72,32 +66,26 @@ RSpec.describe Post do
it { is_expected.to rate_limit }
let(:topic) { Fabricate(:topic) }
- let(:post_args) do
- { user: topic.user, topic: topic }
- end
+ let(:post_args) { { user: topic.user, topic: topic } }
- describe 'scopes' do
-
- describe '#by_newest' do
- it 'returns posts ordered by created_at desc' do
- 2.times do |t|
- Fabricate(:post, created_at: t.seconds.from_now)
- end
+ describe "scopes" do
+ describe "#by_newest" do
+ it "returns posts ordered by created_at desc" do
+ 2.times { |t| Fabricate(:post, created_at: t.seconds.from_now) }
expect(Post.by_newest.first.created_at).to be > Post.by_newest.last.created_at
end
end
- describe '#with_user' do
- it 'gives you a user' do
+ describe "#with_user" do
+ it "gives you a user" do
Fabricate(:post, user: Fabricate.build(:user))
expect(Post.with_user.first.user).to be_a User
end
end
-
end
describe "revisions and deleting/recovery" do
- context 'with a post without links' do
+ context "with a post without links" do
let(:post) { Fabricate(:post, post_args) }
before do
@@ -121,15 +109,15 @@ RSpec.describe Post do
end
end
- context 'with a post with links' do
+ context "with a post with links" do
let(:post) { Fabricate(:post_with_external_links) }
before do
post.trash!
post.reload
end
- describe 'recovery' do
- it 'recreates the topic_link records' do
+ describe "recovery" do
+ it "recreates the topic_link records" do
TopicLink.expects(:extract_from).with(post)
post.recover!
end
@@ -137,14 +125,19 @@ RSpec.describe Post do
end
end
- context 'with a post with notices' do
+ context "with a post with notices" do
let(:post) do
post = Fabricate(:post, post_args)
- post.upsert_custom_fields(Post::NOTICE => { type: Post.notices[:returning_user], last_posted_at: 1.day.ago })
+ post.upsert_custom_fields(
+ Post::NOTICE => {
+ type: Post.notices[:returning_user],
+ last_posted_at: 1.day.ago,
+ },
+ )
post
end
- it 'will have its notice cleared when post is trashed' do
+ it "will have its notice cleared when post is trashed" do
expect { post.trash! }.to change { post.custom_fields }.to({})
end
end
@@ -173,9 +166,7 @@ RSpec.describe Post do
context "if the topic category is read_restricted" do
let(:category) { Fabricate(:private_category, group: Fabricate(:group)) }
- before do
- topic.change_category_to_id(category.id)
- end
+ before { topic.change_category_to_id(category.id) }
it "returns true" do
expect(post.with_secure_uploads?).to eq(true)
@@ -192,12 +183,12 @@ RSpec.describe Post do
end
end
- describe 'flagging helpers' do
+ describe "flagging helpers" do
fab!(:post) { Fabricate(:post) }
fab!(:user) { coding_horror }
fab!(:admin) { Fabricate(:admin) }
- it 'is_flagged? is accurate' do
+ it "is_flagged? is accurate" do
PostActionCreator.off_topic(user, post)
expect(post.reload.is_flagged?).to eq(true)
@@ -205,19 +196,19 @@ RSpec.describe Post do
expect(post.reload.is_flagged?).to eq(false)
end
- it 'is_flagged? is true if flag was deferred' do
+ it "is_flagged? is true if flag was deferred" do
result = PostActionCreator.off_topic(user, post)
result.reviewable.perform(admin, :ignore)
expect(post.reload.is_flagged?).to eq(true)
end
- it 'is_flagged? is true if flag was cleared' do
+ it "is_flagged? is true if flag was cleared" do
result = PostActionCreator.off_topic(user, post)
result.reviewable.perform(admin, :disagree)
expect(post.reload.is_flagged?).to eq(true)
end
- it 'reviewable_flag is nil when ignored' do
+ it "reviewable_flag is nil when ignored" do
result = PostActionCreator.spam(user, post)
expect(post.reviewable_flag).to eq(result.reviewable)
@@ -225,7 +216,7 @@ RSpec.describe Post do
expect(post.reviewable_flag).to be_nil
end
- it 'reviewable_flag is nil when disagreed' do
+ it "reviewable_flag is nil when disagreed" do
result = PostActionCreator.spam(user, post)
expect(post.reviewable_flag).to eq(result.reviewable)
@@ -238,15 +229,43 @@ RSpec.describe Post do
fab!(:newuser) { Fabricate(:user, trust_level: TrustLevel[0]) }
let(:post_no_images) { Fabricate.build(:post, post_args.merge(user: newuser)) }
let(:post_one_image) { post_with_body("", newuser) }
- let(:post_two_images) { post_with_body("file.txt ", newuser) }
- let(:post_two_attachments) { post_with_body("errors.log model.3ds ", newuser) }
+ let(:post_one_attachment) do
+ post_with_body(
+ "file.txt ",
+ newuser,
+ )
+ end
+ let(:post_two_attachments) do
+ post_with_body(
+ "errors.log model.3ds ",
+ newuser,
+ )
+ end
it "returns 0 attachments for an empty post" do
expect(Fabricate.build(:post).attachment_count).to eq(0)
@@ -369,11 +396,9 @@ RSpec.describe Post do
end
context "with validation" do
- before do
- SiteSetting.newuser_max_attachments = 1
- end
+ before { SiteSetting.newuser_max_attachments = 1 }
- context 'with newuser' do
+ context "with newuser" do
it "allows a new user to post below the limit" do
expect(post_one_attachment).to be_valid
end
@@ -403,8 +428,18 @@ RSpec.describe Post do
fab!(:newuser) { Fabricate(:user, trust_level: TrustLevel[0]) }
let(:no_links) { post_with_body("hello world my name is evil trout", newuser) }
let(:one_link) { post_with_body("[jlawr](http://www.imdb.com/name/nm2225369)", newuser) }
- let(:two_links) { post_with_body("disney reddit ", newuser) }
- let(:three_links) { post_with_body("http://discourse.org and http://discourse.org/another_url and http://www.imdb.com/name/nm2225369", newuser) }
+ let(:two_links) do
+ post_with_body(
+ "disney reddit ",
+ newuser,
+ )
+ end
+ let(:three_links) do
+ post_with_body(
+ "http://discourse.org and http://discourse.org/another_url and http://www.imdb.com/name/nm2225369",
+ newuser,
+ )
+ end
describe "raw_links" do
it "returns a blank collection for a post with no links" do
@@ -416,11 +451,17 @@ RSpec.describe Post do
end
it "can find two links from html" do
- expect(two_links.raw_links).to eq(["http://disneyland.disney.go.com/", "http://reddit.com"])
+ expect(two_links.raw_links).to eq(%w[http://disneyland.disney.go.com/ http://reddit.com])
end
it "can find three links without markup" do
- expect(three_links.raw_links).to eq(["http://discourse.org", "http://discourse.org/another_url", "http://www.imdb.com/name/nm2225369"])
+ expect(three_links.raw_links).to eq(
+ %w[
+ http://discourse.org
+ http://discourse.org/another_url
+ http://www.imdb.com/name/nm2225369
+ ],
+ )
end
end
@@ -444,8 +485,12 @@ RSpec.describe Post do
end
context "with a previous host" do
-
- let(:another_disney_link) { post_with_body("[radiator springs](http://disneyland.disney.go.com/disney-california-adventure/radiator-springs-racers/)", newuser) }
+ let(:another_disney_link) do
+ post_with_body(
+ "[radiator springs](http://disneyland.disney.go.com/disney-california-adventure/radiator-springs-racers/)",
+ newuser,
+ )
+ end
before do
another_disney_link.save
@@ -453,7 +498,10 @@ RSpec.describe Post do
end
it "contains the new post's links, PLUS the previous one" do
- expect(two_links.total_hosts_usage).to eq('disneyland.disney.go.com' => 2, 'reddit.com' => 1)
+ expect(two_links.total_hosts_usage).to eq(
+ "disneyland.disney.go.com" => 2,
+ "reddit.com" => 1,
+ )
end
end
end
@@ -461,11 +509,20 @@ RSpec.describe Post do
describe "maximums" do
fab!(:newuser) { Fabricate(:user, trust_level: TrustLevel[0]) }
- let(:post_one_link) { post_with_body("[sherlock](http://www.bbc.co.uk/programmes/b018ttws)", newuser) }
+ let(:post_one_link) do
+ post_with_body("[sherlock](http://www.bbc.co.uk/programmes/b018ttws)", newuser)
+ end
let(:post_onebox) { post_with_body("http://www.google.com", newuser) }
let(:post_code_link) { post_with_body("http://www.google.com", newuser) }
- let(:post_two_links) { post_with_body("discourse twitter ", newuser) }
- let(:post_with_mentions) { post_with_body("hello @#{newuser.username} how are you doing?", newuser) }
+ let(:post_two_links) do
+ post_with_body(
+ "discourse twitter ",
+ newuser,
+ )
+ end
+ let(:post_with_mentions) do
+ post_with_body("hello @#{newuser.username} how are you doing?", newuser)
+ end
it "returns 0 links for an empty post" do
expect(Fabricate.build(:post).link_count).to eq(0)
@@ -484,11 +541,9 @@ RSpec.describe Post do
end
context "with validation" do
- before do
- SiteSetting.newuser_max_links = 1
- end
+ before { SiteSetting.newuser_max_links = 1 }
- context 'with newuser' do
+ context "with newuser" do
it "returns true when within the amount of links allowed" do
expect(post_one_link).to be_valid
end
@@ -523,7 +578,7 @@ RSpec.describe Post do
end
it "will skip the check for allowlisted domains" do
- SiteSetting.allowed_link_domains = 'www.bbc.co.uk'
+ SiteSetting.allowed_link_domains = "www.bbc.co.uk"
SiteSetting.min_trust_to_post_links = 2
post_two_links.user.trust_level = TrustLevel[1]
expect(post_one_link).to be_valid
@@ -533,7 +588,7 @@ RSpec.describe Post do
end
describe "@mentions" do
- context 'with raw_mentions' do
+ context "with raw_mentions" do
it "returns an empty array with no matches" do
post = Fabricate.build(:post, post_args.merge(raw: "Hello Jake and Finn!"))
expect(post.raw_mentions).to eq([])
@@ -541,48 +596,54 @@ RSpec.describe Post do
it "returns lowercase unique versions of the mentions" do
post = Fabricate.build(:post, post_args.merge(raw: "@Jake @Finn @Jake"))
- expect(post.raw_mentions).to eq(['jake', 'finn'])
+ expect(post.raw_mentions).to eq(%w[jake finn])
end
it "ignores pre" do
# we need to force an inline
post = Fabricate.build(:post, post_args.merge(raw: "p @Jake @Finn"))
- expect(post.raw_mentions).to eq(['finn'])
+ expect(post.raw_mentions).to eq(["finn"])
end
it "catches content between pre tags" do
# per common mark we need to force an inline
post = Fabricate.build(:post, post_args.merge(raw: "a hello @Finn
" }
+ describe "before save" do
+ let(:cooked) do
+ "
"
+ end
let(:post) do
- Fabricate(:post,
- raw: "hello @#{group.name}
|
+ %Q|hello @#{group.name}
|,
)
end
end
- describe 'when user can mention a group' do
- before do
- group.add(post.user)
- end
+ describe "when user can mention a group" do
+ before { group.add(post.user) }
- it 'should create the mention' do
+ it "should create the mention" do
post.update!(raw: "hello @#{group.name}")
post.trigger_post_process
post.reload
expect(post.cooked).to eq(
- %Q|hello @#{group.name}
|
+ %Q|hello @#{group.name}
|,
)
end
end
- describe 'when group owner can mention a group' do
+ describe "when group owner can mention a group" do
before do
group.update!(mentionable_level: Group::ALIAS_LEVELS[:owners_mods_and_admins])
group.add_owner(post.user)
end
- it 'should create the mention' do
+ it "should create the mention" do
post.update!(raw: "hello @#{group.name}")
post.trigger_post_process
post.reload
expect(post.cooked).to eq(
- %Q|hello @#{group.name}
|
+ %Q|hello @#{group.name}
|,
)
end
end
@@ -1076,7 +1184,9 @@ RSpec.describe Post do
end
describe "has_host_spam" do
- let(:raw) { "hello from my site http://www.example.net http://#{GlobalSetting.hostname} http://#{RailsMultisite::ConnectionManagement.current_hostname}" }
+ let(:raw) do
+ "hello from my site http://www.example.net http://#{GlobalSetting.hostname} http://#{RailsMultisite::ConnectionManagement.current_hostname}"
+ end
it "correctly detects host spam" do
post = Fabricate(:post, raw: raw)
@@ -1124,7 +1234,8 @@ RSpec.describe Post do
it "ignores private messages" do
SiteSetting.newuser_spam_host_threshold = 1
user = Fabricate(:user, trust_level: 0)
- post = Fabricate(:post, raw: raw, user: user, topic: Fabricate(:private_message_topic, user: user))
+ post =
+ Fabricate(:post, raw: raw, user: user, topic: Fabricate(:private_message_topic, user: user))
expect(post.has_host_spam?).to eq(false)
end
end
@@ -1143,7 +1254,8 @@ RSpec.describe Post do
describe "#excerpt_for_topic" do
it "returns a topic excerpt, defaulting to 220 chars" do
- expected_excerpt = "This is a sample post with semi-long raw content. The raw content is also more than \ntwo hundred characters to satisfy any test conditions that require content longer \nthan the typical test post raw content. It really is…"
+ expected_excerpt =
+ "This is a sample post with semi-long raw content. The raw content is also more than \ntwo hundred characters to satisfy any test conditions that require content longer \nthan the typical test post raw content. It really is…"
post = Fabricate(:post_with_long_raw_content)
post.rebake!
excerpt = post.excerpt_for_topic
@@ -1167,7 +1279,7 @@ RSpec.describe Post do
first_baked = post.baked_at
first_cooked = post.cooked
- DB.exec("UPDATE posts SET cooked = 'frogs' WHERE id = ?", [ post.id ])
+ DB.exec("UPDATE posts SET cooked = 'frogs' WHERE id = ?", [post.id])
post.reload
post.expects(:publish_change_to_clients!).with(:rebaked)
@@ -1182,7 +1294,7 @@ RSpec.describe Post do
it "updates the topic excerpt at the same time if it is the OP" do
post = create_post
post.topic.update(excerpt: "test")
- DB.exec("UPDATE posts SET cooked = 'frogs' WHERE id = ?", [ post.id ])
+ DB.exec("UPDATE posts SET cooked = 'frogs' WHERE id = ?", [post.id])
post.reload
result = post.rebake!
post.topic.reload
@@ -1272,14 +1384,13 @@ RSpec.describe Post do
end
it "uses default locale for edit reason" do
- I18n.locale = 'de'
+ I18n.locale = "de"
post.set_owner(coding_horror, Discourse.system_user)
post.reload
- expected_reason = I18n.with_locale(SiteSetting.default_locale) do
- I18n.t('change_owner.post_revision_text')
- end
+ expected_reason =
+ I18n.with_locale(SiteSetting.default_locale) { I18n.t("change_owner.post_revision_text") }
expect(post.edit_reason).to eq(expected_reason)
end
@@ -1301,7 +1412,6 @@ RSpec.describe Post do
end
it "will rate limit globally" do
-
post1 = create_post
post2 = create_post
post3 = create_post
@@ -1318,16 +1428,13 @@ RSpec.describe Post do
expect(post3.reload.baked_version).not_to eq(-1)
expect(post2.reload.baked_version).not_to eq(-1)
expect(post1.reload.baked_version).to eq(-1)
-
end
end
describe "#hide!" do
fab!(:post) { Fabricate(:post) }
- after do
- Discourse.redis.flushdb
- end
+ after { Discourse.redis.flushdb }
it "should ignore the unique post validator when hiding a post with similar content as a recent post" do
post_2 = Fabricate(:post, user: post.user)
@@ -1342,18 +1449,18 @@ RSpec.describe Post do
expect(post_2.reload.hidden).to eq(true)
end
- it 'should decrease user_stat topic_count for first post' do
- expect do
- post.hide!(PostActionType.types[:off_topic])
- end.to change { post.user.user_stat.reload.topic_count }.from(1).to(0)
+ it "should decrease user_stat topic_count for first post" do
+ expect do post.hide!(PostActionType.types[:off_topic]) end.to change {
+ post.user.user_stat.reload.topic_count
+ }.from(1).to(0)
end
- it 'should decrease user_stat post_count' do
+ it "should decrease user_stat post_count" do
post_2 = Fabricate(:post, topic: post.topic, user: post.user)
- expect do
- post_2.hide!(PostActionType.types[:off_topic])
- end.to change { post_2.user.user_stat.reload.post_count }.from(1).to(0)
+ expect do post_2.hide!(PostActionType.types[:off_topic]) end.to change {
+ post_2.user.user_stat.reload.post_count
+ }.from(1).to(0)
end
end
@@ -1382,21 +1489,19 @@ RSpec.describe Post do
expect(hidden_topic.visible).to eq(true)
end
- it 'should increase user_stat topic_count for first post' do
+ it "should increase user_stat topic_count for first post" do
post.hide!(PostActionType.types[:off_topic])
- expect do
- post.unhide!
- end.to change { post.user.user_stat.reload.topic_count }.from(0).to(1)
+ expect do post.unhide! end.to change { post.user.user_stat.reload.topic_count }.from(0).to(1)
end
- it 'should decrease user_stat post_count' do
+ it "should decrease user_stat post_count" do
post_2 = Fabricate(:post, topic: post.topic, user: post.user)
post_2.hide!(PostActionType.types[:off_topic])
- expect do
- post_2.unhide!
- end.to change { post_2.user.user_stat.reload.post_count }.from(0).to(1)
+ expect do post_2.unhide! end.to change { post_2.user.user_stat.reload.post_count }.from(0).to(
+ 1,
+ )
end
end
@@ -1424,7 +1529,7 @@ RSpec.describe Post do
expect(post.revisions.pluck(:number)).to eq([1, 2])
end
- describe 'uploads' do
+ describe "uploads" do
fab!(:video_upload) { Fabricate(:upload, extension: "mp4") }
fab!(:image_upload) { Fabricate(:upload) }
fab!(:audio_upload) { Fabricate(:upload, extension: "ogg") }
@@ -1436,8 +1541,7 @@ RSpec.describe Post do
let(:video_url) { "#{base_url}#{video_upload.url}" }
let(:audio_url) { "#{base_url}#{audio_upload.url}" }
- let(:raw_multiple) do
- <<~RAW
+ let(:raw_multiple) { <<~RAW }
Link
[test|attachment](#{attachment_upload_2.short_url})
[test3|attachment](#{attachment_upload_3.short_url})
@@ -1453,7 +1557,6 @@ RSpec.describe Post do
#{audio_url}
RAW
- end
let(:post) { Fabricate(:post, raw: raw_multiple) }
@@ -1477,7 +1580,7 @@ RSpec.describe Post do
audio_upload.id,
attachment_upload.id,
attachment_upload_2.id,
- attachment_upload_3.id
+ attachment_upload_3.id,
)
end
@@ -1494,8 +1597,8 @@ RSpec.describe Post do
context "when secure uploads is enabled" do
before do
setup_s3
- SiteSetting.authorized_extensions = "pdf|png|jpg|csv"
- SiteSetting.secure_uploads = true
+ SiteSetting.authorized_extensions = "pdf|png|jpg|csv"
+ SiteSetting.secure_uploads = true
end
it "sets the access_control_post_id on uploads in the post that don't already have the value set" do
@@ -1512,9 +1615,7 @@ RSpec.describe Post do
end
context "for custom emoji" do
- before do
- CustomEmoji.create(name: "meme", upload: image_upload)
- end
+ before { CustomEmoji.create(name: "meme", upload: image_upload) }
it "never sets an access control post because they should not be secure" do
post.link_post_uploads
expect(image_upload.reload.access_control_post_id).to eq(nil)
@@ -1523,15 +1624,13 @@ RSpec.describe Post do
end
end
- describe '#update_uploads_secure_status' do
+ describe "#update_uploads_secure_status" do
fab!(:user) { Fabricate(:user, trust_level: 0) }
- let(:raw) do
- <<~RAW
+ let(:raw) { <<~RAW }
Link
RAW
- end
before do
Jobs.run_immediately!
@@ -1548,39 +1647,54 @@ RSpec.describe Post do
it "marks image and attachment uploads as secure in PMs when secure_uploads is ON" do
SiteSetting.secure_uploads = true
- post = Fabricate(:post, raw: raw, user: user, topic: Fabricate(:private_message_topic, user: user))
+ post =
+ Fabricate(
+ :post,
+ raw: raw,
+ user: user,
+ topic: Fabricate(:private_message_topic, user: user),
+ )
post.link_post_uploads
post.update_uploads_secure_status(source: "test")
- expect(UploadReference.where(target: post).joins(:upload).pluck(:upload_id, :secure)).to contain_exactly(
- [attachment_upload.id, true],
- [image_upload.id, true]
- )
+ expect(
+ UploadReference.where(target: post).joins(:upload).pluck(:upload_id, :secure),
+ ).to contain_exactly([attachment_upload.id, true], [image_upload.id, true])
end
it "marks image uploads as not secure in PMs when when secure_uploads is ON" do
SiteSetting.secure_uploads = false
- post = Fabricate(:post, raw: raw, user: user, topic: Fabricate(:private_message_topic, user: user))
+ post =
+ Fabricate(
+ :post,
+ raw: raw,
+ user: user,
+ topic: Fabricate(:private_message_topic, user: user),
+ )
post.link_post_uploads
post.update_uploads_secure_status(source: "test")
- expect(UploadReference.where(target: post).joins(:upload).pluck(:upload_id, :secure)).to contain_exactly(
- [attachment_upload.id, false],
- [image_upload.id, false]
- )
+ expect(
+ UploadReference.where(target: post).joins(:upload).pluck(:upload_id, :secure),
+ ).to contain_exactly([attachment_upload.id, false], [image_upload.id, false])
end
it "marks attachments as secure when relevant setting is enabled" do
SiteSetting.secure_uploads = true
private_category = Fabricate(:private_category, group: Fabricate(:group))
- post = Fabricate(:post, raw: raw, user: user, topic: Fabricate(:topic, user: user, category: private_category))
+ post =
+ Fabricate(
+ :post,
+ raw: raw,
+ user: user,
+ topic: Fabricate(:topic, user: user, category: private_category),
+ )
post.link_post_uploads
post.update_uploads_secure_status(source: "test")
- expect(UploadReference.where(target: post).joins(:upload).pluck(:upload_id, :secure)).to contain_exactly(
- [attachment_upload.id, true],
- [image_upload.id, true]
- )
+ expect(
+ UploadReference.where(target: post).joins(:upload).pluck(:upload_id, :secure),
+ ).to contain_exactly([attachment_upload.id, true], [image_upload.id, true])
end
it "does not mark an upload as secure if it has already been used in a public topic" do
@@ -1588,19 +1702,24 @@ RSpec.describe Post do
post.link_post_uploads
post.update_uploads_secure_status(source: "test")
- pm = Fabricate(:post, raw: raw, user: user, topic: Fabricate(:private_message_topic, user: user))
+ pm =
+ Fabricate(
+ :post,
+ raw: raw,
+ user: user,
+ topic: Fabricate(:private_message_topic, user: user),
+ )
pm.link_post_uploads
pm.update_uploads_secure_status(source: "test")
- expect(UploadReference.where(target: pm).joins(:upload).pluck(:upload_id, :secure)).to contain_exactly(
- [attachment_upload.id, false],
- [image_upload.id, false]
- )
+ expect(
+ UploadReference.where(target: pm).joins(:upload).pluck(:upload_id, :secure),
+ ).to contain_exactly([attachment_upload.id, false], [image_upload.id, false])
end
end
end
- describe 'topic updated_at' do
+ describe "topic updated_at" do
let :topic do
create_post.topic
end
@@ -1618,38 +1737,64 @@ RSpec.describe Post do
it "will update topic updated_at for all topic related events" do
SiteSetting.whispers_allowed_groups = "#{Group::AUTO_GROUPS[:staff]}"
- post = updates_topic_updated_at do
- create_post(topic_id: topic.id, post_type: Post.types[:whisper])
- end
+ post =
+ updates_topic_updated_at do
+ create_post(topic_id: topic.id, post_type: Post.types[:whisper])
+ end
- updates_topic_updated_at do
- PostDestroyer.new(Discourse.system_user, post).destroy
- end
-
- updates_topic_updated_at do
- PostDestroyer.new(Discourse.system_user, post).recover
- end
+ updates_topic_updated_at { PostDestroyer.new(Discourse.system_user, post).destroy }
+ updates_topic_updated_at { PostDestroyer.new(Discourse.system_user, post).recover }
end
end
describe "have_uploads" do
it "should find all posts with the upload" do
ids = []
- ids << Fabricate(:post, cooked: "A post with upload
").id
- ids << Fabricate(:post, cooked: "A post with optimized image
").id
+ ids << Fabricate(
+ :post,
+ cooked: "A post with upload
",
+ ).id
+ ids << Fabricate(
+ :post,
+ cooked:
+ "A post with optimized image
",
+ ).id
Fabricate(:post)
- ids << Fabricate(:post, cooked: "A post with upload
").id
- ids << Fabricate(:post, cooked: "A post with upload link
").id
- ids << Fabricate(:post, cooked: "A post with optimized image ")
- ids << Fabricate(:post, cooked: 'A post with missing upload https://cdn.example.com/uploads/short-url/XefghijklmU9.mp4 ",
+ ).id
+ ids << Fabricate(
+ :post,
+ cooked:
+ "A post with optimized image ",
+ )
+ ids << Fabricate(
+ :post,
+ cooked:
+ 'A post with missing upload https://cdn.example.com/uploads/short-url/XefghijklmU9.mp4 Link to upload ")
+ post =
+ Fabricate(
+ :post,
+ raw:
+ "
Link to upload ",
+ )
post.each_upload_url { |src, _, _| urls << src }
expect(urls).to be_empty
end
@@ -1774,10 +1922,13 @@ RSpec.describe Post do
SiteSetting.Upload.stubs(:s3_cdn_url).returns("https://cdn.example.com/site1")
urls = []
- raw = "
"
+ raw =
+ "
"
post = Fabricate(:post, raw: raw)
post.each_upload_url { |src, _, _| urls << src }
- expect(urls).to contain_exactly("https://cdn.example.com/site1/original/1X/bc68acbc8c022726e69f980e00d6811212r.jpg")
+ expect(urls).to contain_exactly(
+ "https://cdn.example.com/site1/original/1X/bc68acbc8c022726e69f980e00d6811212r.jpg",
+ )
end
end
@@ -1787,10 +1938,12 @@ RSpec.describe Post do
fab!(:topic) { Fabricate(:private_message_topic, user: user1) }
fab!(:post) { Fabricate(:post, topic: topic) }
fab!(:group_user) { Fabricate(:group_user, user: user3) }
- fab!(:topic_allowed_group) { Fabricate(:topic_allowed_group, topic: topic, group: group_user.group) }
+ fab!(:topic_allowed_group) do
+ Fabricate(:topic_allowed_group, topic: topic, group: group_user.group)
+ end
let(:user2) { topic.allowed_users.last }
- it 'send message to all users participating in private conversation' do
+ it "send message to all users participating in private conversation" do
freeze_time
message = {
id: post.id,
@@ -1799,12 +1952,11 @@ RSpec.describe Post do
user_id: post.user_id,
last_editor_id: post.last_editor_id,
type: :created,
- version: post.version
+ version: post.version,
}
- messages = MessageBus.track_publish("/topic/#{topic.id}") do
- post.publish_change_to_clients!(:created)
- end
+ messages =
+ MessageBus.track_publish("/topic/#{topic.id}") { post.publish_change_to_clients!(:created) }
created_message = messages.select { |msg| msg.data[:type] == :created }.first
expect(created_message).to be_present
@@ -1816,19 +1968,19 @@ RSpec.describe Post do
expect(stats_message.user_ids.sort).to eq([user1.id, user2.id, user3.id].sort)
end
- it 'also publishes topic stats' do
- messages = MessageBus.track_publish("/topic/#{topic.id}") do
- post.publish_change_to_clients!(:created)
- end
+ it "also publishes topic stats" do
+ messages =
+ MessageBus.track_publish("/topic/#{topic.id}") { post.publish_change_to_clients!(:created) }
stats_message = messages.select { |msg| msg.data[:type] == :stats }.first
expect(stats_message).to be_present
end
- it 'skips publishing topic stats when requested' do
- messages = MessageBus.track_publish("/topic/#{topic.id}") do
- post.publish_change_to_clients!(:anything, { skip_topic_stats: true })
- end
+ it "skips publishing topic stats when requested" do
+ messages =
+ MessageBus.track_publish("/topic/#{topic.id}") do
+ post.publish_change_to_clients!(:anything, { skip_topic_stats: true })
+ end
stats_message = messages.select { |msg| msg.data[:type] == :stats }.first
expect(stats_message).to be_blank
@@ -1849,18 +2001,22 @@ RSpec.describe Post do
PostDestroyer.new(admin, post).destroy
end
- it 'returns error message if same admin and time did not pass' do
- expect(post.cannot_permanently_delete_reason(admin)).to eq(I18n.t('post.cannot_permanently_delete.wait_or_different_admin', time_left: RateLimiter.time_left(Post::PERMANENT_DELETE_TIMER.to_i)))
+ it "returns error message if same admin and time did not pass" do
+ expect(post.cannot_permanently_delete_reason(admin)).to eq(
+ I18n.t(
+ "post.cannot_permanently_delete.wait_or_different_admin",
+ time_left: RateLimiter.time_left(Post::PERMANENT_DELETE_TIMER.to_i),
+ ),
+ )
end
- it 'returns nothing if different admin' do
+ it "returns nothing if different admin" do
expect(post.cannot_permanently_delete_reason(Fabricate(:admin))).to eq(nil)
end
end
describe "#canonical_url" do
- it 'is able to determine correct canonical urls' do
-
+ it "is able to determine correct canonical urls" do
# ugly, but no interface to set this and we don't want to create
# 100 posts to test this thing
TopicView.stubs(:chunk_size).returns(2)
diff --git a/spec/models/post_timing_spec.rb b/spec/models/post_timing_spec.rb
index 7a6a07ed17f..4e63943fe98 100644
--- a/spec/models/post_timing_spec.rb
+++ b/spec/models/post_timing_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe PostTiming do
it { is_expected.to validate_presence_of :post_number }
it { is_expected.to validate_presence_of :msecs }
- describe 'pretend_read' do
+ describe "pretend_read" do
fab!(:p1) { Fabricate(:post) }
fab!(:p2) { Fabricate(:post, topic: p1.topic, user: p1.user) }
fab!(:p3) { Fabricate(:post, topic: p1.topic, user: p1.user) }
@@ -21,13 +21,13 @@ RSpec.describe PostTiming do
def topic_user(user_id, last_read_post_number)
TopicUser.create!(
- topic_id: topic_id,
- user_id: user_id,
- last_read_post_number: last_read_post_number,
- )
+ topic_id: topic_id,
+ user_id: user_id,
+ last_read_post_number: last_read_post_number,
+ )
end
- it 'works correctly' do
+ it "works correctly" do
timing(1, 1)
timing(2, 1)
timing(2, 2)
@@ -53,11 +53,10 @@ RSpec.describe PostTiming do
tu = TopicUser.find_by(topic_id: topic_id, user_id: 3)
expect(tu.last_read_post_number).to eq(3)
-
end
end
- describe 'safeguard' do
+ describe "safeguard" do
it "doesn't store timings that are larger than the account lifetime" do
user = Fabricate(:user, created_at: 3.minutes.ago)
@@ -65,23 +64,24 @@ RSpec.describe PostTiming do
msecs = PostTiming.where(post_number: post.post_number, user_id: user.id).pluck(:msecs)[0]
expect(msecs).to eq(123)
- PostTiming.process_timings(user, post.topic_id, 1, [[post.post_number, 10.minutes.to_i * 1000]])
+ PostTiming.process_timings(
+ user,
+ post.topic_id,
+ 1,
+ [[post.post_number, 10.minutes.to_i * 1000]],
+ )
msecs = PostTiming.where(post_number: post.post_number, user_id: user.id).pluck(:msecs)[0]
expect(msecs).to eq(123 + PostTiming::MAX_READ_TIME_PER_BATCH)
end
-
end
- describe 'process_timings' do
-
+ describe "process_timings" do
# integration tests
- it 'processes timings correctly' do
+ it "processes timings correctly" do
PostActionNotifier.enable
- (2..5).each do |i|
- Fabricate(:post, topic: post.topic, post_number: i)
- end
+ (2..5).each { |i| Fabricate(:post, topic: post.topic, post_number: i) }
user2 = Fabricate(:coding_horror, created_at: 1.day.ago)
PostActionCreator.like(user2, post)
@@ -95,7 +95,7 @@ RSpec.describe PostTiming do
PostTiming.process_timings(post.user, post.topic_id, 1, [[post.post_number, 1.day]])
- user_visit = post.user.user_visits.order('id DESC').first
+ user_visit = post.user.user_visits.order("id DESC").first
expect(user_visit.posts_read).to eq(1)
# Skip to bottom
@@ -109,13 +109,11 @@ RSpec.describe PostTiming do
expect(user_visit.reload.posts_read).to eq(5)
end
- it 'does not count private message posts read' do
+ it "does not count private message posts read" do
pm = Fabricate(:private_message_topic, user: Fabricate(:admin))
user1, user2 = pm.topic_allowed_users.map(&:user)
- (1..3).each do |i|
- Fabricate(:post, topic: pm, user: user1)
- end
+ (1..3).each { |i| Fabricate(:post, topic: pm, user: user1) }
PostTiming.process_timings(user2, pm.id, 10, [[1, 100]])
user_visit = user2.user_visits.last
@@ -126,14 +124,19 @@ RSpec.describe PostTiming do
end
end
- describe 'recording' do
+ describe "recording" do
before do
@topic = post.topic
@coding_horror = Fabricate(:coding_horror)
- @timing_attrs = { msecs: 1234, topic_id: post.topic_id, user_id: @coding_horror.id, post_number: post.post_number }
+ @timing_attrs = {
+ msecs: 1234,
+ topic_id: post.topic_id,
+ user_id: @coding_horror.id,
+ post_number: post.post_number,
+ }
end
- it 'adds a view to the post' do
+ it "adds a view to the post" do
expect {
PostTiming.record_timing(@timing_attrs)
post.reload
@@ -149,45 +152,46 @@ RSpec.describe PostTiming do
expect(@coding_horror.user_stat.posts_read_count).to eq(0)
end
- describe 'multiple calls' do
- it 'correctly works' do
+ describe "multiple calls" do
+ it "correctly works" do
PostTiming.record_timing(@timing_attrs)
PostTiming.record_timing(@timing_attrs)
- timing = PostTiming.find_by(topic_id: post.topic_id, user_id: @coding_horror.id, post_number: post.post_number)
+ timing =
+ PostTiming.find_by(
+ topic_id: post.topic_id,
+ user_id: @coding_horror.id,
+ post_number: post.post_number,
+ )
expect(timing).to be_present
expect(timing.msecs).to eq(2468)
expect(@coding_horror.user_stat.posts_read_count).to eq(1)
end
-
end
-
end
- describe 'decrementing posts read count when destroying post timings' do
+ describe "decrementing posts read count when destroying post timings" do
let(:initial_read_count) { 0 }
let(:post) { Fabricate(:post, reads: initial_read_count) }
- before do
- PostTiming.process_timings(post.user, post.topic_id, 1, [[post.post_number, 100]])
- end
+ before { PostTiming.process_timings(post.user, post.topic_id, 1, [[post.post_number, 100]]) }
- it '#destroy_last_for decrements the reads count for a post' do
+ it "#destroy_last_for decrements the reads count for a post" do
PostTiming.destroy_last_for(post.user, topic_id: post.topic_id)
expect(post.reload.reads).to eq initial_read_count
end
- it '#destroy_for decrements the reads count for a post' do
+ it "#destroy_for decrements the reads count for a post" do
PostTiming.destroy_for(post.user, [post.topic_id])
expect(post.reload.reads).to eq initial_read_count
end
end
- describe '.destroy_last_for' do
- it 'updates first unread for a user correctly when topic is public' do
+ describe ".destroy_last_for" do
+ it "updates first unread for a user correctly when topic is public" do
post.topic.update!(updated_at: 10.minutes.ago)
PostTiming.process_timings(post.user, post.topic_id, 1, [[post.post_number, 100]])
@@ -196,7 +200,7 @@ RSpec.describe PostTiming do
expect(post.user.user_stat.reload.first_unread_at).to eq_time(post.topic.updated_at)
end
- it 'updates first unread for a user correctly when topic is a pm' do
+ it "updates first unread for a user correctly when topic is a pm" do
post = Fabricate(:private_message_post)
post.topic.update!(updated_at: 10.minutes.ago)
PostTiming.process_timings(post.user, post.topic_id, 1, [[post.post_number, 100]])
@@ -206,7 +210,7 @@ RSpec.describe PostTiming do
expect(post.user.user_stat.reload.first_unread_pm_at).to eq_time(post.topic.updated_at)
end
- it 'updates first unread for a user correctly when topic is a group pm' do
+ it "updates first unread for a user correctly when topic is a group pm" do
topic = Fabricate(:private_message_topic, updated_at: 10.minutes.ago)
post = Fabricate(:post, topic: topic)
user = Fabricate(:user)
@@ -217,8 +221,9 @@ RSpec.describe PostTiming do
PostTiming.destroy_last_for(user, topic_id: topic.id)
- expect(GroupUser.find_by(user: user, group: group).first_unread_pm_at)
- .to eq_time(post.topic.updated_at)
+ expect(GroupUser.find_by(user: user, group: group).first_unread_pm_at).to eq_time(
+ post.topic.updated_at,
+ )
end
end
end
diff --git a/spec/models/private_message_topic_tracking_state_spec.rb b/spec/models/private_message_topic_tracking_state_spec.rb
index 5d3968a0ed9..82d72b39b7d 100644
--- a/spec/models/private_message_topic_tracking_state_spec.rb
+++ b/spec/models/private_message_topic_tracking_state_spec.rb
@@ -4,21 +4,17 @@ RSpec.describe PrivateMessageTopicTrackingState do
fab!(:user) { Fabricate(:user) }
fab!(:user_2) { Fabricate(:user) }
- before_all do
- Group.refresh_automatic_groups!
- end
+ before_all { Group.refresh_automatic_groups! }
fab!(:group) do
- Fabricate(:group, messageable_level: Group::ALIAS_LEVELS[:everyone]).tap do |g|
- g.add(user_2)
- end
+ Fabricate(:group, messageable_level: Group::ALIAS_LEVELS[:everyone]).tap { |g| g.add(user_2) }
end
fab!(:group_message) do
create_post(
user: user,
target_group_names: [group.name],
- archetype: Archetype.private_message
+ archetype: Archetype.private_message,
).topic
end
@@ -26,7 +22,7 @@ RSpec.describe PrivateMessageTopicTrackingState do
create_post(
user: user,
target_usernames: [user_2.username],
- archetype: Archetype.private_message
+ archetype: Archetype.private_message,
).topic
end
@@ -34,27 +30,21 @@ RSpec.describe PrivateMessageTopicTrackingState do
create_post(
user: user,
target_usernames: [Fabricate(:user).username],
- archetype: Archetype.private_message
+ archetype: Archetype.private_message,
).topic
end
- describe '.report' do
- it 'returns the right tracking state' do
- TopicUser.find_by(user: user_2, topic: group_message).update!(
- last_read_post_number: 1
- )
+ describe ".report" do
+ it "returns the right tracking state" do
+ TopicUser.find_by(user: user_2, topic: group_message).update!(last_read_post_number: 1)
- expect(described_class.report(user_2).map(&:topic_id))
- .to contain_exactly(private_message.id)
+ expect(described_class.report(user_2).map(&:topic_id)).to contain_exactly(private_message.id)
create_post(user: user, topic: group_message)
report = described_class.report(user_2)
- expect(report.map(&:topic_id)).to contain_exactly(
- group_message.id,
- private_message.id
- )
+ expect(report.map(&:topic_id)).to contain_exactly(group_message.id, private_message.id)
state = report.first
@@ -68,155 +58,137 @@ RSpec.describe PrivateMessageTopicTrackingState do
expect(report.last.group_ids).to contain_exactly(group.id)
end
- it 'returns the right tracking state when topics contain whispers' do
+ it "returns the right tracking state when topics contain whispers" do
SiteSetting.whispers_allowed_groups = "#{Group::AUTO_GROUPS[:staff]}"
- TopicUser.find_by(user: user_2, topic: private_message).update!(
- last_read_post_number: 1
- )
+ TopicUser.find_by(user: user_2, topic: private_message).update!(last_read_post_number: 1)
create_post(
raw: "this is a test post",
topic: private_message,
post_type: Post.types[:whisper],
- user: Fabricate(:admin)
+ user: Fabricate(:admin),
)
- expect(described_class.report(user_2).map(&:topic_id))
- .to contain_exactly(group_message.id)
+ expect(described_class.report(user_2).map(&:topic_id)).to contain_exactly(group_message.id)
user_2.grant_admin!
tracking_state = described_class.report(user_2)
- expect(tracking_state.map { |topic| [topic.topic_id, topic.highest_post_number] })
- .to contain_exactly(
- [group_message.id, 1],
- [private_message.id, 2]
- )
+ expect(
+ tracking_state.map { |topic| [topic.topic_id, topic.highest_post_number] },
+ ).to contain_exactly([group_message.id, 1], [private_message.id, 2])
end
- it 'returns the right tracking state when topics have been dismissed' do
- DismissedTopicUser.create!(
- user_id: user_2.id,
- topic_id: group_message.id
- )
+ it "returns the right tracking state when topics have been dismissed" do
+ DismissedTopicUser.create!(user_id: user_2.id, topic_id: group_message.id)
- expect(described_class.report(user_2).map(&:topic_id))
- .to contain_exactly(private_message.id)
+ expect(described_class.report(user_2).map(&:topic_id)).to contain_exactly(private_message.id)
end
end
- describe '.publish_new' do
- it 'should publish the right message_bus message' do
- messages = MessageBus.track_publish do
- described_class.publish_new(private_message)
- end
+ describe ".publish_new" do
+ it "should publish the right message_bus message" do
+ messages = MessageBus.track_publish { described_class.publish_new(private_message) }
expect(messages.map(&:channel)).to contain_exactly(
described_class.user_channel(user.id),
- described_class.user_channel(user_2.id)
+ described_class.user_channel(user_2.id),
)
- data = messages.find do |message|
- message.channel == described_class.user_channel(user.id)
- end.data
+ data =
+ messages.find { |message| message.channel == described_class.user_channel(user.id) }.data
- expect(data['message_type']).to eq(described_class::NEW_MESSAGE_TYPE)
+ expect(data["message_type"]).to eq(described_class::NEW_MESSAGE_TYPE)
end
- it 'should publish the right message_bus message for a group message' do
- messages = MessageBus.track_publish do
- described_class.publish_new(group_message)
- end
+ it "should publish the right message_bus message for a group message" do
+ messages = MessageBus.track_publish { described_class.publish_new(group_message) }
expect(messages.map(&:channel)).to contain_exactly(
described_class.group_channel(group.id),
- described_class.user_channel(user.id)
+ described_class.user_channel(user.id),
)
- data = messages.find do |message|
- message.channel == described_class.group_channel(group.id)
- end.data
+ data =
+ messages.find { |message| message.channel == described_class.group_channel(group.id) }.data
- expect(data['message_type']).to eq(described_class::NEW_MESSAGE_TYPE)
- expect(data['topic_id']).to eq(group_message.id)
- expect(data['payload']['last_read_post_number']).to eq(nil)
- expect(data['payload']['highest_post_number']).to eq(1)
- expect(data['payload']['group_ids']).to eq([group.id])
- expect(data['payload']['created_by_user_id']).to eq(group_message.user_id)
+ expect(data["message_type"]).to eq(described_class::NEW_MESSAGE_TYPE)
+ expect(data["topic_id"]).to eq(group_message.id)
+ expect(data["payload"]["last_read_post_number"]).to eq(nil)
+ expect(data["payload"]["highest_post_number"]).to eq(1)
+ expect(data["payload"]["group_ids"]).to eq([group.id])
+ expect(data["payload"]["created_by_user_id"]).to eq(group_message.user_id)
end
end
- describe '.publish_unread' do
- it 'should publish the right message_bus message' do
- messages = MessageBus.track_publish do
- described_class.publish_unread(private_message.first_post)
- end
+ describe ".publish_unread" do
+ it "should publish the right message_bus message" do
+ messages =
+ MessageBus.track_publish { described_class.publish_unread(private_message.first_post) }
expect(messages.map(&:channel)).to contain_exactly(
described_class.user_channel(user.id),
- described_class.user_channel(user_2.id)
+ described_class.user_channel(user_2.id),
)
- data = messages.find do |message|
- message.channel == described_class.user_channel(user.id)
- end.data
+ data =
+ messages.find { |message| message.channel == described_class.user_channel(user.id) }.data
- expect(data['message_type']).to eq(described_class::UNREAD_MESSAGE_TYPE)
- expect(data['topic_id']).to eq(private_message.id)
- expect(data['payload']['last_read_post_number']).to eq(1)
- expect(data['payload']['highest_post_number']).to eq(1)
- expect(data['payload']['created_by_user_id']).to eq(private_message.first_post.user_id)
- expect(data['payload']['notification_level'])
- .to eq(NotificationLevels.all[:watching])
- expect(data['payload']['group_ids']).to eq([])
+ expect(data["message_type"]).to eq(described_class::UNREAD_MESSAGE_TYPE)
+ expect(data["topic_id"]).to eq(private_message.id)
+ expect(data["payload"]["last_read_post_number"]).to eq(1)
+ expect(data["payload"]["highest_post_number"]).to eq(1)
+ expect(data["payload"]["created_by_user_id"]).to eq(private_message.first_post.user_id)
+ expect(data["payload"]["notification_level"]).to eq(NotificationLevels.all[:watching])
+ expect(data["payload"]["group_ids"]).to eq([])
end
- it 'does not publish message_bus message if post in topic is not new for user' do
+ it "does not publish message_bus message if post in topic is not new for user" do
group_message.update!(created_at: 3.days.ago)
user_2.user_option.update!(new_topic_duration_minutes: 2.days.minutes)
- messages = MessageBus.track_publish do
- described_class.publish_unread(group_message.first_post)
- end
+ messages =
+ MessageBus.track_publish { described_class.publish_unread(group_message.first_post) }
expect(messages).to eq([])
end
end
- describe '.publish_group_archived' do
- it 'should publish the right message_bus message' do
+ describe ".publish_group_archived" do
+ it "should publish the right message_bus message" do
user_3 = Fabricate(:user)
group.add(user_3)
- messages = MessageBus.track_publish do
- described_class.publish_group_archived(
- topic: group_message,
- group_id: group.id,
- acting_user_id: user_3.id
- )
- end
+ messages =
+ MessageBus.track_publish do
+ described_class.publish_group_archived(
+ topic: group_message,
+ group_id: group.id,
+ acting_user_id: user_3.id,
+ )
+ end
- expect(messages.map(&:channel)).to contain_exactly(
- described_class.group_channel(group.id)
- )
+ expect(messages.map(&:channel)).to contain_exactly(described_class.group_channel(group.id))
- data = messages.find do |message|
- message.channel == described_class.group_channel(group.id)
- end.data
+ data =
+ messages.find { |message| message.channel == described_class.group_channel(group.id) }.data
- expect(data['message_type']).to eq(described_class::GROUP_ARCHIVE_MESSAGE_TYPE)
- expect(data['topic_id']).to eq(group_message.id)
- expect(data['payload']['group_ids']).to contain_exactly(group.id)
- expect(data['payload']['acting_user_id']).to eq(user_3.id)
+ expect(data["message_type"]).to eq(described_class::GROUP_ARCHIVE_MESSAGE_TYPE)
+ expect(data["topic_id"]).to eq(group_message.id)
+ expect(data["payload"]["group_ids"]).to contain_exactly(group.id)
+ expect(data["payload"]["acting_user_id"]).to eq(user_3.id)
end
end
- describe '.publish_read' do
- it 'should publish the right message_bus message' do
- message = MessageBus.track_publish(described_class.user_channel(user.id)) do
- PrivateMessageTopicTrackingState.publish_read(private_message.id, 1, user)
- end.first
+ describe ".publish_read" do
+ it "should publish the right message_bus message" do
+ message =
+ MessageBus
+ .track_publish(described_class.user_channel(user.id)) do
+ PrivateMessageTopicTrackingState.publish_read(private_message.id, 1, user)
+ end
+ .first
data = message.data
diff --git a/spec/models/published_page_spec.rb b/spec/models/published_page_spec.rb
index e8ef2eba7a8..105ce883a70 100644
--- a/spec/models/published_page_spec.rb
+++ b/spec/models/published_page_spec.rb
@@ -1,11 +1,10 @@
# frozen_string_literal: true
RSpec.describe PublishedPage, type: :model do
-
fab!(:topic) { Fabricate(:topic) }
it "has path and url helpers" do
- pp = PublishedPage.create!(topic: topic, slug: 'hello-world')
+ pp = PublishedPage.create!(topic: topic, slug: "hello-world")
expect(pp.path).to eq("/pub/hello-world")
expect(pp.url).to eq(Discourse.base_url + "/pub/hello-world")
end
@@ -21,5 +20,4 @@ RSpec.describe PublishedPage, type: :model do
expect(PublishedPage.new(topic: topic, slug: "check-slug")).not_to be_valid
expect(PublishedPage.new(topic: topic, slug: "by-topic")).not_to be_valid
end
-
end
diff --git a/spec/models/quoted_post_spec.rb b/spec/models/quoted_post_spec.rb
index 950dbfd975f..96fb2f9742a 100644
--- a/spec/models/quoted_post_spec.rb
+++ b/spec/models/quoted_post_spec.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
RSpec.describe QuotedPost do
- it 'correctly extracts quotes' do
+ it "correctly extracts quotes" do
Jobs.run_immediately!
topic = Fabricate(:topic)
@@ -22,16 +22,25 @@ RSpec.describe QuotedPost do
RAW
stub_image_size
- post4 = create_post(topic: topic, raw: raw, post_number: 4, reply_to_post_number: post3.post_number)
+ post4 =
+ create_post(topic: topic, raw: raw, post_number: 4, reply_to_post_number: post3.post_number)
- expect(QuotedPost.where(post_id: post4.id).pluck(:quoted_post_id)).to contain_exactly(post1.id, post2.id, post3.id)
+ expect(QuotedPost.where(post_id: post4.id).pluck(:quoted_post_id)).to contain_exactly(
+ post1.id,
+ post2.id,
+ post3.id,
+ )
expect(post4.reload.reply_quoted).to eq(true)
SiteSetting.editing_grace_period = 1.minute.to_i
post5 = create_post(topic: topic, post_number: 5, raw: "post 5")
raw = raw.sub(post3.full_url, post5.full_url)
post4.revise(post4.user, { raw: raw }, revised_at: post4.updated_at + 2.minutes)
- expect(QuotedPost.where(post_id: post4.id).pluck(:quoted_post_id)).to contain_exactly(post1.id, post2.id, post5.id)
+ expect(QuotedPost.where(post_id: post4.id).pluck(:quoted_post_id)).to contain_exactly(
+ post1.id,
+ post2.id,
+ post5.id,
+ )
end
it "doesn't count quotes from the same post" do
@@ -56,7 +65,7 @@ RSpec.describe QuotedPost do
expect(QuotedPost.where(quoted_post_id: post.id).count).to eq(0)
end
- it 'correctly handles deltas' do
+ it "correctly handles deltas" do
post1 = Fabricate(:post)
post2 = Fabricate(:post)
diff --git a/spec/models/remote_theme_spec.rb b/spec/models/remote_theme_spec.rb
index b45e714bc99..659bd5a3324 100644
--- a/spec/models/remote_theme_spec.rb
+++ b/spec/models/remote_theme_spec.rb
@@ -1,8 +1,13 @@
# frozen_string_literal: true
RSpec.describe RemoteTheme do
- describe '#import_remote' do
- def about_json(love_color: "FAFAFA", tertiary_low_color: "FFFFFF", color_scheme_name: "Amazing", about_url: "https://www.site.com/about")
+ describe "#import_remote" do
+ def about_json(
+ love_color: "FAFAFA",
+ tertiary_low_color: "FFFFFF",
+ color_scheme_name: "Amazing",
+ about_url: "https://www.site.com/about"
+ )
<<~JSON
{
"name": "awesome theme",
@@ -45,7 +50,7 @@ RSpec.describe RemoteTheme do
"common/color_definitions.scss" => ":root{--color-var: red}",
"assets/font.woff2" => "FAKE FONT",
"settings.yaml" => "boolean_setting: true",
- "locales/en.yml" => "sometranslations"
+ "locales/en.yml" => "sometranslations",
)
end
@@ -53,24 +58,18 @@ RSpec.describe RemoteTheme do
MockGitImporter.register("https://example.com/initial_repo.git", initial_repo)
end
- after do
- `rm -fr #{initial_repo}`
- end
+ after { `rm -fr #{initial_repo}` }
- around(:each) do |group|
- MockGitImporter.with_mock do
- group.run
- end
- end
+ around(:each) { |group| MockGitImporter.with_mock { group.run } }
- it 'can correctly import a remote theme' do
- time = Time.new('2000')
+ it "can correctly import a remote theme" do
+ time = Time.new("2000")
freeze_time time
@theme = RemoteTheme.import_theme(initial_repo_url)
remote = @theme.remote_theme
- expect(@theme.name).to eq('awesome theme')
+ expect(@theme.name).to eq("awesome theme")
expect(remote.remote_url).to eq(initial_repo_url)
expect(remote.remote_version).to eq(`cd #{initial_repo} && git rev-parse HEAD`.strip)
expect(remote.local_version).to eq(`cd #{initial_repo} && git rev-parse HEAD`.strip)
@@ -107,14 +106,17 @@ RSpec.describe RemoteTheme do
scheme = ColorScheme.find_by(theme_id: @theme.id)
expect(scheme.name).to eq("Amazing")
- expect(scheme.colors.find_by(name: 'love').hex).to eq('fafafa')
- expect(scheme.colors.find_by(name: 'tertiary-low').hex).to eq('ffffff')
+ expect(scheme.colors.find_by(name: "love").hex).to eq("fafafa")
+ expect(scheme.colors.find_by(name: "tertiary-low").hex).to eq("ffffff")
expect(@theme.color_scheme_id).to eq(scheme.id)
@theme.update(color_scheme_id: nil)
File.write("#{initial_repo}/common/header.html", "I AM UPDATED")
- File.write("#{initial_repo}/about.json", about_json(love_color: "EAEAEA", about_url: "https://newsite.com/about"))
+ File.write(
+ "#{initial_repo}/about.json",
+ about_json(love_color: "EAEAEA", about_url: "https://newsite.com/about"),
+ )
File.write("#{initial_repo}/settings.yml", "integer_setting: 32")
`cd #{initial_repo} && git add settings.yml`
@@ -123,7 +125,7 @@ RSpec.describe RemoteTheme do
File.delete("#{initial_repo}/stylesheets/file.scss")
`cd #{initial_repo} && git commit -am "update"`
- time = Time.new('2001')
+ time = Time.new("2001")
freeze_time time
remote.update_remote_version
@@ -136,7 +138,7 @@ RSpec.describe RemoteTheme do
scheme = ColorScheme.find_by(theme_id: @theme.id)
expect(scheme.name).to eq("Amazing")
- expect(scheme.colors.find_by(name: 'love').hex).to eq('eaeaea')
+ expect(scheme.colors.find_by(name: "love").hex).to eq("eaeaea")
expect(@theme.color_scheme_id).to eq(nil) # Should only be set on first import
mapped = Hash[*@theme.theme_fields.map { |f| ["#{f.target_id}-#{f.name}", f.value] }.flatten]
@@ -154,7 +156,10 @@ RSpec.describe RemoteTheme do
expect(remote.about_url).to eq("https://newsite.com/about")
# It should be able to remove old colors as well
- File.write("#{initial_repo}/about.json", about_json(love_color: "BABABA", tertiary_low_color: "", color_scheme_name: "Amazing 2"))
+ File.write(
+ "#{initial_repo}/about.json",
+ about_json(love_color: "BABABA", tertiary_low_color: "", color_scheme_name: "Amazing 2"),
+ )
`cd #{initial_repo} && git commit -am "update"`
remote.update_from_remote
@@ -165,7 +170,7 @@ RSpec.describe RemoteTheme do
expect(scheme_count).to eq(1)
scheme = ColorScheme.find_by(theme_id: @theme.id)
- expect(scheme.colors.find_by(name: 'tertiary_low_color')).to eq(nil)
+ expect(scheme.colors.find_by(name: "tertiary_low_color")).to eq(nil)
end
it "can update themes with overwritten history" do
@@ -173,7 +178,7 @@ RSpec.describe RemoteTheme do
remote = theme.remote_theme
old_version = `cd #{initial_repo} && git rev-parse HEAD`.strip
- expect(theme.name).to eq('awesome theme')
+ expect(theme.name).to eq("awesome theme")
expect(remote.remote_url).to eq(initial_repo_url)
expect(remote.local_version).to eq(old_version)
expect(remote.remote_version).to eq(old_version)
@@ -197,7 +202,7 @@ RSpec.describe RemoteTheme do
remote_url: "https://github.com/org/testtheme.git",
local_version: "a2ec030e551fc8d8579790e1954876fe769fe40a",
remote_version: "21122230dbfed804067849393c3332083ddd0c07",
- commits_behind: 2
+ commits_behind: 2,
)
end
@@ -206,7 +211,7 @@ RSpec.describe RemoteTheme do
remote_url: "https://gitlab.com/org/repo.git",
local_version: "a2ec030e551fc8d8579790e1954876fe769fe40a",
remote_version: "21122230dbfed804067849393c3332083ddd0c07",
- commits_behind: 5
+ commits_behind: 5,
)
end
@@ -217,7 +222,7 @@ RSpec.describe RemoteTheme do
it "returns URL for comparing between local_version and remote_version" do
expect(github_repo.github_diff_link).to eq(
- "https://github.com/org/testtheme/compare/#{github_repo.local_version}...#{github_repo.remote_version}"
+ "https://github.com/org/testtheme/compare/#{github_repo.local_version}...#{github_repo.remote_version}",
)
end
@@ -258,11 +263,15 @@ RSpec.describe RemoteTheme do
theme.update!(enabled: false)
expect(described_class.out_of_date_themes).to eq([])
end
-
end
describe ".unreachable_themes" do
- let(:remote) { RemoteTheme.create!(remote_url: "https://github.com/org/testtheme", last_error_text: "can't contact this repo :(") }
+ let(:remote) do
+ RemoteTheme.create!(
+ remote_url: "https://github.com/org/testtheme",
+ last_error_text: "can't contact this repo :(",
+ )
+ end
let!(:theme) { Fabricate(:theme, remote_theme: remote) }
it "finds out of date themes" do
diff --git a/spec/models/report_spec.rb b/spec/models/report_spec.rb
index c7e7ca7838d..b87064abbde 100644
--- a/spec/models/report_spec.rb
+++ b/spec/models/report_spec.rb
@@ -3,43 +3,43 @@
RSpec.describe Report do
let(:user) { Fabricate(:user) }
let(:c0) { Fabricate(:category, user: user) }
- let(:c1) { Fabricate(:category, parent_category: c0, user: user) } # id: 2
+ let(:c1) { Fabricate(:category, parent_category: c0, user: user) } # id: 2
let(:c2) { Fabricate(:category, user: user) }
- shared_examples 'no data' do
+ shared_examples "no data" do
context "with no data" do
- it 'returns an empty report' do
+ it "returns an empty report" do
expect(report.data).to be_blank
end
end
end
- shared_examples 'category filtering' do
- it 'returns the filtered data' do
+ shared_examples "category filtering" do
+ it "returns the filtered data" do
expect(report.total).to eq 1
end
end
- shared_examples 'category filtering on subcategories' do
- it 'returns the filtered data' do
+ shared_examples "category filtering on subcategories" do
+ it "returns the filtered data" do
expect(report.total).to eq(1)
end
end
- shared_examples 'with data x/y' do
+ shared_examples "with data x/y" do
it "returns today's data" do
expect(report.data.select { |v| v[:x].today? }).to be_present
end
- it 'returns correct data for period' do
+ it "returns correct data for period" do
expect(report.data[0][:y]).to eq 3
end
- it 'returns total' do
+ it "returns total" do
expect(report.total).to eq 4
end
- it 'returns previous 30 day’s data' do
+ it "returns previous 30 day’s data" do
expect(report.prev30Days).to be_present
end
end
@@ -47,18 +47,44 @@ RSpec.describe Report do
describe "counting" do
describe "requests" do
before do
- freeze_time DateTime.parse('2017-03-01 12:00')
+ freeze_time DateTime.parse("2017-03-01 12:00")
# today, an incomplete day:
- application_requests = [{ date: 0.days.ago.to_time, req_type: ApplicationRequest.req_types['http_total'], count: 1 }]
+ application_requests = [
+ {
+ date: 0.days.ago.to_time,
+ req_type: ApplicationRequest.req_types["http_total"],
+ count: 1,
+ },
+ ]
# 60 complete days:
- 30.times.each_with_object(application_requests) do |i|
- application_requests.concat([{ date: (i + 1).days.ago.to_time, req_type: ApplicationRequest.req_types['http_total'], count: 10 }])
- end
- 30.times.each_with_object(application_requests) do |i|
- application_requests.concat([{ date: (31 + i).days.ago.to_time, req_type: ApplicationRequest.req_types['http_total'], count: 100 }])
- end
+ 30
+ .times
+ .each_with_object(application_requests) do |i|
+ application_requests.concat(
+ [
+ {
+ date: (i + 1).days.ago.to_time,
+ req_type: ApplicationRequest.req_types["http_total"],
+ count: 10,
+ },
+ ],
+ )
+ end
+ 30
+ .times
+ .each_with_object(application_requests) do |i|
+ application_requests.concat(
+ [
+ {
+ date: (31 + i).days.ago.to_time,
+ req_type: ApplicationRequest.req_types["http_total"],
+ count: 100,
+ },
+ ],
+ )
+ end
ApplicationRequest.insert_all(application_requests)
end
@@ -75,20 +101,21 @@ RSpec.describe Report do
describe "topics" do
before do
Report.clear_cache
- freeze_time DateTime.parse('2017-03-01 12:00')
+ freeze_time DateTime.parse("2017-03-01 12:00")
user = Fabricate(:user)
- topics = ((0..32).to_a + [60, 61, 62, 63]).map do |i|
- date = i.days.ago
- {
- user_id: user.id,
- last_post_user_id: user.id,
- title: "topic #{i}",
- category_id: SiteSetting.uncategorized_category_id,
- bumped_at: date,
- created_at: date,
- updated_at: date
- }
- end
+ topics =
+ ((0..32).to_a + [60, 61, 62, 63]).map do |i|
+ date = i.days.ago
+ {
+ user_id: user.id,
+ last_post_user_id: user.id,
+ title: "topic #{i}",
+ category_id: SiteSetting.uncategorized_category_id,
+ bumped_at: date,
+ created_at: date,
+ updated_at: date,
+ }
+ end
Topic.insert_all(topics)
end
@@ -98,11 +125,13 @@ RSpec.describe Report do
expect(json[:prev30Days]).to eq(3)
# lets make sure we can ask for the correct options for the report
- json = Report.find("topics",
- start_date: 5.days.ago.beginning_of_day,
- end_date: 1.day.ago.end_of_day,
- facets: [:prev_period]
- ).as_json
+ json =
+ Report.find(
+ "topics",
+ start_date: 5.days.ago.beginning_of_day,
+ end_date: 1.day.ago.end_of_day,
+ facets: [:prev_period],
+ ).as_json
expect(json[:prev_period]).to eq(5)
expect(json[:data].length).to eq(5)
@@ -111,16 +140,16 @@ RSpec.describe Report do
end
end
- describe 'visits report' do
- let(:report) { Report.find('visits') }
+ describe "visits report" do
+ let(:report) { Report.find("visits") }
- include_examples 'no data'
+ include_examples "no data"
context "with visits" do
let(:user) { Fabricate(:user) }
it "returns a report with data" do
- freeze_time DateTime.parse('2000-01-01')
+ freeze_time DateTime.parse("2000-01-01")
user.user_visits.create(visited_at: 1.hour.from_now)
user.user_visits.create(visited_at: 1.day.ago)
user.user_visits.create(visited_at: 2.days.ago, mobile: true)
@@ -135,16 +164,16 @@ RSpec.describe Report do
end
end
- describe 'mobile visits report' do
- let(:report) { Report.find('mobile_visits') }
+ describe "mobile visits report" do
+ let(:report) { Report.find("mobile_visits") }
- include_examples 'no data'
+ include_examples "no data"
context "with visits" do
let(:user) { Fabricate(:user) }
it "returns a report with data" do
- freeze_time DateTime.parse('2000-01-01')
+ freeze_time DateTime.parse("2000-01-01")
user.user_visits.create(visited_at: 1.hour.from_now)
user.user_visits.create(visited_at: 2.days.ago, mobile: true)
user.user_visits.create(visited_at: 45.days.ago)
@@ -158,35 +187,50 @@ RSpec.describe Report do
end
end
- [:signup, :topic, :post, :flag, :like, :email].each do |arg|
+ %i[signup topic post flag like email].each do |arg|
describe "#{arg} report" do
pluralized = arg.to_s.pluralize
let(:report) { Report.find(pluralized) }
context "no #{pluralized}" do
- it 'returns an empty report' do
+ it "returns an empty report" do
expect(report.data).to be_blank
end
end
context "with #{pluralized}" do
before(:each) do
- freeze_time DateTime.parse('2017-03-01 12:00')
+ freeze_time DateTime.parse("2017-03-01 12:00")
if arg == :flag
user = Fabricate(:user)
topic = Fabricate(:topic, user: user)
- builder = -> (dt) { PostActionCreator.create(user, Fabricate(:post, topic: topic, user: user), :spam, created_at: dt) }
+ builder = ->(dt) {
+ PostActionCreator.create(
+ user,
+ Fabricate(:post, topic: topic, user: user),
+ :spam,
+ created_at: dt,
+ )
+ }
elsif arg == :signup
- builder = -> (dt) { Fabricate(:user, created_at: dt) }
+ builder = ->(dt) { Fabricate(:user, created_at: dt) }
else
user = Fabricate(:user)
factories = { email: :email_log }
- builder = -> (dt) { Fabricate(factories[arg] || arg, created_at: dt, user: user) }
+ builder = ->(dt) { Fabricate(factories[arg] || arg, created_at: dt, user: user) }
end
- [DateTime.now, 1.hour.ago, 1.hour.ago, 1.day.ago, 2.days.ago, 30.days.ago, 35.days.ago].each(&builder)
+ [
+ DateTime.now,
+ 1.hour.ago,
+ 1.hour.ago,
+ 1.day.ago,
+ 2.days.ago,
+ 30.days.ago,
+ 35.days.ago,
+ ].each(&builder)
end
it "returns today's, total and previous 30 day's data" do
@@ -198,30 +242,58 @@ RSpec.describe Report do
end
end
- [:http_total, :http_2xx, :http_background, :http_3xx, :http_4xx, :http_5xx, :page_view_crawler, :page_view_logged_in, :page_view_anon].each do |request_type|
+ %i[
+ http_total
+ http_2xx
+ http_background
+ http_3xx
+ http_4xx
+ http_5xx
+ page_view_crawler
+ page_view_logged_in
+ page_view_anon
+ ].each do |request_type|
describe "#{request_type} request reports" do
- let(:report) { Report.find("#{request_type}_reqs", start_date: 10.days.ago.to_time, end_date: Time.now) }
+ let(:report) do
+ Report.find("#{request_type}_reqs", start_date: 10.days.ago.to_time, end_date: Time.now)
+ end
context "with no #{request_type} records" do
- it 'returns an empty report' do
+ it "returns an empty report" do
expect(report.data).to be_blank
end
end
context "with #{request_type}" do
before do
- freeze_time DateTime.parse('2017-03-01 12:00')
+ freeze_time DateTime.parse("2017-03-01 12:00")
application_requests = [
- { date: 35.days.ago.to_time, req_type: ApplicationRequest.req_types[request_type.to_s], count: 35 },
- { date: 7.days.ago.to_time, req_type: ApplicationRequest.req_types[request_type.to_s], count: 8 },
+ {
+ date: 35.days.ago.to_time,
+ req_type: ApplicationRequest.req_types[request_type.to_s],
+ count: 35,
+ },
+ {
+ date: 7.days.ago.to_time,
+ req_type: ApplicationRequest.req_types[request_type.to_s],
+ count: 8,
+ },
{ date: Time.now, req_type: ApplicationRequest.req_types[request_type.to_s], count: 1 },
- { date: 1.day.ago.to_time, req_type: ApplicationRequest.req_types[request_type.to_s], count: 2 },
- { date: 2.days.ago.to_time, req_type: ApplicationRequest.req_types[request_type.to_s], count: 3 }
+ {
+ date: 1.day.ago.to_time,
+ req_type: ApplicationRequest.req_types[request_type.to_s],
+ count: 2,
+ },
+ {
+ date: 2.days.ago.to_time,
+ req_type: ApplicationRequest.req_types[request_type.to_s],
+ count: 3,
+ },
]
ApplicationRequest.insert_all(application_requests)
end
- it 'returns a report with data' do
+ it "returns a report with data" do
# expected number of records
expect(report.data.count).to eq 4
@@ -244,61 +316,62 @@ RSpec.describe Report do
end
end
- describe 'user to user private messages with replies' do
- let(:report) { Report.find('user_to_user_private_messages_with_replies') }
+ describe "user to user private messages with replies" do
+ let(:report) { Report.find("user_to_user_private_messages_with_replies") }
let(:user) { Fabricate(:user) }
let(:topic) { Fabricate(:topic, created_at: 1.hour.ago, user: user) }
- it 'topic report).to not include private messages' do
+ it "topic report).to not include private messages" do
Fabricate(:private_message_topic, created_at: 1.hour.ago, user: user)
topic
- report = Report.find('topics')
+ report = Report.find("topics")
expect(report.data[0][:y]).to eq(1)
expect(report.total).to eq(1)
end
- it 'post report).to not include private messages' do
+ it "post report).to not include private messages" do
Fabricate(:private_message_post, created_at: 1.hour.ago)
Fabricate(:post)
- report = Report.find('posts')
+ report = Report.find("posts")
expect(report.data[0][:y]).to eq 1
expect(report.total).to eq 1
end
- context 'with no private messages' do
- it 'returns an empty report' do
+ context "with no private messages" do
+ it "returns an empty report" do
expect(report.data).to be_blank
end
- context 'with some public posts' do
- it 'returns an empty report' do
- Fabricate(:post, topic: topic, user: user); Fabricate(:post, topic: topic, user: user)
+ context "with some public posts" do
+ it "returns an empty report" do
+ Fabricate(:post, topic: topic, user: user)
+ Fabricate(:post, topic: topic, user: user)
expect(report.data).to be_blank
expect(report.total).to eq 0
end
end
end
- context 'with some private messages' do
+ context "with some private messages" do
before do
Fabricate(:private_message_post, created_at: 25.hours.ago, user: user)
Fabricate(:private_message_post, created_at: 1.hour.ago, user: user)
Fabricate(:private_message_post, created_at: 1.hour.ago, user: user)
end
- it 'returns correct data' do
+ it "returns correct data" do
expect(report.data[0][:y]).to eq 1
expect(report.data[1][:y]).to eq 2
expect(report.total).to eq 3
end
- context 'with some public posts' do
+ context "with some public posts" do
before do
Fabricate(:post, user: user, topic: topic)
Fabricate(:post, user: user, topic: topic)
end
- it 'returns correct data' do
+ it "returns correct data" do
expect(report.data[0][:y]).to eq 1
expect(report.data[1][:y]).to eq 2
expect(report.total).to eq 3
@@ -306,37 +379,37 @@ RSpec.describe Report do
end
end
- context 'with private message from system user' do
+ context "with private message from system user" do
before do
Fabricate(:private_message_post, created_at: 1.hour.ago, user: Discourse.system_user)
end
- it 'does not include system users' do
+ it "does not include system users" do
expect(report.data).to be_blank
expect(report.total).to eq 0
end
end
end
- describe 'user to user private messages' do
- let(:report) { Report.find('user_to_user_private_messages') }
+ describe "user to user private messages" do
+ let(:report) { Report.find("user_to_user_private_messages") }
- context 'with private message from system user' do
+ context "with private message from system user" do
before do
Fabricate(:private_message_post, created_at: 1.hour.ago, user: Discourse.system_user)
end
- it 'does not include system users' do
+ it "does not include system users" do
expect(report.data).to be_blank
expect(report.total).to eq 0
end
end
end
- describe 'users by trust level report' do
- let(:report) { Report.find('users_by_trust_level') }
+ describe "users by trust level report" do
+ let(:report) { Report.find("users_by_trust_level") }
- include_examples 'no data'
+ include_examples "no data"
context "with users at different trust levels" do
before do
@@ -351,15 +424,17 @@ RSpec.describe Report do
expect(report.data.find { |d| d[:x] == TrustLevel[2] }[:y]).to eq 2
expect(report.data.find { |d| d[:x] == TrustLevel[4] }[:y]).to eq 1
- expect(report.data.find { |d| d[:x] == TrustLevel[0] }[:url]).to eq '/admin/users/list/newuser'
+ expect(
+ report.data.find { |d| d[:x] == TrustLevel[0] }[:url],
+ ).to eq "/admin/users/list/newuser"
end
end
end
- describe 'new contributors report' do
- let(:report) { Report.find('new_contributors') }
+ describe "new contributors report" do
+ let(:report) { Report.find("new_contributors") }
- include_examples 'no data'
+ include_examples "no data"
context "with contributors" do
before do
@@ -382,10 +457,10 @@ RSpec.describe Report do
end
end
- describe 'users by types level report' do
- let(:report) { Report.find('users_by_type') }
+ describe "users by types level report" do
+ let(:report) { Report.find("users_by_type") }
- include_examples 'no data'
+ include_examples "no data"
context "with users at different trust levels" do
before do
@@ -407,24 +482,28 @@ RSpec.describe Report do
end
end
- describe 'trending search report' do
- let(:report) { Report.find('trending_search') }
+ describe "trending search report" do
+ let(:report) { Report.find("trending_search") }
- include_examples 'no data'
+ include_examples "no data"
context "with different searches" do
before do
- SearchLog.log(term: 'ruby', search_type: :header, ip_address: '127.0.0.1')
+ SearchLog.log(term: "ruby", search_type: :header, ip_address: "127.0.0.1")
- SearchLog.create!(term: 'ruby', search_result_id: 1, search_type: 1, ip_address: '127.0.0.1', user_id: Fabricate(:user).id)
+ SearchLog.create!(
+ term: "ruby",
+ search_result_id: 1,
+ search_type: 1,
+ ip_address: "127.0.0.1",
+ user_id: Fabricate(:user).id,
+ )
- SearchLog.log(term: 'ruby', search_type: :header, ip_address: '127.0.0.2')
- SearchLog.log(term: 'php', search_type: :header, ip_address: '127.0.0.1')
+ SearchLog.log(term: "ruby", search_type: :header, ip_address: "127.0.0.2")
+ SearchLog.log(term: "php", search_type: :header, ip_address: "127.0.0.1")
end
- after do
- SearchLog.clear_debounce_cache!
- end
+ after { SearchLog.clear_debounce_cache! }
it "returns a report with data" do
expect(report.data[0][:term]).to eq("ruby")
@@ -437,17 +516,17 @@ RSpec.describe Report do
end
end
- describe 'DAU/MAU report' do
- let(:report) { Report.find('dau_by_mau') }
+ describe "DAU/MAU report" do
+ let(:report) { Report.find("dau_by_mau") }
- include_examples 'no data'
+ include_examples "no data"
context "with different users/visits" do
before do
- freeze_time DateTime.parse('2017-03-01 12:00')
+ freeze_time DateTime.parse("2017-03-01 12:00")
arpit = Fabricate(:user)
- arpit.user_visits.create(visited_at: 1.day.ago)
+ arpit.user_visits.create(visited_at: 1.day.ago)
sam = Fabricate(:user)
sam.user_visits.create(visited_at: 2.days.ago)
@@ -470,14 +549,14 @@ RSpec.describe Report do
end
end
- describe 'Daily engaged users' do
- let(:report) { Report.find('daily_engaged_users') }
+ describe "Daily engaged users" do
+ let(:report) { Report.find("daily_engaged_users") }
- include_examples 'no data'
+ include_examples "no data"
context "with different activities" do
before do
- freeze_time DateTime.parse('2017-03-01 12:00')
+ freeze_time DateTime.parse("2017-03-01 12:00")
UserActionManager.enable
@@ -497,33 +576,32 @@ RSpec.describe Report do
end
end
- describe 'posts counts' do
+ describe "posts counts" do
it "only counts regular posts" do
post = Fabricate(:post)
Fabricate(:moderator_post, topic: post.topic)
Fabricate.build(:post, post_type: Post.types[:whisper], topic: post.topic)
- post.topic.add_small_action(Fabricate(:admin), "invited_group", 'coolkids')
- r = Report.find('posts')
+ post.topic.add_small_action(Fabricate(:admin), "invited_group", "coolkids")
+ r = Report.find("posts")
expect(r.total).to eq(1)
expect(r.data[0][:y]).to eq(1)
end
end
- describe 'flags_status' do
- let(:report) { Report.find('flags_status') }
+ describe "flags_status" do
+ let(:report) { Report.find("flags_status") }
- include_examples 'no data'
+ include_examples "no data"
context "with flags" do
let(:flagger) { Fabricate(:user) }
let(:post) { Fabricate(:post, user: flagger) }
- before do
- freeze_time
- end
+ before { freeze_time }
it "returns a report with data" do
- result = PostActionCreator.new(flagger, post, PostActionType.types[:spam], message: 'bad').perform
+ result =
+ PostActionCreator.new(flagger, post, PostActionType.types[:spam], message: "bad").perform
expect(result.success).to eq(true)
expect(report.data).to be_present
@@ -544,10 +622,10 @@ RSpec.describe Report do
end
end
- describe 'post_edits' do
- let(:report) { Report.find('post_edits') }
+ describe "post_edits" do
+ let(:report) { Report.find("post_edits") }
- include_examples 'no data'
+ include_examples "no data"
context "with edits" do
let(:editor) { Fabricate(:user) }
@@ -556,8 +634,12 @@ RSpec.describe Report do
before do
freeze_time
- post.revise(post.user, { raw: 'updated body by author', edit_reason: 'not cool' }, force_new_version: true)
- post.revise(editor, raw: 'updated body', edit_reason: 'not cool')
+ post.revise(
+ post.user,
+ { raw: "updated body by author", edit_reason: "not cool" },
+ force_new_version: true,
+ )
+ post.revise(editor, raw: "updated body", edit_reason: "not cool")
end
it "returns a report with data" do
@@ -583,24 +665,20 @@ RSpec.describe Report do
fab!(:editor_with_two_edits) do
Fabricate(:user).tap do |user|
- 2.times do |i|
- posts[i].revise(user, { raw: "edit #{i + 1}" })
- end
+ 2.times { |i| posts[i].revise(user, { raw: "edit #{i + 1}" }) }
end
end
fab!(:editor_with_one_edit) do
- Fabricate(:user).tap do |user|
- posts.last.revise(user, { raw: "edit 3" })
- end
+ Fabricate(:user).tap { |user| posts.last.revise(user, { raw: "edit 3" }) }
end
let(:report_with_one_edit) do
- Report.find('post_edits', { filters: { 'editor' => editor_with_one_edit.username } })
+ Report.find("post_edits", { filters: { "editor" => editor_with_one_edit.username } })
end
let(:report_with_two_edits) do
- Report.find('post_edits', { filters: { 'editor' => editor_with_two_edits.username } })
+ Report.find("post_edits", { filters: { "editor" => editor_with_two_edits.username } })
end
it "returns a report for a given editor" do
@@ -610,21 +688,17 @@ RSpec.describe Report do
end
end
- describe 'moderator activity' do
- let(:report) {
- Report.find('moderators_activity')
- }
+ describe "moderator activity" do
+ let(:report) { Report.find("moderators_activity") }
- let(:sam) { Fabricate(:user, moderator: true, username: 'sam') }
+ let(:sam) { Fabricate(:user, moderator: true, username: "sam") }
- let(:jeff) { Fabricate(:user, moderator: true, username: 'jeff') }
+ let(:jeff) { Fabricate(:user, moderator: true, username: "jeff") }
- include_examples 'no data'
+ include_examples "no data"
context "with moderators" do
- before do
- freeze_time(Date.today)
- end
+ before { freeze_time(Date.today) }
context "with moderators order" do
before do
@@ -633,8 +707,8 @@ RSpec.describe Report do
end
it "returns the moderators in alphabetical order" do
- expect(report.data[0][:username]).to eq('jeff')
- expect(report.data[1][:username]).to eq('sam')
+ expect(report.data[0][:username]).to eq("jeff")
+ expect(report.data[1][:username]).to eq("sam")
end
end
@@ -650,9 +724,9 @@ RSpec.describe Report do
end
it "returns the correct read times" do
- expect(report.data[0][:username]).to eq('jeff')
+ expect(report.data[0][:username]).to eq("jeff")
expect(report.data[0][:time_read]).to eq(3000)
- expect(report.data[1][:username]).to eq('sam')
+ expect(report.data[1][:username]).to eq("sam")
expect(report.data[1][:time_read]).to eq(300)
end
end
@@ -680,15 +754,13 @@ RSpec.describe Report do
it "returns the correct topic count" do
expect(report.data[0][:topic_count]).to eq(1)
- expect(report.data[0][:username]).to eq('jeff')
+ expect(report.data[0][:username]).to eq("jeff")
expect(report.data[1][:topic_count]).to eq(2)
- expect(report.data[1][:username]).to eq('sam')
+ expect(report.data[1][:username]).to eq("sam")
end
context "with private messages" do
- before do
- Fabricate(:private_message_topic, user: jeff)
- end
+ before { Fabricate(:private_message_topic, user: jeff) }
it "doesn’t count private topic" do
expect(report.data[0][:topic_count]).to eq(1)
@@ -706,15 +778,13 @@ RSpec.describe Report do
it "returns the correct topic count" do
expect(report.data[0][:topic_count]).to eq(1)
- expect(report.data[0][:username]).to eq('jeff')
+ expect(report.data[0][:username]).to eq("jeff")
expect(report.data[1][:topic_count]).to eq(2)
- expect(report.data[1][:username]).to eq('sam')
+ expect(report.data[1][:username]).to eq("sam")
end
context "with private messages" do
- before do
- Fabricate(:private_message_post, user: jeff)
- end
+ before { Fabricate(:private_message_post, user: jeff) }
it "doesn’t count private post" do
expect(report.data[0][:post_count]).to eq(1)
@@ -732,57 +802,54 @@ RSpec.describe Report do
it "returns the correct topic count" do
expect(report.data[0][:pm_count]).to eq(1)
- expect(report.data[0][:username]).to eq('jeff')
+ expect(report.data[0][:username]).to eq("jeff")
expect(report.data[1][:pm_count]).to be_blank
- expect(report.data[1][:username]).to eq('sam')
-
+ expect(report.data[1][:username]).to eq("sam")
end
end
context "with revisions" do
before do
post = Fabricate(:post)
- post.revise(sam, raw: 'updated body', edit_reason: 'not cool')
+ post.revise(sam, raw: "updated body", edit_reason: "not cool")
end
it "returns the correct revisions count" do
expect(report.data[0][:revision_count]).to eq(1)
- expect(report.data[0][:username]).to eq('sam')
+ expect(report.data[0][:username]).to eq("sam")
end
context "when revising own post" do
before do
post = Fabricate(:post, user: sam)
- post.revise(sam, raw: 'updated body')
+ post.revise(sam, raw: "updated body")
end
it "doesn't count a revision on your own post" do
expect(report.data[0][:revision_count]).to eq(1)
- expect(report.data[0][:username]).to eq('sam')
+ expect(report.data[0][:username]).to eq("sam")
end
end
end
context "with previous data" do
- before do
- Fabricate(:topic, user: sam, created_at: 1.year.ago)
- end
+ before { Fabricate(:topic, user: sam, created_at: 1.year.ago) }
it "doesn’t count old data" do
expect(report.data[0][:topic_count]).to be_blank
- expect(report.data[0][:username]).to eq('sam')
+ expect(report.data[0][:username]).to eq("sam")
end
end
end
end
- describe 'flags' do
- let(:report) { Report.find('flags') }
+ describe "flags" do
+ let(:report) { Report.find("flags") }
- include_examples 'no data'
+ include_examples "no data"
- context 'with data' do
- include_examples 'with data x/y'
+ context "with data" do
+ include_examples "with data x/y"
before(:each) do
user = Fabricate(:user)
@@ -798,26 +865,28 @@ RSpec.describe Report do
end
context "with category filtering" do
- let(:report) { Report.find('flags', filters: { category: c1.id }) }
+ let(:report) { Report.find("flags", filters: { category: c1.id }) }
- include_examples 'category filtering'
+ include_examples "category filtering"
context "with subcategories" do
- let(:report) { Report.find('flags', filters: { category: c0.id, 'include_subcategories': true }) }
+ let(:report) do
+ Report.find("flags", filters: { category: c0.id, include_subcategories: true })
+ end
- include_examples 'category filtering on subcategories'
+ include_examples "category filtering on subcategories"
end
end
end
end
- describe 'topics' do
- let(:report) { Report.find('topics') }
+ describe "topics" do
+ let(:report) { Report.find("topics") }
- include_examples 'no data'
+ include_examples "no data"
- context 'with data' do
- include_examples 'with data x/y'
+ context "with data" do
+ include_examples "with data x/y"
before(:each) do
user = Fabricate(:user)
@@ -828,14 +897,16 @@ RSpec.describe Report do
end
context "with category filtering" do
- let(:report) { Report.find('topics', filters: { category: c1.id }) }
+ let(:report) { Report.find("topics", filters: { category: c1.id }) }
- include_examples 'category filtering'
+ include_examples "category filtering"
context "with subcategories" do
- let(:report) { Report.find('topics', filters: { category: c0.id, 'include_subcategories': true }) }
+ let(:report) do
+ Report.find("topics", filters: { category: c0.id, include_subcategories: true })
+ end
- include_examples 'category filtering on subcategories'
+ include_examples "category filtering on subcategories"
end
end
end
@@ -862,9 +933,8 @@ RSpec.describe Report do
class Report
def self.report_timeout_test(report)
- report.error = wrap_slow_query(1) do
- ActiveRecord::Base.connection.execute("SELECT pg_sleep(5)")
- end
+ report.error =
+ wrap_slow_query(1) { ActiveRecord::Base.connection.execute("SELECT pg_sleep(5)") }
end
end
end
@@ -881,32 +951,29 @@ RSpec.describe Report do
Rails.logger = @fake_logger = FakeLogger.new
end
- after do
- Rails.logger = @orig_logger
- end
+ after { Rails.logger = @orig_logger }
it "returns no report" do
- class ReportInitError < StandardError; end
+ class ReportInitError < StandardError
+ end
Report.stubs(:new).raises(ReportInitError.new("x"))
- report = Report.find('signups', wrap_exceptions_in_test: true)
+ report = Report.find("signups", wrap_exceptions_in_test: true)
expect(report).to be_nil
- expect(@fake_logger.errors).to eq([
- 'Couldn’t create report `signups`:
'
- ])
+ expect(@fake_logger.errors).to eq(["Couldn’t create report `signups`: "])
end
end
- describe 'posts' do
- let(:report) { Report.find('posts') }
+ describe "posts" do
+ let(:report) { Report.find("posts") }
- include_examples 'no data'
+ include_examples "no data"
- context 'with data' do
- include_examples 'with data x/y'
+ context "with data" do
+ include_examples "with data x/y"
before(:each) do
user = Fabricate(:user)
@@ -919,14 +986,16 @@ RSpec.describe Report do
end
context "with category filtering" do
- let(:report) { Report.find('posts', filters: { category: c1.id }) }
+ let(:report) { Report.find("posts", filters: { category: c1.id }) }
- include_examples 'category filtering'
+ include_examples "category filtering"
context "with subcategories" do
- let(:report) { Report.find('posts', filters: { category: c0.id, 'include_subcategories': true }) }
+ let(:report) do
+ Report.find("posts", filters: { category: c0.id, include_subcategories: true })
+ end
- include_examples 'category filtering on subcategories'
+ include_examples "category filtering on subcategories"
end
end
end
@@ -934,13 +1003,13 @@ RSpec.describe Report do
# TODO: time_to_first_response
- describe 'topics_with_no_response' do
- let(:report) { Report.find('topics_with_no_response') }
+ describe "topics_with_no_response" do
+ let(:report) { Report.find("topics_with_no_response") }
- include_examples 'no data'
+ include_examples "no data"
- context 'with data' do
- include_examples 'with data x/y'
+ context "with data" do
+ include_examples "with data x/y"
before(:each) do
user = Fabricate(:user)
@@ -951,26 +1020,34 @@ RSpec.describe Report do
end
context "with category filtering" do
- let(:report) { Report.find('topics_with_no_response', filters: { category: c1.id }) }
+ let(:report) { Report.find("topics_with_no_response", filters: { category: c1.id }) }
- include_examples 'category filtering'
+ include_examples "category filtering"
context "with subcategories" do
- let(:report) { Report.find('topics_with_no_response', filters: { category: c0.id, 'include_subcategories': true }) }
+ let(:report) do
+ Report.find(
+ "topics_with_no_response",
+ filters: {
+ category: c0.id,
+ include_subcategories: true,
+ },
+ )
+ end
- include_examples 'category filtering on subcategories'
+ include_examples "category filtering on subcategories"
end
end
end
end
- describe 'likes' do
- let(:report) { Report.find('likes') }
+ describe "likes" do
+ let(:report) { Report.find("likes") }
- include_examples 'no data'
+ include_examples "no data"
- context 'with data' do
- include_examples 'with data x/y'
+ context "with data" do
+ include_examples "with data x/y"
before(:each) do
topic = Fabricate(:topic, category: c1)
@@ -981,32 +1058,36 @@ RSpec.describe Report do
post = Fabricate(:post, topic: topic)
PostActionCreator.like(Fabricate(:user), post)
PostActionCreator.like(Fabricate(:user), post)
- PostActionCreator.like(Fabricate(:user), post).post_action.tap do |pa|
- pa.created_at = 45.days.ago
- end.save!
+ PostActionCreator
+ .like(Fabricate(:user), post)
+ .post_action
+ .tap { |pa| pa.created_at = 45.days.ago }
+ .save!
end
context "with category filtering" do
- let(:report) { Report.find('likes', filters: { category: c1.id }) }
+ let(:report) { Report.find("likes", filters: { category: c1.id }) }
- include_examples 'category filtering'
+ include_examples "category filtering"
context "with subcategories" do
- let(:report) { Report.find('likes', filters: { category: c0.id, 'include_subcategories': true }) }
+ let(:report) do
+ Report.find("likes", filters: { category: c0.id, include_subcategories: true })
+ end
- include_examples 'category filtering on subcategories'
+ include_examples "category filtering on subcategories"
end
end
end
end
- describe 'user_flagging_ratio' do
+ describe "user_flagging_ratio" do
let(:joffrey) { Fabricate(:user, username: "joffrey") }
let(:robin) { Fabricate(:user, username: "robin") }
let(:moderator) { Fabricate(:moderator) }
let(:user) { Fabricate(:user) }
- context 'with data' do
+ context "with data" do
it "it works" do
topic = Fabricate(:topic, user: user)
2.times do
@@ -1024,7 +1105,7 @@ RSpec.describe Report do
result = PostActionCreator.off_topic(robin, post_agreed)
result.reviewable.perform(moderator, :agree_and_keep)
- report = Report.find('user_flagging_ratio')
+ report = Report.find("user_flagging_ratio")
first = report.data[0]
expect(first[:username]).to eq("joffrey")
@@ -1069,16 +1150,30 @@ RSpec.describe Report do
context "with data" do
it "works" do
- freeze_time DateTime.parse('2017-03-01 12:00')
+ freeze_time DateTime.parse("2017-03-01 12:00")
ip = [81, 2, 69, 142]
- DiscourseIpInfo.open_db(File.join(Rails.root, 'spec', 'fixtures', 'mmdb'))
- Resolv::DNS.any_instance.stubs(:getname).with(ip.join(".")).returns("ip-#{ip.join("-")}.example.com")
+ DiscourseIpInfo.open_db(File.join(Rails.root, "spec", "fixtures", "mmdb"))
+ Resolv::DNS
+ .any_instance
+ .stubs(:getname)
+ .with(ip.join("."))
+ .returns("ip-#{ip.join("-")}.example.com")
- UserAuthToken.log(action: "generate", user_id: robin.id, client_ip: ip.join("."), created_at: 1.hour.ago)
+ UserAuthToken.log(
+ action: "generate",
+ user_id: robin.id,
+ client_ip: ip.join("."),
+ created_at: 1.hour.ago,
+ )
UserAuthToken.log(action: "generate", user_id: joffrey.id, client_ip: "1.2.3.4")
- UserAuthToken.log(action: "generate", user_id: joffrey.id, client_ip: ip.join("."), created_at: 2.hours.ago)
+ UserAuthToken.log(
+ action: "generate",
+ user_id: joffrey.id,
+ client_ip: ip.join("."),
+ created_at: 2.hours.ago,
+ )
UserAuthToken.log(action: "generate", user_id: james.id)
report = Report.find("staff_logins")
@@ -1101,18 +1196,24 @@ RSpec.describe Report do
context "with data" do
let!(:tarek_upload) do
- Fabricate(:upload, user: tarek,
- url: "/uploads/default/original/1X/tarek.jpg",
- extension: "jpg",
- original_filename: "tarek.jpg",
- filesize: 1000)
+ Fabricate(
+ :upload,
+ user: tarek,
+ url: "/uploads/default/original/1X/tarek.jpg",
+ extension: "jpg",
+ original_filename: "tarek.jpg",
+ filesize: 1000,
+ )
end
let!(:khalil_upload) do
- Fabricate(:upload, user: khalil,
- url: "/uploads/default/original/1X/khalil.png",
- extension: "png",
- original_filename: "khalil.png",
- filesize: 2000)
+ Fabricate(
+ :upload,
+ user: khalil,
+ url: "/uploads/default/original/1X/khalil.png",
+ extension: "png",
+ original_filename: "khalil.png",
+ filesize: 2000,
+ )
end
it "works" do
@@ -1126,7 +1227,9 @@ RSpec.describe Report do
row = data.find { |r| r[:author_id] == user.id }
expect(row[:author_id]).to eq(user.id)
expect(row[:author_username]).to eq(user.username)
- expect(row[:author_avatar_template]).to eq(User.avatar_template(user.username, user.uploaded_avatar_id))
+ expect(row[:author_avatar_template]).to eq(
+ User.avatar_template(user.username, user.uploaded_avatar_id),
+ )
expect(row[:filesize]).to eq(upload.filesize)
expect(row[:extension]).to eq(upload.extension)
expect(row[:file_url]).to eq(Discourse.store.cdn_url(upload.url))
@@ -1174,7 +1277,9 @@ RSpec.describe Report do
expect(row).to be_present
expect(row[:ignored_user_id]).to eq(user.id)
expect(row[:ignored_username]).to eq(user.username)
- expect(row[:ignored_user_avatar_template]).to eq(User.avatar_template(user.username, user.uploaded_avatar_id))
+ expect(row[:ignored_user_avatar_template]).to eq(
+ User.avatar_template(user.username, user.uploaded_avatar_id),
+ )
expect(row[:ignores_count]).to eq(ignores)
expect(row[:mutes_count]).to eq(mutes)
end
@@ -1188,13 +1293,11 @@ RSpec.describe Report do
Theme.clear_default!
end
- let(:reports) { Report.find('consolidated_page_views') }
+ let(:reports) { Report.find("consolidated_page_views") }
context "with no data" do
it "works" do
- reports.data.each do |report|
- expect(report[:data]).to be_empty
- end
+ reports.data.each { |report| expect(report[:data]).to be_empty }
end
end
@@ -1239,13 +1342,11 @@ RSpec.describe Report do
Theme.clear_default!
end
- let(:reports) { Report.find('consolidated_api_requests') }
+ let(:reports) { Report.find("consolidated_api_requests") }
context "with no data" do
it "works" do
- reports.data.each do |report|
- expect(report[:data]).to be_empty
- end
+ reports.data.each { |report| expect(report[:data]).to be_empty }
end
end
@@ -1286,13 +1387,11 @@ RSpec.describe Report do
Theme.clear_default!
end
- let(:reports) { Report.find('trust_level_growth') }
+ let(:reports) { Report.find("trust_level_growth") }
context "with no data" do
it "works" do
- reports.data.each do |report|
- expect(report[:data]).to be_empty
- end
+ reports.data.each { |report| expect(report[:data]).to be_empty }
end
end
@@ -1301,8 +1400,18 @@ RSpec.describe Report do
fab!(:martin) { Fabricate(:user) }
before do
- UserHistory.create(action: UserHistory.actions[:auto_trust_level_change], target_user_id: gwen.id, new_value: TrustLevel[2], previous_value: 1)
- UserHistory.create(action: UserHistory.actions[:change_trust_level], target_user_id: martin.id, new_value: TrustLevel[4], previous_value: 0)
+ UserHistory.create(
+ action: UserHistory.actions[:auto_trust_level_change],
+ target_user_id: gwen.id,
+ new_value: TrustLevel[2],
+ previous_value: 1,
+ )
+ UserHistory.create(
+ action: UserHistory.actions[:change_trust_level],
+ target_user_id: martin.id,
+ new_value: TrustLevel[4],
+ previous_value: 0,
+ )
end
it "works" do
@@ -1336,12 +1445,18 @@ RSpec.describe Report do
end
it "caches exception reports for 1 minute" do
- Discourse.cache.expects(:write).with(Report.cache_key(exception_report), exception_report.as_json, expires_in: 1.minute)
+ Discourse
+ .cache
+ .expects(:write)
+ .with(Report.cache_key(exception_report), exception_report.as_json, expires_in: 1.minute)
Report.cache(exception_report)
end
it "caches valid reports for 35 minutes" do
- Discourse.cache.expects(:write).with(Report.cache_key(valid_report), valid_report.as_json, expires_in: 35.minutes)
+ Discourse
+ .cache
+ .expects(:write)
+ .with(Report.cache_key(valid_report), valid_report.as_json, expires_in: 35.minutes)
Report.cache(valid_report)
end
end
@@ -1375,12 +1490,12 @@ RSpec.describe Report do
end
end
- describe 'top_users_by_likes_received' do
- let(:report) { Report.find('top_users_by_likes_received') }
+ describe "top_users_by_likes_received" do
+ let(:report) { Report.find("top_users_by_likes_received") }
- include_examples 'no data'
+ include_examples "no data"
- context 'with data' do
+ context "with data" do
before do
user_1 = Fabricate(:user, username: "jonah")
user_2 = Fabricate(:user, username: "jake")
@@ -1392,7 +1507,7 @@ RSpec.describe Report do
end
it "with category filtering" do
- report = Report.find('top_users_by_likes_received')
+ report = Report.find("top_users_by_likes_received")
expect(report.data.length).to eq(3)
expect(report.data[0][:username]).to eq("jake")
@@ -1402,12 +1517,12 @@ RSpec.describe Report do
end
end
- describe 'top_users_by_likes_received_from_a_variety_of_people' do
- let(:report) { Report.find('top_users_by_likes_received_from_a_variety_of_people') }
+ describe "top_users_by_likes_received_from_a_variety_of_people" do
+ let(:report) { Report.find("top_users_by_likes_received_from_a_variety_of_people") }
- include_examples 'no data'
+ include_examples "no data"
- context 'with data' do
+ context "with data" do
before do
user_1 = Fabricate(:user, username: "jonah")
user_2 = Fabricate(:user, username: "jake")
@@ -1424,14 +1539,31 @@ RSpec.describe Report do
post_2 = Fabricate(:post, topic: topic_2, user: user_2)
post_3 = Fabricate(:post, topic: topic_3, user: user_3)
- 3.times { UserAction.create!(user_id: user_4.id, target_post_id: post_1.id, action_type: UserAction::LIKE) }
- 6.times { UserAction.create!(user_id: user_5.id, target_post_id: post_2.id, action_type: UserAction::LIKE) }
- 9.times { UserAction.create!(user_id: user_6.id, target_post_id: post_3.id, action_type: UserAction::LIKE) }
-
+ 3.times do
+ UserAction.create!(
+ user_id: user_4.id,
+ target_post_id: post_1.id,
+ action_type: UserAction::LIKE,
+ )
+ end
+ 6.times do
+ UserAction.create!(
+ user_id: user_5.id,
+ target_post_id: post_2.id,
+ action_type: UserAction::LIKE,
+ )
+ end
+ 9.times do
+ UserAction.create!(
+ user_id: user_6.id,
+ target_post_id: post_3.id,
+ action_type: UserAction::LIKE,
+ )
+ end
end
it "with category filtering" do
- report = Report.find('top_users_by_likes_received_from_a_variety_of_people')
+ report = Report.find("top_users_by_likes_received_from_a_variety_of_people")
expect(report.data.length).to eq(3)
expect(report.data[0][:username]).to eq("jonah")
@@ -1441,12 +1573,12 @@ RSpec.describe Report do
end
end
- describe 'top_users_by_likes_received_from_inferior_trust_level' do
- let(:report) { Report.find('top_users_by_likes_received_from_inferior_trust_level') }
+ describe "top_users_by_likes_received_from_inferior_trust_level" do
+ let(:report) { Report.find("top_users_by_likes_received_from_inferior_trust_level") }
- include_examples 'no data'
+ include_examples "no data"
- context 'with data' do
+ context "with data" do
before do
user_1 = Fabricate(:user, username: "jonah", trust_level: 2)
user_2 = Fabricate(:user, username: "jake", trust_level: 2)
@@ -1463,14 +1595,31 @@ RSpec.describe Report do
post_2 = Fabricate(:post, topic: topic_2, user: user_2)
post_3 = Fabricate(:post, topic: topic_3, user: user_3)
- 3.times { UserAction.create!(user_id: user_4.id, target_post_id: post_1.id, action_type: UserAction::LIKE) }
- 6.times { UserAction.create!(user_id: user_5.id, target_post_id: post_2.id, action_type: UserAction::LIKE) }
- 9.times { UserAction.create!(user_id: user_6.id, target_post_id: post_3.id, action_type: UserAction::LIKE) }
-
+ 3.times do
+ UserAction.create!(
+ user_id: user_4.id,
+ target_post_id: post_1.id,
+ action_type: UserAction::LIKE,
+ )
+ end
+ 6.times do
+ UserAction.create!(
+ user_id: user_5.id,
+ target_post_id: post_2.id,
+ action_type: UserAction::LIKE,
+ )
+ end
+ 9.times do
+ UserAction.create!(
+ user_id: user_6.id,
+ target_post_id: post_3.id,
+ action_type: UserAction::LIKE,
+ )
+ end
end
it "with category filtering" do
- report = Report.find('top_users_by_likes_received_from_inferior_trust_level')
+ report = Report.find("top_users_by_likes_received_from_inferior_trust_level")
expect(report.data.length).to eq(2)
expect(report.data[0][:username]).to eq("jake")
diff --git a/spec/models/reviewable_claimed_topic_spec.rb b/spec/models/reviewable_claimed_topic_spec.rb
index 6b4a5f42a30..e6b6b9e4a27 100644
--- a/spec/models/reviewable_claimed_topic_spec.rb
+++ b/spec/models/reviewable_claimed_topic_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
RSpec.describe ReviewableClaimedTopic, type: :model do
-
it "respects the uniqueness constraint" do
topic = Fabricate(:topic)
@@ -11,5 +10,4 @@ RSpec.describe ReviewableClaimedTopic, type: :model do
ct = ReviewableClaimedTopic.new(topic_id: topic.id, user_id: Fabricate(:user).id)
expect(ct.save).to eq(false)
end
-
end
diff --git a/spec/models/reviewable_flagged_post_spec.rb b/spec/models/reviewable_flagged_post_spec.rb
index 003c5d0ea85..f86d6736be0 100644
--- a/spec/models/reviewable_flagged_post_spec.rb
+++ b/spec/models/reviewable_flagged_post_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
RSpec.describe ReviewableFlaggedPost, type: :model do
-
def pending_count
ReviewableFlaggedPost.default_visible.pending.count
end
@@ -24,7 +23,6 @@ RSpec.describe ReviewableFlaggedPost, type: :model do
let(:guardian) { Guardian.new(moderator) }
describe "actions_for" do
-
it "returns appropriate defaults" do
actions = reviewable.actions_for(guardian)
expect(actions.has?(:agree_and_hide)).to eq(true)
@@ -90,7 +88,7 @@ RSpec.describe ReviewableFlaggedPost, type: :model do
it "excludes delete action if the reviewer cannot delete the user" do
post.user.user_stat.update!(
first_post_created_at: 1.year.ago,
- post_count: User::MAX_STAFF_DELETE_POST_COUNT + 1
+ post_count: User::MAX_STAFF_DELETE_POST_COUNT + 1,
)
expect(reviewable.actions_for(guardian).has?(:delete_user)).to be false
@@ -114,15 +112,22 @@ RSpec.describe ReviewableFlaggedPost, type: :model do
describe "with reviewable claiming enabled" do
fab!(:claimed) { Fabricate(:reviewable_claimed_topic, topic: post.topic, user: moderator) }
it "clears the claimed topic on resolve" do
- SiteSetting.reviewable_claiming = 'required'
+ SiteSetting.reviewable_claiming = "required"
reviewable.perform(moderator, :agree_and_keep)
expect(reviewable).to be_approved
expect(score.reload).to be_agreed
expect(post).not_to be_hidden
expect(ReviewableClaimedTopic.where(topic_id: post.topic.id).exists?).to eq(false)
- expect(post.topic.reviewables.first.history.where(reviewable_history_type: ReviewableHistory.types[:unclaimed]).size).to eq(1)
+ expect(
+ post
+ .topic
+ .reviewables
+ .first
+ .history
+ .where(reviewable_history_type: ReviewableHistory.types[:unclaimed])
+ .size,
+ ).to eq(1)
end
-
end
it "agree_and_suspend agrees with the flags and keeps the post" do
@@ -222,7 +227,6 @@ RSpec.describe ReviewableFlaggedPost, type: :model do
expect(post.user_deleted?).to eq(false)
expect(post.hidden?).to eq(false)
end
-
end
describe "pending count" do
@@ -238,7 +242,7 @@ RSpec.describe ReviewableFlaggedPost, type: :model do
it "respects `reviewable_default_visibility`" do
Reviewable.set_priorities(high: 7.5)
- SiteSetting.reviewable_default_visibility = 'high'
+ SiteSetting.reviewable_default_visibility = "high"
expect(pending_count).to eq(0)
PostActionCreator.off_topic(user, post)
@@ -282,15 +286,15 @@ RSpec.describe ReviewableFlaggedPost, type: :model do
expect(post.hidden).to eq(true)
expect(post.hidden_at).to be_present
end
-
end
describe "#perform_delete_and_agree" do
it "notifies the user about the flagged post deletion" do
reviewable = Fabricate(:reviewable_flagged_post)
reviewable.add_score(
- moderator, PostActionType.types[:spam],
- created_at: reviewable.created_at
+ moderator,
+ PostActionType.types[:spam],
+ created_at: reviewable.created_at,
)
reviewable.perform(moderator, :delete_and_agree)
@@ -303,11 +307,9 @@ RSpec.describe ReviewableFlaggedPost, type: :model do
let(:flagged_post) { Fabricate(:reviewable_flagged_post) }
let!(:reply) { create_reply(flagged_post.target) }
- before do
- flagged_post.target.update(reply_count: 1)
- end
+ before { flagged_post.target.update(reply_count: 1) }
- it 'ignore flagged replies' do
+ it "ignore flagged replies" do
flagged_reply = Fabricate(:reviewable_flagged_post, target: reply)
flagged_post.perform(moderator, :delete_and_agree_replies)
@@ -319,15 +321,20 @@ RSpec.describe ReviewableFlaggedPost, type: :model do
flagged_post.perform(moderator, :delete_and_agree_replies)
expect(Jobs::SendSystemMessage.jobs.size).to eq(2)
- expect(Jobs::SendSystemMessage.jobs.last["args"].first["message_type"]).to eq("flags_agreed_and_post_deleted_for_responders")
+ expect(Jobs::SendSystemMessage.jobs.last["args"].first["message_type"]).to eq(
+ "flags_agreed_and_post_deleted_for_responders",
+ )
end
it "skips responders notification when the score type doesn't match any post action flag type" do
- flagged_post.reviewable_scores.first.update!(reviewable_score_type: ReviewableScore.types[:needs_approval])
+ flagged_post.reviewable_scores.first.update!(
+ reviewable_score_type: ReviewableScore.types[:needs_approval],
+ )
- expect {
- flagged_post.perform(moderator, :delete_and_agree_replies)
- }.not_to change(Jobs::SendSystemMessage.jobs, :size)
+ expect { flagged_post.perform(moderator, :delete_and_agree_replies) }.not_to change(
+ Jobs::SendSystemMessage.jobs,
+ :size,
+ )
end
it "ignores flagged responses" do
@@ -342,7 +349,11 @@ RSpec.describe ReviewableFlaggedPost, type: :model do
describe "#perform_disagree_and_restore" do
it "notifies the user about the flagged post being restored" do
reviewable = Fabricate(:reviewable_flagged_post)
- reviewable.post.update(hidden: true, hidden_at: Time.zone.now, hidden_reason_id: PostActionType.types[:spam])
+ reviewable.post.update(
+ hidden: true,
+ hidden_at: Time.zone.now,
+ hidden_reason_id: PostActionType.types[:spam],
+ )
reviewable.perform(moderator, :disagree_and_restore)
@@ -350,7 +361,7 @@ RSpec.describe ReviewableFlaggedPost, type: :model do
end
end
- describe 'recalculating the reviewable score' do
+ describe "recalculating the reviewable score" do
let(:expected_score) { 8 }
let(:reviewable) { Fabricate(:reviewable_flagged_post, score: expected_score) }
@@ -377,9 +388,9 @@ RSpec.describe ReviewableFlaggedPost, type: :model do
def create_reply(post)
PostCreator.create(
Fabricate(:user),
- raw: 'this is the reply text',
+ raw: "this is the reply text",
reply_to_post_number: post.post_number,
- topic_id: post.topic
+ topic_id: post.topic,
)
end
end
diff --git a/spec/models/reviewable_history_spec.rb b/spec/models/reviewable_history_spec.rb
index 0b01814321b..68083a04d45 100644
--- a/spec/models/reviewable_history_spec.rb
+++ b/spec/models/reviewable_history_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
RSpec.describe ReviewableHistory, type: :model do
-
fab!(:user) { Fabricate(:user) }
fab!(:admin) { Fabricate(:admin) }
fab!(:moderator) { Fabricate(:moderator) }
@@ -56,5 +55,4 @@ RSpec.describe ReviewableHistory, type: :model do
expect(history[1].created_by).to eq(moderator)
expect(history[1].edited).to eq("category_id" => [old_category.id, nil])
end
-
end
diff --git a/spec/models/reviewable_post_spec.rb b/spec/models/reviewable_post_spec.rb
index cba3af49da9..d377aab6626 100644
--- a/spec/models/reviewable_post_spec.rb
+++ b/spec/models/reviewable_post_spec.rb
@@ -3,31 +3,32 @@
RSpec.describe ReviewablePost do
fab!(:admin) { Fabricate(:admin) }
- describe '#build_actions' do
+ describe "#build_actions" do
let(:post) { Fabricate.build(:post) }
let(:reviewable) { ReviewablePost.new(target: post) }
let(:guardian) { Guardian.new }
- it 'Does not return available actions when the reviewable is no longer pending' do
- available_actions = (Reviewable.statuses.keys - ["pending"]).reduce([]) do |actions, status|
- reviewable.status = status
+ it "Does not return available actions when the reviewable is no longer pending" do
+ available_actions =
+ (Reviewable.statuses.keys - ["pending"]).reduce([]) do |actions, status|
+ reviewable.status = status
- actions.concat reviewable_actions(guardian).to_a
- end
+ actions.concat reviewable_actions(guardian).to_a
+ end
expect(available_actions).to be_empty
end
- it 'only shows the approve post action if users cannot delete the post' do
+ it "only shows the approve post action if users cannot delete the post" do
expect(reviewable_actions(guardian).has?(:approve)).to eq(true)
expect(reviewable_actions(guardian).has?(:reject_and_delete)).to eq(false)
end
- it 'includes the reject and delete action if the user is allowed' do
+ it "includes the reject and delete action if the user is allowed" do
expect(reviewable_actions(Guardian.new(admin)).has?(:reject_and_delete)).to eq(true)
end
- it 'includes the approve post and unhide action if the post is hidden' do
+ it "includes the approve post and unhide action if the post is hidden" do
post.hidden = true
actions = reviewable_actions(guardian)
@@ -35,7 +36,7 @@ RSpec.describe ReviewablePost do
expect(actions.has?(:approve_and_unhide)).to eq(true)
end
- it 'includes the reject post and keep deleted action is the post is deleted' do
+ it "includes the reject post and keep deleted action is the post is deleted" do
post.deleted_at = 1.day.ago
actions = reviewable_actions(guardian)
@@ -44,8 +45,7 @@ RSpec.describe ReviewablePost do
expect(actions.has?(:reject_and_keep_deleted)).to eq(true)
end
- it 'includes an option to approve and restore the post if the user is allowed' do
-
+ it "includes an option to approve and restore the post if the user is allowed" do
post.deleted_at = 1.day.ago
actions = reviewable_actions(Guardian.new(admin))
@@ -61,30 +61,30 @@ RSpec.describe ReviewablePost do
end
end
- describe 'Performing actions' do
+ describe "Performing actions" do
let(:post) { Fabricate(:post) }
let(:reviewable) { ReviewablePost.needs_review!(target: post, created_by: admin) }
before { reviewable.created_new! }
- describe '#perform_approve' do
- it 'transitions to the approved state' do
+ describe "#perform_approve" do
+ it "transitions to the approved state" do
result = reviewable.perform admin, :approve
expect(result.transition_to).to eq :approved
end
end
- describe '#perform_reject_and_suspend' do
- it 'transitions to the rejected state' do
+ describe "#perform_reject_and_suspend" do
+ it "transitions to the rejected state" do
result = reviewable.perform admin, :reject_and_suspend
expect(result.transition_to).to eq :rejected
end
end
- describe '#perform_reject_and_keep_deleted' do
- it 'transitions to the rejected state and keep the post deleted' do
+ describe "#perform_reject_and_keep_deleted" do
+ it "transitions to the rejected state and keep the post deleted" do
post.trash!
result = reviewable.perform admin, :reject_and_keep_deleted
@@ -94,8 +94,8 @@ RSpec.describe ReviewablePost do
end
end
- describe '#perform_approve_and_restore' do
- it 'transitions to the approved state and restores the post' do
+ describe "#perform_approve_and_restore" do
+ it "transitions to the approved state and restores the post" do
post.trash!
result = reviewable.reload.perform admin, :approve_and_restore
@@ -105,8 +105,8 @@ RSpec.describe ReviewablePost do
end
end
- describe '#perform_approve_and_unhide' do
- it 'transitions to the approved state and unhides the post' do
+ describe "#perform_approve_and_unhide" do
+ it "transitions to the approved state and unhides the post" do
post.update!(hidden: true)
result = reviewable.reload.perform admin, :approve_and_unhide
@@ -116,8 +116,8 @@ RSpec.describe ReviewablePost do
end
end
- describe '#perform_reject_and_delete' do
- it 'transitions to the rejected state and deletes the post' do
+ describe "#perform_reject_and_delete" do
+ it "transitions to the rejected state and deletes the post" do
result = reviewable.perform admin, :reject_and_delete
expect(result.transition_to).to eq :rejected
diff --git a/spec/models/reviewable_queued_post_spec.rb b/spec/models/reviewable_queued_post_spec.rb
index da9fa7565ea..8ddf4247e50 100644
--- a/spec/models/reviewable_queued_post_spec.rb
+++ b/spec/models/reviewable_queued_post_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
RSpec.describe ReviewableQueuedPost, type: :model do
-
fab!(:category) { Fabricate(:category) }
fab!(:moderator) { Fabricate(:moderator) }
@@ -20,23 +19,29 @@ RSpec.describe ReviewableQueuedPost, type: :model do
create_options = reviewable.create_options
expect(create_options[:topic_id]).to eq(topic.id)
- expect(create_options[:raw]).to eq('hello world post contents.')
+ expect(create_options[:raw]).to eq("hello world post contents.")
expect(create_options[:reply_to_post_number]).to eq(1)
expect(create_options[:via_email]).to eq(true)
- expect(create_options[:raw_email]).to eq('store_me')
+ expect(create_options[:raw_email]).to eq("store_me")
expect(create_options[:auto_track]).to eq(true)
- expect(create_options[:custom_fields]).to eq('hello' => 'world')
- expect(create_options[:cooking_options]).to eq(cat: 'hat')
+ expect(create_options[:custom_fields]).to eq("hello" => "world")
+ expect(create_options[:cooking_options]).to eq(cat: "hat")
expect(create_options[:cook_method]).to eq(Post.cook_methods[:raw_html])
expect(create_options[:not_create_option]).to eq(nil)
- expect(create_options[:image_sizes]).to eq("http://foo.bar/image.png" => { "width" => 0, "height" => 222 })
+ expect(create_options[:image_sizes]).to eq(
+ "http://foo.bar/image.png" => {
+ "width" => 0,
+ "height" => 222,
+ },
+ )
end
end
describe "actions" do
context "with approve_post" do
- it 'triggers an extensibility event' do
- event = DiscourseEvent.track(:approved_post) { reviewable.perform(moderator, :approve_post) }
+ it "triggers an extensibility event" do
+ event =
+ DiscourseEvent.track(:approved_post) { reviewable.perform(moderator, :approve_post) }
expect(event).to be_present
expect(event[:params].first).to eq(reviewable)
end
@@ -46,16 +51,17 @@ RSpec.describe ReviewableQueuedPost, type: :model do
result = nil
Jobs.run_immediately!
- event = DiscourseEvent.track(:before_create_notifications_for_users) do
- result = reviewable.perform(moderator, :approve_post)
- end
+ event =
+ DiscourseEvent.track(:before_create_notifications_for_users) do
+ result = reviewable.perform(moderator, :approve_post)
+ end
expect(result.success?).to eq(true)
expect(result.created_post).to be_present
expect(event).to be_present
expect(result.created_post).to be_valid
expect(result.created_post.topic).to eq(topic)
- expect(result.created_post.custom_fields['hello']).to eq('world')
+ expect(result.created_post.custom_fields["hello"]).to eq("world")
expect(result.created_post_topic).to eq(topic)
expect(result.created_post.user).to eq(reviewable.created_by)
expect(reviewable.target_id).to eq(result.created_post.id)
@@ -63,18 +69,21 @@ RSpec.describe ReviewableQueuedPost, type: :model do
expect(Topic.count).to eq(topic_count)
expect(Post.count).to eq(post_count + 1)
- notifications = Notification.where(
- user: reviewable.created_by,
- notification_type: Notification.types[:post_approved]
- )
+ notifications =
+ Notification.where(
+ user: reviewable.created_by,
+ notification_type: Notification.types[:post_approved],
+ )
expect(notifications).to be_present
# We can't approve twice
- expect { reviewable.perform(moderator, :approve_post) }.to raise_error(Reviewable::InvalidAction)
+ expect { reviewable.perform(moderator, :approve_post) }.to raise_error(
+ Reviewable::InvalidAction,
+ )
end
it "skips validations" do
- reviewable.payload['raw'] = 'x'
+ reviewable.payload["raw"] = "x"
result = reviewable.perform(moderator, :approve_post)
expect(result.created_post).to be_present
end
@@ -92,12 +101,12 @@ RSpec.describe ReviewableQueuedPost, type: :model do
result = reviewable.perform(moderator, :approve_post)
expect(result.success?).to eq(true)
end
-
end
context "with reject_post" do
- it 'triggers an extensibility event' do
- event = DiscourseEvent.track(:rejected_post) { reviewable.perform(moderator, :reject_post) }
+ it "triggers an extensibility event" do
+ event =
+ DiscourseEvent.track(:rejected_post) { reviewable.perform(moderator, :reject_post) }
expect(event).to be_present
expect(event[:params].first).to eq(reviewable)
end
@@ -110,7 +119,9 @@ RSpec.describe ReviewableQueuedPost, type: :model do
expect(Post.count).to eq(post_count)
# We can't reject twice
- expect { reviewable.perform(moderator, :reject_post) }.to raise_error(Reviewable::InvalidAction)
+ expect { reviewable.perform(moderator, :reject_post) }.to raise_error(
+ Reviewable::InvalidAction,
+ )
end
end
@@ -143,25 +154,25 @@ RSpec.describe ReviewableQueuedPost, type: :model do
context "when editing" do
it "is editable and returns the fields" do
fields = reviewable.editable_for(Guardian.new(moderator))
- expect(fields.has?('category_id')).to eq(true)
- expect(fields.has?('payload.raw')).to eq(true)
- expect(fields.has?('payload.title')).to eq(true)
- expect(fields.has?('payload.tags')).to eq(true)
+ expect(fields.has?("category_id")).to eq(true)
+ expect(fields.has?("payload.raw")).to eq(true)
+ expect(fields.has?("payload.title")).to eq(true)
+ expect(fields.has?("payload.tags")).to eq(true)
end
it "is editable by a category group reviewer" do
fields = reviewable.editable_for(Guardian.new(Fabricate(:user)))
- expect(fields.has?('category_id')).to eq(false)
- expect(fields.has?('payload.raw')).to eq(true)
- expect(fields.has?('payload.title')).to eq(true)
- expect(fields.has?('payload.tags')).to eq(true)
+ expect(fields.has?("category_id")).to eq(false)
+ expect(fields.has?("payload.raw")).to eq(true)
+ expect(fields.has?("payload.title")).to eq(true)
+ expect(fields.has?("payload.tags")).to eq(true)
end
end
it "returns the appropriate create options for a topic" do
create_options = reviewable.create_options
expect(create_options[:category]).to eq(reviewable.category.id)
- expect(create_options[:archetype]).to eq('regular')
+ expect(create_options[:archetype]).to eq("regular")
end
it "creates the post and topic when approved" do
@@ -182,8 +193,9 @@ RSpec.describe ReviewableQueuedPost, type: :model do
it "creates a topic with staff tag when approved" do
hidden_tag = Fabricate(:tag)
- staff_tag_group = Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name])
- reviewable.payload['tags'] += [hidden_tag.name]
+ staff_tag_group =
+ Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name])
+ reviewable.payload["tags"] += [hidden_tag.name]
result = reviewable.perform(moderator, :approve_post)
@@ -191,7 +203,7 @@ RSpec.describe ReviewableQueuedPost, type: :model do
expect(result.created_post_topic).to be_present
expect(result.created_post_topic).to be_valid
expect(reviewable.topic_id).to eq(result.created_post_topic.id)
- expect(result.created_post_topic.tags.pluck(:name)).to match_array(reviewable.payload['tags'])
+ expect(result.created_post_topic.tags.pluck(:name)).to match_array(reviewable.payload["tags"])
end
it "does not create the post and topic when rejected" do
@@ -209,7 +221,9 @@ RSpec.describe ReviewableQueuedPost, type: :model do
describe "Callbacks" do
context "when creating a new pending reviewable" do
- let(:reviewable) { Fabricate.build(:reviewable_queued_post_topic, category: category, created_by: user) }
+ let(:reviewable) do
+ Fabricate.build(:reviewable_queued_post_topic, category: category, created_by: user)
+ end
let(:user) { Fabricate(:user) }
let(:user_stats) { user.user_stat }
diff --git a/spec/models/reviewable_score_spec.rb b/spec/models/reviewable_score_spec.rb
index 4b2d38d4e88..8d2dfac0182 100644
--- a/spec/models/reviewable_score_spec.rb
+++ b/spec/models/reviewable_score_spec.rb
@@ -36,7 +36,7 @@ RSpec.describe ReviewableScore, type: :model do
end
it "increases the score by the post action type's score bonus" do
- PostActionType.where(name_key: 'spam').update_all(score_bonus: 2.25)
+ PostActionType.where(name_key: "spam").update_all(score_bonus: 2.25)
reviewable = PostActionCreator.spam(user, post).reviewable
score = reviewable.reviewable_scores.find_by(user: user)
expect(score).to be_pending
@@ -54,12 +54,13 @@ RSpec.describe ReviewableScore, type: :model do
let(:topic) { post.topic }
it "gives a bonus for take_action" do
- result = PostActionCreator.new(
- moderator,
- post,
- PostActionType.types[:spam],
- take_action: true
- ).perform
+ result =
+ PostActionCreator.new(
+ moderator,
+ post,
+ PostActionType.types[:spam],
+ take_action: true,
+ ).perform
expect(result.reviewable_score.take_action_bonus).to eq(5.0)
expect(result.reviewable.score).to eq(11.0)
@@ -162,7 +163,9 @@ RSpec.describe ReviewableScore, type: :model do
end
it "returns 6.0 for staff" do
- expect(ReviewableScore.user_flag_score(Fabricate.build(:moderator, trust_level: 2))).to eq(6.0)
+ expect(ReviewableScore.user_flag_score(Fabricate.build(:moderator, trust_level: 2))).to eq(
+ 6.0,
+ )
expect(ReviewableScore.user_flag_score(Fabricate.build(:admin, trust_level: 1))).to eq(6.0)
end
end
@@ -185,7 +188,7 @@ RSpec.describe ReviewableScore, type: :model do
fab!(:user) { Fabricate(:user) }
let(:user_stat) { user.user_stat }
- it 'never returns less than 0' do
+ it "never returns less than 0" do
user.trust_level = 2
user_stat.flags_agreed = 1
user_stat.flags_disagreed = 1000
@@ -194,7 +197,7 @@ RSpec.describe ReviewableScore, type: :model do
expect(ReviewableScore.calculate_score(user, 5, 5)).to eq(0)
end
- it 'returns user_flag_score + type_bonus + take_action_bonus' do
+ it "returns user_flag_score + type_bonus + take_action_bonus" do
user.trust_level = 2
user_stat.flags_agreed = 12
user_stat.flags_disagreed = 2
diff --git a/spec/models/reviewable_spec.rb b/spec/models/reviewable_spec.rb
index 09ae331325d..1f9d8e6b0b8 100644
--- a/spec/models/reviewable_spec.rb
+++ b/spec/models/reviewable_spec.rb
@@ -19,15 +19,15 @@ RSpec.describe Reviewable, type: :model do
expect(reviewable.payload).to be_present
expect(reviewable.version).to eq(0)
- expect(reviewable.payload['name']).to eq('bandersnatch')
- expect(reviewable.payload['list']).to eq([1, 2, 3])
+ expect(reviewable.payload["name"]).to eq("bandersnatch")
+ expect(reviewable.payload["list"]).to eq([1, 2, 3])
end
it "can add a target" do
reviewable.target = user
reviewable.save!
- expect(reviewable.target_type).to eq('User')
+ expect(reviewable.target_type).to eq("User")
expect(reviewable.target_id).to eq(user.id)
expect(reviewable.target).to eq(user)
end
@@ -67,11 +67,23 @@ RSpec.describe Reviewable, type: :model do
end
it "can create multiple objects with a NULL target" do
- r0 = ReviewableQueuedPost.needs_review!(created_by: admin, payload: { raw: 'hello world I am a post' })
+ r0 =
+ ReviewableQueuedPost.needs_review!(
+ created_by: admin,
+ payload: {
+ raw: "hello world I am a post",
+ },
+ )
expect(r0).to be_present
r0.update_column(:status, Reviewable.statuses[:approved])
- r1 = ReviewableQueuedPost.needs_review!(created_by: admin, payload: { raw: "another post's contents" })
+ r1 =
+ ReviewableQueuedPost.needs_review!(
+ created_by: admin,
+ payload: {
+ raw: "another post's contents",
+ },
+ )
expect(ReviewableQueuedPost.count).to eq(2)
expect(r1.id).not_to eq(r0.id)
@@ -138,18 +150,19 @@ RSpec.describe Reviewable, type: :model do
expect(Reviewable.list_for(user, status: :pending)).to be_blank
end
- context 'as an admin' do
+ context "as an admin" do
before { user.update_columns(moderator: false, admin: true) }
- it 'can filter by the target_created_by_id attribute' do
+ it "can filter by the target_created_by_id attribute" do
different_reviewable = Fabricate(:reviewable)
- reviewables = Reviewable.list_for(user, username: different_reviewable.target_created_by.username)
+ reviewables =
+ Reviewable.list_for(user, username: different_reviewable.target_created_by.username)
expect(reviewables).to include(different_reviewable)
reviewables = Reviewable.list_for(user, username: user.username)
expect(reviewables).not_to include(different_reviewable)
end
- it 'can filter by the created_by_id attribute if there is no target' do
+ it "can filter by the created_by_id attribute if there is no target" do
qp = Fabricate(:reviewable_queued_post)
reviewables = Reviewable.list_for(user, username: qp.created_by.username)
expect(reviewables).to include(qp)
@@ -157,20 +170,19 @@ RSpec.describe Reviewable, type: :model do
expect(reviewables).not_to include(qp)
end
- it 'can filter by who reviewed the flag' do
+ it "can filter by who reviewed the flag" do
reviewable = Fabricate(:reviewable_flagged_post)
admin = Fabricate(:admin)
reviewable.perform(admin, :ignore)
- reviewables = Reviewable.list_for(
- user, status: :all, reviewed_by: admin.username
- )
+ reviewables = Reviewable.list_for(user, status: :all, reviewed_by: admin.username)
expect(reviewables).to contain_exactly(reviewable)
end
- it 'Does not filter by status when status parameter is set to all' do
- rejected_reviewable = Fabricate(:reviewable, target: post, status: Reviewable.statuses[:rejected])
+ it "Does not filter by status when status parameter is set to all" do
+ rejected_reviewable =
+ Fabricate(:reviewable, target: post, status: Reviewable.statuses[:rejected])
reviewables = Reviewable.list_for(user, status: :all)
expect(reviewables).to match_array [reviewable, rejected_reviewable]
end
@@ -179,19 +191,19 @@ RSpec.describe Reviewable, type: :model do
r0 = Fabricate(:reviewable, score: 100, created_at: 3.months.ago)
r1 = Fabricate(:reviewable, score: 999, created_at: 1.month.ago)
- list = Reviewable.list_for(user, sort_order: 'score')
+ list = Reviewable.list_for(user, sort_order: "score")
expect(list[0].id).to eq(r1.id)
expect(list[1].id).to eq(r0.id)
- list = Reviewable.list_for(user, sort_order: 'score_asc')
+ list = Reviewable.list_for(user, sort_order: "score_asc")
expect(list[0].id).to eq(r0.id)
expect(list[1].id).to eq(r1.id)
- list = Reviewable.list_for(user, sort_order: 'created_at')
+ list = Reviewable.list_for(user, sort_order: "created_at")
expect(list[0].id).to eq(r1.id)
expect(list[1].id).to eq(r0.id)
- list = Reviewable.list_for(user, sort_order: 'created_at_asc')
+ list = Reviewable.list_for(user, sort_order: "created_at_asc")
expect(list[0].id).to eq(r0.id)
expect(list[1].id).to eq(r1.id)
end
@@ -200,19 +212,20 @@ RSpec.describe Reviewable, type: :model do
before do
SiteSetting.reviewable_default_visibility = :high
Reviewable.set_priorities(high: 10)
- @queued_post = Fabricate(:reviewable_queued_post, score: 0, target: post, force_review: true)
+ @queued_post =
+ Fabricate(:reviewable_queued_post, score: 0, target: post, force_review: true)
@queued_user = Fabricate(:reviewable_user, score: 0, force_review: true)
end
- it 'includes queued posts when searching for pending reviewables' do
+ it "includes queued posts when searching for pending reviewables" do
expect(Reviewable.list_for(user)).to contain_exactly(@queued_post, @queued_user)
end
- it 'excludes pending queued posts when applying a different status filter' do
+ it "excludes pending queued posts when applying a different status filter" do
expect(Reviewable.list_for(user, status: :deleted)).to be_empty
end
- it 'excludes pending queued posts when applying a different type filter' do
+ it "excludes pending queued posts when applying a different type filter" do
expect(Reviewable.list_for(user, type: ReviewableFlaggedPost.name)).to be_empty
end
end
@@ -229,11 +242,12 @@ RSpec.describe Reviewable, type: :model do
it "respects category id on the reviewable" do
Group.refresh_automatic_group!(:staff)
- reviewable = ReviewableFlaggedPost.needs_review!(
- target: post,
- created_by: Fabricate(:user),
- reviewable_by_moderator: true
- )
+ reviewable =
+ ReviewableFlaggedPost.needs_review!(
+ target: post,
+ created_by: Fabricate(:user),
+ reviewable_by_moderator: true,
+ )
expect(reviewable.category).to eq(category)
expect(Reviewable.list_for(moderator)).not_to include(reviewable)
expect(Reviewable.list_for(admin)).to include(reviewable)
@@ -253,9 +267,9 @@ RSpec.describe Reviewable, type: :model do
fab!(:user) { Fabricate(:user, groups: [group]) }
fab!(:admin_reviewable) { Fabricate(:reviewable, reviewable_by_moderator: false) }
fab!(:mod_reviewable) { Fabricate(:reviewable, reviewable_by_moderator: true) }
- fab!(:group_reviewable) {
+ fab!(:group_reviewable) do
Fabricate(:reviewable, reviewable_by_group: group, reviewable_by_moderator: false)
- }
+ end
context "for admins" do
it "returns a list of pending reviewables that haven't been seen by the user" do
@@ -287,9 +301,7 @@ RSpec.describe Reviewable, type: :model do
end
context "for group moderators" do
- before do
- SiteSetting.enable_category_group_moderation = true
- end
+ before { SiteSetting.enable_category_group_moderation = true }
it "returns a list of pending reviewables that haven't been seen by the user" do
list = Reviewable.unseen_list_for(user, preload: false)
@@ -304,9 +316,9 @@ RSpec.describe Reviewable, type: :model do
end
it "valid_types returns the appropriate types" do
- expect(Reviewable.valid_type?('ReviewableUser')).to eq(true)
- expect(Reviewable.valid_type?('ReviewableQueuedPost')).to eq(true)
- expect(Reviewable.valid_type?('ReviewableFlaggedPost')).to eq(true)
+ expect(Reviewable.valid_type?("ReviewableUser")).to eq(true)
+ expect(Reviewable.valid_type?("ReviewableQueuedPost")).to eq(true)
+ expect(Reviewable.valid_type?("ReviewableFlaggedPost")).to eq(true)
expect(Reviewable.valid_type?(nil)).to eq(false)
expect(Reviewable.valid_type?("")).to eq(false)
expect(Reviewable.valid_type?("Reviewable")).to eq(false)
@@ -323,9 +335,10 @@ RSpec.describe Reviewable, type: :model do
expect(event).to be_present
expect(event[:params].first).to eq(reviewable)
- event = DiscourseEvent.track(:reviewable_transitioned_to) do
- reviewable.transition_to(:approved, moderator)
- end
+ event =
+ DiscourseEvent.track(:reviewable_transitioned_to) do
+ reviewable.transition_to(:approved, moderator)
+ end
expect(event).to be_present
expect(event[:params][0]).to eq(:approved)
expect(event[:params][1]).to eq(reviewable)
@@ -347,20 +360,17 @@ RSpec.describe Reviewable, type: :model do
reviewable = PostActionCreator.create(moderator, post, :inappropriate).reviewable
reviewable.perform(moderator, :disagree)
- expect { PostActionCreator.spam(Fabricate(:user), post) }
- .to change { reviewable.reload.status }
- .from("rejected")
- .to("pending")
- .and change { Jobs::NotifyReviewable.jobs.size }
- .by(1)
+ expect { PostActionCreator.spam(Fabricate(:user), post) }.to change {
+ reviewable.reload.status
+ }.from("rejected").to("pending").and change { Jobs::NotifyReviewable.jobs.size }.by(1)
end
it "triggers a notification on pending -> approve" do
reviewable = Fabricate(:reviewable_queued_post)
- expect do
- reviewable.perform(moderator, :approve_post)
- end.to change { Jobs::NotifyReviewable.jobs.size }.by(1)
+ expect do reviewable.perform(moderator, :approve_post) end.to change {
+ Jobs::NotifyReviewable.jobs.size
+ }.by(1)
job = Jobs::NotifyReviewable.jobs.last
@@ -371,9 +381,9 @@ RSpec.describe Reviewable, type: :model do
it "triggers a notification on pending -> reject" do
reviewable = Fabricate(:reviewable_queued_post)
- expect do
- reviewable.perform(moderator, :reject_post)
- end.to change { Jobs::NotifyReviewable.jobs.size }.by(1)
+ expect do reviewable.perform(moderator, :reject_post) end.to change {
+ Jobs::NotifyReviewable.jobs.size
+ }.by(1)
job = Jobs::NotifyReviewable.jobs.last
@@ -384,9 +394,9 @@ RSpec.describe Reviewable, type: :model do
it "triggers a notification on approve -> reject to update status" do
reviewable = Fabricate(:reviewable_queued_post, status: Reviewable.statuses[:approved])
- expect do
- reviewable.perform(moderator, :reject_post)
- end.to change { Jobs::NotifyReviewable.jobs.size }.by(1)
+ expect do reviewable.perform(moderator, :reject_post) end.to change {
+ Jobs::NotifyReviewable.jobs.size
+ }.by(1)
job = Jobs::NotifyReviewable.jobs.last
@@ -397,9 +407,9 @@ RSpec.describe Reviewable, type: :model do
it "triggers a notification on reject -> approve to update status" do
reviewable = Fabricate(:reviewable_queued_post, status: Reviewable.statuses[:rejected])
- expect do
- reviewable.perform(moderator, :approve_post)
- end.to change { Jobs::NotifyReviewable.jobs.size }.by(1)
+ expect do reviewable.perform(moderator, :approve_post) end.to change {
+ Jobs::NotifyReviewable.jobs.size
+ }.by(1)
job = Jobs::NotifyReviewable.jobs.last
@@ -441,7 +451,6 @@ RSpec.describe Reviewable, type: :model do
end
describe ".score_required_to_hide_post" do
-
it "will return the default visibility if it's higher" do
described_class.set_priorities(low: 40.0, high: 100.0)
SiteSetting.hide_post_sensitivity = described_class.sensitivities[:high]
@@ -494,7 +503,6 @@ RSpec.describe Reviewable, type: :model do
end
describe ".score_to_auto_close_topic" do
-
it "returns the default if we can't calculated any percentiles" do
SiteSetting.auto_close_topic_sensitivity = described_class.sensitivities[:low]
expect(described_class.score_to_auto_close_topic).to eq(31.25)
@@ -538,32 +546,31 @@ RSpec.describe Reviewable, type: :model do
it "will return the default priority if none supplied" do
Reviewable.set_priorities(medium: 12.3, high: 45.6)
expect(Reviewable.min_score_for_priority).to eq(0.0)
- SiteSetting.reviewable_default_visibility = 'medium'
+ SiteSetting.reviewable_default_visibility = "medium"
expect(Reviewable.min_score_for_priority).to eq(12.3)
- SiteSetting.reviewable_default_visibility = 'high'
+ SiteSetting.reviewable_default_visibility = "high"
expect(Reviewable.min_score_for_priority).to eq(45.6)
end
end
describe "custom filters" do
- after do
- Reviewable.clear_custom_filters!
- end
+ after { Reviewable.clear_custom_filters! }
- it 'correctly add a new filter' do
+ it "correctly add a new filter" do
Reviewable.add_custom_filter([:assigned_to, Proc.new { |results, value| results }])
expect(Reviewable.custom_filters.size).to eq(1)
end
- it 'applies the custom filter' do
+ it "applies the custom filter" do
admin = Fabricate(:admin)
first_reviewable = Fabricate(:reviewable)
second_reviewable = Fabricate(:reviewable)
custom_filter = [:target_id, Proc.new { |results, value| results.where(target_id: value) }]
Reviewable.add_custom_filter(custom_filter)
- results = Reviewable.list_for(admin, additional_filters: { target_id: first_reviewable.target_id })
+ results =
+ Reviewable.list_for(admin, additional_filters: { target_id: first_reviewable.target_id })
expect(results.size).to eq(1)
expect(results.first).to eq first_reviewable
@@ -576,47 +583,47 @@ RSpec.describe Reviewable, type: :model do
custom_filter = [
:troublemaker,
Proc.new do |results, value|
- results.joins(<<~SQL
+ results
+ .joins(<<~SQL)
INNER JOIN posts p ON p.id = target_id
INNER JOIN topics t ON t.id = p.topic_id
INNER JOIN topic_custom_fields tcf ON tcf.topic_id = t.id
INNER JOIN users u ON u.id = tcf.value::integer
SQL
- )
.where(target_type: Post.name)
- .where('tcf.name = ?', 'troublemaker_user_id')
- .where('u.username = ?', value)
- end
+ .where("tcf.name = ?", "troublemaker_user_id")
+ .where("u.username = ?", value)
+ end,
]
Reviewable.add_custom_filter(custom_filter)
mod = Fabricate(:moderator)
- results = Reviewable.list_for(mod, additional_filters: { troublemaker: 'badguy' })
+ results = Reviewable.list_for(mod, additional_filters: { troublemaker: "badguy" })
expect { results.first }.not_to raise_error
end
end
end
- describe '.by_status' do
- it 'includes reviewables with deleted targets when passing the reviewed status' do
+ describe ".by_status" do
+ it "includes reviewables with deleted targets when passing the reviewed status" do
reviewable = Fabricate(:reviewable_queued_post, status: Reviewable.statuses[:deleted])
expect(Reviewable.by_status(Reviewable.all, :reviewed)).to contain_exactly(reviewable)
end
end
- describe 'default actions' do
+ describe "default actions" do
let(:reviewable) { Reviewable.new }
let(:actions) { Reviewable::Actions.new(reviewable, Guardian.new) }
- describe '#delete_user_actions' do
- it 'adds a bundle with the delete_user action' do
+ describe "#delete_user_actions" do
+ it "adds a bundle with the delete_user action" do
reviewable.delete_user_actions(actions)
expect(actions.has?(:delete_user)).to be true
end
- it 'adds a bundle with the delete_user_block action' do
+ it "adds a bundle with the delete_user_block action" do
reviewable.delete_user_actions(actions)
expect(actions.has?(:delete_user_block)).to be true
@@ -629,7 +636,9 @@ RSpec.describe Reviewable, type: :model do
fab!(:user) { Fabricate(:user) }
fab!(:admin_reviewable) { Fabricate(:reviewable, reviewable_by_moderator: false) }
fab!(:mod_reviewable) { Fabricate(:reviewable, reviewable_by_moderator: true) }
- fab!(:group_reviewable) { Fabricate(:reviewable, reviewable_by_moderator: false, reviewable_by_group: group) }
+ fab!(:group_reviewable) do
+ Fabricate(:reviewable, reviewable_by_moderator: false, reviewable_by_group: group)
+ end
it "doesn't include reviewables that can't be seen by the user" do
SiteSetting.enable_category_group_moderation = true
diff --git a/spec/models/reviewable_user_spec.rb b/spec/models/reviewable_user_spec.rb
index ece77650c44..319ec0812e8 100644
--- a/spec/models/reviewable_user_spec.rb
+++ b/spec/models/reviewable_user_spec.rb
@@ -26,32 +26,30 @@ RSpec.describe ReviewableUser, type: :model do
expect(actions.has?(:delete_user_block)).to eq(false)
end
- it 'can delete a user without a giving a rejection reason if the user was a spammer' do
- reviewable.reviewable_scores.build(user: admin, reason: 'suspect_user')
+ it "can delete a user without a giving a rejection reason if the user was a spammer" do
+ reviewable.reviewable_scores.build(user: admin, reason: "suspect_user")
assert_require_reject_reason(:delete_user, false)
end
- it 'requires a rejection reason to delete a user' do
+ it "requires a rejection reason to delete a user" do
assert_require_reject_reason(:delete_user, true)
end
- it 'can delete and block a user without giving a rejection reason if the user was a spammer' do
- reviewable.reviewable_scores.build(user: admin, reason: 'suspect_user')
+ it "can delete and block a user without giving a rejection reason if the user was a spammer" do
+ reviewable.reviewable_scores.build(user: admin, reason: "suspect_user")
assert_require_reject_reason(:delete_user, false)
end
- it 'requires a rejection reason to delete and block a user' do
+ it "requires a rejection reason to delete and block a user" do
assert_require_reject_reason(:delete_user_block, true)
end
def assert_require_reject_reason(id, expected)
actions = reviewable.actions_for(Guardian.new(moderator))
- expect(actions.to_a.
- find { |a| a.id == id }.require_reject_reason).
- to eq(expected)
+ expect(actions.to_a.find { |a| a.id == id }.require_reject_reason).to eq(expected)
end
end
@@ -106,9 +104,7 @@ RSpec.describe ReviewableUser, type: :model do
reviewable.reload
expect(reviewable.target).to be_blank
expect(reviewable.reject_reason).to eq("reject reason")
- expect(UserHistory.last.context).to eq(
- I18n.t("user.destroy_reasons.reviewable_reject")
- )
+ expect(UserHistory.last.context).to eq(I18n.t("user.destroy_reasons.reviewable_reject"))
end
it "allows us to reject and block a user" do
@@ -138,8 +134,23 @@ RSpec.describe ReviewableUser, type: :model do
it "optionally sends email with reject reason" do
SiteSetting.must_approve_users = true
- Jobs::CriticalUserEmail.any_instance.expects(:execute).with({ type: :signup_after_reject, user_id: reviewable.target_id, reject_reason: "reject reason" }).once
- reviewable.perform(moderator, :delete_user_block, reject_reason: "reject reason", send_email: true)
+ Jobs::CriticalUserEmail
+ .any_instance
+ .expects(:execute)
+ .with(
+ {
+ type: :signup_after_reject,
+ user_id: reviewable.target_id,
+ reject_reason: "reject reason",
+ },
+ )
+ .once
+ reviewable.perform(
+ moderator,
+ :delete_user_block,
+ reject_reason: "reject reason",
+ send_email: true,
+ )
end
it "allows us to reject a user who has posts" do
@@ -188,7 +199,7 @@ RSpec.describe ReviewableUser, type: :model do
end
end
- describe 'when must_approve_users is true' do
+ describe "when must_approve_users is true" do
before do
SiteSetting.must_approve_users = true
Jobs.run_immediately!
@@ -210,27 +221,32 @@ RSpec.describe ReviewableUser, type: :model do
it "doesn't enqueue a 'signup after approval' email if must_approve_users is false" do
SiteSetting.must_approve_users = false
- expect_not_enqueued_with(job: :critical_user_email, args: { type: :signup_after_approval }) do
- @reviewable.perform(admin, :approve_user)
- end
+ expect_not_enqueued_with(
+ job: :critical_user_email,
+ args: {
+ type: :signup_after_approval,
+ },
+ ) { @reviewable.perform(admin, :approve_user) }
end
end
- it 'triggers a extensibility event' do
+ it "triggers a extensibility event" do
user && admin # bypass the user_created event
- event = DiscourseEvent.track_events {
- ReviewableUser.find_by(target: user).perform(admin, :approve_user)
- }.first
+ event =
+ DiscourseEvent
+ .track_events { ReviewableUser.find_by(target: user).perform(admin, :approve_user) }
+ .first
expect(event[:event_name]).to eq(:user_approved)
expect(event[:params].first).to eq(user)
end
- it 'triggers a extensibility event' do
+ it "triggers a extensibility event" do
user && admin # bypass the user_created event
- event = DiscourseEvent.track_events {
- ReviewableUser.find_by(target: user).perform(admin, :approve_user)
- }.first
+ event =
+ DiscourseEvent
+ .track_events { ReviewableUser.find_by(target: user).perform(admin, :approve_user) }
+ .first
expect(event[:event_name]).to eq(:user_approved)
expect(event[:params].first).to eq(user)
diff --git a/spec/models/s3_region_site_setting_spec.rb b/spec/models/s3_region_site_setting_spec.rb
index ec70f94252b..109edb26c95 100644
--- a/spec/models/s3_region_site_setting_spec.rb
+++ b/spec/models/s3_region_site_setting_spec.rb
@@ -1,15 +1,13 @@
# frozen_string_literal: true
RSpec.describe S3RegionSiteSetting do
-
- describe 'valid_value?' do
- it 'returns true for a valid S3 region' do
- expect(S3RegionSiteSetting.valid_value?('us-west-1')).to eq(true)
+ describe "valid_value?" do
+ it "returns true for a valid S3 region" do
+ expect(S3RegionSiteSetting.valid_value?("us-west-1")).to eq(true)
end
- it 'returns false for an invalid S3 region' do
- expect(S3RegionSiteSetting.valid_value?('the-moon')).to eq(false)
+ it "returns false for an invalid S3 region" do
+ expect(S3RegionSiteSetting.valid_value?("the-moon")).to eq(false)
end
end
-
end
diff --git a/spec/models/screened_email_spec.rb b/spec/models/screened_email_spec.rb
index 11045500e8d..802b9aa83f1 100644
--- a/spec/models/screened_email_spec.rb
+++ b/spec/models/screened_email_spec.rb
@@ -1,8 +1,8 @@
# frozen_string_literal: true
RSpec.describe ScreenedEmail do
- let(:email) { 'block@spamfromhome.org' }
- let(:similar_email) { 'bl0ck@spamfromhome.org' }
+ let(:email) { "block@spamfromhome.org" }
+ let(:similar_email) { "bl0ck@spamfromhome.org" }
describe "new record" do
it "sets a default action_type" do
@@ -16,21 +16,21 @@ RSpec.describe ScreenedEmail do
end
it "downcases the email" do
- s = ScreenedEmail.create(email: 'SPAMZ@EXAMPLE.COM')
- expect(s.email).to eq('spamz@example.com')
+ s = ScreenedEmail.create(email: "SPAMZ@EXAMPLE.COM")
+ expect(s.email).to eq("spamz@example.com")
end
end
- describe '#block' do
- context 'when email is not being blocked' do
- it 'creates a new record with default action of :block' do
+ describe "#block" do
+ context "when email is not being blocked" do
+ it "creates a new record with default action of :block" do
record = ScreenedEmail.block(email)
expect(record).not_to be_new_record
expect(record.email).to eq(email)
expect(record.action_type).to eq(ScreenedEmail.actions[:block])
end
- it 'lets action_type be overridden' do
+ it "lets action_type be overridden" do
record = ScreenedEmail.block(email, action_type: ScreenedEmail.actions[:do_nothing])
expect(record).not_to be_new_record
expect(record.email).to eq(email)
@@ -38,7 +38,7 @@ RSpec.describe ScreenedEmail do
end
end
- context 'when email is already being blocked' do
+ context "when email is already being blocked" do
let!(:existing) { Fabricate(:screened_email, email: email) }
it "doesn't create a new record" do
@@ -51,15 +51,15 @@ RSpec.describe ScreenedEmail do
end
end
- describe '#should_block?' do
+ describe "#should_block?" do
subject { ScreenedEmail.should_block?(email) }
it "automatically blocks via email canonicalization" do
SiteSetting.levenshtein_distance_spammer_emails = 0
- ScreenedEmail.block('bad.acTor+1@gmail.com')
- ScreenedEmail.block('bad.actOr+2@gmail.com')
+ ScreenedEmail.block("bad.acTor+1@gmail.com")
+ ScreenedEmail.block("bad.actOr+2@gmail.com")
- expect(ScreenedEmail.should_block?('b.a.dactor@gmail.com')).to eq(true)
+ expect(ScreenedEmail.should_block?("b.a.dactor@gmail.com")).to eq(true)
end
it "returns false if a record with the email doesn't exist" do
@@ -93,13 +93,17 @@ RSpec.describe ScreenedEmail do
end
context "when action_type is :block" do
- let!(:screened_email) { Fabricate(:screened_email, email: email, action_type: ScreenedEmail.actions[:block]) }
+ let!(:screened_email) do
+ Fabricate(:screened_email, email: email, action_type: ScreenedEmail.actions[:block])
+ end
it { is_expected.to eq(true) }
include_examples "when a ScreenedEmail record matches"
end
context "when action_type is :do_nothing" do
- let!(:screened_email) { Fabricate(:screened_email, email: email, action_type: ScreenedEmail.actions[:do_nothing]) }
+ let!(:screened_email) do
+ Fabricate(:screened_email, email: email, action_type: ScreenedEmail.actions[:do_nothing])
+ end
it { is_expected.to eq(false) }
include_examples "when a ScreenedEmail record matches"
end
diff --git a/spec/models/screened_ip_address_spec.rb b/spec/models/screened_ip_address_spec.rb
index e016cf65554..4e277a08ccf 100644
--- a/spec/models/screened_ip_address_spec.rb
+++ b/spec/models/screened_ip_address_spec.rb
@@ -1,40 +1,52 @@
# frozen_string_literal: true
RSpec.describe ScreenedIpAddress do
- let(:ip_address) { '99.232.23.124' }
+ let(:ip_address) { "99.232.23.124" }
let(:valid_params) { { ip_address: ip_address } }
- describe 'new record' do
- it 'sets a default action_type' do
- expect(described_class.create(valid_params).action_type).to eq(described_class.actions[:block])
+ describe "new record" do
+ it "sets a default action_type" do
+ expect(described_class.create(valid_params).action_type).to eq(
+ described_class.actions[:block],
+ )
end
- it 'sets an error when ip_address is invalid' do
- expect(described_class.create(valid_params.merge(ip_address: '99.99.99')).errors[:ip_address]).to be_present
+ it "sets an error when ip_address is invalid" do
+ expect(
+ described_class.create(valid_params.merge(ip_address: "99.99.99")).errors[:ip_address],
+ ).to be_present
end
- it 'can set action_type using the action_name virtual attribute' do
- expect(described_class.new(valid_params.merge(action_name: :do_nothing)).action_type).to eq(described_class.actions[:do_nothing])
- expect(described_class.new(valid_params.merge(action_name: :block)).action_type).to eq(described_class.actions[:block])
- expect(described_class.new(valid_params.merge(action_name: 'do_nothing')).action_type).to eq(described_class.actions[:do_nothing])
- expect(described_class.new(valid_params.merge(action_name: 'block')).action_type).to eq(described_class.actions[:block])
+ it "can set action_type using the action_name virtual attribute" do
+ expect(described_class.new(valid_params.merge(action_name: :do_nothing)).action_type).to eq(
+ described_class.actions[:do_nothing],
+ )
+ expect(described_class.new(valid_params.merge(action_name: :block)).action_type).to eq(
+ described_class.actions[:block],
+ )
+ expect(described_class.new(valid_params.merge(action_name: "do_nothing")).action_type).to eq(
+ described_class.actions[:do_nothing],
+ )
+ expect(described_class.new(valid_params.merge(action_name: "block")).action_type).to eq(
+ described_class.actions[:block],
+ )
end
- it 'raises a useful exception when action is invalid' do
- expect {
- described_class.new(valid_params.merge(action_name: 'dance'))
- }.to raise_error(ArgumentError)
+ it "raises a useful exception when action is invalid" do
+ expect { described_class.new(valid_params.merge(action_name: "dance")) }.to raise_error(
+ ArgumentError,
+ )
end
- it 'raises a useful exception when action is nil' do
- expect {
- described_class.new(valid_params.merge(action_name: nil))
- }.to raise_error(ArgumentError)
+ it "raises a useful exception when action is nil" do
+ expect { described_class.new(valid_params.merge(action_name: nil)) }.to raise_error(
+ ArgumentError,
+ )
end
- it 'returns a useful error if ip address matches an existing record' do
- ScreenedIpAddress.create(ip_address: '2600:387:b:f::7a/128', action_name: :block)
- r = ScreenedIpAddress.new(ip_address: '2600:387:b:f::7a', action_name: :block)
+ it "returns a useful error if ip address matches an existing record" do
+ ScreenedIpAddress.create(ip_address: "2600:387:b:f::7a/128", action_name: :block)
+ r = ScreenedIpAddress.new(ip_address: "2600:387:b:f::7a", action_name: :block)
expect(r.save).to eq(false)
expect(r.errors[:ip_address]).to be_present
end
@@ -46,11 +58,15 @@ RSpec.describe ScreenedIpAddress do
end
it "returns ip_address without mask if there is no mask" do
- expect(described_class.new(ip_address: "123.123.23.22").ip_address_with_mask).to eq("123.123.23.22")
+ expect(described_class.new(ip_address: "123.123.23.22").ip_address_with_mask).to eq(
+ "123.123.23.22",
+ )
end
it "returns ip_address with mask" do
- expect(described_class.new(ip_address: "123.12.0.0/16").ip_address_with_mask).to eq("123.12.0.0/16")
+ expect(described_class.new(ip_address: "123.12.0.0/16").ip_address_with_mask).to eq(
+ "123.12.0.0/16",
+ )
end
end
@@ -79,12 +95,12 @@ RSpec.describe ScreenedIpAddress do
end
it "translates * characters" do
- test_good_value("123.*.*.*", "123.0.0.0/8")
- test_good_value("123.12.*.*", "123.12.0.0/16")
- test_good_value("123.12.1.*", "123.12.1.0/24")
+ test_good_value("123.*.*.*", "123.0.0.0/8")
+ test_good_value("123.12.*.*", "123.12.0.0/16")
+ test_good_value("123.12.1.*", "123.12.1.0/24")
test_good_value("123.12.*.*/16", "123.12.0.0/16")
- test_good_value("123.12.*", "123.12.0.0/16")
- test_good_value("123.*", "123.0.0.0/8")
+ test_good_value("123.12.*", "123.12.0.0/16")
+ test_good_value("123.*", "123.0.0.0/8")
end
it "handles bad input" do
@@ -98,194 +114,281 @@ RSpec.describe ScreenedIpAddress do
end
end
- describe '#watch' do
- context 'when ip_address is not being watched' do
- it 'should create a new record' do
+ describe "#watch" do
+ context "when ip_address is not being watched" do
+ it "should create a new record" do
record = described_class.watch(ip_address)
expect(record).not_to be_new_record
expect(record.action_type).to eq(described_class.actions[:block])
end
- it 'lets action_type be overridden' do
- record = described_class.watch(ip_address, action_type: described_class.actions[:do_nothing])
+ it "lets action_type be overridden" do
+ record =
+ described_class.watch(ip_address, action_type: described_class.actions[:do_nothing])
expect(record).not_to be_new_record
expect(record.action_type).to eq(described_class.actions[:do_nothing])
end
it "a record with subnet mask exists, but doesn't match" do
- existing = Fabricate(:screened_ip_address, ip_address: '99.232.23.124/24')
- expect { described_class.watch('99.232.55.124') }.to change { described_class.count }
+ existing = Fabricate(:screened_ip_address, ip_address: "99.232.23.124/24")
+ expect { described_class.watch("99.232.55.124") }.to change { described_class.count }
end
it "a record with exact matching exists, but doesn't match" do
- existing = Fabricate(:screened_ip_address, ip_address: '99.232.23.124')
- expect { described_class.watch('99.232.23.123') }.to change { described_class.count }
+ existing = Fabricate(:screened_ip_address, ip_address: "99.232.23.124")
+ expect { described_class.watch("99.232.23.123") }.to change { described_class.count }
end
end
- context 'when ip_address is already being watched' do
- shared_examples 'exact match of ip address' do
- it 'should not create a new record' do
+ context "when ip_address is already being watched" do
+ shared_examples "exact match of ip address" do
+ it "should not create a new record" do
expect { described_class.watch(ip_address_arg) }.to_not change { described_class.count }
end
- it 'returns the existing record' do
+ it "returns the existing record" do
expect(described_class.watch(ip_address_arg)).to eq(existing)
end
end
- context 'when using exact match' do
+ context "when using exact match" do
fab!(:existing) { Fabricate(:screened_ip_address) }
let(:ip_address_arg) { existing.ip_address }
- include_examples 'exact match of ip address'
+ include_examples "exact match of ip address"
end
- context 'when using subnet mask 255.255.255.0' do
- fab!(:existing) { Fabricate(:screened_ip_address, ip_address: '99.232.23.124/24') }
+ context "when using subnet mask 255.255.255.0" do
+ fab!(:existing) { Fabricate(:screened_ip_address, ip_address: "99.232.23.124/24") }
- context 'with exact address' do
- let(:ip_address_arg) { '99.232.23.124' }
- include_examples 'exact match of ip address'
+ context "with exact address" do
+ let(:ip_address_arg) { "99.232.23.124" }
+ include_examples "exact match of ip address"
end
- context 'with address in same subnet' do
- let(:ip_address_arg) { '99.232.23.135' }
- include_examples 'exact match of ip address'
+ context "with address in same subnet" do
+ let(:ip_address_arg) { "99.232.23.135" }
+ include_examples "exact match of ip address"
end
end
end
it "doesn't block 10.0.0.0/8" do
- expect(described_class.watch('10.0.0.0').action_type).to eq(described_class.actions[:do_nothing])
- expect(described_class.watch('10.0.0.1').action_type).to eq(described_class.actions[:do_nothing])
- expect(described_class.watch('10.10.125.111').action_type).to eq(described_class.actions[:do_nothing])
+ expect(described_class.watch("10.0.0.0").action_type).to eq(
+ described_class.actions[:do_nothing],
+ )
+ expect(described_class.watch("10.0.0.1").action_type).to eq(
+ described_class.actions[:do_nothing],
+ )
+ expect(described_class.watch("10.10.125.111").action_type).to eq(
+ described_class.actions[:do_nothing],
+ )
end
it "doesn't block 192.168.0.0/16" do
- expect(described_class.watch('192.168.0.5').action_type).to eq(described_class.actions[:do_nothing])
- expect(described_class.watch('192.168.10.1').action_type).to eq(described_class.actions[:do_nothing])
+ expect(described_class.watch("192.168.0.5").action_type).to eq(
+ described_class.actions[:do_nothing],
+ )
+ expect(described_class.watch("192.168.10.1").action_type).to eq(
+ described_class.actions[:do_nothing],
+ )
end
it "doesn't block 127.0.0.0/8" do
- expect(described_class.watch('127.0.0.1').action_type).to eq(described_class.actions[:do_nothing])
+ expect(described_class.watch("127.0.0.1").action_type).to eq(
+ described_class.actions[:do_nothing],
+ )
end
it "doesn't block fc00::/7 addresses (IPv6)" do
- expect(described_class.watch('fd12:db8::ff00:42:8329').action_type).to eq(described_class.actions[:do_nothing])
+ expect(described_class.watch("fd12:db8::ff00:42:8329").action_type).to eq(
+ described_class.actions[:do_nothing],
+ )
end
end
- describe '#should_block?' do
- it 'returns false when record does not exist' do
+ describe "#should_block?" do
+ it "returns false when record does not exist" do
expect(described_class.should_block?(ip_address)).to eq(false)
end
- it 'returns false when no record matches' do
- screened_ip_address = Fabricate(:screened_ip_address, ip_address: '111.234.23.11', action_type: described_class.actions[:block])
- expect(described_class.should_block?('222.12.12.12')).to eq(false)
+ it "returns false when no record matches" do
+ screened_ip_address =
+ Fabricate(
+ :screened_ip_address,
+ ip_address: "111.234.23.11",
+ action_type: described_class.actions[:block],
+ )
+ expect(described_class.should_block?("222.12.12.12")).to eq(false)
expect(screened_ip_address.reload.match_count).to eq(0)
end
- it 'returns false if a more specific recrord matches and action is :do_nothing' do
- Fabricate(:screened_ip_address, ip_address: '111.234.23.0/24', action_type: described_class.actions[:block])
- Fabricate(:screened_ip_address, ip_address: '111.234.23.11', action_type: described_class.actions[:do_nothing])
- expect(described_class.should_block?('111.234.23.11')).to eq(false)
- expect(described_class.should_block?('111.234.23.12')).to eq(true)
+ it "returns false if a more specific recrord matches and action is :do_nothing" do
+ Fabricate(
+ :screened_ip_address,
+ ip_address: "111.234.23.0/24",
+ action_type: described_class.actions[:block],
+ )
+ Fabricate(
+ :screened_ip_address,
+ ip_address: "111.234.23.11",
+ action_type: described_class.actions[:do_nothing],
+ )
+ expect(described_class.should_block?("111.234.23.11")).to eq(false)
+ expect(described_class.should_block?("111.234.23.12")).to eq(true)
- Fabricate(:screened_ip_address, ip_address: '222.234.23.0/24', action_type: described_class.actions[:do_nothing])
- Fabricate(:screened_ip_address, ip_address: '222.234.23.11', action_type: described_class.actions[:block])
- expect(described_class.should_block?('222.234.23.11')).to eq(true)
- expect(described_class.should_block?('222.234.23.12')).to eq(false)
+ Fabricate(
+ :screened_ip_address,
+ ip_address: "222.234.23.0/24",
+ action_type: described_class.actions[:do_nothing],
+ )
+ Fabricate(
+ :screened_ip_address,
+ ip_address: "222.234.23.11",
+ action_type: described_class.actions[:block],
+ )
+ expect(described_class.should_block?("222.234.23.11")).to eq(true)
+ expect(described_class.should_block?("222.234.23.12")).to eq(false)
end
- context 'with IPv4' do
- it 'returns false when when record matches and action is :do_nothing' do
- screened_ip_address = Fabricate(:screened_ip_address, ip_address: '111.234.23.11', action_type: described_class.actions[:do_nothing])
- expect(described_class.should_block?('111.234.23.11')).to eq(false)
+ context "with IPv4" do
+ it "returns false when when record matches and action is :do_nothing" do
+ screened_ip_address =
+ Fabricate(
+ :screened_ip_address,
+ ip_address: "111.234.23.11",
+ action_type: described_class.actions[:do_nothing],
+ )
+ expect(described_class.should_block?("111.234.23.11")).to eq(false)
expect(screened_ip_address.reload.match_count).to eq(0)
end
- it 'returns true when when record matches and action is :block' do
- screened_ip_address = Fabricate(:screened_ip_address, ip_address: '111.234.23.11', action_type: described_class.actions[:block])
- expect(described_class.should_block?('111.234.23.11')).to eq(true)
+ it "returns true when when record matches and action is :block" do
+ screened_ip_address =
+ Fabricate(
+ :screened_ip_address,
+ ip_address: "111.234.23.11",
+ action_type: described_class.actions[:block],
+ )
+ expect(described_class.should_block?("111.234.23.11")).to eq(true)
expect(screened_ip_address.reload.match_count).to eq(1)
end
end
- context 'with IPv6' do
- it 'returns false when when record matches and action is :do_nothing' do
- screened_ip_address = Fabricate(:screened_ip_address, ip_address: '2001:db8::ff00:42:8329', action_type: described_class.actions[:do_nothing])
- expect(described_class.should_block?('2001:db8::ff00:42:8329')).to eq(false)
+ context "with IPv6" do
+ it "returns false when when record matches and action is :do_nothing" do
+ screened_ip_address =
+ Fabricate(
+ :screened_ip_address,
+ ip_address: "2001:db8::ff00:42:8329",
+ action_type: described_class.actions[:do_nothing],
+ )
+ expect(described_class.should_block?("2001:db8::ff00:42:8329")).to eq(false)
expect(screened_ip_address.reload.match_count).to eq(0)
end
- it 'returns true when when record matches and action is :block' do
- screened_ip_address = Fabricate(:screened_ip_address, ip_address: '2001:db8::ff00:42:8329', action_type: described_class.actions[:block])
- expect(described_class.should_block?('2001:db8::ff00:42:8329')).to eq(true)
+ it "returns true when when record matches and action is :block" do
+ screened_ip_address =
+ Fabricate(
+ :screened_ip_address,
+ ip_address: "2001:db8::ff00:42:8329",
+ action_type: described_class.actions[:block],
+ )
+ expect(described_class.should_block?("2001:db8::ff00:42:8329")).to eq(true)
expect(screened_ip_address.reload.match_count).to eq(1)
end
end
end
- describe '#is_allowed?' do
- it 'returns false when record does not exist' do
+ describe "#is_allowed?" do
+ it "returns false when record does not exist" do
expect(described_class.is_allowed?(ip_address)).to eq(false)
end
- it 'returns false when no record matches' do
- screened_ip_address = Fabricate(:screened_ip_address, ip_address: '111.234.23.11', action_type: described_class.actions[:do_nothing])
- expect(described_class.is_allowed?('222.12.12.12')).to eq(false)
+ it "returns false when no record matches" do
+ screened_ip_address =
+ Fabricate(
+ :screened_ip_address,
+ ip_address: "111.234.23.11",
+ action_type: described_class.actions[:do_nothing],
+ )
+ expect(described_class.is_allowed?("222.12.12.12")).to eq(false)
expect(screened_ip_address.reload.match_count).to eq(0)
end
- context 'with IPv4' do
- it 'returns true when when record matches and action is :do_nothing' do
- screened_ip_address = Fabricate(:screened_ip_address, ip_address: '111.234.23.11', action_type: described_class.actions[:do_nothing])
- expect(described_class.is_allowed?('111.234.23.11')).to eq(true)
+ context "with IPv4" do
+ it "returns true when when record matches and action is :do_nothing" do
+ screened_ip_address =
+ Fabricate(
+ :screened_ip_address,
+ ip_address: "111.234.23.11",
+ action_type: described_class.actions[:do_nothing],
+ )
+ expect(described_class.is_allowed?("111.234.23.11")).to eq(true)
expect(screened_ip_address.reload.match_count).to eq(1)
end
- it 'returns false when when record matches and action is :block' do
- screened_ip_address = Fabricate(:screened_ip_address, ip_address: '111.234.23.11', action_type: described_class.actions[:block])
- expect(described_class.is_allowed?('111.234.23.11')).to eq(false)
+ it "returns false when when record matches and action is :block" do
+ screened_ip_address =
+ Fabricate(
+ :screened_ip_address,
+ ip_address: "111.234.23.11",
+ action_type: described_class.actions[:block],
+ )
+ expect(described_class.is_allowed?("111.234.23.11")).to eq(false)
expect(screened_ip_address.reload.match_count).to eq(0)
end
end
- context 'with IPv6' do
- it 'returns true when when record matches and action is :do_nothing' do
- screened_ip_address = Fabricate(:screened_ip_address, ip_address: '2001:db8::ff00:42:8329', action_type: described_class.actions[:do_nothing])
- expect(described_class.is_allowed?('2001:db8::ff00:42:8329')).to eq(true)
+ context "with IPv6" do
+ it "returns true when when record matches and action is :do_nothing" do
+ screened_ip_address =
+ Fabricate(
+ :screened_ip_address,
+ ip_address: "2001:db8::ff00:42:8329",
+ action_type: described_class.actions[:do_nothing],
+ )
+ expect(described_class.is_allowed?("2001:db8::ff00:42:8329")).to eq(true)
expect(screened_ip_address.reload.match_count).to eq(1)
end
- it 'returns false when when record matches and action is :block' do
- screened_ip_address = Fabricate(:screened_ip_address, ip_address: '2001:db8::ff00:42:8329', action_type: described_class.actions[:block])
- expect(described_class.is_allowed?('2001:db8::ff00:42:8329')).to eq(false)
+ it "returns false when when record matches and action is :block" do
+ screened_ip_address =
+ Fabricate(
+ :screened_ip_address,
+ ip_address: "2001:db8::ff00:42:8329",
+ action_type: described_class.actions[:block],
+ )
+ expect(described_class.is_allowed?("2001:db8::ff00:42:8329")).to eq(false)
expect(screened_ip_address.reload.match_count).to eq(0)
end
end
end
- describe '#block_admin_login?' do
- context 'when no allow_admin records exist' do
+ describe "#block_admin_login?" do
+ context "when no allow_admin records exist" do
it "returns false when use_admin_ip_allowlist is false" do
- expect(described_class.block_admin_login?(Fabricate.build(:user), '123.12.12.12')).to eq(false)
+ expect(described_class.block_admin_login?(Fabricate.build(:user), "123.12.12.12")).to eq(
+ false,
+ )
end
context "when use_admin_ip_allowlist is true" do
before { SiteSetting.use_admin_ip_allowlist = true }
it "returns false when user is nil" do
- expect(described_class.block_admin_login?(nil, '123.12.12.12')).to eq(false)
+ expect(described_class.block_admin_login?(nil, "123.12.12.12")).to eq(false)
end
it "returns false for non-admin user" do
- expect(described_class.block_admin_login?(Fabricate.build(:user), '123.12.12.12')).to eq(false)
+ expect(described_class.block_admin_login?(Fabricate.build(:user), "123.12.12.12")).to eq(
+ false,
+ )
end
it "returns false for admin user" do
- expect(described_class.block_admin_login?(Fabricate.build(:admin), '123.12.12.12')).to eq(false)
+ expect(described_class.block_admin_login?(Fabricate.build(:admin), "123.12.12.12")).to eq(
+ false,
+ )
end
it "returns false for admin user and ip_address arg is nil" do
@@ -294,14 +397,20 @@ RSpec.describe ScreenedIpAddress do
end
end
- context 'when allow_admin record exists' do
+ context "when allow_admin record exists" do
before do
- @permitted_ip_address = '111.234.23.11'
- Fabricate(:screened_ip_address, ip_address: @permitted_ip_address, action_type: described_class.actions[:allow_admin])
+ @permitted_ip_address = "111.234.23.11"
+ Fabricate(
+ :screened_ip_address,
+ ip_address: @permitted_ip_address,
+ action_type: described_class.actions[:allow_admin],
+ )
end
it "returns false when use_admin_ip_allowlist is false" do
- expect(described_class.block_admin_login?(Fabricate.build(:admin), '123.12.12.12')).to eq(false)
+ expect(described_class.block_admin_login?(Fabricate.build(:admin), "123.12.12.12")).to eq(
+ false,
+ )
end
context "when use_admin_ip_allowlist is true" do
@@ -312,26 +421,34 @@ RSpec.describe ScreenedIpAddress do
end
it "returns false for an admin user at the allowed ip address" do
- expect(described_class.block_admin_login?(Fabricate.build(:admin), @permitted_ip_address)).to eq(false)
+ expect(
+ described_class.block_admin_login?(Fabricate.build(:admin), @permitted_ip_address),
+ ).to eq(false)
end
it "returns true for an admin user at another ip address" do
- expect(described_class.block_admin_login?(Fabricate.build(:admin), '123.12.12.12')).to eq(true)
+ expect(described_class.block_admin_login?(Fabricate.build(:admin), "123.12.12.12")).to eq(
+ true,
+ )
end
it "returns false for regular user at allowed ip address" do
- expect(described_class.block_admin_login?(Fabricate.build(:user), @permitted_ip_address)).to eq(false)
+ expect(
+ described_class.block_admin_login?(Fabricate.build(:user), @permitted_ip_address),
+ ).to eq(false)
end
it "returns false for regular user at another ip address" do
- expect(described_class.block_admin_login?(Fabricate.build(:user), '123.12.12.12')).to eq(false)
+ expect(described_class.block_admin_login?(Fabricate.build(:user), "123.12.12.12")).to eq(
+ false,
+ )
end
end
end
end
- describe '#roll_up' do
- it 'rolls up IPv4 addresses' do
+ describe "#roll_up" do
+ it "rolls up IPv4 addresses" do
SiteSetting.min_ban_entries_for_roll_up = 3
# this should not be touched
@@ -352,7 +469,7 @@ RSpec.describe ScreenedIpAddress do
expect { ScreenedIpAddress.roll_up }.not_to change { ScreenedIpAddress.count }
end
- it 'rolls up IPv6 addresses' do
+ it "rolls up IPv6 addresses" do
SiteSetting.min_ban_entries_for_roll_up = 3
Fabricate(:screened_ip_address, ip_address: "2001:db8:3333:4441:5555:6666:7777:8888")
@@ -364,7 +481,11 @@ RSpec.describe ScreenedIpAddress do
Fabricate(:screened_ip_address, ip_address: "2001:db8:3333:4441:5555:6666:7777:888a/96")
expect { ScreenedIpAddress.roll_up }.to change { ScreenedIpAddress.count }.by(-2)
expect(ScreenedIpAddress.pluck(:ip_address)).to include("2001:db8:3333:4441::/64")
- expect(ScreenedIpAddress.pluck(:ip_address)).not_to include("2001:db8:3333:4441:5555:6666:7777:8888", "2001:db8:3333:4441:5555:6666:7777:8889", "2001:db8:3333:4441:5555:6666:7777:888a")
+ expect(ScreenedIpAddress.pluck(:ip_address)).not_to include(
+ "2001:db8:3333:4441:5555:6666:7777:8888",
+ "2001:db8:3333:4441:5555:6666:7777:8889",
+ "2001:db8:3333:4441:5555:6666:7777:888a",
+ )
# expect roll up to be stable
expect { ScreenedIpAddress.roll_up }.not_to change { ScreenedIpAddress.count }
@@ -375,7 +496,11 @@ RSpec.describe ScreenedIpAddress do
Fabricate(:screened_ip_address, ip_address: "2001:db8:3333:4443::/64")
expect { ScreenedIpAddress.roll_up }.to change { ScreenedIpAddress.count }.by(-2)
expect(ScreenedIpAddress.pluck(:ip_address)).to include("2001:db8:3333:4440::/60")
- expect(ScreenedIpAddress.pluck(:ip_address)).not_to include("2001:db8:3333:4441::/64", "2001:db8:3333:4442::/64", "2001:db8:3333:4443::/64")
+ expect(ScreenedIpAddress.pluck(:ip_address)).not_to include(
+ "2001:db8:3333:4441::/64",
+ "2001:db8:3333:4442::/64",
+ "2001:db8:3333:4443::/64",
+ )
# expect roll up to be stable
expect { ScreenedIpAddress.roll_up }.not_to change { ScreenedIpAddress.count }
diff --git a/spec/models/screened_url_spec.rb b/spec/models/screened_url_spec.rb
index 430b255c124..cfcc685ec50 100644
--- a/spec/models/screened_url_spec.rb
+++ b/spec/models/screened_url_spec.rb
@@ -1,14 +1,16 @@
# frozen_string_literal: true
RSpec.describe ScreenedUrl do
- let(:url) { 'http://shopppping.com/bad/drugz' }
- let(:domain) { 'shopppping.com' }
+ let(:url) { "http://shopppping.com/bad/drugz" }
+ let(:domain) { "shopppping.com" }
let(:valid_params) { { url: url, domain: domain } }
describe "new record" do
it "sets a default action_type" do
- expect(described_class.create(valid_params).action_type).to eq(described_class.actions[:do_nothing])
+ expect(described_class.create(valid_params).action_type).to eq(
+ described_class.actions[:do_nothing],
+ )
end
it "last_match_at is null" do
@@ -22,101 +24,115 @@ RSpec.describe ScreenedUrl do
end
end
- describe 'normalize' do
+ describe "normalize" do
let(:record) { described_class.new(@params) }
- subject { record.normalize; record }
+ subject do
+ record.normalize
+ record
+ end
- ['http://', 'HTTP://', 'https://', 'HTTPS://'].each do |prefix|
+ %w[http:// HTTP:// https:// HTTPS://].each do |prefix|
it "strips #{prefix}" do
- @params = valid_params.merge(url: url.gsub('http://', prefix))
- expect(subject.url).to eq(url.gsub('http://', ''))
+ @params = valid_params.merge(url: url.gsub("http://", prefix))
+ expect(subject.url).to eq(url.gsub("http://", ""))
end
end
it "strips trailing slash" do
- @params = valid_params.merge(url: 'silverbullet.in/')
- expect(subject.url).to eq('silverbullet.in')
+ @params = valid_params.merge(url: "silverbullet.in/")
+ expect(subject.url).to eq("silverbullet.in")
end
it "strips trailing slashes" do
- @params = valid_params.merge(url: 'silverbullet.in/buy///')
- expect(subject.url).to eq('silverbullet.in/buy')
+ @params = valid_params.merge(url: "silverbullet.in/buy///")
+ expect(subject.url).to eq("silverbullet.in/buy")
end
it "downcases domains" do
- record1 = described_class.new(valid_params.merge(domain: 'DuB30.com', url: 'DuB30.com/Gems/Gems-of-Power'))
+ record1 =
+ described_class.new(
+ valid_params.merge(domain: "DuB30.com", url: "DuB30.com/Gems/Gems-of-Power"),
+ )
record1.normalize
- expect(record1.domain).to eq('dub30.com')
- expect(record1.url).to eq('dub30.com/Gems/Gems-of-Power')
+ expect(record1.domain).to eq("dub30.com")
+ expect(record1.url).to eq("dub30.com/Gems/Gems-of-Power")
expect(record1).to be_valid
- record2 = described_class.new(valid_params.merge(domain: 'DuB30.com', url: 'DuB30.com'))
+ record2 = described_class.new(valid_params.merge(domain: "DuB30.com", url: "DuB30.com"))
record2.normalize
- expect(record2.domain).to eq('dub30.com')
- expect(record2.url).to eq('dub30.com')
+ expect(record2.domain).to eq("dub30.com")
+ expect(record2.url).to eq("dub30.com")
expect(record2).to be_valid
end
it "strips www. from domains" do
- record1 = described_class.new(valid_params.merge(domain: 'www.DuB30.com', url: 'www.DuB30.com/Gems/Gems-of-Power'))
+ record1 =
+ described_class.new(
+ valid_params.merge(domain: "www.DuB30.com", url: "www.DuB30.com/Gems/Gems-of-Power"),
+ )
record1.normalize
- expect(record1.domain).to eq('dub30.com')
+ expect(record1.domain).to eq("dub30.com")
- record2 = described_class.new(valid_params.merge(domain: 'WWW.DuB30.cOM', url: 'WWW.DuB30.com/Gems/Gems-of-Power'))
+ record2 =
+ described_class.new(
+ valid_params.merge(domain: "WWW.DuB30.cOM", url: "WWW.DuB30.com/Gems/Gems-of-Power"),
+ )
record2.normalize
- expect(record2.domain).to eq('dub30.com')
+ expect(record2.domain).to eq("dub30.com")
- record3 = described_class.new(valid_params.merge(domain: 'www.trolls.spammers.com', url: 'WWW.DuB30.com/Gems/Gems-of-Power'))
+ record3 =
+ described_class.new(
+ valid_params.merge(
+ domain: "www.trolls.spammers.com",
+ url: "WWW.DuB30.com/Gems/Gems-of-Power",
+ ),
+ )
record3.normalize
- expect(record3.domain).to eq('trolls.spammers.com')
+ expect(record3.domain).to eq("trolls.spammers.com")
end
it "doesn't modify the url argument" do
- expect {
- described_class.new(valid_params).normalize
- }.to_not change { valid_params[:url] }
+ expect { described_class.new(valid_params).normalize }.to_not change { valid_params[:url] }
end
it "doesn't modify the domain argument" do
params = valid_params.merge(domain: domain.upcase)
- expect {
- described_class.new(params).normalize
- }.to_not change { params[:domain] }
+ expect { described_class.new(params).normalize }.to_not change { params[:domain] }
end
end
- describe 'find_match' do
- it 'returns nil when there is no match' do
- expect(described_class.find_match('http://spamspot.com/buy/it')).to eq(nil)
+ describe "find_match" do
+ it "returns nil when there is no match" do
+ expect(described_class.find_match("http://spamspot.com/buy/it")).to eq(nil)
end
- it 'returns the record when there is an exact match' do
+ it "returns the record when there is an exact match" do
match = described_class.create(valid_params)
expect(described_class.find_match(valid_params[:url])).to eq(match)
end
- it 'ignores case of the domain' do
- match = described_class.create(valid_params.merge(url: 'spamexchange.com/Good/Things'))
+ it "ignores case of the domain" do
+ match = described_class.create(valid_params.merge(url: "spamexchange.com/Good/Things"))
expect(described_class.find_match("http://SPAMExchange.com/Good/Things")).to eq(match)
end
end
- describe '#watch' do
- context 'when url is not being blocked' do
- it 'creates a new record with default action of :do_nothing' do
+ describe "#watch" do
+ context "when url is not being blocked" do
+ it "creates a new record with default action of :do_nothing" do
record = described_class.watch(url, domain)
expect(record).not_to be_new_record
expect(record.action_type).to eq(described_class.actions[:do_nothing])
end
- it 'lets action_type be overridden' do
+ it "lets action_type be overridden" do
record = described_class.watch(url, domain, action_type: described_class.actions[:block])
expect(record).not_to be_new_record
expect(record.action_type).to eq(described_class.actions[:block])
end
end
- context 'when url is already being blocked' do
+ context "when url is already being blocked" do
let!(:existing) { Fabricate(:screened_url, url: url, domain: domain) }
it "doesn't create a new record" do
diff --git a/spec/models/search_log_spec.rb b/spec/models/search_log_spec.rb
index 773fa56f250..9c9934f6c29 100644
--- a/spec/models/search_log_spec.rb
+++ b/spec/models/search_log_spec.rb
@@ -1,27 +1,18 @@
# frozen_string_literal: true
RSpec.describe SearchLog, type: :model do
- after do
- SearchLog.clear_debounce_cache!
- end
+ after { SearchLog.clear_debounce_cache! }
describe ".log" do
context "with invalid arguments" do
it "no search type returns error" do
- status, _ = SearchLog.log(
- term: 'bounty hunter',
- search_type: :missing,
- ip_address: '127.0.0.1'
- )
+ status, _ =
+ SearchLog.log(term: "bounty hunter", search_type: :missing, ip_address: "127.0.0.1")
expect(status).to eq(:error)
end
it "no IP returns error" do
- status, _ = SearchLog.log(
- term: 'bounty hunter',
- search_type: :header,
- ip_address: nil
- )
+ status, _ = SearchLog.log(term: "bounty hunter", search_type: :header, ip_address: nil)
expect(status).to eq(:error)
end
end
@@ -29,57 +20,35 @@ RSpec.describe SearchLog, type: :model do
context "when anonymous" do
it "logs and updates the search" do
freeze_time
- action, log_id = SearchLog.log(
- term: 'jabba',
- search_type: :header,
- ip_address: '192.168.0.33'
- )
+ action, log_id =
+ SearchLog.log(term: "jabba", search_type: :header, ip_address: "192.168.0.33")
expect(action).to eq(:created)
log = SearchLog.find(log_id)
- expect(log.term).to eq('jabba')
+ expect(log.term).to eq("jabba")
expect(log.search_type).to eq(SearchLog.search_types[:header])
- expect(log.ip_address).to eq('192.168.0.33')
+ expect(log.ip_address).to eq("192.168.0.33")
- action, updated_log_id = SearchLog.log(
- term: 'jabba the hut',
- search_type: :header,
- ip_address: '192.168.0.33'
- )
+ action, updated_log_id =
+ SearchLog.log(term: "jabba the hut", search_type: :header, ip_address: "192.168.0.33")
expect(action).to eq(:updated)
expect(updated_log_id).to eq(log_id)
end
it "creates a new search with a different prefix" do
freeze_time
- action, _ = SearchLog.log(
- term: 'darth',
- search_type: :header,
- ip_address: '127.0.0.1'
- )
+ action, _ = SearchLog.log(term: "darth", search_type: :header, ip_address: "127.0.0.1")
expect(action).to eq(:created)
- action, _ = SearchLog.log(
- term: 'anakin',
- search_type: :header,
- ip_address: '127.0.0.1'
- )
+ action, _ = SearchLog.log(term: "anakin", search_type: :header, ip_address: "127.0.0.1")
expect(action).to eq(:created)
end
it "creates a new search with a different ip" do
freeze_time
- action, _ = SearchLog.log(
- term: 'darth',
- search_type: :header,
- ip_address: '127.0.0.1'
- )
+ action, _ = SearchLog.log(term: "darth", search_type: :header, ip_address: "127.0.0.1")
expect(action).to eq(:created)
- action, _ = SearchLog.log(
- term: 'darth',
- search_type: :header,
- ip_address: '127.0.0.2'
- )
+ action, _ = SearchLog.log(term: "darth", search_type: :header, ip_address: "127.0.0.2")
expect(action).to eq(:created)
end
end
@@ -89,25 +58,27 @@ RSpec.describe SearchLog, type: :model do
it "logs and updates the search" do
freeze_time
- action, log_id = SearchLog.log(
- term: 'hello',
- search_type: :full_page,
- ip_address: '192.168.0.1',
- user_id: user.id
- )
+ action, log_id =
+ SearchLog.log(
+ term: "hello",
+ search_type: :full_page,
+ ip_address: "192.168.0.1",
+ user_id: user.id,
+ )
expect(action).to eq(:created)
log = SearchLog.find(log_id)
- expect(log.term).to eq('hello')
+ expect(log.term).to eq("hello")
expect(log.search_type).to eq(SearchLog.search_types[:full_page])
expect(log.ip_address).to eq(nil)
expect(log.user_id).to eq(user.id)
- action, updated_log_id = SearchLog.log(
- term: 'hello dolly',
- search_type: :header,
- ip_address: '192.168.0.33',
- user_id: user.id
- )
+ action, updated_log_id =
+ SearchLog.log(
+ term: "hello dolly",
+ search_type: :header,
+ ip_address: "192.168.0.33",
+ user_id: user.id,
+ )
expect(action).to eq(:updated)
expect(updated_log_id).to eq(log_id)
end
@@ -115,23 +86,25 @@ RSpec.describe SearchLog, type: :model do
it "logs again if time has passed" do
freeze_time(10.minutes.ago)
- action, _ = SearchLog.log(
- term: 'hello',
- search_type: :full_page,
- ip_address: '192.168.0.1',
- user_id: user.id
- )
+ action, _ =
+ SearchLog.log(
+ term: "hello",
+ search_type: :full_page,
+ ip_address: "192.168.0.1",
+ user_id: user.id,
+ )
expect(action).to eq(:created)
freeze_time(10.minutes.from_now)
- Discourse.redis.del(SearchLog.redis_key(ip_address: '192.168.0.1', user_id: user.id))
+ Discourse.redis.del(SearchLog.redis_key(ip_address: "192.168.0.1", user_id: user.id))
- action, _ = SearchLog.log(
- term: 'hello',
- search_type: :full_page,
- ip_address: '192.168.0.1',
- user_id: user.id
- )
+ action, _ =
+ SearchLog.log(
+ term: "hello",
+ search_type: :full_page,
+ ip_address: "192.168.0.1",
+ user_id: user.id,
+ )
expect(action).to eq(:created)
end
@@ -139,20 +112,22 @@ RSpec.describe SearchLog, type: :model do
it "logs again with a different user" do
freeze_time
- action, _ = SearchLog.log(
- term: 'hello',
- search_type: :full_page,
- ip_address: '192.168.0.1',
- user_id: user.id
- )
+ action, _ =
+ SearchLog.log(
+ term: "hello",
+ search_type: :full_page,
+ ip_address: "192.168.0.1",
+ user_id: user.id,
+ )
expect(action).to eq(:created)
- action, _ = SearchLog.log(
- term: 'hello dolly',
- search_type: :full_page,
- ip_address: '192.168.0.1',
- user_id: Fabricate(:user).id
- )
+ action, _ =
+ SearchLog.log(
+ term: "hello dolly",
+ search_type: :full_page,
+ ip_address: "192.168.0.1",
+ user_id: Fabricate(:user).id,
+ )
expect(action).to eq(:created)
end
end
@@ -176,10 +151,11 @@ RSpec.describe SearchLog, type: :model do
Fabricate(:search_log, term: "ruBy", user: Fabricate(:user))
Fabricate(:search_log, term: "ruby core", ip_address: "127.0.0.3")
- Fabricate(:search_log,
+ Fabricate(
+ :search_log,
term: "ruBy",
search_type: SearchLog.search_types[:full_page],
- ip_address: "127.0.0.2"
+ ip_address: "127.0.0.2",
)
term_details = SearchLog.term_details("ruby")
@@ -189,8 +165,8 @@ RSpec.describe SearchLog, type: :model do
expect(term_header_details[:data][0][:y]).to eq(2)
SearchLog
- .where("lower(term) = ?", 'ruby')
- .where(ip_address: '127.0.0.2')
+ .where("lower(term) = ?", "ruby")
+ .where(ip_address: "127.0.0.2")
.update_all(search_result_id: 24)
term_click_through_details = SearchLog.term_details("ruby", :all, :click_through_only)
@@ -202,18 +178,18 @@ RSpec.describe SearchLog, type: :model do
describe "trending" do
fab!(:user) { Fabricate(:user) }
before do
- SearchLog.log(term: 'ruby', search_type: :header, ip_address: '127.0.0.1')
- SearchLog.log(term: 'php', search_type: :header, ip_address: '127.0.0.1')
- SearchLog.log(term: 'java', search_type: :header, ip_address: '127.0.0.1')
- SearchLog.log(term: 'ruby', search_type: :header, ip_address: '127.0.0.1', user_id: user.id)
- SearchLog.log(term: 'swift', search_type: :header, ip_address: '127.0.0.1')
- SearchLog.log(term: 'ruby', search_type: :header, ip_address: '127.0.0.2')
+ SearchLog.log(term: "ruby", search_type: :header, ip_address: "127.0.0.1")
+ SearchLog.log(term: "php", search_type: :header, ip_address: "127.0.0.1")
+ SearchLog.log(term: "java", search_type: :header, ip_address: "127.0.0.1")
+ SearchLog.log(term: "ruby", search_type: :header, ip_address: "127.0.0.1", user_id: user.id)
+ SearchLog.log(term: "swift", search_type: :header, ip_address: "127.0.0.1")
+ SearchLog.log(term: "ruby", search_type: :header, ip_address: "127.0.0.2")
end
it "considers time period" do
expect(SearchLog.trending.to_a.count).to eq(4)
- SearchLog.where(term: 'swift').update_all(created_at: 1.year.ago)
+ SearchLog.where(term: "swift").update_all(created_at: 1.year.ago)
expect(SearchLog.trending(:monthly).to_a.count).to eq(3)
end
@@ -223,9 +199,9 @@ RSpec.describe SearchLog, type: :model do
expect(top_trending.searches).to eq(3)
expect(top_trending.click_through).to eq(0)
- SearchLog.where(term: 'ruby', ip_address: '127.0.0.1').update_all(search_result_id: 12)
- SearchLog.where(term: 'ruby', user_id: user.id).update_all(search_result_id: 12)
- SearchLog.where(term: 'ruby', ip_address: '127.0.0.2').update_all(search_result_id: 24)
+ SearchLog.where(term: "ruby", ip_address: "127.0.0.1").update_all(search_result_id: 12)
+ SearchLog.where(term: "ruby", user_id: user.id).update_all(search_result_id: 12)
+ SearchLog.where(term: "ruby", ip_address: "127.0.0.2").update_all(search_result_id: 24)
top_trending = SearchLog.trending.first
expect(top_trending.click_through).to eq(3)
end
@@ -233,10 +209,10 @@ RSpec.describe SearchLog, type: :model do
describe "clean_up" do
it "will remove old logs" do
- SearchLog.log(term: 'jawa', search_type: :header, ip_address: '127.0.0.1')
- SearchLog.log(term: 'jedi', search_type: :header, ip_address: '127.0.0.1')
- SearchLog.log(term: 'rey', search_type: :header, ip_address: '127.0.0.1')
- SearchLog.log(term: 'finn', search_type: :header, ip_address: '127.0.0.1')
+ SearchLog.log(term: "jawa", search_type: :header, ip_address: "127.0.0.1")
+ SearchLog.log(term: "jedi", search_type: :header, ip_address: "127.0.0.1")
+ SearchLog.log(term: "rey", search_type: :header, ip_address: "127.0.0.1")
+ SearchLog.log(term: "finn", search_type: :header, ip_address: "127.0.0.1")
SiteSetting.search_query_log_max_size = 5
SearchLog.clean_up
@@ -245,8 +221,8 @@ RSpec.describe SearchLog, type: :model do
SiteSetting.search_query_log_max_size = 2
SearchLog.clean_up
expect(SearchLog.count).to eq(2)
- expect(SearchLog.where(term: 'rey').first).to be_present
- expect(SearchLog.where(term: 'finn').first).to be_present
+ expect(SearchLog.where(term: "rey").first).to be_present
+ expect(SearchLog.where(term: "finn").first).to be_present
end
end
end
diff --git a/spec/models/sidebar_section_link_spec.rb b/spec/models/sidebar_section_link_spec.rb
index e497a45b98c..bc7db7703e4 100644
--- a/spec/models/sidebar_section_link_spec.rb
+++ b/spec/models/sidebar_section_link_spec.rb
@@ -4,35 +4,46 @@ RSpec.describe SidebarSectionLink do
fab!(:user) { Fabricate(:user) }
describe "Validations" do
- it 'is not valid when linkable already exists for the current user' do
+ it "is not valid when linkable already exists for the current user" do
category_sidebar_section_link = Fabricate(:category_sidebar_section_link, user: user)
- sidebar_section_link = SidebarSectionLink.new(user: user, linkable: category_sidebar_section_link.linkable)
+ sidebar_section_link =
+ SidebarSectionLink.new(user: user, linkable: category_sidebar_section_link.linkable)
expect(sidebar_section_link.valid?).to eq(false)
expect(sidebar_section_link.errors.details[:user_id][0][:error]).to eq(:taken)
end
- describe '#linkable_type' do
+ describe "#linkable_type" do
it "is not valid when linkable_type is not supported" do
- sidebar_section_link = SidebarSectionLink.new(user: user, linkable_id: 1, linkable_type: 'sometype')
+ sidebar_section_link =
+ SidebarSectionLink.new(user: user, linkable_id: 1, linkable_type: "sometype")
expect(sidebar_section_link.valid?).to eq(false)
- expect(sidebar_section_link.errors[:linkable_type]).to eq([
- I18n.t("activerecord.errors.models.sidebar_section_link.attributes.linkable_type.invalid")
- ])
+ expect(sidebar_section_link.errors[:linkable_type]).to eq(
+ [
+ I18n.t(
+ "activerecord.errors.models.sidebar_section_link.attributes.linkable_type.invalid",
+ ),
+ ],
+ )
end
it "is not valid when linkable_type is Tag and SiteSetting.tagging_enabled is false" do
SiteSetting.tagging_enabled = false
- sidebar_section_link = SidebarSectionLink.new(user: user, linkable_id: 1, linkable_type: 'Tag')
+ sidebar_section_link =
+ SidebarSectionLink.new(user: user, linkable_id: 1, linkable_type: "Tag")
expect(sidebar_section_link.valid?).to eq(false)
- expect(sidebar_section_link.errors[:linkable_type]).to eq([
- I18n.t("activerecord.errors.models.sidebar_section_link.attributes.linkable_type.invalid")
- ])
+ expect(sidebar_section_link.errors[:linkable_type]).to eq(
+ [
+ I18n.t(
+ "activerecord.errors.models.sidebar_section_link.attributes.linkable_type.invalid",
+ ),
+ ],
+ )
end
end
end
diff --git a/spec/models/site_setting_spec.rb b/spec/models/site_setting_spec.rb
index df2d9a4c581..bac55a1be4c 100644
--- a/spec/models/site_setting_spec.rb
+++ b/spec/models/site_setting_spec.rb
@@ -1,71 +1,83 @@
# frozen_string_literal: true
RSpec.describe SiteSetting do
- describe 'topic_title_length' do
- it 'returns a range of min/max topic title length' do
+ describe "topic_title_length" do
+ it "returns a range of min/max topic title length" do
expect(SiteSetting.topic_title_length).to eq(
- (SiteSetting.defaults[:min_topic_title_length]..SiteSetting.defaults[:max_topic_title_length])
+ (
+ SiteSetting.defaults[:min_topic_title_length]..SiteSetting.defaults[
+ :max_topic_title_length
+ ]
+ ),
)
end
end
- describe 'post_length' do
- it 'returns a range of min/max post length' do
- expect(SiteSetting.post_length).to eq(SiteSetting.defaults[:min_post_length]..SiteSetting.defaults[:max_post_length])
+ describe "post_length" do
+ it "returns a range of min/max post length" do
+ expect(SiteSetting.post_length).to eq(
+ SiteSetting.defaults[:min_post_length]..SiteSetting.defaults[:max_post_length],
+ )
end
end
- describe 'first_post_length' do
- it 'returns a range of min/max first post length' do
- expect(SiteSetting.first_post_length).to eq(SiteSetting.defaults[:min_first_post_length]..SiteSetting.defaults[:max_post_length])
+ describe "first_post_length" do
+ it "returns a range of min/max first post length" do
+ expect(SiteSetting.first_post_length).to eq(
+ SiteSetting.defaults[:min_first_post_length]..SiteSetting.defaults[:max_post_length],
+ )
end
end
- describe 'private_message_title_length' do
- it 'returns a range of min/max pm topic title length' do
- expect(SiteSetting.private_message_title_length).to eq(SiteSetting.defaults[:min_personal_message_title_length]..SiteSetting.defaults[:max_topic_title_length])
+ describe "private_message_title_length" do
+ it "returns a range of min/max pm topic title length" do
+ expect(SiteSetting.private_message_title_length).to eq(
+ SiteSetting.defaults[:min_personal_message_title_length]..SiteSetting.defaults[
+ :max_topic_title_length
+ ],
+ )
end
end
- describe 'in test we do some judo to ensure SiteSetting is always reset between tests' do
- it 'is always the correct default' do
- expect(SiteSetting.contact_email).to eq('')
+ describe "in test we do some judo to ensure SiteSetting is always reset between tests" do
+ it "is always the correct default" do
+ expect(SiteSetting.contact_email).to eq("")
end
- it 'sets a setting' do
- SiteSetting.contact_email = 'sam@sam.com'
+ it "sets a setting" do
+ SiteSetting.contact_email = "sam@sam.com"
end
- it 'is always the correct default' do
- expect(SiteSetting.contact_email).to eq('')
+ it "is always the correct default" do
+ expect(SiteSetting.contact_email).to eq("")
end
end
describe "anonymous_homepage" do
it "returns latest" do
- expect(SiteSetting.anonymous_homepage).to eq('latest')
+ expect(SiteSetting.anonymous_homepage).to eq("latest")
end
end
describe "top_menu" do
describe "validations" do
it "always demands latest" do
- expect do
- SiteSetting.top_menu = 'categories'
- end.to raise_error(Discourse::InvalidParameters)
+ expect do SiteSetting.top_menu = "categories" end.to raise_error(
+ Discourse::InvalidParameters,
+ )
end
it "does not allow random text" do
- expect do
- SiteSetting.top_menu = 'latest|random'
- end.to raise_error(Discourse::InvalidParameters)
+ expect do SiteSetting.top_menu = "latest|random" end.to raise_error(
+ Discourse::InvalidParameters,
+ )
end
end
describe "items" do
let(:items) { SiteSetting.top_menu_items }
- it 'returns TopMenuItem objects' do
+ it "returns TopMenuItem objects" do
expect(items[0]).to be_kind_of(TopMenuItem)
end
end
@@ -73,7 +85,7 @@ RSpec.describe SiteSetting do
describe "homepage" do
it "has homepage" do
SiteSetting.top_menu = "bookmarks|latest"
- expect(SiteSetting.homepage).to eq('bookmarks')
+ expect(SiteSetting.homepage).to eq("bookmarks")
end
end
end
@@ -82,11 +94,9 @@ RSpec.describe SiteSetting do
context "when has_enough_top_topics" do
before do
SiteSetting.topics_per_period_in_top_page = 2
- SiteSetting.top_page_default_timeframe = 'daily'
+ SiteSetting.top_page_default_timeframe = "daily"
- 2.times do
- TopTopic.create!(daily_score: 2.5)
- end
+ 2.times { TopTopic.create!(daily_score: 2.5) }
TopTopic.refresh!
end
@@ -99,7 +109,7 @@ RSpec.describe SiteSetting do
context "when does_not_have_enough_top_topics" do
before do
SiteSetting.topics_per_period_in_top_page = 20
- SiteSetting.top_page_default_timeframe = 'daily'
+ SiteSetting.top_page_default_timeframe = "daily"
TopTopic.refresh!
end
@@ -110,9 +120,7 @@ RSpec.describe SiteSetting do
end
describe "scheme" do
- before do
- SiteSetting.force_https = true
- end
+ before { SiteSetting.force_https = true }
it "returns http when ssl is disabled" do
SiteSetting.force_https = false
@@ -140,25 +148,21 @@ RSpec.describe SiteSetting do
end
end
- describe 'deprecated site settings' do
+ describe "deprecated site settings" do
before do
SiteSetting.force_https = true
@orig_logger = Rails.logger
Rails.logger = @fake_logger = FakeLogger.new
end
- after do
- Rails.logger = @orig_logger
- end
+ after { Rails.logger = @orig_logger }
- it 'should act as a proxy to the new methods' do
+ it "should act as a proxy to the new methods" do
begin
original_settings = SiteSettings::DeprecatedSettings::SETTINGS.dup
SiteSettings::DeprecatedSettings::SETTINGS.clear
- SiteSettings::DeprecatedSettings::SETTINGS.push([
- 'use_https', 'force_https', true, '0.0.1'
- ])
+ SiteSettings::DeprecatedSettings::SETTINGS.push(["use_https", "force_https", true, "0.0.1"])
SiteSetting.setup_deprecated_methods
@@ -167,9 +171,7 @@ RSpec.describe SiteSetting do
expect(SiteSetting.use_https?).to eq(true)
end.to change { @fake_logger.warnings.count }.by(2)
- expect do
- SiteSetting.use_https(warn: false)
- end.to_not change { @fake_logger.warnings }
+ expect do SiteSetting.use_https(warn: false) end.to_not change { @fake_logger.warnings }
SiteSetting.use_https = false
@@ -178,24 +180,22 @@ RSpec.describe SiteSetting do
ensure
SiteSettings::DeprecatedSettings::SETTINGS.clear
- SiteSettings::DeprecatedSettings::SETTINGS.concat(
- original_settings
- )
+ SiteSettings::DeprecatedSettings::SETTINGS.concat(original_settings)
end
end
end
- describe 'cached settings' do
- it 'should recalculate cached setting when dependent settings are changed' do
- SiteSetting.blocked_attachment_filenames = 'foo'
+ describe "cached settings" do
+ it "should recalculate cached setting when dependent settings are changed" do
+ SiteSetting.blocked_attachment_filenames = "foo"
expect(SiteSetting.blocked_attachment_filenames_regex).to eq(/foo/)
- SiteSetting.blocked_attachment_filenames = 'foo|bar'
+ SiteSetting.blocked_attachment_filenames = "foo|bar"
expect(SiteSetting.blocked_attachment_filenames_regex).to eq(/foo|bar/)
end
end
- it 'sanitizes the client settings when they are overridden' do
+ it "sanitizes the client settings when they are overridden" do
xss = "click me! "
SiteSetting.global_notice = xss
@@ -206,7 +206,7 @@ RSpec.describe SiteSetting do
it "doesn't corrupt site settings with special characters" do
value = 'OX5y3Oljb+Qt9Bu809vsBQ==<>!%{}*&!@#$%..._-A'
settings = new_settings(SiteSettings::LocalProcessProvider.new)
- settings.setting(:test_setting, '', client: true)
+ settings.setting(:test_setting, "", client: true)
settings.test_setting = value
diff --git a/spec/models/site_spec.rb b/spec/models/site_spec.rb
index c764d3ebb51..0e39591929b 100644
--- a/spec/models/site_spec.rb
+++ b/spec/models/site_spec.rb
@@ -1,19 +1,25 @@
# frozen_string_literal: true
RSpec.describe Site do
- after do
- Site.clear_cache
- end
+ after { Site.clear_cache }
def expect_correct_themes(guardian)
json = Site.json_for(guardian)
parsed = JSON.parse(json)
- expected = Theme.where('id = :default OR user_selectable',
- default: SiteSetting.default_theme_id)
- .order(:name)
- .pluck(:id, :name, :color_scheme_id)
- .map { |id, n, cs| { "theme_id" => id, "name" => n, "default" => id == SiteSetting.default_theme_id, "color_scheme_id" => cs } }
+ expected =
+ Theme
+ .where("id = :default OR user_selectable", default: SiteSetting.default_theme_id)
+ .order(:name)
+ .pluck(:id, :name, :color_scheme_id)
+ .map do |id, n, cs|
+ {
+ "theme_id" => id,
+ "name" => n,
+ "default" => id == SiteSetting.default_theme_id,
+ "color_scheme_id" => cs,
+ }
+ end
expect(parsed["user_themes"]).to eq(expected)
end
@@ -59,20 +65,21 @@ RSpec.describe Site do
expect(Site.new(guardian).categories.last[:notification_level]).to eq(1)
end
- describe '#categories' do
+ describe "#categories" do
fab!(:category) { Fabricate(:category) }
fab!(:user) { Fabricate(:user) }
let(:guardian) { Guardian.new(user) }
it "omits read restricted categories" do
expect(Site.new(guardian).categories.map { |c| c[:id] }).to contain_exactly(
- SiteSetting.uncategorized_category_id, category.id
+ SiteSetting.uncategorized_category_id,
+ category.id,
)
category.update!(read_restricted: true)
expect(Site.new(guardian).categories.map { |c| c[:id] }).to contain_exactly(
- SiteSetting.uncategorized_category_id
+ SiteSetting.uncategorized_category_id,
)
end
@@ -82,13 +89,14 @@ RSpec.describe Site do
category.groups << group
expect(Site.new(guardian).categories.map { |c| c[:id] }).to contain_exactly(
- SiteSetting.uncategorized_category_id
+ SiteSetting.uncategorized_category_id,
)
group.add(user)
expect(Site.new(Guardian.new(user)).categories.map { |c| c[:id] }).to contain_exactly(
- SiteSetting.uncategorized_category_id, category.id
+ SiteSetting.uncategorized_category_id,
+ category.id,
)
end
@@ -100,11 +108,9 @@ RSpec.describe Site do
guardian = Guardian.new(user)
- expect(Site.new(guardian)
- .categories
- .keep_if { |c| c[:name] == category.name }
- .first[:permission])
- .not_to eq(CategoryGroup.permission_types[:full])
+ expect(
+ Site.new(guardian).categories.keep_if { |c| c[:name] == category.name }.first[:permission],
+ ).not_to eq(CategoryGroup.permission_types[:full])
# If a parent category is not visible, the child categories should not be returned
category.set_permissions(staff: :full)
@@ -114,7 +120,7 @@ RSpec.describe Site do
expect(Site.new(guardian).categories).not_to include(sub_category)
end
- it 'should clear the cache when custom fields are updated' do
+ it "should clear the cache when custom fields are updated" do
Site.preloaded_category_custom_fields << "enable_marketplace"
categories = Site.new(Guardian.new).categories
@@ -125,18 +131,18 @@ RSpec.describe Site do
categories = Site.new(Guardian.new).categories
- expect(categories.last[:custom_fields]["enable_marketplace"]).to eq('t')
+ expect(categories.last[:custom_fields]["enable_marketplace"]).to eq("t")
category.upsert_custom_fields(enable_marketplace: false)
categories = Site.new(Guardian.new).categories
- expect(categories.last[:custom_fields]["enable_marketplace"]).to eq('f')
+ expect(categories.last[:custom_fields]["enable_marketplace"]).to eq("f")
ensure
Site.reset_preloaded_category_custom_fields
end
- it 'sets the can_edit field for categories correctly' do
+ it "sets the can_edit field for categories correctly" do
categories = Site.new(Guardian.new).categories
expect(categories.map { |c| c[:can_edit] }).to contain_exactly(false, false)
@@ -172,7 +178,7 @@ RSpec.describe Site do
SiteSetting.enable_twitter_logins = true
SiteSetting.enable_facebook_logins = true
data = JSON.parse(Site.json_for(Guardian.new))
- expect(data["auth_providers"].map { |a| a["name"] }).to contain_exactly('facebook', 'twitter')
+ expect(data["auth_providers"].map { |a| a["name"] }).to contain_exactly("facebook", "twitter")
end
it "includes all enabled authentication providers for anon when login_required" do
@@ -180,7 +186,7 @@ RSpec.describe Site do
SiteSetting.enable_twitter_logins = true
SiteSetting.enable_facebook_logins = true
data = JSON.parse(Site.json_for(Guardian.new))
- expect(data["auth_providers"].map { |a| a["name"] }).to contain_exactly('facebook', 'twitter')
+ expect(data["auth_providers"].map { |a| a["name"] }).to contain_exactly("facebook", "twitter")
end
describe ".show_welcome_topic_banner?" do
@@ -245,5 +251,4 @@ RSpec.describe Site do
expect(Discourse.cache.read(Site.welcome_topic_banner_cache_key(admin.id))).to eq(false)
end
end
-
end
diff --git a/spec/models/sitemap_spec.rb b/spec/models/sitemap_spec.rb
index 552dd58e649..1f922b5805b 100644
--- a/spec/models/sitemap_spec.rb
+++ b/spec/models/sitemap_spec.rb
@@ -1,30 +1,39 @@
# frozen_string_literal: true
-require 'rails_helper'
+require "rails_helper"
RSpec.describe Sitemap do
- describe '.regenerate_sitemaps' do
+ describe ".regenerate_sitemaps" do
fab!(:topic) { Fabricate(:topic) }
- it 'always create the news and recent sitemaps' do
+ it "always create the news and recent sitemaps" do
described_class.regenerate_sitemaps
- sitemaps = Sitemap.where(name: [Sitemap::NEWS_SITEMAP_NAME, Sitemap::RECENT_SITEMAP_NAME], enabled: true)
+ sitemaps =
+ Sitemap.where(
+ name: [Sitemap::NEWS_SITEMAP_NAME, Sitemap::RECENT_SITEMAP_NAME],
+ enabled: true,
+ )
expect(sitemaps.exists?).to eq(true)
end
- it 'bumps existing sitemaps last_posted_at attribute' do
- news = Sitemap.create!(name: Sitemap::NEWS_SITEMAP_NAME, enabled: true, last_posted_at: 10.days.ago)
+ it "bumps existing sitemaps last_posted_at attribute" do
+ news =
+ Sitemap.create!(
+ name: Sitemap::NEWS_SITEMAP_NAME,
+ enabled: true,
+ last_posted_at: 10.days.ago,
+ )
described_class.regenerate_sitemaps
expect(news.reload.last_posted_at).to eq_time(topic.updated_at)
end
- it 'creates the sitemap first page when there is a topic' do
+ it "creates the sitemap first page when there is a topic" do
described_class.regenerate_sitemaps
- first_page = Sitemap.find_by(name: '1')
+ first_page = Sitemap.find_by(name: "1")
expect(first_page.enabled).to eq(true)
end
@@ -35,13 +44,13 @@ RSpec.describe Sitemap do
Category.update_stats
described_class.regenerate_sitemaps
- first_page = Sitemap.find_by(name: '1')
+ first_page = Sitemap.find_by(name: "1")
expect(first_page).to be_nil
end
- it 'disable empty pages' do
- unused_page = Sitemap.touch('10')
+ it "disable empty pages" do
+ unused_page = Sitemap.touch("10")
described_class.regenerate_sitemaps
@@ -49,8 +58,8 @@ RSpec.describe Sitemap do
end
end
- describe '#topics' do
- shared_examples 'Excludes hidden and restricted topics' do
+ describe "#topics" do
+ shared_examples "Excludes hidden and restricted topics" do
it "doesn't include topics from restricted categories" do
restricted_category = Fabricate(:category, read_restricted: true)
Fabricate(:topic, category: restricted_category)
@@ -69,14 +78,14 @@ RSpec.describe Sitemap do
end
end
- context 'when the sitemap corresponds to a page' do
- let(:sitemap) { described_class.new(enabled: true, last_posted_at: 1.minute.ago, name: '1') }
+ context "when the sitemap corresponds to a page" do
+ let(:sitemap) { described_class.new(enabled: true, last_posted_at: 1.minute.ago, name: "1") }
- it 'returns an empty array if there no topics' do
+ it "returns an empty array if there no topics" do
expect(sitemap.topics).to be_empty
end
- it 'returns all the neccessary topic attributes to render a sitemap URL' do
+ it "returns all the neccessary topic attributes to render a sitemap URL" do
topic = Fabricate(:topic)
topics_data = sitemap.topics.first
@@ -87,9 +96,9 @@ RSpec.describe Sitemap do
expect(topics_data[3]).to eq_time(topic.updated_at)
end
- it 'returns empty when the page is empty because the previous page is not full' do
+ it "returns empty when the page is empty because the previous page is not full" do
Fabricate(:topic)
- sitemap.name = '2'
+ sitemap.name = "2"
topics_data = sitemap.topics
@@ -106,17 +115,19 @@ RSpec.describe Sitemap do
expect(topic_ids).to contain_exactly(topic_2.id, topic_1.id, topic_3.id)
end
- it_behaves_like 'Excludes hidden and restricted topics'
+ it_behaves_like "Excludes hidden and restricted topics"
end
- context 'with sitemap for recent topics' do
+ context "with sitemap for recent topics" do
let(:sitemap) do
described_class.new(
- enabled: true, last_posted_at: 1.minute.ago, name: described_class::RECENT_SITEMAP_NAME
+ enabled: true,
+ last_posted_at: 1.minute.ago,
+ name: described_class::RECENT_SITEMAP_NAME,
)
end
- it 'return topics that were bumped less than three days ago' do
+ it "return topics that were bumped less than three days ago" do
Fabricate(:topic, bumped_at: 4.days.ago)
recent_topic = Fabricate(:topic, bumped_at: 2.days.ago, posts_count: 3)
@@ -131,17 +142,19 @@ RSpec.describe Sitemap do
expect(recent_topic_data[4]).to eq(recent_topic.posts_count)
end
- it_behaves_like 'Excludes hidden and restricted topics'
+ it_behaves_like "Excludes hidden and restricted topics"
end
- context 'with news sitemap' do
+ context "with news sitemap" do
let(:sitemap) do
described_class.new(
- enabled: true, last_posted_at: 1.minute.ago, name: described_class::NEWS_SITEMAP_NAME
+ enabled: true,
+ last_posted_at: 1.minute.ago,
+ name: described_class::NEWS_SITEMAP_NAME,
)
end
- it 'returns topics that were bumped in the last 72 hours' do
+ it "returns topics that were bumped in the last 72 hours" do
Fabricate(:topic, bumped_at: 73.hours.ago)
recent_topic = Fabricate(:topic, bumped_at: 71.hours.ago)
@@ -155,7 +168,7 @@ RSpec.describe Sitemap do
expect(recent_topic_data[3]).to eq_time(recent_topic.updated_at)
end
- it_behaves_like 'Excludes hidden and restricted topics'
+ it_behaves_like "Excludes hidden and restricted topics"
end
end
end
diff --git a/spec/models/skipped_email_log_spec.rb b/spec/models/skipped_email_log_spec.rb
index 2360e91f5eb..a6fe6b55d59 100644
--- a/spec/models/skipped_email_log_spec.rb
+++ b/spec/models/skipped_email_log_spec.rb
@@ -2,22 +2,20 @@
RSpec.describe SkippedEmailLog, type: :model do
let(:custom_skipped_email_log) do
- Fabricate.build(:skipped_email_log,
- reason_type: SkippedEmailLog.reason_types[:custom]
- )
+ Fabricate.build(:skipped_email_log, reason_type: SkippedEmailLog.reason_types[:custom])
end
let(:skipped_email_log) { Fabricate.build(:skipped_email_log) }
- describe 'validations' do
+ describe "validations" do
it { is_expected.to validate_presence_of(:email_type) }
it { is_expected.to validate_presence_of(:to_address) }
it { is_expected.to validate_presence_of(:reason_type) }
- describe '#reason_type' do
- describe 'when reason_type is not valid' do
- it 'should not be valid' do
- skipped_email_log.reason_type = 999999
+ describe "#reason_type" do
+ describe "when reason_type is not valid" do
+ it "should not be valid" do
+ skipped_email_log.reason_type = 999_999
expect(skipped_email_log.valid?).to eq(false)
expect(skipped_email_log.errors.messages).to include(:reason_type)
@@ -25,36 +23,35 @@ RSpec.describe SkippedEmailLog, type: :model do
end
end
- describe '#custom_reason' do
- describe 'when log is a custom reason type' do
- describe 'when custom reason is blank' do
- it 'should not be valid' do
+ describe "#custom_reason" do
+ describe "when log is a custom reason type" do
+ describe "when custom reason is blank" do
+ it "should not be valid" do
expect(custom_skipped_email_log.valid?).to eq(false)
- expect(custom_skipped_email_log.errors.messages)
- .to include(:custom_reason)
+ expect(custom_skipped_email_log.errors.messages).to include(:custom_reason)
end
end
- describe 'when custom reason is not blank' do
- it 'should be valid' do
- custom_skipped_email_log.custom_reason = 'test'
+ describe "when custom reason is not blank" do
+ it "should be valid" do
+ custom_skipped_email_log.custom_reason = "test"
expect(custom_skipped_email_log.valid?).to eq(true)
end
end
end
- describe 'when log is not a custom reason type' do
- describe 'when custom reason is blank' do
- it 'should be valid' do
+ describe "when log is not a custom reason type" do
+ describe "when custom reason is blank" do
+ it "should be valid" do
expect(skipped_email_log.valid?).to eq(true)
end
end
- describe 'when custom reason is not blank' do
- it 'should not be valid' do
- skipped_email_log.custom_reason = 'test'
+ describe "when custom reason is not blank" do
+ it "should not be valid" do
+ skipped_email_log.custom_reason = "test"
expect(skipped_email_log.valid?).to eq(false)
expect(skipped_email_log.errors.messages).to include(:custom_reason)
@@ -64,39 +61,40 @@ RSpec.describe SkippedEmailLog, type: :model do
end
end
- describe '.reason_types' do
+ describe ".reason_types" do
describe "verify enum sequence" do
- it 'should return the right sequence' do
+ it "should return the right sequence" do
expect(SkippedEmailLog.reason_types[:custom]).to eq(1)
expect(SkippedEmailLog.reason_types[:user_email_already_read]).to eq(15)
end
end
end
- describe '#reason' do
- describe 'for a custom log' do
- it 'should return the right output' do
- custom_skipped_email_log.custom_reason = 'test'
- expect(custom_skipped_email_log.reason).to eq('test')
+ describe "#reason" do
+ describe "for a custom log" do
+ it "should return the right output" do
+ custom_skipped_email_log.custom_reason = "test"
+ expect(custom_skipped_email_log.reason).to eq("test")
end
end
- describe 'for a non custom log' do
- it 'should return the right output' do
- expect(skipped_email_log.reason).to eq("
- #{I18n.t('skipped_email_log.exceeded_emails_limit')}
- ".strip)
+ describe "for a non custom log" do
+ it "should return the right output" do
+ expect(skipped_email_log.reason).to eq(
+ "
+ #{I18n.t("skipped_email_log.exceeded_emails_limit")}
+ ".strip,
+ )
- skipped_email_log.reason_type =
- SkippedEmailLog.reason_types[:user_email_no_user]
+ skipped_email_log.reason_type = SkippedEmailLog.reason_types[:user_email_no_user]
skipped_email_log.user_id = 9999
- expect(skipped_email_log.reason).to eq("
- #{I18n.t(
- 'skipped_email_log.user_email_no_user', user_id: 9999
- )}
- ".strip)
+ expect(skipped_email_log.reason).to eq(
+ "
+ #{I18n.t("skipped_email_log.user_email_no_user", user_id: 9999)}
+ ".strip,
+ )
end
end
end
diff --git a/spec/models/stylesheet_cache_spec.rb b/spec/models/stylesheet_cache_spec.rb
index 1e0796fa323..01046d2f5a9 100644
--- a/spec/models/stylesheet_cache_spec.rb
+++ b/spec/models/stylesheet_cache_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
RSpec.describe StylesheetCache do
-
describe ".add" do
it "correctly cycles once MAX_TO_KEEP is hit" do
StylesheetCache.destroy_all
@@ -33,7 +32,7 @@ RSpec.describe StylesheetCache do
StylesheetCache.add("mobile", SecureRandom.hex, "body { }", "map", max_to_keep: 2)
StylesheetCache.add("mobile", SecureRandom.hex, "body { }", "map", max_to_keep: 2)
- expect(StylesheetCache.order(:id).pluck(:target)).to eq(["desktop", "desktop", "mobile", "mobile"])
+ expect(StylesheetCache.order(:id).pluck(:target)).to eq(%w[desktop desktop mobile mobile])
end
end
diff --git a/spec/models/tag_group_spec.rb b/spec/models/tag_group_spec.rb
index 1891acda29e..9fbb9ecaacd 100644
--- a/spec/models/tag_group_spec.rb
+++ b/spec/models/tag_group_spec.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
RSpec.describe TagGroup do
- describe '#visible' do
+ describe "#visible" do
fab!(:user1) { Fabricate(:user) }
fab!(:user2) { Fabricate(:user) }
fab!(:admin) { Fabricate(:admin) }
@@ -10,19 +10,25 @@ RSpec.describe TagGroup do
fab!(:group) { Fabricate(:group) }
fab!(:beta_group) { Fabricate(:group) }
- fab!(:everyone_tag_group) { Fabricate(:tag_group, name: 'Visible & usable by everyone', tag_names: ['foo-bar']) }
- fab!(:visible_tag_group) { Fabricate(:tag_group, name: 'Visible by everyone, usable by staff', tag_names: ['foo']) }
- fab!(:staff_only_tag_group) { Fabricate(:tag_group, name: 'Staff only', tag_names: ['bar']) }
- fab!(:beta_only_tag_group) { Fabricate(:tag_group, name: 'Beta only', tag_names: ['beta']) }
+ fab!(:everyone_tag_group) do
+ Fabricate(:tag_group, name: "Visible & usable by everyone", tag_names: ["foo-bar"])
+ end
+ fab!(:visible_tag_group) do
+ Fabricate(:tag_group, name: "Visible by everyone, usable by staff", tag_names: ["foo"])
+ end
+ fab!(:staff_only_tag_group) { Fabricate(:tag_group, name: "Staff only", tag_names: ["bar"]) }
+ fab!(:beta_only_tag_group) { Fabricate(:tag_group, name: "Beta only", tag_names: ["beta"]) }
- fab!(:public_tag_group) { Fabricate(:tag_group, name: 'Public', tag_names: ['public1']) }
- fab!(:private_tag_group) { Fabricate(:tag_group, name: 'Private', tag_names: ['privatetag1']) }
- fab!(:staff_tag_group) { Fabricate(:tag_group, name: 'Staff Talk', tag_names: ['stafftag1']) }
- fab!(:unrestricted_tag_group) { Fabricate(:tag_group, name: 'Unrestricted', tag_names: ['use-anywhere']) }
+ fab!(:public_tag_group) { Fabricate(:tag_group, name: "Public", tag_names: ["public1"]) }
+ fab!(:private_tag_group) { Fabricate(:tag_group, name: "Private", tag_names: ["privatetag1"]) }
+ fab!(:staff_tag_group) { Fabricate(:tag_group, name: "Staff Talk", tag_names: ["stafftag1"]) }
+ fab!(:unrestricted_tag_group) do
+ Fabricate(:tag_group, name: "Unrestricted", tag_names: ["use-anywhere"])
+ end
- fab!(:public_category) { Fabricate(:category, name: 'Public Category') }
+ fab!(:public_category) { Fabricate(:category, name: "Public Category") }
fab!(:private_category) { Fabricate(:private_category, group: group) }
- fab!(:staff_category) { Fabricate(:category, name: 'Secret') }
+ fab!(:staff_category) { Fabricate(:category, name: "Secret") }
let(:everyone) { Group::AUTO_GROUPS[:everyone] }
let(:staff) { Group::AUTO_GROUPS[:staff] }
@@ -40,7 +46,7 @@ RSpec.describe TagGroup do
staff_category.set_permissions(admins: :full)
staff_category.save!
- private_category.set_permissions(staff: :full, group => :full)
+ private_category.set_permissions(:staff => :full, group => :full)
private_category.save!
public_category.allowed_tag_groups = [public_tag_group.name]
@@ -62,23 +68,41 @@ RSpec.describe TagGroup do
shared_examples "correct visible tag groups" do
it "returns correct groups based on category & tag group permissions" do
- expect(TagGroup.visible(Guardian.new(admin)).pluck(:name)).to match_array(TagGroup.pluck(:name))
- expect(TagGroup.visible(Guardian.new(moderator)).pluck(:name)).to match_array(TagGroup.pluck(:name))
+ expect(TagGroup.visible(Guardian.new(admin)).pluck(:name)).to match_array(
+ TagGroup.pluck(:name),
+ )
+ expect(TagGroup.visible(Guardian.new(moderator)).pluck(:name)).to match_array(
+ TagGroup.pluck(:name),
+ )
- expect(TagGroup.visible(Guardian.new(user2)).pluck(:name)).to match_array([
- public_tag_group.name, unrestricted_tag_group.name, private_tag_group.name,
- everyone_tag_group.name, visible_tag_group.name,
- ])
+ expect(TagGroup.visible(Guardian.new(user2)).pluck(:name)).to match_array(
+ [
+ public_tag_group.name,
+ unrestricted_tag_group.name,
+ private_tag_group.name,
+ everyone_tag_group.name,
+ visible_tag_group.name,
+ ],
+ )
- expect(TagGroup.visible(Guardian.new(user1)).pluck(:name)).to match_array([
- public_tag_group.name, unrestricted_tag_group.name, beta_only_tag_group.name,
- everyone_tag_group.name, visible_tag_group.name,
- ])
+ expect(TagGroup.visible(Guardian.new(user1)).pluck(:name)).to match_array(
+ [
+ public_tag_group.name,
+ unrestricted_tag_group.name,
+ beta_only_tag_group.name,
+ everyone_tag_group.name,
+ visible_tag_group.name,
+ ],
+ )
- expect(TagGroup.visible(Guardian.new(nil)).pluck(:name)).to match_array([
- public_tag_group.name, unrestricted_tag_group.name, everyone_tag_group.name,
- visible_tag_group.name,
- ])
+ expect(TagGroup.visible(Guardian.new(nil)).pluck(:name)).to match_array(
+ [
+ public_tag_group.name,
+ unrestricted_tag_group.name,
+ everyone_tag_group.name,
+ visible_tag_group.name,
+ ],
+ )
end
end
@@ -94,17 +118,15 @@ RSpec.describe TagGroup do
end
end
- describe 'tag_names=' do
+ describe "tag_names=" do
let(:tag_group) { Fabricate(:tag_group) }
fab!(:tag) { Fabricate(:tag) }
before { SiteSetting.tagging_enabled = true }
it "can use existing tags and create new ones" do
- expect {
- tag_group.tag_names = [tag.name, 'new-tag']
- }.to change { Tag.count }.by(1)
- expect_same_tag_names(tag_group.reload.tags, [tag, 'new-tag'])
+ expect { tag_group.tag_names = [tag.name, "new-tag"] }.to change { Tag.count }.by(1)
+ expect_same_tag_names(tag_group.reload.tags, [tag, "new-tag"])
end
it "removes parent tag as group member" do
@@ -123,20 +145,18 @@ RSpec.describe TagGroup do
expect_same_tag_names([tg.parent_tag], [parent])
end
- context 'with synonyms' do
- fab!(:synonym) { Fabricate(:tag, name: 'synonym', target_tag: tag) }
+ context "with synonyms" do
+ fab!(:synonym) { Fabricate(:tag, name: "synonym", target_tag: tag) }
it "adds synonyms from base tags too" do
- expect {
- tag_group.tag_names = [tag.name, 'new-tag']
- }.to change { Tag.count }.by(1)
- expect_same_tag_names(tag_group.reload.tags, [tag, 'new-tag', synonym])
+ expect { tag_group.tag_names = [tag.name, "new-tag"] }.to change { Tag.count }.by(1)
+ expect_same_tag_names(tag_group.reload.tags, [tag, "new-tag", synonym])
end
it "removes tags correctly" do
tag_group.update!(tag_names: [tag.name])
- tag_group.tag_names = ['new-tag']
- expect_same_tag_names(tag_group.reload.tags, ['new-tag'])
+ tag_group.tag_names = ["new-tag"]
+ expect_same_tag_names(tag_group.reload.tags, ["new-tag"])
end
end
end
diff --git a/spec/models/tag_spec.rb b/spec/models/tag_spec.rb
index 4d9be093bc7..7aff07ab795 100644
--- a/spec/models/tag_spec.rb
+++ b/spec/models/tag_spec.rb
@@ -20,48 +20,55 @@ RSpec.describe Tag do
SiteSetting.min_trust_level_to_tag_topics = 0
end
- describe 'Associations' do
- it 'should delete associated sidebar_section_links when tag is destroyed' do
+ describe "Associations" do
+ it "should delete associated sidebar_section_links when tag is destroyed" do
tag_sidebar_section_link = Fabricate(:tag_sidebar_section_link)
- tag_sidebar_section_link_2 = Fabricate(:tag_sidebar_section_link, linkable: tag_sidebar_section_link.linkable)
+ tag_sidebar_section_link_2 =
+ Fabricate(:tag_sidebar_section_link, linkable: tag_sidebar_section_link.linkable)
category_sidebar_section_link = Fabricate(:category_sidebar_section_link)
- expect { tag_sidebar_section_link.linkable.destroy! }.to change { SidebarSectionLink.count }.from(3).to(1)
+ expect { tag_sidebar_section_link.linkable.destroy! }.to change {
+ SidebarSectionLink.count
+ }.from(3).to(1)
expect(SidebarSectionLink.first).to eq(category_sidebar_section_link)
end
end
- describe 'new' do
+ describe "new" do
subject { Fabricate.build(:tag) }
- it 'triggers a extensibility event' do
+ it "triggers a extensibility event" do
event = DiscourseEvent.track_events { subject.save! }.last
expect(event[:event_name]).to eq(:tag_created)
expect(event[:params].first).to eq(subject)
end
- it 'prevents case-insensitive duplicates' do
+ it "prevents case-insensitive duplicates" do
Fabricate.build(:tag, name: "hello").save!
- expect { Fabricate.build(:tag, name: "hElLo").save! }.to raise_error(ActiveRecord::RecordInvalid)
+ expect { Fabricate.build(:tag, name: "hElLo").save! }.to raise_error(
+ ActiveRecord::RecordInvalid,
+ )
end
it 'does not allow creation of tag with name in "RESERVED_TAGS"' do
- expect { Fabricate.build(:tag, name: "None").save! }.to raise_error(ActiveRecord::RecordInvalid)
+ expect { Fabricate.build(:tag, name: "None").save! }.to raise_error(
+ ActiveRecord::RecordInvalid,
+ )
end
end
- describe 'destroy' do
+ describe "destroy" do
subject { Fabricate(:tag) }
- it 'triggers a extensibility event' do
+ it "triggers a extensibility event" do
event = DiscourseEvent.track_events { subject.destroy! }.last
expect(event[:event_name]).to eq(:tag_destroyed)
expect(event[:params].first).to eq(subject)
end
- it 'removes it from its tag group' do
+ it "removes it from its tag group" do
tag_group = Fabricate(:tag_group, tags: [tag])
expect { tag.destroy }.to change { TagGroupMembership.count }.by(-1)
expect(tag_group.reload.tags).to be_empty
@@ -73,7 +80,7 @@ RSpec.describe Tag do
expect { tag.destroy }.to change { Tag.count }.by(-1)
end
- describe '#top_tags' do
+ describe "#top_tags" do
it "returns nothing if nothing has been tagged" do
make_some_tags(tag_a_topic: false)
expect(Tag.top_tags.sort).to be_empty
@@ -99,8 +106,12 @@ RSpec.describe Tag do
it "works correctly" do
expect(Tag.top_tags(category: @category1).sort).to eq([@tags[0].name].sort)
- expect(Tag.top_tags(guardian: Guardian.new(Fabricate(:admin))).sort).to eq([@tags[0].name, @tags[1].name, @tags[2].name].sort)
- expect(Tag.top_tags(category: @private_category, guardian: Guardian.new(Fabricate(:admin))).sort).to eq([@tags[2].name].sort)
+ expect(Tag.top_tags(guardian: Guardian.new(Fabricate(:admin))).sort).to eq(
+ [@tags[0].name, @tags[1].name, @tags[2].name].sort,
+ )
+ expect(
+ Tag.top_tags(category: @private_category, guardian: Guardian.new(Fabricate(:admin))).sort,
+ ).to eq([@tags[2].name].sort)
expect(Tag.top_tags.sort).to eq([@tags[0].name, @tags[1].name].sort)
expect(Tag.top_tags(category: @private_category)).to be_empty
@@ -136,8 +147,10 @@ RSpec.describe Tag do
end
context "with hidden tags" do
- let(:hidden_tag) { Fabricate(:tag, name: 'hidden') }
- let!(:staff_tag_group) { Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name]) }
+ let(:hidden_tag) { Fabricate(:tag, name: "hidden") }
+ let!(:staff_tag_group) do
+ Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name])
+ end
let!(:topic2) { Fabricate(:topic, tags: [tag, hidden_tag]) }
it "returns all tags to staff" do
@@ -149,24 +162,28 @@ RSpec.describe Tag do
end
it "doesn't return hidden tags to non-staff" do
- expect(Tag.top_tags(guardian: Guardian.new(Fabricate(:user)))).to_not include(hidden_tag.name)
+ expect(Tag.top_tags(guardian: Guardian.new(Fabricate(:user)))).to_not include(
+ hidden_tag.name,
+ )
end
end
end
- describe '#pm_tags' do
+ describe "#pm_tags" do
let(:regular_user) { Fabricate(:trust_level_4) }
let(:admin) { Fabricate(:admin) }
let(:personal_message) do
- Fabricate(:private_message_topic, user: regular_user, topic_allowed_users: [
- Fabricate.build(:topic_allowed_user, user: regular_user),
- Fabricate.build(:topic_allowed_user, user: admin)
- ])
+ Fabricate(
+ :private_message_topic,
+ user: regular_user,
+ topic_allowed_users: [
+ Fabricate.build(:topic_allowed_user, user: regular_user),
+ Fabricate.build(:topic_allowed_user, user: admin),
+ ],
+ )
end
- before do
- 2.times { |i| Fabricate(:tag, topics: [personal_message], name: "tag-#{i}") }
- end
+ before { 2.times { |i| Fabricate(:tag, topics: [personal_message], name: "tag-#{i}") } }
it "returns nothing if user is not a staff" do
expect(Tag.pm_tags(guardian: Guardian.new(regular_user))).to be_empty
@@ -197,14 +214,18 @@ RSpec.describe Tag do
describe "unused tags scope" do
let!(:tags) do
- [ Fabricate(:tag, name: "used_publically", topic_count: 2, pm_topic_count: 0),
- Fabricate(:tag, name: "used_privately", topic_count: 0, pm_topic_count: 3),
- Fabricate(:tag, name: "used_everywhere", topic_count: 0, pm_topic_count: 3),
- Fabricate(:tag, name: "unused1", topic_count: 0, pm_topic_count: 0),
- Fabricate(:tag, name: "unused2", topic_count: 0, pm_topic_count: 0)]
+ [
+ Fabricate(:tag, name: "used_publically", topic_count: 2, pm_topic_count: 0),
+ Fabricate(:tag, name: "used_privately", topic_count: 0, pm_topic_count: 3),
+ Fabricate(:tag, name: "used_everywhere", topic_count: 0, pm_topic_count: 3),
+ Fabricate(:tag, name: "unused1", topic_count: 0, pm_topic_count: 0),
+ Fabricate(:tag, name: "unused2", topic_count: 0, pm_topic_count: 0),
+ ]
end
- let(:tag_in_group) { Fabricate(:tag, name: "unused_in_group", topic_count: 0, pm_topic_count: 0) }
+ let(:tag_in_group) do
+ Fabricate(:tag, name: "unused_in_group", topic_count: 0, pm_topic_count: 0)
+ end
let!(:tag_group) { Fabricate(:tag_group, tag_names: [tag_in_group.name]) }
it "returns the correct tags" do
diff --git a/spec/models/tag_user_spec.rb b/spec/models/tag_user_spec.rb
index 8d2e1f86fde..4c5956aab20 100644
--- a/spec/models/tag_user_spec.rb
+++ b/spec/models/tag_user_spec.rb
@@ -27,10 +27,34 @@ RSpec.describe TagUser do
let!(:tag4) { Fabricate(:tag) }
fab!(:user1) { Fabricate(:user) }
fab!(:user2) { Fabricate(:user) }
- let!(:tag_user1) { TagUser.create(user: user1, tag: tag1, notification_level: TagUser.notification_levels[:watching]) }
- let!(:tag_user2) { TagUser.create(user: user1, tag: tag2, notification_level: TagUser.notification_levels[:tracking]) }
- let!(:tag_user3) { TagUser.create(user: user2, tag: tag3, notification_level: TagUser.notification_levels[:watching_first_post]) }
- let!(:tag_user4) { TagUser.create(user: user2, tag: tag4, notification_level: TagUser.notification_levels[:muted]) }
+ let!(:tag_user1) do
+ TagUser.create(
+ user: user1,
+ tag: tag1,
+ notification_level: TagUser.notification_levels[:watching],
+ )
+ end
+ let!(:tag_user2) do
+ TagUser.create(
+ user: user1,
+ tag: tag2,
+ notification_level: TagUser.notification_levels[:tracking],
+ )
+ end
+ let!(:tag_user3) do
+ TagUser.create(
+ user: user2,
+ tag: tag3,
+ notification_level: TagUser.notification_levels[:watching_first_post],
+ )
+ end
+ let!(:tag_user4) do
+ TagUser.create(
+ user: user2,
+ tag: tag4,
+ notification_level: TagUser.notification_levels[:muted],
+ )
+ end
it "scopes to notification levels visible due to absence of tag group" do
expect(TagUser.notification_level_visible.length).to be(4)
@@ -45,9 +69,9 @@ RSpec.describe TagUser do
Fabricate(:group_user, group: group1, user: user1)
- expect(TagUser.notification_level_visible.pluck(:id)).to match_array([
- tag_user1.id, tag_user3.id, tag_user4.id
- ])
+ expect(TagUser.notification_level_visible.pluck(:id)).to match_array(
+ [tag_user1.id, tag_user3.id, tag_user4.id],
+ )
end
it "scopes to notification levels visible because user is staff" do
@@ -61,11 +85,14 @@ RSpec.describe TagUser do
end
it "scopes to notification levels visible by specified notification level" do
- expect(TagUser.notification_level_visible([TagUser.notification_levels[:watching]]).length).to be(1)
- expect(TagUser.notification_level_visible(
- [TagUser.notification_levels[:watching],
- TagUser.notification_levels[:tracking]]
- ).length).to be(2)
+ expect(
+ TagUser.notification_level_visible([TagUser.notification_levels[:watching]]).length,
+ ).to be(1)
+ expect(
+ TagUser.notification_level_visible(
+ [TagUser.notification_levels[:watching], TagUser.notification_levels[:tracking]],
+ ).length,
+ ).to be(2)
end
end
@@ -113,7 +140,6 @@ RSpec.describe TagUser do
describe "batch_set" do
it "watches and unwatches tags correctly" do
-
user = Fabricate(:user)
tag = Fabricate(:tag)
post = create_post(tags: [tag.name])
@@ -136,7 +162,6 @@ RSpec.describe TagUser do
end
it "watches and unwatches tags correctly using tag synonym" do
-
user = Fabricate(:user)
tag = Fabricate(:tag)
synonym = Fabricate(:tag, target_tag: tag)
@@ -163,29 +188,36 @@ RSpec.describe TagUser do
describe "integration" do
fab!(:user) { Fabricate(:user) }
fab!(:watched_tag) { Fabricate(:tag) }
- let(:muted_tag) { Fabricate(:tag) }
+ let(:muted_tag) { Fabricate(:tag) }
fab!(:tracked_tag) { Fabricate(:tag) }
context "with some tag notification settings" do
- before do
- Jobs.run_immediately!
- end
+ before { Jobs.run_immediately! }
let :watched_post do
- TagUser.create!(user: user, tag: watched_tag, notification_level: TagUser.notification_levels[:watching])
+ TagUser.create!(
+ user: user,
+ tag: watched_tag,
+ notification_level: TagUser.notification_levels[:watching],
+ )
create_post(tags: [watched_tag.name])
end
let :tracked_post do
- TagUser.create!(user: user, tag: tracked_tag, notification_level: TagUser.notification_levels[:tracking])
+ TagUser.create!(
+ user: user,
+ tag: tracked_tag,
+ notification_level: TagUser.notification_levels[:tracking],
+ )
create_post(tags: [tracked_tag.name])
end
it "sets notification levels correctly" do
-
# define a wide open tag group to ensure it also works
- group = TagGroup.new(name: 'Visible & usable by everyone', tag_names: [watched_tag.name])
- group.permissions = [[Group::AUTO_GROUPS[:everyone], TagGroupPermission.permission_types[:full]]]
+ group = TagGroup.new(name: "Visible & usable by everyone", tag_names: [watched_tag.name])
+ group.permissions = [
+ [Group::AUTO_GROUPS[:everyone], TagGroupPermission.permission_types[:full]],
+ ]
group.save!
expect(Notification.where(user_id: user.id, topic_id: watched_post.topic_id).count).to eq 1
@@ -198,9 +230,21 @@ RSpec.describe TagUser do
end
it "sets notification level to the highest one if there are multiple tags" do
- TagUser.create!(user: user, tag: tracked_tag, notification_level: TagUser.notification_levels[:tracking])
- TagUser.create!(user: user, tag: muted_tag, notification_level: TagUser.notification_levels[:muted])
- TagUser.create!(user: user, tag: watched_tag, notification_level: TagUser.notification_levels[:watching])
+ TagUser.create!(
+ user: user,
+ tag: tracked_tag,
+ notification_level: TagUser.notification_levels[:tracking],
+ )
+ TagUser.create!(
+ user: user,
+ tag: muted_tag,
+ notification_level: TagUser.notification_levels[:muted],
+ )
+ TagUser.create!(
+ user: user,
+ tag: watched_tag,
+ notification_level: TagUser.notification_levels[:watching],
+ )
post = create_post(tags: [muted_tag.name, tracked_tag.name, watched_tag.name])
@@ -218,7 +262,11 @@ RSpec.describe TagUser do
# this is assuming post was already visited in the past, but now cause tag
# was added we should start watching it
TopicUser.change(user.id, post.topic.id, total_msecs_viewed: 1)
- TagUser.create!(user: user, tag: watched_tag, notification_level: TagUser.notification_levels[:watching])
+ TagUser.create!(
+ user: user,
+ tag: watched_tag,
+ notification_level: TagUser.notification_levels[:watching],
+ )
DiscourseTagging.tag_topic_by_names(post.topic, Guardian.new(user), [watched_tag.name])
post.topic.save!
@@ -229,30 +277,42 @@ RSpec.describe TagUser do
it "can stop watching after tag has changed" do
watched_tag2 = Fabricate(:tag)
- TagUser.create!(user: user, tag: watched_tag, notification_level: TagUser.notification_levels[:watching])
- TagUser.create!(user: user, tag: watched_tag2, notification_level: TagUser.notification_levels[:watching])
+ TagUser.create!(
+ user: user,
+ tag: watched_tag,
+ notification_level: TagUser.notification_levels[:watching],
+ )
+ TagUser.create!(
+ user: user,
+ tag: watched_tag2,
+ notification_level: TagUser.notification_levels[:watching],
+ )
post = create_post(tags: [watched_tag.name, watched_tag2.name])
TopicUser.change(user.id, post.topic_id, total_msecs_viewed: 1)
- expect(TopicUser.get(post.topic, user).notification_level).to eq TopicUser.notification_levels[:watching]
+ expect(
+ TopicUser.get(post.topic, user).notification_level,
+ ).to eq TopicUser.notification_levels[:watching]
DiscourseTagging.tag_topic_by_names(post.topic, Guardian.new(user), [watched_tag.name])
post.topic.save!
- expect(TopicUser.get(post.topic, user).notification_level).to eq TopicUser.notification_levels[:watching]
+ expect(
+ TopicUser.get(post.topic, user).notification_level,
+ ).to eq TopicUser.notification_levels[:watching]
DiscourseTagging.tag_topic_by_names(post.topic, Guardian.new(user), [])
post.topic.save!
- expect(TopicUser.get(post.topic, user).notification_level).to eq TopicUser.notification_levels[:tracking]
-
+ expect(
+ TopicUser.get(post.topic, user).notification_level,
+ ).to eq TopicUser.notification_levels[:tracking]
end
it "correctly handles staff tags" do
-
staff = Fabricate(:admin)
topic = create_post.topic
- create_staff_only_tags(['foo'])
+ create_staff_only_tags(["foo"])
result = DiscourseTagging.tag_topic_by_names(topic, Guardian.new(user), ["foo"])
expect(result).to eq(false)
@@ -269,16 +329,19 @@ RSpec.describe TagUser do
topic.reload
- result = DiscourseTagging.tag_topic_by_names(topic, Guardian.new(user), ["foo", "bar"])
+ result = DiscourseTagging.tag_topic_by_names(topic, Guardian.new(user), %w[foo bar])
expect(result).to eq(true)
topic.reload
expect(topic.tags.length).to eq(2)
-
end
it "is destroyed when a user is deleted" do
- TagUser.create!(user: user, tag: tracked_tag, notification_level: TagUser.notification_levels[:tracking])
+ TagUser.create!(
+ user: user,
+ tag: tracked_tag,
+ notification_level: TagUser.notification_levels[:tracking],
+ )
user.destroy!
expect(TagUser.where(user_id: user.id).count).to eq(0)
end
@@ -311,10 +374,26 @@ RSpec.describe TagUser do
context "for a user" do
let(:user) { Fabricate(:user) }
before do
- TagUser.create(user: user, tag: tag1, notification_level: TagUser.notification_levels[:watching])
- TagUser.create(user: user, tag: tag2, notification_level: TagUser.notification_levels[:tracking])
- TagUser.create(user: user, tag: tag3, notification_level: TagUser.notification_levels[:watching_first_post])
- TagUser.create(user: user, tag: tag4, notification_level: TagUser.notification_levels[:muted])
+ TagUser.create(
+ user: user,
+ tag: tag1,
+ notification_level: TagUser.notification_levels[:watching],
+ )
+ TagUser.create(
+ user: user,
+ tag: tag2,
+ notification_level: TagUser.notification_levels[:tracking],
+ )
+ TagUser.create(
+ user: user,
+ tag: tag3,
+ notification_level: TagUser.notification_levels[:watching_first_post],
+ )
+ TagUser.create(
+ user: user,
+ tag: tag4,
+ notification_level: TagUser.notification_levels[:muted],
+ )
end
it "gets the tag_user notification levels for all tags the user is tracking and does not
@@ -332,7 +411,9 @@ RSpec.describe TagUser do
group = Fabricate(:group)
tag_group = Fabricate(:tag_group, tags: [tag2], permissions: { group.name => 1 })
- expect(TagUser.notification_levels_for(user).keys).to match_array([tag1.name, tag3.name, tag4.name])
+ expect(TagUser.notification_levels_for(user).keys).to match_array(
+ [tag1.name, tag3.name, tag4.name],
+ )
end
end
end
diff --git a/spec/models/theme_field_spec.rb b/spec/models/theme_field_spec.rb
index 5a14bca2fa6..145d6fd48a3 100644
--- a/spec/models/theme_field_spec.rb
+++ b/spec/models/theme_field_spec.rb
@@ -17,21 +17,20 @@ RSpec.describe ThemeField do
ThemeField.create!(theme: theme3, target_id: num, name: "header", value: "html ")
end
- expect(ThemeField.find_by_theme_ids(
- [theme3.id, theme.id, theme2.id]
- ).pluck(:theme_id)).to eq(
- [theme3.id, theme3.id, theme.id, theme.id, theme2.id, theme2.id]
+ expect(ThemeField.find_by_theme_ids([theme3.id, theme.id, theme2.id]).pluck(:theme_id)).to eq(
+ [theme3.id, theme3.id, theme.id, theme.id, theme2.id, theme2.id],
)
end
end
- it 'does not insert a script tag when there are no inline script' do
- theme_field = ThemeField.create!(theme_id: 1, target_id: 0, name: "body_tag", value: 'new div
')
+ it "does not insert a script tag when there are no inline script" do
+ theme_field =
+ ThemeField.create!(theme_id: 1, target_id: 0, name: "body_tag", value: "new div
")
theme_field.ensure_baked!
- expect(theme_field.value_baked).to_not include('I am bold")
theme.save!
expect(Theme.lookup_field(theme.id, :desktop, "head_tag")).to eq("I am bold ")
end
- it 'should precompile fragments in body and head tags' do
+ it "should precompile fragments in body and head tags" do
with_template = <
{{hello}}
@@ -134,15 +138,15 @@ HTML
theme.set_field(target: :common, name: "header", value: with_template)
theme.save!
- field = theme.theme_fields.find_by(target_id: Theme.targets[:common], name: 'header')
+ field = theme.theme_fields.find_by(target_id: Theme.targets[:common], name: "header")
baked = Theme.lookup_field(theme.id, :mobile, "header")
expect(baked).to include(field.javascript_cache.url)
- expect(field.javascript_cache.content).to include('@ember/template-factory')
- expect(field.javascript_cache.content).to include('raw-handlebars')
+ expect(field.javascript_cache.content).to include("@ember/template-factory")
+ expect(field.javascript_cache.content).to include("raw-handlebars")
end
- it 'can destroy unbaked theme without errors' do
+ it "can destroy unbaked theme without errors" do
with_template = <
{{hello}}
@@ -154,26 +158,26 @@ HTML
theme.set_field(target: :common, name: "header", value: with_template)
theme.save!
- field = theme.theme_fields.find_by(target_id: Theme.targets[:common], name: 'header')
+ field = theme.theme_fields.find_by(target_id: Theme.targets[:common], name: "header")
baked = Theme.lookup_field(theme.id, :mobile, "header")
ThemeField.where(id: field.id).update_all(compiler_version: 0) # update_all to avoid callbacks
field.reload.destroy!
end
- it 'should create body_tag_baked on demand if needed' do
+ it "should create body_tag_baked on demand if needed" do
theme.set_field(target: :common, name: :body_tag, value: "test")
theme.save
ThemeField.update_all(value_baked: nil)
- expect(Theme.lookup_field(theme.id, :desktop, :body_tag)).to match(/test<\/b>/)
+ expect(Theme.lookup_field(theme.id, :desktop, :body_tag)).to match(%r{test })
end
describe "#switch_to_component!" do
it "correctly converts a theme to component" do
theme.add_relative_theme!(:child, child)
- scheme = ColorScheme.create!(name: 'test')
+ scheme = ColorScheme.create!(name: "test")
theme.update!(color_scheme_id: scheme.id, user_selectable: true)
theme.set_default!
@@ -227,7 +231,13 @@ HTML
describe "plugin api" do
def transpile(html)
- f = ThemeField.create!(target_id: Theme.targets[:mobile], theme_id: 1, name: "after_header", value: html)
+ f =
+ ThemeField.create!(
+ target_id: Theme.targets[:mobile],
+ theme_id: 1,
+ name: "after_header",
+ value: html,
+ )
f.ensure_baked!
[f.value_baked, f.javascript_cache, f]
end
@@ -244,27 +254,29 @@ HTML
expect(javascript_cache.content).to include("if ('define' in window) {")
expect(javascript_cache.content).to include(
- "define(\"discourse/theme-#{field.theme_id}/initializers/theme-field-#{field.id}-mobile-html-script-1\""
+ "define(\"discourse/theme-#{field.theme_id}/initializers/theme-field-#{field.id}-mobile-html-script-1\"",
)
expect(javascript_cache.content).to include(
- "settings = require(\"discourse/lib/theme-settings-store\").getObjectForTheme(#{field.theme_id});"
+ "settings = require(\"discourse/lib/theme-settings-store\").getObjectForTheme(#{field.theme_id});",
+ )
+ expect(javascript_cache.content).to include(
+ "name: \"theme-field-#{field.id}-mobile-html-script-1\",",
)
- expect(javascript_cache.content).to include("name: \"theme-field-#{field.id}-mobile-html-script-1\",")
expect(javascript_cache.content).to include("after: \"inject-objects\",")
expect(javascript_cache.content).to include("(0, _pluginApi.withPluginApi)(\"0.1\", api =>")
expect(javascript_cache.content).to include("const x = 1;")
end
end
- describe 'theme upload vars' do
+ describe "theme upload vars" do
let :image do
file_from_fixtures("logo.png")
end
- it 'can handle uploads based of ThemeField' do
+ it "can handle uploads based of ThemeField" do
upload = UploadCreator.new(image, "logo.png").create_for(-1)
theme.set_field(target: :common, name: :logo, upload_id: upload.id, type: :theme_upload_var)
- theme.set_field(target: :common, name: :scss, value: 'body {background-image: url($logo)}')
+ theme.set_field(target: :common, name: :scss, value: "body {background-image: url($logo)}")
theme.save!
# make sure we do not nuke it
@@ -279,9 +291,12 @@ HTML
manager = Stylesheet::Manager.new(theme_id: theme.id)
- scss, _map = Stylesheet::Manager::Builder.new(
- target: :desktop_theme, theme: theme, manager: manager
- ).compile(force: true)
+ scss, _map =
+ Stylesheet::Manager::Builder.new(
+ target: :desktop_theme,
+ theme: theme,
+ manager: manager,
+ ).compile(force: true)
expect(scss).to include(upload.url)
end
@@ -289,26 +304,40 @@ HTML
describe "theme settings" do
it "allows values to be used in scss" do
- theme.set_field(target: :settings, name: :yaml, value: "background_color: red\nfont_size: 25px")
- theme.set_field(target: :common, name: :scss, value: 'body {background-color: $background_color; font-size: $font-size}')
+ theme.set_field(
+ target: :settings,
+ name: :yaml,
+ value: "background_color: red\nfont_size: 25px",
+ )
+ theme.set_field(
+ target: :common,
+ name: :scss,
+ value: "body {background-color: $background_color; font-size: $font-size}",
+ )
theme.save!
manager = Stylesheet::Manager.new(theme_id: theme.id)
- scss, _map = Stylesheet::Manager::Builder.new(
- target: :desktop_theme, theme: theme, manager: manager
- ).compile(force: true)
+ scss, _map =
+ Stylesheet::Manager::Builder.new(
+ target: :desktop_theme,
+ theme: theme,
+ manager: manager,
+ ).compile(force: true)
expect(scss).to include("background-color:red")
expect(scss).to include("font-size:25px")
setting = theme.settings.find { |s| s.name == :font_size }
- setting.value = '30px'
+ setting.value = "30px"
theme.save!
- scss, _map = Stylesheet::Manager::Builder.new(
- target: :desktop_theme, theme: theme, manager: manager
- ).compile(force: true)
+ scss, _map =
+ Stylesheet::Manager::Builder.new(
+ target: :desktop_theme,
+ theme: theme,
+ manager: manager,
+ ).compile(force: true)
expect(scss).to include("font-size:30px")
@@ -318,70 +347,99 @@ HTML
andanothervalue 'withquotes'; margin: 0;
CSS
- theme.set_field(target: :common, name: :scss, value: 'body {font-size: quote($font-size)}')
+ theme.set_field(target: :common, name: :scss, value: "body {font-size: quote($font-size)}")
theme.save!
- scss, _map = Stylesheet::Manager::Builder.new(
- target: :desktop_theme, theme: theme, manager: manager
- ).compile(force: true)
+ scss, _map =
+ Stylesheet::Manager::Builder.new(
+ target: :desktop_theme,
+ theme: theme,
+ manager: manager,
+ ).compile(force: true)
- expect(scss).to include('font-size:"#{$fakeinterpolatedvariable}\a andanothervalue \'withquotes\'; margin: 0;\a"')
+ expect(scss).to include(
+ 'font-size:"#{$fakeinterpolatedvariable}\a andanothervalue \'withquotes\'; margin: 0;\a"',
+ )
end
it "can use a setting straight away after introducing it" do
- theme.set_field(target: :common, name: :scss, value: 'body {background-color: red;}')
+ theme.set_field(target: :common, name: :scss, value: "body {background-color: red;}")
theme.save!
theme.reload
- theme.set_field(target: :settings, name: :yaml, value: "background_color: red\nfont_size: 25px")
- theme.set_field(target: :common, name: :scss, value: 'body {background-color: $background_color;}')
+ theme.set_field(
+ target: :settings,
+ name: :yaml,
+ value: "background_color: red\nfont_size: 25px",
+ )
+ theme.set_field(
+ target: :common,
+ name: :scss,
+ value: "body {background-color: $background_color;}",
+ )
theme.save!
- expect(theme.theme_fields.find_by(target_id: Theme.targets[:common], name: "scss").error).to eq(nil)
+ expect(
+ theme.theme_fields.find_by(target_id: Theme.targets[:common], name: "scss").error,
+ ).to eq(nil)
end
it "allows values to be used in JS" do
theme.name = 'awesome theme"'
theme.set_field(target: :settings, name: :yaml, value: "name: bob")
- theme_field = theme.set_field(target: :common, name: :after_header, value: '')
+ theme_field =
+ theme.set_field(
+ target: :common,
+ name: :after_header,
+ value:
+ '',
+ )
theme.save!
theme_field.reload
- expect(Theme.lookup_field(theme.id, :desktop, :after_header)).to include(theme_field.javascript_cache.url)
+ expect(Theme.lookup_field(theme.id, :desktop, :after_header)).to include(
+ theme_field.javascript_cache.url,
+ )
expect(theme_field.javascript_cache.content).to include("if ('require' in window) {")
expect(theme_field.javascript_cache.content).to include(
- "require(\"discourse/lib/theme-settings-store\").registerSettings(#{theme_field.theme.id}, {\"name\":\"bob\"});"
+ "require(\"discourse/lib/theme-settings-store\").registerSettings(#{theme_field.theme.id}, {\"name\":\"bob\"});",
)
expect(theme_field.javascript_cache.content).to include("if ('define' in window) {")
expect(theme_field.javascript_cache.content).to include(
- "define(\"discourse/theme-#{theme_field.theme.id}/initializers/theme-field-#{theme_field.id}-common-html-script-1\","
+ "define(\"discourse/theme-#{theme_field.theme.id}/initializers/theme-field-#{theme_field.id}-common-html-script-1\",",
+ )
+ expect(theme_field.javascript_cache.content).to include(
+ "name: \"theme-field-#{theme_field.id}-common-html-script-1\",",
)
- expect(theme_field.javascript_cache.content).to include("name: \"theme-field-#{theme_field.id}-common-html-script-1\",")
expect(theme_field.javascript_cache.content).to include("after: \"inject-objects\",")
- expect(theme_field.javascript_cache.content).to include("(0, _pluginApi.withPluginApi)(\"1.0\", api =>")
+ expect(theme_field.javascript_cache.content).to include(
+ "(0, _pluginApi.withPluginApi)(\"1.0\", api =>",
+ )
expect(theme_field.javascript_cache.content).to include("alert(settings.name)")
expect(theme_field.javascript_cache.content).to include("let a = () => {}")
setting = theme.settings.find { |s| s.name == :name }
- setting.value = 'bill'
+ setting.value = "bill"
theme.save!
theme_field.reload
expect(theme_field.javascript_cache.content).to include(
- "require(\"discourse/lib/theme-settings-store\").registerSettings(#{theme_field.theme.id}, {\"name\":\"bill\"});"
+ "require(\"discourse/lib/theme-settings-store\").registerSettings(#{theme_field.theme.id}, {\"name\":\"bill\"});",
+ )
+ expect(Theme.lookup_field(theme.id, :desktop, :after_header)).to include(
+ theme_field.javascript_cache.url,
)
- expect(Theme.lookup_field(theme.id, :desktop, :after_header)).to include(theme_field.javascript_cache.url)
end
- it 'is empty when the settings are invalid' do
- theme.set_field(target: :settings, name: :yaml, value: 'nil_setting: ')
+ it "is empty when the settings are invalid" do
+ theme.set_field(target: :settings, name: :yaml, value: "nil_setting: ")
theme.save!
expect(theme.settings).to be_empty
end
end
- it 'correctly caches theme ids' do
+ it "correctly caches theme ids" do
Theme.destroy_all
theme
@@ -410,7 +468,7 @@ HTML
expect(Theme.user_theme_ids).to eq([])
end
- it 'correctly caches user_themes template' do
+ it "correctly caches user_themes template" do
Theme.destroy_all
json = Site.json_for(guardian)
@@ -446,56 +504,64 @@ HTML
Theme.find_by(id: id).included_settings.to_json
end
- it 'clears color scheme cache correctly' do
+ it "clears color scheme cache correctly" do
Theme.destroy_all
- cs = Fabricate(:color_scheme, name: 'Fancy', color_scheme_colors: [
- Fabricate(:color_scheme_color, name: 'header_primary', hex: 'F0F0F0'),
- Fabricate(:color_scheme_color, name: 'header_background', hex: '1E1E1E'),
- Fabricate(:color_scheme_color, name: 'tertiary', hex: '858585')
- ])
+ cs =
+ Fabricate(
+ :color_scheme,
+ name: "Fancy",
+ color_scheme_colors: [
+ Fabricate(:color_scheme_color, name: "header_primary", hex: "F0F0F0"),
+ Fabricate(:color_scheme_color, name: "header_background", hex: "1E1E1E"),
+ Fabricate(:color_scheme_color, name: "tertiary", hex: "858585"),
+ ],
+ )
- theme = Fabricate(:theme,
- user_selectable: true,
- user: Fabricate(:admin),
- color_scheme_id: cs.id
- )
+ theme =
+ Fabricate(:theme, user_selectable: true, user: Fabricate(:admin), color_scheme_id: cs.id)
theme.set_default!
- expect(ColorScheme.hex_for_name('header_primary')).to eq('F0F0F0')
+ expect(ColorScheme.hex_for_name("header_primary")).to eq("F0F0F0")
Theme.clear_default!
- expect(ColorScheme.hex_for_name('header_primary')).to eq('333333')
+ expect(ColorScheme.hex_for_name("header_primary")).to eq("333333")
end
it "correctly notifies about theme changes" do
cs1 = Fabricate(:color_scheme)
cs2 = Fabricate(:color_scheme)
- theme = Fabricate(:theme,
- user_selectable: true,
- user: user,
- color_scheme_id: cs1.id
+ theme = Fabricate(:theme, user_selectable: true, user: user, color_scheme_id: cs1.id)
+
+ messages = MessageBus.track_publish { theme.save! }.filter { |m| m.channel == "/file-change" }
+ expect(messages.count).to eq(1)
+ expect(messages.first.data.map { |d| d[:target] }).to contain_exactly(
+ :desktop_theme,
+ :mobile_theme,
)
- messages = MessageBus.track_publish do
- theme.save!
- end.filter { |m| m.channel == "/file-change" }
- expect(messages.count).to eq(1)
- expect(messages.first.data.map { |d| d[:target] }).to contain_exactly(:desktop_theme, :mobile_theme)
-
# With color scheme change:
- messages = MessageBus.track_publish do
- theme.color_scheme_id = cs2.id
- theme.save!
- end.filter { |m| m.channel == "/file-change" }
+ messages =
+ MessageBus
+ .track_publish do
+ theme.color_scheme_id = cs2.id
+ theme.save!
+ end
+ .filter { |m| m.channel == "/file-change" }
expect(messages.count).to eq(1)
- expect(messages.first.data.map { |d| d[:target] }).to contain_exactly(:admin, :desktop, :desktop_theme, :mobile, :mobile_theme)
+ expect(messages.first.data.map { |d| d[:target] }).to contain_exactly(
+ :admin,
+ :desktop,
+ :desktop_theme,
+ :mobile,
+ :mobile_theme,
+ )
end
- it 'includes theme_uploads in settings' do
+ it "includes theme_uploads in settings" do
Theme.destroy_all
upload = UploadCreator.new(file_from_fixtures("logo.png"), "logo.png").create_for(-1)
@@ -507,7 +573,7 @@ HTML
expect(json["theme_uploads"]["bob"]).to eq(upload.url)
end
- it 'does not break on missing uploads in settings' do
+ it "does not break on missing uploads in settings" do
Theme.destroy_all
upload = UploadCreator.new(file_from_fixtures("logo.png"), "logo.png").create_for(-1)
@@ -521,7 +587,7 @@ HTML
expect(json).to be_empty
end
- it 'uses CDN url for theme_uploads in settings' do
+ it "uses CDN url for theme_uploads in settings" do
set_cdn_url("http://cdn.localhost")
Theme.destroy_all
@@ -534,7 +600,7 @@ HTML
expect(json["theme_uploads"]["bob"]).to eq("http://cdn.localhost#{upload.url}")
end
- it 'uses CDN url for settings of type upload' do
+ it "uses CDN url for settings of type upload" do
set_cdn_url("http://cdn.localhost")
Theme.destroy_all
@@ -545,7 +611,12 @@ HTML
default: ""
YAML
- ThemeSetting.create!(theme: theme, data_type: ThemeSetting.types[:upload], value: upload.id.to_s, name: "my_upload")
+ ThemeSetting.create!(
+ theme: theme,
+ data_type: ThemeSetting.types[:upload],
+ value: upload.id.to_s,
+ name: "my_upload",
+ )
theme.save!
json = JSON.parse(cached_settings(theme.id))
@@ -553,9 +624,12 @@ HTML
end
describe "convert_settings" do
-
- it 'can migrate a list field to a string field with json schema' do
- theme.set_field(target: :settings, name: :yaml, value: "valid_json_schema_setting:\n default: \"green,globe\"\n type: \"list\"")
+ it "can migrate a list field to a string field with json schema" do
+ theme.set_field(
+ target: :settings,
+ name: :yaml,
+ value: "valid_json_schema_setting:\n default: \"green,globe\"\n type: \"list\"",
+ )
theme.save!
setting = theme.settings.find { |s| s.name == :valid_json_schema_setting }
@@ -571,12 +645,20 @@ HTML
theme.convert_settings
setting = theme.settings.find { |s| s.name == :valid_json_schema_setting }
- expect(JSON.parse(setting.value)).to eq(JSON.parse('[{"color":"red","icon":"globe"},{"color":"green","icon":"cog"},{"color":"brown","icon":"users"}]'))
+ expect(JSON.parse(setting.value)).to eq(
+ JSON.parse(
+ '[{"color":"red","icon":"globe"},{"color":"green","icon":"cog"},{"color":"brown","icon":"users"}]',
+ ),
+ )
expect(setting.type).to eq(ThemeSetting.types[:string])
end
- it 'does not update setting if data does not validate against json schema' do
- theme.set_field(target: :settings, name: :yaml, value: "valid_json_schema_setting:\n default: \"green,globe\"\n type: \"list\"")
+ it "does not update setting if data does not validate against json schema" do
+ theme.set_field(
+ target: :settings,
+ name: :yaml,
+ value: "valid_json_schema_setting:\n default: \"green,globe\"\n type: \"list\"",
+ )
theme.save!
setting = theme.settings.find { |s| s.name == :valid_json_schema_setting }
@@ -600,24 +682,34 @@ HTML
expect(setting.type).to eq(ThemeSetting.types[:string])
end
- it 'warns when the theme has modified the setting type but data cannot be converted' do
+ it "warns when the theme has modified the setting type but data cannot be converted" do
begin
@orig_logger = Rails.logger
Rails.logger = @fake_logger = FakeLogger.new
- theme.set_field(target: :settings, name: :yaml, value: "valid_json_schema_setting:\n default: \"\"\n type: \"list\"")
+ theme.set_field(
+ target: :settings,
+ name: :yaml,
+ value: "valid_json_schema_setting:\n default: \"\"\n type: \"list\"",
+ )
theme.save!
setting = theme.settings.find { |s| s.name == :valid_json_schema_setting }
setting.value = "red,globe"
theme.save!
- theme.set_field(target: :settings, name: :yaml, value: "valid_json_schema_setting:\n default: \"\"\n type: \"string\"")
+ theme.set_field(
+ target: :settings,
+ name: :yaml,
+ value: "valid_json_schema_setting:\n default: \"\"\n type: \"string\"",
+ )
theme.save!
theme.convert_settings
expect(setting.value).to eq("red,globe")
- expect(@fake_logger.warnings[0]).to include("Theme setting type has changed but cannot be converted.")
+ expect(@fake_logger.warnings[0]).to include(
+ "Theme setting type has changed but cannot be converted.",
+ )
ensure
Rails.logger = @orig_logger
end
@@ -626,7 +718,13 @@ HTML
describe "theme translations" do
it "can list working theme_translation_manager objects" do
- en_translation = ThemeField.create!(theme_id: theme.id, name: "en", type_id: ThemeField.types[:yaml], target_id: Theme.targets[:translations], value: <<~YAML)
+ en_translation =
+ ThemeField.create!(
+ theme_id: theme.id,
+ name: "en",
+ type_id: ThemeField.types[:yaml],
+ target_id: Theme.targets[:translations],
+ value: <<~YAML,
en:
theme_metadata:
description: "Description of my theme"
@@ -636,62 +734,78 @@ HTML
base_translation1: en test3
base_translation2: en test4
YAML
- fr_translation = ThemeField.create!(theme_id: theme.id, name: "fr", type_id: ThemeField.types[:yaml], target_id: Theme.targets[:translations], value: <<~YAML)
+ )
+ fr_translation =
+ ThemeField.create!(
+ theme_id: theme.id,
+ name: "fr",
+ type_id: ThemeField.types[:yaml],
+ target_id: Theme.targets[:translations],
+ value: <<~YAML,
fr:
group_of_translations:
translation2: fr test2
base_translation2: fr test4
base_translation3: fr test5
YAML
+ )
I18n.locale = :fr
theme.update_translation("group_of_translations.translation1", "overriddentest1")
translations = theme.translations
theme.reload
- expect(translations.map(&:key)).to eq([
- "group_of_translations.translation1",
- "group_of_translations.translation2",
- "base_translation1",
- "base_translation2",
- "base_translation3"
- ])
+ expect(translations.map(&:key)).to eq(
+ %w[
+ group_of_translations.translation1
+ group_of_translations.translation2
+ base_translation1
+ base_translation2
+ base_translation3
+ ],
+ )
- expect(translations.map(&:default)).to eq([
- "en test1",
- "fr test2",
- "en test3",
- "fr test4",
- "fr test5"
- ])
+ expect(translations.map(&:default)).to eq(
+ ["en test1", "fr test2", "en test3", "fr test4", "fr test5"],
+ )
- expect(translations.map(&:value)).to eq([
- "overriddentest1",
- "fr test2",
- "en test3",
- "fr test4",
- "fr test5"
- ])
+ expect(translations.map(&:value)).to eq(
+ ["overriddentest1", "fr test2", "en test3", "fr test4", "fr test5"],
+ )
end
it "can list internal theme_translation_manager objects" do
- en_translation = ThemeField.create!(theme_id: theme.id, name: "en", type_id: ThemeField.types[:yaml], target_id: Theme.targets[:translations], value: <<~YAML)
+ en_translation =
+ ThemeField.create!(
+ theme_id: theme.id,
+ name: "en",
+ type_id: ThemeField.types[:yaml],
+ target_id: Theme.targets[:translations],
+ value: <<~YAML,
en:
theme_metadata:
description: "Description of my theme"
another_translation: en test4
YAML
+ )
translations = theme.internal_translations
expect(translations.map(&:key)).to contain_exactly("theme_metadata.description")
expect(translations.map(&:value)).to contain_exactly("Description of my theme")
end
it "can create a hash of overridden values" do
- en_translation = ThemeField.create!(theme_id: theme.id, name: "en", type_id: ThemeField.types[:yaml], target_id: Theme.targets[:translations], value: <<~YAML)
+ en_translation =
+ ThemeField.create!(
+ theme_id: theme.id,
+ name: "en",
+ type_id: ThemeField.types[:yaml],
+ target_id: Theme.targets[:translations],
+ value: <<~YAML,
en:
group_of_translations:
translation1: en test1
YAML
+ )
theme.update_translation("group_of_translations.translation1", "overriddentest1")
I18n.locale = :fr
@@ -700,31 +814,54 @@ HTML
expect(theme.translation_override_hash).to eq(
"en" => {
"group_of_translations" => {
- "translation1" => "overriddentest1"
- }
+ "translation1" => "overriddentest1",
+ },
},
"fr" => {
"group_of_translations" => {
- "translation1" => "overriddentest2"
- }
- }
+ "translation1" => "overriddentest2",
+ },
+ },
)
end
it "fall back when listing baked field" do
theme2 = Fabricate(:theme)
- en_translation = ThemeField.create!(theme_id: theme.id, name: "en", type_id: ThemeField.types[:yaml], target_id: Theme.targets[:translations], value: '')
- fr_translation = ThemeField.create!(theme_id: theme.id, name: "fr", type_id: ThemeField.types[:yaml], target_id: Theme.targets[:translations], value: '')
+ en_translation =
+ ThemeField.create!(
+ theme_id: theme.id,
+ name: "en",
+ type_id: ThemeField.types[:yaml],
+ target_id: Theme.targets[:translations],
+ value: "",
+ )
+ fr_translation =
+ ThemeField.create!(
+ theme_id: theme.id,
+ name: "fr",
+ type_id: ThemeField.types[:yaml],
+ target_id: Theme.targets[:translations],
+ value: "",
+ )
- en_translation2 = ThemeField.create!(theme_id: theme2.id, name: "en", type_id: ThemeField.types[:yaml], target_id: Theme.targets[:translations], value: '')
+ en_translation2 =
+ ThemeField.create!(
+ theme_id: theme2.id,
+ name: "en",
+ type_id: ThemeField.types[:yaml],
+ target_id: Theme.targets[:translations],
+ value: "",
+ )
- expect(Theme.list_baked_fields([theme.id, theme2.id], :translations, 'fr').map(&:id)).to contain_exactly(fr_translation.id, en_translation2.id)
+ expect(
+ Theme.list_baked_fields([theme.id, theme2.id], :translations, "fr").map(&:id),
+ ).to contain_exactly(fr_translation.id, en_translation2.id)
end
end
describe "automatic recompile" do
- it 'must recompile after bumping theme_field version' do
+ it "must recompile after bumping theme_field version" do
child.set_field(target: :common, name: "header", value: "World")
child.set_field(target: :extra_js, name: "test.js.es6", value: "const hello = 'world';")
child.save!
@@ -732,32 +869,45 @@ HTML
first_common_value = Theme.lookup_field(child.id, :desktop, "header")
first_extra_js_value = Theme.lookup_field(child.id, :extra_js, nil)
- Theme.stubs(:compiler_version).returns("SOME_NEW_HASH") do
- second_common_value = Theme.lookup_field(child.id, :desktop, "header")
- second_extra_js_value = Theme.lookup_field(child.id, :extra_js, nil)
+ Theme
+ .stubs(:compiler_version)
+ .returns("SOME_NEW_HASH") do
+ second_common_value = Theme.lookup_field(child.id, :desktop, "header")
+ second_extra_js_value = Theme.lookup_field(child.id, :extra_js, nil)
- new_common_compiler_version = ThemeField.find_by(theme_id: child.id, name: "header").compiler_version
- new_extra_js_compiler_version = ThemeField.find_by(theme_id: child.id, name: "test.js.es6").compiler_version
+ new_common_compiler_version =
+ ThemeField.find_by(theme_id: child.id, name: "header").compiler_version
+ new_extra_js_compiler_version =
+ ThemeField.find_by(theme_id: child.id, name: "test.js.es6").compiler_version
- expect(first_common_value).to eq(second_common_value)
- expect(first_extra_js_value).to eq(second_extra_js_value)
+ expect(first_common_value).to eq(second_common_value)
+ expect(first_extra_js_value).to eq(second_extra_js_value)
- expect(new_common_compiler_version).to eq("SOME_NEW_HASH")
- expect(new_extra_js_compiler_version).to eq("SOME_NEW_HASH")
- end
+ expect(new_common_compiler_version).to eq("SOME_NEW_HASH")
+ expect(new_extra_js_compiler_version).to eq("SOME_NEW_HASH")
+ end
end
- it 'recompiles when the hostname changes' do
+ it "recompiles when the hostname changes" do
theme.set_field(target: :settings, name: :yaml, value: "name: bob")
- theme_field = theme.set_field(target: :common, name: :after_header, value: '')
+ theme_field =
+ theme.set_field(
+ target: :common,
+ name: :after_header,
+ value: '',
+ )
theme.save!
- expect(Theme.lookup_field(theme.id, :common, :after_header)).to include("_ws=#{Discourse.current_hostname}")
+ expect(Theme.lookup_field(theme.id, :common, :after_header)).to include(
+ "_ws=#{Discourse.current_hostname}",
+ )
SiteSetting.force_hostname = "someotherhostname.com"
Theme.clear_cache!
- expect(Theme.lookup_field(theme.id, :common, :after_header)).to include("_ws=someotherhostname.com")
+ expect(Theme.lookup_field(theme.id, :common, :after_header)).to include(
+ "_ws=someotherhostname.com",
+ )
end
end
@@ -766,28 +916,31 @@ HTML
let(:second_file_scss) { "p { color: blue};" }
let(:child_scss) { "body { background: green}" }
- let(:theme) { Fabricate(:theme).tap { |t|
- t.set_field(target: :extra_scss, name: "my_files/magic", value: scss)
- t.set_field(target: :extra_scss, name: "my_files/magic2", value: second_file_scss)
- t.save!
- }}
+ let(:theme) do
+ Fabricate(:theme).tap do |t|
+ t.set_field(target: :extra_scss, name: "my_files/magic", value: scss)
+ t.set_field(target: :extra_scss, name: "my_files/magic2", value: second_file_scss)
+ t.save!
+ end
+ end
- let(:child_theme) { Fabricate(:theme).tap { |t|
- t.component = true
- t.set_field(target: :extra_scss, name: "my_files/moremagic", value: child_scss)
- t.save!
- theme.add_relative_theme!(:child, t)
- }}
+ let(:child_theme) do
+ Fabricate(:theme).tap do |t|
+ t.component = true
+ t.set_field(target: :extra_scss, name: "my_files/moremagic", value: child_scss)
+ t.save!
+ theme.add_relative_theme!(:child, t)
+ end
+ end
- let(:compiler) {
+ let(:compiler) do
manager = Stylesheet::Manager.new(theme_id: theme.id)
- builder = Stylesheet::Manager::Builder.new(
- target: :desktop_theme, theme: theme, manager: manager
- )
+ builder =
+ Stylesheet::Manager::Builder.new(target: :desktop_theme, theme: theme, manager: manager)
builder.compile(force: true)
- }
+ end
it "works when importing file by path" do
theme.set_field(target: :common, name: :scss, value: '@import "my_files/magic";')
@@ -798,7 +951,11 @@ HTML
end
it "works when importing multiple files" do
- theme.set_field(target: :common, name: :scss, value: '@import "my_files/magic"; @import "my_files/magic2"')
+ theme.set_field(
+ target: :common,
+ name: :scss,
+ value: '@import "my_files/magic"; @import "my_files/magic2"',
+ )
theme.save!
css, _map = compiler
@@ -812,9 +969,12 @@ HTML
manager = Stylesheet::Manager.new(theme_id: child_theme.id)
- builder = Stylesheet::Manager::Builder.new(
- target: :desktop_theme, theme: child_theme, manager: manager
- )
+ builder =
+ Stylesheet::Manager::Builder.new(
+ target: :desktop_theme,
+ theme: child_theme,
+ manager: manager,
+ )
css, _map = builder.compile(force: true)
expect(css).to include("body{background:green}")
@@ -827,7 +987,11 @@ HTML
end
it "includes settings and uploads when set" do
- theme.set_field(target: :settings, name: :yaml, value: "background_color: red\nfont_size: 25px")
+ theme.set_field(
+ target: :settings,
+ name: :yaml,
+ value: "background_color: red\nfont_size: 25px",
+ )
upload = UploadCreator.new(file_from_fixtures("logo.png"), "logo.png").create_for(-1)
theme.set_field(type: :theme_upload_var, target: :common, name: "bobby", upload_id: upload.id)
theme.save!
@@ -844,23 +1008,23 @@ HTML
theme_id: theme.id,
target_id: Theme.targets[:settings],
name: "yaml",
- value: "some_number: 1"
+ value: "some_number: 1",
)
theme.set_field(
target: :tests_js,
type: :js,
name: "acceptance/some-test.js",
- value: "assert.ok(true);"
+ value: "assert.ok(true);",
)
theme.save!
end
- it 'returns nil for content and digest if theme does not have tests' do
+ it "returns nil for content and digest if theme does not have tests" do
ThemeField.destroy_all
expect(theme.baked_js_tests_with_digest).to eq([nil, nil])
end
- it 'digest does not change when settings are changed' do
+ it "digest does not change when settings are changed" do
content, digest = theme.baked_js_tests_with_digest
expect(content).to be_present
expect(digest).to be_present
@@ -885,13 +1049,20 @@ HTML
refresh: true
YAML
- ThemeSetting.create!(theme: theme, data_type: ThemeSetting.types[:bool], name: "super_feature_enabled")
+ ThemeSetting.create!(
+ theme: theme,
+ data_type: ThemeSetting.types[:bool],
+ name: "super_feature_enabled",
+ )
theme.save!
- messages = MessageBus.track_publish do
- theme.update_setting(:super_feature_enabled, true)
- theme.save!
- end.filter { |m| m.channel == "/global/asset-version" }
+ messages =
+ MessageBus
+ .track_publish do
+ theme.update_setting(:super_feature_enabled, true)
+ theme.save!
+ end
+ .filter { |m| m.channel == "/global/asset-version" }
expect(messages.count).to eq(1)
end
@@ -904,13 +1075,20 @@ HTML
refresh: false
YAML
- ThemeSetting.create!(theme: theme, data_type: ThemeSetting.types[:bool], name: "super_feature_enabled")
+ ThemeSetting.create!(
+ theme: theme,
+ data_type: ThemeSetting.types[:bool],
+ name: "super_feature_enabled",
+ )
theme.save!
- messages = MessageBus.track_publish do
- theme.update_setting(:super_feature_enabled, true)
- theme.save!
- end.filter { |m| m.channel == "/global/asset-version" }
+ messages =
+ MessageBus
+ .track_publish do
+ theme.update_setting(:super_feature_enabled, true)
+ theme.save!
+ end
+ .filter { |m| m.channel == "/global/asset-version" }
expect(messages.count).to eq(0)
end
diff --git a/spec/models/top_menu_item_spec.rb b/spec/models/top_menu_item_spec.rb
index 30eb2e00843..16b827439d6 100644
--- a/spec/models/top_menu_item_spec.rb
+++ b/spec/models/top_menu_item_spec.rb
@@ -1,15 +1,12 @@
# frozen_string_literal: true
RSpec.describe TopMenuItem do
- before do
- SiteSetting.top_menu = 'categories|latest'
- end
+ before { SiteSetting.top_menu = "categories|latest" }
let(:items) { SiteSetting.top_menu_items }
- it 'has name' do
- expect(items[0].name).to eq('categories')
- expect(items[1].name).to eq('latest')
+ it "has name" do
+ expect(items[0].name).to eq("categories")
+ expect(items[1].name).to eq("latest")
end
-
end
diff --git a/spec/models/top_topic_spec.rb b/spec/models/top_topic_spec.rb
index 6542779e295..f0fa30b4c94 100644
--- a/spec/models/top_topic_spec.rb
+++ b/spec/models/top_topic_spec.rb
@@ -1,11 +1,9 @@
# frozen_string_literal: true
RSpec.describe TopTopic do
- describe '#sorted_periods' do
+ describe "#sorted_periods" do
context "when verifying enum sequence" do
- before do
- @sorted_periods = TopTopic.sorted_periods
- end
+ before { @sorted_periods = TopTopic.sorted_periods }
it "'daily' should be at 1st position" do
expect(@sorted_periods[:daily]).to eq(1)
@@ -28,9 +26,7 @@ RSpec.describe TopTopic do
end
context "after calculating" do
- before do
- TopTopic.refresh!
- end
+ before { TopTopic.refresh! }
it "should have top topics" do
expect(TopTopic.pluck(:topic_id)).to match_array([t1.id, t2.id])
@@ -51,8 +47,8 @@ RSpec.describe TopTopic do
fab!(:topic_3) { Fabricate(:topic, posts_count: 10) }
fab!(:t3_post_1) { Fabricate(:post, topic_id: topic_3.id) }
- let!(:t3_view_1) { TopicViewItem.add(topic_3.id, '127.0.0.1', user) }
- let!(:t3_view_2) { TopicViewItem.add(topic_3.id, '127.0.0.2', coding_horror) }
+ let!(:t3_view_1) { TopicViewItem.add(topic_3.id, "127.0.0.1", user) }
+ let!(:t3_view_2) { TopicViewItem.add(topic_3.id, "127.0.0.2", coding_horror) }
# Note: all topics has 10 posts so we can skip "0 - ((10 - topics.posts_count) / 20) * #{period}_op_likes_count" calculation
@@ -67,8 +63,12 @@ RSpec.describe TopTopic do
top_topics = TopTopic.all
expect(top_topics.where(topic_id: topic_1.id).pluck_first(:yearly_score)).to eq(27)
- expect(top_topics.where(topic_id: topic_2.id).pluck_first(:yearly_score)).to be_within(0.0000000001).of(18.301029995664)
- expect(top_topics.where(topic_id: topic_3.id).pluck_first(:yearly_score)).to be_within(0.0000000001).of(10.602059991328)
+ expect(top_topics.where(topic_id: topic_2.id).pluck_first(:yearly_score)).to be_within(
+ 0.0000000001,
+ ).of(18.301029995664)
+ expect(top_topics.where(topic_id: topic_3.id).pluck_first(:yearly_score)).to be_within(
+ 0.0000000001,
+ ).of(10.602059991328)
# when 'top_topics_formula_log_views_multiplier' setting is changed
SiteSetting.top_topics_formula_log_views_multiplier = 4
@@ -85,8 +85,12 @@ RSpec.describe TopTopic do
top_topics = TopTopic.all
expect(top_topics.where(topic_id: topic_1.id).pluck_first(:yearly_score)).to eq(27)
- expect(top_topics.where(topic_id: topic_2.id).pluck_first(:yearly_score)).to be_within(0.0000000001).of(18.301029995664)
- expect(top_topics.where(topic_id: topic_3.id).pluck_first(:yearly_score)).to be_within(0.0000000001).of(11.2041199826559)
+ expect(top_topics.where(topic_id: topic_2.id).pluck_first(:yearly_score)).to be_within(
+ 0.0000000001,
+ ).of(18.301029995664)
+ expect(top_topics.where(topic_id: topic_3.id).pluck_first(:yearly_score)).to be_within(
+ 0.0000000001,
+ ).of(11.2041199826559)
# when 'top_topics_formula_first_post_likes_multiplier' setting is changed
SiteSetting.top_topics_formula_log_views_multiplier = 2 # unchanged
@@ -103,8 +107,12 @@ RSpec.describe TopTopic do
top_topics = TopTopic.all
expect(top_topics.where(topic_id: topic_1.id).pluck_first(:yearly_score)).to eq(69)
- expect(top_topics.where(topic_id: topic_2.id).pluck_first(:yearly_score)).to be_within(0.0000000001).of(33.301029995664)
- expect(top_topics.where(topic_id: topic_3.id).pluck_first(:yearly_score)).to be_within(0.0000000001).of(10.602059991328)
+ expect(top_topics.where(topic_id: topic_2.id).pluck_first(:yearly_score)).to be_within(
+ 0.0000000001,
+ ).of(33.301029995664)
+ expect(top_topics.where(topic_id: topic_3.id).pluck_first(:yearly_score)).to be_within(
+ 0.0000000001,
+ ).of(10.602059991328)
# when 'top_topics_formula_least_likes_per_post_multiplier' setting is changed
SiteSetting.top_topics_formula_log_views_multiplier = 2 # unchanged
@@ -121,8 +129,12 @@ RSpec.describe TopTopic do
top_topics = TopTopic.all
expect(top_topics.where(topic_id: topic_1.id).pluck_first(:yearly_score)).to eq(30)
- expect(top_topics.where(topic_id: topic_2.id).pluck_first(:yearly_score)).to be_within(0.0000000001).of(21.301029995664)
- expect(top_topics.where(topic_id: topic_3.id).pluck_first(:yearly_score)).to be_within(0.0000000001).of(10.602059991328)
+ expect(top_topics.where(topic_id: topic_2.id).pluck_first(:yearly_score)).to be_within(
+ 0.0000000001,
+ ).of(21.301029995664)
+ expect(top_topics.where(topic_id: topic_3.id).pluck_first(:yearly_score)).to be_within(
+ 0.0000000001,
+ ).of(10.602059991328)
# handles invalid string value
SiteSetting.top_topics_formula_log_views_multiplier = "not good"
@@ -133,8 +145,12 @@ RSpec.describe TopTopic do
top_topics = TopTopic.all
expect(top_topics.where(topic_id: topic_1.id).pluck_first(:yearly_score)).to eq(27)
- expect(top_topics.where(topic_id: topic_2.id).pluck_first(:yearly_score)).to be_within(0.0000000001).of(18.301029995664)
- expect(top_topics.where(topic_id: topic_3.id).pluck_first(:yearly_score)).to be_within(0.0000000001).of(10.602059991328)
+ expect(top_topics.where(topic_id: topic_2.id).pluck_first(:yearly_score)).to be_within(
+ 0.0000000001,
+ ).of(18.301029995664)
+ expect(top_topics.where(topic_id: topic_3.id).pluck_first(:yearly_score)).to be_within(
+ 0.0000000001,
+ ).of(10.602059991328)
end
end
end
diff --git a/spec/models/topic_converter_spec.rb b/spec/models/topic_converter_spec.rb
index 7598b144328..9d8da65a333 100644
--- a/spec/models/topic_converter_spec.rb
+++ b/spec/models/topic_converter_spec.rb
@@ -1,19 +1,19 @@
# frozen_string_literal: true
RSpec.describe TopicConverter do
- describe 'convert_to_public_topic' do
+ describe "convert_to_public_topic" do
fab!(:admin) { Fabricate(:admin) }
fab!(:author) { Fabricate(:user) }
fab!(:category) { Fabricate(:category, topic_count: 1) }
fab!(:private_message) { Fabricate(:private_message_topic, user: author) } # creates a topic without a first post
- let(:first_post) { create_post(user: author, topic: private_message, allow_uncategorized_topics: false) }
+ let(:first_post) do
+ create_post(user: author, topic: private_message, allow_uncategorized_topics: false)
+ end
let(:other_user) { private_message.topic_allowed_users.find { |u| u.user != author }.user }
- let(:uncategorized_category) do
- Category.find(SiteSetting.uncategorized_category_id)
- end
+ let(:uncategorized_category) { Category.find(SiteSetting.uncategorized_category_id) }
- context 'with success' do
+ context "with success" do
it "converts private message to regular topic" do
SiteSetting.allow_uncategorized_topics = true
topic = nil
@@ -23,14 +23,15 @@ RSpec.describe TopicConverter do
other_pm = Fabricate(:private_message_post).topic
other_pm_post = Fabricate(:private_message_post, topic: other_pm)
- other_pm_post_2 = Fabricate(:private_message_post, topic: other_pm, user: other_pm_post.user)
+ other_pm_post_2 =
+ Fabricate(:private_message_post, topic: other_pm, user: other_pm_post.user)
expect do
topic = TopicConverter.new(first_post.topic, admin).convert_to_public_topic
topic.reload
- end.to change { uncategorized_category.reload.topic_count }.by(1)
- .and change { author.reload.topic_count }.from(0).to(1)
- .and change { author.reload.post_count }.from(0).to(2)
+ end.to change { uncategorized_category.reload.topic_count }.by(1).and change {
+ author.reload.topic_count
+ }.from(0).to(1).and change { author.reload.post_count }.from(0).to(2)
# Ensure query does not affect users from other topics or posts as DB query to update count is quite complex.
expect(other_pm.user.topic_count).to eq(0)
@@ -43,29 +44,33 @@ RSpec.describe TopicConverter do
expect(topic.category_id).to eq(SiteSetting.uncategorized_category_id)
end
- context 'when uncategorized category is not allowed' do
+ context "when uncategorized category is not allowed" do
before do
SiteSetting.allow_uncategorized_topics = false
category.update!(read_restricted: false)
end
- it 'should convert private message into the right category' do
+ it "should convert private message into the right category" do
topic = TopicConverter.new(first_post.topic, admin).convert_to_public_topic
topic.reload
expect(topic).to be_valid
expect(topic.archetype).to eq("regular")
- first_category = Category.where.not(id: SiteSetting.uncategorized_category_id)
- .where(read_restricted: false).order('id asc').first
+ first_category =
+ Category
+ .where.not(id: SiteSetting.uncategorized_category_id)
+ .where(read_restricted: false)
+ .order("id asc")
+ .first
expect(topic.category_id).to eq(first_category.id)
expect(topic.category.topic_count).to eq(2)
end
end
- context 'when a custom category_id is given' do
- it 'should convert private message into the right category' do
+ context "when a custom category_id is given" do
+ it "should convert private message into the right category" do
topic = TopicConverter.new(first_post.topic, admin).convert_to_public_topic(category.id)
expect(topic.reload.category).to eq(category)
@@ -95,18 +100,26 @@ RSpec.describe TopicConverter do
it "updates UserActions" do
TopicConverter.new(private_message, admin).convert_to_public_topic
- expect(author.user_actions.where(action_type: UserAction::NEW_PRIVATE_MESSAGE).count).to eq(0)
+ expect(
+ author.user_actions.where(action_type: UserAction::NEW_PRIVATE_MESSAGE).count,
+ ).to eq(0)
expect(author.user_actions.where(action_type: UserAction::NEW_TOPIC).count).to eq(1)
- expect(other_user.user_actions.where(action_type: UserAction::NEW_PRIVATE_MESSAGE).count).to eq(0)
- expect(other_user.user_actions.where(action_type: UserAction::GOT_PRIVATE_MESSAGE).count).to eq(0)
+ expect(
+ other_user.user_actions.where(action_type: UserAction::NEW_PRIVATE_MESSAGE).count,
+ ).to eq(0)
+ expect(
+ other_user.user_actions.where(action_type: UserAction::GOT_PRIVATE_MESSAGE).count,
+ ).to eq(0)
expect(other_user.user_actions.where(action_type: UserAction::REPLY).count).to eq(1)
end
end
it "deletes notifications for users not allowed to see the topic" do
staff_category = Fabricate(:private_category, group: Group[:staff])
- user_notification = Fabricate(:mentioned_notification, post: first_post, user: Fabricate(:user))
- admin_notification = Fabricate(:mentioned_notification, post: first_post, user: Fabricate(:admin))
+ user_notification =
+ Fabricate(:mentioned_notification, post: first_post, user: Fabricate(:user))
+ admin_notification =
+ Fabricate(:mentioned_notification, post: first_post, user: Fabricate(:admin))
Jobs.run_immediately!
TopicConverter.new(first_post.topic, admin).convert_to_public_topic(staff_category.id)
@@ -117,14 +130,14 @@ RSpec.describe TopicConverter do
end
end
- describe 'convert_to_private_message' do
+ describe "convert_to_private_message" do
fab!(:admin) { Fabricate(:admin) }
fab!(:author) { Fabricate(:user) }
fab!(:category) { Fabricate(:category) }
fab!(:topic) { Fabricate(:topic, user: author, category_id: category.id) }
fab!(:post) { Fabricate(:post, topic: topic, user: topic.user) }
- context 'with success' do
+ context "with success" do
it "converts regular topic to private message" do
private_message = topic.convert_to_private_message(post.user)
expect(private_message).to be_valid
@@ -134,7 +147,7 @@ RSpec.describe TopicConverter do
end
it "converts unlisted topic to private message" do
- topic.update_status('visible', false, admin)
+ topic.update_status("visible", false, admin)
private_message = topic.convert_to_private_message(post.user)
expect(private_message).to be_valid
@@ -154,10 +167,9 @@ RSpec.describe TopicConverter do
topic_user = TopicUser.create!(user_id: author.id, topic_id: topic.id, posted: true)
- expect do
- topic.convert_to_private_message(admin)
- end.to change { author.reload.post_count }.from(2).to(0)
- .and change { author.reload.topic_count }.from(1).to(0)
+ expect do topic.convert_to_private_message(admin) end.to change {
+ author.reload.post_count
+ }.from(2).to(0).and change { author.reload.topic_count }.from(1).to(0)
# Ensure query does not affect users from other topics or posts as DB query to update count is quite complex.
expect(other_topic.user.post_count).to eq(0)
@@ -176,8 +188,11 @@ RSpec.describe TopicConverter do
topic.convert_to_private_message(admin)
- expect(topic.reload.topic_allowed_users.pluck(:user_id))
- .to contain_exactly(admin.id, post.user_id, post2.user_id)
+ expect(topic.reload.topic_allowed_users.pluck(:user_id)).to contain_exactly(
+ admin.id,
+ post.user_id,
+ post2.user_id,
+ )
end
it "changes user_action type" do
@@ -185,7 +200,9 @@ RSpec.describe TopicConverter do
UserActionManager.enable
topic.convert_to_private_message(admin)
expect(author.user_actions.where(action_type: UserAction::NEW_TOPIC).count).to eq(0)
- expect(author.user_actions.where(action_type: UserAction::NEW_PRIVATE_MESSAGE).count).to eq(1)
+ expect(author.user_actions.where(action_type: UserAction::NEW_PRIVATE_MESSAGE).count).to eq(
+ 1,
+ )
end
it "deletes notifications for users not allowed to see the message" do
@@ -217,14 +234,14 @@ RSpec.describe TopicConverter do
end
end
- context 'when topic has replies' do
+ context "when topic has replies" do
before do
@replied_user = Fabricate(:coding_horror)
create_post(topic: topic, user: @replied_user)
topic.reload
end
- it 'adds users who replied to topic in Private Message' do
+ it "adds users who replied to topic in Private Message" do
topic.convert_to_private_message(admin)
expect(topic.reload.topic_allowed_users.where(user_id: @replied_user.id).count).to eq(1)
@@ -232,10 +249,8 @@ RSpec.describe TopicConverter do
end
end
- context 'when user already exists in topic_allowed_users table' do
- before do
- topic.topic_allowed_users.create!(user_id: admin.id)
- end
+ context "when user already exists in topic_allowed_users table" do
+ before { topic.topic_allowed_users.create!(user_id: admin.id) }
it "works" do
topic.convert_to_private_message(admin)
@@ -244,7 +259,7 @@ RSpec.describe TopicConverter do
end
end
- context 'with user_profiles with newly converted PM as featured topic' do
+ context "with user_profiles with newly converted PM as featured topic" do
it "sets all matching user_profile featured topic ids to nil" do
author.user_profile.update(featured_topic: topic)
topic.convert_to_private_message(admin)
diff --git a/spec/models/topic_embed_spec.rb b/spec/models/topic_embed_spec.rb
index bedfb02978a..a15e4b13ab5 100644
--- a/spec/models/topic_embed_spec.rb
+++ b/spec/models/topic_embed_spec.rb
@@ -1,18 +1,19 @@
# frozen_string_literal: true
-require 'stringio'
+require "stringio"
RSpec.describe TopicEmbed do
-
it { is_expected.to belong_to :topic }
it { is_expected.to belong_to :post }
it { is_expected.to validate_presence_of :embed_url }
- describe '.import' do
+ describe ".import" do
fab!(:user) { Fabricate(:user) }
let(:title) { "How to turn a fish from good to evil in 30 seconds" }
- let(:url) { 'http://eviltrout.com/123' }
- let(:contents) { " hello world new post hello
" }
+ let(:url) { "http://eviltrout.com/123" }
+ let(:contents) do
+ "hello world new post hello
"
+ end
fab!(:embeddable_host) { Fabricate(:embeddable_host) }
fab!(:category) { Fabricate(:category) }
fab!(:tag) { Fabricate(:tag) }
@@ -22,7 +23,7 @@ RSpec.describe TopicEmbed do
expect(TopicEmbed.count).to eq(0)
end
- context 'when creating a post' do
+ context "when creating a post" do
let!(:post) { TopicEmbed.import(user, url, title, contents) }
let(:topic_embed) { TopicEmbed.find_by(post: post) }
@@ -34,12 +35,17 @@ RSpec.describe TopicEmbed do
expect(post.cooked).to eq(post.raw)
# It converts relative URLs to absolute
- expect(post.cooked).to have_tag('a', with: { href: 'http://eviltrout.com/hello' })
- expect(post.cooked).to have_tag('img', with: { src: 'http://eviltrout.com/images/wat.jpg' })
+ expect(post.cooked).to have_tag("a", with: { href: "http://eviltrout.com/hello" })
+ expect(post.cooked).to have_tag("img", with: { src: "http://eviltrout.com/images/wat.jpg" })
# It converts relative URLs to absolute when expanded
stub_request(:get, url).to_return(status: 200, body: contents)
- expect(TopicEmbed.expanded_for(post)).to have_tag('img', with: { src: 'http://eviltrout.com/images/wat.jpg' })
+ expect(TopicEmbed.expanded_for(post)).to have_tag(
+ "img",
+ with: {
+ src: "http://eviltrout.com/images/wat.jpg",
+ },
+ )
expect(post.topic.has_topic_embed?).to eq(true)
expect(TopicEmbed.where(topic_id: post.topic_id)).to be_present
@@ -67,13 +73,13 @@ RSpec.describe TopicEmbed do
end
it "Should leave uppercase Feed Entry URL untouched in content" do
- cased_url = 'http://eviltrout.com/ABCD'
+ cased_url = "http://eviltrout.com/ABCD"
post = TopicEmbed.import(user, cased_url, title, "some random content")
expect(post.cooked).to match(/#{cased_url}/)
end
it "Should leave lowercase Feed Entry URL untouched in content" do
- cased_url = 'http://eviltrout.com/abcd'
+ cased_url = "http://eviltrout.com/abcd"
post = TopicEmbed.import(user, cased_url, title, "some random content")
expect(post.cooked).to match(/#{cased_url}/)
end
@@ -81,14 +87,16 @@ RSpec.describe TopicEmbed do
it "will make the topic unlisted if `embed_unlisted` is set until someone replies" do
Jobs.run_immediately!
SiteSetting.embed_unlisted = true
- imported_post = TopicEmbed.import(user, "http://eviltrout.com/abcd", title, "some random content")
+ imported_post =
+ TopicEmbed.import(user, "http://eviltrout.com/abcd", title, "some random content")
expect(imported_post.topic).not_to be_visible
- pc = PostCreator.new(
- Fabricate(:user),
- raw: "this is a reply that will make the topic visible",
- topic_id: imported_post.topic_id,
- reply_to_post_number: 1
- )
+ pc =
+ PostCreator.new(
+ Fabricate(:user),
+ raw: "this is a reply that will make the topic visible",
+ topic_id: imported_post.topic_id,
+ reply_to_post_number: 1,
+ )
pc.create
expect(imported_post.topic.reload).to be_visible
end
@@ -96,13 +104,21 @@ RSpec.describe TopicEmbed do
it "won't be invisible if `embed_unlisted` is set to false" do
Jobs.run_immediately!
SiteSetting.embed_unlisted = false
- imported_post = TopicEmbed.import(user, "http://eviltrout.com/abcd", title, "some random content")
+ imported_post =
+ TopicEmbed.import(user, "http://eviltrout.com/abcd", title, "some random content")
expect(imported_post.topic).to be_visible
end
it "creates the topic in the category passed as a parameter" do
Jobs.run_immediately!
- imported_post = TopicEmbed.import(user, "http://eviltrout.com/abcd", title, "some random content", category_id: category.id)
+ imported_post =
+ TopicEmbed.import(
+ user,
+ "http://eviltrout.com/abcd",
+ title,
+ "some random content",
+ category_id: category.id,
+ )
expect(imported_post.topic.category).not_to eq(embeddable_host.category)
expect(imported_post.topic.category).to eq(category)
end
@@ -110,27 +126,47 @@ RSpec.describe TopicEmbed do
it "creates the topic with the tag passed as a parameter" do
Jobs.run_immediately!
SiteSetting.tagging_enabled = true
- imported_post = TopicEmbed.import(user, "http://eviltrout.com/abcd", title, "some random content", tags: [tag.name])
+ imported_post =
+ TopicEmbed.import(
+ user,
+ "http://eviltrout.com/abcd",
+ title,
+ "some random content",
+ tags: [tag.name],
+ )
expect(imported_post.topic.tags).to include(tag)
end
it "respects overriding the cook_method when asked" do
Jobs.run_immediately!
SiteSetting.embed_support_markdown = false
- stub_request(:get, "https://www.youtube.com/watch?v=K56soYl0U1w")
- .to_return(status: 200, body: "", headers: {})
- stub_request(:get, "https://www.youtube.com/embed/K56soYl0U1w")
- .to_return(status: 200, body: "", headers: {})
+ stub_request(:get, "https://www.youtube.com/watch?v=K56soYl0U1w").to_return(
+ status: 200,
+ body: "",
+ headers: {
+ },
+ )
+ stub_request(:get, "https://www.youtube.com/embed/K56soYl0U1w").to_return(
+ status: 200,
+ body: "",
+ headers: {
+ },
+ )
- imported_post = TopicEmbed.import(user, "http://eviltrout.com/abcd", title, "https://www.youtube.com/watch?v=K56soYl0U1w", cook_method: Post.cook_methods[:regular])
+ imported_post =
+ TopicEmbed.import(
+ user,
+ "http://eviltrout.com/abcd",
+ title,
+ "https://www.youtube.com/watch?v=K56soYl0U1w",
+ cook_method: Post.cook_methods[:regular],
+ )
expect(imported_post.cooked).to match(/onebox|iframe/)
end
end
context "when post creation supports markdown rendering" do
- before do
- SiteSetting.embed_support_markdown = true
- end
+ before { SiteSetting.embed_support_markdown = true }
it "works as expected" do
post = TopicEmbed.import(user, url, title, "some random content")
@@ -141,27 +177,26 @@ RSpec.describe TopicEmbed do
end
end
- describe 'embedded content truncation' do
+ describe "embedded content truncation" do
MAX_LENGTH_BEFORE_TRUNCATION = 100
- let(:long_content) { "#{'a' * MAX_LENGTH_BEFORE_TRUNCATION}
\nmore
" }
+ let(:long_content) { "#{"a" * MAX_LENGTH_BEFORE_TRUNCATION}
\nmore
" }
- it 'truncates the imported post when truncation is enabled' do
+ it "truncates the imported post when truncation is enabled" do
SiteSetting.embed_truncate = true
post = TopicEmbed.import(user, url, title, long_content)
expect(post.raw).not_to include(long_content)
end
- it 'keeps everything in the imported post when truncation is disabled' do
+ it "keeps everything in the imported post when truncation is disabled" do
SiteSetting.embed_truncate = false
post = TopicEmbed.import(user, url, title, long_content)
expect(post.raw).to include(long_content)
end
- it 'looks at first div when there is no paragraph' do
-
+ it "looks at first div when there is no paragraph" do
no_para = "testing it
"
SiteSetting.embed_truncate = true
@@ -172,36 +207,42 @@ RSpec.describe TopicEmbed do
end
end
- describe '.topic_id_for_embed' do
+ describe ".topic_id_for_embed" do
it "returns correct topic id irrespective of url protocol" do
topic_embed = Fabricate(:topic_embed, embed_url: "http://example.com/post/248")
- expect(TopicEmbed.topic_id_for_embed('http://exAMPle.com/post/248')).to eq(topic_embed.topic_id)
- expect(TopicEmbed.topic_id_for_embed('https://example.com/post/248/')).to eq(topic_embed.topic_id)
+ expect(TopicEmbed.topic_id_for_embed("http://exAMPle.com/post/248")).to eq(
+ topic_embed.topic_id,
+ )
+ expect(TopicEmbed.topic_id_for_embed("https://example.com/post/248/")).to eq(
+ topic_embed.topic_id,
+ )
- expect(TopicEmbed.topic_id_for_embed('http://example.com/post/248/2')).to eq(nil)
- expect(TopicEmbed.topic_id_for_embed('http://examples.com/post/248')).to eq(nil)
- expect(TopicEmbed.topic_id_for_embed('http://example.com/post/24')).to eq(nil)
- expect(TopicEmbed.topic_id_for_embed('http://example.com/post')).to eq(nil)
+ expect(TopicEmbed.topic_id_for_embed("http://example.com/post/248/2")).to eq(nil)
+ expect(TopicEmbed.topic_id_for_embed("http://examples.com/post/248")).to eq(nil)
+ expect(TopicEmbed.topic_id_for_embed("http://example.com/post/24")).to eq(nil)
+ expect(TopicEmbed.topic_id_for_embed("http://example.com/post")).to eq(nil)
end
it "finds the topic id when the embed_url contains a query string" do
topic_embed = Fabricate(:topic_embed, embed_url: "http://example.com/post/248?key=foo")
- expect(TopicEmbed.topic_id_for_embed('http://example.com/post/248?key=foo')).to eq(topic_embed.topic_id)
+ expect(TopicEmbed.topic_id_for_embed("http://example.com/post/248?key=foo")).to eq(
+ topic_embed.topic_id,
+ )
end
end
- describe '.find_remote' do
+ describe ".find_remote" do
fab!(:embeddable_host) { Fabricate(:embeddable_host) }
describe ".title_scrub" do
- let(:url) { 'http://eviltrout.com/123' }
- let(:contents) { "Through the Looking Glass - Classic Books some content here" }
-
- before do
- stub_request(:get, url).to_return(status: 200, body: contents)
+ let(:url) { "http://eviltrout.com/123" }
+ let(:contents) do
+ "Through the Looking Glass - Classic Books some content here"
end
+ before { stub_request(:get, url).to_return(status: 200, body: contents) }
+
it "doesn't scrub the title by default" do
response = TopicEmbed.find_remote(url)
expect(response.title).to eq("Through the Looking Glass - Classic Books")
@@ -216,11 +257,13 @@ RSpec.describe TopicEmbed do
context 'with post with allowed classes "foo" and "emoji"' do
fab!(:user) { Fabricate(:user) }
- let(:url) { 'http://eviltrout.com/123' }
- let(:contents) { "my normal size emoji Hi
Hi
Hi
Hi
سلام این یک پاراگراف آزمون است." }
- before do
- stub_request(:get, url).to_return(status: 200, body: contents)
- end
+ before { stub_request(:get, url).to_return(status: 200, body: contents) }
it "doesn't throw an error" do
response = TopicEmbed.find_remote(url)
@@ -305,12 +348,10 @@ RSpec.describe TopicEmbed do
end
context "with encoded URL" do
- let(:url) { 'http://example.com/hello%20world' }
+ let(:url) { "http://example.com/hello%20world" }
let(:contents) { "Hello World! " }
- before do
- stub_request(:get, url).to_return(status: 200, body: contents)
- end
+ before { stub_request(:get, url).to_return(status: 200, body: contents) }
it "doesn't throw an error" do
response = TopicEmbed.find_remote(url)
@@ -320,46 +361,44 @@ RSpec.describe TopicEmbed do
context "with non-http URL" do
it "throws an error" do
- url = '/test.txt'
+ url = "/test.txt"
expect(TopicEmbed.find_remote(url)).to be_nil
end
end
context "with emails" do
- let(:url) { 'http://example.com/foo' }
- let(:contents) { 'URL encoded @ symbol
normal mailto link
' }
-
- before do
- stub_request(:get, url).to_return(status: 200, body: contents)
+ let(:url) { "http://example.com/foo" }
+ let(:contents) do
+ 'URL encoded @ symbol
normal mailto link
'
end
+ before { stub_request(:get, url).to_return(status: 200, body: contents) }
+
it "handles mailto links" do
response = TopicEmbed.find_remote(url)
- expect(response.body).to have_tag('a', with: { href: 'mailto:foo@example.com' })
- expect(response.body).to have_tag('a', with: { href: 'mailto:bar@example.com' })
+ expect(response.body).to have_tag("a", with: { href: "mailto:foo@example.com" })
+ expect(response.body).to have_tag("a", with: { href: "mailto:bar@example.com" })
end
end
context "with malformed href" do
- let(:url) { 'http://example.com/foo' }
+ let(:url) { "http://example.com/foo" }
let(:contents) { 'Baz
' }
- before do
- stub_request(:get, url).to_return(status: 200, body: contents)
- end
+ before { stub_request(:get, url).to_return(status: 200, body: contents) }
it "doesn’t raise an exception" do
expect { TopicEmbed.find_remote(url) }.not_to raise_error
end
end
- context 'with canonical links' do
- let(:url) { 'http://eviltrout.com/123?asd' }
- let(:canonical_url) { 'http://eviltrout.com/123' }
+ context "with canonical links" do
+ let(:url) { "http://eviltrout.com/123?asd" }
+ let(:canonical_url) { "http://eviltrout.com/123" }
let(:content) { "Canonical " }
+ let(:canonical_content) { "Canonical " }
before do
stub_request(:get, url).to_return(status: 200, body: content)
@@ -367,18 +406,17 @@ RSpec.describe TopicEmbed do
stub_request(:get, canonical_url).to_return(status: 200, body: canonical_content)
end
- it 'a' do
+ it "a" do
response = TopicEmbed.find_remote(url)
expect(response.title).to eq("Canonical")
end
-
end
end
- describe '.absolutize_urls' do
+ describe ".absolutize_urls" do
it "handles badly formed URIs" do
- invalid_url = 'http://source.com/#double#anchor'
+ invalid_url = "http://source.com/#double#anchor"
contents = "hello world new post hello "
raw = TopicEmbed.absolutize_urls(invalid_url, contents)
@@ -402,8 +440,16 @@ RSpec.describe TopicEmbed do
after { I18n.reload! }
it "uses the default site locale for the 'imported_from' footer" do
- TranslationOverride.upsert!("en", "embed.imported_from", "English translation of embed.imported_from with %{link}")
- TranslationOverride.upsert!("de", "embed.imported_from", "German translation of embed.imported_from with %{link}")
+ TranslationOverride.upsert!(
+ "en",
+ "embed.imported_from",
+ "English translation of embed.imported_from with %{link}",
+ )
+ TranslationOverride.upsert!(
+ "de",
+ "embed.imported_from",
+ "German translation of embed.imported_from with %{link}",
+ )
I18n.locale = :en
expected_html = TopicEmbed.imported_from_html("some_url")
diff --git a/spec/models/topic_featured_users_spec.rb b/spec/models/topic_featured_users_spec.rb
index 32255e68015..2de151f029b 100644
--- a/spec/models/topic_featured_users_spec.rb
+++ b/spec/models/topic_featured_users_spec.rb
@@ -1,8 +1,7 @@
# frozen_string_literal: true
RSpec.describe TopicFeaturedUsers do
- it 'ensures consistency' do
-
+ it "ensures consistency" do
t = Fabricate(:topic)
Fabricate(:post, topic: t, user: t.user)
p2 = Fabricate(:post, topic: t)
@@ -10,11 +9,13 @@ RSpec.describe TopicFeaturedUsers do
p4 = Fabricate(:post, topic: t)
p5 = Fabricate(:post, topic: t)
- t.update_columns(featured_user1_id: 66,
- featured_user2_id: 70,
- featured_user3_id: 12,
- featured_user4_id: 7,
- last_post_user_id: p5.user_id)
+ t.update_columns(
+ featured_user1_id: 66,
+ featured_user2_id: 70,
+ featured_user3_id: 12,
+ featured_user4_id: 7,
+ last_post_user_id: p5.user_id,
+ )
TopicFeaturedUsers.ensure_consistency!
t.reload
diff --git a/spec/models/topic_group_spec.rb b/spec/models/topic_group_spec.rb
index be5f1ebb5b0..a692bc04c7c 100644
--- a/spec/models/topic_group_spec.rb
+++ b/spec/models/topic_group_spec.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
RSpec.describe TopicGroup do
- describe '#update_last_read' do
+ describe "#update_last_read" do
fab!(:group) { Fabricate(:group) }
fab!(:user) { Fabricate(:user) }
@@ -10,7 +10,7 @@ RSpec.describe TopicGroup do
group.add(user)
end
- it 'does nothing if the user is not a member of an allowed group' do
+ it "does nothing if the user is not a member of an allowed group" do
another_user = Fabricate(:user)
described_class.update_last_read(another_user, @topic.id, @topic.highest_post_number)
@@ -19,14 +19,14 @@ RSpec.describe TopicGroup do
expect(created_topic_group).to eq(false)
end
- it 'creates a new record if the user is a member of an allowed group' do
+ it "creates a new record if the user is a member of an allowed group" do
described_class.update_last_read(user, @topic.id, @topic.highest_post_number)
created_topic_group = described_class.find_by(topic: @topic, group: group)
expect(created_topic_group.last_read_post_number).to eq @topic.highest_post_number
end
- it 'does nothing if the topic does not have allowed groups' do
+ it "does nothing if the topic does not have allowed groups" do
@topic.update!(allowed_groups: [])
described_class.update_last_read(user, @topic.id, @topic.highest_post_number)
@@ -35,8 +35,12 @@ RSpec.describe TopicGroup do
expect(created_topic_group).to eq(false)
end
- it 'updates an existing record with a higher post number' do
- described_class.create!(topic: @topic, group: group, last_read_post_number: @topic.highest_post_number - 1)
+ it "updates an existing record with a higher post number" do
+ described_class.create!(
+ topic: @topic,
+ group: group,
+ last_read_post_number: @topic.highest_post_number - 1,
+ )
described_class.update_last_read(user, @topic.id, @topic.highest_post_number)
created_topic_group = described_class.find_by(topic: @topic, group: group)
@@ -44,9 +48,13 @@ RSpec.describe TopicGroup do
expect(created_topic_group.last_read_post_number).to eq @topic.highest_post_number
end
- it 'does nothing if the user read post number is lower than the current one' do
+ it "does nothing if the user read post number is lower than the current one" do
highest_read_number = @topic.highest_post_number + 1
- described_class.create!(topic: @topic, group: group, last_read_post_number: highest_read_number)
+ described_class.create!(
+ topic: @topic,
+ group: group,
+ last_read_post_number: highest_read_number,
+ )
described_class.update_last_read(user, @topic.id, @topic.highest_post_number)
created_topic_group = described_class.find_by(topic: @topic, group: group)
@@ -54,11 +62,15 @@ RSpec.describe TopicGroup do
expect(created_topic_group.last_read_post_number).to eq highest_read_number
end
- it 'creates a new record if the list of allowed groups has changed' do
+ it "creates a new record if the list of allowed groups has changed" do
another_allowed_group = Fabricate(:group)
another_allowed_group.add(user)
@topic.allowed_groups << another_allowed_group
- described_class.create!(topic: @topic, group: group, last_read_post_number: @topic.highest_post_number)
+ described_class.create!(
+ topic: @topic,
+ group: group,
+ last_read_post_number: @topic.highest_post_number,
+ )
described_class.update_last_read(user, @topic.id, @topic.highest_post_number)
created_topic_group = described_class.find_by(topic: @topic, group: another_allowed_group)
@@ -66,11 +78,19 @@ RSpec.describe TopicGroup do
expect(created_topic_group.last_read_post_number).to eq @topic.highest_post_number
end
- it 'Only updates the record that shares the same topic_id' do
+ it "Only updates the record that shares the same topic_id" do
new_post_number = 100
topic2 = Fabricate(:private_message_topic, allowed_groups: [group], topic_allowed_users: [])
- described_class.create!(topic: @topic, group: group, last_read_post_number: @topic.highest_post_number)
- described_class.create!(topic: topic2, group: group, last_read_post_number: topic2.highest_post_number)
+ described_class.create!(
+ topic: @topic,
+ group: group,
+ last_read_post_number: @topic.highest_post_number,
+ )
+ described_class.create!(
+ topic: topic2,
+ group: group,
+ last_read_post_number: topic2.highest_post_number,
+ )
described_class.update_last_read(user, @topic.id, new_post_number)
created_topic_group = described_class.find_by(topic: @topic, group: group)
diff --git a/spec/models/topic_invite_spec.rb b/spec/models/topic_invite_spec.rb
index 42bc335dd37..cd8e81dc00e 100644
--- a/spec/models/topic_invite_spec.rb
+++ b/spec/models/topic_invite_spec.rb
@@ -1,10 +1,8 @@
# frozen_string_literal: true
RSpec.describe TopicInvite do
-
it { is_expected.to belong_to :topic }
it { is_expected.to belong_to :invite }
it { is_expected.to validate_presence_of :topic_id }
it { is_expected.to validate_presence_of :invite_id }
-
end
diff --git a/spec/models/topic_link_click_spec.rb b/spec/models/topic_link_click_spec.rb
index 4f43fc456df..53b2f71ba77 100644
--- a/spec/models/topic_link_click_spec.rb
+++ b/spec/models/topic_link_click_spec.rb
@@ -6,10 +6,10 @@ RSpec.describe TopicLinkClick do
it { is_expected.to validate_presence_of :topic_link_id }
def test_uri
- URI.parse('http://test.host')
+ URI.parse("http://test.host")
end
- describe 'topic_links' do
+ describe "topic_links" do
before do
@topic = Fabricate(:topic)
@post = Fabricate(:post_with_external_links, user: @topic.user, topic: @topic)
@@ -17,88 +17,113 @@ RSpec.describe TopicLinkClick do
@topic_link = @topic.topic_links.first
end
- it 'has 0 clicks at first' do
+ it "has 0 clicks at first" do
expect(@topic_link.clicks).to eq(0)
end
- describe '.create' do
- before do
- TopicLinkClick.create(topic_link: @topic_link, ip_address: '192.168.1.1')
- end
+ describe ".create" do
+ before { TopicLinkClick.create(topic_link: @topic_link, ip_address: "192.168.1.1") }
- it 'creates the forum topic link click' do
+ it "creates the forum topic link click" do
expect(TopicLinkClick.count).to eq(1)
@topic_link.reload
expect(@topic_link.clicks).to eq(1)
- expect(TopicLinkClick.first.ip_address.to_s).to eq('192.168.1.1')
+ expect(TopicLinkClick.first.ip_address.to_s).to eq("192.168.1.1")
end
end
- describe '.create_from' do
+ describe ".create_from" do
it "works correctly" do
# returns nil to prevent exploits
- click = TopicLinkClick.create_from(url: "http://url-that-doesnt-exist.com", post_id: @post.id, ip: '127.0.0.1')
+ click =
+ TopicLinkClick.create_from(
+ url: "http://url-that-doesnt-exist.com",
+ post_id: @post.id,
+ ip: "127.0.0.1",
+ )
expect(click).to eq(nil)
# redirects if allowlisted
- click = TopicLinkClick.create_from(url: "https://www.youtube.com/watch?v=jYd_5aggzd4", post_id: @post.id, ip: '127.0.0.1')
+ click =
+ TopicLinkClick.create_from(
+ url: "https://www.youtube.com/watch?v=jYd_5aggzd4",
+ post_id: @post.id,
+ ip: "127.0.0.1",
+ )
expect(click).to eq("https://www.youtube.com/watch?v=jYd_5aggzd4")
# does not change own link
expect {
- TopicLinkClick.create_from(url: @topic_link.url, post_id: @post.id, ip: '127.0.0.0', user_id: @post.user_id)
+ TopicLinkClick.create_from(
+ url: @topic_link.url,
+ post_id: @post.id,
+ ip: "127.0.0.0",
+ user_id: @post.user_id,
+ )
}.not_to change(TopicLinkClick, :count)
# can handle double # in a url
# NOTE: this is not compliant but exists in the wild
- click = TopicLinkClick.create_from(url: "http://discourse.org#a#b", post_id: @post.id, ip: '127.0.0.1')
+ click =
+ TopicLinkClick.create_from(
+ url: "http://discourse.org#a#b",
+ post_id: @post.id,
+ ip: "127.0.0.1",
+ )
expect(click).to eq("http://discourse.org#a#b")
end
- context 'with a valid url and post_id' do
+ context "with a valid url and post_id" do
before do
- @url = TopicLinkClick.create_from(url: @topic_link.url, post_id: @post.id, ip: '127.0.0.1')
+ @url =
+ TopicLinkClick.create_from(url: @topic_link.url, post_id: @post.id, ip: "127.0.0.1")
@click = TopicLinkClick.last
end
- it 'creates a click' do
+ it "creates a click" do
expect(@click).to be_present
expect(@click.topic_link).to eq(@topic_link)
expect(@url).to eq(@topic_link.url)
# second click should not record
- expect { TopicLinkClick.create_from(url: @topic_link.url, post_id: @post.id, ip: '127.0.0.1') }.not_to change(TopicLinkClick, :count)
+ expect {
+ TopicLinkClick.create_from(url: @topic_link.url, post_id: @post.id, ip: "127.0.0.1")
+ }.not_to change(TopicLinkClick, :count)
end
-
end
- context 'while logged in' do
+ context "while logged in" do
fab!(:other_user) { Fabricate(:user) }
before do
- @url = TopicLinkClick.create_from(url: @topic_link.url, post_id: @post.id, ip: '127.0.0.1', user_id: other_user.id)
+ @url =
+ TopicLinkClick.create_from(
+ url: @topic_link.url,
+ post_id: @post.id,
+ ip: "127.0.0.1",
+ user_id: other_user.id,
+ )
@click = TopicLinkClick.last
end
- it 'creates a click without an IP' do
+ it "creates a click without an IP" do
expect(@click).to be_present
expect(@click.topic_link).to eq(@topic_link)
expect(@click.user_id).to eq(other_user.id)
expect(@click.ip_address).to eq(nil)
end
-
end
context "with relative urls" do
let(:host) { URI.parse(Discourse.base_url).host }
- it 'returns the url' do
- url = TopicLinkClick.create_from(url: '/relative-url', post_id: @post.id, ip: '127.0.0.1')
+ it "returns the url" do
+ url = TopicLinkClick.create_from(url: "/relative-url", post_id: @post.id, ip: "127.0.0.1")
expect(url).to eq("/relative-url")
end
- it 'finds a protocol relative urls with a host' do
+ it "finds a protocol relative urls with a host" do
url = "//#{host}/relative-url"
redirect = TopicLinkClick.create_from(url: url)
expect(redirect).to eq(url)
@@ -115,24 +140,25 @@ RSpec.describe TopicLinkClick do
Rails.configuration.action_controller.asset_host = "https://cdn.discourse.org/stuff"
end
- after do
- Rails.configuration.action_controller.asset_host = nil
- end
+ after { Rails.configuration.action_controller.asset_host = nil }
it "correctly handles cdn links" do
+ url =
+ TopicLinkClick.create_from(
+ url: "https://cdn.discourse.org/stuff/my_link",
+ topic_id: @topic.id,
+ ip: "127.0.0.3",
+ )
- url = TopicLinkClick.create_from(
- url: 'https://cdn.discourse.org/stuff/my_link',
- topic_id: @topic.id,
- ip: '127.0.0.3')
-
- expect(url).to eq('https://cdn.discourse.org/stuff/my_link')
+ expect(url).to eq("https://cdn.discourse.org/stuff/my_link")
# cdn exploit
- url = TopicLinkClick.create_from(
- url: 'https://cdn.discourse.org/bad/my_link',
- topic_id: @topic.id,
- ip: '127.0.0.3')
+ url =
+ TopicLinkClick.create_from(
+ url: "https://cdn.discourse.org/bad/my_link",
+ topic_id: @topic.id,
+ ip: "127.0.0.3",
+ )
expect(url).to eq(nil)
@@ -142,19 +168,20 @@ RSpec.describe TopicLinkClick do
post = Fabricate(:post, topic: @topic, raw: "[test](#{path})")
TopicLink.extract_from(post)
- url = TopicLinkClick.create_from(
- url: "https://cdn.discourse.org/stuff#{path}",
- topic_id: post.topic_id,
- post_id: post.id,
- ip: '127.0.0.3')
+ url =
+ TopicLinkClick.create_from(
+ url: "https://cdn.discourse.org/stuff#{path}",
+ topic_id: post.topic_id,
+ post_id: post.id,
+ ip: "127.0.0.3",
+ )
expect(url).to eq("https://cdn.discourse.org/stuff#{path}")
- click = TopicLinkClick.order('id desc').first
+ click = TopicLinkClick.order("id desc").first
- expect(click.topic_link_id).to eq(TopicLink.order('id desc').first.id)
+ expect(click.topic_link_id).to eq(TopicLink.order("id desc").first.id)
end
-
end
context "with s3 cdns" do
@@ -162,77 +189,93 @@ RSpec.describe TopicLinkClick do
setup_s3
SiteSetting.s3_cdn_url = "https://discourse-s3-cdn.global.ssl.fastly.net"
- post = Fabricate(:post, topic: @topic, raw: "[test](//test.localhost/uploads/default/my-test-link)")
+ post =
+ Fabricate(
+ :post,
+ topic: @topic,
+ raw: "[test](//test.localhost/uploads/default/my-test-link)",
+ )
TopicLink.extract_from(post)
- url = TopicLinkClick.create_from(
- url: "https://discourse-s3-cdn.global.ssl.fastly.net/my-test-link",
- topic_id: @topic.id,
- ip: '127.0.0.3')
+ url =
+ TopicLinkClick.create_from(
+ url: "https://discourse-s3-cdn.global.ssl.fastly.net/my-test-link",
+ topic_id: @topic.id,
+ ip: "127.0.0.3",
+ )
expect(url).to be_present
end
-
end
-
end
- context 'with a HTTPS version of the same URL' do
+ context "with a HTTPS version of the same URL" do
before do
- @url = TopicLinkClick.create_from(url: 'https://twitter.com', topic_id: @topic.id, ip: '127.0.0.3')
+ @url =
+ TopicLinkClick.create_from(
+ url: "https://twitter.com",
+ topic_id: @topic.id,
+ ip: "127.0.0.3",
+ )
@click = TopicLinkClick.last
end
- it 'creates a click' do
+ it "creates a click" do
expect(@click).to be_present
expect(@click.topic_link).to eq(@topic_link)
- expect(@url).to eq('https://twitter.com')
+ expect(@url).to eq("https://twitter.com")
end
end
- context 'with a google analytics tracking code' do
+ context "with a google analytics tracking code" do
before do
- @url = TopicLinkClick.create_from(url: 'http://twitter.com?_ga=1.16846778.221554446.1071987018',
- topic_id: @topic.id,
- ip: '127.0.0.3')
+ @url =
+ TopicLinkClick.create_from(
+ url: "http://twitter.com?_ga=1.16846778.221554446.1071987018",
+ topic_id: @topic.id,
+ ip: "127.0.0.3",
+ )
@click = TopicLinkClick.last
end
- it 'creates a click' do
+ it "creates a click" do
expect(@click).to be_present
expect(@click.topic_link).to eq(@topic_link)
- expect(@url).to eq('http://twitter.com?_ga=1.16846778.221554446.1071987018')
+ expect(@url).to eq("http://twitter.com?_ga=1.16846778.221554446.1071987018")
end
end
- context 'with a query param and google analytics' do
+ context "with a query param and google analytics" do
before do
@topic = Fabricate(:topic)
- @post = Fabricate(:post,
+ @post =
+ Fabricate(
+ :post,
topic: @topic,
user: @topic.user,
- raw: "Here's a link to twitter: http://twitter.com?ref=forum"
+ raw: "Here's a link to twitter: http://twitter.com?ref=forum",
)
TopicLink.extract_from(@post)
@topic_link = @topic.topic_links.first
end
- it 'creates a click' do
- url = TopicLinkClick.create_from(
- url: 'http://twitter.com?ref=forum&_ga=1.16846778.221554446.1071987018',
- topic_id: @topic.id,
- post_id: @post.id,
- ip: '127.0.0.3'
- )
+ it "creates a click" do
+ url =
+ TopicLinkClick.create_from(
+ url: "http://twitter.com?ref=forum&_ga=1.16846778.221554446.1071987018",
+ topic_id: @topic.id,
+ post_id: @post.id,
+ ip: "127.0.0.3",
+ )
click = TopicLinkClick.last
expect(click).to be_present
expect(click.topic_link).to eq(@topic_link)
- expect(url).to eq('http://twitter.com?ref=forum&_ga=1.16846778.221554446.1071987018')
+ expect(url).to eq("http://twitter.com?ref=forum&_ga=1.16846778.221554446.1071987018")
end
end
- context 'with same base URL with different query' do
- it 'are handled differently' do
+ context "with same base URL with different query" do
+ it "are handled differently" do
post = Fabricate(:post, raw: <<~RAW)
no query param: http://example.com/a
with query param: http://example.com/a?b=c
@@ -241,38 +284,66 @@ RSpec.describe TopicLinkClick do
TopicLink.extract_from(post)
- TopicLinkClick.create_from(url: 'http://example.com/a', post_id: post.id, ip: '127.0.0.1', user: Fabricate(:user))
- TopicLinkClick.create_from(url: 'http://example.com/a?b=c', post_id: post.id, ip: '127.0.0.2', user: Fabricate(:user))
- TopicLinkClick.create_from(url: 'http://example.com/a?b=c&d=e', post_id: post.id, ip: '127.0.0.3', user: Fabricate(:user))
- TopicLinkClick.create_from(url: 'http://example.com/a?b=c', post_id: post.id, ip: '127.0.0.4', user: Fabricate(:user))
+ TopicLinkClick.create_from(
+ url: "http://example.com/a",
+ post_id: post.id,
+ ip: "127.0.0.1",
+ user: Fabricate(:user),
+ )
+ TopicLinkClick.create_from(
+ url: "http://example.com/a?b=c",
+ post_id: post.id,
+ ip: "127.0.0.2",
+ user: Fabricate(:user),
+ )
+ TopicLinkClick.create_from(
+ url: "http://example.com/a?b=c&d=e",
+ post_id: post.id,
+ ip: "127.0.0.3",
+ user: Fabricate(:user),
+ )
+ TopicLinkClick.create_from(
+ url: "http://example.com/a?b=c",
+ post_id: post.id,
+ ip: "127.0.0.4",
+ user: Fabricate(:user),
+ )
- expect(TopicLink.where("url LIKE '%example.com%'").pluck(:url, :clicks)).to contain_exactly(
- ['http://example.com/a', 1], ['http://example.com/a?b=c', 2], ['http://example.com/a?b=c&d=e', 1]
+ expect(
+ TopicLink.where("url LIKE '%example.com%'").pluck(:url, :clicks),
+ ).to contain_exactly(
+ ["http://example.com/a", 1],
+ ["http://example.com/a?b=c", 2],
+ ["http://example.com/a?b=c&d=e", 1],
)
end
end
- context 'with a google analytics tracking code and a hash' do
+ context "with a google analytics tracking code and a hash" do
before do
- @url = TopicLinkClick.create_from(url: 'http://discourse.org?_ga=1.16846778.221554446.1071987018#faq',
- topic_id: @topic.id,
- ip: '127.0.0.3')
+ @url =
+ TopicLinkClick.create_from(
+ url: "http://discourse.org?_ga=1.16846778.221554446.1071987018#faq",
+ topic_id: @topic.id,
+ ip: "127.0.0.3",
+ )
@click = TopicLinkClick.last
end
- it 'creates a click' do
+ it "creates a click" do
expect(@click).to be_present
- expect(@url).to eq('http://discourse.org?_ga=1.16846778.221554446.1071987018#faq')
+ expect(@url).to eq("http://discourse.org?_ga=1.16846778.221554446.1071987018#faq")
end
end
- context 'with a valid url and topic_id' do
+ context "with a valid url and topic_id" do
before do
- @url = TopicLinkClick.create_from(url: @topic_link.url, topic_id: @topic.id, ip: '127.0.0.3')
+ @url =
+ TopicLinkClick.create_from(url: @topic_link.url, topic_id: @topic.id, ip: "127.0.0.3")
@click = TopicLinkClick.last
end
- it 'creates a click' do
+ it "creates a click" do
expect(@click).to be_present
expect(@click.topic_link).to eq(@topic_link)
expect(@url).to eq(@topic_link.url)
diff --git a/spec/models/topic_link_spec.rb b/spec/models/topic_link_spec.rb
index 19f94bad351..cf837e44bc5 100644
--- a/spec/models/topic_link_spec.rb
+++ b/spec/models/topic_link_spec.rb
@@ -7,36 +7,34 @@ RSpec.describe TopicLink do
URI.parse(Discourse.base_url)
end
- fab!(:topic) do
- Fabricate(:topic, title: 'unique topic name')
- end
+ fab!(:topic) { Fabricate(:topic, title: "unique topic name") }
- fab!(:user) do
- topic.user
- end
+ fab!(:user) { topic.user }
fab!(:post) { Fabricate(:post) }
it "can't link to the same topic" do
- ftl = TopicLink.new(url: "/t/#{topic.id}",
- topic_id: topic.id,
- link_topic_id: topic.id)
+ ftl = TopicLink.new(url: "/t/#{topic.id}", topic_id: topic.id, link_topic_id: topic.id)
expect(ftl.valid?).to eq(false)
end
- describe 'external links' do
- it 'correctly handles links' do
-
+ describe "external links" do
+ it "correctly handles links" do
non_png = "https://b.com/#{SecureRandom.hex}"
# prepare a title for one of the links
- stub_request(:get, non_png).
- with(headers: {
- 'Accept' => '*/*',
- 'Accept-Encoding' => 'gzip',
- 'Host' => 'b.com',
- }).
- to_return(status: 200, body: "amazing ", headers: {})
+ stub_request(:get, non_png).with(
+ headers: {
+ "Accept" => "*/*",
+ "Accept-Encoding" => "gzip",
+ "Host" => "b.com",
+ },
+ ).to_return(
+ status: 200,
+ body: "amazing ",
+ headers: {
+ },
+ )
# so we run crawl_topic_links
Jobs.run_immediately!
@@ -47,8 +45,8 @@ RSpec.describe TopicLink do
post = Fabricate(:post, raw: <<~RAW, user: user, topic: topic)
http://a.com/
#{non_png}
- http://#{'a' * 200}.com/invalid
- //b.com/#{'a' * 500}
+ http://#{"a" * 200}.com/invalid
+ //b.com/#{"a" * 500}
#{png}
RAW
@@ -62,7 +60,7 @@ RSpec.describe TopicLink do
png,
non_png,
"http://a.com/",
- "//b.com/#{'a' * 500}"[0...TopicLink.max_url_length]
+ "//b.com/#{"a" * 500}"[0...TopicLink.max_url_length],
)
old_ids = topic.topic_links.pluck(:id)
@@ -75,17 +73,25 @@ RSpec.describe TopicLink do
end
end
- describe 'internal links' do
+ describe "internal links" do
it "extracts onebox" do
other_topic = Fabricate(:topic, user: user)
Fabricate(:post, topic: other_topic, user: user, raw: "some content for the first post")
- other_post = Fabricate(:post, topic: other_topic, user: user, raw: "some content for the second post")
+ other_post =
+ Fabricate(:post, topic: other_topic, user: user, raw: "some content for the second post")
- url = "http://#{test_uri.host}/t/#{other_topic.slug}/#{other_topic.id}/#{other_post.post_number}"
+ url =
+ "http://#{test_uri.host}/t/#{other_topic.slug}/#{other_topic.id}/#{other_post.post_number}"
invalid_url = "http://#{test_uri.host}/t/#{other_topic.slug}/9999999999999999999999999999999"
- Fabricate(:post, topic: topic, user: user, raw: 'initial post')
- post = Fabricate(:post, topic: topic, user: user, raw: "Link to another topic:\n\n#{url}\n\n#{invalid_url}")
+ Fabricate(:post, topic: topic, user: user, raw: "initial post")
+ post =
+ Fabricate(
+ :post,
+ topic: topic,
+ user: user,
+ raw: "Link to another topic:\n\n#{url}\n\n#{invalid_url}",
+ )
TopicLink.extract_from(post)
@@ -96,24 +102,21 @@ RSpec.describe TopicLink do
expect(link.url).to eq(url)
end
- context 'with topic link' do
- fab!(:other_topic) do
- Fabricate(:topic, user: user)
- end
+ context "with topic link" do
+ fab!(:other_topic) { Fabricate(:topic, user: user) }
fab!(:moderator) { Fabricate(:moderator) }
- let(:post) do
- Fabricate(:post, topic: other_topic, user: user, raw: "some content")
- end
+ let(:post) { Fabricate(:post, topic: other_topic, user: user, raw: "some content") }
- it 'works' do
+ it "works" do
# ensure other_topic has a post
post
url = "http://#{test_uri.host}/t/#{other_topic.slug}/#{other_topic.id}"
- Fabricate(:post, topic: topic, user: user, raw: 'initial post')
- linked_post = Fabricate(:post, topic: topic, user: user, raw: "Link to another topic: #{url}")
+ Fabricate(:post, topic: topic, user: user, raw: "initial post")
+ linked_post =
+ Fabricate(:post, topic: topic, user: user, raw: "Link to another topic: #{url}")
# this is subtle, but we had a bug were second time
# TopicLink.extract_from was called a reflection was nuked
@@ -128,7 +131,7 @@ RSpec.describe TopicLink do
expect(link).to be_internal
expect(link.url).to eq(url)
expect(link.domain).to eq(test_uri.host)
- expect(link.link_topic_id). to eq(other_topic.id)
+ expect(link.link_topic_id).to eq(other_topic.id)
expect(link).not_to be_reflection
reflection = other_topic.topic_links.first
@@ -137,7 +140,9 @@ RSpec.describe TopicLink do
expect(reflection).to be_reflection
expect(reflection.post_id).to be_present
expect(reflection.domain).to eq(test_uri.host)
- expect(reflection.url).to eq("http://#{test_uri.host}/t/unique-topic-name/#{topic.id}/#{linked_post.post_number}")
+ expect(reflection.url).to eq(
+ "http://#{test_uri.host}/t/unique-topic-name/#{topic.id}/#{linked_post.post_number}",
+ )
expect(reflection.link_topic_id).to eq(topic.id)
expect(reflection.link_post_id).to eq(linked_post.id)
@@ -148,7 +153,7 @@ RSpec.describe TopicLink do
post_ids: [linked_post.id],
topic_id: topic.id,
acting_user: user,
- new_owner: Fabricate(:user)
+ new_owner: Fabricate(:user),
).change_owner!
TopicLink.extract_from(linked_post)
@@ -158,11 +163,12 @@ RSpec.describe TopicLink do
expect(other_topic.reload.topic_links.where(link_post_id: linked_post.id)).to be_blank
end
- it 'works without id' do
+ it "works without id" do
post
url = "http://#{test_uri.host}/t/#{other_topic.slug}"
- Fabricate(:post, topic: topic, user: user, raw: 'initial post')
- linked_post = Fabricate(:post, topic: topic, user: user, raw: "Link to another topic: #{url}")
+ Fabricate(:post, topic: topic, user: user, raw: "initial post")
+ linked_post =
+ Fabricate(:post, topic: topic, user: user, raw: "Link to another topic: #{url}")
TopicLink.extract_from(linked_post)
link = topic.topic_links.first
@@ -173,7 +179,9 @@ RSpec.describe TopicLink do
expect(reflection).to be_reflection
expect(reflection.post_id).to be_present
expect(reflection.domain).to eq(test_uri.host)
- expect(reflection.url).to eq("http://#{test_uri.host}/t/unique-topic-name/#{topic.id}/#{linked_post.post_number}")
+ expect(reflection.url).to eq(
+ "http://#{test_uri.host}/t/unique-topic-name/#{topic.id}/#{linked_post.post_number}",
+ )
expect(reflection.link_topic_id).to eq(topic.id)
expect(reflection.link_post_id).to eq(linked_post.id)
expect(reflection.user_id).to eq(link.user_id)
@@ -183,27 +191,33 @@ RSpec.describe TopicLink do
post
url = "http://#{test_uri.host}/t/#{other_topic.slug}/#{other_topic.id}"
- Fabricate(:post, topic: topic, user: user, raw: 'initial post')
- linked_post = Fabricate(:post, topic: topic, user: user, raw: "Link to another topic: #{url}")
+ Fabricate(:post, topic: topic, user: user, raw: "initial post")
+ linked_post =
+ Fabricate(:post, topic: topic, user: user, raw: "Link to another topic: #{url}")
TopicLink.extract_from(linked_post)
expect(other_topic.reload.topic_links.where(link_post_id: linked_post.id).count).to eq(1)
PostDestroyer.new(moderator, linked_post).destroy
TopicLink.extract_from(linked_post)
expect(other_topic.reload.topic_links.where(link_post_id: linked_post.id)).to be_blank
-
end
- it 'truncates long links' do
- SiteSetting.slug_generation_method = 'encoded'
+ it "truncates long links" do
+ SiteSetting.slug_generation_method = "encoded"
long_title = "Καλημερα σε ολους και ολες" * 9 # 234 chars, but the encoded slug will be 1224 chars in length
other_topic = Fabricate(:topic, user: user, title: long_title)
expect(other_topic.slug.length).to be > TopicLink.max_url_length
- Fabricate(:post, topic: other_topic, user: user, raw: 'initial post')
+ Fabricate(:post, topic: other_topic, user: user, raw: "initial post")
other_topic_url = "http://#{test_uri.host}/t/#{other_topic.slug}/#{other_topic.id}"
- post_with_link = Fabricate(:post, topic: topic, user: user, raw: "Link to another topic: #{other_topic_url}")
+ post_with_link =
+ Fabricate(
+ :post,
+ topic: topic,
+ user: user,
+ raw: "Link to another topic: #{other_topic_url}",
+ )
TopicLink.extract_from(post_with_link)
topic.reload
link = topic.topic_links.first
@@ -211,18 +225,24 @@ RSpec.describe TopicLink do
expect(link.url.length).to eq(TopicLink.max_url_length)
end
- it 'does not truncate reflection links' do
- SiteSetting.slug_generation_method = 'encoded'
+ it "does not truncate reflection links" do
+ SiteSetting.slug_generation_method = "encoded"
long_title = "Καλημερα σε ολους και ολες" * 9 # 234 chars, but the encoded slug will be 1224 chars in length
topic = Fabricate(:topic, user: user, title: long_title)
expect(topic.slug.length).to be > TopicLink.max_url_length
topic_url = "http://#{test_uri.host}/t/#{topic.slug}/#{topic.id}"
other_topic = Fabricate(:topic, user: user)
- Fabricate(:post, topic: other_topic, user: user, raw: 'initial post')
+ Fabricate(:post, topic: other_topic, user: user, raw: "initial post")
other_topic_url = "http://#{test_uri.host}/t/#{other_topic.slug}/#{other_topic.id}"
- post_with_link = Fabricate(:post, topic: topic, user: user, raw: "Link to another topic: #{other_topic_url}")
+ post_with_link =
+ Fabricate(
+ :post,
+ topic: topic,
+ user: user,
+ raw: "Link to another topic: #{other_topic_url}",
+ )
expect { TopicLink.extract_from(post_with_link) }.to_not raise_error
other_topic.reload
@@ -233,24 +253,29 @@ RSpec.describe TopicLink do
end
context "with link to a user on discourse" do
- let(:post) { Fabricate(:post, topic: topic, user: user, raw: "user ") }
-
- before do
- TopicLink.extract_from(post)
+ let(:post) do
+ Fabricate(
+ :post,
+ topic: topic,
+ user: user,
+ raw: "user ",
+ )
end
- it 'does not extract a link' do
+ before { TopicLink.extract_from(post) }
+
+ it "does not extract a link" do
expect(topic.topic_links).to be_blank
end
end
context "with link to a discourse resource like a FAQ" do
- let(:post) { Fabricate(:post, topic: topic, user: user, raw: "faq link here ") }
- before do
- TopicLink.extract_from(post)
+ let(:post) do
+ Fabricate(:post, topic: topic, user: user, raw: "faq link here ")
end
+ before { TopicLink.extract_from(post) }
- it 'does not extract a link' do
+ it "does not extract a link" do
expect(topic.topic_links).to be_present
end
end
@@ -258,27 +283,33 @@ RSpec.describe TopicLink do
context "with mention links" do
let(:post) { Fabricate(:post, topic: topic, user: user, raw: "Hey #{user.username_lower}") }
- before do
- TopicLink.extract_from(post)
- end
+ before { TopicLink.extract_from(post) }
- it 'does not extract a link' do
+ it "does not extract a link" do
expect(topic.topic_links).to be_blank
end
end
context "with email address" do
it "does not extract a link" do
- post = Fabricate(:post, topic: topic, user: user, raw: "Valid email: foo@bar.com\n\nInvalid email: rfc822;name@domain.com")
+ post =
+ Fabricate(
+ :post,
+ topic: topic,
+ user: user,
+ raw: "Valid email: foo@bar.com\n\nInvalid email: rfc822;name@domain.com",
+ )
TopicLink.extract_from(post)
expect(topic.topic_links).to be_blank
end
end
context "with mail link" do
- let(:post) { Fabricate(:post, topic: topic, user: user, raw: "[email]bar@example.com[/email]") }
+ let(:post) do
+ Fabricate(:post, topic: topic, user: user, raw: "[email]bar@example.com[/email]")
+ end
- it 'does not extract a link' do
+ it "does not extract a link" do
TopicLink.extract_from(post)
expect(topic.topic_links).to be_blank
end
@@ -287,7 +318,12 @@ RSpec.describe TopicLink do
context "with quote links" do
it "sets quote correctly" do
linked_post = Fabricate(:post, topic: topic, user: user, raw: "my test post")
- quoting_post = Fabricate(:post, raw: "[quote=\"#{user.username}, post: #{linked_post.post_number}, topic: #{topic.id}\"]\nquote\n[/quote]")
+ quoting_post =
+ Fabricate(
+ :post,
+ raw:
+ "[quote=\"#{user.username}, post: #{linked_post.post_number}, topic: #{topic.id}\"]\nquote\n[/quote]",
+ )
TopicLink.extract_from(quoting_post)
link = quoting_post.topic.topic_links.first
@@ -298,7 +334,15 @@ RSpec.describe TopicLink do
end
context "with link to a local attachments" do
- let(:post) { Fabricate(:post, topic: topic, user: user, raw: 'ruby.rb ') }
+ let(:post) do
+ Fabricate(
+ :post,
+ topic: topic,
+ user: user,
+ raw:
+ 'ruby.rb ',
+ )
+ end
it "extracts the link" do
TopicLink.extract_from(post)
@@ -312,13 +356,20 @@ RSpec.describe TopicLink do
# should not be the reflection
expect(link).not_to be_reflection
# should have file extension
- expect(link.extension).to eq('rb')
+ expect(link.extension).to eq("rb")
end
-
end
context "with link to an attachments uploaded on S3" do
- let(:post) { Fabricate(:post, topic: topic, user: user, raw: 'ruby.rb ') }
+ let(:post) do
+ Fabricate(
+ :post,
+ topic: topic,
+ user: user,
+ raw:
+ 'ruby.rb ',
+ )
+ end
it "extracts the link" do
TopicLink.extract_from(post)
@@ -328,24 +379,25 @@ RSpec.describe TopicLink do
# is not internal
expect(link).not_to be_internal
# has the correct url
- expect(link.url).to eq("//s3.amazonaws.com/bucket/2104a0211c9ce41ed67989a1ed62e9a394c1fbd1446.rb")
+ expect(link.url).to eq(
+ "//s3.amazonaws.com/bucket/2104a0211c9ce41ed67989a1ed62e9a394c1fbd1446.rb",
+ )
# should not be the reflection
expect(link).not_to be_reflection
# should have file extension
- expect(link.extension).to eq('rb')
+ expect(link.extension).to eq("rb")
end
-
end
end
- describe 'internal link from pm' do
- it 'works' do
- pm = Fabricate(:topic, user: user, category_id: nil, archetype: 'private_message')
+ describe "internal link from pm" do
+ it "works" do
+ pm = Fabricate(:topic, user: user, category_id: nil, archetype: "private_message")
Fabricate(:post, topic: pm, user: user, raw: "some content")
url = "http://#{test_uri.host}/t/topic-slug/#{topic.id}"
- Fabricate(:post, topic: pm, user: user, raw: 'initial post')
+ Fabricate(:post, topic: pm, user: user, raw: "initial post")
linked_post = Fabricate(:post, topic: pm, user: user, raw: "Link to another topic: #{url}")
TopicLink.extract_from(linked_post)
@@ -353,16 +405,16 @@ RSpec.describe TopicLink do
expect(topic.topic_links.first).to eq(nil)
expect(pm.topic_links.first).not_to eq(nil)
end
-
end
- describe 'internal link from unlisted topic' do
- it 'works' do
+ describe "internal link from unlisted topic" do
+ it "works" do
unlisted_topic = Fabricate(:topic, user: user, visible: false)
url = "http://#{test_uri.host}/t/topic-slug/#{topic.id}"
- Fabricate(:post, topic: unlisted_topic, user: user, raw: 'initial post')
- linked_post = Fabricate(:post, topic: unlisted_topic, user: user, raw: "Link to another topic: #{url}")
+ Fabricate(:post, topic: unlisted_topic, user: user, raw: "initial post")
+ linked_post =
+ Fabricate(:post, topic: unlisted_topic, user: user, raw: "Link to another topic: #{url}")
TopicLink.extract_from(linked_post)
@@ -371,8 +423,8 @@ RSpec.describe TopicLink do
end
end
- describe 'internal link with non-standard port' do
- it 'includes the non standard port if present' do
+ describe "internal link with non-standard port" do
+ it "includes the non standard port if present" do
other_topic = Fabricate(:topic, user: user)
SiteSetting.port = 5678
alternate_uri = URI.parse(Discourse.base_url)
@@ -382,48 +434,47 @@ RSpec.describe TopicLink do
TopicLink.extract_from(post)
reflection = other_topic.topic_links.first
- expect(reflection.url).to eq("http://#{alternate_uri.host}:5678/t/unique-topic-name/#{topic.id}")
+ expect(reflection.url).to eq(
+ "http://#{alternate_uri.host}:5678/t/unique-topic-name/#{topic.id}",
+ )
end
end
- describe 'query methods' do
- it 'returns blank without posts' do
+ describe "query methods" do
+ it "returns blank without posts" do
expect(TopicLink.counts_for(Guardian.new, nil, nil)).to be_blank
end
- context 'with data' do
-
+ context "with data" do
let(:post) do
topic = Fabricate(:topic)
Fabricate(:post_with_external_links, user: topic.user, topic: topic)
end
- let(:counts_for) do
- TopicLink.counts_for(Guardian.new, post.topic, [post])
- end
+ let(:counts_for) { TopicLink.counts_for(Guardian.new, post.topic, [post]) }
- it 'creates a valid topic lookup' do
+ it "creates a valid topic lookup" do
TopicLink.extract_from(post)
lookup = TopicLink.duplicate_lookup(post.topic)
expect(lookup).to be_present
- expect(lookup['google.com']).to be_present
+ expect(lookup["google.com"]).to be_present
- ch = lookup['www.codinghorror.com/blog']
+ ch = lookup["www.codinghorror.com/blog"]
expect(ch).to be_present
- expect(ch[:domain]).to eq('www.codinghorror.com')
+ expect(ch[:domain]).to eq("www.codinghorror.com")
expect(ch[:username]).to eq(post.username)
expect(ch[:posted_at]).to be_present
expect(ch[:post_number]).to be_present
end
- it 'has the correct results' do
+ it "has the correct results" do
TopicLink.extract_from(post)
topic_link_first = post.topic.topic_links.first
- TopicLinkClick.create!(topic_link: topic_link_first, ip_address: '192.168.1.1')
- TopicLinkClick.create!(topic_link: topic_link_first, ip_address: '192.168.1.2')
+ TopicLinkClick.create!(topic_link: topic_link_first, ip_address: "192.168.1.1")
+ TopicLinkClick.create!(topic_link: topic_link_first, ip_address: "192.168.1.2")
topic_link_second = post.topic.topic_links.second
- TopicLinkClick.create!(topic_link: topic_link_second, ip_address: '192.168.1.1')
+ TopicLinkClick.create!(topic_link: topic_link_second, ip_address: "192.168.1.1")
expect(counts_for[post.id]).to be_present
expect(counts_for[post.id].first[:clicks]).to eq(2)
@@ -435,14 +486,14 @@ RSpec.describe TopicLink do
expect(array[1].clicks).to eq(1)
end
- it 'secures internal links correctly' do
+ it "secures internal links correctly" do
category = Fabricate(:category)
secret_topic = Fabricate(:topic, category: category)
url = "http://#{test_uri.host}/t/topic-slug/#{secret_topic.id}"
post = Fabricate(:post, raw: "hello test topic #{url}")
TopicLink.extract_from(post)
- TopicLinkClick.create!(topic_link: post.topic.topic_links.first, ip_address: '192.168.1.1')
+ TopicLinkClick.create!(topic_link: post.topic.topic_links.first, ip_address: "192.168.1.1")
expect(TopicLink.topic_map(Guardian.new, post.topic_id).count).to eq(1)
expect(TopicLink.counts_for(Guardian.new, post.topic, [post]).length).to eq(1)
@@ -459,7 +510,7 @@ RSpec.describe TopicLink do
expect(TopicLink.counts_for(Guardian.new(admin), post.topic, [post]).length).to eq(1)
end
- it 'does not include links from whisper' do
+ it "does not include links from whisper" do
url = "https://blog.codinghorror.com/hacker-hack-thyself/"
post = Fabricate(:post, raw: "whisper post... #{url}", post_type: Post.types[:whisper])
TopicLink.extract_from(post)
@@ -467,18 +518,22 @@ RSpec.describe TopicLink do
expect(TopicLink.topic_map(Guardian.new, post.topic_id).count).to eq(0)
end
- it 'secures internal links correctly' do
+ it "secures internal links correctly" do
other_topic = Fabricate(:topic)
other_user = Fabricate(:user)
url = "http://#{test_uri.host}/t/topic-slug/#{other_topic.id}"
post = Fabricate(:post, raw: "hello test topic #{url}")
TopicLink.extract_from(post)
- TopicLinkClick.create!(topic_link: post.topic.topic_links.first, ip_address: '192.168.1.1')
+ TopicLinkClick.create!(topic_link: post.topic.topic_links.first, ip_address: "192.168.1.1")
expect(TopicLink.counts_for(Guardian.new(other_user), post.topic, [post]).length).to eq(1)
- TopicUser.change(other_user.id, other_topic.id, notification_level: TopicUser.notification_levels[:muted])
+ TopicUser.change(
+ other_user.id,
+ other_topic.id,
+ notification_level: TopicUser.notification_levels[:muted],
+ )
expect(TopicLink.counts_for(Guardian.new(other_user), post.topic, [post]).length).to eq(0)
end
@@ -510,7 +565,14 @@ RSpec.describe TopicLink do
end
it "works with invalid link target" do
- post = Fabricate(:post, raw: 'http:geturl ', user: user, topic: topic, cook_method: Post.cook_methods[:raw_html])
+ post =
+ Fabricate(
+ :post,
+ raw: 'http:geturl ',
+ user: user,
+ topic: topic,
+ cook_method: Post.cook_methods[:raw_html],
+ )
expect { TopicLink.extract_from(post) }.to_not raise_error
end
end
diff --git a/spec/models/topic_list_spec.rb b/spec/models/topic_list_spec.rb
index f2ba6cfee19..ec333aa8f68 100644
--- a/spec/models/topic_list_spec.rb
+++ b/spec/models/topic_list_spec.rb
@@ -1,22 +1,18 @@
# frozen_string_literal: true
RSpec.describe TopicList do
- let!(:topic) {
+ let!(:topic) do
t = Fabricate(:topic)
t.allowed_user_ids = [t.user.id]
t
- }
+ end
let(:user) { topic.user }
let(:topic_list) { TopicList.new("liked", user, [topic]) }
- before do
- TopicList.preloaded_custom_fields.clear
- end
+ before { TopicList.preloaded_custom_fields.clear }
- after do
- TopicList.preloaded_custom_fields.clear
- end
+ after { TopicList.preloaded_custom_fields.clear }
describe ".preloaded_custom_fields" do
it "should return a unique set of values" do
@@ -24,18 +20,19 @@ RSpec.describe TopicList do
TopicList.preloaded_custom_fields << "test"
TopicList.preloaded_custom_fields << "apple"
- expect(TopicList.preloaded_custom_fields).to eq(Set.new(%w{test apple}))
+ expect(TopicList.preloaded_custom_fields).to eq(Set.new(%w[test apple]))
end
end
describe "preload" do
it "allows preloading of data" do
preloaded_topic = false
- preloader = lambda do |topics, topic_list|
- expect(TopicList === topic_list).to eq(true)
- expect(topics.length).to eq(1)
- preloaded_topic = true
- end
+ preloader =
+ lambda do |topics, topic_list|
+ expect(TopicList === topic_list).to eq(true)
+ expect(topics.length).to eq(1)
+ preloaded_topic = true
+ end
TopicList.on_preload(&preloader)
@@ -46,13 +43,14 @@ RSpec.describe TopicList do
end
end
- describe '#load_topics' do
- it 'loads additional data for serialization' do
- category_user = CategoryUser.create!(
- user: user,
- category: topic.category,
- notification_level: NotificationLevels.all[:regular]
- )
+ describe "#load_topics" do
+ it "loads additional data for serialization" do
+ category_user =
+ CategoryUser.create!(
+ user: user,
+ category: topic.category,
+ notification_level: NotificationLevels.all[:regular],
+ )
topic = topic_list.load_topics.first
@@ -60,34 +58,51 @@ RSpec.describe TopicList do
end
end
- describe '#top_tags' do
- it 'should return the right tags' do
+ describe "#top_tags" do
+ it "should return the right tags" do
tag = Fabricate(:tag, topics: [topic])
other_tag = Fabricate(:tag, topics: [topic], name: "use-anywhere")
output = [tag.name, other_tag.name]
expect(topic_list.top_tags.sort).to eq(output.sort)
end
- describe 'when there are tags restricted to a category' do
+ describe "when there are tags restricted to a category" do
fab!(:category) { Fabricate(:category) }
fab!(:topic) { Fabricate(:topic, category: category) }
fab!(:other_topic) { Fabricate(:topic) } # uncategorized
fab!(:tag) { Fabricate(:tag, topics: [topic], categories: [category], name: "category-tag") }
fab!(:other_tag) { Fabricate(:tag, topics: [topic], name: "use-anywhere") }
- let(:topic_list) { TopicList.new('latest', topic.user, [topic], category: category.id, category_id: category.id) }
+ let(:topic_list) do
+ TopicList.new(
+ "latest",
+ topic.user,
+ [topic],
+ category: category.id,
+ category_id: category.id,
+ )
+ end
- it 'should return tags used in the category' do
+ it "should return tags used in the category" do
expect(topic_list.top_tags).to eq([tag.name, other_tag.name].sort)
end
it "with no category, should return all tags" do
- expect(TopicList.new('latest', other_topic.user, [other_topic]).top_tags.sort).to eq([tag.name, other_tag.name].sort)
+ expect(TopicList.new("latest", other_topic.user, [other_topic]).top_tags.sort).to eq(
+ [tag.name, other_tag.name].sort,
+ )
end
it "with another category with no tags, should return no tags" do
other_category = Fabricate(:category)
topic3 = Fabricate(:topic, category: other_category)
- list = TopicList.new('latest', topic3.user, [topic3], category: other_category.id, category_id: other_category.id)
+ list =
+ TopicList.new(
+ "latest",
+ topic3.user,
+ [topic3],
+ category: other_category.id,
+ category_id: other_category.id,
+ )
expect(list.top_tags).to be_empty
end
end
@@ -98,7 +113,7 @@ RSpec.describe TopicList do
let(:tag) { Fabricate(:tag) }
it "returns topic_list" do
- topic_list = TopicList.new('latest', nil, nil, category: category, category_id: category.id)
+ topic_list = TopicList.new("latest", nil, nil, category: category, category_id: category.id)
expect(topic_list.preload_key).to eq("topic_list")
end
end
diff --git a/spec/models/topic_participants_summary_spec.rb b/spec/models/topic_participants_summary_spec.rb
index a62f8234a87..a887b53add1 100644
--- a/spec/models/topic_participants_summary_spec.rb
+++ b/spec/models/topic_participants_summary_spec.rb
@@ -1,15 +1,11 @@
# frozen_string_literal: true
RSpec.describe TopicParticipantsSummary do
- describe '#summary' do
+ describe "#summary" do
let(:summary) { described_class.new(topic, user: topic_creator).summary }
let(:topic) do
- Fabricate(:topic,
- user: topic_creator,
- archetype: Archetype::private_message,
- category_id: nil
- )
+ Fabricate(:topic, user: topic_creator, archetype: Archetype.private_message, category_id: nil)
end
fab!(:topic_creator) { Fabricate(:user) }
@@ -24,6 +20,5 @@ RSpec.describe TopicParticipantsSummary do
topic.allowed_user_ids = [user1.id, user2.id, user3.id, user4.id, user5.id, user6.id]
expect(summary.map(&:user)).to eq([user1, user2, user3, user4, user5])
end
-
end
end
diff --git a/spec/models/topic_posters_summary_spec.rb b/spec/models/topic_posters_summary_spec.rb
index 9380ec32fed..94dd61c56cb 100644
--- a/spec/models/topic_posters_summary_spec.rb
+++ b/spec/models/topic_posters_summary_spec.rb
@@ -1,35 +1,34 @@
# frozen_string_literal: true
RSpec.describe TopicPostersSummary do
- describe '#summary' do
- let!(:topic_creator) { Fabricate(:user) }
+ describe "#summary" do
+ let!(:topic_creator) { Fabricate(:user) }
context "when there are no other posters" do
- let!(:topic) do
- Fabricate(:topic,
- user: topic_creator,
- )
- end
+ let!(:topic) { Fabricate(:topic, user: topic_creator) }
let!(:summary) { described_class.new(topic).summary }
- it 'contains only the topic creator' do
+ it "contains only the topic creator" do
expect(summary.count).to eq 1
summary.first.tap do |topic_poster|
expect(topic_poster.user).to eq topic_creator
- expect(topic_poster.description).to eq([
- I18n.t(:original_poster), I18n.t(:most_recent_poster)].join(I18n.t(:poster_description_joiner))
+ expect(topic_poster.description).to eq(
+ [I18n.t(:original_poster), I18n.t(:most_recent_poster)].join(
+ I18n.t(:poster_description_joiner),
+ ),
)
end
end
end
- context 'when the last poster is also the topic creator' do
+ context "when the last poster is also the topic creator" do
fab!(:featured_user1) { Fabricate(:user) }
let!(:topic) do
- Fabricate(:topic,
+ Fabricate(
+ :topic,
user: topic_creator,
last_poster: topic_creator,
featured_user1: featured_user1,
@@ -38,42 +37,38 @@ RSpec.describe TopicPostersSummary do
let!(:summary) { described_class.new(topic).summary }
- it 'keeps the topic creator at the front of the summary' do
- expect(summary.map(&:user)).to eq([
- topic_creator,
- featured_user1
- ])
+ it "keeps the topic creator at the front of the summary" do
+ expect(summary.map(&:user)).to eq([topic_creator, featured_user1])
end
end
- context 'when the topic has many posters' do
- let!(:last_poster) { Fabricate(:user) }
+ context "when the topic has many posters" do
+ let!(:last_poster) { Fabricate(:user) }
fab!(:featured_user1) { Fabricate(:user) }
fab!(:featured_user2) { Fabricate(:user) }
fab!(:featured_user3) { Fabricate(:user) }
fab!(:featured_user4) { Fabricate(:user) }
let!(:topic) do
- Fabricate(:topic,
+ Fabricate(
+ :topic,
user: topic_creator,
last_poster: last_poster,
featured_user1: featured_user1,
featured_user2: featured_user2,
featured_user3: featured_user3,
- featured_user4: featured_user4
+ featured_user4: featured_user4,
)
end
let!(:summary) { described_class.new(topic).summary }
- it 'contains only five posters with latest poster at the end' do
- expect(summary.map(&:user)).to eq([
- topic_creator,
- featured_user1, featured_user2, featured_user3,
- last_poster
- ])
+ it "contains only five posters with latest poster at the end" do
+ expect(summary.map(&:user)).to eq(
+ [topic_creator, featured_user1, featured_user2, featured_user3, last_poster],
+ )
# If more than one user, attach the latest class
- expect(summary.last.extras).to eq 'latest'
+ expect(summary.last.extras).to eq "latest"
end
end
end
diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index c21004fbbab..d60f7b83db7 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -12,67 +12,69 @@ RSpec.describe Topic do
fab!(:evil_trout) { Fabricate(:evil_trout) }
fab!(:admin) { Fabricate(:admin) }
fab!(:group) { Fabricate(:group) }
- fab!(:trust_level_2) { Fabricate(:user, trust_level: SiteSetting.min_trust_level_to_allow_invite) }
+ fab!(:trust_level_2) do
+ Fabricate(:user, trust_level: SiteSetting.min_trust_level_to_allow_invite)
+ end
- describe 'Validations' do
+ describe "Validations" do
let(:topic) { Fabricate.build(:topic) }
describe "#featured_link" do
- describe 'when featured_link contains more than a URL' do
- it 'should not be valid' do
- topic.featured_link = 'http://meta.discourse.org TEST'
+ describe "when featured_link contains more than a URL" do
+ it "should not be valid" do
+ topic.featured_link = "http://meta.discourse.org TEST"
expect(topic).to_not be_valid
end
end
- describe 'when featured_link is a valid URL' do
- it 'should be valid' do
- topic.featured_link = 'http://meta.discourse.org'
+ describe "when featured_link is a valid URL" do
+ it "should be valid" do
+ topic.featured_link = "http://meta.discourse.org"
expect(topic).to be_valid
end
end
end
describe "#external_id" do
- describe 'when external_id is too long' do
- it 'should not be valid' do
- topic.external_id = 'a' * (Topic::EXTERNAL_ID_MAX_LENGTH + 1)
+ describe "when external_id is too long" do
+ it "should not be valid" do
+ topic.external_id = "a" * (Topic::EXTERNAL_ID_MAX_LENGTH + 1)
expect(topic).to_not be_valid
end
end
- describe 'when external_id has invalid characters' do
- it 'should not be valid' do
- topic.external_id = 'a*&^!@()#'
+ describe "when external_id has invalid characters" do
+ it "should not be valid" do
+ topic.external_id = "a*&^!@()#"
expect(topic).to_not be_valid
end
end
- describe 'when external_id is an empty string' do
- it 'should not be valid' do
- topic.external_id = ''
+ describe "when external_id is an empty string" do
+ it "should not be valid" do
+ topic.external_id = ""
expect(topic).to_not be_valid
end
end
- describe 'when external_id has already been used' do
- it 'should not be valid' do
- topic2 = Fabricate(:topic, external_id: 'asdf')
- topic.external_id = 'asdf'
+ describe "when external_id has already been used" do
+ it "should not be valid" do
+ topic2 = Fabricate(:topic, external_id: "asdf")
+ topic.external_id = "asdf"
expect(topic).to_not be_valid
end
end
- describe 'when external_id is nil' do
- it 'should be valid' do
+ describe "when external_id is nil" do
+ it "should be valid" do
topic.external_id = nil
expect(topic).to be_valid
end
end
- describe 'when external_id is valid' do
- it 'should be valid' do
- topic.external_id = 'abc_123-ZXY'
+ describe "when external_id is valid" do
+ it "should be valid" do
+ topic.external_id = "abc_123-ZXY"
expect(topic).to be_valid
end
end
@@ -81,81 +83,76 @@ RSpec.describe Topic do
describe "#title" do
it { is_expected.to validate_presence_of :title }
- describe 'censored words' do
- after do
- Discourse.redis.flushdb
- end
+ describe "censored words" do
+ after { Discourse.redis.flushdb }
- describe 'when title contains censored words' do
- after do
- WordWatcher.clear_cache!
- end
+ describe "when title contains censored words" do
+ after { WordWatcher.clear_cache! }
- it 'should not be valid' do
- ['pineapple', 'pen'].each { |w| Fabricate(:watched_word, word: w, action: WatchedWord.actions[:censor]) }
+ it "should not be valid" do
+ %w[pineapple pen].each do |w|
+ Fabricate(:watched_word, word: w, action: WatchedWord.actions[:censor])
+ end
- topic.title = 'pen PinEapple apple pen is a complete sentence'
+ topic.title = "pen PinEapple apple pen is a complete sentence"
expect(topic).to_not be_valid
- expect(topic.errors.full_messages.first).to include(I18n.t(
- 'errors.messages.contains_censored_words', censored_words: 'pen, pineapple'
- ))
+ expect(topic.errors.full_messages.first).to include(
+ I18n.t("errors.messages.contains_censored_words", censored_words: "pen, pineapple"),
+ )
end
end
- describe 'titles with censored words not on boundaries' do
+ describe "titles with censored words not on boundaries" do
it "should be valid" do
- Fabricate(:watched_word, word: 'apple', action: WatchedWord.actions[:censor])
+ Fabricate(:watched_word, word: "apple", action: WatchedWord.actions[:censor])
topic.title = "Pineapples are great fruit! Applebee's is a great restaurant"
expect(topic).to be_valid
end
end
- describe 'when title does not contain censored words' do
- it 'should be valid' do
- topic.title = 'The cake is a lie'
+ describe "when title does not contain censored words" do
+ it "should be valid" do
+ topic.title = "The cake is a lie"
expect(topic).to be_valid
end
end
- describe 'escape special characters in censored words' do
+ describe "escape special characters in censored words" do
before do
- ['co(onut', 'coconut', 'a**le'].each do |w|
+ %w[co(onut coconut a**le].each do |w|
Fabricate(:watched_word, word: w, action: WatchedWord.actions[:censor])
end
end
- it 'should not be valid' do
+ it "should not be valid" do
topic.title = "I have a co(onut a**le"
expect(topic.valid?).to eq(false)
- expect(topic.errors.full_messages.first).to include(I18n.t(
- 'errors.messages.contains_censored_words',
- censored_words: 'co(onut, a**le'
- ))
+ expect(topic.errors.full_messages.first).to include(
+ I18n.t("errors.messages.contains_censored_words", censored_words: "co(onut, a**le"),
+ )
end
end
end
- describe 'blocked words' do
- describe 'when title contains watched words' do
- after do
- WordWatcher.clear_cache!
- end
+ describe "blocked words" do
+ describe "when title contains watched words" do
+ after { WordWatcher.clear_cache! }
- it 'should not be valid' do
- Fabricate(:watched_word, word: 'pineapple', action: WatchedWord.actions[:block])
+ it "should not be valid" do
+ Fabricate(:watched_word, word: "pineapple", action: WatchedWord.actions[:block])
- topic.title = 'pen PinEapple apple pen is a complete sentence'
+ topic.title = "pen PinEapple apple pen is a complete sentence"
expect(topic).to_not be_valid
- expect(topic.errors.full_messages.first).to include(I18n.t(
- 'contains_blocked_word', word: 'PinEapple'
- ))
+ expect(topic.errors.full_messages.first).to include(
+ I18n.t("contains_blocked_word", word: "PinEapple"),
+ )
end
end
end
@@ -164,7 +161,7 @@ RSpec.describe Topic do
it { is_expected.to rate_limit }
- describe '#visible_post_types' do
+ describe "#visible_post_types" do
let(:types) { Post.types }
before do
@@ -208,11 +205,11 @@ RSpec.describe Topic do
end
end
- describe 'slug' do
- context 'with encoded generator' do
- before { SiteSetting.slug_generation_method = 'encoded' }
+ describe "slug" do
+ context "with encoded generator" do
+ before { SiteSetting.slug_generation_method = "encoded" }
- context 'with ascii letters' do
+ context "with ascii letters" do
let!(:title) { "hello world topic" }
let!(:slug) { "hello-world-topic" }
let!(:topic) { Fabricate.build(:topic, title: title) }
@@ -223,45 +220,45 @@ RSpec.describe Topic do
end
end
- context 'for cjk characters' do
+ context "for cjk characters" do
let!(:title) { "熱帶風暴畫眉" }
let!(:topic) { Fabricate.build(:topic, title: title) }
it "returns encoded Slug for a title" do
expect(topic.title).to eq(title)
- expect(topic.slug).to eq('%E7%86%B1%E5%B8%B6%E9%A2%A8%E6%9A%B4%E7%95%AB%E7%9C%89')
+ expect(topic.slug).to eq("%E7%86%B1%E5%B8%B6%E9%A2%A8%E6%9A%B4%E7%95%AB%E7%9C%89")
end
end
- context 'for numbers' do
+ context "for numbers" do
let!(:title) { "123456789" }
let!(:slug) { "topic" }
let!(:topic) { Fabricate.build(:topic, title: title) }
- it 'generates default slug' do
+ it "generates default slug" do
Slug.expects(:for).with(title).returns("topic")
expect(Fabricate.build(:topic, title: title).slug).to eq("topic")
end
end
end
- context 'with none generator' do
+ context "with none generator" do
let!(:title) { "熱帶風暴畫眉" }
let!(:slug) { "topic" }
let!(:topic) { Fabricate.build(:topic, title: title) }
- before { SiteSetting.slug_generation_method = 'none' }
+ before { SiteSetting.slug_generation_method = "none" }
it "returns a Slug for a title" do
- Slug.expects(:for).with(title).returns('topic')
+ Slug.expects(:for).with(title).returns("topic")
expect(Fabricate.build(:topic, title: title).slug).to eq(slug)
end
end
- describe '#ascii_generator' do
- before { SiteSetting.slug_generation_method = 'ascii' }
+ describe "#ascii_generator" do
+ before { SiteSetting.slug_generation_method = "ascii" }
- context 'with ascii letters' do
+ context "with ascii letters" do
let!(:title) { "hello world topic" }
let!(:slug) { "hello-world-topic" }
let!(:topic) { Fabricate.build(:topic, title: title) }
@@ -272,9 +269,9 @@ RSpec.describe Topic do
end
end
- context 'for cjk characters' do
+ context "for cjk characters" do
let!(:title) { "熱帶風暴畫眉" }
- let!(:slug) { 'topic' }
+ let!(:slug) { "topic" }
let!(:topic) { Fabricate.build(:topic, title: title) }
it "returns 'topic' when the slug is empty (say, non-latin characters)" do
@@ -284,7 +281,7 @@ RSpec.describe Topic do
end
end
- describe 'slug computed hooks' do
+ describe "slug computed hooks" do
before do
invert_slug = ->(topic, slug, title) { slug.reverse }
Topic.slug_computed_callbacks << invert_slug
@@ -310,9 +307,7 @@ RSpec.describe Topic do
expect(topic.slug).to eq(other_slug)
end
- after do
- Topic.slug_computed_callbacks.clear
- end
+ after { Topic.slug_computed_callbacks.clear }
end
end
@@ -320,47 +315,53 @@ RSpec.describe Topic do
let!(:topic) { Fabricate(:topic) }
it "doesn't update it to be shorter due to cleaning using TextCleaner" do
- topic.title = 'unread glitch'
+ topic.title = "unread glitch"
expect(topic.save).to eq(false)
end
end
- describe 'private message title' do
+ describe "private message title" do
before do
SiteSetting.min_topic_title_length = 15
SiteSetting.min_personal_message_title_length = 3
end
- it 'allows shorter titles' do
- pm = Fabricate.build(:private_message_topic, title: 'a' * SiteSetting.min_personal_message_title_length)
+ it "allows shorter titles" do
+ pm =
+ Fabricate.build(
+ :private_message_topic,
+ title: "a" * SiteSetting.min_personal_message_title_length,
+ )
expect(pm).to be_valid
end
- it 'but not too short' do
- pm = Fabricate.build(:private_message_topic, title: 'a')
+ it "but not too short" do
+ pm = Fabricate.build(:private_message_topic, title: "a")
expect(pm).to_not be_valid
end
end
- describe 'admin topic title' do
- it 'allows really short titles' do
- pm = Fabricate.build(:private_message_topic, user: admin, title: 'a')
+ describe "admin topic title" do
+ it "allows really short titles" do
+ pm = Fabricate.build(:private_message_topic, user: admin, title: "a")
expect(pm).to be_valid
end
- it 'but not blank' do
- pm = Fabricate.build(:private_message_topic, title: '')
+ it "but not blank" do
+ pm = Fabricate.build(:private_message_topic, title: "")
expect(pm).to_not be_valid
end
end
- describe 'topic title uniqueness' do
+ describe "topic title uniqueness" do
fab!(:category1) { Fabricate(:category) }
fab!(:category2) { Fabricate(:category) }
fab!(:topic) { Fabricate(:topic, category: category1) }
let(:new_topic) { Fabricate.build(:topic, title: topic.title, category: category1) }
- let(:new_topic_different_cat) { Fabricate.build(:topic, title: topic.title, category: category2) }
+ let(:new_topic_different_cat) do
+ Fabricate.build(:topic, title: topic.title, category: category2)
+ end
context "when duplicates aren't allowed" do
before do
@@ -423,26 +424,34 @@ RSpec.describe Topic do
SiteSetting.min_topic_title_length = 134
new_topic_different_cat.title = "more than 5 characters but less than 134"
expect(new_topic_different_cat).not_to be_valid
- expect(new_topic_different_cat.errors[:title]).to include(I18n.t("errors.messages.too_short", count: 134))
+ expect(new_topic_different_cat.errors[:title]).to include(
+ I18n.t("errors.messages.too_short", count: 134),
+ )
end
end
end
- describe 'html in title' do
+ describe "html in title" do
def build_topic_with_title(title)
build(:topic, title: title).tap { |t| t.valid? }
end
let(:topic_bold) { build_topic_with_title("Topic with bold text in its title") }
- let(:topic_image) { build_topic_with_title("Topic with Click here "
- TranslationOverride.upsert!('en', 'js.themes.error_caused_by', xss)
+ TranslationOverride.upsert!("en", "js.themes.error_caused_by", xss)
- ovr = TranslationOverride.where(locale: 'en', translation_key: 'js.themes.error_caused_by').first
+ ovr =
+ TranslationOverride.where(locale: "en", translation_key: "js.themes.error_caused_by").first
expect(ovr).to be_present
expect(ovr.value).to eq("Click here alert('TEST');")
end
it "stores js for a message format key" do
- TranslationOverride.upsert!('ru', 'some.key_MF', '{NUM_RESULTS, plural, one {1 result} other {many} }')
+ TranslationOverride.upsert!(
+ "ru",
+ "some.key_MF",
+ "{NUM_RESULTS, plural, one {1 result} other {many} }",
+ )
- ovr = TranslationOverride.where(locale: 'ru', translation_key: 'some.key_MF').first
+ ovr = TranslationOverride.where(locale: "ru", translation_key: "some.key_MF").first
expect(ovr).to be_present
- expect(ovr.compiled_js).to start_with('function')
+ expect(ovr.compiled_js).to start_with("function")
expect(ovr.compiled_js).to_not match(/Invalid Format/i)
end
describe "site cache" do
def cached_value(guardian, translation_key, locale:)
- types_name, name_key, attribute = translation_key.split('.')
+ types_name, name_key, attribute = translation_key.split(".")
I18n.with_locale(locale) do
json = Site.json_for(guardian)
- JSON.parse(json)[types_name]
- .find { |x| x['name_key'] == name_key }[attribute]
+ JSON.parse(json)[types_name].find { |x| x["name_key"] == name_key }[attribute]
end
end
@@ -152,39 +178,41 @@ RSpec.describe TranslationOverride do
I18n.locale = :de
translation_keys.each do |translation_key|
- original_value = I18n.t(translation_key, locale: 'en')
- expect(cached_value(user_guardian, translation_key, locale: 'en')).to eq(original_value)
- expect(cached_value(anon_guardian, translation_key, locale: 'en')).to eq(original_value)
+ original_value = I18n.t(translation_key, locale: "en")
+ expect(cached_value(user_guardian, translation_key, locale: "en")).to eq(original_value)
+ expect(cached_value(anon_guardian, translation_key, locale: "en")).to eq(original_value)
- TranslationOverride.upsert!('en', translation_key, 'bar')
- expect(cached_value(user_guardian, translation_key, locale: 'en')).to eq('bar')
- expect(cached_value(anon_guardian, translation_key, locale: 'en')).to eq('bar')
+ TranslationOverride.upsert!("en", translation_key, "bar")
+ expect(cached_value(user_guardian, translation_key, locale: "en")).to eq("bar")
+ expect(cached_value(anon_guardian, translation_key, locale: "en")).to eq("bar")
end
- TranslationOverride.revert!('en', translation_keys)
+ TranslationOverride.revert!("en", translation_keys)
translation_keys.each do |translation_key|
- original_value = I18n.t(translation_key, locale: 'en')
- expect(cached_value(user_guardian, translation_key, locale: 'en')).to eq(original_value)
- expect(cached_value(anon_guardian, translation_key, locale: 'en')).to eq(original_value)
+ original_value = I18n.t(translation_key, locale: "en")
+ expect(cached_value(user_guardian, translation_key, locale: "en")).to eq(original_value)
+ expect(cached_value(anon_guardian, translation_key, locale: "en")).to eq(original_value)
end
end
end
context "with post_action_types" do
- let(:translation_keys) { ['post_action_types.off_topic.description'] }
+ let(:translation_keys) { ["post_action_types.off_topic.description"] }
include_examples "resets site text"
end
context "with topic_flag_types" do
- let(:translation_keys) { ['topic_flag_types.spam.description'] }
+ let(:translation_keys) { ["topic_flag_types.spam.description"] }
include_examples "resets site text"
end
context "with multiple keys" do
- let(:translation_keys) { ['post_action_types.off_topic.description', 'topic_flag_types.spam.description'] }
+ let(:translation_keys) do
+ %w[post_action_types.off_topic.description topic_flag_types.spam.description]
+ end
include_examples "resets site text"
end
@@ -193,27 +221,47 @@ RSpec.describe TranslationOverride do
it "correctly reloads all translation overrides" do
original_en_topics = I18n.t("topics", locale: :en)
original_en_emoji = I18n.t("js.composer.emoji", locale: :en)
- original_en_offtopic_description = I18n.t("post_action_types.off_topic.description", locale: :en)
+ original_en_offtopic_description =
+ I18n.t("post_action_types.off_topic.description", locale: :en)
original_de_likes = I18n.t("likes", locale: :de)
TranslationOverride.create!(locale: "en", translation_key: "topics", value: "Threads")
- TranslationOverride.create!(locale: "en", translation_key: "js.composer.emoji", value: "Smilies")
- TranslationOverride.create!(locale: "en", translation_key: "post_action_types.off_topic.description", value: "Overridden description")
- TranslationOverride.create!(locale: "de", translation_key: "likes", value: "„Gefällt mir“-Angaben")
+ TranslationOverride.create!(
+ locale: "en",
+ translation_key: "js.composer.emoji",
+ value: "Smilies",
+ )
+ TranslationOverride.create!(
+ locale: "en",
+ translation_key: "post_action_types.off_topic.description",
+ value: "Overridden description",
+ )
+ TranslationOverride.create!(
+ locale: "de",
+ translation_key: "likes",
+ value: "„Gefällt mir“-Angaben",
+ )
expect(I18n.t("topics", locale: :en)).to eq(original_en_topics)
expect(I18n.t("js.composer.emoji", locale: :en)).to eq(original_en_emoji)
- expect(cached_value(anon_guardian, "post_action_types.off_topic.description", locale: :en)).to eq(original_en_offtopic_description)
+ expect(
+ cached_value(anon_guardian, "post_action_types.off_topic.description", locale: :en),
+ ).to eq(original_en_offtopic_description)
expect(I18n.t("likes", locale: :de)).to eq(original_de_likes)
TranslationOverride.reload_all_overrides!
expect(I18n.t("topics", locale: :en)).to eq("Threads")
expect(I18n.t("js.composer.emoji", locale: :en)).to eq("Smilies")
- expect(cached_value(anon_guardian, "post_action_types.off_topic.description", locale: :en)).to eq("Overridden description")
+ expect(
+ cached_value(anon_guardian, "post_action_types.off_topic.description", locale: :en),
+ ).to eq("Overridden description")
expect(I18n.t("likes", locale: :de)).to eq("„Gefällt mir“-Angaben")
- TranslationOverride.revert!(:en, ["topics", "js.composer.emoji", "post_action_types.off_topic.description"])
+ TranslationOverride.revert!(
+ :en,
+ %w[topics js.composer.emoji post_action_types.off_topic.description],
+ )
TranslationOverride.revert!(:de, ["likes"])
end
end
diff --git a/spec/models/trust_level3_requirements_spec.rb b/spec/models/trust_level3_requirements_spec.rb
index 303b0d5ad6e..19bc70b132c 100644
--- a/spec/models/trust_level3_requirements_spec.rb
+++ b/spec/models/trust_level3_requirements_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
RSpec.describe TrustLevel3Requirements do
-
fab!(:user) { Fabricate(:user) }
subject(:tl3_requirements) { described_class.new(user) }
fab!(:moderator) { Fabricate(:moderator) }
@@ -11,22 +10,23 @@ RSpec.describe TrustLevel3Requirements do
fab!(:topic3) { Fabricate(:topic) }
fab!(:topic4) { Fabricate(:topic) }
- before do
- described_class.clear_cache
- end
+ before { described_class.clear_cache }
def make_view(topic, at, user_id)
- TopicViewItem.add(topic.id, '11.22.33.44', user_id, at, _skip_redis = true)
+ TopicViewItem.add(topic.id, "11.22.33.44", user_id, at, _skip_redis = true)
end
def like_at(created_by, post, created_at)
- PostActionCreator.new(created_by, post, PostActionType.types[:like], created_at: created_at).perform
+ PostActionCreator.new(
+ created_by,
+ post,
+ PostActionType.types[:like],
+ created_at: created_at,
+ ).perform
end
describe "requirements" do
-
describe "penalty_counts" do
-
it "returns if the user has been silenced in last 6 months" do
expect(tl3_requirements.penalty_counts.silenced).to eq(0)
expect(tl3_requirements.penalty_counts.total).to eq(0)
@@ -58,7 +58,7 @@ RSpec.describe TrustLevel3Requirements do
UserHistory.create!(
target_user_id: user.id,
acting_user_id: moderator.id,
- action: UserHistory.actions[:suspend_user]
+ action: UserHistory.actions[:suspend_user],
)
expect(tl3_requirements.penalty_counts.suspended).to eq(1)
@@ -67,7 +67,7 @@ RSpec.describe TrustLevel3Requirements do
UserHistory.create!(
target_user_id: user.id,
acting_user_id: moderator.id,
- action: UserHistory.actions[:unsuspend_user]
+ action: UserHistory.actions[:unsuspend_user],
)
expect(tl3_requirements.penalty_counts.suspended).to eq(0)
@@ -83,7 +83,7 @@ RSpec.describe TrustLevel3Requirements do
UserHistory.create!(
target_user_id: user.id,
acting_user_id: Discourse.system_user.id,
- action: UserHistory.actions[:suspend_user]
+ action: UserHistory.actions[:suspend_user],
)
expect(tl3_requirements.penalty_counts.suspended).to eq(1)
@@ -92,7 +92,7 @@ RSpec.describe TrustLevel3Requirements do
UserHistory.create!(
target_user_id: user.id,
acting_user_id: Discourse.system_user.id,
- action: UserHistory.actions[:unsuspend_user]
+ action: UserHistory.actions[:unsuspend_user],
)
expect(tl3_requirements.penalty_counts.suspended).to eq(1)
@@ -257,11 +257,12 @@ RSpec.describe TrustLevel3Requirements do
it "excludes private messages" do
user.save!
- private_topic = create_post(
- user: moderator,
- archetype: Archetype.private_message,
- target_usernames: [user.username, moderator.username]
- ).topic
+ private_topic =
+ create_post(
+ user: moderator,
+ archetype: Archetype.private_message,
+ target_usernames: [user.username, moderator.username],
+ ).topic
_reply1 = create_post(topic: private_topic, user: user)
@@ -272,9 +273,9 @@ RSpec.describe TrustLevel3Requirements do
describe "topics_viewed" do
it "counts topics views within last 100 days (default time period), not counting a topic more than once" do
user.save
- make_view(topic1, 1.day.ago, user.id)
- make_view(topic1, 3.days.ago, user.id) # same topic, different day
- make_view(topic2, 4.days.ago, user.id)
+ make_view(topic1, 1.day.ago, user.id)
+ make_view(topic1, 3.days.ago, user.id) # same topic, different day
+ make_view(topic2, 4.days.ago, user.id)
make_view(topic3, 101.days.ago, user.id) # too long ago
expect(tl3_requirements.topics_viewed).to eq(2)
end
@@ -282,9 +283,9 @@ RSpec.describe TrustLevel3Requirements do
it "counts topics views within last 200 days, respecting tl3_time_period setting" do
SiteSetting.tl3_time_period = 200
user.save
- make_view(topic1, 1.day.ago, user.id)
- make_view(topic1, 3.days.ago, user.id) # same topic, different day
- make_view(topic2, 4.days.ago, user.id)
+ make_view(topic1, 1.day.ago, user.id)
+ make_view(topic1, 3.days.ago, user.id) # same topic, different day
+ make_view(topic2, 4.days.ago, user.id)
make_view(topic3, 101.days.ago, user.id)
make_view(topic4, 201.days.ago, user.id) # too long ago
expect(tl3_requirements.topics_viewed).to eq(3)
@@ -292,11 +293,12 @@ RSpec.describe TrustLevel3Requirements do
it "excludes private messages" do
user.save
- private_topic = create_post(
- user: moderator,
- archetype: Archetype.private_message,
- target_usernames: [user.username, moderator.username]
- ).topic
+ private_topic =
+ create_post(
+ user: moderator,
+ archetype: Archetype.private_message,
+ target_usernames: [user.username, moderator.username],
+ ).topic
make_view(topic1, 1.day.ago, user.id)
make_view(private_topic, 1.day.ago, user.id)
@@ -318,23 +320,24 @@ RSpec.describe TrustLevel3Requirements do
describe "topics_viewed_all_time" do
it "counts topics viewed at any time" do
user.save
- make_view(topic1, 1.day.ago, user.id)
- make_view(topic2, 100.days.ago, user.id)
- make_view(topic3, 101.days.ago, user.id)
+ make_view(topic1, 1.day.ago, user.id)
+ make_view(topic2, 100.days.ago, user.id)
+ make_view(topic3, 101.days.ago, user.id)
expect(tl3_requirements.topics_viewed_all_time).to eq(3)
end
it "excludes private messages" do
user.save
- private_topic = create_post(
- user: moderator,
- archetype: Archetype.private_message,
- target_usernames: [user.username, moderator.username]
- ).topic
+ private_topic =
+ create_post(
+ user: moderator,
+ archetype: Archetype.private_message,
+ target_usernames: [user.username, moderator.username],
+ ).topic
- make_view(topic1, 1.day.ago, user.id)
- make_view(topic2, 100.days.ago, user.id)
- make_view(topic3, 101.days.ago, user.id)
+ make_view(topic1, 1.day.ago, user.id)
+ make_view(topic2, 100.days.ago, user.id)
+ make_view(topic3, 101.days.ago, user.id)
make_view(private_topic, 1.day.ago, user.id)
make_view(private_topic, 100.days.ago, user.id)
expect(tl3_requirements.topics_viewed_all_time).to eq(3)
@@ -353,26 +356,61 @@ RSpec.describe TrustLevel3Requirements do
context "with flagged posts" do
before do
user.save
- flags = [:off_topic, :inappropriate, :notify_user, :notify_moderators, :spam].map do |t|
- Fabricate(:flag, post: Fabricate(:post, user: user), post_action_type_id: PostActionType.types[t], agreed_at: 1.minute.ago)
- end
+ flags =
+ %i[off_topic inappropriate notify_user notify_moderators spam].map do |t|
+ Fabricate(
+ :flag,
+ post: Fabricate(:post, user: user),
+ post_action_type_id: PostActionType.types[t],
+ agreed_at: 1.minute.ago,
+ )
+ end
- _deferred_flags = [:off_topic, :inappropriate, :notify_user, :notify_moderators, :spam].map do |t|
- Fabricate(:flag, post: Fabricate(:post, user: user), post_action_type_id: PostActionType.types[t], deferred_at: 1.minute.ago)
- end
+ _deferred_flags =
+ %i[off_topic inappropriate notify_user notify_moderators spam].map do |t|
+ Fabricate(
+ :flag,
+ post: Fabricate(:post, user: user),
+ post_action_type_id: PostActionType.types[t],
+ deferred_at: 1.minute.ago,
+ )
+ end
- _deleted_flags = [:off_topic, :inappropriate, :notify_user, :notify_moderators, :spam].map do |t|
- Fabricate(:flag, post: Fabricate(:post, user: user), post_action_type_id: PostActionType.types[t], deleted_at: 1.minute.ago)
- end
+ _deleted_flags =
+ %i[off_topic inappropriate notify_user notify_moderators spam].map do |t|
+ Fabricate(
+ :flag,
+ post: Fabricate(:post, user: user),
+ post_action_type_id: PostActionType.types[t],
+ deleted_at: 1.minute.ago,
+ )
+ end
# Same post, different user:
- Fabricate(:flag, post: flags[1].post, post_action_type_id: PostActionType.types[:spam], agreed_at: 1.minute.ago)
+ Fabricate(
+ :flag,
+ post: flags[1].post,
+ post_action_type_id: PostActionType.types[:spam],
+ agreed_at: 1.minute.ago,
+ )
# Flagged their own post:
- Fabricate(:flag, user: user, post: Fabricate(:post, user: user), post_action_type_id: PostActionType.types[:spam], agreed_at: 1.minute.ago)
+ Fabricate(
+ :flag,
+ user: user,
+ post: Fabricate(:post, user: user),
+ post_action_type_id: PostActionType.types[:spam],
+ agreed_at: 1.minute.ago,
+ )
# More than 100 days ago:
- Fabricate(:flag, post: Fabricate(:post, user: user, created_at: 101.days.ago), post_action_type_id: PostActionType.types[:spam], created_at: 101.days.ago, agreed_at: 1.day.ago)
+ Fabricate(
+ :flag,
+ post: Fabricate(:post, user: user, created_at: 101.days.ago),
+ post_action_type_id: PostActionType.types[:spam],
+ created_at: 101.days.ago,
+ agreed_at: 1.day.ago,
+ )
end
it "num_flagged_posts and num_flagged_by_users count spam and inappropriate agreed flags in the last 100 days" do
@@ -394,7 +432,7 @@ RSpec.describe TrustLevel3Requirements do
create_post(
user: moderator,
archetype: Archetype.private_message,
- target_usernames: [user.username, moderator.username]
+ target_usernames: [user.username, moderator.username],
)
end
@@ -415,9 +453,7 @@ RSpec.describe TrustLevel3Requirements do
end
describe "num_likes_received" do
- before do
- UserActionManager.enable
- end
+ before { UserActionManager.enable }
let(:topic) { Fabricate(:topic, user: user, created_at: 102.days.ago) }
let(:old_post) { create_post(topic: topic, user: user, created_at: 102.days.ago) }
@@ -428,7 +464,7 @@ RSpec.describe TrustLevel3Requirements do
create_post(
user: user,
archetype: Archetype.private_message,
- target_usernames: [liker.username, liker2.username]
+ target_usernames: [liker.username, liker2.username],
)
end
@@ -597,5 +633,4 @@ RSpec.describe TrustLevel3Requirements do
end
end
end
-
end
diff --git a/spec/models/trust_level_and_staff_setting_spec.rb b/spec/models/trust_level_and_staff_setting_spec.rb
index 418d41d64fb..67ecd58df4c 100644
--- a/spec/models/trust_level_and_staff_setting_spec.rb
+++ b/spec/models/trust_level_and_staff_setting_spec.rb
@@ -2,9 +2,7 @@
RSpec.describe TrustLevelAndStaffSetting do
describe ".values" do
- after do
- I18n.reload!
- end
+ after { I18n.reload! }
it "returns translated names" do
TranslationOverride.upsert!(I18n.locale, "js.trust_levels.names.newuser", "New Member")
@@ -14,7 +12,9 @@ RSpec.describe TrustLevelAndStaffSetting do
value = values.find { |v| v[:value] == 0 }
expect(value).to be_present
- expect(value[:name]).to eq(I18n.t("js.trust_levels.detailed_name", level: 0, name: "New Member"))
+ expect(value[:name]).to eq(
+ I18n.t("js.trust_levels.detailed_name", level: 0, name: "New Member"),
+ )
value = values.find { |v| v[:value] == "admin" }
expect(value).to be_present
diff --git a/spec/models/trust_level_setting_spec.rb b/spec/models/trust_level_setting_spec.rb
index 580acab61d0..6a91368ce86 100644
--- a/spec/models/trust_level_setting_spec.rb
+++ b/spec/models/trust_level_setting_spec.rb
@@ -2,15 +2,15 @@
RSpec.describe TrustLevelSetting do
describe ".values" do
- after do
- I18n.reload!
- end
+ after { I18n.reload! }
it "returns translated names" do
TranslationOverride.upsert!(I18n.locale, "js.trust_levels.names.newuser", "New Member")
value = TrustLevelSetting.values.first
- expect(value[:name]).to eq(I18n.t("js.trust_levels.detailed_name", level: 0, name: "New Member"))
+ expect(value[:name]).to eq(
+ I18n.t("js.trust_levels.detailed_name", level: 0, name: "New Member"),
+ )
expect(value[:value]).to eq(0)
end
end
diff --git a/spec/models/unsubscribe_key_spec.rb b/spec/models/unsubscribe_key_spec.rb
index e3e813fedb4..c5fcc175a52 100644
--- a/spec/models/unsubscribe_key_spec.rb
+++ b/spec/models/unsubscribe_key_spec.rb
@@ -1,9 +1,8 @@
# frozen_string_literal: true
RSpec.describe UnsubscribeKey do
-
- describe 'post unsubscribe key' do
- it 'can generate a correct url' do
+ describe "post unsubscribe key" do
+ it "can generate a correct url" do
post = Fabricate(:post)
url = post.unsubscribe_url(post.user)
@@ -17,27 +16,22 @@ RSpec.describe UnsubscribeKey do
end
end
- describe 'key' do
-
+ describe "key" do
fab!(:user) { Fabricate(:user) }
let!(:key) { UnsubscribeKey.create_key_for(user, UnsubscribeKey::DIGEST_TYPE) }
- it 'has a temporary key' do
+ it "has a temporary key" do
expect(key).to be_present
end
- describe '#user_for_key' do
-
- it 'can be used to find the user' do
+ describe "#user_for_key" do
+ it "can be used to find the user" do
expect(UnsubscribeKey.user_for_key(key)).to eq(user)
end
- it 'returns nil with an invalid key' do
- expect(UnsubscribeKey.user_for_key('asdfasdf')).to be_blank
+ it "returns nil with an invalid key" do
+ expect(UnsubscribeKey.user_for_key("asdfasdf")).to be_blank
end
-
end
-
end
-
end
diff --git a/spec/models/upload_reference_spec.rb b/spec/models/upload_reference_spec.rb
index cd7a826957c..79785d12de9 100644
--- a/spec/models/upload_reference_spec.rb
+++ b/spec/models/upload_reference_spec.rb
@@ -1,240 +1,253 @@
# frozen_string_literal: true
RSpec.describe UploadReference do
- describe 'badge uploads' do
+ describe "badge uploads" do
fab!(:upload) { Fabricate(:upload) }
- it 'creates upload references' do
+ it "creates upload references" do
badge = nil
- expect { badge = Fabricate(:badge, image_upload_id: upload.id) }
- .to change { UploadReference.count }.by(1)
+ expect { badge = Fabricate(:badge, image_upload_id: upload.id) }.to change {
+ UploadReference.count
+ }.by(1)
upload_reference = UploadReference.last
expect(upload_reference.upload).to eq(upload)
expect(upload_reference.target).to eq(badge)
- expect { badge.destroy! }
- .to change { UploadReference.count }.by(-1)
+ expect { badge.destroy! }.to change { UploadReference.count }.by(-1)
end
end
- describe 'category uploads' do
+ describe "category uploads" do
fab!(:upload1) { Fabricate(:upload) }
fab!(:upload2) { Fabricate(:upload) }
fab!(:upload3) { Fabricate(:upload) }
- it 'creates upload references' do
+ it "creates upload references" do
category = nil
- expect { category = Fabricate(:category, uploaded_logo_id: upload1.id, uploaded_logo_dark_id: upload2.id, uploaded_background_id: upload3.id) }
- .to change { UploadReference.count }.by(3)
+ expect {
+ category =
+ Fabricate(
+ :category,
+ uploaded_logo_id: upload1.id,
+ uploaded_logo_dark_id: upload2.id,
+ uploaded_background_id: upload3.id,
+ )
+ }.to change { UploadReference.count }.by(3)
upload_reference = UploadReference.last
expect(upload_reference.target).to eq(category)
- expect { category.destroy! }
- .to change { UploadReference.count }.by(-3)
+ expect { category.destroy! }.to change { UploadReference.count }.by(-3)
end
end
- describe 'custom emoji uploads' do
+ describe "custom emoji uploads" do
fab!(:upload) { Fabricate(:upload) }
- it 'creates upload references' do
+ it "creates upload references" do
custom_emoji = nil
- expect { custom_emoji = CustomEmoji.create!(name: 'emoji', upload_id: upload.id) }
- .to change { UploadReference.count }.by(1)
+ expect { custom_emoji = CustomEmoji.create!(name: "emoji", upload_id: upload.id) }.to change {
+ UploadReference.count
+ }.by(1)
upload_reference = UploadReference.last
expect(upload_reference.target).to eq(custom_emoji)
- expect { custom_emoji.destroy! }
- .to change { UploadReference.count }.by(-1)
+ expect { custom_emoji.destroy! }.to change { UploadReference.count }.by(-1)
end
end
- describe 'group uploads' do
+ describe "group uploads" do
fab!(:upload) { Fabricate(:upload) }
- it 'creates upload references' do
+ it "creates upload references" do
group = nil
- expect { group = Fabricate(:group, flair_upload_id: upload.id) }
- .to change { UploadReference.count }.by(1)
+ expect { group = Fabricate(:group, flair_upload_id: upload.id) }.to change {
+ UploadReference.count
+ }.by(1)
upload_reference = UploadReference.last
expect(upload_reference.upload).to eq(upload)
expect(upload_reference.target).to eq(group)
- expect { group.destroy! }
- .to change { UploadReference.count }.by(-1)
+ expect { group.destroy! }.to change { UploadReference.count }.by(-1)
end
end
- describe 'post uploads' do
+ describe "post uploads" do
fab!(:upload) { Fabricate(:upload) }
fab!(:post) { Fabricate(:post, raw: "[](#{upload.short_url})") }
- it 'creates upload references' do
- expect { post.link_post_uploads }
- .to change { UploadReference.count }.by(1)
+ it "creates upload references" do
+ expect { post.link_post_uploads }.to change { UploadReference.count }.by(1)
upload_reference = UploadReference.last
expect(upload_reference.upload).to eq(upload)
expect(upload_reference.target).to eq(post)
- expect { post.destroy! }
- .to change { UploadReference.count }.by(-1)
+ expect { post.destroy! }.to change { UploadReference.count }.by(-1)
end
end
- describe 'site setting uploads' do
+ describe "site setting uploads" do
let(:provider) { SiteSettings::DbProvider.new(SiteSetting) }
fab!(:upload) { Fabricate(:upload) }
fab!(:upload2) { Fabricate(:upload) }
- it 'creates upload references for uploads' do
- expect { provider.save('logo', upload.id, SiteSettings::TypeSupervisor.types[:upload]) }
- .to change { UploadReference.count }.by(1)
+ it "creates upload references for uploads" do
+ expect {
+ provider.save("logo", upload.id, SiteSettings::TypeSupervisor.types[:upload])
+ }.to change { UploadReference.count }.by(1)
upload_reference = UploadReference.last
expect(upload_reference.upload).to eq(upload)
- expect(upload_reference.target).to eq(SiteSetting.find_by(name: 'logo'))
+ expect(upload_reference.target).to eq(SiteSetting.find_by(name: "logo"))
- expect { provider.destroy('logo') }
- .to change { UploadReference.count }.by(-1)
+ expect { provider.destroy("logo") }.to change { UploadReference.count }.by(-1)
end
- it 'creates upload references for uploaded_image_lists' do
- expect { provider.save('selectable_avatars', "#{upload.id}|#{upload2.id}", SiteSettings::TypeSupervisor.types[:uploaded_image_list]) }
- .to change { UploadReference.count }.by(2)
+ it "creates upload references for uploaded_image_lists" do
+ expect {
+ provider.save(
+ "selectable_avatars",
+ "#{upload.id}|#{upload2.id}",
+ SiteSettings::TypeSupervisor.types[:uploaded_image_list],
+ )
+ }.to change { UploadReference.count }.by(2)
- upload_references = UploadReference.all.where(target: SiteSetting.find_by(name: 'selectable_avatars'))
+ upload_references =
+ UploadReference.all.where(target: SiteSetting.find_by(name: "selectable_avatars"))
expect(upload_references.pluck(:upload_id)).to contain_exactly(upload.id, upload2.id)
- expect { provider.destroy('selectable_avatars') }
- .to change { UploadReference.count }.by(-2)
+ expect { provider.destroy("selectable_avatars") }.to change { UploadReference.count }.by(-2)
end
end
- describe 'theme field uploads' do
+ describe "theme field uploads" do
fab!(:upload) { Fabricate(:upload) }
- it 'creates upload refererences' do
+ it "creates upload refererences" do
theme_field = nil
expect do
- theme_field = ThemeField.create!(
- theme_id: Fabricate(:theme).id,
- target_id: 0,
- name: 'field',
- value: '',
- upload: upload,
- type_id: ThemeField.types[:theme_upload_var],
- )
+ theme_field =
+ ThemeField.create!(
+ theme_id: Fabricate(:theme).id,
+ target_id: 0,
+ name: "field",
+ value: "",
+ upload: upload,
+ type_id: ThemeField.types[:theme_upload_var],
+ )
end.to change { UploadReference.count }.by(1)
upload_reference = UploadReference.last
expect(upload_reference.upload).to eq(upload)
expect(upload_reference.target).to eq(theme_field)
- expect { theme_field.destroy! }
- .to change { UploadReference.count }.by(-1)
+ expect { theme_field.destroy! }.to change { UploadReference.count }.by(-1)
end
end
- describe 'theme setting uploads' do
+ describe "theme setting uploads" do
fab!(:upload) { Fabricate(:upload) }
- it 'creates upload refererences' do
+ it "creates upload refererences" do
theme_setting = nil
expect do
- theme_setting = ThemeSetting.create!(
- name: 'field',
- data_type: ThemeSetting.types[:upload],
- value: upload.id,
- theme_id: Fabricate(:theme).id,
- )
+ theme_setting =
+ ThemeSetting.create!(
+ name: "field",
+ data_type: ThemeSetting.types[:upload],
+ value: upload.id,
+ theme_id: Fabricate(:theme).id,
+ )
end.to change { UploadReference.count }.by(1)
upload_reference = UploadReference.last
expect(upload_reference.upload).to eq(upload)
expect(upload_reference.target).to eq(theme_setting)
- expect { theme_setting.destroy! }
- .to change { UploadReference.count }.by(-1)
+ expect { theme_setting.destroy! }.to change { UploadReference.count }.by(-1)
end
end
- describe 'user uploads' do
+ describe "user uploads" do
fab!(:upload) { Fabricate(:upload) }
- it 'creates upload references' do
+ it "creates upload references" do
user = nil
- expect { user = Fabricate(:user, uploaded_avatar_id: upload.id) }
- .to change { UploadReference.count }.by(1)
+ expect { user = Fabricate(:user, uploaded_avatar_id: upload.id) }.to change {
+ UploadReference.count
+ }.by(1)
upload_reference = UploadReference.last
expect(upload_reference.upload).to eq(upload)
expect(upload_reference.target).to eq(user)
- expect { user.destroy! }
- .to change { UploadReference.count }.by(-1)
+ expect { user.destroy! }.to change { UploadReference.count }.by(-1)
end
end
- describe 'user avatar uploads' do
+ describe "user avatar uploads" do
fab!(:upload1) { Fabricate(:upload) }
fab!(:upload2) { Fabricate(:upload) }
- it 'creates upload references' do
+ it "creates upload references" do
user_avatar = nil
- expect { user_avatar = Fabricate(:user_avatar, custom_upload_id: upload1.id, gravatar_upload_id: upload2.id) }
- .to change { UploadReference.count }.by(2)
+ expect {
+ user_avatar =
+ Fabricate(:user_avatar, custom_upload_id: upload1.id, gravatar_upload_id: upload2.id)
+ }.to change { UploadReference.count }.by(2)
upload_reference = UploadReference.last
expect(upload_reference.target).to eq(user_avatar)
- expect { user_avatar.destroy! }
- .to change { UploadReference.count }.by(-2)
+ expect { user_avatar.destroy! }.to change { UploadReference.count }.by(-2)
end
end
- describe 'user export uploads' do
+ describe "user export uploads" do
fab!(:upload) { Fabricate(:upload) }
- it 'creates upload references' do
+ it "creates upload references" do
user_export = nil
expect do
- user_export = UserExport.create!(
- file_name: 'export',
- user: Fabricate(:user),
- upload: upload,
- topic: Fabricate(:topic),
- )
+ user_export =
+ UserExport.create!(
+ file_name: "export",
+ user: Fabricate(:user),
+ upload: upload,
+ topic: Fabricate(:topic),
+ )
end.to change { UploadReference.count }.by(1)
upload_reference = UploadReference.last
expect(upload_reference.upload).to eq(upload)
expect(upload_reference.target).to eq(user_export)
- expect { user_export.destroy! }
- .to change { UploadReference.count }.by(-1)
+ expect { user_export.destroy! }.to change { UploadReference.count }.by(-1)
end
end
- describe 'user profile uploads' do
+ describe "user profile uploads" do
fab!(:user) { Fabricate(:user) }
fab!(:upload1) { Fabricate(:upload) }
fab!(:upload2) { Fabricate(:upload) }
- it 'creates upload references' do
+ it "creates upload references" do
user_profile = user.user_profile
- expect { user_profile.update!(profile_background_upload_id: upload1.id, card_background_upload_id: upload2.id) }
- .to change { UploadReference.count }.by(2)
+ expect {
+ user_profile.update!(
+ profile_background_upload_id: upload1.id,
+ card_background_upload_id: upload2.id,
+ )
+ }.to change { UploadReference.count }.by(2)
upload_reference = UploadReference.last
expect(upload_reference.target).to eq(user_profile)
- expect { user_profile.destroy! }
- .to change { UploadReference.count }.by(-2)
+ expect { user_profile.destroy! }.to change { UploadReference.count }.by(-2)
end
end
end
diff --git a/spec/models/upload_spec.rb b/spec/models/upload_spec.rb
index 642061904e3..a29df2e1cbb 100644
--- a/spec/models/upload_spec.rb
+++ b/spec/models/upload_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Upload do
let(:attachment_path) { __FILE__ }
let(:attachment) { File.new(attachment_path) }
- describe '.with_no_non_post_relations' do
+ describe ".with_no_non_post_relations" do
it "does not find non-post related uploads" do
post_upload = Fabricate(:upload)
post = Fabricate(:post, raw: "click me! "
user_field = Fabricate(:user_field)
@@ -20,7 +20,7 @@ RSpec.describe UserField do
expect(user_field.description).to eq("click me! alert('TEST');")
end
- it 'allows target attribute in the description' do
+ it "allows target attribute in the description" do
link = "elsewhere "
user_field = Fabricate(:user_field)
diff --git a/spec/models/user_history_spec.rb b/spec/models/user_history_spec.rb
index 5dc7c024753..b88ab715bf7 100644
--- a/spec/models/user_history_spec.rb
+++ b/spec/models/user_history_spec.rb
@@ -1,11 +1,9 @@
# frozen_string_literal: true
RSpec.describe UserHistory do
- describe '#actions' do
+ describe "#actions" do
context "when verifying enum sequence" do
- before do
- @actions = UserHistory.actions
- end
+ before { @actions = UserHistory.actions }
it "'delete_user' should be at 1st position" do
expect(@actions[:delete_user]).to eq(1)
@@ -17,15 +15,26 @@ RSpec.describe UserHistory do
end
end
- describe '#staff_action_records' do
+ describe "#staff_action_records" do
context "with some records" do
fab!(:admin) { Fabricate(:admin) }
- let(:custom_type) { 'confirmed_ham' }
+ let(:custom_type) { "confirmed_ham" }
before do
- @change_site_setting = UserHistory.create!(action: UserHistory.actions[:change_site_setting], subject: "title", previous_value: "Old", new_value: "New")
- @change_trust_level = UserHistory.create!(action: UserHistory.actions[:change_trust_level], target_user_id: Fabricate(:user).id, details: "stuff happened")
- @custom_history = StaffActionLogger.new(admin).log_custom('confirmed_ham', admin_only: true)
+ @change_site_setting =
+ UserHistory.create!(
+ action: UserHistory.actions[:change_site_setting],
+ subject: "title",
+ previous_value: "Old",
+ new_value: "New",
+ )
+ @change_trust_level =
+ UserHistory.create!(
+ action: UserHistory.actions[:change_trust_level],
+ target_user_id: Fabricate(:user).id,
+ details: "stuff happened",
+ )
+ @custom_history = StaffActionLogger.new(admin).log_custom("confirmed_ham", admin_only: true)
end
it "returns all records for admins" do
@@ -38,22 +47,30 @@ RSpec.describe UserHistory do
expect(records).not_to include([@change_site_setting])
end
- it 'filters by action' do
- records = described_class.staff_action_records(admin, action_id: @change_site_setting.action_before_type_cast).to_a
+ it "filters by action" do
+ records =
+ described_class.staff_action_records(
+ admin,
+ action_id: @change_site_setting.action_before_type_cast,
+ ).to_a
expect(records.size).to eq(1)
expect(records.first).to eq(@change_site_setting)
end
- it 'filters by action_name' do
- records = described_class.staff_action_records(admin, action_name: "change_site_setting").to_a
+ it "filters by action_name" do
+ records =
+ described_class.staff_action_records(admin, action_name: "change_site_setting").to_a
expect(records.size).to eq(1)
expect(records.first).to eq(@change_site_setting)
end
- it 'Uses action_name as custom_type when searching for custom_staff logs' do
- records = described_class.staff_action_records(
- admin, action_name: custom_type, action_id: described_class.actions[:custom_staff]
- ).to_a
+ it "Uses action_name as custom_type when searching for custom_staff logs" do
+ records =
+ described_class.staff_action_records(
+ admin,
+ action_name: custom_type,
+ action_id: described_class.actions[:custom_staff],
+ ).to_a
expect(records.size).to eq(1)
expect(records.first).to eq(@custom_history)
diff --git a/spec/models/user_notification_schedule_spec.rb b/spec/models/user_notification_schedule_spec.rb
index b80922963c9..59475196895 100644
--- a/spec/models/user_notification_schedule_spec.rb
+++ b/spec/models/user_notification_schedule_spec.rb
@@ -4,53 +4,49 @@ RSpec.describe UserNotificationSchedule do
fab!(:user) { Fabricate(:user) }
describe "validations" do
- it 'is invalid when no times are specified' do
- schedule = UserNotificationSchedule.create({
- user: user,
- enabled: true
- })
- expect(schedule.errors.attribute_names).to eq([
- :day_0_start_time,
- :day_0_end_time,
- :day_1_start_time,
- :day_1_end_time,
- :day_2_start_time,
- :day_2_end_time,
- :day_3_start_time,
- :day_3_end_time,
- :day_4_start_time,
- :day_4_end_time,
- :day_5_start_time,
- :day_5_end_time,
- :day_6_start_time,
- :day_6_end_time,
- ])
+ it "is invalid when no times are specified" do
+ schedule = UserNotificationSchedule.create({ user: user, enabled: true })
+ expect(schedule.errors.attribute_names).to eq(
+ %i[
+ day_0_start_time
+ day_0_end_time
+ day_1_start_time
+ day_1_end_time
+ day_2_start_time
+ day_2_end_time
+ day_3_start_time
+ day_3_end_time
+ day_4_start_time
+ day_4_end_time
+ day_5_start_time
+ day_5_end_time
+ day_6_start_time
+ day_6_end_time
+ ],
+ )
end
- it 'is invalid when a start time is below -1' do
- schedule = UserNotificationSchedule.new({
- user: user,
- }.merge(UserNotificationSchedule::DEFAULT))
+ it "is invalid when a start time is below -1" do
+ schedule =
+ UserNotificationSchedule.new({ user: user }.merge(UserNotificationSchedule::DEFAULT))
schedule.day_0_start_time = -2
schedule.save
expect(schedule.errors.count).to eq(1)
expect(schedule.errors[:day_0_start_time]).to be_present
end
- it 'invalid when an end time is greater than 1440' do
- schedule = UserNotificationSchedule.new({
- user: user,
- }.merge(UserNotificationSchedule::DEFAULT))
+ it "invalid when an end time is greater than 1440" do
+ schedule =
+ UserNotificationSchedule.new({ user: user }.merge(UserNotificationSchedule::DEFAULT))
schedule.day_0_end_time = 1441
schedule.save
expect(schedule.errors.count).to eq(1)
expect(schedule.errors[:day_0_end_time]).to be_present
end
- it 'invalid when the start time is greater than the end time' do
- schedule = UserNotificationSchedule.new({
- user: user,
- }.merge(UserNotificationSchedule::DEFAULT))
+ it "invalid when the start time is greater than the end time" do
+ schedule =
+ UserNotificationSchedule.new({ user: user }.merge(UserNotificationSchedule::DEFAULT))
schedule.day_0_start_time = 1000
schedule.day_0_end_time = 800
schedule.save
diff --git a/spec/models/user_option_spec.rb b/spec/models/user_option_spec.rb
index 36193aba7a0..c7f3c79d8f7 100644
--- a/spec/models/user_option_spec.rb
+++ b/spec/models/user_option_spec.rb
@@ -48,7 +48,6 @@ RSpec.describe UserOption do
describe "site settings" do
it "should apply defaults from site settings" do
-
SiteSetting.default_other_enable_quoting = false
SiteSetting.default_other_enable_defer = true
SiteSetting.default_other_external_links_in_new_tab = true
@@ -120,16 +119,24 @@ RSpec.describe UserOption do
user.stubs(:last_seen_at).returns(5.minutes.ago)
end
- after do
- Discourse.redis.flushdb
- end
+ after { Discourse.redis.flushdb }
it "should have a reason for the first visit" do
freeze_time do
delay = SiteSetting.active_user_rate_limit_secs / 2
- expect_enqueued_with(job: :update_top_redirection, args: { user_id: user.id, redirected_at: Time.zone.now.to_s }, at: Time.zone.now + delay) do
- expect(user.user_option.redirected_to_top).to eq(reason: I18n.t('redirected_to_top_reasons.new_user'), period: :monthly)
+ expect_enqueued_with(
+ job: :update_top_redirection,
+ args: {
+ user_id: user.id,
+ redirected_at: Time.zone.now.to_s,
+ },
+ at: Time.zone.now + delay,
+ ) do
+ expect(user.user_option.redirected_to_top).to eq(
+ reason: I18n.t("redirected_to_top_reasons.new_user"),
+ period: :monthly,
+ )
end
end
end
@@ -149,8 +156,10 @@ RSpec.describe UserOption do
user.last_seen_at = 2.months.ago
user.user_option.expects(:update_last_redirected_to_top!).once
- expect(user.user_option.redirected_to_top).to eq(reason: I18n.t('redirected_to_top_reasons.not_seen_in_a_month'),
- period: :monthly)
+ expect(user.user_option.redirected_to_top).to eq(
+ reason: I18n.t("redirected_to_top_reasons.not_seen_in_a_month"),
+ period: :monthly,
+ )
end
end
end
@@ -158,26 +167,24 @@ RSpec.describe UserOption do
end
end
- describe '.user_tzinfo' do
+ describe ".user_tzinfo" do
fab!(:user) { Fabricate(:user) }
- context 'with user with valid timezone given' do
- before do
- user.user_option.update(timezone: 'Europe/Paris')
- end
+ context "with user with valid timezone given" do
+ before { user.user_option.update(timezone: "Europe/Paris") }
- it 'returns the expect timezone' do
- expect(UserOption.user_tzinfo(user.id)).to eq(ActiveSupport::TimeZone.find_tzinfo('Europe/Paris'))
+ it "returns the expect timezone" do
+ expect(UserOption.user_tzinfo(user.id)).to eq(
+ ActiveSupport::TimeZone.find_tzinfo("Europe/Paris"),
+ )
end
end
- context 'with user with invalid timezone given' do
- before do
- user.user_option.update(timezone: 'Catopia/Catcity')
- end
+ context "with user with invalid timezone given" do
+ before { user.user_option.update(timezone: "Catopia/Catcity") }
- it 'fallbacks to UTC' do
- expect(UserOption.user_tzinfo(user.id)).to eq(ActiveSupport::TimeZone.find_tzinfo('UTC'))
+ it "fallbacks to UTC" do
+ expect(UserOption.user_tzinfo(user.id)).to eq(ActiveSupport::TimeZone.find_tzinfo("UTC"))
end
end
end
diff --git a/spec/models/user_profile_spec.rb b/spec/models/user_profile_spec.rb
index 11063657002..bd6a3023851 100644
--- a/spec/models/user_profile_spec.rb
+++ b/spec/models/user_profile_spec.rb
@@ -22,7 +22,9 @@ RSpec.describe UserProfile do
end
context "when watched words are of type 'Censor'" do
- let!(:censored_word) { Fabricate(:watched_word, word: "censored", action: WatchedWord.actions[:censor]) }
+ let!(:censored_word) do
+ Fabricate(:watched_word, word: "censored", action: WatchedWord.actions[:censor])
+ end
let(:location) { "censored location" }
it "censors the words upon saving" do
@@ -33,7 +35,12 @@ RSpec.describe UserProfile do
context "when watched words are of type 'Replace'" do
let(:location) { "word to replace" }
let!(:replace_word) do
- Fabricate(:watched_word, word: "to replace", replacement: "replaced", action: WatchedWord.actions[:replace])
+ Fabricate(
+ :watched_word,
+ word: "to replace",
+ replacement: "replaced",
+ action: WatchedWord.actions[:replace],
+ )
end
it "replaces the words upon saving" do
@@ -47,7 +54,9 @@ RSpec.describe UserProfile do
it "is not valid" do
expect(profile.valid?).to eq(false)
- expect(profile.errors.full_messages).to include(/Location is too long \(maximum is 3000 characters\)/)
+ expect(profile.errors.full_messages).to include(
+ /Location is too long \(maximum is 3000 characters\)/,
+ )
end
end
@@ -77,7 +86,9 @@ RSpec.describe UserProfile do
it "is not valid" do
expect(profile.valid?).to eq(false)
- expect(profile.errors.full_messages).to include(/About Me is too long \(maximum is 3000 characters\)/)
+ expect(profile.errors.full_messages).to include(
+ /About Me is too long \(maximum is 3000 characters\)/,
+ )
end
end
@@ -87,13 +98,13 @@ RSpec.describe UserProfile do
end
end
- it 'is created automatically when a user is created' do
+ it "is created automatically when a user is created" do
user = Fabricate(:evil_trout)
expect(user.user_profile).to be_present
end
- describe 'rebaking' do
- it 'correctly rebakes bio' do
+ describe "rebaking" do
+ it "correctly rebakes bio" do
user_profile = Fabricate(:evil_trout).user_profile
user_profile.update_columns(bio_raw: "test", bio_cooked: "broken", bio_cooked_version: nil)
@@ -106,14 +117,14 @@ RSpec.describe UserProfile do
end
end
- describe 'new' do
+ describe "new" do
let(:user_profile) { UserProfile.new(bio_raw: "test") }
- it 'is not valid without user' do
+ it "is not valid without user" do
expect(user_profile.valid?).to be false
end
- it 'is is valid with user' do
+ it "is is valid with user" do
user_profile.user = Fabricate.build(:user)
expect(user_profile.valid?).to be true
end
@@ -144,7 +155,7 @@ RSpec.describe UserProfile do
it "doesn't blow up with an invalid URI" do
SiteSetting.allowed_user_website_domains = "discourse.org"
- user_profile.website = 'user - https://forum.example.com/user'
+ user_profile.website = "user - https://forum.example.com/user"
expect { user_profile.save! }.to raise_error(ActiveRecord::RecordInvalid)
end
@@ -154,25 +165,25 @@ RSpec.describe UserProfile do
end
end
- describe 'after save' do
+ describe "after save" do
fab!(:user) { Fabricate(:user) }
before do
- user.user_profile.bio_raw = 'my bio'
+ user.user_profile.bio_raw = "my bio"
user.user_profile.save
end
- it 'has cooked bio' do
+ it "has cooked bio" do
expect(user.user_profile.bio_cooked).to be_present
end
- it 'has bio summary' do
+ it "has bio summary" do
expect(user.user_profile.bio_summary).to be_present
end
end
end
- describe 'changing bio' do
+ describe "changing bio" do
fab!(:user) { Fabricate(:user) }
before do
@@ -181,36 +192,35 @@ RSpec.describe UserProfile do
user.user_profile.reload
end
- it 'should markdown the raw_bio and put it in cooked_bio' do
+ it "should markdown the raw_bio and put it in cooked_bio" do
expect(user.user_profile.bio_cooked).to eq("turtle power!
")
end
end
- describe 'bio excerpt emojis' do
+ describe "bio excerpt emojis" do
fab!(:user) { Fabricate(:user) }
fab!(:upload) { Fabricate(:upload) }
before do
- CustomEmoji.create!(name: 'test', upload: upload)
+ CustomEmoji.create!(name: "test", upload: upload)
Emoji.clear_cache
- user.user_profile.update!(
- bio_raw: "hello :test: :woman_scientist:t5: 🤔"
- )
+ user.user_profile.update!(bio_raw: "hello :test: :woman_scientist:t5: 🤔")
end
- it 'supports emoji images' do
- expect(user.user_profile.bio_excerpt(500, keep_emoji_images: true)).to eq("hello http://discourse.org ")
- expect(user_profile.bio_processed).to match_html("I love http://discourse.org
")
+ expect(user_profile.bio_excerpt).to match_html(
+ "I love http://discourse.org ",
+ )
+ expect(user_profile.bio_processed).to match_html(
+ "I love http://discourse.org
",
+ )
end
- it 'removes the link if the user is new' do
+ it "removes the link if the user is new" do
user.trust_level = TrustLevel[0]
user_profile.send(:cook)
expect(user_profile.bio_excerpt).to match_html("I love http://discourse.org")
expect(user_profile.bio_processed).to eq("I love http://discourse.org
")
end
- it 'removes the link if the user is suspended' do
+ it "removes the link if the user is suspended" do
user.suspended_till = 1.month.from_now
user_profile.send(:cook)
expect(user_profile.bio_excerpt).to match_html("I love http://discourse.org")
expect(user_profile.bio_processed).to eq("I love http://discourse.org
")
end
- context 'when tl3_links_no_follow is false' do
+ context "when tl3_links_no_follow is false" do
before { SiteSetting.tl3_links_no_follow = false }
- it 'includes the link without nofollow if the user is trust level 3 or higher' do
+ it "includes the link without nofollow if the user is trust level 3 or higher" do
user.trust_level = TrustLevel[3]
user_profile.send(:cook)
- expect(user_profile.bio_excerpt).to match_html("I love http://discourse.org ")
- expect(user_profile.bio_processed).to match_html("I love http://discourse.org
")
+ expect(user_profile.bio_excerpt).to match_html(
+ "I love http://discourse.org ",
+ )
+ expect(user_profile.bio_processed).to match_html(
+ "I love http://discourse.org
",
+ )
end
- it 'removes nofollow from links in bio when trust level is increased' do
+ it "removes nofollow from links in bio when trust level is increased" do
created_user.change_trust_level!(TrustLevel[3])
- expect(created_user.user_profile.bio_excerpt).to match_html("I love http://discourse.org ")
- expect(created_user.user_profile.bio_processed).to match_html("I love http://discourse.org
")
+ expect(created_user.user_profile.bio_excerpt).to match_html(
+ "I love http://discourse.org ",
+ )
+ expect(created_user.user_profile.bio_processed).to match_html(
+ "I love http://discourse.org
",
+ )
end
- it 'adds nofollow to links in bio when trust level is decreased' do
+ it "adds nofollow to links in bio when trust level is decreased" do
created_user.trust_level = TrustLevel[3]
created_user.save
created_user.reload
created_user.change_trust_level!(TrustLevel[2])
- expect(created_user.user_profile.bio_excerpt).to match_html("I love http://discourse.org ")
- expect(created_user.user_profile.bio_processed).to match_html("I love http://discourse.org
")
+ expect(created_user.user_profile.bio_excerpt).to match_html(
+ "I love http://discourse.org ",
+ )
+ expect(created_user.user_profile.bio_processed).to match_html(
+ "I love http://discourse.org
",
+ )
end
end
- context 'when tl3_links_no_follow is true' do
+ context "when tl3_links_no_follow is true" do
before { SiteSetting.tl3_links_no_follow = true }
- it 'includes the link with nofollow if the user is trust level 3 or higher' do
+ it "includes the link with nofollow if the user is trust level 3 or higher" do
user.trust_level = TrustLevel[3]
user_profile.send(:cook)
- expect(user_profile.bio_excerpt).to match_html("I love http://discourse.org ")
- expect(user_profile.bio_processed).to match_html("I love http://discourse.org
")
+ expect(user_profile.bio_excerpt).to match_html(
+ "I love http://discourse.org ",
+ )
+ expect(user_profile.bio_processed).to match_html(
+ "I love http://discourse.org
",
+ )
end
end
end
end
- describe '.import_url_for_user' do
+ describe ".import_url_for_user" do
fab!(:user) { Fabricate(:user) }
before do
- stub_request(:any, "thisfakesomething.something.com")
- .to_return(body: "abc", status: 404, headers: { 'Content-Length' => 3 })
+ stub_request(:any, "thisfakesomething.something.com").to_return(
+ body: "abc",
+ status: 404,
+ headers: {
+ "Content-Length" => 3,
+ },
+ )
end
- describe 'when profile_background_url returns an invalid status code' do
- it 'should not do anything' do
+ describe "when profile_background_url returns an invalid status code" do
+ it "should not do anything" do
url = "http://thisfakesomething.something.com/"
UserProfile.import_url_for_user(url, user, is_card_background: false)
@@ -304,8 +339,8 @@ RSpec.describe UserProfile do
end
end
- describe 'when card_background_url returns an invalid status code' do
- it 'should not do anything' do
+ describe "when card_background_url returns an invalid status code" do
+ it "should not do anything" do
url = "http://thisfakesomething.something.com/"
UserProfile.import_url_for_user(url, user, is_card_background: true)
diff --git a/spec/models/user_profile_view_spec.rb b/spec/models/user_profile_view_spec.rb
index 3002b747b72..4769e4b3c71 100644
--- a/spec/models/user_profile_view_spec.rb
+++ b/spec/models/user_profile_view_spec.rb
@@ -10,9 +10,11 @@ RSpec.describe UserProfileView do
end
it "should increase user's profile view count" do
- expect { add(user_profile_id, '1.1.1.1') }.to change { described_class.count }.by(1)
+ expect { add(user_profile_id, "1.1.1.1") }.to change { described_class.count }.by(1)
expect(user.user_profile.reload.views).to eq(1)
- expect { add(user_profile_id, '1.1.1.1', other_user.id) }.to change { described_class.count }.by(1)
+ expect { add(user_profile_id, "1.1.1.1", other_user.id) }.to change {
+ described_class.count
+ }.by(1)
user_profile = user.user_profile.reload
expect(user_profile.views).to eq(2)
@@ -23,7 +25,7 @@ RSpec.describe UserProfileView do
time = Time.zone.now
2.times do
- add(user_profile_id, '1.1.1.1', nil, time)
+ add(user_profile_id, "1.1.1.1", nil, time)
expect(described_class.count).to eq(1)
end
end
@@ -31,7 +33,7 @@ RSpec.describe UserProfileView do
it "should not create duplicated profile view or log IP for signed in user" do
time = Time.zone.now
- ['1.1.1.1', '2.2.2.2'].each do |ip|
+ %w[1.1.1.1 2.2.2.2].each do |ip|
add(user_profile_id, ip, other_user.id, time)
expect(described_class.count).to eq(1)
expect(UserProfileView.find_by(user_id: other_user.id).ip_address).to eq(nil)
@@ -39,7 +41,7 @@ RSpec.describe UserProfileView do
end
it "should not create a profile view for the system user" do
- add(user_profile_id, '1.1.1.1', Discourse::SYSTEM_USER_ID)
+ add(user_profile_id, "1.1.1.1", Discourse::SYSTEM_USER_ID)
expect(described_class.count).to eq(0)
end
end
diff --git a/spec/models/user_search_spec.rb b/spec/models/user_search_spec.rb
index 11e7ef5f9ce..e7d58fce44d 100644
--- a/spec/models/user_search_spec.rb
+++ b/spec/models/user_search_spec.rb
@@ -1,24 +1,35 @@
# frozen_string_literal: true
RSpec.describe UserSearch do
-
before_all { SearchIndexer.enable } # Enable for prefabrication
before { SearchIndexer.enable } # Enable for each test
- fab!(:topic) { Fabricate :topic }
- fab!(:topic2) { Fabricate :topic }
- fab!(:topic3) { Fabricate :topic }
- fab!(:topic4) { Fabricate :topic }
- fab!(:mr_b) { Fabricate :user, username: "mrb", name: "Michael Madsen", last_seen_at: 10.days.ago }
- fab!(:mr_blue) { Fabricate :user, username: "mrblue", name: "Eddie Code", last_seen_at: 9.days.ago }
- fab!(:mr_orange) { Fabricate :user, username: "mrorange", name: "Tim Roth", last_seen_at: 8.days.ago }
- fab!(:mr_pink) { Fabricate :user, username: "mrpink", name: "Steve Buscemi", last_seen_at: 7.days.ago }
- fab!(:mr_brown) { Fabricate :user, username: "mrbrown", name: "Quentin Tarantino", last_seen_at: 6.days.ago }
- fab!(:mr_white) { Fabricate :user, username: "mrwhite", name: "Harvey Keitel", last_seen_at: 5.days.ago }
- fab!(:inactive) { Fabricate :user, username: "Ghost", active: false }
- fab!(:admin) { Fabricate :admin, username: "theadmin" }
+ fab!(:topic) { Fabricate :topic }
+ fab!(:topic2) { Fabricate :topic }
+ fab!(:topic3) { Fabricate :topic }
+ fab!(:topic4) { Fabricate :topic }
+ fab!(:mr_b) do
+ Fabricate :user, username: "mrb", name: "Michael Madsen", last_seen_at: 10.days.ago
+ end
+ fab!(:mr_blue) do
+ Fabricate :user, username: "mrblue", name: "Eddie Code", last_seen_at: 9.days.ago
+ end
+ fab!(:mr_orange) do
+ Fabricate :user, username: "mrorange", name: "Tim Roth", last_seen_at: 8.days.ago
+ end
+ fab!(:mr_pink) do
+ Fabricate :user, username: "mrpink", name: "Steve Buscemi", last_seen_at: 7.days.ago
+ end
+ fab!(:mr_brown) do
+ Fabricate :user, username: "mrbrown", name: "Quentin Tarantino", last_seen_at: 6.days.ago
+ end
+ fab!(:mr_white) do
+ Fabricate :user, username: "mrwhite", name: "Harvey Keitel", last_seen_at: 5.days.ago
+ end
+ fab!(:inactive) { Fabricate :user, username: "Ghost", active: false }
+ fab!(:admin) { Fabricate :admin, username: "theadmin" }
fab!(:moderator) { Fabricate :moderator, username: "themod" }
- fab!(:staged) { Fabricate :staged }
+ fab!(:staged) { Fabricate :staged }
def search_for(*args)
# mapping "username" so it's easier to debug
@@ -68,7 +79,6 @@ RSpec.describe UserSearch do
results = search_for("", searching_user: searching_user, category_id: category.id)
expect(results).to eq [user.username]
end
-
end
it "allows for correct underscore searching" do
@@ -184,14 +194,12 @@ RSpec.describe UserSearch do
pm_topic = Fabricate(:private_message_post).topic
# Anonymous, does not have access
- expect do
- search_for("", topic_id: pm_topic.id)
- end.to raise_error(Discourse::InvalidAccess)
+ expect do search_for("", topic_id: pm_topic.id) end.to raise_error(Discourse::InvalidAccess)
# Random user, does not have access
- expect do
- search_for("", topic_id: pm_topic.id, searching_user: mr_b)
- end.to raise_error(Discourse::InvalidAccess)
+ expect do search_for("", topic_id: pm_topic.id, searching_user: mr_b) end.to raise_error(
+ Discourse::InvalidAccess,
+ )
Group.refresh_automatic_groups!
pm_topic.invite(pm_topic.user, mr_b.username)
@@ -225,9 +233,9 @@ RSpec.describe UserSearch do
it "doesn't prioritises exact matches mentions for users who haven't been seen in over a year" do
abcdef = Fabricate(:user, username: "abcdef", last_seen_at: 2.days.ago)
- abcde = Fabricate(:user, username: "abcde", last_seen_at: 2.weeks.ago)
- abcd = Fabricate(:user, username: "abcd", last_seen_at: 2.months.ago)
- abc = Fabricate(:user, username: "abc", last_seen_at: 2.years.ago)
+ abcde = Fabricate(:user, username: "abcde", last_seen_at: 2.weeks.ago)
+ abcd = Fabricate(:user, username: "abcd", last_seen_at: 2.months.ago)
+ abc = Fabricate(:user, username: "abc", last_seen_at: 2.years.ago)
results = search_for("abc", topic_id: topic.id)
expect(results).to eq [abcdef, abcde, abcd, abc].map(&:username)
diff --git a/spec/models/user_second_factor_spec.rb b/spec/models/user_second_factor_spec.rb
index f7f4ae1dd67..1dc16116dfb 100644
--- a/spec/models/user_second_factor_spec.rb
+++ b/spec/models/user_second_factor_spec.rb
@@ -1,8 +1,8 @@
# frozen_string_literal: true
RSpec.describe UserSecondFactor do
- describe '.methods' do
- it 'should retain the right order' do
+ describe ".methods" do
+ it "should retain the right order" do
expect(described_class.methods[:totp]).to eq(1)
expect(described_class.methods[:backup_codes]).to eq(2)
end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index f017c73c70e..3b405129128 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -6,22 +6,28 @@ RSpec.describe User do
subject(:user) { Fabricate(:user, last_seen_at: 1.day.ago) }
def user_error_message(*keys)
- I18n.t(:"activerecord.errors.models.user.attributes.#{keys.join('.')}")
+ I18n.t(:"activerecord.errors.models.user.attributes.#{keys.join(".")}")
end
- it { is_expected.to have_many(:pending_posts).class_name('ReviewableQueuedPost').with_foreign_key(:created_by_id) }
+ it do
+ is_expected.to have_many(:pending_posts).class_name("ReviewableQueuedPost").with_foreign_key(
+ :created_by_id,
+ )
+ end
- describe 'Associations' do
- it 'should delete sidebar_section_links when a user is destroyed' do
+ describe "Associations" do
+ it "should delete sidebar_section_links when a user is destroyed" do
Fabricate(:category_sidebar_section_link, user: user)
Fabricate(:tag_sidebar_section_link, user: user)
- expect { user.destroy! }.to change { SidebarSectionLink.where(user: user).count }.from(2).to(0)
+ expect { user.destroy! }.to change { SidebarSectionLink.where(user: user).count }.from(2).to(
+ 0,
+ )
end
end
- describe 'Callbacks' do
- describe 'default sidebar section links' do
+ describe "Callbacks" do
+ describe "default sidebar section links" do
fab!(:category) { Fabricate(:category) }
fab!(:secured_category) do |category|
@@ -33,7 +39,9 @@ RSpec.describe User do
fab!(:tag) { Fabricate(:tag) }
fab!(:hidden_tag) { Fabricate(:tag) }
- fab!(:staff_tag_group) { Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name]) }
+ fab!(:staff_tag_group) do
+ Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name])
+ end
before do
SiteSetting.navigation_menu = "sidebar"
@@ -42,72 +50,77 @@ RSpec.describe User do
SiteSetting.default_sidebar_tags = "#{tag.name}|#{hidden_tag.name}"
end
- it 'creates the right sidebar section link records for categories and tags that a user can see' do
+ it "creates the right sidebar section link records for categories and tags that a user can see" do
user = Fabricate(:user)
- expect(SidebarSectionLink.where(linkable_type: 'Category', user_id: user.id).pluck(:linkable_id)).to contain_exactly(
- category.id
- )
+ expect(
+ SidebarSectionLink.where(linkable_type: "Category", user_id: user.id).pluck(:linkable_id),
+ ).to contain_exactly(category.id)
- expect(SidebarSectionLink.where(linkable_type: 'Tag', user_id: user.id).pluck(:linkable_id)).to contain_exactly(
- tag.id
- )
+ expect(
+ SidebarSectionLink.where(linkable_type: "Tag", user_id: user.id).pluck(:linkable_id),
+ ).to contain_exactly(tag.id)
admin = Fabricate(:admin)
- expect(SidebarSectionLink.where(linkable_type: 'Category', user_id: admin.id).pluck(:linkable_id)).to contain_exactly(
- category.id,
- secured_category.id
- )
+ expect(
+ SidebarSectionLink.where(linkable_type: "Category", user_id: admin.id).pluck(
+ :linkable_id,
+ ),
+ ).to contain_exactly(category.id, secured_category.id)
- expect(SidebarSectionLink.where(linkable_type: 'Tag', user_id: admin.id).pluck(:linkable_id)).to contain_exactly(
- tag.id,
- hidden_tag.id
- )
+ expect(
+ SidebarSectionLink.where(linkable_type: "Tag", user_id: admin.id).pluck(:linkable_id),
+ ).to contain_exactly(tag.id, hidden_tag.id)
end
- it 'should create and remove the right sidebar section link records when user is promoted/demoted as an admin' do
+ it "should create and remove the right sidebar section link records when user is promoted/demoted as an admin" do
user = Fabricate(:user)
another_category = Fabricate(:category)
another_tag = Fabricate(:tag)
# User has customized their sidebar categories and tags
SidebarSectionLink.where(user: user).delete_all
- SidebarSectionLinksUpdater.update_category_section_links(user, category_ids: [another_category.id])
+ SidebarSectionLinksUpdater.update_category_section_links(
+ user,
+ category_ids: [another_category.id],
+ )
SidebarSectionLinksUpdater.update_tag_section_links(user, tag_names: [another_tag.name])
# A user promoted to admin now has any default categories/tags they didn't previously have access to
user.update(admin: true)
- expect(SidebarSectionLink.where(linkable_type: 'Category', user_id: user.id).pluck(:linkable_id)).to contain_exactly(
- another_category.id,
- secured_category.id
- )
- expect(SidebarSectionLink.where(linkable_type: 'Tag', user_id: user.id).pluck(:linkable_id)).to contain_exactly(
- another_tag.id,
- hidden_tag.id
- )
+ expect(
+ SidebarSectionLink.where(linkable_type: "Category", user_id: user.id).pluck(:linkable_id),
+ ).to contain_exactly(another_category.id, secured_category.id)
+ expect(
+ SidebarSectionLink.where(linkable_type: "Tag", user_id: user.id).pluck(:linkable_id),
+ ).to contain_exactly(another_tag.id, hidden_tag.id)
# User still has their customized sidebar categories and tags after demotion
user.update(admin: false)
- expect(SidebarSectionLink.where(linkable_type: 'Category', user_id: user.id).pluck(:linkable_id)).to contain_exactly(
- another_category.id
- )
- expect(SidebarSectionLink.where(linkable_type: 'Tag', user_id: user.id).pluck(:linkable_id)).to contain_exactly(
- another_tag.id
- )
+ expect(
+ SidebarSectionLink.where(linkable_type: "Category", user_id: user.id).pluck(:linkable_id),
+ ).to contain_exactly(another_category.id)
+ expect(
+ SidebarSectionLink.where(linkable_type: "Tag", user_id: user.id).pluck(:linkable_id),
+ ).to contain_exactly(another_tag.id)
end
- it 'should not receive any new categories w/ suppress secured categories from admin enabled' do
+ it "should not receive any new categories w/ suppress secured categories from admin enabled" do
SiteSetting.suppress_secured_categories_from_admin = true
user = Fabricate(:user)
SidebarSectionLink.where(user: user).delete_all # User has customized their sidebar categories
user.update(admin: true)
- expect(SidebarSectionLink.where(linkable_type: 'Category', user_id: user.id).pluck(:linkable_id)).to be_empty
+ expect(
+ SidebarSectionLink.where(linkable_type: "Category", user_id: user.id).pluck(:linkable_id),
+ ).to be_empty
user.update(admin: false)
- expect(SidebarSectionLink.where(linkable_type: 'Category', user_id: user.id).pluck(:linkable_id)).to be_empty
+ expect(
+ SidebarSectionLink.where(linkable_type: "Category", user_id: user.id).pluck(:linkable_id),
+ ).to be_empty
end
- it 'should not create any sidebar section link records when navigation_menu site setting is still legacy' do
+ it "should not create any sidebar section link records when navigation_menu site setting is still legacy" do
SiteSetting.navigation_menu = "legacy"
user = Fabricate(:user)
@@ -115,141 +128,143 @@ RSpec.describe User do
expect(SidebarSectionLink.exists?(user_id: user.id)).to eq(false)
end
- it 'should not create any sidebar section link records for staged users' do
+ it "should not create any sidebar section link records for staged users" do
user = Fabricate(:user, staged: true)
expect(SidebarSectionLink.exists?).to eq(false)
end
- it 'should create sidebar section link records when user has been unstaged' do
+ it "should create sidebar section link records when user has been unstaged" do
user = Fabricate(:user, staged: true)
user.unstage!
expect(SidebarSectionLink.exists?(user: user)).to eq(true)
end
- it 'should not create any sidebar section link records for non human users' do
+ it "should not create any sidebar section link records for non human users" do
user = Fabricate(:user, id: -Time.now.to_i)
expect(SidebarSectionLink.exists?).to eq(false)
end
- it 'should not create any tag sidebar section link records when tagging is disabled' do
+ it "should not create any tag sidebar section link records when tagging is disabled" do
SiteSetting.tagging_enabled = false
user = Fabricate(:user)
- expect(SidebarSectionLink.exists?(linkable_type: 'Category', user_id: user.id)).to eq(true)
- expect(SidebarSectionLink.exists?(linkable_type: 'Tag', user_id: user.id)).to eq(false)
+ expect(SidebarSectionLink.exists?(linkable_type: "Category", user_id: user.id)).to eq(true)
+ expect(SidebarSectionLink.exists?(linkable_type: "Tag", user_id: user.id)).to eq(false)
end
end
end
- describe 'Validations' do
- describe '#username' do
+ describe "Validations" do
+ describe "#username" do
it { is_expected.to validate_presence_of :username }
- describe 'when username already exists' do
- it 'should not be valid' do
+ describe "when username already exists" do
+ it "should not be valid" do
new_user = Fabricate.build(:user, username: user.username.upcase)
expect(new_user).to_not be_valid
- expect(new_user.errors.full_messages.first)
- .to include(I18n.t(:'user.username.unique'))
+ expect(new_user.errors.full_messages.first).to include(I18n.t(:"user.username.unique"))
end
end
- describe 'when group with a same name already exists' do
- it 'should not be valid' do
+ describe "when group with a same name already exists" do
+ it "should not be valid" do
new_user = Fabricate.build(:user, username: group.name.upcase)
expect(new_user).to_not be_valid
- expect(new_user.errors.full_messages.first)
- .to include(I18n.t(:'user.username.unique'))
+ expect(new_user.errors.full_messages.first).to include(I18n.t(:"user.username.unique"))
end
end
- it 'is not valid if username changes to be same as password' do
- user.username = 'myawesomepassword'
+ it "is not valid if username changes to be same as password" do
+ user.username = "myawesomepassword"
expect(user).to_not be_valid
- expect(user.errors.full_messages.first)
- .to include(user_error_message(:username, :same_as_password))
+ expect(user.errors.full_messages.first).to include(
+ user_error_message(:username, :same_as_password),
+ )
end
- it 'is not valid if username lowercase changes to be same as password' do
- user.username = 'MyAwesomePassword'
+ it "is not valid if username lowercase changes to be same as password" do
+ user.username = "MyAwesomePassword"
expect(user).to_not be_valid
- expect(user.errors.full_messages.first)
- .to include(user_error_message(:username, :same_as_password))
+ expect(user.errors.full_messages.first).to include(
+ user_error_message(:username, :same_as_password),
+ )
end
- describe 'when a username is an integer' do
- it 'is converted to a string on normalization' do
+ describe "when a username is an integer" do
+ it "is converted to a string on normalization" do
expect(User.normalize_username(123)).to eq("123") # This is possible via the API
end
end
end
- describe 'name' do
- it 'is not valid if it changes to be the same as the password' do
- user.name = 'myawesomepassword'
+ describe "name" do
+ it "is not valid if it changes to be the same as the password" do
+ user.name = "myawesomepassword"
expect(user).to_not be_valid
- expect(user.errors.full_messages.first)
- .to include(user_error_message(:name, :same_as_password))
+ expect(user.errors.full_messages.first).to include(
+ user_error_message(:name, :same_as_password),
+ )
end
- it 'is not valid if name lowercase changes to be the same as the password' do
- user.name = 'MyAwesomePassword'
+ it "is not valid if name lowercase changes to be the same as the password" do
+ user.name = "MyAwesomePassword"
expect(user).to_not be_valid
- expect(user.errors.full_messages.first)
- .to include(user_error_message(:name, :same_as_password))
+ expect(user.errors.full_messages.first).to include(
+ user_error_message(:name, :same_as_password),
+ )
end
it "doesn't raise an error if the name is longer than the max password length" do
- user.name = 'x' * (User.max_password_length + 1)
+ user.name = "x" * (User.max_password_length + 1)
expect(user).to be_valid
end
end
- describe 'emails' do
+ describe "emails" do
it { is_expected.to validate_presence_of :primary_email }
let(:user) { Fabricate.build(:user) }
- describe 'when record has a valid email' do
+ describe "when record has a valid email" do
it "should be valid" do
- user.email = 'test@gmail.com'
+ user.email = "test@gmail.com"
expect(user).to be_valid
end
end
- describe 'when record has an invalid email' do
- it 'should not be valid' do
- user.email = 'test@gmailcom'
+ describe "when record has an invalid email" do
+ it "should not be valid" do
+ user.email = "test@gmailcom"
expect(user).to_not be_valid
expect(user.errors.messages.keys).to contain_exactly(:primary_email)
end
end
- describe 'when record has an email that as already been taken' do
- it 'should not be valid' do
+ describe "when record has an email that as already been taken" do
+ it "should not be valid" do
user2 = Fabricate(:user)
user.email = user2.email.upcase
expect(user).to_not be_valid
- expect(user.errors.messages[:primary_email]).to include(I18n.t(
- 'activerecord.errors.messages.taken'
- ))
+ expect(user.errors.messages[:primary_email]).to include(
+ I18n.t("activerecord.errors.messages.taken"),
+ )
end
end
- describe 'when user is staged' do
- it 'should still validate presence of primary_email' do
+ describe "when user is staged" do
+ it "should still validate presence of primary_email" do
user.staged = true
user.email = nil
@@ -258,7 +273,7 @@ RSpec.describe User do
end
end
- describe 'when primary_email is being reassigned to another user' do
+ describe "when primary_email is being reassigned to another user" do
it "should not be valid" do
user2 = Fabricate.build(:user, email: nil)
user.save!
@@ -298,7 +313,9 @@ RSpec.describe User do
end
context "when watched words are of type 'Censor'" do
- let!(:censored_word) { Fabricate(:watched_word, word: "censored", action: WatchedWord.actions[:censor]) }
+ let!(:censored_word) do
+ Fabricate(:watched_word, word: "censored", action: WatchedWord.actions[:censor])
+ end
let(:value) { "censored word" }
context "when user field is public" do
@@ -321,7 +338,12 @@ RSpec.describe User do
context "when watched words are of type 'Replace'" do
let(:value) { "word to replace" }
let!(:replace_word) do
- Fabricate(:watched_word, word: "to replace", replacement: "replaced", action: WatchedWord.actions[:replace])
+ Fabricate(
+ :watched_word,
+ word: "to replace",
+ replacement: "replaced",
+ action: WatchedWord.actions[:replace],
+ )
end
context "when user field is public" do
@@ -359,11 +381,11 @@ RSpec.describe User do
context "with a multiselect user field" do
fab!(:user_field) do
- Fabricate(:user_field, field_type: 'multiselect', show_on_profile: true) do
+ Fabricate(:user_field, field_type: "multiselect", show_on_profile: true) do
user_field_options do
[
- Fabricate(:user_field_option, value: 'Axe'),
- Fabricate(:user_field_option, value: 'Sword')
+ Fabricate(:user_field_option, value: "Axe"),
+ Fabricate(:user_field_option, value: "Sword"),
]
end
end
@@ -372,28 +394,29 @@ RSpec.describe User do
let(:user_field_value) { user.reload.user_fields[user_field.id.to_s] }
context "with a blocked word" do
- let(:value) { %w{ Axe bad Sword } }
+ let(:value) { %w[Axe bad Sword] }
it "does not block the word since it is not user generated-content" do
user.save!
- expect(user_field_value).to eq %w{ Axe bad Sword }
+ expect(user_field_value).to eq %w[Axe bad Sword]
end
end
context "with a censored word" do
- let(:value) { %w{ Axe bad Sword } }
+ let(:value) { %w[Axe bad Sword] }
before { watched_word.action = WatchedWord.actions[:censor] }
it "does not censor the word since it is not user generated-content" do
user.save!
- expect(user_field_value).to eq %w{ Axe bad Sword }
+ expect(user_field_value).to eq %w[Axe bad Sword]
end
end
-
end
context "when reseting user fields" do
- let!(:censored_word) { Fabricate(:watched_word, word: "censored", action: WatchedWord.actions[:censor]) }
+ let!(:censored_word) do
+ Fabricate(:watched_word, word: "censored", action: WatchedWord.actions[:censor])
+ end
let(:value) { nil }
it "works" do
@@ -404,85 +427,95 @@ RSpec.describe User do
end
end
- describe '#count_by_signup_date' do
+ describe "#count_by_signup_date" do
before(:each) do
User.destroy_all
- freeze_time DateTime.parse('2017-02-01 12:00')
+ freeze_time DateTime.parse("2017-02-01 12:00")
Fabricate(:user)
Fabricate(:user, created_at: 1.day.ago)
Fabricate(:user, created_at: 1.day.ago)
Fabricate(:user, created_at: 2.days.ago)
Fabricate(:user, created_at: 4.days.ago)
end
- let(:signups_by_day) { { 1.day.ago.to_date => 2, 2.days.ago.to_date => 1, Time.now.utc.to_date => 1 } }
+ let(:signups_by_day) do
+ { 1.day.ago.to_date => 2, 2.days.ago.to_date => 1, Time.now.utc.to_date => 1 }
+ end
- it 'collect closed interval signups' do
+ it "collect closed interval signups" do
expect(User.count_by_signup_date(2.days.ago, Time.now)).to include(signups_by_day)
- expect(User.count_by_signup_date(2.days.ago, Time.now)).not_to include(4.days.ago.to_date => 1)
+ expect(User.count_by_signup_date(2.days.ago, Time.now)).not_to include(
+ 4.days.ago.to_date => 1,
+ )
end
end
- describe '.enqueue_welcome_message' do
+ describe ".enqueue_welcome_message" do
fab!(:user) { Fabricate(:user) }
- it 'enqueues the system message' do
+ it "enqueues the system message" do
SiteSetting.send_welcome_message = true
- expect_enqueued_with(job: :send_system_message, args: { user_id: user.id, message_type: 'welcome_user' }) do
- user.enqueue_welcome_message('welcome_user')
- end
+ expect_enqueued_with(
+ job: :send_system_message,
+ args: {
+ user_id: user.id,
+ message_type: "welcome_user",
+ },
+ ) { user.enqueue_welcome_message("welcome_user") }
end
it "doesn't enqueue the system message when the site settings disable it" do
SiteSetting.send_welcome_message = false
- expect_not_enqueued_with(job: :send_system_message, args: { user_id: user.id, message_type: 'welcome_user' }) do
- user.enqueue_welcome_message('welcome_user')
- end
+ expect_not_enqueued_with(
+ job: :send_system_message,
+ args: {
+ user_id: user.id,
+ message_type: "welcome_user",
+ },
+ ) { user.enqueue_welcome_message("welcome_user") }
end
end
- describe 'enqueue_staff_welcome_message' do
+ describe "enqueue_staff_welcome_message" do
fab!(:first_admin) { Fabricate(:admin) }
fab!(:user) { Fabricate(:user) }
- it 'enqueues message for admin' do
- expect {
- user.grant_admin!
- }.to change { Jobs::SendSystemMessage.jobs.count }.by 1
+ it "enqueues message for admin" do
+ expect { user.grant_admin! }.to change { Jobs::SendSystemMessage.jobs.count }.by 1
end
- it 'enqueues message for moderator' do
- expect {
- user.grant_moderation!
- }.to change { Jobs::SendSystemMessage.jobs.count }.by 1
+ it "enqueues message for moderator" do
+ expect { user.grant_moderation! }.to change { Jobs::SendSystemMessage.jobs.count }.by 1
end
- it 'skips the message if already an admin' do
+ it "skips the message if already an admin" do
user.update(admin: true)
- expect {
- user.grant_admin!
- }.not_to change { Jobs::SendSystemMessage.jobs.count }
+ expect { user.grant_admin! }.not_to change { Jobs::SendSystemMessage.jobs.count }
end
end
- describe '.set_default_tags_preferences' do
+ describe ".set_default_tags_preferences" do
let(:tag) { Fabricate(:tag) }
it "should set default tag preferences when new user created" do
SiteSetting.default_tags_watching = tag.name
user = Fabricate(:user)
- expect(TagUser.exists?(tag_id: tag.id, user_id: user.id, notification_level: TagUser.notification_levels[:watching])).to be_truthy
+ expect(
+ TagUser.exists?(
+ tag_id: tag.id,
+ user_id: user.id,
+ notification_level: TagUser.notification_levels[:watching],
+ ),
+ ).to be_truthy
end
end
- describe 'reviewable' do
+ describe "reviewable" do
let(:user) { Fabricate(:user, active: false) }
fab!(:admin) { Fabricate(:admin) }
- before do
- Jobs.run_immediately!
- end
+ before { Jobs.run_immediately! }
it "creates a reviewable for the user if must_approve_users is true and activate is called" do
SiteSetting.must_approve_users = true
@@ -531,7 +564,7 @@ RSpec.describe User do
end
end
- describe 'delete posts in batches' do
+ describe "delete posts in batches" do
fab!(:post1) { Fabricate(:post) }
fab!(:user) { post1.user }
fab!(:post2) { Fabricate(:post, topic: post1.topic, user: user) }
@@ -541,7 +574,7 @@ RSpec.describe User do
let(:guardian) { Guardian.new(Fabricate(:admin)) }
fab!(:reviewable_queued_post) { Fabricate(:reviewable_queued_post, created_by: user) }
- it 'deletes only one batch of posts' do
+ it "deletes only one batch of posts" do
post2
deleted_posts = user.delete_posts_in_batches(guardian, 1)
expect(Post.where(id: post_ids).count).to eq(2)
@@ -549,21 +582,17 @@ RSpec.describe User do
expect(deleted_posts[0]).to eq(post2)
end
- it 'correctly deletes posts and topics' do
+ it "correctly deletes posts and topics" do
posts
user.delete_posts_in_batches(guardian, 20)
expect(Post.where(id: post_ids)).to be_empty
expect(Reviewable.where(created_by: user).count).to eq(0)
- posts.each do |p|
- if p.is_first_post?
- expect(Topic.find_by(id: p.topic_id)).to be_nil
- end
- end
+ posts.each { |p| expect(Topic.find_by(id: p.topic_id)).to be_nil if p.is_first_post? }
end
- it 'does not allow non moderators to delete all posts' do
+ it "does not allow non moderators to delete all posts" do
invalid_guardian = Guardian.new(Fabricate(:user))
expect do
@@ -578,8 +607,7 @@ RSpec.describe User do
end
end
- describe 'new' do
-
+ describe "new" do
subject { Fabricate.build(:user) }
it { is_expected.to be_valid }
@@ -591,55 +619,59 @@ RSpec.describe User do
expect(subject.approved_by_id).to be_blank
end
- it 'triggers an extensibility event' do
+ it "triggers an extensibility event" do
event = DiscourseEvent.track_events { subject.save! }.first
expect(event[:event_name]).to eq(:user_created)
expect(event[:params].first).to eq(subject)
end
- context 'with after_save' do
+ context "with after_save" do
before { subject.save! }
it "has correct settings" do
expect(subject.email_tokens).to be_present
expect(subject.user_stat).to be_present
expect(subject.user_profile).to be_present
- expect(subject.user_option.email_messages_level).to eq(UserOption.email_level_types[:always])
+ expect(subject.user_option.email_messages_level).to eq(
+ UserOption.email_level_types[:always],
+ )
expect(subject.user_option.email_level).to eq(UserOption.email_level_types[:only_when_away])
end
end
it "downcases email addresses" do
- user = Fabricate.build(:user, email: 'Fancy.Caps.4.U@gmail.com')
+ user = Fabricate.build(:user, email: "Fancy.Caps.4.U@gmail.com")
user.valid?
- expect(user.email).to eq('fancy.caps.4.u@gmail.com')
+ expect(user.email).to eq("fancy.caps.4.u@gmail.com")
end
it "strips whitespace from email addresses" do
- user = Fabricate.build(:user, email: ' example@gmail.com ')
+ user = Fabricate.build(:user, email: " example@gmail.com ")
user.valid?
- expect(user.email).to eq('example@gmail.com')
+ expect(user.email).to eq("example@gmail.com")
end
end
- describe 'ip address validation' do
- it 'validates ip_address for new users' do
+ describe "ip address validation" do
+ it "validates ip_address for new users" do
u = Fabricate.build(:user)
- AllowedIpAddressValidator.any_instance.expects(:validate_each).with(u, :ip_address, u.ip_address)
+ AllowedIpAddressValidator
+ .any_instance
+ .expects(:validate_each)
+ .with(u, :ip_address, u.ip_address)
u.valid?
end
- it 'does not validate ip_address when updating an existing user' do
+ it "does not validate ip_address when updating an existing user" do
u = Fabricate(:user)
- u.ip_address = '87.123.23.11'
+ u.ip_address = "87.123.23.11"
AllowedIpAddressValidator.any_instance.expects(:validate_each).never
u.valid?
end
end
describe "trust levels" do
-
# NOTE be sure to use build to avoid db calls
let(:user) { Fabricate.build(:user, trust_level: TrustLevel[0]) }
@@ -648,8 +680,7 @@ RSpec.describe User do
expect(User.new.trust_level).to eq(TrustLevel[4])
end
- describe 'has_trust_level?' do
-
+ describe "has_trust_level?" do
it "raises an error with an invalid level" do
expect { user.has_trust_level?(:wat) }.to raise_error(InvalidTrustLevel)
end
@@ -672,10 +703,9 @@ RSpec.describe User do
user.admin = true
expect(user.has_trust_level?(TrustLevel[1])).to eq(true)
end
-
end
- describe 'moderator' do
+ describe "moderator" do
it "isn't a moderator by default" do
expect(user.moderator?).to eq(false)
end
@@ -689,44 +719,42 @@ RSpec.describe User do
user.admin = true
expect(user.staff?).to eq(true)
end
-
end
-
end
- describe 'staff and regular users' do
+ describe "staff and regular users" do
let(:user) { Fabricate.build(:user) }
- describe '#staff?' do
+ describe "#staff?" do
subject { user.staff? }
it { is_expected.to eq(false) }
- context 'for a moderator user' do
+ context "for a moderator user" do
before { user.moderator = true }
it { is_expected.to eq(true) }
end
- context 'for an admin user' do
+ context "for an admin user" do
before { user.admin = true }
it { is_expected.to eq(true) }
end
end
- describe '#regular?' do
+ describe "#regular?" do
subject { user.regular? }
it { is_expected.to eq(true) }
- context 'for a moderator user' do
+ context "for a moderator user" do
before { user.moderator = true }
it { is_expected.to eq(false) }
end
- context 'for an admin user' do
+ context "for an admin user" do
before { user.admin = true }
it { is_expected.to eq(false) }
@@ -734,16 +762,14 @@ RSpec.describe User do
end
end
- describe 'email_hash' do
- before_all do
- @user = Fabricate(:user)
- end
+ describe "email_hash" do
+ before_all { @user = Fabricate(:user) }
- it 'should have a sane email hash' do
+ it "should have a sane email hash" do
expect(@user.email_hash).to match(/^[0-9a-f]{32}$/)
end
- it 'should use downcase email' do
+ it "should use downcase email" do
@user.email = "example@example.com"
@user2 = Fabricate(:user)
@user2.email = "ExAmPlE@eXaMpLe.com"
@@ -751,7 +777,7 @@ RSpec.describe User do
expect(@user.email_hash).to eq(@user2.email_hash)
end
- it 'should trim whitespace before hashing' do
+ it "should trim whitespace before hashing" do
@user.email = "example@example.com"
@user2 = Fabricate(:user)
@user2.email = " example@example.com "
@@ -760,30 +786,70 @@ RSpec.describe User do
end
end
- describe 'associated_accounts' do
- it 'should correctly find social associations' do
+ describe "associated_accounts" do
+ it "should correctly find social associations" do
user = Fabricate(:user)
expect(user.associated_accounts).to eq([])
- UserAssociatedAccount.create(user_id: user.id, provider_name: "twitter", provider_uid: "1", info: { nickname: "sam" })
- UserAssociatedAccount.create(user_id: user.id, provider_name: "facebook", provider_uid: "1234", info: { email: "test@example.com" })
- UserAssociatedAccount.create(user_id: user.id, provider_name: "discord", provider_uid: "examplel123123", info: { nickname: "sam" })
- UserAssociatedAccount.create(user_id: user.id, provider_name: "google_oauth2", provider_uid: "1", info: { email: "sam@sam.com" })
- UserAssociatedAccount.create(user_id: user.id, provider_name: "github", provider_uid: "1", info: { nickname: "sam" })
+ UserAssociatedAccount.create(
+ user_id: user.id,
+ provider_name: "twitter",
+ provider_uid: "1",
+ info: {
+ nickname: "sam",
+ },
+ )
+ UserAssociatedAccount.create(
+ user_id: user.id,
+ provider_name: "facebook",
+ provider_uid: "1234",
+ info: {
+ email: "test@example.com",
+ },
+ )
+ UserAssociatedAccount.create(
+ user_id: user.id,
+ provider_name: "discord",
+ provider_uid: "examplel123123",
+ info: {
+ nickname: "sam",
+ },
+ )
+ UserAssociatedAccount.create(
+ user_id: user.id,
+ provider_name: "google_oauth2",
+ provider_uid: "1",
+ info: {
+ email: "sam@sam.com",
+ },
+ )
+ UserAssociatedAccount.create(
+ user_id: user.id,
+ provider_name: "github",
+ provider_uid: "1",
+ info: {
+ nickname: "sam",
+ },
+ )
user.reload
- expect(user.associated_accounts.map { |a| a[:name] }).to contain_exactly('twitter', 'facebook', 'google_oauth2', 'github', 'discord')
-
+ expect(user.associated_accounts.map { |a| a[:name] }).to contain_exactly(
+ "twitter",
+ "facebook",
+ "google_oauth2",
+ "github",
+ "discord",
+ )
end
end
- describe '.is_singular_admin?' do
- it 'returns true if user is singular admin' do
+ describe ".is_singular_admin?" do
+ it "returns true if user is singular admin" do
admin = Fabricate(:admin)
expect(admin.is_singular_admin?).to eq(true)
end
- it 'returns false if user is not the only admin' do
+ it "returns false if user is not the only admin" do
admin = Fabricate(:admin)
Fabricate(:admin)
@@ -791,21 +857,21 @@ RSpec.describe User do
end
end
- describe 'name heuristics' do
- it 'is able to guess a decent name from an email' do
- expect(User.suggest_name('sam.saffron@gmail.com')).to eq('Sam Saffron')
+ describe "name heuristics" do
+ it "is able to guess a decent name from an email" do
+ expect(User.suggest_name("sam.saffron@gmail.com")).to eq("Sam Saffron")
end
- it 'is able to guess a decent name from username' do
- expect(User.suggest_name('@sam.saffron')).to eq('Sam Saffron')
+ it "is able to guess a decent name from username" do
+ expect(User.suggest_name("@sam.saffron")).to eq("Sam Saffron")
end
- it 'is able to guess a decent name from name' do
- expect(User.suggest_name('sam saffron')).to eq('Sam Saffron')
+ it "is able to guess a decent name from name" do
+ expect(User.suggest_name("sam saffron")).to eq("Sam Saffron")
end
end
- describe 'username format' do
+ describe "username format" do
fab!(:user) { Fabricate(:user) }
def assert_bad(username)
@@ -824,10 +890,10 @@ RSpec.describe User do
assert_good("abcde")
end
- context 'when Unicode usernames are disabled' do
+ context "when Unicode usernames are disabled" do
before { SiteSetting.unicode_usernames = false }
- %w{
+ %w[
first.last
first
first-last
@@ -836,13 +902,13 @@ RSpec.describe User do
mc.hammer_nose
UPPERCASE
sgif
- }.each do |username|
+ ].each do |username|
it "allows #{username}" do
assert_good(username)
end
end
- %w{
+ %w[
traildot.
has\ space
double__underscore
@@ -860,39 +926,23 @@ RSpec.describe User do
sam.woff
sam.Png
sam.gif
- }.each do |username|
+ ].each do |username|
it "disallows #{username}" do
assert_bad(username)
end
end
end
- context 'when Unicode usernames are enabled' do
+ context "when Unicode usernames are enabled" do
before { SiteSetting.unicode_usernames = true }
- %w{
- Джофрэй
- Джо.фрэй
- Джофр-эй
- Д.жофрэй
- 乔夫雷
- 乔夫_雷
- _乔夫雷
- }.each do |username|
+ %w[Джофрэй Джо.фрэй Джофр-эй Д.жофрэй 乔夫雷 乔夫_雷 _乔夫雷].each do |username|
it "allows #{username}" do
assert_good(username)
end
end
- %w{
- .Джофрэй
- Джофрэй.
- Джо\ фрэй
- Джоф__рэй
- 乔夫雷.js
- 乔夫雷.
- 乔夫%雷
- }.each do |username|
+ %w[.Джофрэй Джофрэй. Джо\ фрэй Джоф__рэй 乔夫雷.js 乔夫雷. 乔夫%雷].each do |username|
it "disallows #{username}" do
assert_bad(username)
end
@@ -900,7 +950,7 @@ RSpec.describe User do
end
end
- describe 'username uniqueness' do
+ describe "username uniqueness" do
before_all do
@user = Fabricate.build(:user)
@user.save!
@@ -918,28 +968,24 @@ RSpec.describe User do
end
end
- describe '.username_available?' do
+ describe ".username_available?" do
it "returns true for a username that is available" do
- expect(User.username_available?('BruceWayne')).to eq(true)
+ expect(User.username_available?("BruceWayne")).to eq(true)
end
- it 'returns false when a username is taken' do
+ it "returns false when a username is taken" do
expect(User.username_available?(Fabricate(:user).username)).to eq(false)
end
- it 'returns false when a username is reserved' do
- SiteSetting.reserved_usernames = 'test|donkey'
- expect(User.username_available?('tESt')).to eq(false)
+ it "returns false when a username is reserved" do
+ SiteSetting.reserved_usernames = "test|donkey"
+ expect(User.username_available?("tESt")).to eq(false)
end
- it 'returns true when reserved username is explicitly allowed' do
- SiteSetting.reserved_usernames = 'test|donkey'
+ it "returns true when reserved username is explicitly allowed" do
+ SiteSetting.reserved_usernames = "test|donkey"
- expect(User.username_available?(
- 'tESt',
- nil,
- allow_reserved_username: true)
- ).to eq(true)
+ expect(User.username_available?("tESt", nil, allow_reserved_username: true)).to eq(true)
end
it "returns true when username is associated to a staged user of the same email" do
@@ -950,160 +996,160 @@ RSpec.describe User do
expect(User.username_available?(user.username, user.primary_email.email)).to eq(false)
end
- it 'returns false when a username equals an existing group name' do
- Fabricate(:group, name: 'foo')
- expect(User.username_available?('Foo')).to eq(false)
+ it "returns false when a username equals an existing group name" do
+ Fabricate(:group, name: "foo")
+ expect(User.username_available?("Foo")).to eq(false)
end
context "with Unicode usernames enabled" do
before { SiteSetting.unicode_usernames = true }
- it 'returns false when the username is taken, but the Unicode normalization form is different' do
+ it "returns false when the username is taken, but the Unicode normalization form is different" do
Fabricate(:user, username: "L\u00F6we") # NFC
requested_username = "Lo\u0308we" # NFD
expect(User.username_available?(requested_username)).to eq(false)
end
- it 'returns false when the username is taken and the case differs' do
- Fabricate(:user, username: 'LÖWE')
- expect(User.username_available?('löwe')).to eq(false)
+ it "returns false when the username is taken and the case differs" do
+ Fabricate(:user, username: "LÖWE")
+ expect(User.username_available?("löwe")).to eq(false)
end
end
end
- describe '.reserved_username?' do
- it 'returns true when a username is reserved' do
- SiteSetting.reserved_usernames = 'test|donkey'
+ describe ".reserved_username?" do
+ it "returns true when a username is reserved" do
+ SiteSetting.reserved_usernames = "test|donkey"
- expect(User.reserved_username?('donkey')).to eq(true)
- expect(User.reserved_username?('DonKey')).to eq(true)
- expect(User.reserved_username?('test')).to eq(true)
+ expect(User.reserved_username?("donkey")).to eq(true)
+ expect(User.reserved_username?("DonKey")).to eq(true)
+ expect(User.reserved_username?("test")).to eq(true)
end
- it 'should not allow usernames matched against an expression' do
+ it "should not allow usernames matched against an expression" do
SiteSetting.reserved_usernames = "test)|*admin*|foo*|*bar|abc.def|löwe|ka\u0308fer"
- expect(User.reserved_username?('test')).to eq(false)
- expect(User.reserved_username?('abc9def')).to eq(false)
+ expect(User.reserved_username?("test")).to eq(false)
+ expect(User.reserved_username?("abc9def")).to eq(false)
- expect(User.reserved_username?('admin')).to eq(true)
- expect(User.reserved_username?('foo')).to eq(true)
- expect(User.reserved_username?('bar')).to eq(true)
+ expect(User.reserved_username?("admin")).to eq(true)
+ expect(User.reserved_username?("foo")).to eq(true)
+ expect(User.reserved_username?("bar")).to eq(true)
- expect(User.reserved_username?('admi')).to eq(false)
- expect(User.reserved_username?('bar.foo')).to eq(false)
- expect(User.reserved_username?('foo.bar')).to eq(true)
- expect(User.reserved_username?('baz.bar')).to eq(true)
+ expect(User.reserved_username?("admi")).to eq(false)
+ expect(User.reserved_username?("bar.foo")).to eq(false)
+ expect(User.reserved_username?("foo.bar")).to eq(true)
+ expect(User.reserved_username?("baz.bar")).to eq(true)
- expect(User.reserved_username?('LÖwe')).to eq(true)
+ expect(User.reserved_username?("LÖwe")).to eq(true)
expect(User.reserved_username?("Lo\u0308we")).to eq(true) # NFD
- expect(User.reserved_username?('löwe')).to eq(true) # NFC
- expect(User.reserved_username?('käfer')).to eq(true) # NFC
+ expect(User.reserved_username?("löwe")).to eq(true) # NFC
+ expect(User.reserved_username?("käfer")).to eq(true) # NFC
end
end
- describe 'email_validator' do
- it 'should allow good emails' do
- user = Fabricate.build(:user, email: 'good@gmail.com')
+ describe "email_validator" do
+ it "should allow good emails" do
+ user = Fabricate.build(:user, email: "good@gmail.com")
expect(user).to be_valid
end
- it 'should reject some emails based on the blocked_email_domains site setting' do
- SiteSetting.blocked_email_domains = 'mailinator.com'
- expect(Fabricate.build(:user, email: 'notgood@mailinator.com')).not_to be_valid
- expect(Fabricate.build(:user, email: 'mailinator@gmail.com')).to be_valid
+ it "should reject some emails based on the blocked_email_domains site setting" do
+ SiteSetting.blocked_email_domains = "mailinator.com"
+ expect(Fabricate.build(:user, email: "notgood@mailinator.com")).not_to be_valid
+ expect(Fabricate.build(:user, email: "mailinator@gmail.com")).to be_valid
end
- it 'should reject some emails based on the blocked_email_domains site setting' do
- SiteSetting.blocked_email_domains = 'mailinator.com|trashmail.net'
- expect(Fabricate.build(:user, email: 'notgood@mailinator.com')).not_to be_valid
- expect(Fabricate.build(:user, email: 'notgood@trashmail.net')).not_to be_valid
- expect(Fabricate.build(:user, email: 'mailinator.com@gmail.com')).to be_valid
+ it "should reject some emails based on the blocked_email_domains site setting" do
+ SiteSetting.blocked_email_domains = "mailinator.com|trashmail.net"
+ expect(Fabricate.build(:user, email: "notgood@mailinator.com")).not_to be_valid
+ expect(Fabricate.build(:user, email: "notgood@trashmail.net")).not_to be_valid
+ expect(Fabricate.build(:user, email: "mailinator.com@gmail.com")).to be_valid
end
- it 'should not reject partial matches' do
- SiteSetting.blocked_email_domains = 'mail.com'
- expect(Fabricate.build(:user, email: 'mailinator@gmail.com')).to be_valid
+ it "should not reject partial matches" do
+ SiteSetting.blocked_email_domains = "mail.com"
+ expect(Fabricate.build(:user, email: "mailinator@gmail.com")).to be_valid
end
- it 'should reject some emails based on the blocked_email_domains site setting ignoring case' do
- SiteSetting.blocked_email_domains = 'trashmail.net'
- expect(Fabricate.build(:user, email: 'notgood@TRASHMAIL.NET')).not_to be_valid
+ it "should reject some emails based on the blocked_email_domains site setting ignoring case" do
+ SiteSetting.blocked_email_domains = "trashmail.net"
+ expect(Fabricate.build(:user, email: "notgood@TRASHMAIL.NET")).not_to be_valid
end
- it 'should reject emails based on the blocked_email_domains site setting matching subdomain' do
- SiteSetting.blocked_email_domains = 'domain.com'
- expect(Fabricate.build(:user, email: 'notgood@sub.domain.com')).not_to be_valid
+ it "should reject emails based on the blocked_email_domains site setting matching subdomain" do
+ SiteSetting.blocked_email_domains = "domain.com"
+ expect(Fabricate.build(:user, email: "notgood@sub.domain.com")).not_to be_valid
end
- it 'skips the blocklist if skip_email_validation is set' do
- SiteSetting.blocked_email_domains = 'domain.com'
- user = Fabricate.build(:user, email: 'notgood@sub.domain.com')
+ it "skips the blocklist if skip_email_validation is set" do
+ SiteSetting.blocked_email_domains = "domain.com"
+ user = Fabricate.build(:user, email: "notgood@sub.domain.com")
user.skip_email_validation = true
expect(user).to be_valid
end
- it 'blocklist should not reject developer emails' do
- Rails.configuration.stubs(:developer_emails).returns('developer@discourse.org')
- SiteSetting.blocked_email_domains = 'discourse.org'
- expect(Fabricate.build(:user, email: 'developer@discourse.org')).to be_valid
+ it "blocklist should not reject developer emails" do
+ Rails.configuration.stubs(:developer_emails).returns("developer@discourse.org")
+ SiteSetting.blocked_email_domains = "discourse.org"
+ expect(Fabricate.build(:user, email: "developer@discourse.org")).to be_valid
end
- it 'should not interpret a period as a wildcard' do
- SiteSetting.blocked_email_domains = 'trashmail.net'
- expect(Fabricate.build(:user, email: 'good@trashmailinet.com')).to be_valid
+ it "should not interpret a period as a wildcard" do
+ SiteSetting.blocked_email_domains = "trashmail.net"
+ expect(Fabricate.build(:user, email: "good@trashmailinet.com")).to be_valid
end
- it 'should not be used to validate existing records' do
- u = Fabricate(:user, email: 'in_before_blocklisted@fakemail.com')
- SiteSetting.blocked_email_domains = 'fakemail.com'
+ it "should not be used to validate existing records" do
+ u = Fabricate(:user, email: "in_before_blocklisted@fakemail.com")
+ SiteSetting.blocked_email_domains = "fakemail.com"
expect(u).to be_valid
end
- it 'should be used when email is being changed' do
- SiteSetting.blocked_email_domains = 'mailinator.com'
- u = Fabricate(:user, email: 'good@gmail.com')
- u.email = 'nope@mailinator.com'
+ it "should be used when email is being changed" do
+ SiteSetting.blocked_email_domains = "mailinator.com"
+ u = Fabricate(:user, email: "good@gmail.com")
+ u.email = "nope@mailinator.com"
expect(u).not_to be_valid
end
- it 'allowlist should reject some emails based on the allowed_email_domains site setting' do
- SiteSetting.allowed_email_domains = 'vaynermedia.com'
- user = Fabricate.build(:user, email: 'notgood@mailinator.com')
+ it "allowlist should reject some emails based on the allowed_email_domains site setting" do
+ SiteSetting.allowed_email_domains = "vaynermedia.com"
+ user = Fabricate.build(:user, email: "notgood@mailinator.com")
expect(user).not_to be_valid
- expect(user.errors.messages[:primary_email]).to include(I18n.t('user.email.not_allowed'))
- expect(Fabricate.build(:user, email: 'sbauch@vaynermedia.com')).to be_valid
+ expect(user.errors.messages[:primary_email]).to include(I18n.t("user.email.not_allowed"))
+ expect(Fabricate.build(:user, email: "sbauch@vaynermedia.com")).to be_valid
end
- it 'should reject some emails based on the allowed_email_domains site setting when allowlisting multiple domains' do
- SiteSetting.allowed_email_domains = 'vaynermedia.com|gmail.com'
- expect(Fabricate.build(:user, email: 'notgood@mailinator.com')).not_to be_valid
- expect(Fabricate.build(:user, email: 'notgood@trashmail.net')).not_to be_valid
- expect(Fabricate.build(:user, email: 'mailinator.com@gmail.com')).to be_valid
- expect(Fabricate.build(:user, email: 'mailinator.com@vaynermedia.com')).to be_valid
+ it "should reject some emails based on the allowed_email_domains site setting when allowlisting multiple domains" do
+ SiteSetting.allowed_email_domains = "vaynermedia.com|gmail.com"
+ expect(Fabricate.build(:user, email: "notgood@mailinator.com")).not_to be_valid
+ expect(Fabricate.build(:user, email: "notgood@trashmail.net")).not_to be_valid
+ expect(Fabricate.build(:user, email: "mailinator.com@gmail.com")).to be_valid
+ expect(Fabricate.build(:user, email: "mailinator.com@vaynermedia.com")).to be_valid
end
- it 'should accept some emails based on the allowed_email_domains site setting ignoring case' do
- SiteSetting.allowed_email_domains = 'vaynermedia.com'
- expect(Fabricate.build(:user, email: 'good@VAYNERMEDIA.COM')).to be_valid
+ it "should accept some emails based on the allowed_email_domains site setting ignoring case" do
+ SiteSetting.allowed_email_domains = "vaynermedia.com"
+ expect(Fabricate.build(:user, email: "good@VAYNERMEDIA.COM")).to be_valid
end
- it 'allowlist should accept developer emails' do
- Rails.configuration.stubs(:developer_emails).returns('developer@discourse.org')
- SiteSetting.allowed_email_domains = 'awesome.org'
- expect(Fabricate.build(:user, email: 'developer@discourse.org')).to be_valid
+ it "allowlist should accept developer emails" do
+ Rails.configuration.stubs(:developer_emails).returns("developer@discourse.org")
+ SiteSetting.allowed_email_domains = "awesome.org"
+ expect(Fabricate.build(:user, email: "developer@discourse.org")).to be_valid
end
- it 'email allowlist should not be used to validate existing records' do
- u = Fabricate(:user, email: 'in_before_allowlisted@fakemail.com')
- SiteSetting.blocked_email_domains = 'vaynermedia.com'
+ it "email allowlist should not be used to validate existing records" do
+ u = Fabricate(:user, email: "in_before_allowlisted@fakemail.com")
+ SiteSetting.blocked_email_domains = "vaynermedia.com"
expect(u).to be_valid
end
- it 'email allowlist should be used when email is being changed' do
- SiteSetting.allowed_email_domains = 'vaynermedia.com'
- u = Fabricate(:user, email: 'good@vaynermedia.com')
- u.email = 'nope@mailinator.com'
+ it "email allowlist should be used when email is being changed" do
+ SiteSetting.allowed_email_domains = "vaynermedia.com"
+ u = Fabricate(:user, email: "good@vaynermedia.com")
+ u.email = "nope@mailinator.com"
expect(u).not_to be_valid
end
@@ -1117,8 +1163,7 @@ RSpec.describe User do
end
end
- describe 'passwords' do
-
+ describe "passwords" do
it "should not have an active account with a good password" do
@user = Fabricate.build(:user, active: false)
@user.password = "ilovepasta"
@@ -1127,7 +1172,7 @@ RSpec.describe User do
expect(@user.active).to eq(false)
expect(@user.confirm_password?("ilovepasta")).to eq(true)
- email_token = Fabricate(:email_token, user: @user, email: 'pasta@delicious.com')
+ email_token = Fabricate(:email_token, user: @user, email: "pasta@delicious.com")
UserAuthToken.generate!(user_id: @user.id)
@@ -1153,9 +1198,7 @@ RSpec.describe User do
SiteSetting.previous_visit_timeout_hours = 1
end
- after do
- reset_last_seen_cache!(user)
- end
+ after { reset_last_seen_cache!(user) }
it "should act correctly" do
expect(user.previous_visit_at).to eq(nil)
@@ -1179,7 +1222,6 @@ RSpec.describe User do
user.reload
expect(user.previous_visit_at).to eq_time(second_visit_date)
end
-
end
describe "update_last_seen!" do
@@ -1187,9 +1229,7 @@ RSpec.describe User do
let!(:first_visit_date) { Time.zone.now }
let!(:second_visit_date) { 2.hours.from_now }
- after do
- reset_last_seen_cache!(user)
- end
+ after { reset_last_seen_cache!(user) }
it "should update the last seen value" do
expect(user.last_seen_at).to eq nil
@@ -1239,9 +1279,7 @@ RSpec.describe User do
end
context "if a timezone already exists on user option" do
- before do
- user.user_option.update_attribute(:timezone, "America/Denver")
- end
+ before { user.user_option.update_attribute(:timezone, "America/Denver") }
it "does not update the timezone" do
user.update_timezone_if_missing(timezone)
@@ -1262,7 +1300,7 @@ RSpec.describe User do
expect(user.user_stat.days_visited).to eq(0)
end
- describe 'with no previous values' do
+ describe "with no previous values" do
after do
reset_last_seen_cache!(user)
unfreeze_time
@@ -1313,25 +1351,25 @@ RSpec.describe User do
end
end
- describe 'email_confirmed?' do
+ describe "email_confirmed?" do
fab!(:user) { Fabricate(:user) }
- context 'when email has not been confirmed yet' do
- it 'should return false' do
+ context "when email has not been confirmed yet" do
+ it "should return false" do
expect(user.email_confirmed?).to eq(false)
end
end
- context 'when email has been confirmed' do
- it 'should return true' do
+ context "when email has been confirmed" do
+ it "should return true" do
token = Fabricate(:email_token, user: user)
EmailToken.confirm(token.token)
expect(user.email_confirmed?).to eq(true)
end
end
- context 'when user has no email tokens for some reason' do
- it 'should return false' do
+ context "when user has no email tokens for some reason" do
+ it "should return false" do
user.email_tokens.each { |t| t.destroy }
user.reload
expect(user.email_confirmed?).to eq(true)
@@ -1342,9 +1380,27 @@ RSpec.describe User do
describe "flag_linked_posts_as_spam" do
fab!(:user) { Fabricate(:user) }
fab!(:admin) { Fabricate(:admin) }
- fab!(:post) { PostCreator.new(user, title: "this topic contains spam", raw: "this post has a link: http://discourse.org").create }
- fab!(:another_post) { PostCreator.new(user, title: "this topic also contains spam", raw: "this post has a link: http://discourse.org/asdfa").create }
- fab!(:post_without_link) { PostCreator.new(user, title: "this topic shouldn't be spam", raw: "this post has no links in it.").create }
+ fab!(:post) do
+ PostCreator.new(
+ user,
+ title: "this topic contains spam",
+ raw: "this post has a link: http://discourse.org",
+ ).create
+ end
+ fab!(:another_post) do
+ PostCreator.new(
+ user,
+ title: "this topic also contains spam",
+ raw: "this post has a link: http://discourse.org/asdfa",
+ ).create
+ end
+ fab!(:post_without_link) do
+ PostCreator.new(
+ user,
+ title: "this topic shouldn't be spam",
+ raw: "this post has no links in it.",
+ ).create
+ end
it "has flagged all the user's posts as spam" do
user.flag_linked_posts_as_spam
@@ -1373,69 +1429,72 @@ RSpec.describe User do
expect(post.reload.spam_count).to eq(0)
end
-
end
- describe '#readable_name' do
- context 'when name is missing' do
- it 'returns just the username' do
- expect(Fabricate(:user, username: 'foo', name: nil).readable_name).to eq('foo')
+ describe "#readable_name" do
+ context "when name is missing" do
+ it "returns just the username" do
+ expect(Fabricate(:user, username: "foo", name: nil).readable_name).to eq("foo")
end
end
- context 'when name and username are identical' do
- it 'returns just the username' do
- expect(Fabricate(:user, username: 'foo', name: 'foo').readable_name).to eq('foo')
+ context "when name and username are identical" do
+ it "returns just the username" do
+ expect(Fabricate(:user, username: "foo", name: "foo").readable_name).to eq("foo")
end
end
- context 'when name and username are not identical' do
- it 'returns the name and username' do
- expect(Fabricate(:user, username: 'foo', name: 'Bar Baz').readable_name).to eq('Bar Baz (foo)')
+ context "when name and username are not identical" do
+ it "returns the name and username" do
+ expect(Fabricate(:user, username: "foo", name: "Bar Baz").readable_name).to eq(
+ "Bar Baz (foo)",
+ )
end
end
end
- describe '.find_by_username_or_email' do
- it 'finds users' do
- bob = Fabricate(:user, username: 'bob', email: 'bob@example.com')
- found_user = User.find_by_username_or_email('Bob')
+ describe ".find_by_username_or_email" do
+ it "finds users" do
+ bob = Fabricate(:user, username: "bob", email: "bob@example.com")
+ found_user = User.find_by_username_or_email("Bob")
expect(found_user).to eq bob
- found_user = User.find_by_username_or_email('bob@Example.com')
+ found_user = User.find_by_username_or_email("bob@Example.com")
expect(found_user).to eq bob
- found_user = User.find_by_username_or_email('Bob@Example.com')
+ found_user = User.find_by_username_or_email("Bob@Example.com")
expect(found_user).to eq bob
- found_user = User.find_by_username_or_email('bob1')
+ found_user = User.find_by_username_or_email("bob1")
expect(found_user).to be_nil
- found_user = User.find_by_email('bob@Example.com')
+ found_user = User.find_by_email("bob@Example.com")
expect(found_user).to eq bob
- found_user = User.find_by_email('BOB@Example.com')
+ found_user = User.find_by_email("BOB@Example.com")
expect(found_user).to eq bob
- found_user = User.find_by_email('bob')
+ found_user = User.find_by_email("bob")
expect(found_user).to be_nil
- found_user = User.find_by_username('bOb')
+ found_user = User.find_by_username("bOb")
expect(found_user).to eq bob
end
- it 'finds users with Unicode username' do
+ it "finds users with Unicode username" do
SiteSetting.unicode_usernames = true
- user = Fabricate(:user, username: 'löwe')
+ user = Fabricate(:user, username: "löwe")
- expect(User.find_by_username('LÖWE')).to eq(user) # NFC
+ expect(User.find_by_username("LÖWE")).to eq(user) # NFC
expect(User.find_by_username("LO\u0308WE")).to eq(user) # NFD
expect(User.find_by_username("lo\u0308we")).to eq(user) # NFD
end
end
describe "#new_user_posting_on_first_day?" do
-
def test_user?(opts = {})
- Fabricate.build(:user, { created_at: Time.zone.now }.merge(opts)).new_user_posting_on_first_day?
+ Fabricate.build(
+ :user,
+ { created_at: Time.zone.now }.merge(opts),
+ ).new_user_posting_on_first_day?
end
it "handles when user has never posted" do
@@ -1489,10 +1548,12 @@ RSpec.describe User do
context "with a reply" do
before do
Jobs.run_immediately!
- PostCreator.new(Fabricate(:user),
- raw: 'whatever this is a raw post',
- topic_id: topic.id,
- reply_to_post_number: post.post_number).create
+ PostCreator.new(
+ Fabricate(:user),
+ raw: "whatever this is a raw post",
+ topic_id: topic.id,
+ reply_to_post_number: post.post_number,
+ ).create
end
it "resets the `posted_too_much` threshold" do
@@ -1506,11 +1567,9 @@ RSpec.describe User do
topic_user.trust_level = TrustLevel[0]
expect(topic.user.posted_too_much_in_topic?(topic.id)).to eq(false)
end
-
end
describe "#find_email" do
-
fab!(:user) { Fabricate(:user, email: "bob@example.com") }
context "when email is exists in the email logs" do
@@ -1531,27 +1590,25 @@ RSpec.describe User do
end
describe "#gravatar_template" do
-
it "returns a gravatar based template" do
- expect(User.gravatar_template("em@il.com")).to eq("//www.gravatar.com/avatar/6dc2fde946483a1d8a84b89345a1b638.png?s={size}&r=pg&d=identicon")
+ expect(User.gravatar_template("em@il.com")).to eq(
+ "//www.gravatar.com/avatar/6dc2fde946483a1d8a84b89345a1b638.png?s={size}&r=pg&d=identicon",
+ )
end
-
end
describe "#custom_gravatar" do
- before do
- SiteSetting.gravatar_base_url = "seccdn.libravatar.org"
- end
+ before { SiteSetting.gravatar_base_url = "seccdn.libravatar.org" }
it "returns a gravatar url as set in the settings" do
- expect(User.gravatar_template("em@il.com")).to eq("//seccdn.libravatar.org/avatar/6dc2fde946483a1d8a84b89345a1b638.png?s={size}&r=pg&d=identicon")
+ expect(User.gravatar_template("em@il.com")).to eq(
+ "//seccdn.libravatar.org/avatar/6dc2fde946483a1d8a84b89345a1b638.png?s={size}&r=pg&d=identicon",
+ )
end
end
describe "#letter_avatar_color" do
- before do
- SiteSetting.restrict_letter_avatar_colors = "2F70AC|ED207B|AAAAAA|77FF33"
- end
+ before { SiteSetting.restrict_letter_avatar_colors = "2F70AC|ED207B|AAAAAA|77FF33" }
it "returns custom color if restrict_letter_avatar_colors site setting is set" do
expect(User.letter_avatar_color("username_one")).to eq("2F70AC")
@@ -1562,42 +1619,46 @@ RSpec.describe User do
end
describe ".small_avatar_url" do
-
- let(:user) { build(:user, username: 'Sam') }
+ let(:user) { build(:user, username: "Sam") }
it "returns a 45-pixel-wide avatar" do
SiteSetting.external_system_avatars_enabled = false
- expect(user.small_avatar_url).to eq("//test.localhost/letter_avatar/sam/45/#{LetterAvatar.version}.png")
+ expect(user.small_avatar_url).to eq(
+ "//test.localhost/letter_avatar/sam/45/#{LetterAvatar.version}.png",
+ )
SiteSetting.external_system_avatars_enabled = true
- expect(user.small_avatar_url).to eq("//test.localhost/letter_avatar_proxy/v4/letter/s/5f9b8f/45.png")
+ expect(user.small_avatar_url).to eq(
+ "//test.localhost/letter_avatar_proxy/v4/letter/s/5f9b8f/45.png",
+ )
end
-
end
describe ".avatar_template_url" do
-
- let(:user) { build(:user, uploaded_avatar_id: 99, username: 'Sam') }
+ let(:user) { build(:user, uploaded_avatar_id: 99, username: "Sam") }
it "returns a schemaless avatar template with correct id" do
- expect(user.avatar_template_url).to eq("//test.localhost/user_avatar/test.localhost/sam/{size}/99_#{OptimizedImage::VERSION}.png")
+ expect(user.avatar_template_url).to eq(
+ "//test.localhost/user_avatar/test.localhost/sam/{size}/99_#{OptimizedImage::VERSION}.png",
+ )
end
it "returns a schemaless cdn-based avatar template" do
Rails.configuration.action_controller.stubs(:asset_host).returns("http://my.cdn.com")
- expect(user.avatar_template_url).to eq("//my.cdn.com/user_avatar/test.localhost/sam/{size}/99_#{OptimizedImage::VERSION}.png")
+ expect(user.avatar_template_url).to eq(
+ "//my.cdn.com/user_avatar/test.localhost/sam/{size}/99_#{OptimizedImage::VERSION}.png",
+ )
end
-
end
- describe '#avatar_template' do
- it 'uses the small logo if the user is the system user' do
+ describe "#avatar_template" do
+ it "uses the small logo if the user is the system user" do
logo_small_url = Discourse.store.cdn_url(SiteSetting.logo_small.url)
expect(Discourse.system_user.avatar_template).to eq(logo_small_url)
end
- it 'uses the system user avatar if the logo is nil' do
+ it "uses the system user avatar if the logo is nil" do
SiteSetting.logo_small = nil
system_user = Discourse.system_user
expected = User.avatar_template(system_user.username, system_user.uploaded_avatar_id)
@@ -1605,7 +1666,7 @@ RSpec.describe User do
expect(Discourse.system_user.avatar_template).to eq(expected)
end
- it 'uses the regular avatar for other users' do
+ it "uses the regular avatar for other users" do
user = Fabricate(:user)
expected = User.avatar_template(user.username, user.uploaded_avatar_id)
@@ -1618,9 +1679,7 @@ RSpec.describe User do
fab!(:user) { Fabricate(:user) }
let!(:now) { Time.zone.now }
before { user.update_last_seen!(now) }
- after do
- reset_last_seen_cache!(user)
- end
+ after { reset_last_seen_cache!(user) }
it "with existing UserVisit record, increments the posts_read value" do
expect {
@@ -1646,7 +1705,6 @@ RSpec.describe User do
end
context "when the user has a group" do
-
before do
group.usernames = user.username
group.save
@@ -1721,49 +1779,64 @@ RSpec.describe User do
fab!(:user) { Fabricate(:user) }
fab!(:unactivated) { Fabricate(:user, active: false) }
fab!(:unactivated_old) { Fabricate(:user, active: false, created_at: 1.month.ago) }
- fab!(:unactivated_old_with_system_pm) { Fabricate(:user, active: false, created_at: 2.months.ago) }
- fab!(:unactivated_old_with_human_pm) { Fabricate(:user, active: false, created_at: 2.months.ago) }
+ fab!(:unactivated_old_with_system_pm) do
+ Fabricate(:user, active: false, created_at: 2.months.ago)
+ end
+ fab!(:unactivated_old_with_human_pm) do
+ Fabricate(:user, active: false, created_at: 2.months.ago)
+ end
fab!(:unactivated_old_with_post) { Fabricate(:user, active: false, created_at: 1.month.ago) }
before do
Group.refresh_automatic_groups!
- PostCreator.new(Discourse.system_user,
- title: "Welcome to our Discourse",
- raw: "This is a welcome message",
- archetype: Archetype.private_message,
- target_usernames: [unactivated_old_with_system_pm.username],
+ PostCreator.new(
+ Discourse.system_user,
+ title: "Welcome to our Discourse",
+ raw: "This is a welcome message",
+ archetype: Archetype.private_message,
+ target_usernames: [unactivated_old_with_system_pm.username],
).create
- PostCreator.new(user,
- title: "Welcome to our Discourse",
- raw: "This is a welcome message",
- archetype: Archetype.private_message,
- target_usernames: [unactivated_old_with_human_pm.username],
+ PostCreator.new(
+ user,
+ title: "Welcome to our Discourse",
+ raw: "This is a welcome message",
+ archetype: Archetype.private_message,
+ target_usernames: [unactivated_old_with_human_pm.username],
).create
- PostCreator.new(unactivated_old_with_post,
- title: "Test topic from a user",
- raw: "This is a sample message"
+ PostCreator.new(
+ unactivated_old_with_post,
+ title: "Test topic from a user",
+ raw: "This is a sample message",
).create
end
- it 'should only remove old, unactivated users' do
+ it "should only remove old, unactivated users" do
User.purge_unactivated
- expect(User.real.all).to match_array([user, unactivated, unactivated_old_with_human_pm, unactivated_old_with_post])
+ expect(User.real.all).to match_array(
+ [user, unactivated, unactivated_old_with_human_pm, unactivated_old_with_post],
+ )
end
it "does nothing if purge_unactivated_users_grace_period_days is 0" do
SiteSetting.purge_unactivated_users_grace_period_days = 0
User.purge_unactivated
- expect(User.real.all).to match_array([
- user, unactivated, unactivated_old, unactivated_old_with_system_pm, unactivated_old_with_human_pm, unactivated_old_with_post
- ])
+ expect(User.real.all).to match_array(
+ [
+ user,
+ unactivated,
+ unactivated_old,
+ unactivated_old_with_system_pm,
+ unactivated_old_with_human_pm,
+ unactivated_old_with_post,
+ ],
+ )
end
end
describe "hash_passwords" do
-
let(:too_long) { "x" * (User.max_password_length + 1) }
def hash(password, salt)
@@ -1771,33 +1844,32 @@ RSpec.describe User do
end
it "returns the same hash for the same password and salt" do
- expect(hash('poutine', 'gravy')).to eq(hash('poutine', 'gravy'))
+ expect(hash("poutine", "gravy")).to eq(hash("poutine", "gravy"))
end
it "returns a different hash for the same salt and different password" do
- expect(hash('poutine', 'gravy')).not_to eq(hash('fries', 'gravy'))
+ expect(hash("poutine", "gravy")).not_to eq(hash("fries", "gravy"))
end
it "returns a different hash for the same password and different salt" do
- expect(hash('poutine', 'gravy')).not_to eq(hash('poutine', 'cheese'))
+ expect(hash("poutine", "gravy")).not_to eq(hash("poutine", "cheese"))
end
it "raises an error when passwords are too long" do
- expect { hash(too_long, 'gravy') }.to raise_error(StandardError)
+ expect { hash(too_long, "gravy") }.to raise_error(StandardError)
end
-
end
describe "automatic group membership" do
-
- fab!(:group) {
- Fabricate(:group,
- automatic_membership_email_domains: "bar.com|wat.com",
- grant_trust_level: 1,
- title: "bars and wats",
- primary_group: true
+ fab!(:group) do
+ Fabricate(
+ :group,
+ automatic_membership_email_domains: "bar.com|wat.com",
+ grant_trust_level: 1,
+ title: "bars and wats",
+ primary_group: true,
)
- }
+ end
it "doesn't automatically add staged users" do
staged_user = Fabricate(:user, active: true, staged: true, email: "wat@wat.com")
@@ -1821,19 +1893,25 @@ RSpec.describe User do
it "is automatically added to a group when the email matches the SSO record" do
user = Fabricate(:user, active: true, email: "sso@bar.com")
- user.create_single_sign_on_record(external_id: 123, external_email: "sso@bar.com", last_payload: "")
+ user.create_single_sign_on_record(
+ external_id: 123,
+ external_email: "sso@bar.com",
+ last_payload: "",
+ )
user.set_automatic_groups
group.reload
expect(group.users.include?(user)).to eq(true)
end
it "get attributes from the group" do
- user = Fabricate.build(:user,
- active: true,
- trust_level: 0,
- email: "foo@bar.com",
- password: "strongpassword4Uguys"
- )
+ user =
+ Fabricate.build(
+ :user,
+ active: true,
+ trust_level: 0,
+ email: "foo@bar.com",
+ password: "strongpassword4Uguys",
+ )
user.password_required!
user.save!
@@ -1847,20 +1925,26 @@ RSpec.describe User do
end
end
- describe 'staff info' do
+ describe "staff info" do
fab!(:user) { Fabricate(:user) }
fab!(:moderator) { Fabricate(:moderator) }
describe "#number_of_flags_given" do
it "doesn't count disagreed flags" do
post_agreed = Fabricate(:post)
- PostActionCreator.inappropriate(user, post_agreed).reviewable.perform(moderator, :agree_and_keep)
+ PostActionCreator
+ .inappropriate(user, post_agreed)
+ .reviewable
+ .perform(moderator, :agree_and_keep)
post_deferred = Fabricate(:post)
PostActionCreator.inappropriate(user, post_deferred).reviewable.perform(moderator, :ignore)
post_disagreed = Fabricate(:post)
- PostActionCreator.inappropriate(user, post_disagreed).reviewable.perform(moderator, :disagree)
+ PostActionCreator
+ .inappropriate(user, post_disagreed)
+ .reviewable
+ .perform(moderator, :disagree)
expect(user.number_of_flags_given).to eq(2)
end
@@ -1885,28 +1969,28 @@ RSpec.describe User do
end
end
- describe '#number_of_rejected_posts' do
- it 'counts rejected posts' do
+ describe "#number_of_rejected_posts" do
+ it "counts rejected posts" do
Fabricate(:reviewable_queued_post, created_by: user, status: Reviewable.statuses[:rejected])
expect(user.number_of_rejected_posts).to eq(1)
end
- it 'ignore non-rejected posts' do
+ it "ignore non-rejected posts" do
Fabricate(:reviewable_queued_post, created_by: user, status: Reviewable.statuses[:approved])
expect(user.number_of_rejected_posts).to eq(0)
end
end
- describe '#number_of_flagged_posts' do
- it 'counts flagged posts from the user' do
+ describe "#number_of_flagged_posts" do
+ it "counts flagged posts from the user" do
Fabricate(:reviewable_flagged_post, target_created_by: user)
expect(user.number_of_flagged_posts).to eq(1)
end
- it 'ignores flagged posts from another user' do
+ it "ignores flagged posts from another user" do
Fabricate(:reviewable_flagged_post, target_created_by: Fabricate(:user))
expect(user.number_of_flagged_posts).to eq(0)
@@ -1936,7 +2020,6 @@ RSpec.describe User do
end
context "when user preferences are overridden" do
-
fab!(:category0) { Fabricate(:category) }
fab!(:category1) { Fabricate(:category) }
fab!(:category2) { Fabricate(:category) }
@@ -1988,7 +2071,9 @@ RSpec.describe User do
expect(CategoryUser.lookup(user, :watching).pluck(:category_id)).to eq([category0.id])
expect(CategoryUser.lookup(user, :tracking).pluck(:category_id)).to eq([category1.id])
expect(CategoryUser.lookup(user, :muted).pluck(:category_id)).to eq([category2.id])
- expect(CategoryUser.lookup(user, :watching_first_post).pluck(:category_id)).to eq([category3.id])
+ expect(CategoryUser.lookup(user, :watching_first_post).pluck(:category_id)).to eq(
+ [category3.id],
+ )
expect(CategoryUser.lookup(user, :regular).pluck(:category_id)).to eq([category4.id])
end
@@ -2003,7 +2088,6 @@ RSpec.describe User do
end
context UserOption do
-
it "Creates a UserOption row when a user record is created and destroys once done" do
user = Fabricate(:user)
expect(user.user_option.email_level).to eq(UserOption.email_level_types[:only_when_away])
@@ -2011,64 +2095,62 @@ RSpec.describe User do
user_id = user.id
user.destroy!
expect(UserOption.find_by(user_id: user_id)).to eq(nil)
-
end
-
end
describe "#logged_out" do
fab!(:user) { Fabricate(:user) }
- it 'should publish the right message' do
+ it "should publish the right message" do
message = MessageBus.track_publish("/logout/#{user.id}") { user.logged_out }.first
expect(message.data).to eq(user.id)
end
end
- describe '#read_first_notification?' do
+ describe "#read_first_notification?" do
fab!(:user) { Fabricate(:user, trust_level: TrustLevel[0]) }
fab!(:notification) { Fabricate(:private_message_notification) }
- describe 'when first notification has not been seen' do
- it 'should return the right value' do
+ describe "when first notification has not been seen" do
+ it "should return the right value" do
expect(user.read_first_notification?).to eq(false)
end
end
- describe 'when first notification has been seen' do
- it 'should return the right value' do
+ describe "when first notification has been seen" do
+ it "should return the right value" do
user.update!(seen_notification_id: notification.id)
expect(user.reload.read_first_notification?).to eq(true)
end
end
- describe 'when user is trust level 1' do
- it 'should return the right value' do
+ describe "when user is trust level 1" do
+ it "should return the right value" do
user.update!(trust_level: TrustLevel[1])
expect(user.read_first_notification?).to eq(false)
end
end
- describe 'when user is trust level 2' do
- it 'should return the right value' do
+ describe "when user is trust level 2" do
+ it "should return the right value" do
user.update!(trust_level: TrustLevel[2])
expect(user.read_first_notification?).to eq(true)
end
end
- describe 'when user is an old user' do
- it 'should return the right value' do
+ describe "when user is an old user" do
+ it "should return the right value" do
user.update!(first_seen_at: 1.year.ago)
expect(user.read_first_notification?).to eq(true)
end
end
- describe 'when user skipped new user tips' do
- it 'should return the right value' do
+ describe "when user skipped new user tips" do
+ it "should return the right value" do
user.user_option.update!(skip_new_user_tips: true)
expect(user.read_first_notification?).to eq(true)
@@ -2078,17 +2160,39 @@ RSpec.describe User do
describe "#featured_user_badges" do
fab!(:user) { Fabricate(:user) }
- let!(:user_badge_tl1) { UserBadge.create(badge_id: Badge::BasicUser, user: user, granted_by: Discourse.system_user, granted_at: Time.now) }
- let!(:user_badge_tl2) { UserBadge.create(badge_id: Badge::Member, user: user, granted_by: Discourse.system_user, granted_at: Time.now) }
- let!(:user_badge_like) { UserBadge.create(badge_id: Badge::FirstLike, user: user, granted_by: Discourse.system_user, granted_at: Time.now) }
+ let!(:user_badge_tl1) do
+ UserBadge.create(
+ badge_id: Badge::BasicUser,
+ user: user,
+ granted_by: Discourse.system_user,
+ granted_at: Time.now,
+ )
+ end
+ let!(:user_badge_tl2) do
+ UserBadge.create(
+ badge_id: Badge::Member,
+ user: user,
+ granted_by: Discourse.system_user,
+ granted_at: Time.now,
+ )
+ end
+ let!(:user_badge_like) do
+ UserBadge.create(
+ badge_id: Badge::FirstLike,
+ user: user,
+ granted_by: Discourse.system_user,
+ granted_at: Time.now,
+ )
+ end
- it 'should display badges in the correct order' do
- expect(user.featured_user_badges.map(&:badge_id)).to eq([Badge::Member, Badge::FirstLike, Badge::BasicUser])
+ it "should display badges in the correct order" do
+ expect(user.featured_user_badges.map(&:badge_id)).to eq(
+ [Badge::Member, Badge::FirstLike, Badge::BasicUser],
+ )
end
end
describe ".clear_global_notice_if_needed" do
-
fab!(:user) { Fabricate(:user) }
fab!(:admin) { Fabricate(:admin) }
@@ -2114,11 +2218,10 @@ RSpec.describe User do
expect(SiteSetting.has_login_hint).to eq(false)
expect(SiteSetting.global_notice).to eq("")
end
-
end
- describe '.human_users' do
- it 'should only return users with a positive primary key' do
+ describe ".human_users" do
+ it "should only return users with a positive primary key" do
Fabricate(:bot)
user = Fabricate(:user)
@@ -2126,7 +2229,7 @@ RSpec.describe User do
end
end
- describe '.not_staged' do
+ describe ".not_staged" do
let!(:user0) { Fabricate(:user, staged: true) }
let!(:user1) { Fabricate(:user) }
@@ -2136,45 +2239,70 @@ RSpec.describe User do
end
end
- describe '#publish_notifications_state' do
- it 'should publish the right message sorted by ID desc' do
+ describe "#publish_notifications_state" do
+ it "should publish the right message sorted by ID desc" do
notification = Fabricate(:notification, user: user)
notification2 = Fabricate(:notification, user: user, read: true)
- message = MessageBus.track_publish("/notification/#{user.id}") do
- user.publish_notifications_state
- end.first
+ message =
+ MessageBus
+ .track_publish("/notification/#{user.id}") { user.publish_notifications_state }
+ .first
- expect(message.data[:recent]).to eq([
- [notification2.id, true], [notification.id, false]
- ])
+ expect(message.data[:recent]).to eq([[notification2.id, true], [notification.id, false]])
end
- it 'floats the unread high priority notifications to the top' do
+ it "floats the unread high priority notifications to the top" do
notification = Fabricate(:notification, user: user)
notification2 = Fabricate(:notification, user: user, read: true)
- notification3 = Fabricate(:notification, user: user, notification_type: Notification.types[:private_message])
- notification4 = Fabricate(:notification, user: user, notification_type: Notification.types[:bookmark_reminder])
+ notification3 =
+ Fabricate(
+ :notification,
+ user: user,
+ notification_type: Notification.types[:private_message],
+ )
+ notification4 =
+ Fabricate(
+ :notification,
+ user: user,
+ notification_type: Notification.types[:bookmark_reminder],
+ )
- message = MessageBus.track_publish("/notification/#{user.id}") do
- user.publish_notifications_state
- end.first
+ message =
+ MessageBus
+ .track_publish("/notification/#{user.id}") { user.publish_notifications_state }
+ .first
- expect(message.data[:recent]).to eq([
- [notification4.id, false], [notification3.id, false],
- [notification2.id, true], [notification.id, false]
- ])
+ expect(message.data[:recent]).to eq(
+ [
+ [notification4.id, false],
+ [notification3.id, false],
+ [notification2.id, true],
+ [notification.id, false],
+ ],
+ )
end
it "has the correct counts" do
notification = Fabricate(:notification, user: user)
notification2 = Fabricate(:notification, user: user, read: true)
- notification3 = Fabricate(:notification, user: user, notification_type: Notification.types[:private_message])
- notification4 = Fabricate(:notification, user: user, notification_type: Notification.types[:bookmark_reminder])
+ notification3 =
+ Fabricate(
+ :notification,
+ user: user,
+ notification_type: Notification.types[:private_message],
+ )
+ notification4 =
+ Fabricate(
+ :notification,
+ user: user,
+ notification_type: Notification.types[:bookmark_reminder],
+ )
- message = MessageBus.track_publish("/notification/#{user.id}") do
- user.publish_notifications_state
- end.first
+ message =
+ MessageBus
+ .track_publish("/notification/#{user.id}") { user.publish_notifications_state }
+ .first
expect(message.data[:unread_notifications]).to eq(1)
# NOTE: because of deprecation this will be equal to unread_high_priority_notifications,
@@ -2188,41 +2316,51 @@ RSpec.describe User do
notification2 = Fabricate(:notification, user: user, read: true)
user.update(last_seen_at: 31.days.ago)
- message = MessageBus.track_publish("/notification/#{user.id}") do
- user.publish_notifications_state
- end.first
+ message =
+ MessageBus
+ .track_publish("/notification/#{user.id}") { user.publish_notifications_state }
+ .first
expect(message).to eq(nil)
end
context "with sidebar based navigation menu" do
- before do
- SiteSetting.navigation_menu = "sidebar"
- end
+ before { SiteSetting.navigation_menu = "sidebar" }
it "adds all_unread_notifications and grouped_unread_notifications to the payload" do
user.update!(admin: true)
Fabricate(:notification, user: user, notification_type: 1)
- Fabricate(:notification, notification_type: 15, high_priority: true, read: false, user: user)
- Fabricate(:notification, user: user, notification_type: Notification.types[:private_message], read: false)
+ Fabricate(
+ :notification,
+ notification_type: 15,
+ high_priority: true,
+ read: false,
+ user: user,
+ )
+ Fabricate(
+ :notification,
+ user: user,
+ notification_type: Notification.types[:private_message],
+ read: false,
+ )
- messages = MessageBus.track_publish("/notification/#{user.id}") do
- user.publish_notifications_state
- end
+ messages =
+ MessageBus.track_publish("/notification/#{user.id}") { user.publish_notifications_state }
expect(messages.size).to eq(1)
message = messages.first
expect(message.data[:all_unread_notifications_count]).to eq(3)
- expect(message.data[:grouped_unread_notifications]).to eq({ 1 => 1, 15 => 1, Notification.types[:private_message] => 1 })
+ expect(message.data[:grouped_unread_notifications]).to eq(
+ { 1 => 1, 15 => 1, Notification.types[:private_message] => 1 },
+ )
expect(message.data[:new_personal_messages_notifications_count]).to eq(1)
end
end
end
describe "silenced?" do
-
it "is not silenced by default" do
expect(Fabricate(:user)).not_to be_silenced
end
@@ -2250,26 +2388,32 @@ RSpec.describe User do
describe "#unread_notifications" do
fab!(:user) { Fabricate(:user) }
- before do
- User.max_unread_notifications = 3
- end
+ before { User.max_unread_notifications = 3 }
- after do
- User.max_unread_notifications = nil
- end
+ after { User.max_unread_notifications = nil }
it "limits to MAX_UNREAD_NOTIFICATIONS" do
4.times do
- Notification.create!(user_id: user.id, notification_type: 1, read: false, data: '{}')
+ Notification.create!(user_id: user.id, notification_type: 1, read: false, data: "{}")
end
expect(user.unread_notifications).to eq(3)
end
it "does not include high priority notifications" do
- Notification.create!(user_id: user.id, notification_type: 1, read: false, data: '{}')
- Notification.create!(user_id: user.id, notification_type: Notification.types[:private_message], read: false, data: '{}')
- Notification.create!(user_id: user.id, notification_type: Notification.types[:bookmark_reminder], read: false, data: '{}')
+ Notification.create!(user_id: user.id, notification_type: 1, read: false, data: "{}")
+ Notification.create!(
+ user_id: user.id,
+ notification_type: Notification.types[:private_message],
+ read: false,
+ data: "{}",
+ )
+ Notification.create!(
+ user_id: user.id,
+ notification_type: Notification.types[:bookmark_reminder],
+ read: false,
+ data: "{}",
+ )
expect(user.unread_notifications).to eq(1)
end
@@ -2279,16 +2423,34 @@ RSpec.describe User do
fab!(:user) { Fabricate(:user) }
it "only returns an unread count of PM and bookmark reminder notifications" do
- Notification.create!(user_id: user.id, notification_type: 1, read: false, data: '{}')
- Notification.create!(user_id: user.id, notification_type: Notification.types[:private_message], read: false, data: '{}')
- Notification.create!(user_id: user.id, notification_type: Notification.types[:bookmark_reminder], read: false, data: '{}')
+ Notification.create!(user_id: user.id, notification_type: 1, read: false, data: "{}")
+ Notification.create!(
+ user_id: user.id,
+ notification_type: Notification.types[:private_message],
+ read: false,
+ data: "{}",
+ )
+ Notification.create!(
+ user_id: user.id,
+ notification_type: Notification.types[:bookmark_reminder],
+ read: false,
+ data: "{}",
+ )
expect(user.unread_high_priority_notifications).to eq(2)
end
end
describe "#unstage!" do
- let!(:user) { Fabricate(:staged, email: 'staged@account.com', active: true, username: 'staged1', name: 'Stage Name') }
+ let!(:user) do
+ Fabricate(
+ :staged,
+ email: "staged@account.com",
+ active: true,
+ username: "staged1",
+ name: "Stage Name",
+ )
+ end
it "correctly unstages a user" do
user.unstage!
@@ -2316,20 +2478,20 @@ RSpec.describe User do
describe "#activate" do
let!(:inactive) { Fabricate(:user, active: false) }
- it 'confirms email token and activates user' do
+ it "confirms email token and activates user" do
inactive.activate
inactive.reload
expect(inactive.email_confirmed?).to eq(true)
expect(inactive.active).to eq(true)
end
- it 'works without needing to reload the model' do
+ it "works without needing to reload the model" do
inactive.activate
expect(inactive.email_confirmed?).to eq(true)
expect(inactive.active).to eq(true)
end
- it 'activates user even if email token is already confirmed' do
+ it "activates user even if email token is already confirmed" do
token = inactive.email_tokens.find_by(email: inactive.email)
token.update_column(:confirmed, true)
inactive.activate
@@ -2338,44 +2500,38 @@ RSpec.describe User do
end
def filter_by(method)
- username = 'someuniqueusername'
+ username = "someuniqueusername"
user.update!(username: username)
- username2 = 'awesomeusername'
+ username2 = "awesomeusername"
user2 = Fabricate(:user, username: username2)
- expect(User.public_send(method, username))
- .to eq([user])
+ expect(User.public_send(method, username)).to eq([user])
- expect(User.public_send(method, 'UNiQuE'))
- .to eq([user])
+ expect(User.public_send(method, "UNiQuE")).to eq([user])
- expect(User.public_send(method, [username, username2]))
- .to contain_exactly(user, user2)
+ expect(User.public_send(method, [username, username2])).to contain_exactly(user, user2)
- expect(User.public_send(method, ['UNiQuE', 'sOME']))
- .to contain_exactly(user, user2)
+ expect(User.public_send(method, %w[UNiQuE sOME])).to contain_exactly(user, user2)
end
- describe '#filter_by_username' do
- it 'should be able to filter by username' do
+ describe "#filter_by_username" do
+ it "should be able to filter by username" do
filter_by(:filter_by_username)
end
end
- describe '#filter_by_username_or_email' do
- it 'should be able to filter by email' do
- email = 'veryspecialtest@discourse.org'
+ describe "#filter_by_username_or_email" do
+ it "should be able to filter by email" do
+ email = "veryspecialtest@discourse.org"
user.update!(email: email)
- expect(User.filter_by_username_or_email(email))
- .to eq([user])
+ expect(User.filter_by_username_or_email(email)).to eq([user])
- expect(User.filter_by_username_or_email('veryspeCiaLtest'))
- .to eq([user])
+ expect(User.filter_by_username_or_email("veryspeCiaLtest")).to eq([user])
end
- it 'should be able to filter by username' do
+ it "should be able to filter by username" do
filter_by(:filter_by_username_or_email)
end
end
@@ -2394,12 +2550,12 @@ RSpec.describe User do
describe "#email=" do
let(:new_email) { "newprimary@example.com" }
- it 'sets the primary email' do
+ it "sets the primary email" do
user.update!(email: new_email)
expect(User.find(user.id).email).to eq(new_email)
end
- it 'only saves when save called' do
+ it "only saves when save called" do
old_email = user.email
user.email = new_email
expect(User.find(user.id).email).to eq(old_email)
@@ -2407,7 +2563,7 @@ RSpec.describe User do
expect(User.find(user.id).email).to eq(new_email)
end
- it 'will automatically remove matching secondary emails' do
+ it "will automatically remove matching secondary emails" do
secondary_email_record = Fabricate(:secondary_email, user: user)
user.reload
expect(user.secondary_emails.count).to eq(1)
@@ -2417,7 +2573,6 @@ RSpec.describe User do
expect(User.find(user.id).email).to eq(secondary_email_record.email)
expect(user.secondary_emails.count).to eq(0)
end
-
end
describe "set_random_avatar" do
@@ -2435,7 +2590,6 @@ RSpec.describe User do
end
describe "ensure_consistency!" do
-
it "will clean up dangling avatars" do
upload = Fabricate(:upload)
user = Fabricate(:user, uploaded_avatar_id: upload.id)
@@ -2451,40 +2605,47 @@ RSpec.describe User do
user.reload
expect(user.uploaded_avatar_id).to eq(nil)
end
-
end
- describe '#match_primary_group_changes' do
- let(:group_a) { Fabricate(:group, title: 'A', users: [user]) }
- let(:group_b) { Fabricate(:group, title: 'B', users: [user]) }
+ describe "#match_primary_group_changes" do
+ let(:group_a) { Fabricate(:group, title: "A", users: [user]) }
+ let(:group_b) { Fabricate(:group, title: "B", users: [user]) }
it "updates user's title only when it is blank or matches the previous primary group" do
- expect { user.update(primary_group: group_a) }.to change { user.reload.title }.from(nil).to('A')
- expect { user.update(primary_group: group_b) }.to change { user.reload.title }.from('A').to('B')
+ expect { user.update(primary_group: group_a) }.to change { user.reload.title }.from(nil).to(
+ "A",
+ )
+ expect { user.update(primary_group: group_b) }.to change { user.reload.title }.from("A").to(
+ "B",
+ )
- user.update(title: 'Different')
+ user.update(title: "Different")
expect { user.update(primary_group: group_a) }.to_not change { user.reload.title }
end
it "updates user's title only when it is blank or matches the previous primary group" do
- expect { user.update(primary_group: group_a) }.to change { user.reload.flair_group }.from(nil).to(group_a)
- expect { user.update(primary_group: group_b) }.to change { user.reload.flair_group }.from(group_a).to(group_b)
+ expect { user.update(primary_group: group_a) }.to change { user.reload.flair_group }.from(
+ nil,
+ ).to(group_a)
+ expect { user.update(primary_group: group_b) }.to change { user.reload.flair_group }.from(
+ group_a,
+ ).to(group_b)
user.update(flair_group: group_a)
expect { user.update(primary_group: group_a) }.to_not change { user.reload.flair_group }
end
end
- describe '#title=' do
- fab!(:badge) { Fabricate(:badge, name: 'Badge', allow_title: false) }
+ describe "#title=" do
+ fab!(:badge) { Fabricate(:badge, name: "Badge", allow_title: false) }
- it 'sets badge_granted_title correctly' do
+ it "sets badge_granted_title correctly" do
BadgeGranter.grant(badge, user)
user.update!(title: badge.name)
expect(user.user_profile.reload.badge_granted_title).to eq(false)
- user.update!(title: 'Custom')
+ user.update!(title: "Custom")
expect(user.user_profile.reload.badge_granted_title).to eq(false)
badge.update!(allow_title: true)
@@ -2498,14 +2659,14 @@ RSpec.describe User do
expect(user.user_profile.granted_title_badge_id).to eq(nil)
end
- context 'when a custom badge name has been set and it matches the title' do
- let(:customized_badge_name) { 'Merit Badge' }
+ context "when a custom badge name has been set and it matches the title" do
+ let(:customized_badge_name) { "Merit Badge" }
before do
TranslationOverride.upsert!(I18n.locale, Badge.i18n_key(badge.name), customized_badge_name)
end
- it 'sets badge_granted_title correctly' do
+ it "sets badge_granted_title correctly" do
BadgeGranter.grant(badge, user)
badge.update!(allow_title: true)
@@ -2514,29 +2675,27 @@ RSpec.describe User do
expect(user.user_profile.reload.granted_title_badge_id).to eq(badge.id)
end
- after do
- TranslationOverride.revert!(I18n.locale, Badge.i18n_key(badge.name))
- end
+ after { TranslationOverride.revert!(I18n.locale, Badge.i18n_key(badge.name)) }
end
end
- describe '#next_best_title' do
- fab!(:group_a) { Fabricate(:group, title: 'Group A') }
- fab!(:group_b) { Fabricate(:group, title: 'Group B') }
- fab!(:group_c) { Fabricate(:group, title: 'Group C') }
- fab!(:badge) { Fabricate(:badge, name: 'Badge', allow_title: true) }
+ describe "#next_best_title" do
+ fab!(:group_a) { Fabricate(:group, title: "Group A") }
+ fab!(:group_b) { Fabricate(:group, title: "Group B") }
+ fab!(:group_c) { Fabricate(:group, title: "Group C") }
+ fab!(:badge) { Fabricate(:badge, name: "Badge", allow_title: true) }
- it 'only includes groups with title' do
+ it "only includes groups with title" do
group_a.add(user)
- expect(user.next_best_title).to eq('Group A')
+ expect(user.next_best_title).to eq("Group A")
group_a.update!(title: nil)
expect(user.next_best_title).to eq(nil)
end
- it 'only includes badges that allow to be set as title' do
+ it "only includes badges that allow to be set as title" do
BadgeGranter.grant(badge, user)
- expect(user.next_best_title).to eq('Badge')
+ expect(user.next_best_title).to eq("Badge")
badge.update!(allow_title: false)
expect(user.next_best_title).to eq(nil)
@@ -2551,69 +2710,75 @@ RSpec.describe User do
group_a.update!(primary_group: true)
group_b.update!(primary_group: true)
user.update!(primary_group_id: group_a.id)
- expect(user.next_best_title).to eq('Group A')
+ expect(user.next_best_title).to eq("Group A")
user.update!(primary_group_id: group_b.id)
- expect(user.next_best_title).to eq('Group B')
+ expect(user.next_best_title).to eq("Group B")
group_b.remove(user)
- expect(user.next_best_title).to eq('Group A')
+ expect(user.next_best_title).to eq("Group A")
group_a.remove(user)
- expect(user.next_best_title).to eq('Group C')
+ expect(user.next_best_title).to eq("Group C")
group_c.remove(user)
- expect(user.next_best_title).to eq('Badge')
+ expect(user.next_best_title).to eq("Badge")
BadgeGranter.revoke(UserBadge.find_by(user_id: user.id, badge_id: badge.id))
expect(user.next_best_title).to eq(nil)
end
end
- describe 'check_site_contact_username' do
+ describe "check_site_contact_username" do
before { SiteSetting.site_contact_username = contact_user.username }
- context 'when admin' do
+ context "when admin" do
let(:contact_user) { Fabricate(:admin) }
- it 'clears site_contact_username site setting when admin privilege is revoked' do
+ it "clears site_contact_username site setting when admin privilege is revoked" do
contact_user.revoke_admin!
- expect(SiteSetting.site_contact_username).to eq(SiteSetting.defaults[:site_contact_username])
+ expect(SiteSetting.site_contact_username).to eq(
+ SiteSetting.defaults[:site_contact_username],
+ )
end
end
- context 'when moderator' do
+ context "when moderator" do
let(:contact_user) { Fabricate(:moderator) }
- it 'clears site_contact_username site setting when moderator privilege is revoked' do
+ it "clears site_contact_username site setting when moderator privilege is revoked" do
contact_user.revoke_moderation!
- expect(SiteSetting.site_contact_username).to eq(SiteSetting.defaults[:site_contact_username])
+ expect(SiteSetting.site_contact_username).to eq(
+ SiteSetting.defaults[:site_contact_username],
+ )
end
end
- context 'when admin and moderator' do
+ context "when admin and moderator" do
let(:contact_user) { Fabricate(:moderator, admin: true) }
- it 'does not change site_contact_username site setting when admin privilege is revoked' do
+ it "does not change site_contact_username site setting when admin privilege is revoked" do
contact_user.revoke_admin!
expect(SiteSetting.site_contact_username).to eq(contact_user.username)
end
- it 'does not change site_contact_username site setting when moderator privilege is revoked' do
+ it "does not change site_contact_username site setting when moderator privilege is revoked" do
contact_user.revoke_moderation!
expect(SiteSetting.site_contact_username).to eq(contact_user.username)
end
- it 'clears site_contact_username site setting when staff privileges are revoked' do
+ it "clears site_contact_username site setting when staff privileges are revoked" do
contact_user.revoke_admin!
contact_user.revoke_moderation!
- expect(SiteSetting.site_contact_username).to eq(SiteSetting.defaults[:site_contact_username])
+ expect(SiteSetting.site_contact_username).to eq(
+ SiteSetting.defaults[:site_contact_username],
+ )
end
end
end
describe "#destroy!" do
- it 'clears up associated data on destroy!' do
+ it "clears up associated data on destroy!" do
user = Fabricate(:user)
post = Fabricate(:post)
@@ -2661,9 +2826,9 @@ RSpec.describe User do
it "normalizes username before executing query" do
expect(User.username_exists?(user.username)).to eq(true)
expect(User.username_exists?("Lo\u0308we")).to eq(true) # NFD
- expect(User.username_exists?("L\u00F6we")).to eq(true) # NFC
+ expect(User.username_exists?("L\u00F6we")).to eq(true) # NFC
expect(User.username_exists?("LO\u0308WE")).to eq(true) # NFD
- expect(User.username_exists?("l\u00D6wE")).to eq(true) # NFC
+ expect(User.username_exists?("l\u00D6wE")).to eq(true) # NFC
expect(User.username_exists?("foo")).to eq(false)
end
end
@@ -2673,17 +2838,25 @@ RSpec.describe User do
before { SiteSetting.external_system_avatars_enabled = true }
it "uses the normalized username" do
- expect(User.system_avatar_template("Lo\u0308we")).to match(%r|/letter_avatar_proxy/v\d/letter/l/71e660/{size}.png|)
- expect(User.system_avatar_template("L\u00F6wE")).to match(%r|/letter_avatar_proxy/v\d/letter/l/71e660/{size}.png|)
+ expect(User.system_avatar_template("Lo\u0308we")).to match(
+ %r|/letter_avatar_proxy/v\d/letter/l/71e660/{size}.png|,
+ )
+ expect(User.system_avatar_template("L\u00F6wE")).to match(
+ %r|/letter_avatar_proxy/v\d/letter/l/71e660/{size}.png|,
+ )
end
it "uses the first grapheme cluster and URL encodes it" do
- expect(User.system_avatar_template("बहुत")).to match(%r|/letter_avatar_proxy/v\d/letter/%E0%A4%AC/ea5d25/{size}.png|)
+ expect(User.system_avatar_template("बहुत")).to match(
+ %r|/letter_avatar_proxy/v\d/letter/%E0%A4%AC/ea5d25/{size}.png|,
+ )
end
it "substitutes {username} with the URL encoded username" do
SiteSetting.external_system_avatars_url = "https://{hostname}/{username}.png"
- expect(User.system_avatar_template("बहुत")).to eq("https://#{Discourse.current_hostname}/%E0%A4%AC%E0%A4%B9%E0%A5%81%E0%A4%A4.png")
+ expect(User.system_avatar_template("बहुत")).to eq(
+ "https://#{Discourse.current_hostname}/%E0%A4%AC%E0%A4%B9%E0%A5%81%E0%A4%A4.png",
+ )
end
end
end
@@ -2692,8 +2865,10 @@ RSpec.describe User do
describe "Second-factor authenticators" do
describe "#totps" do
it "only includes enabled totp 2FA" do
- enabled_totp_2fa = Fabricate(:user_second_factor_totp, user: user, name: 'Enabled TOTP', enabled: true)
- disabled_totp_2fa = Fabricate(:user_second_factor_totp, user: user, name: 'Disabled TOTP', enabled: false)
+ enabled_totp_2fa =
+ Fabricate(:user_second_factor_totp, user: user, name: "Enabled TOTP", enabled: true)
+ disabled_totp_2fa =
+ Fabricate(:user_second_factor_totp, user: user, name: "Disabled TOTP", enabled: false)
expect(user.totps.map(&:id)).to eq([enabled_totp_2fa.id])
end
@@ -2701,29 +2876,39 @@ RSpec.describe User do
describe "#security_keys" do
it "only includes enabled security_key 2FA" do
- enabled_security_key_2fa = Fabricate(:user_security_key_with_random_credential, user: user, name: 'Enabled YubiKey', enabled: true)
- disabled_security_key_2fa = Fabricate(:user_security_key_with_random_credential, user: user, name: 'Disabled YubiKey', enabled: false)
+ enabled_security_key_2fa =
+ Fabricate(
+ :user_security_key_with_random_credential,
+ user: user,
+ name: "Enabled YubiKey",
+ enabled: true,
+ )
+ disabled_security_key_2fa =
+ Fabricate(
+ :user_security_key_with_random_credential,
+ user: user,
+ name: "Disabled YubiKey",
+ enabled: false,
+ )
expect(user.security_keys.map(&:id)).to eq([enabled_security_key_2fa.id])
end
end
end
- describe 'Secure identifier for a user which is a string other than the ID used to identify the user in some cases e.g. security keys' do
- describe '#create_or_fetch_secure_identifier' do
- context 'if the user already has a secure identifier' do
+ describe "Secure identifier for a user which is a string other than the ID used to identify the user in some cases e.g. security keys" do
+ describe "#create_or_fetch_secure_identifier" do
+ context "if the user already has a secure identifier" do
let(:sec_ident) { SecureRandom.hex(20) }
- before do
- user.update(secure_identifier: sec_ident)
- end
+ before { user.update(secure_identifier: sec_ident) }
- it 'returns the identifier' do
+ it "returns the identifier" do
expect(user.create_or_fetch_secure_identifier).to eq(sec_ident)
end
end
- context 'if the user already does not have a secure identifier' do
- it 'creates one' do
+ context "if the user already does not have a secure identifier" do
+ it "creates one" do
expect(user.secure_identifier).to eq(nil)
user.create_or_fetch_secure_identifier
expect(user.reload.secure_identifier).not_to eq(nil)
@@ -2732,42 +2917,40 @@ RSpec.describe User do
end
end
- describe 'Granting admin or moderator status' do
- context 'when granting admin status' do
- context 'when there is a reviewable' do
+ describe "Granting admin or moderator status" do
+ context "when granting admin status" do
+ context "when there is a reviewable" do
fab!(:user) { Fabricate(:reviewable_user) }
- context 'when the user isn’t approved yet' do
- it 'approves the associated reviewable' do
+ context "when the user isn’t approved yet" do
+ it "approves the associated reviewable" do
expect { user.target.grant_admin! }.to change { user.reload.dup }.to be_approved
end
end
context "when the user is already approved" do
- before do
- user.perform(Discourse.system_user, :approve_user)
- end
+ before { user.perform(Discourse.system_user, :approve_user) }
- it 'does nothing' do
+ it "does nothing" do
expect { user.target.grant_admin! }.not_to change { user.reload.approved? }
end
end
end
- context 'when there is no reviewable' do
+ context "when there is no reviewable" do
let(:user) { Fabricate(:user, approved: false) }
- it 'approves the user' do
+ it "approves the user" do
expect { user.grant_admin! }.to change { user.reload.approved }.to true
end
end
end
- context 'when granting moderator status' do
- context 'when there is a reviewable' do
+ context "when granting moderator status" do
+ context "when there is a reviewable" do
let(:user) { Fabricate(:reviewable_user) }
- it 'approves the associated reviewable' do
+ it "approves the associated reviewable" do
expect { user.target.grant_moderation! }.to change { user.reload.dup }.to be_approved
end
end
@@ -2779,11 +2962,41 @@ RSpec.describe User do
fab!(:user2) { Fabricate(:user) }
before_all do
- UserVisit.create(user_id: user.id, visited_at: 1.minute.ago, posts_read: 1, mobile: false, time_read: 10)
- UserVisit.create(user_id: user.id, visited_at: 2.days.ago, posts_read: 1, mobile: false, time_read: 20)
- UserVisit.create(user_id: user.id, visited_at: 1.week.ago, posts_read: 1, mobile: false, time_read: 30)
- UserVisit.create(user_id: user.id, visited_at: 1.year.ago, posts_read: 1, mobile: false, time_read: 40) # Old, should be ignored
- UserVisit.create(user_id: user2.id, visited_at: 1.minute.ago, posts_read: 1, mobile: false, time_read: 50)
+ UserVisit.create(
+ user_id: user.id,
+ visited_at: 1.minute.ago,
+ posts_read: 1,
+ mobile: false,
+ time_read: 10,
+ )
+ UserVisit.create(
+ user_id: user.id,
+ visited_at: 2.days.ago,
+ posts_read: 1,
+ mobile: false,
+ time_read: 20,
+ )
+ UserVisit.create(
+ user_id: user.id,
+ visited_at: 1.week.ago,
+ posts_read: 1,
+ mobile: false,
+ time_read: 30,
+ )
+ UserVisit.create(
+ user_id: user.id,
+ visited_at: 1.year.ago,
+ posts_read: 1,
+ mobile: false,
+ time_read: 40,
+ ) # Old, should be ignored
+ UserVisit.create(
+ user_id: user2.id,
+ visited_at: 1.minute.ago,
+ posts_read: 1,
+ mobile: false,
+ time_read: 50,
+ )
end
it "calculates correctly" do
@@ -2821,70 +3034,76 @@ RSpec.describe User do
end
end
- describe '#update_ip_address!' do
- it 'updates ip_address correctly' do
- expect do
- user.update_ip_address!('127.0.0.1')
- end.to change { user.reload.ip_address.to_s }.to('127.0.0.1')
+ describe "#update_ip_address!" do
+ it "updates ip_address correctly" do
+ expect do user.update_ip_address!("127.0.0.1") end.to change {
+ user.reload.ip_address.to_s
+ }.to("127.0.0.1")
- expect do
- user.update_ip_address!('127.0.0.1')
- end.to_not change { user.reload.ip_address }
+ expect do user.update_ip_address!("127.0.0.1") end.to_not change { user.reload.ip_address }
end
- describe 'keeping old ip address' do
- before do
- SiteSetting.keep_old_ip_address_count = 2
- end
+ describe "keeping old ip address" do
+ before { SiteSetting.keep_old_ip_address_count = 2 }
- it 'tracks old user record correctly' do
- expect do
- user.update_ip_address!('127.0.0.1')
- end.to change { UserIpAddressHistory.where(user_id: user.id).count }.by(1)
+ it "tracks old user record correctly" do
+ expect do user.update_ip_address!("127.0.0.1") end.to change {
+ UserIpAddressHistory.where(user_id: user.id).count
+ }.by(1)
freeze_time 10.minutes.from_now
- expect do
- user.update_ip_address!('0.0.0.0')
- end.to change { UserIpAddressHistory.where(user_id: user.id).count }.by(1)
+ expect do user.update_ip_address!("0.0.0.0") end.to change {
+ UserIpAddressHistory.where(user_id: user.id).count
+ }.by(1)
freeze_time 11.minutes.from_now
- expect do
- user.update_ip_address!('127.0.0.1')
- end.to_not change { UserIpAddressHistory.where(user_id: user.id).count }
+ expect do user.update_ip_address!("127.0.0.1") end.to_not change {
+ UserIpAddressHistory.where(user_id: user.id).count
+ }
- expect(UserIpAddressHistory.find_by(
- user_id: user.id, ip_address: '127.0.0.1'
- ).updated_at).to eq_time(Time.zone.now)
+ expect(
+ UserIpAddressHistory.find_by(user_id: user.id, ip_address: "127.0.0.1").updated_at,
+ ).to eq_time(Time.zone.now)
freeze_time 12.minutes.from_now
- expect do
- user.update_ip_address!('0.0.0.1')
- end.not_to change { UserIpAddressHistory.where(user_id: user.id).count }
+ expect do user.update_ip_address!("0.0.0.1") end.not_to change {
+ UserIpAddressHistory.where(user_id: user.id).count
+ }
- expect(
- UserIpAddressHistory.where(user_id: user.id).pluck(:ip_address).map(&:to_s)
- ).to eq(['127.0.0.1', '0.0.0.1'])
+ expect(UserIpAddressHistory.where(user_id: user.id).pluck(:ip_address).map(&:to_s)).to eq(
+ %w[127.0.0.1 0.0.0.1],
+ )
end
end
end
describe "#do_not_disturb?" do
it "is true when a dnd timing is present for the current time" do
- Fabricate(:do_not_disturb_timing, user: user, starts_at: Time.zone.now, ends_at: 1.day.from_now)
+ Fabricate(
+ :do_not_disturb_timing,
+ user: user,
+ starts_at: Time.zone.now,
+ ends_at: 1.day.from_now,
+ )
expect(user.do_not_disturb?).to eq(true)
end
it "is false when no dnd timing is present for the current time" do
- Fabricate(:do_not_disturb_timing, user: user, starts_at: Time.zone.now - 2.day, ends_at: 1.minute.ago)
+ Fabricate(
+ :do_not_disturb_timing,
+ user: user,
+ starts_at: Time.zone.now - 2.day,
+ ends_at: 1.minute.ago,
+ )
expect(user.do_not_disturb?).to eq(false)
end
end
describe "#invited_by" do
- it 'returns even if invites was trashed' do
+ it "returns even if invites was trashed" do
invite = Fabricate(:invite, invited_by: Fabricate(:user))
Fabricate(:invited_user, invite: invite, user: user)
invite.trash!
@@ -2897,7 +3116,7 @@ RSpec.describe User do
[
["returns true for equal usernames", "john", "john", true],
["returns false for different usernames", "john", "bill", false],
- ["considers usernames that are different only in case as equal", "john", "JoHN", true]
+ ["considers usernames that are different only in case as equal", "john", "JoHN", true],
].each do |testcase_name, current_username, another_username, is_equal|
it "#{testcase_name}" do
user = Fabricate(:user, username: current_username)
@@ -2922,19 +3141,19 @@ RSpec.describe User do
describe "#whisperer?" do
fab!(:group) { Fabricate(:group) }
- it 'returns true for an admin user' do
+ it "returns true for an admin user" do
SiteSetting.whispers_allowed_groups = "#{group.id}"
admin = Fabricate.create(:admin)
expect(admin.whisperer?).to eq(true)
end
- it 'returns false for an admin user when whispers are not enabled' do
+ it "returns false for an admin user when whispers are not enabled" do
admin = Fabricate.create(:admin)
expect(admin.whisperer?).to eq(false)
end
- it 'returns true for user belonging to whisperers groups' do
+ it "returns true for user belonging to whisperers groups" do
whisperer = Fabricate(:user)
user = Fabricate(:user)
SiteSetting.whispers_allowed_groups = "#{group.id}"
@@ -2948,7 +3167,7 @@ RSpec.describe User do
expect(user.whisperer?).to eq(false)
end
- it 'returns false if no whispers groups exist' do
+ it "returns false if no whispers groups exist" do
expect(subject.whisperer?).to eq(false)
end
end
@@ -2960,11 +3179,22 @@ RSpec.describe User do
Fabricate(:notification, user: user, notification_type: 1, high_priority: false, read: true)
Fabricate(:notification, user: user, notification_type: 1, high_priority: false, read: false)
- Fabricate(:notification, user: user, notification_type: 2, high_priority: true, read: false, topic: nil)
+ Fabricate(
+ :notification,
+ user: user,
+ notification_type: 2,
+ high_priority: true,
+ read: false,
+ topic: nil,
+ )
- Fabricate(:notification, user: user, notification_type: 3, high_priority: true, read: false).tap do |n|
- n.topic.trash!(Fabricate(:admin))
- end
+ Fabricate(
+ :notification,
+ user: user,
+ notification_type: 3,
+ high_priority: true,
+ read: false,
+ ).tap { |n| n.topic.trash!(Fabricate(:admin)) }
Fabricate(:notification, user: user, notification_type: 3, high_priority: false, read: true)
@@ -3012,18 +3242,9 @@ RSpec.describe User do
it "picks the reviewable of the largest id" do
user.update!(admin: true)
- Fabricate(
- :reviewable,
- created_at: 3.minutes.ago,
- updated_at: 3.minutes.ago,
- score: 100
- )
- reviewable2 = Fabricate(
- :reviewable,
- created_at: 30.minutes.ago,
- updated_at: 30.minutes.ago,
- score: 10
- )
+ Fabricate(:reviewable, created_at: 3.minutes.ago, updated_at: 3.minutes.ago, score: 100)
+ reviewable2 =
+ Fabricate(:reviewable, created_at: 30.minutes.ago, updated_at: 30.minutes.ago, score: 10)
user.bump_last_seen_reviewable!
expect(user.last_seen_reviewable_id).to eq(reviewable2.id)
end
@@ -3044,7 +3265,8 @@ RSpec.describe User do
user.update!(groups: [group])
SiteSetting.enable_category_group_moderation = true
- group_reviewable = Fabricate(:reviewable, reviewable_by_moderator: false, reviewable_by_group: group)
+ group_reviewable =
+ Fabricate(:reviewable, reviewable_by_moderator: false, reviewable_by_group: group)
mod_reviewable = Fabricate(:reviewable, reviewable_by_moderator: true)
admin_reviewable = Fabricate(:reviewable, reviewable_by_moderator: false)
@@ -3058,14 +3280,15 @@ RSpec.describe User do
it "publishes a message to the user's /reviewable_counts message bus channel" do
user.update!(admin: true)
Fabricate(:reviewable)
- messages = MessageBus.track_publish do
- user.bump_last_seen_reviewable!
- end
+ messages = MessageBus.track_publish { user.bump_last_seen_reviewable! }
expect(messages.size).to eq(1)
expect(messages.first).to have_attributes(
channel: "/reviewable_counts/#{user.id}",
user_ids: [user.id],
- data: { unseen_reviewable_count: 0, reviewable_count: 1 }
+ data: {
+ unseen_reviewable_count: 0,
+ reviewable_count: 1,
+ },
)
end
end
@@ -3088,15 +3311,21 @@ RSpec.describe User do
end
end
- describe '#visible_sidebar_tags' do
+ describe "#visible_sidebar_tags" do
fab!(:user) { Fabricate(:user) }
fab!(:tag) { Fabricate(:tag) }
fab!(:hidden_tag) { Fabricate(:tag, name: "secret") }
- fab!(:staff_tag_group) { Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: ["secret"]) }
- fab!(:tag_sidebar_section_link) { Fabricate(:tag_sidebar_section_link, user: user, linkable: tag) }
- fab!(:tag_sidebar_section_link_2) { Fabricate(:tag_sidebar_section_link, user: user, linkable: hidden_tag) }
+ fab!(:staff_tag_group) do
+ Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: ["secret"])
+ end
+ fab!(:tag_sidebar_section_link) do
+ Fabricate(:tag_sidebar_section_link, user: user, linkable: tag)
+ end
+ fab!(:tag_sidebar_section_link_2) do
+ Fabricate(:tag_sidebar_section_link, user: user, linkable: hidden_tag)
+ end
- it 'should only return tag sidebar section link records of tags that the user is allowed to see' do
+ it "should only return tag sidebar section link records of tags that the user is allowed to see" do
expect(user.visible_sidebar_tags).to contain_exactly(tag)
user.update!(admin: true)
@@ -3105,35 +3334,36 @@ RSpec.describe User do
end
end
- describe '#secure_category_ids' do
+ describe "#secure_category_ids" do
fab!(:admin) { Fabricate(:admin) }
fab!(:group) { Fabricate(:group) }
fab!(:private_category) { Fabricate(:private_category, group: group) }
- it 'allows admin to see all secure categories' do
+ it "allows admin to see all secure categories" do
expect(admin.secure_category_ids).to include(private_category.id)
end
- context 'when SiteSetting.suppress_secured_categories_from_admin is true' do
- it 'hides secure categories from admins' do
+ context "when SiteSetting.suppress_secured_categories_from_admin is true" do
+ it "hides secure categories from admins" do
SiteSetting.suppress_secured_categories_from_admin = true
expect(admin.secure_category_ids).not_to include(private_category.id)
end
end
end
- describe '#new_personal_messages_notifications_count' do
+ describe "#new_personal_messages_notifications_count" do
it "returns count of new and unread private_message notifications of the user" do
another_user = Fabricate(:user)
Fabricate(:notification, user: user, read: false)
- last_seen_id = Fabricate(
- :notification,
- user: user,
- read: false,
- notification_type: Notification.types[:private_message]
- ).id
+ last_seen_id =
+ Fabricate(
+ :notification,
+ user: user,
+ read: false,
+ notification_type: Notification.types[:private_message],
+ ).id
expect(user.new_personal_messages_notifications_count).to eq(1)
@@ -3141,28 +3371,28 @@ RSpec.describe User do
:notification,
user: user,
read: false,
- notification_type: Notification.types[:private_message]
+ notification_type: Notification.types[:private_message],
)
Fabricate(
:notification,
user: another_user,
read: false,
- notification_type: Notification.types[:private_message]
+ notification_type: Notification.types[:private_message],
)
Fabricate(
:notification,
user: user,
read: true,
- notification_type: Notification.types[:private_message]
+ notification_type: Notification.types[:private_message],
)
Fabricate(
:notification,
user: user,
read: false,
- notification_type: Notification.types[:replied]
+ notification_type: Notification.types[:replied],
)
user.update!(seen_notification_id: last_seen_id)
diff --git a/spec/models/user_stat_spec.rb b/spec/models/user_stat_spec.rb
index 2c7ae6f2ccb..c879d301031 100644
--- a/spec/models/user_stat_spec.rb
+++ b/spec/models/user_stat_spec.rb
@@ -9,24 +9,25 @@ RSpec.describe UserStat do
expect(user.user_stat.new_since).to be_present
end
- describe '#update_view_counts' do
+ describe "#update_view_counts" do
let(:user) { Fabricate(:user) }
let(:stat) { user.user_stat }
- context 'with topics_entered' do
- context 'without any views' do
+ context "with topics_entered" do
+ context "without any views" do
it "doesn't increase the user's topics_entered" do
- expect { UserStat.update_view_counts; stat.reload }.not_to change(stat, :topics_entered)
+ expect {
+ UserStat.update_view_counts
+ stat.reload
+ }.not_to change(stat, :topics_entered)
end
end
- context 'with a view' do
+ context "with a view" do
fab!(:topic) { Fabricate(:topic) }
- let!(:view) { TopicViewItem.add(topic.id, '127.0.0.1', user.id) }
+ let!(:view) { TopicViewItem.add(topic.id, "127.0.0.1", user.id) }
- before do
- user.update_column :last_seen_at, 1.second.ago
- end
+ before { user.update_column :last_seen_at, 1.second.ago }
it "adds one to the topics entered" do
UserStat.update_view_counts
@@ -35,7 +36,7 @@ RSpec.describe UserStat do
end
it "won't record a second view as a different topic" do
- TopicViewItem.add(topic.id, '127.0.0.1', user.id)
+ TopicViewItem.add(topic.id, "127.0.0.1", user.id)
UserStat.update_view_counts
stat.reload
expect(stat.topics_entered).to eq(1)
@@ -43,22 +44,28 @@ RSpec.describe UserStat do
end
end
- context 'with posts_read_count' do
- context 'without any post timings' do
+ context "with posts_read_count" do
+ context "without any post timings" do
it "doesn't increase the user's posts_read_count" do
- expect { UserStat.update_view_counts; stat.reload }.not_to change(stat, :posts_read_count)
+ expect {
+ UserStat.update_view_counts
+ stat.reload
+ }.not_to change(stat, :posts_read_count)
end
end
- context 'with a post timing' do
+ context "with a post timing" do
let!(:post) { Fabricate(:post) }
let!(:post_timings) do
- PostTiming.record_timing(msecs: 1234, topic_id: post.topic_id, user_id: user.id, post_number: post.post_number)
+ PostTiming.record_timing(
+ msecs: 1234,
+ topic_id: post.topic_id,
+ user_id: user.id,
+ post_number: post.post_number,
+ )
end
- before do
- user.update_column :last_seen_at, 1.second.ago
- end
+ before { user.update_column :last_seen_at, 1.second.ago }
it "increases posts_read_count" do
UserStat.update_view_counts
@@ -69,8 +76,8 @@ RSpec.describe UserStat do
end
end
- describe 'ensure consistency!' do
- it 'can update first unread' do
+ describe "ensure consistency!" do
+ it "can update first unread" do
post = create_post
freeze_time 10.minutes.from_now
@@ -84,7 +91,7 @@ RSpec.describe UserStat do
expect(post.user.user_stat.first_unread_at).to eq_time(Time.zone.now)
end
- it 'updates first unread pm timestamp correctly' do
+ it "updates first unread pm timestamp correctly" do
freeze_time
user = Fabricate(:user, last_seen_at: Time.zone.now)
@@ -92,21 +99,27 @@ RSpec.describe UserStat do
pm_topic = Fabricate(:private_message_topic, user: user, recipient: user_2)
create_post(user: user, topic_id: pm_topic.id)
- TopicUser.change(user.id, pm_topic.id,
- notification_level: TopicUser.notification_levels[:tracking]
+ TopicUser.change(
+ user.id,
+ pm_topic.id,
+ notification_level: TopicUser.notification_levels[:tracking],
)
# user that is not tracking PM topic
- TopicUser.change(user_2.id, pm_topic.id,
- notification_level: TopicUser.notification_levels[:regular]
+ TopicUser.change(
+ user_2.id,
+ pm_topic.id,
+ notification_level: TopicUser.notification_levels[:regular],
)
# User that has not been seen recently
user_3 = Fabricate(:user, last_seen_at: 1.year.ago)
pm_topic.allowed_users << user_3
- TopicUser.change(user_3.id, pm_topic.id,
- notification_level: TopicUser.notification_levels[:tracking]
+ TopicUser.change(
+ user_3.id,
+ pm_topic.id,
+ notification_level: TopicUser.notification_levels[:tracking],
)
user_3_orig_first_unread_pm_at = user_3.user_stat.first_unread_pm_at
@@ -121,13 +134,17 @@ RSpec.describe UserStat do
pm_topic_2 = Fabricate(:private_message_topic, user: user_5, recipient: user_6)
create_post(user: user_5, topic_id: pm_topic_2.id)
- TopicUser.change(user_5.id, pm_topic_2.id,
- notification_level: TopicUser.notification_levels[:tracking]
+ TopicUser.change(
+ user_5.id,
+ pm_topic_2.id,
+ notification_level: TopicUser.notification_levels[:tracking],
)
# User out of last seen limit
- TopicUser.change(user_6.id, pm_topic_2.id,
- notification_level: TopicUser.notification_levels[:tracking]
+ TopicUser.change(
+ user_6.id,
+ pm_topic_2.id,
+ notification_level: TopicUser.notification_levels[:tracking],
)
create_post(user: user_6, topic_id: pm_topic_2.id)
@@ -143,20 +160,26 @@ RSpec.describe UserStat do
end
# User affected
- expect(user.user_stat.reload.first_unread_pm_at).to be_within(1.seconds).of(pm_topic.reload.updated_at)
- expect(user_2.user_stat.reload.first_unread_pm_at).to be_within(1.seconds).of(UserStat::UPDATE_UNREAD_MINUTES_AGO.minutes.ago)
+ expect(user.user_stat.reload.first_unread_pm_at).to be_within(1.seconds).of(
+ pm_topic.reload.updated_at,
+ )
+ expect(user_2.user_stat.reload.first_unread_pm_at).to be_within(1.seconds).of(
+ UserStat::UPDATE_UNREAD_MINUTES_AGO.minutes.ago,
+ )
expect(user_3.user_stat.reload.first_unread_pm_at).to eq_time(user_3_orig_first_unread_pm_at)
- expect(user_4.user_stat.reload.first_unread_pm_at).to be_within(1.seconds).of(UserStat::UPDATE_UNREAD_MINUTES_AGO.minutes.ago)
+ expect(user_4.user_stat.reload.first_unread_pm_at).to be_within(1.seconds).of(
+ UserStat::UPDATE_UNREAD_MINUTES_AGO.minutes.ago,
+ )
expect(user_5.user_stat.reload.first_unread_pm_at).to eq_time(pm_topic_2.reload.updated_at)
expect(user_6.user_stat.reload.first_unread_pm_at).to eq_time(user_6_orig_first_unread_pm_at)
end
end
- describe 'update_time_read!' do
+ describe "update_time_read!" do
fab!(:user) { Fabricate(:user) }
let(:stat) { user.user_stat }
- it 'always expires redis key' do
+ it "always expires redis key" do
# this tests implementation which is not 100% ideal
# that said, redis key leaks are not good
stat.update_time_read!
@@ -165,14 +188,14 @@ RSpec.describe UserStat do
expect(ttl).to be <= UserStat::MAX_TIME_READ_DIFF
end
- it 'makes no changes if nothing is cached' do
+ it "makes no changes if nothing is cached" do
Discourse.redis.del(UserStat.last_seen_key(user.id))
stat.update_time_read!
stat.reload
expect(stat.time_read).to eq(0)
end
- it 'makes a change if time read is below threshold' do
+ it "makes a change if time read is below threshold" do
freeze_time
UserStat.cache_last_seen(user.id, (Time.now - 10).to_f)
stat.update_time_read!
@@ -180,7 +203,7 @@ RSpec.describe UserStat do
expect(stat.time_read).to eq(10)
end
- it 'makes no change if time read is above threshold' do
+ it "makes no change if time read is above threshold" do
freeze_time
t = Time.now - 1 - UserStat::MAX_TIME_READ_DIFF
@@ -190,10 +213,9 @@ RSpec.describe UserStat do
stat.reload
expect(stat.time_read).to eq(0)
end
-
end
- describe 'update_distinct_badge_count' do
+ describe "update_distinct_badge_count" do
fab!(:user) { Fabricate(:user) }
let(:stat) { user.user_stat }
fab!(:badge1) { Fabricate(:badge) }
@@ -242,13 +264,12 @@ RSpec.describe UserStat do
badge2.update(enabled: true)
expect(stat.reload.distinct_badge_count).to eq(2)
end
-
end
- describe '.update_draft_count' do
+ describe ".update_draft_count" do
fab!(:user) { Fabricate(:user) }
- it 'updates draft_count' do
+ it "updates draft_count" do
Draft.create!(user: user, draft_key: "topic_1", data: {})
Draft.create!(user: user, draft_key: "new_topic", data: {})
Draft.create!(user: user, draft_key: "topic_2", data: {})
@@ -275,9 +296,12 @@ RSpec.describe UserStat do
end
it "publishes a message to clients" do
- MessageBus.expects(:publish).with("/u/#{user.username_lower}/counters",
- { pending_posts_count: 1 },
- user_ids: [user.id], group_ids: [Group::AUTO_GROUPS[:staff]])
+ MessageBus.expects(:publish).with(
+ "/u/#{user.username_lower}/counters",
+ { pending_posts_count: 1 },
+ user_ids: [user.id],
+ group_ids: [Group::AUTO_GROUPS[:staff]],
+ )
update_pending_posts
end
end
diff --git a/spec/models/user_status_spec.rb b/spec/models/user_status_spec.rb
index 0b239784052..70adace5513 100644
--- a/spec/models/user_status_spec.rb
+++ b/spec/models/user_status_spec.rb
@@ -4,7 +4,7 @@ RSpec.describe UserStatus do
fab!(:user) { Fabricate(:user) }
describe "validations" do
- it 'is invalid when ends_at is before set_at' do
+ it "is invalid when ends_at is before set_at" do
freeze_time
user_status = UserStatus.new(user: user, set_at: Time.zone.now, ends_at: 1.hour.ago)
user_status.valid?
diff --git a/spec/models/user_summary_spec.rb b/spec/models/user_summary_spec.rb
index 2da1de64a39..128a801b4aa 100644
--- a/spec/models/user_summary_spec.rb
+++ b/spec/models/user_summary_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
RSpec.describe UserSummary do
-
it "produces secure summaries" do
topic = create_post.topic
user = topic.user
diff --git a/spec/models/user_visit_spec.rb b/spec/models/user_visit_spec.rb
index 313231a7db9..27326020a5b 100644
--- a/spec/models/user_visit_spec.rb
+++ b/spec/models/user_visit_spec.rb
@@ -4,7 +4,7 @@ RSpec.describe UserVisit do
fab!(:user) { Fabricate(:user) }
fab!(:other_user) { Fabricate(:user) }
- it 'can ensure consistency' do
+ it "can ensure consistency" do
user.update_visit_record!(2.weeks.ago.to_date)
user.last_seen_at = 2.weeks.ago
user.save
@@ -21,7 +21,7 @@ RSpec.describe UserVisit do
expect(user.user_stat.days_visited).to eq(2)
end
- describe '#by_day' do
+ describe "#by_day" do
before(:each) do
freeze_time
user.user_visits.create(visited_at: Time.zone.now)
@@ -30,9 +30,11 @@ RSpec.describe UserVisit do
user.user_visits.create(visited_at: 2.days.ago)
user.user_visits.create(visited_at: 4.days.ago)
end
- let(:visits_by_day) { { 1.day.ago.to_date => 2, 2.days.ago.to_date => 1, Time.zone.now.to_date => 1 } }
+ let(:visits_by_day) do
+ { 1.day.ago.to_date => 2, 2.days.ago.to_date => 1, Time.zone.now.to_date => 1 }
+ end
- it 'collect closed interval visits' do
+ it "collect closed interval visits" do
expect(UserVisit.by_day(2.days.ago, Time.zone.now)).to include(visits_by_day)
expect(UserVisit.by_day(2.days.ago, Time.zone.now)).not_to include(4.days.ago.to_date => 1)
end
diff --git a/spec/models/username_validator_spec.rb b/spec/models/username_validator_spec.rb
index b96a0a8f296..e3f9ac92e61 100644
--- a/spec/models/username_validator_spec.rb
+++ b/spec/models/username_validator_spec.rb
@@ -23,181 +23,214 @@ RSpec.describe UsernameValidator do
end
end
- shared_examples 'ASCII username' do
- it 'is invalid when the username is blank' do
- expect_invalid('', error_message: I18n.t(:'user.username.blank'))
+ shared_examples "ASCII username" do
+ it "is invalid when the username is blank" do
+ expect_invalid("", error_message: I18n.t(:"user.username.blank"))
end
- it 'is invalid when the username is too short' do
+ it "is invalid when the username is too short" do
SiteSetting.min_username_length = 4
- expect_invalid('a', 'ab', 'abc',
- error_message: I18n.t(:'user.username.short', min: 4))
+ expect_invalid("a", "ab", "abc", error_message: I18n.t(:"user.username.short", min: 4))
end
- it 'is valid when the username has the minimum length' do
+ it "is valid when the username has the minimum length" do
SiteSetting.min_username_length = 4
- expect_valid('abcd')
+ expect_valid("abcd")
end
- it 'is invalid when the username is too long' do
+ it "is invalid when the username is too long" do
SiteSetting.max_username_length = 8
- expect_invalid('abcdefghi',
- error_message: I18n.t(:'user.username.long', max: 8))
+ expect_invalid("abcdefghi", error_message: I18n.t(:"user.username.long", max: 8))
end
- it 'is valid when the username has the maximum length' do
+ it "is valid when the username has the maximum length" do
SiteSetting.max_username_length = 8
- expect_valid('abcdefgh')
+ expect_valid("abcdefgh")
end
- it 'is valid when the username contains alphanumeric characters, dots, underscores and dashes' do
- expect_valid('ab-cd.123_ABC-xYz')
+ it "is valid when the username contains alphanumeric characters, dots, underscores and dashes" do
+ expect_valid("ab-cd.123_ABC-xYz")
end
- it 'is invalid when the username contains non-alphanumeric characters other than dots, underscores and dashes' do
- expect_invalid('abc|', 'a#bc', 'abc xyz',
- error_message: I18n.t(:'user.username.characters'))
+ it "is invalid when the username contains non-alphanumeric characters other than dots, underscores and dashes" do
+ expect_invalid("abc|", "a#bc", "abc xyz", error_message: I18n.t(:"user.username.characters"))
end
- it 'is valid when the username starts with a alphanumeric character or underscore' do
- expect_valid('abcd', '1abc', '_abc')
+ it "is valid when the username starts with a alphanumeric character or underscore" do
+ expect_valid("abcd", "1abc", "_abc")
end
- it 'is invalid when the username starts with a dot or dash' do
- expect_invalid('.abc', '-abc',
- error_message: I18n.t(:'user.username.must_begin_with_alphanumeric_or_underscore'))
+ it "is invalid when the username starts with a dot or dash" do
+ expect_invalid(
+ ".abc",
+ "-abc",
+ error_message: I18n.t(:"user.username.must_begin_with_alphanumeric_or_underscore"),
+ )
end
- it 'is valid when the username ends with a alphanumeric character' do
- expect_valid('abcd', 'abc9')
+ it "is valid when the username ends with a alphanumeric character" do
+ expect_valid("abcd", "abc9")
end
- it 'is invalid when the username ends with an underscore, a dot or dash' do
- expect_invalid('abc_', 'abc.', 'abc-',
- error_message: I18n.t(:'user.username.must_end_with_alphanumeric'))
+ it "is invalid when the username ends with an underscore, a dot or dash" do
+ expect_invalid(
+ "abc_",
+ "abc.",
+ "abc-",
+ error_message: I18n.t(:"user.username.must_end_with_alphanumeric"),
+ )
end
- it 'is invalid when the username contains consecutive underscores, dots or dashes' do
- expect_invalid('a__bc', 'a..bc', 'a--bc',
- error_message: I18n.t(:'user.username.must_not_contain_two_special_chars_in_seq'))
+ it "is invalid when the username contains consecutive underscores, dots or dashes" do
+ expect_invalid(
+ "a__bc",
+ "a..bc",
+ "a--bc",
+ error_message: I18n.t(:"user.username.must_not_contain_two_special_chars_in_seq"),
+ )
end
- it 'is invalid when the username ends with certain file extensions' do
- expect_invalid('abc.json', 'abc.png',
- error_message: I18n.t(:'user.username.must_not_end_with_confusing_suffix'))
+ it "is invalid when the username ends with certain file extensions" do
+ expect_invalid(
+ "abc.json",
+ "abc.png",
+ error_message: I18n.t(:"user.username.must_not_end_with_confusing_suffix"),
+ )
end
end
- context 'when Unicode usernames are disabled' do
+ context "when Unicode usernames are disabled" do
before { SiteSetting.unicode_usernames = false }
- include_examples 'ASCII username'
+ include_examples "ASCII username"
- it 'is invalid when the username contains non-ASCII characters except dots, underscores and dashes' do
- expect_invalid('abcö', 'abc象',
- error_message: I18n.t(:'user.username.characters'))
+ it "is invalid when the username contains non-ASCII characters except dots, underscores and dashes" do
+ expect_invalid("abcö", "abc象", error_message: I18n.t(:"user.username.characters"))
end
end
- context 'when Unicode usernames are enabled' do
+ context "when Unicode usernames are enabled" do
before { SiteSetting.unicode_usernames = true }
context "with ASCII usernames" do
- include_examples 'ASCII username'
+ include_examples "ASCII username"
end
context "with Unicode usernames" do
before { SiteSetting.min_username_length = 1 }
- it 'is invalid when the username is too short' do
+ it "is invalid when the username is too short" do
SiteSetting.min_username_length = 3
- expect_invalid('鳥', 'পাখি',
- error_message: I18n.t(:'user.username.short', min: 3))
+ expect_invalid("鳥", "পাখি", error_message: I18n.t(:"user.username.short", min: 3))
end
- it 'is valid when the username has the minimum length' do
+ it "is valid when the username has the minimum length" do
SiteSetting.min_username_length = 2
- expect_valid('পাখি', 'طائر')
+ expect_valid("পাখি", "طائر")
end
- it 'is invalid when the username is too long' do
+ it "is invalid when the username is too long" do
SiteSetting.max_username_length = 8
- expect_invalid('חוטב_עצים', 'Holzfäller',
- error_message: I18n.t(:'user.username.long', max: 8))
+ expect_invalid(
+ "חוטב_עצים",
+ "Holzfäller",
+ error_message: I18n.t(:"user.username.long", max: 8),
+ )
end
- it 'is valid when the username has the maximum length' do
+ it "is valid when the username has the maximum length" do
SiteSetting.max_username_length = 9
- expect_valid('Дровосек', 'چوب-لباسی', 'தமிழ்-தமிழ்')
+ expect_valid("Дровосек", "چوب-لباسی", "தமிழ்-தமிழ்")
end
- it 'is invalid when the username has too many Unicode codepoints' do
+ it "is invalid when the username has too many Unicode codepoints" do
SiteSetting.max_username_length = 30
- expect_invalid('য়ায়ায়ায়ায়ায়ায়ায়ায়ায়ায়ায়ায়ায়ায়ায়ায়ায়ায়ায়ায়ায়ায়ায়ায়া',
- error_message: I18n.t(:'user.username.too_long'))
+ expect_invalid(
+ "য়ায়ায়ায়ায়ায়ায়ায়ায়ায়ায়ায়ায়ায়ায়ায়ায়ায়ায়ায়ায়ায়ায়ায়ায়া",
+ error_message: I18n.t(:"user.username.too_long"),
+ )
end
- it 'is valid when the username contains Unicode letters' do
- expect_valid('鳥', 'طائر', 'թռչուն', 'πουλί', 'পাখি', 'madár', '새',
- 'پرنده', 'птица', 'fågel', 'นก', 'پرندے', 'ציפור')
+ it "is valid when the username contains Unicode letters" do
+ expect_valid(
+ "鳥",
+ "طائر",
+ "թռչուն",
+ "πουλί",
+ "পাখি",
+ "madár",
+ "새",
+ "پرنده",
+ "птица",
+ "fågel",
+ "นก",
+ "پرندے",
+ "ציפור",
+ )
end
- it 'is valid when the username contains numbers from the Nd or Nl Unicode category' do
- expect_valid('arabic٠١٢٣٤٥٦٧٨٩', 'bengali০১২৩৪৫৬৭৮৯', 'romanⅥ', 'hangzhou〺')
+ it "is valid when the username contains numbers from the Nd or Nl Unicode category" do
+ expect_valid("arabic٠١٢٣٤٥٦٧٨٩", "bengali০১২৩৪৫৬৭৮৯", "romanⅥ", "hangzhou〺")
end
- it 'is invalid when the username contains numbers from the No Unicode category' do
- expect_invalid('circled㊸', 'fraction¾',
- error_message: I18n.t(:'user.username.characters'))
+ it "is invalid when the username contains numbers from the No Unicode category" do
+ expect_invalid("circled㊸", "fraction¾", error_message: I18n.t(:"user.username.characters"))
end
- it 'is invalid when the username contains symbols or emojis' do
+ it "is invalid when the username contains symbols or emojis" do
SiteSetting.min_username_length = 1
- expect_invalid('©', '⇨', '“', '±', '‿', '😃', '🚗',
- error_message: I18n.t(:'user.username.characters'))
+ expect_invalid(
+ "©",
+ "⇨",
+ "“",
+ "±",
+ "‿",
+ "😃",
+ "🚗",
+ error_message: I18n.t(:"user.username.characters"),
+ )
end
- it 'is invalid when the username contains zero width join characters' do
- expect_invalid('ണ്', 'র্যাম',
- error_message: I18n.t(:'user.username.characters'))
+ it "is invalid when the username contains zero width join characters" do
+ expect_invalid("ണ്", "র্যাম", error_message: I18n.t(:"user.username.characters"))
end
- it 'is valid when the username ends with a Unicode Mark' do
- expect_valid('தமிழ்')
+ it "is valid when the username ends with a Unicode Mark" do
+ expect_valid("தமிழ்")
end
- it 'allows all Unicode letters when the allowlist is empty' do
- expect_valid('鳥')
+ it "allows all Unicode letters when the allowlist is empty" do
+ expect_valid("鳥")
end
context "with Unicode allowlist" do
before { SiteSetting.allowed_unicode_username_characters = "[äöüÄÖÜß]" }
- it 'is invalid when username contains non-allowlisted letters' do
- expect_invalid('鳥', 'francès', error_message: I18n.t(:'user.username.characters'))
+ it "is invalid when username contains non-allowlisted letters" do
+ expect_invalid("鳥", "francès", error_message: I18n.t(:"user.username.characters"))
end
- it 'is valid when username contains only allowlisted letters' do
- expect_valid('Löwe', 'Ötzi')
+ it "is valid when username contains only allowlisted letters" do
+ expect_valid("Löwe", "Ötzi")
end
- it 'is valid when username contains only ASCII letters and numbers regardless of allowlist' do
- expect_valid('a-z_A-Z.0-9')
+ it "is valid when username contains only ASCII letters and numbers regardless of allowlist" do
+ expect_valid("a-z_A-Z.0-9")
end
- it 'is valid after resetting the site setting' do
+ it "is valid after resetting the site setting" do
SiteSetting.allowed_unicode_username_characters = ""
- expect_valid('鳥')
+ expect_valid("鳥")
end
end
end
diff --git a/spec/models/watched_word_spec.rb b/spec/models/watched_word_spec.rb
index ef593d29f2a..16b992a157e 100644
--- a/spec/models/watched_word_spec.rb
+++ b/spec/models/watched_word_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
RSpec.describe WatchedWord do
-
it "can't have duplicate words" do
Fabricate(:watched_word, word: "darn", action: described_class.actions[:block])
w = Fabricate.build(:watched_word, word: "darn", action: described_class.actions[:block])
@@ -12,15 +11,15 @@ RSpec.describe WatchedWord do
end
it "doesn't downcase words" do
- expect(described_class.create(word: "ShooT").word).to eq('ShooT')
+ expect(described_class.create(word: "ShooT").word).to eq("ShooT")
end
it "strips leading and trailing spaces" do
- expect(described_class.create(word: " poutine ").word).to eq('poutine')
+ expect(described_class.create(word: " poutine ").word).to eq("poutine")
end
it "squeezes multiple asterisks" do
- expect(described_class.create(word: "a**les").word).to eq('a*les')
+ expect(described_class.create(word: "a**les").word).to eq("a*les")
end
it "is case-insensitive by default" do
@@ -51,10 +50,10 @@ RSpec.describe WatchedWord do
end
end
- describe '#create_or_update_word' do
+ describe "#create_or_update_word" do
it "can create a new record" do
expect {
- w = described_class.create_or_update_word(word: 'nickelback', action_key: :block)
+ w = described_class.create_or_update_word(word: "nickelback", action_key: :block)
expect(w.reload.action).to eq(described_class.actions[:block])
}.to change { described_class.count }.by(1)
end
@@ -69,7 +68,13 @@ RSpec.describe WatchedWord do
end
it "doesn't error for existing record with same action" do
- existing = Fabricate(:watched_word, action: described_class.actions[:flag], created_at: 1.day.ago, updated_at: 1.day.ago)
+ existing =
+ Fabricate(
+ :watched_word,
+ action: described_class.actions[:flag],
+ created_at: 1.day.ago,
+ updated_at: 1.day.ago,
+ )
expect {
w = described_class.create_or_update_word(word: existing.word, action_key: :flag)
expect(w.id).to eq(existing.id)
@@ -79,7 +84,11 @@ RSpec.describe WatchedWord do
it "allows action param instead of action_key" do
expect {
- w = described_class.create_or_update_word(word: 'nickelback', action: described_class.actions[:block])
+ w =
+ described_class.create_or_update_word(
+ word: "nickelback",
+ action: described_class.actions[:block],
+ )
expect(w.reload.action).to eq(described_class.actions[:block])
}.to change { described_class.count }.by(1)
end
@@ -87,7 +96,11 @@ RSpec.describe WatchedWord do
it "normalizes input" do
existing = Fabricate(:watched_word, action: described_class.actions[:flag])
expect {
- w = described_class.create_or_update_word(word: " #{existing.word.upcase} ", action_key: :block)
+ w =
+ described_class.create_or_update_word(
+ word: " #{existing.word.upcase} ",
+ action_key: :block,
+ )
expect(w.reload.action).to eq(described_class.actions[:block])
expect(w.id).to eq(existing.id)
}.to_not change { described_class.count }
@@ -103,24 +116,47 @@ RSpec.describe WatchedWord do
word = Fabricate(:watched_word, action: described_class.actions[:link], word: "meta1")
expect(word.replacement).to eq("http://test.localhost/")
- word = Fabricate(:watched_word, action: described_class.actions[:link], word: "meta2", replacement: "test")
+ word =
+ Fabricate(
+ :watched_word,
+ action: described_class.actions[:link],
+ word: "meta2",
+ replacement: "test",
+ )
expect(word.replacement).to eq("http://test.localhost/test")
- word = Fabricate(:watched_word, action: described_class.actions[:link], word: "meta3", replacement: "/test")
+ word =
+ Fabricate(
+ :watched_word,
+ action: described_class.actions[:link],
+ word: "meta3",
+ replacement: "/test",
+ )
expect(word.replacement).to eq("http://test.localhost/test")
end
it "sets case-sensitivity of a word" do
- word = described_class.create_or_update_word(word: 'joker', action_key: :block, case_sensitive: true)
+ word =
+ described_class.create_or_update_word(
+ word: "joker",
+ action_key: :block,
+ case_sensitive: true,
+ )
expect(word.case_sensitive?).to eq(true)
- word = described_class.create_or_update_word(word: 'free', action_key: :block)
+ word = described_class.create_or_update_word(word: "free", action_key: :block)
expect(word.case_sensitive?).to eq(false)
end
it "updates case-sensitivity of a word" do
- existing = Fabricate(:watched_word, action: described_class.actions[:block], case_sensitive: true)
- updated = described_class.create_or_update_word(word: existing.word, action_key: :block, case_sensitive: false)
+ existing =
+ Fabricate(:watched_word, action: described_class.actions[:block], case_sensitive: true)
+ updated =
+ described_class.create_or_update_word(
+ word: existing.word,
+ action_key: :block,
+ case_sensitive: false,
+ )
expect(updated.case_sensitive?).to eq(false)
end
diff --git a/spec/models/web_crawler_request_spec.rb b/spec/models/web_crawler_request_spec.rb
index 21f1c99990a..12e6b44cfec 100644
--- a/spec/models/web_crawler_request_spec.rb
+++ b/spec/models/web_crawler_request_spec.rb
@@ -6,17 +6,13 @@ RSpec.describe WebCrawlerRequest do
CachedCounting.enable
end
- after do
- CachedCounting.disable
- end
+ after { CachedCounting.disable }
it "can log crawler requests" do
freeze_time
d1 = Time.now.utc.to_date
- 4.times do
- WebCrawlerRequest.increment!("Googlebot")
- end
+ 4.times { WebCrawlerRequest.increment!("Googlebot") }
WebCrawlerRequest.increment!("Bingbot")
@@ -34,5 +30,4 @@ RSpec.describe WebCrawlerRequest do
expect(WebCrawlerRequest.find_by(date: d1, user_agent: "Googlebot").count).to eq(4)
expect(WebCrawlerRequest.find_by(date: d1, user_agent: "Bingbot").count).to eq(1)
end
-
end
diff --git a/spec/models/web_hook_event_spec.rb b/spec/models/web_hook_event_spec.rb
index 321dcd7d69d..6cfb6e0b88a 100644
--- a/spec/models/web_hook_event_spec.rb
+++ b/spec/models/web_hook_event_spec.rb
@@ -4,36 +4,33 @@ RSpec.describe WebHookEvent do
let(:event) { WebHookEvent.new(status: 200, web_hook: Fabricate(:web_hook)) }
let(:failed_event) { WebHookEvent.new(status: 400, web_hook: Fabricate(:web_hook)) }
- describe '.purge_old' do
- before do
- SiteSetting.retain_web_hook_events_period_days = 1
- end
+ describe ".purge_old" do
+ before { SiteSetting.retain_web_hook_events_period_days = 1 }
it "should be able to purge old web hook events" do
web_hook = Fabricate(:web_hook)
web_hook_event = WebHookEvent.create!(status: 200, web_hook: web_hook)
WebHookEvent.create!(status: 200, web_hook: web_hook, created_at: 2.days.ago)
- expect { described_class.purge_old }
- .to change { WebHookEvent.count }.by(-1)
+ expect { described_class.purge_old }.to change { WebHookEvent.count }.by(-1)
expect(WebHookEvent.find(web_hook_event.id)).to eq(web_hook_event)
end
end
- describe '#update_web_hook_delivery_status' do
- it 'update last delivery status for associated WebHook record' do
+ describe "#update_web_hook_delivery_status" do
+ it "update last delivery status for associated WebHook record" do
event.update_web_hook_delivery_status
- expect(event.web_hook.last_delivery_status)
- .to eq(WebHook.last_delivery_statuses[:successful])
+ expect(event.web_hook.last_delivery_status).to eq(WebHook.last_delivery_statuses[:successful])
end
- it 'sets last delivery status to failed' do
+ it "sets last delivery status to failed" do
failed_event.update_web_hook_delivery_status
- expect(failed_event.web_hook.last_delivery_status)
- .to eq(WebHook.last_delivery_statuses[:failed])
+ expect(failed_event.web_hook.last_delivery_status).to eq(
+ WebHook.last_delivery_statuses[:failed],
+ )
end
end
end
diff --git a/spec/models/web_hook_spec.rb b/spec/models/web_hook_spec.rb
index 22f0ffc149c..2752997d846 100644
--- a/spec/models/web_hook_spec.rb
+++ b/spec/models/web_hook_spec.rb
@@ -6,19 +6,19 @@ RSpec.describe WebHook do
it { is_expected.to validate_presence_of :last_delivery_status }
it { is_expected.to validate_presence_of :web_hook_event_types }
- describe '#content_types' do
+ describe "#content_types" do
subject { WebHook.content_types }
it "'json' (application/json) should be at 1st position" do
- expect(subject['application/json']).to eq(1)
+ expect(subject["application/json"]).to eq(1)
end
it "'url_encoded' (application/x-www-form-urlencoded) should be at 2st position" do
- expect(subject['application/x-www-form-urlencoded']).to eq(2)
+ expect(subject["application/x-www-form-urlencoded"]).to eq(2)
end
end
- describe '#last_delivery_statuses' do
+ describe "#last_delivery_statuses" do
subject { WebHook.last_delivery_statuses }
it "inactive should be at 1st position" do
@@ -34,7 +34,7 @@ RSpec.describe WebHook do
end
end
- context 'with web hooks' do
+ context "with web hooks" do
fab!(:post_hook) { Fabricate(:web_hook, payload_url: " https://example.com ") }
fab!(:topic_hook) { Fabricate(:topic_web_hook) }
@@ -43,93 +43,89 @@ RSpec.describe WebHook do
end
it "excludes disabled plugin web_hooks" do
- web_hook_event_types = WebHookEventType.active.find_by(name: 'solved')
+ web_hook_event_types = WebHookEventType.active.find_by(name: "solved")
expect(web_hook_event_types).to eq(nil)
end
it "includes non-plugin web_hooks" do
- web_hook_event_types = WebHookEventType.active.where(name: 'topic')
+ web_hook_event_types = WebHookEventType.active.where(name: "topic")
expect(web_hook_event_types.count).to eq(1)
end
it "includes enabled plugin web_hooks" do
SiteSetting.stubs(:solved_enabled).returns(true)
- web_hook_event_types = WebHookEventType.active.where(name: 'solved')
+ web_hook_event_types = WebHookEventType.active.where(name: "solved")
expect(web_hook_event_types.count).to eq(1)
end
- describe '#active_web_hooks' do
+ describe "#active_web_hooks" do
it "returns unique hooks" do
- post_hook.web_hook_event_types << WebHookEventType.find_by(name: 'topic')
+ post_hook.web_hook_event_types << WebHookEventType.find_by(name: "topic")
post_hook.update!(wildcard_web_hook: true)
expect(WebHook.active_web_hooks(:post)).to eq([post_hook])
end
- it 'find relevant hooks' do
+ it "find relevant hooks" do
expect(WebHook.active_web_hooks(:post)).to eq([post_hook])
expect(WebHook.active_web_hooks(:topic)).to eq([topic_hook])
end
- it 'excludes inactive hooks' do
+ it "excludes inactive hooks" do
post_hook.update!(active: false)
expect(WebHook.active_web_hooks(:post)).to eq([])
expect(WebHook.active_web_hooks(:topic)).to eq([topic_hook])
end
- describe 'wildcard web hooks' do
+ describe "wildcard web hooks" do
fab!(:wildcard_hook) { Fabricate(:wildcard_web_hook) }
- it 'should include wildcard hooks' do
+ it "should include wildcard hooks" do
expect(WebHook.active_web_hooks(:wildcard)).to eq([wildcard_hook])
- expect(WebHook.active_web_hooks(:post)).to contain_exactly(
- post_hook, wildcard_hook
- )
+ expect(WebHook.active_web_hooks(:post)).to contain_exactly(post_hook, wildcard_hook)
- expect(WebHook.active_web_hooks(:topic)).to contain_exactly(
- topic_hook, wildcard_hook
- )
+ expect(WebHook.active_web_hooks(:topic)).to contain_exactly(topic_hook, wildcard_hook)
end
end
end
- describe '#enqueue_hooks' do
- it 'accepts additional parameters' do
- payload = { test: 'some payload' }.to_json
+ describe "#enqueue_hooks" do
+ it "accepts additional parameters" do
+ payload = { test: "some payload" }.to_json
WebHook.enqueue_hooks(:post, :post_created, payload: payload)
job_args = Jobs::EmitWebHookEvent.jobs.first["args"].first
expect(job_args["web_hook_id"]).to eq(post_hook.id)
- expect(job_args["event_type"]).to eq('post')
+ expect(job_args["event_type"]).to eq("post")
expect(job_args["payload"]).to eq(payload)
end
- context 'when including wildcard hooks' do
+ context "when including wildcard hooks" do
fab!(:wildcard_hook) { Fabricate(:wildcard_web_hook) }
- describe '#enqueue_hooks' do
- it 'enqueues hooks with ids' do
+ describe "#enqueue_hooks" do
+ it "enqueues hooks with ids" do
WebHook.enqueue_hooks(:post, :post_created)
job_args = Jobs::EmitWebHookEvent.jobs.first["args"].first
expect(job_args["web_hook_id"]).to eq(post_hook.id)
- expect(job_args["event_type"]).to eq('post')
+ expect(job_args["event_type"]).to eq("post")
job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
expect(job_args["web_hook_id"]).to eq(wildcard_hook.id)
- expect(job_args["event_type"]).to eq('post')
+ expect(job_args["event_type"]).to eq("post")
end
end
end
end
end
- describe 'enqueues hooks' do
+ describe "enqueues hooks" do
let(:user) { Fabricate(:user) }
let(:admin) { Fabricate(:admin) }
let(:topic) { Fabricate(:topic, user: user) }
@@ -137,14 +133,12 @@ RSpec.describe WebHook do
let(:topic_web_hook) { Fabricate(:topic_web_hook) }
let(:tag) { Fabricate(:tag) }
- before do
- topic_web_hook
- end
+ before { topic_web_hook }
- describe 'when there are no active hooks' do
- it 'should not generate payload and enqueue anything for topic events' do
+ describe "when there are no active hooks" do
+ it "should not generate payload and enqueue anything for topic events" do
topic_web_hook.destroy!
- post = PostCreator.create(user, raw: 'post', title: 'topic', skip_validations: true)
+ post = PostCreator.create(user, raw: "post", title: "topic", skip_validations: true)
expect(Jobs::EmitWebHookEvent.jobs.length).to eq(0)
WebHook.expects(:generate_payload).times(0)
@@ -152,15 +146,15 @@ RSpec.describe WebHook do
expect(Jobs::EmitWebHookEvent.jobs.length).to eq(0)
end
- it 'should not enqueue anything for tag events' do
+ it "should not enqueue anything for tag events" do
tag = Fabricate(:tag)
tag.destroy!
expect(Jobs::EmitWebHookEvent.jobs.length).to eq(0)
end
end
- it 'should enqueue the right hooks for topic events' do
- post = PostCreator.create(user, raw: 'post', title: 'topic', skip_validations: true)
+ it "should enqueue the right hooks for topic events" do
+ post = PostCreator.create(user, raw: "post", title: "topic", skip_validations: true)
topic_id = post.topic.id
job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
@@ -182,7 +176,7 @@ RSpec.describe WebHook do
payload = JSON.parse(job_args["payload"])
expect(payload["id"]).to eq(topic_id)
- %w{archived closed visible}.each do |status|
+ %w[archived closed visible].each do |status|
post.topic.update_status(status, true, topic.user)
job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
@@ -209,11 +203,12 @@ RSpec.describe WebHook do
expect(payload["category_id"]).to eq(category.id)
expect do
- successfully_saved_post_and_topic = PostRevisor.new(post, post.topic).revise!(
- post.user,
- { tags: [tag.name] },
- { skip_validations: true },
- )
+ successfully_saved_post_and_topic =
+ PostRevisor.new(post, post.topic).revise!(
+ post.user,
+ { tags: [tag.name] },
+ { skip_validations: true },
+ )
end.to change { Jobs::EmitWebHookEvent.jobs.length }.by(1)
job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
@@ -224,33 +219,32 @@ RSpec.describe WebHook do
expect(payload["tags"]).to contain_exactly(tag.name)
end
- describe 'when topic has been deleted' do
- it 'should not enqueue a post/topic edited hooks' do
+ describe "when topic has been deleted" do
+ it "should not enqueue a post/topic edited hooks" do
topic.trash!
post.reload
PostRevisor.new(post, topic).revise!(
post.user,
- {
- category_id: Category.last.id,
- raw: "#{post.raw} new"
- },
- {}
+ { category_id: Category.last.id, raw: "#{post.raw} new" },
+ {},
)
expect(Jobs::EmitWebHookEvent.jobs.count).to eq(0)
end
end
- it 'should enqueue the right hooks for post events' do
+ it "should enqueue the right hooks for post events" do
Fabricate(:web_hook)
- post = PostCreator.create!(user,
- raw: 'post',
- topic_id: topic.id,
- reply_to_post_number: 1,
- skip_validations: true
- )
+ post =
+ PostCreator.create!(
+ user,
+ raw: "post",
+ topic_id: topic.id,
+ reply_to_post_number: 1,
+ skip_validations: true,
+ )
job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
@@ -261,8 +255,9 @@ RSpec.describe WebHook do
Jobs::EmitWebHookEvent.jobs.clear
# post destroy or recover triggers a moderator post
- expect { PostDestroyer.new(user, post).destroy }
- .to change { Jobs::EmitWebHookEvent.jobs.count }.by(3)
+ expect { PostDestroyer.new(user, post).destroy }.to change {
+ Jobs::EmitWebHookEvent.jobs.count
+ }.by(3)
job_args = Jobs::EmitWebHookEvent.jobs[0]["args"].first
@@ -284,8 +279,9 @@ RSpec.describe WebHook do
Jobs::EmitWebHookEvent.jobs.clear
- expect { PostDestroyer.new(user, post).recover }
- .to change { Jobs::EmitWebHookEvent.jobs.count }.by(3)
+ expect { PostDestroyer.new(user, post).recover }.to change {
+ Jobs::EmitWebHookEvent.jobs.count
+ }.by(3)
job_args = Jobs::EmitWebHookEvent.jobs[0]["args"].first
@@ -306,16 +302,18 @@ RSpec.describe WebHook do
expect(payload["id"]).to eq(post.topic.id)
end
- it 'should enqueue the destroyed hooks with tag filter for post events' do
+ it "should enqueue the destroyed hooks with tag filter for post events" do
tag = Fabricate(:tag)
Fabricate(:web_hook, tags: [tag])
- post = PostCreator.create!(user,
- raw: 'post',
- topic_id: topic.id,
- reply_to_post_number: 1,
- skip_validations: true
- )
+ post =
+ PostCreator.create!(
+ user,
+ raw: "post",
+ topic_id: topic.id,
+ reply_to_post_number: 1,
+ skip_validations: true,
+ )
topic.tags = [tag]
topic.save!
@@ -333,7 +331,7 @@ RSpec.describe WebHook do
job.execute(args.with_indifferent_access)
end
- it 'should enqueue the right hooks for user events' do
+ it "should enqueue the right hooks for user events" do
SiteSetting.must_approve_users = true
Fabricate(:user_web_hook, active: true)
@@ -369,7 +367,7 @@ RSpec.describe WebHook do
payload = JSON.parse(job_args["payload"])
expect(payload["id"]).to eq(user.id)
- UserUpdater.new(admin, user).update(username: 'testing123')
+ UserUpdater.new(admin, user).update(username: "testing123")
job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
expect(job_args["event_name"]).to eq("user_updated")
@@ -409,7 +407,7 @@ RSpec.describe WebHook do
expect(payload["user_fields"].size).to eq(1)
end
- it 'should enqueue the right hooks for category events' do
+ it "should enqueue the right hooks for category events" do
Fabricate(:category_web_hook)
category = Fabricate(:category)
@@ -419,14 +417,14 @@ RSpec.describe WebHook do
payload = JSON.parse(job_args["payload"])
expect(payload["id"]).to eq(category.id)
- category.update!(slug: 'testing')
+ category.update!(slug: "testing")
job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
expect(job_args["event_name"]).to eq("category_updated")
payload = JSON.parse(job_args["payload"])
expect(payload["id"]).to eq(category.id)
- expect(payload["slug"]).to eq('testing')
+ expect(payload["slug"]).to eq("testing")
category.destroy!
@@ -437,7 +435,7 @@ RSpec.describe WebHook do
expect(payload["id"]).to eq(category.id)
end
- it 'should enqueue the right hooks for group events' do
+ it "should enqueue the right hooks for group events" do
Fabricate(:group_web_hook)
group = Fabricate(:group)
@@ -447,23 +445,23 @@ RSpec.describe WebHook do
payload = JSON.parse(job_args["payload"])
expect(payload["id"]).to eq(group.id)
- group.update!(full_name: 'testing')
+ group.update!(full_name: "testing")
job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
expect(job_args["event_name"]).to eq("group_updated")
payload = JSON.parse(job_args["payload"])
expect(payload["id"]).to eq(group.id)
- expect(payload["full_name"]).to eq('testing')
+ expect(payload["full_name"]).to eq("testing")
group.destroy!
job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
expect(job_args["event_name"]).to eq("group_destroyed")
payload = JSON.parse(job_args["payload"])
- expect(payload["full_name"]).to eq('testing')
+ expect(payload["full_name"]).to eq("testing")
end
- it 'should enqueue the right hooks for tag events' do
+ it "should enqueue the right hooks for tag events" do
Fabricate(:tag_web_hook)
tag = Fabricate(:tag)
@@ -473,13 +471,13 @@ RSpec.describe WebHook do
payload = JSON.parse(job_args["payload"])
expect(payload["id"]).to eq(tag.id)
- tag.update!(name: 'testing')
+ tag.update!(name: "testing")
job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
expect(job_args["event_name"]).to eq("tag_updated")
payload = JSON.parse(job_args["payload"])
expect(payload["id"]).to eq(tag.id)
- expect(payload["name"]).to eq('testing')
+ expect(payload["name"]).to eq("testing")
tag.destroy!
@@ -490,7 +488,7 @@ RSpec.describe WebHook do
expect(payload["id"]).to eq(tag.id)
end
- it 'should enqueue the right hooks for notifications' do
+ it "should enqueue the right hooks for notifications" do
Fabricate(:notification_web_hook)
notification = Fabricate(:notification)
job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
@@ -500,7 +498,7 @@ RSpec.describe WebHook do
expect(payload["id"]).to eq(notification.id)
end
- it 'should enqueue the right hooks for reviewables' do
+ it "should enqueue the right hooks for reviewables" do
Fabricate(:reviewable_web_hook)
reviewable = Fabricate(:reviewable)
job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
@@ -509,11 +507,7 @@ RSpec.describe WebHook do
payload = JSON.parse(job_args["payload"])
expect(payload["id"]).to eq(reviewable.id)
- reviewable.add_score(
- Discourse.system_user,
- ReviewableScore.types[:off_topic],
- reason: "test"
- )
+ reviewable.add_score(Discourse.system_user, ReviewableScore.types[:off_topic], reason: "test")
job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
expect(job_args["event_name"]).to eq("reviewable_score_updated")
@@ -528,7 +522,7 @@ RSpec.describe WebHook do
expect(payload["id"]).to eq(reviewable.id)
end
- it 'should enqueue the right hooks for badge grants' do
+ it "should enqueue the right hooks for badge grants" do
Fabricate(:user_badge_web_hook)
badge = Fabricate(:badge)
badge.multiple_grant = true
@@ -553,7 +547,7 @@ RSpec.describe WebHook do
# Future work: revoke badge hook
end
- it 'should enqueue the right hooks for group user addition' do
+ it "should enqueue the right hooks for group user addition" do
Fabricate(:group_user_web_hook)
group = Fabricate(:group)
@@ -571,7 +565,7 @@ RSpec.describe WebHook do
expect(Time.zone.parse(payload["created_at"]).to_f).to be_within(0.001).of(now.to_f)
end
- it 'should enqueue the right hooks for group user deletion' do
+ it "should enqueue the right hooks for group user deletion" do
Fabricate(:group_user_web_hook)
group = Fabricate(:group)
group_user = Fabricate(:group_user, group: group, user: user)
@@ -588,11 +582,11 @@ RSpec.describe WebHook do
expect(payload["user_id"]).to eq(user.id)
end
- context 'with user promoted hooks' do
+ context "with user promoted hooks" do
fab!(:user_promoted_web_hook) { Fabricate(:user_promoted_web_hook) }
fab!(:another_user) { Fabricate(:user, trust_level: 2) }
- it 'should pass the user to the webhook job when a user is promoted' do
+ it "should pass the user to the webhook job when a user is promoted" do
another_user.change_trust_level!(another_user.trust_level + 1)
job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
@@ -601,22 +595,28 @@ RSpec.describe WebHook do
expect(payload["id"]).to eq(another_user.id)
end
- it 'shouldn’t trigger when the user is demoted' do
- expect {
- another_user.change_trust_level!(another_user.trust_level - 1)
- }.not_to change { Jobs::EmitWebHookEvent.jobs.length }
+ it "shouldn’t trigger when the user is demoted" do
+ expect { another_user.change_trust_level!(another_user.trust_level - 1) }.not_to change {
+ Jobs::EmitWebHookEvent.jobs.length
+ }
end
end
- context 'with like created hooks' do
+ context "with like created hooks" do
fab!(:like_web_hook) { Fabricate(:like_web_hook) }
fab!(:another_user) { Fabricate(:user) }
- it 'should pass the group id to the emit webhook job' do
+ it "should pass the group id to the emit webhook job" do
group = Fabricate(:group)
group_user = Fabricate(:group_user, group: group, user: user)
post = Fabricate(:post, user: another_user)
- like = Fabricate(:post_action, post: post, user: user, post_action_type_id: PostActionType.types[:like])
+ like =
+ Fabricate(
+ :post_action,
+ post: post,
+ user: user,
+ post_action_type_id: PostActionType.types[:like],
+ )
now = Time.now
freeze_time now
@@ -625,20 +625,32 @@ RSpec.describe WebHook do
assert_hook_was_queued_with(post, user, group_ids: [group.id])
end
- it 'should pass the category id to the emit webhook job' do
+ it "should pass the category id to the emit webhook job" do
category = Fabricate(:category)
topic.update!(category: category)
- like = Fabricate(:post_action, post: post, user: another_user, post_action_type_id: PostActionType.types[:like])
+ like =
+ Fabricate(
+ :post_action,
+ post: post,
+ user: another_user,
+ post_action_type_id: PostActionType.types[:like],
+ )
DiscourseEvent.trigger(:like_created, like)
assert_hook_was_queued_with(post, another_user, category_id: category.id)
end
- it 'should pass the tag id to the emit webhook job' do
+ it "should pass the tag id to the emit webhook job" do
tag = Fabricate(:tag)
topic.update!(tags: [tag])
- like = Fabricate(:post_action, post: post, user: another_user, post_action_type_id: PostActionType.types[:like])
+ like =
+ Fabricate(
+ :post_action,
+ post: post,
+ user: another_user,
+ post_action_type_id: PostActionType.types[:like],
+ )
DiscourseEvent.trigger(:like_created, like)
@@ -659,30 +671,39 @@ RSpec.describe WebHook do
end
end
- describe '#payload_url_safety' do
+ describe "#payload_url_safety" do
fab!(:post_hook) { Fabricate(:web_hook, payload_url: "https://example.com") }
- it 'errors if payload_url resolves to a blocked IP' do
+ it "errors if payload_url resolves to a blocked IP" do
SiteSetting.blocked_ip_blocks = "92.110.0.0/16"
- FinalDestination::SSRFDetector.stubs(:lookup_ips).with { |h| h == "badhostname.com" }.returns(["92.110.44.17"])
+ FinalDestination::SSRFDetector
+ .stubs(:lookup_ips)
+ .with { |h| h == "badhostname.com" }
+ .returns(["92.110.44.17"])
post_hook.payload_url = "https://badhostname.com"
post_hook.save
expect(post_hook.errors.full_messages).to contain_exactly(
- I18n.t("webhooks.payload_url.blocked_or_internal")
+ I18n.t("webhooks.payload_url.blocked_or_internal"),
)
end
- it 'errors if payload_url resolves to an internal IP' do
- FinalDestination::SSRFDetector.stubs(:lookup_ips).with { |h| h == "badhostname.com" }.returns(["172.18.11.39"])
+ it "errors if payload_url resolves to an internal IP" do
+ FinalDestination::SSRFDetector
+ .stubs(:lookup_ips)
+ .with { |h| h == "badhostname.com" }
+ .returns(["172.18.11.39"])
post_hook.payload_url = "https://badhostname.com"
post_hook.save
expect(post_hook.errors.full_messages).to contain_exactly(
- I18n.t("webhooks.payload_url.blocked_or_internal")
+ I18n.t("webhooks.payload_url.blocked_or_internal"),
)
end
it "doesn't error if payload_url resolves to an allowed IP" do
- FinalDestination::SSRFDetector.stubs(:lookup_ips).with { |h| h == "goodhostname.com" }.returns(["172.32.11.39"])
+ FinalDestination::SSRFDetector
+ .stubs(:lookup_ips)
+ .with { |h| h == "goodhostname.com" }
+ .returns(["172.32.11.39"])
post_hook.payload_url = "https://goodhostname.com"
post_hook.save!
end
diff --git a/spec/multisite/distributed_cache_spec.rb b/spec/multisite/distributed_cache_spec.rb
index 112584ae5bf..0fed72dee8d 100644
--- a/spec/multisite/distributed_cache_spec.rb
+++ b/spec/multisite/distributed_cache_spec.rb
@@ -1,30 +1,31 @@
# frozen_string_literal: true
-RSpec.describe 'Multisite SiteSettings', type: :multisite do
+RSpec.describe "Multisite SiteSettings", type: :multisite do
def cache(name, namespace: true)
DistributedCache.new(name, namespace: namespace)
end
- context 'without namespace' do
- let(:cache1) { cache('test', namespace: false) }
+ context "without namespace" do
+ let(:cache1) { cache("test", namespace: false) }
- it 'does not leak state across multisite' do
- cache1['default'] = true
+ it "does not leak state across multisite" do
+ cache1["default"] = true
- expect(cache1.hash).to eq('default' => true)
+ expect(cache1.hash).to eq("default" => true)
- test_multisite_connection('second') do
- message = MessageBus.track_publish(DistributedCache::Manager::CHANNEL_NAME) do
- cache1['second'] = true
- end.first
+ test_multisite_connection("second") do
+ message =
+ MessageBus
+ .track_publish(DistributedCache::Manager::CHANNEL_NAME) { cache1["second"] = true }
+ .first
- expect(message.data[:hash_key]).to eq('test')
+ expect(message.data[:hash_key]).to eq("test")
expect(message.data[:op]).to eq(:set)
- expect(message.data[:key]).to eq('second')
+ expect(message.data[:key]).to eq("second")
expect(message.data[:value]).to eq(true)
end
- expect(cache1.hash).to eq('default' => true, 'second' => true)
+ expect(cache1.hash).to eq("default" => true, "second" => true)
end
end
end
diff --git a/spec/multisite/jobs_spec.rb b/spec/multisite/jobs_spec.rb
index ebcd6aabf4f..d398f754331 100644
--- a/spec/multisite/jobs_spec.rb
+++ b/spec/multisite/jobs_spec.rb
@@ -1,13 +1,13 @@
# frozen_string_literal: true
RSpec.describe "Running Sidekiq Jobs in Multisite", type: :multisite do
- it 'should revert back to the default connection' do
- expect do
- Jobs::DestroyOldDeletionStubs.new.perform({})
- end.to_not change { RailsMultisite::ConnectionManagement.current_db }
+ it "should revert back to the default connection" do
+ expect do Jobs::DestroyOldDeletionStubs.new.perform({}) end.to_not change {
+ RailsMultisite::ConnectionManagement.current_db
+ }
end
- it 'CheckNewFeatures should only hit the payload once' do
+ it "CheckNewFeatures should only hit the payload once" do
# otherwise it will get rate-limited by meta
DiscourseUpdates.expects(:new_features_payload).returns("{}").once
Jobs::CheckNewFeatures.new.perform({})
diff --git a/spec/multisite/pausable_multisite_spec.rb b/spec/multisite/pausable_multisite_spec.rb
index f7522130e95..aac8f7afa3e 100644
--- a/spec/multisite/pausable_multisite_spec.rb
+++ b/spec/multisite/pausable_multisite_spec.rb
@@ -6,9 +6,7 @@ RSpec.describe "Pausing/Unpausing Sidekiq", type: :multisite do
Sidekiq.pause!
expect(Sidekiq.paused?).to eq(true)
- test_multisite_connection("second") do
- expect(Sidekiq.paused?).to eq(false)
- end
+ test_multisite_connection("second") { expect(Sidekiq.paused?).to eq(false) }
Sidekiq.unpause!
@@ -23,27 +21,23 @@ RSpec.describe "Pausing/Unpausing Sidekiq", type: :multisite do
Sidekiq.unpause_all!
- RailsMultisite::ConnectionManagement.each_connection do
- expect(Sidekiq.paused?).to eq(false)
- end
+ RailsMultisite::ConnectionManagement.each_connection { expect(Sidekiq.paused?).to eq(false) }
end
end
end
RSpec.describe Sidekiq::Pausable, type: :multisite do
- after do
- Sidekiq.unpause_all!
- end
+ after { Sidekiq.unpause_all! }
describe "when sidekiq is paused" do
let(:middleware) { Sidekiq::Pausable.new }
def call_middleware(db = RailsMultisite::ConnectionManagement::DEFAULT)
- middleware.call(Jobs::PostAlert.new, {
- "args" => [{ "current_site_id" => db }]
- }, "critical") do
- yield
- end
+ middleware.call(
+ Jobs::PostAlert.new,
+ { "args" => [{ "current_site_id" => db }] },
+ "critical",
+ ) { yield }
end
it "should delay the job" do
diff --git a/spec/multisite/pausable_spec.rb b/spec/multisite/pausable_spec.rb
index 7a503469bc6..1b6a5778bc9 100644
--- a/spec/multisite/pausable_spec.rb
+++ b/spec/multisite/pausable_spec.rb
@@ -1,9 +1,7 @@
# frozen_string_literal: true
RSpec.describe Sidekiq::Pausable do
- after do
- Sidekiq.unpause_all!
- end
+ after { Sidekiq.unpause_all! }
it "can still run heartbeats when paused" do
Sidekiq.pause!
@@ -14,9 +12,7 @@ RSpec.describe Sidekiq::Pausable do
jobs.clear
middleware = Sidekiq::Pausable.new
- middleware.call(Jobs::RunHeartbeat.new, { "args" => [{}] }, "critical") do
- "done"
- end
+ middleware.call(Jobs::RunHeartbeat.new, { "args" => [{}] }, "critical") { "done" }
jobs = Sidekiq::ScheduledSet.new
expect(jobs.size).to eq(0)
diff --git a/spec/multisite/post_spec.rb b/spec/multisite/post_spec.rb
index f796d09bd62..9053c1becf6 100644
--- a/spec/multisite/post_spec.rb
+++ b/spec/multisite/post_spec.rb
@@ -1,21 +1,24 @@
# frozen_string_literal: true
-RSpec.describe 'Multisite Post', type: :multisite do
- describe '#each_upload_url' do
+RSpec.describe "Multisite Post", type: :multisite do
+ describe "#each_upload_url" do
let(:upload1) { Fabricate(:upload_s3) }
let(:upload2) { Fabricate(:upload_s3) }
let(:upload3) { Fabricate(:upload_s3) }
- before do
- setup_s3
- end
+ before { setup_s3 }
it "correctly identifies all upload urls" do
upload3.url.sub!(RailsMultisite::ConnectionManagement.current_db, "secondsite")
upload3.save!
urls = []
- post = Fabricate(:post, raw: "A post with image and link upload.\n\n\n\nLink to upload \n")
+ post =
+ Fabricate(
+ :post,
+ raw:
+ "A post with image and link upload.\n\n\n\nLink to upload \n",
+ )
post.each_upload_url { |src, _, _| urls << src.sub("http:", "") }
expect(urls).to eq([upload1.short_path, upload2.url])
end
diff --git a/spec/multisite/request_tracker_spec.rb b/spec/multisite/request_tracker_spec.rb
index 82d35592cd6..4ca47c3b6c9 100644
--- a/spec/multisite/request_tracker_spec.rb
+++ b/spec/multisite/request_tracker_spec.rb
@@ -6,12 +6,8 @@ RSpec.describe "RequestTracker in multisite", type: :multisite do
RateLimiter.enable
- test_multisite_connection("default") do
- RateLimiter.clear_all!
- end
- test_multisite_connection("second") do
- RateLimiter.clear_all!
- end
+ test_multisite_connection("default") { RateLimiter.clear_all! }
+ test_multisite_connection("second") { RateLimiter.clear_all! }
RateLimiter.clear_all_global!
end
@@ -28,19 +24,21 @@ RSpec.describe "RequestTracker in multisite", type: :multisite do
called = { default: 0, second: 0 }
test_multisite_connection("default") do
env = create_env("REMOTE_ADDR" => "123.10.71.4")
- status, = call(env) do
- called[:default] += 1
- app_callback&.call(env)
- [200, {}, ["OK"]]
- end
+ status, =
+ call(env) do
+ called[:default] += 1
+ app_callback&.call(env)
+ [200, {}, ["OK"]]
+ end
expect(status).to eq(200)
env = create_env("REMOTE_ADDR" => "123.10.71.4")
- status, headers = call(env) do
- called[:default] += 1
- app_callback&.call(env)
- [200, {}, ["OK"]]
- end
+ status, headers =
+ call(env) do
+ called[:default] += 1
+ app_callback&.call(env)
+ [200, {}, ["OK"]]
+ end
expect(status).to eq(429)
expect(headers["Discourse-Rate-Limit-Error-Code"]).to eq(error_code)
expect(called[:default]).to eq(1)
@@ -48,11 +46,12 @@ RSpec.describe "RequestTracker in multisite", type: :multisite do
test_multisite_connection("second") do
env = create_env("REMOTE_ADDR" => "123.10.71.4")
- status, headers = call(env) do
- called[:second] += 1
- app_callback&.call(env)
- [200, {}, ["OK"]]
- end
+ status, headers =
+ call(env) do
+ called[:second] += 1
+ app_callback&.call(env)
+ [200, {}, ["OK"]]
+ end
expect(status).to eq(429)
expect(headers["Discourse-Rate-Limit-Error-Code"]).to eq(error_code)
expect(called[:second]).to eq(0)
@@ -62,27 +61,25 @@ RSpec.describe "RequestTracker in multisite", type: :multisite do
shared_examples "user id rate limiters behavior" do |error_code, app_callback|
it "does not leak rate limits for a user id to other sites" do
- cookie = create_auth_cookie(
- token: SecureRandom.hex,
- user_id: 1,
- trust_level: 2
- )
+ cookie = create_auth_cookie(token: SecureRandom.hex, user_id: 1, trust_level: 2)
called = { default: 0, second: 0 }
test_multisite_connection("default") do
env = create_env("REMOTE_ADDR" => "123.10.71.4", "HTTP_COOKIE" => "_t=#{cookie}")
- status, = call(env) do
- called[:default] += 1
- app_callback&.call(env)
- [200, {}, ["OK"]]
- end
+ status, =
+ call(env) do
+ called[:default] += 1
+ app_callback&.call(env)
+ [200, {}, ["OK"]]
+ end
expect(status).to eq(200)
env = create_env("REMOTE_ADDR" => "123.10.71.4", "HTTP_COOKIE" => "_t=#{cookie}")
- status, headers, = call(env) do
- called[:default] += 1
- app_callback&.call(env)
- [200, {}, ["OK"]]
- end
+ status, headers, =
+ call(env) do
+ called[:default] += 1
+ app_callback&.call(env)
+ [200, {}, ["OK"]]
+ end
expect(status).to eq(429)
expect(headers["Discourse-Rate-Limit-Error-Code"]).to eq(error_code)
expect(called[:default]).to eq(1)
@@ -90,19 +87,21 @@ RSpec.describe "RequestTracker in multisite", type: :multisite do
test_multisite_connection("second") do
env = create_env("REMOTE_ADDR" => "123.10.71.4", "HTTP_COOKIE" => "_t=#{cookie}")
- status, = call(env) do
- called[:second] += 1
- app_callback&.call(env)
- [200, {}, ["OK"]]
- end
+ status, =
+ call(env) do
+ called[:second] += 1
+ app_callback&.call(env)
+ [200, {}, ["OK"]]
+ end
expect(status).to eq(200)
env = create_env("REMOTE_ADDR" => "123.10.71.4", "HTTP_COOKIE" => "_t=#{cookie}")
- status, headers, = call(env) do
- called[:second] += 1
- app_callback&.call(env)
- [200, {}, ["OK"]]
- end
+ status, headers, =
+ call(env) do
+ called[:second] += 1
+ app_callback&.call(env)
+ [200, {}, ["OK"]]
+ end
expect(status).to eq(429)
expect(headers["Discourse-Rate-Limit-Error-Code"]).to eq(error_code)
expect(called[:second]).to eq(1)
@@ -111,27 +110,21 @@ RSpec.describe "RequestTracker in multisite", type: :multisite do
end
context "with a 10 seconds limiter" do
- before do
- global_setting :max_reqs_per_ip_per_10_seconds, 1
- end
+ before { global_setting :max_reqs_per_ip_per_10_seconds, 1 }
include_examples "ip rate limiters behavior", "ip_10_secs_limit"
include_examples "user id rate limiters behavior", "id_10_secs_limit"
end
context "with a 60 seconds limiter" do
- before do
- global_setting :max_reqs_per_ip_per_minute, 1
- end
+ before { global_setting :max_reqs_per_ip_per_minute, 1 }
include_examples "ip rate limiters behavior", "ip_60_secs_limit"
include_examples "user id rate limiters behavior", "id_60_secs_limit"
end
context "with assets 10 seconds limiter" do
- before do
- global_setting :max_asset_reqs_per_ip_per_10_seconds, 1
- end
+ before { global_setting :max_asset_reqs_per_ip_per_10_seconds, 1 }
app_callback = ->(env) { env["DISCOURSE_IS_ASSET_PATH"] = true }
include_examples "ip rate limiters behavior", "ip_assets_10_secs_limit", app_callback
diff --git a/spec/multisite/s3_store_spec.rb b/spec/multisite/s3_store_spec.rb
index 675484ae941..5765ca89e0f 100644
--- a/spec/multisite/s3_store_spec.rb
+++ b/spec/multisite/s3_store_spec.rb
@@ -1,8 +1,8 @@
# frozen_string_literal: true
-require 'file_store/s3_store'
+require "file_store/s3_store"
-RSpec.describe 'Multisite s3 uploads', type: :multisite do
+RSpec.describe "Multisite s3 uploads", type: :multisite do
let(:original_filename) { "smallest.png" }
let(:uploaded_file) { file_from_fixtures(original_filename) }
let(:upload_sha1) { Digest::SHA1.hexdigest(File.read(uploaded_file)) }
@@ -12,25 +12,26 @@ RSpec.describe 'Multisite s3 uploads', type: :multisite do
Fabricate.build(:upload, sha1: upload_sha1, id: 1, original_filename: original_filename)
end
- describe 'uploading to s3' do
- before(:each) do
- setup_s3
- end
+ describe "uploading to s3" do
+ before(:each) { setup_s3 }
describe "#store_upload" do
let(:s3_client) { Aws::S3::Client.new(stub_responses: true) }
- let(:s3_helper) { S3Helper.new(SiteSetting.s3_upload_bucket, '', client: s3_client) }
+ let(:s3_helper) { S3Helper.new(SiteSetting.s3_upload_bucket, "", client: s3_client) }
let(:store) { FileStore::S3Store.new(s3_helper) }
let(:upload_opts) do
{
acl: "public-read",
cache_control: "max-age=31556952, public, immutable",
- content_type: "image/png"
+ content_type: "image/png",
}
end
it "does not provide a content_disposition for images" do
- s3_helper.expects(:upload).with(uploaded_file, kind_of(String), upload_opts).returns(["path", "etag"])
+ s3_helper
+ .expects(:upload)
+ .with(uploaded_file, kind_of(String), upload_opts)
+ .returns(%w[path etag])
upload = build_upload
store.store_upload(uploaded_file, upload)
end
@@ -40,8 +41,15 @@ RSpec.describe 'Multisite s3 uploads', type: :multisite do
let(:uploaded_file) { file_from_fixtures("small.pdf", "pdf") }
it "adds an attachment content-disposition with the original filename" do
- disp_opts = { content_disposition: "attachment; filename=\"#{original_filename}\"; filename*=UTF-8''#{original_filename}", content_type: "application/pdf" }
- s3_helper.expects(:upload).with(uploaded_file, kind_of(String), upload_opts.merge(disp_opts)).returns(["path", "etag"])
+ disp_opts = {
+ content_disposition:
+ "attachment; filename=\"#{original_filename}\"; filename*=UTF-8''#{original_filename}",
+ content_type: "application/pdf",
+ }
+ s3_helper
+ .expects(:upload)
+ .with(uploaded_file, kind_of(String), upload_opts.merge(disp_opts))
+ .returns(%w[path etag])
upload = build_upload
store.store_upload(uploaded_file, upload)
end
@@ -52,8 +60,15 @@ RSpec.describe 'Multisite s3 uploads', type: :multisite do
let(:uploaded_file) { file_from_fixtures("small.mp4", "media") }
it "adds an attachment content-disposition with the original filename" do
- disp_opts = { content_disposition: "attachment; filename=\"#{original_filename}\"; filename*=UTF-8''#{original_filename}", content_type: "application/mp4" }
- s3_helper.expects(:upload).with(uploaded_file, kind_of(String), upload_opts.merge(disp_opts)).returns(["path", "etag"])
+ disp_opts = {
+ content_disposition:
+ "attachment; filename=\"#{original_filename}\"; filename*=UTF-8''#{original_filename}",
+ content_type: "application/mp4",
+ }
+ s3_helper
+ .expects(:upload)
+ .with(uploaded_file, kind_of(String), upload_opts.merge(disp_opts))
+ .returns(%w[path etag])
upload = build_upload
store.store_upload(uploaded_file, upload)
end
@@ -64,27 +79,34 @@ RSpec.describe 'Multisite s3 uploads', type: :multisite do
let(:uploaded_file) { file_from_fixtures("small.mp3", "media") }
it "adds an attachment content-disposition with the original filename" do
- disp_opts = { content_disposition: "attachment; filename=\"#{original_filename}\"; filename*=UTF-8''#{original_filename}", content_type: "audio/mpeg" }
- s3_helper.expects(:upload).with(uploaded_file, kind_of(String), upload_opts.merge(disp_opts)).returns(["path", "etag"])
+ disp_opts = {
+ content_disposition:
+ "attachment; filename=\"#{original_filename}\"; filename*=UTF-8''#{original_filename}",
+ content_type: "audio/mpeg",
+ }
+ s3_helper
+ .expects(:upload)
+ .with(uploaded_file, kind_of(String), upload_opts.merge(disp_opts))
+ .returns(%w[path etag])
upload = build_upload
store.store_upload(uploaded_file, upload)
end
end
it "returns the correct url for default and second multisite db" do
- test_multisite_connection('default') do
+ test_multisite_connection("default") do
upload = build_upload
expect(store.store_upload(uploaded_file, upload)).to eq(
- "//#{SiteSetting.s3_upload_bucket}.s3.dualstack.us-west-1.amazonaws.com/#{upload_path}/original/1X/c530c06cf89c410c0355d7852644a73fc3ec8c04.png"
+ "//#{SiteSetting.s3_upload_bucket}.s3.dualstack.us-west-1.amazonaws.com/#{upload_path}/original/1X/c530c06cf89c410c0355d7852644a73fc3ec8c04.png",
)
expect(upload.etag).to eq("ETag")
end
- test_multisite_connection('second') do
+ test_multisite_connection("second") do
upload_path = Discourse.store.upload_path
upload = build_upload
expect(store.store_upload(uploaded_file, upload)).to eq(
- "//#{SiteSetting.s3_upload_bucket}.s3.dualstack.us-west-1.amazonaws.com/#{upload_path}/original/1X/c530c06cf89c410c0355d7852644a73fc3ec8c04.png"
+ "//#{SiteSetting.s3_upload_bucket}.s3.dualstack.us-west-1.amazonaws.com/#{upload_path}/original/1X/c530c06cf89c410c0355d7852644a73fc3ec8c04.png",
)
expect(upload.etag).to eq("ETag")
end
@@ -92,10 +114,8 @@ RSpec.describe 'Multisite s3 uploads', type: :multisite do
end
end
- describe 'removal from s3' do
- before do
- setup_s3
- end
+ describe "removal from s3" do
+ before { setup_s3 }
describe "#remove_upload" do
let(:store) { FileStore::S3Store.new }
@@ -106,17 +126,16 @@ RSpec.describe 'Multisite s3 uploads', type: :multisite do
def prepare_fake_s3
@fake_s3 = FakeS3.create
bucket = @fake_s3.bucket(SiteSetting.s3_upload_bucket)
- bucket.put_object(
- key: upload_key,
- size: upload.filesize,
- last_modified: upload.created_at
- )
+ bucket.put_object(key: upload_key, size: upload.filesize, last_modified: upload.created_at)
bucket
end
it "removes the file from s3 on multisite" do
- test_multisite_connection('default') do
- upload.update!(url: "//s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/#{upload_path}/original/1X/#{upload.sha1}.png")
+ test_multisite_connection("default") do
+ upload.update!(
+ url:
+ "//s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/#{upload_path}/original/1X/#{upload.sha1}.png",
+ )
tombstone_key = "uploads/tombstone/default/original/1X/#{upload.sha1}.png"
bucket = prepare_fake_s3
@@ -131,8 +150,11 @@ RSpec.describe 'Multisite s3 uploads', type: :multisite do
end
it "removes the file from s3 on another multisite db" do
- test_multisite_connection('second') do
- upload.update!(url: "//s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/#{upload_path}/original/1X/#{upload.sha1}.png")
+ test_multisite_connection("second") do
+ upload.update!(
+ url:
+ "//s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/#{upload_path}/original/1X/#{upload.sha1}.png",
+ )
tombstone_key = "uploads/tombstone/second/original/1X/#{upload.sha1}.png"
bucket = prepare_fake_s3
@@ -149,14 +171,16 @@ RSpec.describe 'Multisite s3 uploads', type: :multisite do
describe "when s3_upload_bucket includes folders path" do
let(:upload_key) { "discourse-uploads/#{upload_path}/original/1X/#{upload.sha1}.png" }
- before do
- SiteSetting.s3_upload_bucket = "s3-upload-bucket/discourse-uploads"
- end
+ before { SiteSetting.s3_upload_bucket = "s3-upload-bucket/discourse-uploads" }
it "removes the file from s3 on multisite" do
- test_multisite_connection('default') do
- upload.update!(url: "//s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/discourse-uploads/#{upload_path}/original/1X/#{upload.sha1}.png")
- tombstone_key = "discourse-uploads/uploads/tombstone/default/original/1X/#{upload.sha1}.png"
+ test_multisite_connection("default") do
+ upload.update!(
+ url:
+ "//s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/discourse-uploads/#{upload_path}/original/1X/#{upload.sha1}.png",
+ )
+ tombstone_key =
+ "discourse-uploads/uploads/tombstone/default/original/1X/#{upload.sha1}.png"
bucket = prepare_fake_s3
expect(bucket.find_object(upload_key)).to be_present
@@ -172,7 +196,7 @@ RSpec.describe 'Multisite s3 uploads', type: :multisite do
end
end
- describe 'secure uploadss' do
+ describe "secure uploadss" do
let(:store) { FileStore::S3Store.new }
let(:client) { Aws::S3::Client.new(stub_responses: true) }
let(:resource) { Aws::S3::Resource.new(client: client) }
@@ -186,23 +210,25 @@ RSpec.describe 'Multisite s3 uploads', type: :multisite do
SiteSetting.authorized_extensions = "pdf|png|jpg|gif"
end
- before do
- s3_object.stubs(:put).returns(Aws::S3::Types::PutObjectOutput.new(etag: "etag"))
- end
+ before { s3_object.stubs(:put).returns(Aws::S3::Types::PutObjectOutput.new(etag: "etag")) }
describe "when secure attachments are enabled" do
it "returns signed URL with correct path" do
- test_multisite_connection('default') do
- upload = Fabricate(:upload, original_filename: "small.pdf", extension: "pdf", secure: true)
+ test_multisite_connection("default") do
+ upload =
+ Fabricate(:upload, original_filename: "small.pdf", extension: "pdf", secure: true)
path = Discourse.store.get_path_for_upload(upload)
s3_helper.expects(:s3_bucket).returns(s3_bucket).at_least_once
s3_bucket.expects(:object).with("#{upload_path}/#{path}").returns(s3_object).at_least_once
- s3_object.expects(:presigned_url).with(:get, { expires_in: SiteSetting.s3_presigned_get_url_expires_after_seconds })
+ s3_object.expects(:presigned_url).with(
+ :get,
+ { expires_in: SiteSetting.s3_presigned_get_url_expires_after_seconds },
+ )
upload.url = store.store_upload(uploaded_file, upload)
expect(upload.url).to eq(
- "//some-really-cool-bucket.s3.dualstack.us-west-1.amazonaws.com/#{upload_path}/#{path}"
+ "//some-really-cool-bucket.s3.dualstack.us-west-1.amazonaws.com/#{upload_path}/#{path}",
)
expect(store.url_for(upload)).not_to eq(upload.url)
end
@@ -218,7 +244,7 @@ RSpec.describe 'Multisite s3 uploads', type: :multisite do
end
it "returns signed URL with correct path" do
- test_multisite_connection('default') do
+ test_multisite_connection("default") do
upload = Fabricate.build(:upload_s3, sha1: upload_sha1, id: 1)
signed_url = Discourse.store.signed_url_for_path(upload.url)
@@ -226,7 +252,7 @@ RSpec.describe 'Multisite s3 uploads', type: :multisite do
expect(signed_url).to match("#{upload_path}")
end
- test_multisite_connection('second') do
+ test_multisite_connection("second") do
upload_path = Discourse.store.upload_path
upload = Fabricate.build(:upload_s3, sha1: upload_sha1, id: 1)
@@ -239,25 +265,31 @@ RSpec.describe 'Multisite s3 uploads', type: :multisite do
describe "#update_upload_ACL" do
it "updates correct file for default and second multisite db" do
- test_multisite_connection('default') do
+ test_multisite_connection("default") do
upload = build_upload
upload.update!(original_filename: "small.pdf", extension: "pdf", secure: true)
s3_helper.expects(:s3_bucket).returns(s3_bucket).at_least_once
- s3_bucket.expects(:object).with("#{upload_path}/original/1X/#{upload.sha1}.pdf").returns(s3_object)
+ s3_bucket
+ .expects(:object)
+ .with("#{upload_path}/original/1X/#{upload.sha1}.pdf")
+ .returns(s3_object)
s3_object.expects(:acl).returns(s3_object)
s3_object.expects(:put).with(acl: "private").returns(s3_object)
expect(store.update_upload_ACL(upload)).to be_truthy
end
- test_multisite_connection('second') do
+ test_multisite_connection("second") do
upload_path = Discourse.store.upload_path
upload = build_upload
upload.update!(original_filename: "small.pdf", extension: "pdf", secure: true)
s3_helper.expects(:s3_bucket).returns(s3_bucket).at_least_once
- s3_bucket.expects(:object).with("#{upload_path}/original/1X/#{upload.sha1}.pdf").returns(s3_object)
+ s3_bucket
+ .expects(:object)
+ .with("#{upload_path}/original/1X/#{upload.sha1}.pdf")
+ .returns(s3_object)
s3_object.expects(:acl).returns(s3_object)
s3_object.expects(:put).with(acl: "private").returns(s3_object)
@@ -282,38 +314,40 @@ RSpec.describe 'Multisite s3 uploads', type: :multisite do
end
it "returns true if the base hostname is the same for both urls" do
- url = "https://s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/test/original/2X/d/dd7964f5fd13e1103c5244ca30abe1936c0a4b88.png"
+ url =
+ "https://s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/test/original/2X/d/dd7964f5fd13e1103c5244ca30abe1936c0a4b88.png"
expect(store.has_been_uploaded?(url)).to eq(true)
end
it "returns false if the base hostname is the same for both urls BUT the bucket name is different in the path" do
bucket = "someotherbucket"
- url = "https://s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/#{bucket}/original/2X/d/dd7964f5fd13e1103c5244ca30abe1936c0a4b88.png"
+ url =
+ "https://s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/#{bucket}/original/2X/d/dd7964f5fd13e1103c5244ca30abe1936c0a4b88.png"
expect(store.has_been_uploaded?(url)).to eq(false)
end
it "returns false if the hostnames do not match and the s3_cdn_url is blank" do
- url = "https://www.someotherhostname.com/test/original/2X/d/dd7964f5fd13e1103c5244ca30abe1936c0a4b88.png"
+ url =
+ "https://www.someotherhostname.com/test/original/2X/d/dd7964f5fd13e1103c5244ca30abe1936c0a4b88.png"
expect(store.has_been_uploaded?(url)).to eq(false)
end
it "returns true if the s3_cdn_url is present and matches the url hostname" do
SiteSetting.s3_cdn_url = "https://www.someotherhostname.com"
- url = "https://www.someotherhostname.com/test/original/2X/d/dd7964f5fd13e1103c5244ca30abe1936c0a4b88.png"
+ url =
+ "https://www.someotherhostname.com/test/original/2X/d/dd7964f5fd13e1103c5244ca30abe1936c0a4b88.png"
expect(store.has_been_uploaded?(url)).to eq(true)
end
it "returns false if the URI is an invalid mailto link" do
- link = 'mailto: roman;@test.com'
+ link = "mailto: roman;@test.com"
expect(store.has_been_uploaded?(link)).to eq(false)
end
end
describe "#signed_url_for_temporary_upload" do
- before do
- setup_s3
- end
+ before { setup_s3 }
let(:store) { FileStore::S3Store.new }
@@ -324,11 +358,14 @@ RSpec.describe 'Multisite s3 uploads', type: :multisite do
url = store.signed_url_for_temporary_upload("test.png")
key = store.s3_helper.path_from_url(url)
expect(url).to match(/Amz-Expires/)
- expect(key).to match(/temp\/uploads\/default\/test_[0-9]\/[a-zA-z0-9]{0,32}\/[a-zA-z0-9]{0,32}.png/)
+ expect(key).to match(
+ /temp\/uploads\/default\/test_[0-9]\/[a-zA-z0-9]{0,32}\/[a-zA-z0-9]{0,32}.png/,
+ )
end
it "presigned url contans the metadata when provided" do
- url = store.signed_url_for_temporary_upload("test.png", metadata: { "test-meta": "testing" })
+ url =
+ store.signed_url_for_temporary_upload("test.png", metadata: { "test-meta": "testing" })
expect(url).to include("&x-amz-meta-test-meta=testing")
end
end
@@ -340,7 +377,9 @@ RSpec.describe 'Multisite s3 uploads', type: :multisite do
url = store.signed_url_for_temporary_upload("test.png")
key = store.s3_helper.path_from_url(url)
expect(url).to match(/Amz-Expires/)
- expect(key).to match(/temp\/site\/uploads\/default\/test_[0-9]\/[a-zA-z0-9]{0,32}\/[a-zA-z0-9]{0,32}.png/)
+ expect(key).to match(
+ /temp\/site\/uploads\/default\/test_[0-9]\/[a-zA-z0-9]{0,32}\/[a-zA-z0-9]{0,32}.png/,
+ )
end
end
@@ -348,11 +387,13 @@ RSpec.describe 'Multisite s3 uploads', type: :multisite do
before { SiteSetting.s3_upload_bucket = "s3-upload-bucket/standard99" }
it "returns a presigned url with the correct params and the key for the temporary file" do
- test_multisite_connection('second') do
+ test_multisite_connection("second") do
url = store.signed_url_for_temporary_upload("test.png")
key = store.s3_helper.path_from_url(url)
expect(url).to match(/Amz-Expires/)
- expect(key).to match(/temp\/standard99\/uploads\/second\/test_[0-9]\/[a-zA-z0-9]{0,32}\/[a-zA-z0-9]{0,32}.png/)
+ expect(key).to match(
+ /temp\/standard99\/uploads\/second\/test_[0-9]\/[a-zA-z0-9]{0,32}\/[a-zA-z0-9]{0,32}.png/,
+ )
end
end
end
diff --git a/spec/multisite/site_settings_spec.rb b/spec/multisite/site_settings_spec.rb
index 63b4d264405..45e5caaeff3 100644
--- a/spec/multisite/site_settings_spec.rb
+++ b/spec/multisite/site_settings_spec.rb
@@ -1,38 +1,32 @@
# frozen_string_literal: true
-RSpec.describe 'Multisite SiteSettings', type: :multisite do
+RSpec.describe "Multisite SiteSettings", type: :multisite do
before do
@original_provider = SiteSetting.provider
SiteSetting.provider = SiteSettings::DbProvider.new(SiteSetting)
end
- after do
- SiteSetting.provider = @original_provider
- end
+ after { SiteSetting.provider = @original_provider }
- describe '#default_locale' do
- it 'should return the right locale' do
- test_multisite_connection('default') do
- expect(SiteSetting.default_locale).to eq('en')
+ describe "#default_locale" do
+ it "should return the right locale" do
+ test_multisite_connection("default") { expect(SiteSetting.default_locale).to eq("en") }
+
+ test_multisite_connection("second") do
+ SiteSetting.default_locale = "zh_TW"
+
+ expect(SiteSetting.default_locale).to eq("zh_TW")
end
- test_multisite_connection('second') do
- SiteSetting.default_locale = 'zh_TW'
+ test_multisite_connection("default") do
+ expect(SiteSetting.default_locale).to eq("en")
- expect(SiteSetting.default_locale).to eq('zh_TW')
+ SiteSetting.default_locale = "ja"
+
+ expect(SiteSetting.default_locale).to eq("ja")
end
- test_multisite_connection('default') do
- expect(SiteSetting.default_locale).to eq('en')
-
- SiteSetting.default_locale = 'ja'
-
- expect(SiteSetting.default_locale).to eq('ja')
- end
-
- test_multisite_connection('second') do
- expect(SiteSetting.default_locale).to eq('zh_TW')
- end
+ test_multisite_connection("second") { expect(SiteSetting.default_locale).to eq("zh_TW") }
end
end
end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 4b065872c6e..1644f6af06e 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -1,26 +1,28 @@
# frozen_string_literal: true
-if ENV['COVERAGE']
- require 'simplecov'
- SimpleCov.command_name "#{SimpleCov.command_name} #{ENV['TEST_ENV_NUMBER']}" if ENV['TEST_ENV_NUMBER']
- SimpleCov.start 'rails' do
- add_group 'Libraries', /^\/lib\/(?!tasks).*$/
- add_group 'Scripts', 'script'
- add_group 'Serializers', 'app/serializers'
- add_group 'Services', 'app/services'
- add_group 'Tasks', 'lib/tasks'
+if ENV["COVERAGE"]
+ require "simplecov"
+ if ENV["TEST_ENV_NUMBER"]
+ SimpleCov.command_name "#{SimpleCov.command_name} #{ENV["TEST_ENV_NUMBER"]}"
+ end
+ SimpleCov.start "rails" do
+ add_group "Libraries", %r{^/lib/(?!tasks).*$}
+ add_group "Scripts", "script"
+ add_group "Serializers", "app/serializers"
+ add_group "Services", "app/services"
+ add_group "Tasks", "lib/tasks"
end
end
-require 'rubygems'
-require 'rbtrace' if RUBY_ENGINE == "ruby"
-require 'pry'
-require 'pry-byebug'
-require 'pry-rails'
-require 'fabrication'
-require 'mocha/api'
-require 'certified'
-require 'webmock/rspec'
+require "rubygems"
+require "rbtrace" if RUBY_ENGINE == "ruby"
+require "pry"
+require "pry-byebug"
+require "pry-rails"
+require "fabrication"
+require "mocha/api"
+require "certified"
+require "webmock/rspec"
class RspecErrorTracker
def self.last_exception=(ex)
@@ -39,9 +41,9 @@ class RspecErrorTracker
begin
@app.call(env)
- # This is a little repetitive, but since WebMock::NetConnectNotAllowedError
- # and also Mocha::ExpectationError inherit from Exception instead of StandardError
- # they do not get captured by the rescue => e shorthand :(
+ # This is a little repetitive, but since WebMock::NetConnectNotAllowedError
+ # and also Mocha::ExpectationError inherit from Exception instead of StandardError
+ # they do not get captured by the rescue => e shorthand :(
rescue WebMock::NetConnectNotAllowedError, Mocha::ExpectationError, StandardError => e
RspecErrorTracker.last_exception = e
raise e
@@ -50,16 +52,16 @@ class RspecErrorTracker
end
end
-ENV["RAILS_ENV"] ||= 'test'
+ENV["RAILS_ENV"] ||= "test"
require File.expand_path("../../config/environment", __FILE__)
-require 'rspec/rails'
-require 'shoulda-matchers'
-require 'sidekiq/testing'
-require 'test_prof/recipes/rspec/let_it_be'
-require 'test_prof/before_all/adapters/active_record'
-require 'webdrivers'
-require 'selenium-webdriver'
-require 'capybara/rails'
+require "rspec/rails"
+require "shoulda-matchers"
+require "sidekiq/testing"
+require "test_prof/recipes/rspec/let_it_be"
+require "test_prof/before_all/adapters/active_record"
+require "webdrivers"
+require "selenium-webdriver"
+require "capybara/rails"
# The shoulda-matchers gem no longer detects the test framework
# you're using or mixes itself into that framework automatically.
@@ -79,21 +81,15 @@ Dir[Rails.root.join("spec/system/page_objects/**/base.rb")].each { |f| require f
Dir[Rails.root.join("spec/system/page_objects/**/*.rb")].each { |f| require f }
Dir[Rails.root.join("spec/fabricators/*.rb")].each { |f| require f }
-require_relative './helpers/redis_snapshot_helper'
+require_relative "./helpers/redis_snapshot_helper"
# Require plugin helpers at plugin/[plugin]/spec/plugin_helper.rb (includes symlinked plugins).
-if ENV['LOAD_PLUGINS'] == "1"
- Dir[Rails.root.join("plugins/*/spec/plugin_helper.rb")].each do |f|
- require f
- end
+if ENV["LOAD_PLUGINS"] == "1"
+ Dir[Rails.root.join("plugins/*/spec/plugin_helper.rb")].each { |f| require f }
- Dir[Rails.root.join("plugins/*/spec/fabricators/**/*.rb")].each do |f|
- require f
- end
+ Dir[Rails.root.join("plugins/*/spec/fabricators/**/*.rb")].each { |f| require f }
- Dir[Rails.root.join("plugins/*/spec/system/page_objects/**/*.rb")].each do |f|
- require f
- end
+ Dir[Rails.root.join("plugins/*/spec/system/page_objects/**/*.rb")].each { |f| require f }
end
# let's not run seed_fu every test
@@ -105,7 +101,7 @@ SeedFu.seed
# we need this env var to ensure that we can impersonate in test
# this enable integration_helpers sign_in helper
-ENV['DISCOURSE_DEV_ALLOW_ANON_TO_IMPERSONATE'] = '1'
+ENV["DISCOURSE_DEV_ALLOW_ANON_TO_IMPERSONATE"] = "1"
module TestSetup
# This is run before each test and before each before_all block
@@ -118,9 +114,7 @@ module TestSetup
SiteIconManager.disable
WordWatcher.disable_cache
- SiteSetting.provider.all.each do |setting|
- SiteSetting.remove_override!(setting.name)
- end
+ SiteSetting.provider.all.each { |setting| SiteSetting.remove_override!(setting.name) }
# very expensive IO operations
SiteSetting.automatically_download_gravatars = false
@@ -158,31 +152,23 @@ module TestSetup
end
end
-TestProf::BeforeAll.configure do |config|
- config.before(:begin) do
- TestSetup.test_setup
- end
-end
+TestProf::BeforeAll.configure { |config| config.before(:begin) { TestSetup.test_setup } }
-if ENV['PREFABRICATION'] == '0'
+if ENV["PREFABRICATION"] == "0"
module Prefabrication
def fab!(name, &blk)
let!(name, &blk)
end
end
- RSpec.configure do |config|
- config.extend Prefabrication
- end
+ RSpec.configure { |config| config.extend Prefabrication }
else
- TestProf::LetItBe.configure do |config|
- config.alias_to :fab!, refind: true
- end
+ TestProf::LetItBe.configure { |config| config.alias_to :fab!, refind: true }
end
RSpec.configure do |config|
- config.fail_fast = ENV['RSPEC_FAIL_FAST'] == "1"
- config.silence_filter_announcements = ENV['RSPEC_SILENCE_FILTER_ANNOUNCEMENTS'] == "1"
+ config.fail_fast = ENV["RSPEC_FAIL_FAST"] == "1"
+ config.silence_filter_announcements = ENV["RSPEC_SILENCE_FILTER_ANNOUNCEMENTS"] == "1"
config.extend RedisSnapshotHelper
config.include Helpers
config.include MessageBus
@@ -196,7 +182,7 @@ RSpec.configure do |config|
config.include OneboxHelpers
config.include FastImageHelpers
config.mock_framework = :mocha
- config.order = 'random'
+ config.order = "random"
config.infer_spec_type_from_file_location!
# If you're not using ActiveRecord, or you'd prefer not to run each of your
@@ -223,7 +209,7 @@ RSpec.configure do |config|
# Ugly, but needed until we have a user creator
User.skip_callback(:create, :after, :ensure_in_trust_level_group)
- DiscoursePluginRegistry.reset! if ENV['LOAD_PLUGINS'] != "1"
+ DiscoursePluginRegistry.reset! if ENV["LOAD_PLUGINS"] != "1"
Discourse.current_user_provider = TestCurrentUserProvider
SiteSetting.refresh!
@@ -240,10 +226,7 @@ RSpec.configure do |config|
SiteSetting.provider = TestLocalProcessProvider.new
- WebMock.disable_net_connect!(
- allow_localhost: true,
- allow: [Webdrivers::Chromedriver.base_url]
- )
+ WebMock.disable_net_connect!(allow_localhost: true, allow: [Webdrivers::Chromedriver.base_url])
if ENV["CAPBYARA_DEFAULT_MAX_WAIT_TIME"].present?
Capybara.default_max_wait_time = ENV["CAPBYARA_DEFAULT_MAX_WAIT_TIME"].to_i
@@ -254,7 +237,7 @@ RSpec.configure do |config|
Capybara.configure do |capybara_config|
capybara_config.server_host = "localhost"
- capybara_config.server_port = 31337 + ENV['TEST_ENV_NUMBER'].to_i
+ capybara_config.server_port = 31_337 + ENV["TEST_ENV_NUMBER"].to_i
end
# The valid values for SELENIUM_BROWSER_LOG_LEVEL are:
@@ -266,31 +249,24 @@ RSpec.configure do |config|
# DEBUG
# ALL
browser_log_level = ENV["SELENIUM_BROWSER_LOG_LEVEL"] || "SEVERE"
- chrome_browser_options = Selenium::WebDriver::Chrome::Options.new(
- logging_prefs: { "browser" => browser_log_level, "driver" => "ALL" }
- ).tap do |options|
- options.add_argument("--window-size=1400,1400")
- options.add_argument("--no-sandbox")
- options.add_argument("--disable-dev-shm-usage")
- options.add_argument("--mute-audio")
- end
+ chrome_browser_options =
+ Selenium::WebDriver::Chrome::Options
+ .new(logging_prefs: { "browser" => browser_log_level, "driver" => "ALL" })
+ .tap do |options|
+ options.add_argument("--window-size=1400,1400")
+ options.add_argument("--no-sandbox")
+ options.add_argument("--disable-dev-shm-usage")
+ options.add_argument("--mute-audio")
+ end
Capybara.register_driver :selenium_chrome do |app|
- Capybara::Selenium::Driver.new(
- app,
- browser: :chrome,
- capabilities: chrome_browser_options,
- )
+ Capybara::Selenium::Driver.new(app, browser: :chrome, capabilities: chrome_browser_options)
end
Capybara.register_driver :selenium_chrome_headless do |app|
chrome_browser_options.add_argument("--headless")
- Capybara::Selenium::Driver.new(
- app,
- browser: :chrome,
- capabilities: chrome_browser_options,
- )
+ Capybara::Selenium::Driver.new(app, browser: :chrome, capabilities: chrome_browser_options)
end
mobile_chrome_browser_options =
@@ -321,7 +297,7 @@ RSpec.configure do |config|
)
end
- if ENV['ELEVATED_UPLOADS_ID']
+ if ENV["ELEVATED_UPLOADS_ID"]
DB.exec "SELECT setval('uploads_id_seq', 10000)"
else
DB.exec "SELECT setval('uploads_id_seq', 1)"
@@ -357,9 +333,7 @@ RSpec.configure do |config|
end
config.after(:suite) do
- if SpecSecureRandom.value
- FileUtils.remove_dir(file_from_fixtures_tmp_folder, true)
- end
+ FileUtils.remove_dir(file_from_fixtures_tmp_folder, true) if SpecSecureRandom.value
end
config.before :each, &TestSetup.method(:test_setup)
@@ -368,7 +342,8 @@ RSpec.configure do |config|
before_event_count = DiscourseEvent.events.values.sum(&:count)
example.run
after_event_count = DiscourseEvent.events.values.sum(&:count)
- expect(before_event_count).to eq(after_event_count), "DiscourseEvent registrations were not cleaned up"
+ expect(before_event_count).to eq(after_event_count),
+ "DiscourseEvent registrations were not cleaned up"
end
config.before :each do
@@ -377,8 +352,8 @@ RSpec.configure do |config|
end
# Match the request hostname to the value in `database.yml`
- config.before(:all, type: [:request, :multisite, :system]) { host! "test.localhost" }
- config.before(:each, type: [:request, :multisite, :system]) { host! "test.localhost" }
+ config.before(:all, type: %i[request multisite system]) { host! "test.localhost" }
+ config.before(:each, type: %i[request multisite system]) { host! "test.localhost" }
last_driven_by = nil
config.before(:each, type: :system) do |example|
@@ -400,9 +375,7 @@ RSpec.configure do |config|
# for system tests then enable it.
if ENV["SELENIUM_VERBOSE_DRIVER_LOGS"]
lines << "~~~~~~~ DRIVER LOGS ~~~~~~~"
- page.driver.browser.logs.get(:driver).each do |log|
- lines << log.message
- end
+ page.driver.browser.logs.get(:driver).each { |log| lines << log.message }
lines << "~~~~~ END DRIVER LOGS ~~~~~"
end
@@ -414,9 +387,7 @@ RSpec.configure do |config|
if example.exception.kind_of?(RSpec::Core::MultipleExceptionError)
lines << "~~~~~~~ SYSTEM TEST ERRORS ~~~~~~~"
- example.exception.all_exceptions.each do |ex|
- lines << ex.message
- end
+ example.exception.all_exceptions.each { |ex| lines << ex.message }
lines << "~~~~~ END SYSTEM TEST ERRORS ~~~~~"
skip_js_errors = true
@@ -428,9 +399,7 @@ RSpec.configure do |config|
if logs.empty?
lines << "(no logs)"
else
- logs.each do |log|
- lines << log.message
- end
+ logs.each { |log| lines << log.message }
end
lines << "~~~~~ END JS LOGS ~~~~~"
end
@@ -443,10 +412,9 @@ RSpec.configure do |config|
config.before(:each, type: :multisite) do
Rails.configuration.multisite = true # rubocop:disable Discourse/NoDirectMultisiteManipulation
- RailsMultisite::ConnectionManagement.config_filename =
- "spec/fixtures/multisite/two_dbs.yml"
+ RailsMultisite::ConnectionManagement.config_filename = "spec/fixtures/multisite/two_dbs.yml"
- RailsMultisite::ConnectionManagement.establish_connection(db: 'default')
+ RailsMultisite::ConnectionManagement.establish_connection(db: "default")
end
config.after(:each, type: :multisite) do
@@ -480,7 +448,6 @@ RSpec.configure do |config|
end
end
end
-
end
class TrackTimeStub
@@ -498,9 +465,7 @@ def global_setting(name, value)
GlobalSetting.stubs(name).returns(value)
- before_next_spec do
- GlobalSetting.reset_s3_cache!
- end
+ before_next_spec { GlobalSetting.reset_s3_cache! }
end
def set_cdn_url(cdn_url)
@@ -612,22 +577,19 @@ def create_request_env(path: nil)
end
def create_auth_cookie(token:, user_id: nil, trust_level: nil, issued_at: Time.current)
- data = {
- token: token,
- user_id: user_id,
- trust_level: trust_level,
- issued_at: issued_at.to_i
- }
+ data = { token: token, user_id: user_id, trust_level: trust_level, issued_at: issued_at.to_i }
jar = ActionDispatch::Cookies::CookieJar.build(ActionDispatch::TestRequest.create, {})
jar.encrypted[:_t] = { value: data }
CGI.escape(jar[:_t])
end
def decrypt_auth_cookie(cookie)
- ActionDispatch::Cookies::CookieJar
- .build(ActionDispatch::TestRequest.create, { _t: cookie })
- .encrypted[:_t]
- .with_indifferent_access
+ ActionDispatch::Cookies::CookieJar.build(
+ ActionDispatch::TestRequest.create,
+ { _t: cookie },
+ ).encrypted[
+ :_t
+ ].with_indifferent_access
end
class SpecSecureRandom
diff --git a/spec/requests/about_controller_spec.rb b/spec/requests/about_controller_spec.rb
index 7ddfd84d8bb..eb719ae9f7d 100644
--- a/spec/requests/about_controller_spec.rb
+++ b/spec/requests/about_controller_spec.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
RSpec.describe AboutController do
- describe '#index' do
+ describe "#index" do
it "should display the about page for anonymous user when login_required is false" do
SiteSetting.login_required = false
get "/about"
@@ -10,11 +10,11 @@ RSpec.describe AboutController do
expect(response.body).to include("About - Discourse ")
end
- it 'should redirect to login page for anonymous user when login_required is true' do
+ it "should redirect to login page for anonymous user when login_required is true" do
SiteSetting.login_required = true
get "/about"
- expect(response).to redirect_to '/login'
+ expect(response).to redirect_to "/login"
end
it "should display the about page for logged in user when login_required is true" do
@@ -27,14 +27,14 @@ RSpec.describe AboutController do
context "with crawler view" do
it "should include correct title" do
- get '/about', headers: { 'HTTP_USER_AGENT' => 'Googlebot' }
+ get "/about", headers: { "HTTP_USER_AGENT" => "Googlebot" }
expect(response.status).to eq(200)
expect(response.body).to include("About - Discourse ")
end
it "should include correct user URLs" do
Fabricate(:admin, username: "anAdminUser")
- get '/about', headers: { 'HTTP_USER_AGENT' => 'Googlebot' }
+ get "/about", headers: { "HTTP_USER_AGENT" => "Googlebot" }
expect(response.status).to eq(200)
expect(response.body).to include("/u/anadminuser")
end
diff --git a/spec/requests/admin/admin_controller_spec.rb b/spec/requests/admin/admin_controller_spec.rb
index 41d067f36d4..afab9bdfe67 100644
--- a/spec/requests/admin/admin_controller_spec.rb
+++ b/spec/requests/admin/admin_controller_spec.rb
@@ -38,10 +38,11 @@ RSpec.describe Admin::AdminController do
it "permits access with a 200 response" do
api_key = Fabricate(:api_key, user: admin)
- get "/admin.json", headers: {
- HTTP_API_KEY: api_key.key,
- HTTP_API_USERNAME: admin.username
- }
+ get "/admin.json",
+ headers: {
+ HTTP_API_KEY: api_key.key,
+ HTTP_API_USERNAME: admin.username,
+ }
expect(response.status).to eq(200)
end
@@ -51,10 +52,11 @@ RSpec.describe Admin::AdminController do
it "denies access with a 403 response" do
api_key = Fabricate(:api_key, user: moderator)
- get "/admin.json", headers: {
- HTTP_API_KEY: api_key.key,
- HTTP_API_USERNAME: moderator.username
- }
+ get "/admin.json",
+ headers: {
+ HTTP_API_KEY: api_key.key,
+ HTTP_API_USERNAME: moderator.username,
+ }
expect(response.status).to eq(403)
expect(response.parsed_body["errors"]).to include(I18n.t("invalid_access"))
diff --git a/spec/requests/admin/api_controller_spec.rb b/spec/requests/admin/api_controller_spec.rb
index 9fbc4f0c8d8..f6bb8163939 100644
--- a/spec/requests/admin/api_controller_spec.rb
+++ b/spec/requests/admin/api_controller_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe Admin::ApiController do
fab!(:key2, refind: false) { Fabricate(:api_key, user: admin) }
fab!(:key3, refind: false) { Fabricate(:api_key, user: admin) }
- describe '#index' do
+ describe "#index" do
context "when logged in as an admin" do
before { sign_in(admin) }
@@ -24,12 +24,18 @@ RSpec.describe Admin::ApiController do
get "/admin/api/keys.json?offset=0&limit=2"
expect(response.status).to eq(200)
- expect(response.parsed_body["keys"].map { |x| x["id"] }).to contain_exactly(key3.id, key2.id)
+ expect(response.parsed_body["keys"].map { |x| x["id"] }).to contain_exactly(
+ key3.id,
+ key2.id,
+ )
get "/admin/api/keys.json?offset=1&limit=2"
expect(response.status).to eq(200)
- expect(response.parsed_body["keys"].map { |x| x["id"] }).to contain_exactly(key2.id, key1.id)
+ expect(response.parsed_body["keys"].map { |x| x["id"] }).to contain_exactly(
+ key2.id,
+ key1.id,
+ )
get "/admin/api/keys.json?offset=2&limit=2"
@@ -55,13 +61,13 @@ RSpec.describe Admin::ApiController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "keys inaccessible"
end
end
- describe '#show' do
+ describe "#show" do
context "when logged in as an admin" do
before { sign_in(admin) }
@@ -100,19 +106,20 @@ RSpec.describe Admin::ApiController do
end
end
- describe '#update' do
+ describe "#update" do
context "when logged in as an admin" do
before { sign_in(admin) }
it "allows updating the description" do
original_key = key1.key
- put "/admin/api/keys/#{key1.id}.json", params: {
- key: {
- description: "my new description",
- key: "overridekey"
- }
- }
+ put "/admin/api/keys/#{key1.id}.json",
+ params: {
+ key: {
+ description: "my new description",
+ key: "overridekey",
+ },
+ }
expect(response.status).to eq(200)
key1.reload
@@ -124,9 +131,7 @@ RSpec.describe Admin::ApiController do
end
it "returns 400 for invalid payloads" do
- put "/admin/api/keys/#{key1.id}.json", params: {
- key: "string not a hash"
- }
+ put "/admin/api/keys/#{key1.id}.json", params: { key: "string not a hash" }
expect(response.status).to eq(400)
put "/admin/api/keys/#{key1.id}.json", params: {}
@@ -140,12 +145,13 @@ RSpec.describe Admin::ApiController do
original_key = key1.key
original_description = key1.description
- put "/admin/api/keys/#{key1.id}.json", params: {
- key: {
- description: "my new description",
- key: "overridekey"
- }
- }
+ put "/admin/api/keys/#{key1.id}.json",
+ params: {
+ key: {
+ description: "my new description",
+ key: "overridekey",
+ },
+ }
key1.reload
expect(response.status).to eq(404)
@@ -215,21 +221,17 @@ RSpec.describe Admin::ApiController do
before { sign_in(admin) }
it "can create a master key" do
- post "/admin/api/keys.json", params: {
- key: {
- description: "master key description"
- }
- }
+ post "/admin/api/keys.json", params: { key: { description: "master key description" } }
expect(response.status).to eq(200)
data = response.parsed_body
- expect(data['key']['description']).to eq("master key description")
- expect(data['key']['user']).to eq(nil)
- expect(data['key']['key']).to_not eq(nil)
- expect(data['key']['last_used_at']).to eq(nil)
+ expect(data["key"]["description"]).to eq("master key description")
+ expect(data["key"]["user"]).to eq(nil)
+ expect(data["key"]["key"]).to_not eq(nil)
+ expect(data["key"]["last_used_at"]).to eq(nil)
- key = ApiKey.find(data['key']['id'])
+ key = ApiKey.find(data["key"]["id"])
expect(key.description).to eq("master key description")
expect(key.user).to eq(nil)
@@ -239,22 +241,23 @@ RSpec.describe Admin::ApiController do
it "can create a user-specific key" do
user = Fabricate(:user)
- post "/admin/api/keys.json", params: {
- key: {
- description: "restricted key description",
- username: user.username
- }
- }
+ post "/admin/api/keys.json",
+ params: {
+ key: {
+ description: "restricted key description",
+ username: user.username,
+ },
+ }
expect(response.status).to eq(200)
data = response.parsed_body
- expect(data['key']['description']).to eq("restricted key description")
- expect(data['key']['user']['username']).to eq(user.username)
- expect(data['key']['key']).to_not eq(nil)
- expect(data['key']['last_used_at']).to eq(nil)
+ expect(data["key"]["description"]).to eq("restricted key description")
+ expect(data["key"]["user"]["username"]).to eq(user.username)
+ expect(data["key"]["key"]).to_not eq(nil)
+ expect(data["key"]["last_used_at"]).to eq(nil)
- key = ApiKey.find(data['key']['id'])
+ key = ApiKey.find(data["key"]["id"])
expect(key.description).to eq("restricted key description")
expect(key.user.id).to eq(user.id)
@@ -262,63 +265,67 @@ RSpec.describe Admin::ApiController do
expect(UserHistory.last.subject).to eq(key.truncated_key)
end
- describe 'Scopes' do
- it 'creates an scope with allowed parameters' do
- post "/admin/api/keys.json", params: {
- key: {
- description: "master key description",
- scopes: [{ scope_id: 'topics:write', topic_id: '55' }]
- }
- }
+ describe "Scopes" do
+ it "creates an scope with allowed parameters" do
+ post "/admin/api/keys.json",
+ params: {
+ key: {
+ description: "master key description",
+ scopes: [{ scope_id: "topics:write", topic_id: "55" }],
+ },
+ }
expect(response.status).to eq(200)
data = response.parsed_body
- scope = ApiKeyScope.find_by(api_key_id: data.dig('key', 'id'))
+ scope = ApiKeyScope.find_by(api_key_id: data.dig("key", "id"))
- expect(scope.resource).to eq('topics')
- expect(scope.action).to eq('write')
- expect(scope.allowed_parameters['topic_id']).to contain_exactly('55')
+ expect(scope.resource).to eq("topics")
+ expect(scope.action).to eq("write")
+ expect(scope.allowed_parameters["topic_id"]).to contain_exactly("55")
end
- it 'allows multiple parameters separated by a comma' do
- post "/admin/api/keys.json", params: {
- key: {
- description: "master key description",
- scopes: [{ scope_id: 'topics:write', topic_id: '55,33' }]
- }
- }
+ it "allows multiple parameters separated by a comma" do
+ post "/admin/api/keys.json",
+ params: {
+ key: {
+ description: "master key description",
+ scopes: [{ scope_id: "topics:write", topic_id: "55,33" }],
+ },
+ }
expect(response.status).to eq(200)
data = response.parsed_body
- scope = ApiKeyScope.find_by(api_key_id: data.dig('key', 'id'))
+ scope = ApiKeyScope.find_by(api_key_id: data.dig("key", "id"))
- expect(scope.allowed_parameters['topic_id']).to contain_exactly('55', '33')
+ expect(scope.allowed_parameters["topic_id"]).to contain_exactly("55", "33")
end
end
- it 'ignores invalid parameters' do
- post "/admin/api/keys.json", params: {
- key: {
- description: "master key description",
- scopes: [{ scope_id: 'topics:write', fake_id: '55' }]
- }
- }
+ it "ignores invalid parameters" do
+ post "/admin/api/keys.json",
+ params: {
+ key: {
+ description: "master key description",
+ scopes: [{ scope_id: "topics:write", fake_id: "55" }],
+ },
+ }
expect(response.status).to eq(200)
data = response.parsed_body
- scope = ApiKeyScope.find_by(api_key_id: data.dig('key', 'id'))
+ scope = ApiKeyScope.find_by(api_key_id: data.dig("key", "id"))
- expect(scope.allowed_parameters['fake_id']).to be_nil
+ expect(scope.allowed_parameters["fake_id"]).to be_nil
end
- it 'fails when the scope is invalid' do
- post "/admin/api/keys.json", params: {
- key: {
- description: "master key description",
- scopes: [{ scope_id: 'something:else' }]
- }
- }
+ it "fails when the scope is invalid" do
+ post "/admin/api/keys.json",
+ params: {
+ key: {
+ description: "master key description",
+ scopes: [{ scope_id: "something:else" }],
+ },
+ }
expect(response.status).to eq(400)
end
@@ -326,11 +333,7 @@ RSpec.describe Admin::ApiController do
shared_examples "key creation not allowed" do
it "prevents key creation with a 404 response" do
- post "/admin/api/keys.json", params: {
- key: {
- description: "master key description"
- }
- }
+ post "/admin/api/keys.json", params: { key: { description: "master key description" } }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -425,7 +428,7 @@ RSpec.describe Admin::ApiController do
"global",
"badges",
"categories",
- "wordpress"
+ "wordpress",
)
end
end
diff --git a/spec/requests/admin/backups_controller_spec.rb b/spec/requests/admin/backups_controller_spec.rb
index 069e6f1859a..b52278832c0 100644
--- a/spec/requests/admin/backups_controller_spec.rb
+++ b/spec/requests/admin/backups_controller_spec.rb
@@ -9,11 +9,12 @@ RSpec.describe Admin::BackupsController do
let(:backup_filename2) { "2014-02-11-065935.tar.gz" }
def create_backup_files(*filenames)
- @paths = filenames.map do |filename|
- path = backup_path(filename)
- File.open(path, "w") { |f| f.write("test backup") }
- path
- end
+ @paths =
+ filenames.map do |filename|
+ path = backup_path(filename)
+ File.open(path, "w") { |f| f.write("test backup") }
+ path
+ end
end
def backup_path(filename)
@@ -21,14 +22,13 @@ RSpec.describe Admin::BackupsController do
end
def map_preloaded
- controller.instance_variable_get("@preloaded").map do |key, value|
- [key, JSON.parse(value)]
- end.to_h
+ controller
+ .instance_variable_get("@preloaded")
+ .map { |key, value| [key, JSON.parse(value)] }
+ .to_h
end
- before do
- SiteSetting.backup_location = BackupLocationSiteSetting::LOCAL
- end
+ before { SiteSetting.backup_location = BackupLocationSiteSetting::LOCAL }
after do
Discourse.redis.flushdb
@@ -53,7 +53,9 @@ RSpec.describe Admin::BackupsController do
expect(response.status).to eq(200)
preloaded = map_preloaded
- expect(preloaded["operations_status"].symbolize_keys).to eq(BackupRestore.operations_status)
+ expect(preloaded["operations_status"].symbolize_keys).to eq(
+ BackupRestore.operations_status,
+ )
expect(preloaded["logs"].size).to eq(BackupRestore.logs.size)
end
end
@@ -94,13 +96,13 @@ RSpec.describe Admin::BackupsController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "backups inaccessible"
end
end
- describe '#status' do
+ describe "#status" do
context "when logged in as an admin" do
before { sign_in(admin) }
@@ -127,22 +129,23 @@ RSpec.describe Admin::BackupsController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "status inaccessible"
end
end
- describe '#create' do
+ describe "#create" do
context "when logged in as an admin" do
before { sign_in(admin) }
it "starts a backup" do
- BackupRestore.expects(:backup!).with(admin.id, { publish_to_message_bus: true, with_uploads: false, client_id: "foo" })
+ BackupRestore.expects(:backup!).with(
+ admin.id,
+ { publish_to_message_bus: true, with_uploads: false, client_id: "foo" },
+ )
- post "/admin/backups.json", params: {
- with_uploads: false, client_id: "foo"
- }
+ post "/admin/backups.json", params: { with_uploads: false, client_id: "foo" }
expect(response.status).to eq(200)
end
@@ -150,10 +153,7 @@ RSpec.describe Admin::BackupsController do
shared_examples "backups creation not allowed" do
it "prevents backups creation with a 404 response" do
- post "/admin/backups.json", params: {
- with_uploads: false,
- client_id: "foo"
- }
+ post "/admin/backups.json", params: { with_uploads: false, client_id: "foo" }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -167,13 +167,13 @@ RSpec.describe Admin::BackupsController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "backups creation not allowed"
end
end
- describe '#show' do
+ describe "#show" do
context "when logged in as an admin" do
before { sign_in(admin) }
@@ -184,10 +184,12 @@ RSpec.describe Admin::BackupsController do
expect do
get "/admin/backups/#{backup_filename}.json", params: { token: token }
- end.to change { UserHistory.where(action: UserHistory.actions[:backup_download]).count }.by(1)
+ end.to change {
+ UserHistory.where(action: UserHistory.actions[:backup_download]).count
+ }.by(1)
- expect(response.headers['Content-Length']).to eq("11")
- expect(response.headers['Content-Disposition']).to match(/attachment; filename/)
+ expect(response.headers["Content-Length"]).to eq("11")
+ expect(response.headers["Content-Disposition"]).to match(/attachment; filename/)
end
end
@@ -196,7 +198,7 @@ RSpec.describe Admin::BackupsController do
get "/admin/backups/#{backup_filename}.json", params: { token: "bad_value" }
expect(response.status).to eq(422)
- expect(response.headers['Content-Disposition']).not_to match(/attachment; filename/)
+ expect(response.headers["Content-Disposition"]).not_to match(/attachment; filename/)
expect(response.body).to include(I18n.t("download_backup_mailer.no_token"))
end
end
@@ -217,11 +219,13 @@ RSpec.describe Admin::BackupsController do
expect do
get "/admin/backups/#{backup_filename}.json", params: { token: token }
- end.not_to change { UserHistory.where(action: UserHistory.actions[:backup_download]).count }
+ end.not_to change {
+ UserHistory.where(action: UserHistory.actions[:backup_download]).count
+ }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
- expect(response.headers['Content-Disposition']).not_to match(/attachment; filename/)
+ expect(response.headers["Content-Disposition"]).not_to match(/attachment; filename/)
end
end
end
@@ -233,13 +237,13 @@ RSpec.describe Admin::BackupsController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "backup inaccessible"
end
end
- describe '#destroy' do
+ describe "#destroy" do
context "when logged in as an admin" do
before { sign_in(admin) }
@@ -249,9 +253,9 @@ RSpec.describe Admin::BackupsController do
create_backup_files(backup_filename)
expect(File.exist?(path)).to eq(true)
- expect do
- delete "/admin/backups/#{backup_filename}.json"
- end.to change { UserHistory.where(action: UserHistory.actions[:backup_destroy]).count }.by(1)
+ expect do delete "/admin/backups/#{backup_filename}.json" end.to change {
+ UserHistory.where(action: UserHistory.actions[:backup_destroy]).count
+ }.by(1)
expect(response.status).to eq(200)
expect(File.exist?(path)).to eq(false)
@@ -271,9 +275,9 @@ RSpec.describe Admin::BackupsController do
create_backup_files(backup_filename)
expect(File.exist?(path)).to eq(true)
- expect do
- delete "/admin/backups/#{backup_filename}.json"
- end.not_to change { UserHistory.where(action: UserHistory.actions[:backup_destroy]).count }
+ expect do delete "/admin/backups/#{backup_filename}.json" end.not_to change {
+ UserHistory.where(action: UserHistory.actions[:backup_destroy]).count
+ }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -289,13 +293,13 @@ RSpec.describe Admin::BackupsController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "backup deletion not allowed"
end
end
- describe '#logs' do
+ describe "#logs" do
context "when logged in as an admin" do
before { sign_in(admin) }
@@ -325,18 +329,21 @@ RSpec.describe Admin::BackupsController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "backup logs inaccessible"
end
end
- describe '#restore' do
+ describe "#restore" do
context "when logged in as an admin" do
before { sign_in(admin) }
it "starts a restore" do
- BackupRestore.expects(:restore!).with(admin.id, { filename: backup_filename, publish_to_message_bus: true, client_id: "foo" })
+ BackupRestore.expects(:restore!).with(
+ admin.id,
+ { filename: backup_filename, publish_to_message_bus: true, client_id: "foo" },
+ )
post "/admin/backups/#{backup_filename}/restore.json", params: { client_id: "foo" }
@@ -360,21 +367,25 @@ RSpec.describe Admin::BackupsController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "backup restoration not allowed"
end
end
- describe '#readonly' do
+ describe "#readonly" do
context "when logged in as an admin" do
before { sign_in(admin) }
it "enables readonly mode" do
expect(Discourse.readonly_mode?).to eq(false)
- expect { put "/admin/backups/readonly.json", params: { enable: true } }
- .to change { UserHistory.where(action: UserHistory.actions[:change_readonly_mode], new_value: "t").count }.by(1)
+ expect { put "/admin/backups/readonly.json", params: { enable: true } }.to change {
+ UserHistory.where(
+ action: UserHistory.actions[:change_readonly_mode],
+ new_value: "t",
+ ).count
+ }.by(1)
expect(Discourse.readonly_mode?).to eq(true)
expect(response.status).to eq(200)
@@ -384,8 +395,12 @@ RSpec.describe Admin::BackupsController do
Discourse.enable_readonly_mode(Discourse::USER_READONLY_MODE_KEY)
expect(Discourse.readonly_mode?).to eq(true)
- expect { put "/admin/backups/readonly.json", params: { enable: false } }
- .to change { UserHistory.where(action: UserHistory.actions[:change_readonly_mode], new_value: "f").count }.by(1)
+ expect { put "/admin/backups/readonly.json", params: { enable: false } }.to change {
+ UserHistory.where(
+ action: UserHistory.actions[:change_readonly_mode],
+ new_value: "f",
+ ).count
+ }.by(1)
expect(response.status).to eq(200)
expect(Discourse.readonly_mode?).to eq(false)
@@ -396,9 +411,12 @@ RSpec.describe Admin::BackupsController do
it "prevents enabling readonly mode with a 404 response" do
expect(Discourse.readonly_mode?).to eq(false)
- expect do
- put "/admin/backups/readonly.json", params: { enable: true }
- end.not_to change { UserHistory.where(action: UserHistory.actions[:change_readonly_mode], new_value: "t").count }
+ expect do put "/admin/backups/readonly.json", params: { enable: true } end.not_to change {
+ UserHistory.where(
+ action: UserHistory.actions[:change_readonly_mode],
+ new_value: "t",
+ ).count
+ }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -413,7 +431,7 @@ RSpec.describe Admin::BackupsController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "enabling readonly mode not allowed"
end
@@ -425,35 +443,37 @@ RSpec.describe Admin::BackupsController do
describe "when filename contains invalid characters" do
it "should raise an error" do
- ['灰色.tar.gz', '; echo \'haha\'.tar.gz'].each do |invalid_filename|
+ ["灰色.tar.gz", '; echo \'haha\'.tar.gz'].each do |invalid_filename|
described_class.any_instance.expects(:has_enough_space_on_disk?).returns(true)
- post "/admin/backups/upload", params: {
- resumableFilename: invalid_filename,
- resumableTotalSize: 1,
- resumableIdentifier: 'test'
- }
+ post "/admin/backups/upload",
+ params: {
+ resumableFilename: invalid_filename,
+ resumableTotalSize: 1,
+ resumableIdentifier: "test",
+ }
expect(response.status).to eq(415)
- expect(response.body).to eq(I18n.t('backup.invalid_filename'))
+ expect(response.body).to eq(I18n.t("backup.invalid_filename"))
end
end
end
describe "when resumableIdentifier is invalid" do
it "should raise an error" do
- filename = 'test_site-0123456789.tar.gz'
- @paths = [backup_path(File.join('tmp', 'test', "#{filename}.part1"))]
+ filename = "test_site-0123456789.tar.gz"
+ @paths = [backup_path(File.join("tmp", "test", "#{filename}.part1"))]
- post "/admin/backups/upload.json", params: {
- resumableFilename: filename,
- resumableTotalSize: 1,
- resumableIdentifier: '../test',
- resumableChunkNumber: '1',
- resumableChunkSize: '1',
- resumableCurrentChunkSize: '1',
- file: fixture_file_upload(Tempfile.new)
- }
+ post "/admin/backups/upload.json",
+ params: {
+ resumableFilename: filename,
+ resumableTotalSize: 1,
+ resumableIdentifier: "../test",
+ resumableChunkNumber: "1",
+ resumableChunkSize: "1",
+ resumableCurrentChunkSize: "1",
+ file: fixture_file_upload(Tempfile.new),
+ }
expect(response.status).to eq(400)
end
@@ -464,20 +484,27 @@ RSpec.describe Admin::BackupsController do
freeze_time
described_class.any_instance.expects(:has_enough_space_on_disk?).returns(true)
- filename = 'test_Site-0123456789.tar.gz'
+ filename = "test_Site-0123456789.tar.gz"
- post "/admin/backups/upload.json", params: {
- resumableFilename: filename,
- resumableTotalSize: 1,
- resumableIdentifier: 'test',
- resumableChunkNumber: '1',
- resumableChunkSize: '1',
- resumableCurrentChunkSize: '1',
- file: fixture_file_upload(Tempfile.new)
- }
- expect_job_enqueued(job: :backup_chunks_merger, args: {
- filename: filename, identifier: 'test', chunks: 1
- }, at: 5.seconds.from_now)
+ post "/admin/backups/upload.json",
+ params: {
+ resumableFilename: filename,
+ resumableTotalSize: 1,
+ resumableIdentifier: "test",
+ resumableChunkNumber: "1",
+ resumableChunkSize: "1",
+ resumableCurrentChunkSize: "1",
+ file: fixture_file_upload(Tempfile.new),
+ }
+ expect_job_enqueued(
+ job: :backup_chunks_merger,
+ args: {
+ filename: filename,
+ identifier: "test",
+ chunks: 1,
+ },
+ at: 5.seconds.from_now,
+ )
expect(response.status).to eq(200)
expect(response.body).to eq("")
@@ -485,25 +512,32 @@ RSpec.describe Admin::BackupsController do
end
describe "completing an upload by enqueuing backup_chunks_merger" do
- let(:filename) { 'test_Site-0123456789.tar.gz' }
+ let(:filename) { "test_Site-0123456789.tar.gz" }
it "works with a single chunk" do
freeze_time
described_class.any_instance.expects(:has_enough_space_on_disk?).returns(true)
# 2MB file, 2MB chunks = 1x 2MB chunk
- post "/admin/backups/upload.json", params: {
- resumableFilename: filename,
- resumableTotalSize: '2097152',
- resumableIdentifier: 'test',
- resumableChunkNumber: '1',
- resumableChunkSize: '2097152',
- resumableCurrentChunkSize: '2097152',
- file: fixture_file_upload(Tempfile.new)
- }
- expect_job_enqueued(job: :backup_chunks_merger, args: {
- filename: filename, identifier: 'test', chunks: 1
- }, at: 5.seconds.from_now)
+ post "/admin/backups/upload.json",
+ params: {
+ resumableFilename: filename,
+ resumableTotalSize: "2097152",
+ resumableIdentifier: "test",
+ resumableChunkNumber: "1",
+ resumableChunkSize: "2097152",
+ resumableCurrentChunkSize: "2097152",
+ file: fixture_file_upload(Tempfile.new),
+ }
+ expect_job_enqueued(
+ job: :backup_chunks_merger,
+ args: {
+ filename: filename,
+ identifier: "test",
+ chunks: 1,
+ },
+ at: 5.seconds.from_now,
+ )
end
it "works with multiple chunks when the final chunk is chunk_size + remainder" do
@@ -511,27 +545,35 @@ RSpec.describe Admin::BackupsController do
described_class.any_instance.expects(:has_enough_space_on_disk?).twice.returns(true)
# 5MB file, 2MB chunks = 1x 2MB chunk + 1x 3MB chunk with resumable.js
- post "/admin/backups/upload.json", params: {
- resumableFilename: filename,
- resumableTotalSize: '5242880',
- resumableIdentifier: 'test',
- resumableChunkNumber: '1',
- resumableChunkSize: '2097152',
- resumableCurrentChunkSize: '2097152',
- file: fixture_file_upload(Tempfile.new)
- }
- post "/admin/backups/upload.json", params: {
- resumableFilename: filename,
- resumableTotalSize: '5242880',
- resumableIdentifier: 'test',
- resumableChunkNumber: '2',
- resumableChunkSize: '2097152',
- resumableCurrentChunkSize: '3145728',
- file: fixture_file_upload(Tempfile.new)
- }
- expect_job_enqueued(job: :backup_chunks_merger, args: {
- filename: filename, identifier: 'test', chunks: 2
- }, at: 5.seconds.from_now)
+ post "/admin/backups/upload.json",
+ params: {
+ resumableFilename: filename,
+ resumableTotalSize: "5242880",
+ resumableIdentifier: "test",
+ resumableChunkNumber: "1",
+ resumableChunkSize: "2097152",
+ resumableCurrentChunkSize: "2097152",
+ file: fixture_file_upload(Tempfile.new),
+ }
+ post "/admin/backups/upload.json",
+ params: {
+ resumableFilename: filename,
+ resumableTotalSize: "5242880",
+ resumableIdentifier: "test",
+ resumableChunkNumber: "2",
+ resumableChunkSize: "2097152",
+ resumableCurrentChunkSize: "3145728",
+ file: fixture_file_upload(Tempfile.new),
+ }
+ expect_job_enqueued(
+ job: :backup_chunks_merger,
+ args: {
+ filename: filename,
+ identifier: "test",
+ chunks: 2,
+ },
+ at: 5.seconds.from_now,
+ )
end
it "works with multiple chunks when the final chunk is just the remaninder" do
@@ -539,36 +581,45 @@ RSpec.describe Admin::BackupsController do
described_class.any_instance.expects(:has_enough_space_on_disk?).times(3).returns(true)
# 5MB file, 2MB chunks = 2x 2MB chunk + 1x 1MB chunk with uppy.js
- post "/admin/backups/upload.json", params: {
- resumableFilename: filename,
- resumableTotalSize: '5242880',
- resumableIdentifier: 'test',
- resumableChunkNumber: '1',
- resumableChunkSize: '2097152',
- resumableCurrentChunkSize: '2097152',
- file: fixture_file_upload(Tempfile.new)
- }
- post "/admin/backups/upload.json", params: {
- resumableFilename: filename,
- resumableTotalSize: '5242880',
- resumableIdentifier: 'test',
- resumableChunkNumber: '2',
- resumableChunkSize: '2097152',
- resumableCurrentChunkSize: '2097152',
- file: fixture_file_upload(Tempfile.new)
- }
- post "/admin/backups/upload.json", params: {
- resumableFilename: filename,
- resumableTotalSize: '5242880',
- resumableIdentifier: 'test',
- resumableChunkNumber: '3',
- resumableChunkSize: '2097152',
- resumableCurrentChunkSize: '1048576',
- file: fixture_file_upload(Tempfile.new)
- }
- expect_job_enqueued(job: :backup_chunks_merger, args: {
- filename: filename, identifier: 'test', chunks: 3
- }, at: 5.seconds.from_now)
+ post "/admin/backups/upload.json",
+ params: {
+ resumableFilename: filename,
+ resumableTotalSize: "5242880",
+ resumableIdentifier: "test",
+ resumableChunkNumber: "1",
+ resumableChunkSize: "2097152",
+ resumableCurrentChunkSize: "2097152",
+ file: fixture_file_upload(Tempfile.new),
+ }
+ post "/admin/backups/upload.json",
+ params: {
+ resumableFilename: filename,
+ resumableTotalSize: "5242880",
+ resumableIdentifier: "test",
+ resumableChunkNumber: "2",
+ resumableChunkSize: "2097152",
+ resumableCurrentChunkSize: "2097152",
+ file: fixture_file_upload(Tempfile.new),
+ }
+ post "/admin/backups/upload.json",
+ params: {
+ resumableFilename: filename,
+ resumableTotalSize: "5242880",
+ resumableIdentifier: "test",
+ resumableChunkNumber: "3",
+ resumableChunkSize: "2097152",
+ resumableCurrentChunkSize: "1048576",
+ file: fixture_file_upload(Tempfile.new),
+ }
+ expect_job_enqueued(
+ job: :backup_chunks_merger,
+ args: {
+ filename: filename,
+ identifier: "test",
+ chunks: 3,
+ },
+ at: 5.seconds.from_now,
+ )
end
end
end
@@ -576,21 +627,28 @@ RSpec.describe Admin::BackupsController do
shared_examples "uploading backup chunk not allowed" do
it "prevents uploading of backup chunk with a 404 response" do
freeze_time
- filename = 'test_Site-0123456789.tar.gz'
+ filename = "test_Site-0123456789.tar.gz"
- post "/admin/backups/upload.json", params: {
- resumableFilename: filename,
- resumableTotalSize: 1,
- resumableIdentifier: 'test',
- resumableChunkNumber: '1',
- resumableChunkSize: '1',
- resumableCurrentChunkSize: '1',
- file: fixture_file_upload(Tempfile.new)
- }
+ post "/admin/backups/upload.json",
+ params: {
+ resumableFilename: filename,
+ resumableTotalSize: 1,
+ resumableIdentifier: "test",
+ resumableChunkNumber: "1",
+ resumableChunkSize: "1",
+ resumableCurrentChunkSize: "1",
+ file: fixture_file_upload(Tempfile.new),
+ }
- expect_not_enqueued_with(job: :backup_chunks_merger, args: {
- filename: filename, identifier: 'test', chunks: 1
- }, at: 5.seconds.from_now)
+ expect_not_enqueued_with(
+ job: :backup_chunks_merger,
+ args: {
+ filename: filename,
+ identifier: "test",
+ chunks: 1,
+ },
+ at: 5.seconds.from_now,
+ )
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -604,7 +662,7 @@ RSpec.describe Admin::BackupsController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "uploading backup chunk not allowed"
end
@@ -616,12 +674,13 @@ RSpec.describe Admin::BackupsController do
describe "when resumableIdentifier is invalid" do
it "should raise an error" do
- get "/admin/backups/upload", params: {
- resumableidentifier: "../some_file",
- resumablefilename: "test_site-0123456789.tar.gz",
- resumablechunknumber: '1',
- resumablecurrentchunksize: '1'
- }
+ get "/admin/backups/upload",
+ params: {
+ resumableidentifier: "../some_file",
+ resumablefilename: "test_site-0123456789.tar.gz",
+ resumablechunknumber: "1",
+ resumablecurrentchunksize: "1",
+ }
expect(response.status).to eq(400)
end
@@ -630,12 +689,13 @@ RSpec.describe Admin::BackupsController do
shared_examples "checking backup chunk not allowed" do
it "denies access with a 404 response" do
- get "/admin/backups/upload", params: {
- resumableidentifier: "../some_file",
- resumablefilename: "test_site-0123456789.tar.gz",
- resumablechunknumber: '1',
- resumablecurrentchunksize: '1'
- }
+ get "/admin/backups/upload",
+ params: {
+ resumableidentifier: "../some_file",
+ resumablefilename: "test_site-0123456789.tar.gz",
+ resumablechunknumber: "1",
+ resumablecurrentchunksize: "1",
+ }
expect(response.status).to eq(404)
end
@@ -648,17 +708,17 @@ RSpec.describe Admin::BackupsController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "checking backup chunk not allowed"
end
end
- describe '#rollback' do
+ describe "#rollback" do
context "when logged in as an admin" do
before { sign_in(admin) }
- it 'should rollback the restore' do
+ it "should rollback the restore" do
BackupRestore.expects(:rollback!)
post "/admin/backups/rollback.json"
@@ -666,7 +726,7 @@ RSpec.describe Admin::BackupsController do
expect(response.status).to eq(200)
end
- it 'should not allow rollback via a GET request' do
+ it "should not allow rollback via a GET request" do
get "/admin/backups/rollback.json"
expect(response.status).to eq(404)
end
@@ -688,13 +748,13 @@ RSpec.describe Admin::BackupsController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "backup rollback not allowed"
end
end
- describe '#cancel' do
+ describe "#cancel" do
context "when logged in as an admin" do
before { sign_in(admin) }
@@ -706,7 +766,7 @@ RSpec.describe Admin::BackupsController do
expect(response.status).to eq(200)
end
- it 'should not allow cancel via a GET request' do
+ it "should not allow cancel via a GET request" do
get "/admin/backups/cancel.json"
expect(response.status).to eq(404)
end
@@ -728,7 +788,7 @@ RSpec.describe Admin::BackupsController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "backup cancellation not allowed"
end
@@ -739,19 +799,20 @@ RSpec.describe Admin::BackupsController do
before { sign_in(admin) }
it "enqueues email job" do
-
# might as well test this here if we really want www.example.com
SiteSetting.force_hostname = "www.example.com"
create_backup_files(backup_filename)
- expect {
- put "/admin/backups/#{backup_filename}.json"
- }.to change { Jobs::DownloadBackupEmail.jobs.size }.by(1)
+ expect { put "/admin/backups/#{backup_filename}.json" }.to change {
+ Jobs::DownloadBackupEmail.jobs.size
+ }.by(1)
job_args = Jobs::DownloadBackupEmail.jobs.last["args"].first
expect(job_args["user_id"]).to eq(admin.id)
- expect(job_args["backup_file_path"]).to eq("http://www.example.com/admin/backups/#{backup_filename}")
+ expect(job_args["backup_file_path"]).to eq(
+ "http://www.example.com/admin/backups/#{backup_filename}",
+ )
expect(response.status).to eq(200)
end
@@ -768,9 +829,9 @@ RSpec.describe Admin::BackupsController do
SiteSetting.force_hostname = "www.example.com"
create_backup_files(backup_filename)
- expect do
- put "/admin/backups/#{backup_filename}.json"
- end.not_to change { Jobs::DownloadBackupEmail.jobs.size }
+ expect do put "/admin/backups/#{backup_filename}.json" end.not_to change {
+ Jobs::DownloadBackupEmail.jobs.size
+ }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -784,7 +845,7 @@ RSpec.describe Admin::BackupsController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "backup emails not allowed"
end
@@ -792,28 +853,37 @@ RSpec.describe Admin::BackupsController do
describe "S3 multipart uploads" do
let(:upload_type) { "backup" }
- let(:test_bucket_prefix) { "test_#{ENV['TEST_ENV_NUMBER'].presence || '0'}" }
+ let(:test_bucket_prefix) { "test_#{ENV["TEST_ENV_NUMBER"].presence || "0"}" }
let(:backup_file_exists_response) { { status: 404 } }
- let(:mock_multipart_upload_id) { "ibZBv_75gd9r8lH_gqXatLdxMVpAlj6CFTR.OwyF3953YdwbcQnMA2BLGn8Lx12fQNICtMw5KyteFeHw.Sjng--" }
+ let(:mock_multipart_upload_id) do
+ "ibZBv_75gd9r8lH_gqXatLdxMVpAlj6CFTR.OwyF3953YdwbcQnMA2BLGn8Lx12fQNICtMw5KyteFeHw.Sjng--"
+ end
before do
setup_s3
SiteSetting.enable_direct_s3_uploads = true
SiteSetting.s3_backup_bucket = "s3-backup-bucket"
SiteSetting.backup_location = BackupLocationSiteSetting::S3
- stub_request(:head, "https://s3-backup-bucket.s3.us-west-1.amazonaws.com/").to_return(status: 200, body: "", headers: {})
- stub_request(:head, "https://s3-backup-bucket.s3.us-west-1.amazonaws.com/default/test.tar.gz").to_return(
- backup_file_exists_response
+ stub_request(:head, "https://s3-backup-bucket.s3.us-west-1.amazonaws.com/").to_return(
+ status: 200,
+ body: "",
+ headers: {
+ },
)
+ stub_request(
+ :head,
+ "https://s3-backup-bucket.s3.us-west-1.amazonaws.com/default/test.tar.gz",
+ ).to_return(backup_file_exists_response)
end
shared_examples "multipart uploads not allowed" do
it "prevents multipart uploads with a 404 response" do
- post "/admin/backups/create-multipart.json", params: {
- file_name: "test.tar.gz",
- upload_type: upload_type,
- file_size: 4098
- }
+ post "/admin/backups/create-multipart.json",
+ params: {
+ file_name: "test.tar.gz",
+ upload_type: upload_type,
+ file_size: 4098,
+ }
expect(response.status).to eq(404)
end
end
@@ -825,7 +895,7 @@ RSpec.describe Admin::BackupsController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "multipart uploads not allowed"
end
@@ -834,9 +904,12 @@ RSpec.describe Admin::BackupsController do
before { sign_in(admin) }
def stub_create_multipart_backup_request
- BackupRestore::S3BackupStore.any_instance.stubs(:temporary_upload_path).returns(
- "temp/default/#{test_bucket_prefix}/28fccf8259bbe75b873a2bd2564b778c/2u98j832nx93272x947823.gz"
- )
+ BackupRestore::S3BackupStore
+ .any_instance
+ .stubs(:temporary_upload_path)
+ .returns(
+ "temp/default/#{test_bucket_prefix}/28fccf8259bbe75b873a2bd2564b778c/2u98j832nx93272x947823.gz",
+ )
create_multipart_result = <<~XML
\n
@@ -845,28 +918,32 @@ RSpec.describe Admin::BackupsController do
#{mock_multipart_upload_id}
XML
- stub_request(:post, "https://s3-backup-bucket.s3.us-west-1.amazonaws.com/temp/default/#{test_bucket_prefix}/28fccf8259bbe75b873a2bd2564b778c/2u98j832nx93272x947823.gz?uploads").
- to_return(status: 200, body: create_multipart_result)
+ stub_request(
+ :post,
+ "https://s3-backup-bucket.s3.us-west-1.amazonaws.com/temp/default/#{test_bucket_prefix}/28fccf8259bbe75b873a2bd2564b778c/2u98j832nx93272x947823.gz?uploads",
+ ).to_return(status: 200, body: create_multipart_result)
end
it "creates the multipart upload" do
stub_create_multipart_backup_request
- post "/admin/backups/create-multipart.json", params: {
- file_name: "test.tar.gz",
- upload_type: upload_type,
- file_size: 4098
- }
+ post "/admin/backups/create-multipart.json",
+ params: {
+ file_name: "test.tar.gz",
+ upload_type: upload_type,
+ file_size: 4098,
+ }
expect(response.status).to eq(200)
result = response.parsed_body
- external_upload_stub = ExternalUploadStub.where(
- unique_identifier: result["unique_identifier"],
- original_filename: "test.tar.gz",
- created_by: admin,
- upload_type: upload_type,
- key: result["key"],
- multipart: true
- )
+ external_upload_stub =
+ ExternalUploadStub.where(
+ unique_identifier: result["unique_identifier"],
+ original_filename: "test.tar.gz",
+ created_by: admin,
+ upload_type: upload_type,
+ key: result["key"],
+ multipart: true,
+ )
expect(external_upload_stub.exists?).to eq(true)
end
@@ -874,42 +951,41 @@ RSpec.describe Admin::BackupsController do
let(:backup_file_exists_response) { { status: 200, body: "" } }
it "throws an error" do
- post "/admin/backups/create-multipart.json", params: {
- file_name: "test.tar.gz",
- upload_type: upload_type,
- file_size: 4098
- }
+ post "/admin/backups/create-multipart.json",
+ params: {
+ file_name: "test.tar.gz",
+ upload_type: upload_type,
+ file_size: 4098,
+ }
expect(response.status).to eq(422)
- expect(response.parsed_body["errors"]).to include(
- I18n.t("backup.file_exists")
- )
+ expect(response.parsed_body["errors"]).to include(I18n.t("backup.file_exists"))
end
end
context "when filename is invalid" do
it "throws an error" do
- post "/admin/backups/create-multipart.json", params: {
- file_name: "blah $$##.tar.gz",
- upload_type: upload_type,
- file_size: 4098
- }
+ post "/admin/backups/create-multipart.json",
+ params: {
+ file_name: "blah $$##.tar.gz",
+ upload_type: upload_type,
+ file_size: 4098,
+ }
expect(response.status).to eq(422)
- expect(response.parsed_body["errors"]).to include(
- I18n.t("backup.invalid_filename")
- )
+ expect(response.parsed_body["errors"]).to include(I18n.t("backup.invalid_filename"))
end
end
context "when extension is invalid" do
it "throws an error" do
- post "/admin/backups/create-multipart.json", params: {
- file_name: "test.png",
- upload_type: upload_type,
- file_size: 4098
- }
+ post "/admin/backups/create-multipart.json",
+ params: {
+ file_name: "test.png",
+ upload_type: upload_type,
+ file_size: 4098,
+ }
expect(response.status).to eq(422)
expect(response.parsed_body["errors"]).to include(
- I18n.t("backup.backup_file_should_be_tar_gz")
+ I18n.t("backup.backup_file_should_be_tar_gz"),
)
end
end
diff --git a/spec/requests/admin/badges_controller_spec.rb b/spec/requests/admin/badges_controller_spec.rb
index 96f4f9294b5..ffaabcdcaa8 100644
--- a/spec/requests/admin/badges_controller_spec.rb
+++ b/spec/requests/admin/badges_controller_spec.rb
@@ -3,10 +3,10 @@
RSpec.describe Admin::BadgesController do
fab!(:admin) { Fabricate(:admin) }
fab!(:moderator) { Fabricate(:moderator) }
- fab!(:user) { Fabricate(:user, email: 'user1@test.com', username: 'username1') }
+ fab!(:user) { Fabricate(:user, email: "user1@test.com", username: "username1") }
fab!(:badge) { Fabricate(:badge) }
- describe '#index' do
+ describe "#index" do
context "when logged in as an admin" do
before { sign_in(admin) }
@@ -38,27 +38,29 @@ RSpec.describe Admin::BadgesController do
end
end
- describe '#preview' do
+ describe "#preview" do
context "when logged in as an admin" do
before { sign_in(admin) }
- it 'allows preview enable_badge_sql is enabled' do
+ it "allows preview enable_badge_sql is enabled" do
SiteSetting.enable_badge_sql = true
- post "/admin/badges/preview.json", params: {
- sql: 'select id as user_id, created_at granted_at from users'
- }
+ post "/admin/badges/preview.json",
+ params: {
+ sql: "select id as user_id, created_at granted_at from users",
+ }
expect(response.status).to eq(200)
expect(response.parsed_body["grant_count"]).to be > 0
end
- it 'does not allow anything if enable_badge_sql is disabled' do
+ it "does not allow anything if enable_badge_sql is disabled" do
SiteSetting.enable_badge_sql = false
- post "/admin/badges/preview.json", params: {
- sql: 'select id as user_id, created_at granted_at from users'
- }
+ post "/admin/badges/preview.json",
+ params: {
+ sql: "select id as user_id, created_at granted_at from users",
+ }
expect(response.status).to eq(403)
end
@@ -68,9 +70,10 @@ RSpec.describe Admin::BadgesController do
it "denies access to badge preview with a 404 response" do
SiteSetting.enable_badge_sql = true
- post "/admin/badges/preview.json", params: {
- sql: 'select id as user_id, created_at granted_at from users'
- }
+ post "/admin/badges/preview.json",
+ params: {
+ sql: "select id as user_id, created_at granted_at from users",
+ }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -90,23 +93,31 @@ RSpec.describe Admin::BadgesController do
end
end
- describe '#create' do
+ describe "#create" do
context "when logged in as an admin" do
before { sign_in(admin) }
- it 'can create badges correctly' do
+ it "can create badges correctly" do
SiteSetting.enable_badge_sql = true
- post "/admin/badges.json", params: {
- name: 'test', query: 'select 1 as user_id, null as granted_at', badge_type_id: 1
- }
+ post "/admin/badges.json",
+ params: {
+ name: "test",
+ query: "select 1 as user_id, null as granted_at",
+ badge_type_id: 1,
+ }
json = response.parsed_body
expect(response.status).to eq(200)
- expect(json["badge"]["name"]).to eq('test')
- expect(json["badge"]["query"]).to eq('select 1 as user_id, null as granted_at')
+ expect(json["badge"]["name"]).to eq("test")
+ expect(json["badge"]["query"]).to eq("select 1 as user_id, null as granted_at")
- expect(UserHistory.where(acting_user_id: admin.id, action: UserHistory.actions[:create_badge]).exists?).to eq(true)
+ expect(
+ UserHistory.where(
+ acting_user_id: admin.id,
+ action: UserHistory.actions[:create_badge],
+ ).exists?,
+ ).to eq(true)
end
end
@@ -114,9 +125,12 @@ RSpec.describe Admin::BadgesController do
it "prevents badge creation with a 404 response" do
SiteSetting.enable_badge_sql = true
- post "/admin/badges.json", params: {
- name: 'test', query: 'select 1 as user_id, null as granted_at', badge_type_id: 1
- }
+ post "/admin/badges.json",
+ params: {
+ name: "test",
+ query: "select 1 as user_id, null as granted_at",
+ badge_type_id: 1,
+ }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -136,14 +150,14 @@ RSpec.describe Admin::BadgesController do
end
end
- describe '#save_badge_groupings' do
+ describe "#save_badge_groupings" do
context "when logged in as an admin" do
before { sign_in(admin) }
- it 'can save badge groupings' do
+ it "can save badge groupings" do
groupings = BadgeGrouping.all.order(:position).to_a
- groupings << BadgeGrouping.new(name: 'Test 1')
- groupings << BadgeGrouping.new(name: 'Test 2')
+ groupings << BadgeGrouping.new(name: "Test 1")
+ groupings << BadgeGrouping.new(name: "Test 2")
groupings.shuffle!
@@ -192,11 +206,11 @@ RSpec.describe Admin::BadgesController do
end
end
- describe '#badge_types' do
+ describe "#badge_types" do
context "when logged in as an admin" do
before { sign_in(admin) }
- it 'returns JSON' do
+ it "returns JSON" do
get "/admin/badges/types.json"
expect(response.status).to eq(200)
@@ -226,15 +240,20 @@ RSpec.describe Admin::BadgesController do
end
end
- describe '#destroy' do
+ describe "#destroy" do
context "when logged in as an admin" do
before { sign_in(admin) }
- it 'deletes the badge' do
+ it "deletes the badge" do
delete "/admin/badges/#{badge.id}.json"
expect(response.status).to eq(200)
expect(Badge.where(id: badge.id).exists?).to eq(false)
- expect(UserHistory.where(acting_user_id: admin.id, action: UserHistory.actions[:delete_badge]).exists?).to eq(true)
+ expect(
+ UserHistory.where(
+ acting_user_id: admin.id,
+ action: UserHistory.actions[:delete_badge],
+ ).exists?,
+ ).to eq(true)
end
end
@@ -261,89 +280,93 @@ RSpec.describe Admin::BadgesController do
end
end
- describe '#update' do
+ describe "#update" do
context "when logged in as an admin" do
before { sign_in(admin) }
- it 'does not update the name of system badges' do
+ it "does not update the name of system badges" do
editor_badge = Badge.find(Badge::Editor)
editor_badge_name = editor_badge.name
- put "/admin/badges/#{editor_badge.id}.json", params: {
- name: "123456"
- }
+ put "/admin/badges/#{editor_badge.id}.json", params: { name: "123456" }
expect(response.status).to eq(200)
editor_badge.reload
expect(editor_badge.name).to eq(editor_badge_name)
- expect(UserHistory.where(acting_user_id: admin.id, action: UserHistory.actions[:change_badge]).exists?).to eq(true)
+ expect(
+ UserHistory.where(
+ acting_user_id: admin.id,
+ action: UserHistory.actions[:change_badge],
+ ).exists?,
+ ).to eq(true)
end
- it 'does not allow query updates if badge_sql is disabled' do
+ it "does not allow query updates if badge_sql is disabled" do
badge.query = "select 123"
badge.save
SiteSetting.enable_badge_sql = false
- put "/admin/badges/#{badge.id}.json", params: {
- name: "123456",
- query: "select id user_id, created_at granted_at from users",
- badge_type_id: badge.badge_type_id,
- allow_title: false,
- multiple_grant: false,
- enabled: true
- }
+ put "/admin/badges/#{badge.id}.json",
+ params: {
+ name: "123456",
+ query: "select id user_id, created_at granted_at from users",
+ badge_type_id: badge.badge_type_id,
+ allow_title: false,
+ multiple_grant: false,
+ enabled: true,
+ }
expect(response.status).to eq(200)
badge.reload
- expect(badge.name).to eq('123456')
- expect(badge.query).to eq('select 123')
+ expect(badge.name).to eq("123456")
+ expect(badge.query).to eq("select 123")
end
- it 'updates the badge' do
+ it "updates the badge" do
SiteSetting.enable_badge_sql = true
sql = "select id user_id, created_at granted_at from users"
image = Fabricate(:upload)
- put "/admin/badges/#{badge.id}.json", params: {
- name: "123456",
- query: sql,
- badge_type_id: badge.badge_type_id,
- allow_title: false,
- multiple_grant: false,
- enabled: true,
- image_upload_id: image.id,
- icon: "fa-rocket",
- }
+ put "/admin/badges/#{badge.id}.json",
+ params: {
+ name: "123456",
+ query: sql,
+ badge_type_id: badge.badge_type_id,
+ allow_title: false,
+ multiple_grant: false,
+ enabled: true,
+ image_upload_id: image.id,
+ icon: "fa-rocket",
+ }
expect(response.status).to eq(200)
badge.reload
- expect(badge.name).to eq('123456')
+ expect(badge.name).to eq("123456")
expect(badge.query).to eq(sql)
expect(badge.image_upload.id).to eq(image.id)
expect(badge.icon).to eq("fa-rocket")
end
- context 'when there is a user with a title granted using the badge' do
+ context "when there is a user with a title granted using the badge" do
fab!(:user_with_badge_title) { Fabricate(:active_user) }
- fab!(:badge) { Fabricate(:badge, name: 'Oathbreaker', allow_title: true) }
+ fab!(:badge) { Fabricate(:badge, name: "Oathbreaker", allow_title: true) }
before do
BadgeGranter.grant(badge, user_with_badge_title)
- user_with_badge_title.update(title: 'Oathbreaker')
+ user_with_badge_title.update(title: "Oathbreaker")
end
- it 'updates the user title in a job' do
- expect_enqueued_with(job: :bulk_user_title_update, args: {
- new_title: 'Shieldbearer',
- granted_badge_id: badge.id,
- action: Jobs::BulkUserTitleUpdate::UPDATE_ACTION
- }) do
- put "/admin/badges/#{badge.id}.json", params: {
- name: "Shieldbearer"
- }
- end
+ it "updates the user title in a job" do
+ expect_enqueued_with(
+ job: :bulk_user_title_update,
+ args: {
+ new_title: "Shieldbearer",
+ granted_badge_id: badge.id,
+ action: Jobs::BulkUserTitleUpdate::UPDATE_ACTION,
+ },
+ ) { put "/admin/badges/#{badge.id}.json", params: { name: "Shieldbearer" } }
end
end
end
@@ -355,21 +378,22 @@ RSpec.describe Admin::BadgesController do
sql = "select id user_id, created_at granted_at from users"
image = Fabricate(:upload)
- put "/admin/badges/#{badge.id}.json", params: {
- name: "123456",
- query: sql,
- badge_type_id: badge.badge_type_id,
- allow_title: false,
- multiple_grant: false,
- enabled: true,
- image_upload_id: image.id,
- icon: "fa-rocket",
- }
+ put "/admin/badges/#{badge.id}.json",
+ params: {
+ name: "123456",
+ query: sql,
+ badge_type_id: badge.badge_type_id,
+ allow_title: false,
+ multiple_grant: false,
+ enabled: true,
+ image_upload_id: image.id,
+ icon: "fa-rocket",
+ }
badge.reload
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
- expect(badge.name).not_to eq('123456')
+ expect(badge.name).not_to eq("123456")
expect(badge.query).not_to eq(sql)
expect(badge.icon).not_to eq("fa-rocket")
end
@@ -388,34 +412,34 @@ RSpec.describe Admin::BadgesController do
end
end
- describe '#mass_award' do
+ describe "#mass_award" do
context "when logged in as an admin" do
before { sign_in(admin) }
- it 'does nothing when there is no file' do
- post "/admin/badges/award/#{badge.id}.json", params: { file: '' }
+ it "does nothing when there is no file" do
+ post "/admin/badges/award/#{badge.id}.json", params: { file: "" }
expect(response.status).to eq(400)
end
- it 'does nothing when the badge id is not valid' do
- post '/admin/badges/award/fake_id.json', params: { file: fixture_file_upload(Tempfile.new) }
+ it "does nothing when the badge id is not valid" do
+ post "/admin/badges/award/fake_id.json", params: { file: fixture_file_upload(Tempfile.new) }
expect(response.status).to eq(400)
end
- it 'does nothing when the file is not a csv' do
- file = file_from_fixtures('cropped.png')
+ it "does nothing when the file is not a csv" do
+ file = file_from_fixtures("cropped.png")
post "/admin/badges/award/#{badge.id}.json", params: { file: fixture_file_upload(file) }
expect(response.status).to eq(400)
end
- it 'awards the badge using a list of user emails' do
+ it "awards the badge using a list of user emails" do
Jobs.run_immediately!
- file = file_from_fixtures('user_emails.csv', 'csv')
+ file = file_from_fixtures("user_emails.csv", "csv")
UserBadge.destroy_all
post "/admin/badges/award/#{badge.id}.json", params: { file: fixture_file_upload(file) }
@@ -425,10 +449,10 @@ RSpec.describe Admin::BadgesController do
expect(UserBadge.where(user: user, badge: badge).first.seq).to eq(0)
end
- it 'awards the badge using a list of usernames' do
+ it "awards the badge using a list of usernames" do
Jobs.run_immediately!
- file = file_from_fixtures('usernames.csv', 'csv')
+ file = file_from_fixtures("usernames.csv", "csv")
post "/admin/badges/award/#{badge.id}.json", params: { file: fixture_file_upload(file) }
@@ -436,10 +460,10 @@ RSpec.describe Admin::BadgesController do
expect(UserBadge.where(user: user, badge: badge).count).to eq(1)
end
- it 'works with a CSV containing nil values' do
+ it "works with a CSV containing nil values" do
Jobs.run_immediately!
- file = file_from_fixtures('usernames_with_nil_values.csv', 'csv')
+ file = file_from_fixtures("usernames_with_nil_values.csv", "csv")
post "/admin/badges/award/#{badge.id}.json", params: { file: fixture_file_upload(file) }
@@ -447,13 +471,13 @@ RSpec.describe Admin::BadgesController do
expect(UserBadge.where(user: user, badge: badge).count).to eq(1)
end
- it 'does not grant the badge again to a user if they already have the badge' do
+ it "does not grant the badge again to a user if they already have the badge" do
Jobs.run_immediately!
badge.update!(multiple_grant: true)
BadgeGranter.grant(badge, user)
user.reload
- file = file_from_fixtures('usernames_with_nil_values.csv', 'csv')
+ file = file_from_fixtures("usernames_with_nil_values.csv", "csv")
post "/admin/badges/award/#{badge.id}.json", params: { file: fixture_file_upload(file) }
@@ -461,10 +485,10 @@ RSpec.describe Admin::BadgesController do
expect(UserBadge.where(user: user, badge: badge).count).to eq(1)
end
- it 'fails when the badge is disabled' do
+ it "fails when the badge is disabled" do
badge.update!(enabled: false)
- file = file_from_fixtures('usernames_with_nil_values.csv', 'csv')
+ file = file_from_fixtures("usernames_with_nil_values.csv", "csv")
post "/admin/badges/award/#{badge.id}.json", params: { file: fixture_file_upload(file) }
@@ -473,17 +497,18 @@ RSpec.describe Admin::BadgesController do
context "when grant_existing_holders is true" do
it "fails when the badge cannot be granted multiple times" do
- file = file_from_fixtures('user_emails.csv', 'csv')
+ file = file_from_fixtures("user_emails.csv", "csv")
badge.update!(multiple_grant: false)
- post "/admin/badges/award/#{badge.id}.json", params: {
- file: fixture_file_upload(file),
- grant_existing_holders: true
- }
+ post "/admin/badges/award/#{badge.id}.json",
+ params: {
+ file: fixture_file_upload(file),
+ grant_existing_holders: true,
+ }
expect(response.status).to eq(422)
- expect(response.parsed_body['errors']).to eq([
- I18n.t("badges.mass_award.errors.cant_grant_multiple_times", badge_name: badge.name)
- ])
+ expect(response.parsed_body["errors"]).to eq(
+ [I18n.t("badges.mass_award.errors.cant_grant_multiple_times", badge_name: badge.name)],
+ )
end
it "fails when CSV file contains more entries that it's allowed" do
@@ -492,13 +517,16 @@ RSpec.describe Admin::BadgesController do
csv.write("#{user.username}\n" * 11)
csv.rewind
stub_const(Admin::BadgesController, "MAX_CSV_LINES", 10) do
- post "/admin/badges/award/#{badge.id}.json", params: {
- file: fixture_file_upload(csv),
- grant_existing_holders: true
- }
+ post "/admin/badges/award/#{badge.id}.json",
+ params: {
+ file: fixture_file_upload(csv),
+ grant_existing_holders: true,
+ }
end
expect(response.status).to eq(400)
- expect(response.parsed_body["errors"]).to include(I18n.t("badges.mass_award.errors.too_many_csv_entries", count: 10))
+ expect(response.parsed_body["errors"]).to include(
+ I18n.t("badges.mass_award.errors.too_many_csv_entries", count: 10),
+ )
ensure
csv&.close
csv&.unlink
@@ -508,26 +536,23 @@ RSpec.describe Admin::BadgesController do
Jobs.run_immediately!
badge.update!(multiple_grant: true)
csv = Tempfile.new
- content = [
- "nonexistentuser",
- "nonexistentuser",
- "nonexistentemail@discourse.fake"
- ]
+ content = %w[nonexistentuser nonexistentuser nonexistentemail@discourse.fake]
content << user.username
content << user.username
csv.write(content.join("\n"))
csv.rewind
- post "/admin/badges/award/#{badge.id}.json", params: {
- file: fixture_file_upload(csv),
- grant_existing_holders: true
- }
+ post "/admin/badges/award/#{badge.id}.json",
+ params: {
+ file: fixture_file_upload(csv),
+ grant_existing_holders: true,
+ }
expect(response.status).to eq(200)
- expect(response.parsed_body['unmatched_entries']).to contain_exactly(
+ expect(response.parsed_body["unmatched_entries"]).to contain_exactly(
"nonexistentuser",
- "nonexistentemail@discourse.fake"
+ "nonexistentemail@discourse.fake",
)
- expect(response.parsed_body['matched_users_count']).to eq(1)
- expect(response.parsed_body['unmatched_entries_count']).to eq(2)
+ expect(response.parsed_body["matched_users_count"]).to eq(1)
+ expect(response.parsed_body["unmatched_entries_count"]).to eq(2)
expect(UserBadge.where(user: user, badge: badge).count).to eq(2)
ensure
csv&.close
@@ -540,24 +565,26 @@ RSpec.describe Admin::BadgesController do
user_without_badge = Fabricate(:user)
user_with_badge = Fabricate(:user).tap { |u| BadgeGranter.grant(badge, u) }
- csv_content = [
- user_with_badge.email.titlecase,
- user_with_badge.username.titlecase,
- user_without_badge.email.titlecase,
- user_without_badge.username.titlecase
- ] * 20
+ csv_content =
+ [
+ user_with_badge.email.titlecase,
+ user_with_badge.username.titlecase,
+ user_without_badge.email.titlecase,
+ user_without_badge.username.titlecase,
+ ] * 20
csv = Tempfile.new
csv.write(csv_content.join("\n"))
csv.rewind
- post "/admin/badges/award/#{badge.id}.json", params: {
- file: fixture_file_upload(csv),
- grant_existing_holders: true
- }
+ post "/admin/badges/award/#{badge.id}.json",
+ params: {
+ file: fixture_file_upload(csv),
+ grant_existing_holders: true,
+ }
expect(response.status).to eq(200)
- expect(response.parsed_body['unmatched_entries']).to eq([])
- expect(response.parsed_body['matched_users_count']).to eq(2)
- expect(response.parsed_body['unmatched_entries_count']).to eq(0)
+ expect(response.parsed_body["unmatched_entries"]).to eq([])
+ expect(response.parsed_body["matched_users_count"]).to eq(2)
+ expect(response.parsed_body["unmatched_entries_count"]).to eq(0)
sequence = UserBadge.where(user: user_with_badge, badge: badge).pluck(:seq)
expect(sequence.sort).to eq((0...(40 + 1)).to_a)
sequence = UserBadge.where(user: user_without_badge, badge: badge).pluck(:seq)
@@ -571,7 +598,7 @@ RSpec.describe Admin::BadgesController do
shared_examples "mass badge award not allowed" do
it "prevents mass badge award with a 404 response" do
- file = file_from_fixtures('user_emails.csv', 'csv')
+ file = file_from_fixtures("user_emails.csv", "csv")
post "/admin/badges/award/#{badge.id}.json", params: { file: fixture_file_upload(file) }
diff --git a/spec/requests/admin/color_schemes_controller_spec.rb b/spec/requests/admin/color_schemes_controller_spec.rb
index b5a539ac266..6869fc9f18b 100644
--- a/spec/requests/admin/color_schemes_controller_spec.rb
+++ b/spec/requests/admin/color_schemes_controller_spec.rb
@@ -5,14 +5,14 @@ RSpec.describe Admin::ColorSchemesController do
fab!(:moderator) { Fabricate(:moderator) }
fab!(:user) { Fabricate(:user) }
- let(:valid_params) { { color_scheme: {
- name: 'Such Design',
- colors: [
- { name: 'primary', hex: 'FFBB00' },
- { name: 'secondary', hex: '888888' }
- ]
+ let(:valid_params) do
+ {
+ color_scheme: {
+ name: "Such Design",
+ colors: [{ name: "primary", hex: "FFBB00" }, { name: "secondary", hex: "888888" }],
+ },
}
- } }
+ end
describe "#index" do
context "when logged in as an admin" do
@@ -49,7 +49,7 @@ RSpec.describe Admin::ColorSchemesController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "color schemes inaccessible"
end
@@ -63,28 +63,28 @@ RSpec.describe Admin::ColorSchemesController do
post "/admin/color_schemes.json", params: valid_params
expect(response.status).to eq(200)
- expect(response.parsed_body['id']).to be_present
+ expect(response.parsed_body["id"]).to be_present
end
it "returns failure with invalid params" do
params = valid_params
- params[:color_scheme][:colors][0][:hex] = 'cool color please'
+ params[:color_scheme][:colors][0][:hex] = "cool color please"
post "/admin/color_schemes.json", params: valid_params
expect(response.status).to eq(422)
- expect(response.parsed_body['errors']).to be_present
+ expect(response.parsed_body["errors"]).to be_present
end
end
shared_examples "color scheme creation not allowed" do
it "prevents creation with a 404 response" do
params = valid_params
- params[:color_scheme][:colors][0][:hex] = 'cool color please'
+ params[:color_scheme][:colors][0][:hex] = "cool color please"
- expect do
- post "/admin/color_schemes.json", params: valid_params
- end.not_to change { ColorScheme.count }
+ expect do post "/admin/color_schemes.json", params: valid_params end.not_to change {
+ ColorScheme.count
+ }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -98,7 +98,7 @@ RSpec.describe Admin::ColorSchemesController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "color scheme creation not allowed"
end
@@ -127,12 +127,12 @@ RSpec.describe Admin::ColorSchemesController do
params = valid_params
params[:color_scheme][:colors][0][:name] = color_scheme.colors.first.name
- params[:color_scheme][:colors][0][:hex] = 'cool color please'
+ params[:color_scheme][:colors][0][:hex] = "cool color please"
put "/admin/color_schemes/#{color_scheme.id}.json", params: params
expect(response.status).to eq(422)
- expect(response.parsed_body['errors']).to be_present
+ expect(response.parsed_body["errors"]).to be_present
end
end
@@ -152,7 +152,7 @@ RSpec.describe Admin::ColorSchemesController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "color scheme update not allowed"
end
@@ -165,9 +165,9 @@ RSpec.describe Admin::ColorSchemesController do
before { sign_in(admin) }
it "returns success" do
- expect {
- delete "/admin/color_schemes/#{existing.id}.json"
- }.to change { ColorScheme.count }.by(-1)
+ expect { delete "/admin/color_schemes/#{existing.id}.json" }.to change {
+ ColorScheme.count
+ }.by(-1)
expect(response.status).to eq(200)
end
end
@@ -188,7 +188,7 @@ RSpec.describe Admin::ColorSchemesController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "color scheme deletion not allowed"
end
diff --git a/spec/requests/admin/dashboard_controller_spec.rb b/spec/requests/admin/dashboard_controller_spec.rb
index cce0c7fc4a0..3d678a9fec3 100644
--- a/spec/requests/admin/dashboard_controller_spec.rb
+++ b/spec/requests/admin/dashboard_controller_spec.rb
@@ -17,21 +17,21 @@ RSpec.describe Admin::DashboardController do
"emoji" => "🤾",
"title" => "Cool Beans",
"description" => "Now beans are included",
- "created_at" => date1 || (Time.zone.now - 40.minutes)
+ "created_at" => date1 || (Time.zone.now - 40.minutes),
},
{
"id" => "2",
"emoji" => "🙈",
"title" => "Fancy Legumes",
"description" => "Legumes too!",
- "created_at" => date2 || (Time.zone.now - 20.minutes)
- }
+ "created_at" => date2 || (Time.zone.now - 20.minutes),
+ },
]
- Discourse.redis.set('new_features', MultiJson.dump(sample_features))
+ Discourse.redis.set("new_features", MultiJson.dump(sample_features))
end
- describe '#index' do
+ describe "#index" do
shared_examples "version info present" do
it "returns discourse version info" do
get "/admin/dashboard.json"
@@ -42,9 +42,7 @@ RSpec.describe Admin::DashboardController do
end
shared_examples "version info absent" do
- before do
- SiteSetting.version_checks = false
- end
+ before { SiteSetting.version_checks = false }
it "does not return discourse version info" do
get "/admin/dashboard.json"
@@ -59,17 +57,13 @@ RSpec.describe Admin::DashboardController do
before { sign_in(admin) }
context "when version checking is enabled" do
- before do
- SiteSetting.version_checks = true
- end
+ before { SiteSetting.version_checks = true }
include_examples "version info present"
end
context "when version checking is disabled" do
- before do
- SiteSetting.version_checks = false
- end
+ before { SiteSetting.version_checks = false }
include_examples "version info absent"
end
@@ -79,24 +73,20 @@ RSpec.describe Admin::DashboardController do
before { sign_in(moderator) }
context "when version checking is enabled" do
- before do
- SiteSetting.version_checks = true
- end
+ before { SiteSetting.version_checks = true }
include_examples "version info present"
end
context "when version checking is disabled" do
- before do
- SiteSetting.version_checks = false
- end
+ before { SiteSetting.version_checks = false }
include_examples "version info absent"
end
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
it "denies access with a 404 response" do
get "/admin/dashboard.json"
@@ -107,36 +97,34 @@ RSpec.describe Admin::DashboardController do
end
end
- describe '#problems' do
+ describe "#problems" do
context "when logged in as an admin" do
before { sign_in(admin) }
- context 'when there are no problems' do
- before do
- AdminDashboardData.stubs(:fetch_problems).returns([])
- end
+ context "when there are no problems" do
+ before { AdminDashboardData.stubs(:fetch_problems).returns([]) }
- it 'returns an empty array' do
+ it "returns an empty array" do
get "/admin/dashboard/problems.json"
expect(response.status).to eq(200)
json = response.parsed_body
- expect(json['problems'].size).to eq(0)
+ expect(json["problems"].size).to eq(0)
end
end
- context 'when there are problems' do
+ context "when there are problems" do
before do
- AdminDashboardData.stubs(:fetch_problems).returns(['Not enough awesome', 'Too much sass'])
+ AdminDashboardData.stubs(:fetch_problems).returns(["Not enough awesome", "Too much sass"])
end
- it 'returns an array of strings' do
+ it "returns an array of strings" do
get "/admin/dashboard/problems.json"
expect(response.status).to eq(200)
json = response.parsed_body
- expect(json['problems'].size).to eq(2)
- expect(json['problems'][0]).to be_a(String)
- expect(json['problems'][1]).to be_a(String)
+ expect(json["problems"].size).to eq(2)
+ expect(json["problems"][0]).to be_a(String)
+ expect(json["problems"][1]).to be_a(String)
end
end
end
@@ -144,23 +132,21 @@ RSpec.describe Admin::DashboardController do
context "when logged in as a moderator" do
before do
sign_in(moderator)
- AdminDashboardData
- .stubs(:fetch_problems)
- .returns(['Not enough awesome', 'Too much sass'])
+ AdminDashboardData.stubs(:fetch_problems).returns(["Not enough awesome", "Too much sass"])
end
- it 'returns a list of problems' do
+ it "returns a list of problems" do
get "/admin/dashboard/problems.json"
expect(response.status).to eq(200)
json = response.parsed_body
- expect(json['problems'].size).to eq(2)
- expect(json['problems']).to contain_exactly('Not enough awesome', 'Too much sass')
+ expect(json["problems"].size).to eq(2)
+ expect(json["problems"]).to contain_exactly("Not enough awesome", "Too much sass")
end
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
it "denies access with a 404 response" do
get "/admin/dashboard/problems.json"
@@ -171,45 +157,41 @@ RSpec.describe Admin::DashboardController do
end
end
- describe '#new_features' do
- after do
- DiscourseUpdates.clean_state
- end
+ describe "#new_features" do
+ after { DiscourseUpdates.clean_state }
context "when logged in as an admin" do
- before do
- sign_in(admin)
- end
+ before { sign_in(admin) }
- it 'is empty by default' do
+ it "is empty by default" do
get "/admin/dashboard/new-features.json"
expect(response.status).to eq(200)
json = response.parsed_body
- expect(json['new_features']).to eq(nil)
+ expect(json["new_features"]).to eq(nil)
end
- it 'fails gracefully for invalid JSON' do
+ it "fails gracefully for invalid JSON" do
Discourse.redis.set("new_features", "INVALID JSON")
get "/admin/dashboard/new-features.json"
expect(response.status).to eq(200)
json = response.parsed_body
- expect(json['new_features']).to eq(nil)
+ expect(json["new_features"]).to eq(nil)
end
- it 'includes new features when available' do
+ it "includes new features when available" do
populate_new_features
get "/admin/dashboard/new-features.json"
expect(response.status).to eq(200)
json = response.parsed_body
- expect(json['new_features'].length).to eq(2)
- expect(json['new_features'][0]["emoji"]).to eq("🙈")
- expect(json['new_features'][0]["title"]).to eq("Fancy Legumes")
- expect(json['has_unseen_features']).to eq(true)
+ expect(json["new_features"].length).to eq(2)
+ expect(json["new_features"][0]["emoji"]).to eq("🙈")
+ expect(json["new_features"][0]["title"]).to eq("Fancy Legumes")
+ expect(json["has_unseen_features"]).to eq(true)
end
- it 'passes unseen feature state' do
+ it "passes unseen feature state" do
populate_new_features
DiscourseUpdates.mark_new_features_as_seen(admin.id)
@@ -217,7 +199,7 @@ RSpec.describe Admin::DashboardController do
expect(response.status).to eq(200)
json = response.parsed_body
- expect(json['has_unseen_features']).to eq(false)
+ expect(json["has_unseen_features"]).to eq(false)
end
it "sets/bumps the last viewed feature date for the admin" do
@@ -229,14 +211,18 @@ RSpec.describe Admin::DashboardController do
get "/admin/dashboard/new-features.json"
expect(response.status).to eq(200)
- expect(DiscourseUpdates.get_last_viewed_feature_date(admin.id)).to be_within_one_second_of(date2)
+ expect(DiscourseUpdates.get_last_viewed_feature_date(admin.id)).to be_within_one_second_of(
+ date2,
+ )
date2 = 10.minutes.ago
populate_new_features(date1, date2)
get "/admin/dashboard/new-features.json"
expect(response.status).to eq(200)
- expect(DiscourseUpdates.get_last_viewed_feature_date(admin.id)).to be_within_one_second_of(date2)
+ expect(DiscourseUpdates.get_last_viewed_feature_date(admin.id)).to be_within_one_second_of(
+ date2,
+ )
end
it "doesn't error when there are no new features" do
@@ -248,17 +234,17 @@ RSpec.describe Admin::DashboardController do
context "when logged in as a moderator" do
before { sign_in(moderator) }
- it 'includes new features when available' do
+ it "includes new features when available" do
populate_new_features
get "/admin/dashboard/new-features.json"
json = response.parsed_body
- expect(json['new_features'].length).to eq(2)
- expect(json['new_features'][0]["emoji"]).to eq("🙈")
- expect(json['new_features'][0]["title"]).to eq("Fancy Legumes")
- expect(json['has_unseen_features']).to eq(true)
+ expect(json["new_features"].length).to eq(2)
+ expect(json["new_features"][0]["emoji"]).to eq("🙈")
+ expect(json["new_features"][0]["title"]).to eq("Fancy Legumes")
+ expect(json["has_unseen_features"]).to eq(true)
end
it "doesn't set last viewed feature date for moderators" do
@@ -284,15 +270,13 @@ RSpec.describe Admin::DashboardController do
end
end
- describe '#mark_new_features_as_seen' do
- after do
- DiscourseUpdates.clean_state
- end
+ describe "#mark_new_features_as_seen" do
+ after { DiscourseUpdates.clean_state }
context "when logged in as an admin" do
before { sign_in(admin) }
- it 'resets last seen for a given user' do
+ it "resets last seen for a given user" do
populate_new_features
put "/admin/dashboard/mark-new-features-as-seen.json"
diff --git a/spec/requests/admin/email_controller_spec.rb b/spec/requests/admin/email_controller_spec.rb
index 9932fa44369..925bdec568f 100644
--- a/spec/requests/admin/email_controller_spec.rb
+++ b/spec/requests/admin/email_controller_spec.rb
@@ -6,25 +6,21 @@ RSpec.describe Admin::EmailController do
fab!(:user) { Fabricate(:user) }
fab!(:email_log) { Fabricate(:email_log) }
- describe '#index' do
+ describe "#index" do
context "when logged in as an admin" do
before do
sign_in(admin)
- Admin::EmailController.any_instance
+ Admin::EmailController
+ .any_instance
.expects(:action_mailer_settings)
- .returns(
- username: 'username',
- password: 'secret'
- )
+ .returns(username: "username", password: "secret")
end
- it 'does not include the password in the response' do
+ it "does not include the password in the response" do
get "/admin/email.json"
- mail_settings = response.parsed_body['settings']
+ mail_settings = response.parsed_body["settings"]
- expect(
- mail_settings.select { |setting| setting['name'] == 'password' }
- ).to be_empty
+ expect(mail_settings.select { |setting| setting["name"] == "password" }).to be_empty
end
end
@@ -45,19 +41,17 @@ RSpec.describe Admin::EmailController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "email settings inaccessible"
end
end
- describe '#sent' do
+ describe "#sent" do
fab!(:post) { Fabricate(:post) }
fab!(:email_log) { Fabricate(:email_log, post: post) }
- let(:post_reply_key) do
- Fabricate(:post_reply_key, post: post, user: email_log.user)
- end
+ let(:post_reply_key) { Fabricate(:post_reply_key, post: post, user: email_log.user) }
context "when logged in as an admin" do
before { sign_in(admin) }
@@ -81,22 +75,19 @@ RSpec.describe Admin::EmailController do
expect(log["reply_key"]).to eq(post_reply_key.reply_key)
end
- it 'should be able to filter by reply key' do
+ it "should be able to filter by reply key" do
email_log_2 = Fabricate(:email_log, post: post)
- post_reply_key_2 = Fabricate(:post_reply_key,
- post: post,
- user: email_log_2.user,
- reply_key: "2d447423-c625-4fb9-8717-ff04ac60eee8"
- )
+ post_reply_key_2 =
+ Fabricate(
+ :post_reply_key,
+ post: post,
+ user: email_log_2.user,
+ reply_key: "2d447423-c625-4fb9-8717-ff04ac60eee8",
+ )
- [
- "17ff04",
- "2d447423c6254fb98717ff04ac60eee8"
- ].each do |reply_key|
- get "/admin/email/sent.json", params: {
- reply_key: reply_key
- }
+ %w[17ff04 2d447423c6254fb98717ff04ac60eee8].each do |reply_key|
+ get "/admin/email/sent.json", params: { reply_key: reply_key }
expect(response.status).to eq(200)
@@ -107,14 +98,12 @@ RSpec.describe Admin::EmailController do
end
end
- it 'should be able to filter by smtp_transaction_response' do
+ it "should be able to filter by smtp_transaction_response" do
email_log_2 = Fabricate(:email_log, smtp_transaction_response: <<~RESPONSE)
250 Ok: queued as pYoKuQ1aUG5vdpgh-k2K11qcpF4C1ZQ5qmvmmNW25SM=@mailhog.example
RESPONSE
- get "/admin/email/sent.json", params: {
- smtp_transaction_response: "pYoKu"
- }
+ get "/admin/email/sent.json", params: { smtp_transaction_response: "pYoKu" }
expect(response.status).to eq(200)
@@ -141,13 +130,13 @@ RSpec.describe Admin::EmailController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "sent emails inaccessible"
end
end
- describe '#skipped' do
+ describe "#skipped" do
# fab!(:user) { Fabricate(:user) }
fab!(:log1) { Fabricate(:skipped_email_log, user: user, created_at: 20.minutes.ago) }
fab!(:log2) { Fabricate(:skipped_email_log, created_at: 10.minutes.ago) }
@@ -167,10 +156,8 @@ RSpec.describe Admin::EmailController do
end
context "when filtered by username" do
- it 'should return the right response' do
- get "/admin/email/skipped.json", params: {
- user: user.username
- }
+ it "should return the right response" do
+ get "/admin/email/skipped.json", params: { user: user.username }
expect(response.status).to eq(200)
@@ -198,77 +185,73 @@ RSpec.describe Admin::EmailController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "skipped emails inaccessible"
end
end
- describe '#test' do
+ describe "#test" do
context "when logged in as an admin" do
before { sign_in(admin) }
- it 'raises an error without the email parameter' do
+ it "raises an error without the email parameter" do
post "/admin/email/test.json"
expect(response.status).to eq(400)
end
- context 'with an email address' do
- it 'enqueues a test email job' do
- post "/admin/email/test.json", params: { email_address: 'eviltrout@test.domain' }
+ context "with an email address" do
+ it "enqueues a test email job" do
+ post "/admin/email/test.json", params: { email_address: "eviltrout@test.domain" }
expect(response.status).to eq(200)
- expect(ActionMailer::Base.deliveries.map(&:to).flatten).to include('eviltrout@test.domain')
+ expect(ActionMailer::Base.deliveries.map(&:to).flatten).to include(
+ "eviltrout@test.domain",
+ )
end
end
- context 'with SiteSetting.disable_emails' do
+ context "with SiteSetting.disable_emails" do
fab!(:eviltrout) { Fabricate(:evil_trout) }
fab!(:admin) { Fabricate(:admin) }
it 'bypasses disable when setting is "yes"' do
- SiteSetting.disable_emails = 'yes'
+ SiteSetting.disable_emails = "yes"
post "/admin/email/test.json", params: { email_address: admin.email }
- expect(ActionMailer::Base.deliveries.first.to).to contain_exactly(
- admin.email
- )
+ expect(ActionMailer::Base.deliveries.first.to).to contain_exactly(admin.email)
incoming = response.parsed_body
- expect(incoming['sent_test_email_message']).to eq(I18n.t("admin.email.sent_test"))
+ expect(incoming["sent_test_email_message"]).to eq(I18n.t("admin.email.sent_test"))
end
it 'bypasses disable when setting is "non-staff"' do
- SiteSetting.disable_emails = 'non-staff'
+ SiteSetting.disable_emails = "non-staff"
post "/admin/email/test.json", params: { email_address: eviltrout.email }
- expect(ActionMailer::Base.deliveries.first.to).to contain_exactly(
- eviltrout.email
- )
+ expect(ActionMailer::Base.deliveries.first.to).to contain_exactly(eviltrout.email)
incoming = response.parsed_body
- expect(incoming['sent_test_email_message']).to eq(I18n.t("admin.email.sent_test"))
+ expect(incoming["sent_test_email_message"]).to eq(I18n.t("admin.email.sent_test"))
end
it 'works when setting is "no"' do
- SiteSetting.disable_emails = 'no'
+ SiteSetting.disable_emails = "no"
post "/admin/email/test.json", params: { email_address: eviltrout.email }
- expect(ActionMailer::Base.deliveries.first.to).to contain_exactly(
- eviltrout.email
- )
+ expect(ActionMailer::Base.deliveries.first.to).to contain_exactly(eviltrout.email)
incoming = response.parsed_body
- expect(incoming['sent_test_email_message']).to eq(I18n.t("admin.email.sent_test"))
+ expect(incoming["sent_test_email_message"]).to eq(I18n.t("admin.email.sent_test"))
end
end
end
shared_examples "email tests not allowed" do
it "prevents email tests with a 404 response" do
- post "/admin/email/test.json", params: { email_address: 'eviltrout@test.domain' }
+ post "/admin/email/test.json", params: { email_address: "eviltrout@test.domain" }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -282,42 +265,48 @@ RSpec.describe Admin::EmailController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "email tests not allowed"
end
end
- describe '#preview_digest' do
+ describe "#preview_digest" do
context "when logged in as an admin" do
before { sign_in(admin) }
- it 'raises an error without the last_seen_at parameter' do
+ it "raises an error without the last_seen_at parameter" do
get "/admin/email/preview-digest.json"
expect(response.status).to eq(400)
end
it "returns the right response when username is invalid" do
- get "/admin/email/preview-digest.json", params: {
- last_seen_at: 1.week.ago, username: "somerandomeusername"
- }
+ get "/admin/email/preview-digest.json",
+ params: {
+ last_seen_at: 1.week.ago,
+ username: "somerandomeusername",
+ }
expect(response.status).to eq(400)
end
it "previews the digest" do
- get "/admin/email/preview-digest.json", params: {
- last_seen_at: 1.week.ago, username: admin.username
- }
+ get "/admin/email/preview-digest.json",
+ params: {
+ last_seen_at: 1.week.ago,
+ username: admin.username,
+ }
expect(response.status).to eq(200)
end
end
shared_examples "preview digest inaccessible" do
it "denies access with a 404 response" do
- get "/admin/email/preview-digest.json", params: {
- last_seen_at: 1.week.ago, username: moderator.username
- }
+ get "/admin/email/preview-digest.json",
+ params: {
+ last_seen_at: 1.week.ago,
+ username: moderator.username,
+ }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -331,26 +320,29 @@ RSpec.describe Admin::EmailController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "preview digest inaccessible"
end
end
- describe '#send_digest' do
+ describe "#send_digest" do
context "when logged in as an admin" do
before { sign_in(admin) }
it "sends the digest" do
- post "/admin/email/send-digest.json", params: {
- last_seen_at: 1.week.ago, username: admin.username, email: email('previous_replies')
- }
+ post "/admin/email/send-digest.json",
+ params: {
+ last_seen_at: 1.week.ago,
+ username: admin.username,
+ email: email("previous_replies"),
+ }
expect(response.status).to eq(200)
end
end
end
- describe '#handle_mail' do
+ describe "#handle_mail" do
context "when logged in as an admin" do
before { sign_in(admin) }
@@ -360,30 +352,44 @@ RSpec.describe Admin::EmailController do
expect(response.body).to include("param is missing")
end
- it 'should enqueue the right job, and show a deprecation warning (email_encoded param should be used)' do
+ it "should enqueue the right job, and show a deprecation warning (email_encoded param should be used)" do
expect_enqueued_with(
job: :process_email,
- args: { mail: email('cc'), retry_on_rate_limit: true, source: :handle_mail }
- ) do
- post "/admin/email/handle_mail.json", params: { email: email('cc') }
- end
+ args: {
+ mail: email("cc"),
+ retry_on_rate_limit: true,
+ source: :handle_mail,
+ },
+ ) { post "/admin/email/handle_mail.json", params: { email: email("cc") } }
expect(response.status).to eq(200)
- expect(response.body).to eq("warning: the email parameter is deprecated. all POST requests to this route should be sent with a base64 strict encoded email_encoded parameter instead. email has been received and is queued for processing")
+ expect(response.body).to eq(
+ "warning: the email parameter is deprecated. all POST requests to this route should be sent with a base64 strict encoded email_encoded parameter instead. email has been received and is queued for processing",
+ )
end
- it 'should enqueue the right job, decoding the raw email param' do
+ it "should enqueue the right job, decoding the raw email param" do
expect_enqueued_with(
job: :process_email,
- args: { mail: email('cc'), retry_on_rate_limit: true, source: :handle_mail }
+ args: {
+ mail: email("cc"),
+ retry_on_rate_limit: true,
+ source: :handle_mail,
+ },
) do
- post "/admin/email/handle_mail.json", params: { email_encoded: Base64.strict_encode64(email('cc')) }
+ post "/admin/email/handle_mail.json",
+ params: {
+ email_encoded: Base64.strict_encode64(email("cc")),
+ }
end
expect(response.status).to eq(200)
expect(response.body).to eq("email has been received and is queued for processing")
end
it "retries enqueueing with forced UTF-8 encoding when encountering Encoding::UndefinedConversionError" do
- post "/admin/email/handle_mail.json", params: { email_encoded: Base64.strict_encode64(email('encoding_undefined_conversion')) }
+ post "/admin/email/handle_mail.json",
+ params: {
+ email_encoded: Base64.strict_encode64(email("encoding_undefined_conversion")),
+ }
expect(response.status).to eq(200)
expect(response.body).to eq("email has been received and is queued for processing")
end
@@ -391,7 +397,10 @@ RSpec.describe Admin::EmailController do
shared_examples "email handling not allowed" do
it "prevents email handling with a 404 response" do
- post "/admin/email/handle_mail.json", params: { email_encoded: Base64.strict_encode64(email('cc')) }
+ post "/admin/email/handle_mail.json",
+ params: {
+ email_encoded: Base64.strict_encode64(email("cc")),
+ }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -405,22 +414,22 @@ RSpec.describe Admin::EmailController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "email handling not allowed"
end
end
- describe '#rejected' do
+ describe "#rejected" do
context "when logged in as an admin" do
- before { sign_in(admin) }
+ before { sign_in(admin) }
- it 'should provide a string for a blank error' do
+ it "should provide a string for a blank error" do
Fabricate(:incoming_email, error: "")
get "/admin/email/rejected.json"
expect(response.status).to eq(200)
rejected = response.parsed_body
- expect(rejected.first['error']).to eq(I18n.t("emails.incoming.unrecognized_error"))
+ expect(rejected.first["error"]).to eq(I18n.t("emails.incoming.unrecognized_error"))
end
end
@@ -440,22 +449,22 @@ RSpec.describe Admin::EmailController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "rejected emails inaccessible"
end
end
- describe '#incoming' do
+ describe "#incoming" do
context "when logged in as an admin" do
- before { sign_in(admin) }
+ before { sign_in(admin) }
- it 'should provide a string for a blank error' do
+ it "should provide a string for a blank error" do
incoming_email = Fabricate(:incoming_email, error: "")
get "/admin/email/incoming/#{incoming_email.id}.json"
expect(response.status).to eq(200)
incoming = response.parsed_body
- expect(incoming['error']).to eq(I18n.t("emails.incoming.unrecognized_error"))
+ expect(incoming["error"]).to eq(I18n.t("emails.incoming.unrecognized_error"))
end
end
@@ -477,17 +486,17 @@ RSpec.describe Admin::EmailController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "incoming emails inaccessible"
end
end
- describe '#incoming_from_bounced' do
+ describe "#incoming_from_bounced" do
context "when logged in as an admin" do
before { sign_in(admin) }
- it 'raises an error when the email log entry does not exist' do
+ it "raises an error when the email log entry does not exist" do
get "/admin/email/incoming_from_bounced/12345.json"
expect(response.status).to eq(404)
@@ -495,7 +504,7 @@ RSpec.describe Admin::EmailController do
expect(json["errors"]).to include("Discourse::InvalidParameters")
end
- it 'raises an error when the email log entry is not marked as bounced' do
+ it "raises an error when the email log entry is not marked as bounced" do
get "/admin/email/incoming_from_bounced/#{email_log.id}.json"
expect(response.status).to eq(404)
@@ -503,17 +512,18 @@ RSpec.describe Admin::EmailController do
expect(json["errors"]).to include("Discourse::InvalidParameters")
end
- context 'when bounced email log entry exists' do
+ context "when bounced email log entry exists" do
fab!(:email_log) { Fabricate(:email_log, bounced: true, bounce_key: SecureRandom.hex) }
let(:error_message) { "Email::Receiver::BouncedEmailError" }
- it 'returns an incoming email sent to the reply_by_email_address' do
+ it "returns an incoming email sent to the reply_by_email_address" do
SiteSetting.reply_by_email_address = "replies+%{reply_key}@example.com"
- Fabricate(:incoming_email,
- is_bounce: true,
- error: error_message,
- to_addresses: Email::Sender.bounce_address(email_log.bounce_key)
+ Fabricate(
+ :incoming_email,
+ is_bounce: true,
+ error: error_message,
+ to_addresses: Email::Sender.bounce_address(email_log.bounce_key),
)
get "/admin/email/incoming_from_bounced/#{email_log.id}.json"
@@ -523,11 +533,12 @@ RSpec.describe Admin::EmailController do
expect(json["error"]).to eq(error_message)
end
- it 'returns an incoming email sent to the notification_email address' do
- Fabricate(:incoming_email,
- is_bounce: true,
- error: error_message,
- to_addresses: SiteSetting.notification_email.sub("@", "+verp-#{email_log.bounce_key}@")
+ it "returns an incoming email sent to the notification_email address" do
+ Fabricate(
+ :incoming_email,
+ is_bounce: true,
+ error: error_message,
+ to_addresses: SiteSetting.notification_email.sub("@", "+verp-#{email_log.bounce_key}@"),
)
get "/admin/email/incoming_from_bounced/#{email_log.id}.json"
@@ -537,12 +548,13 @@ RSpec.describe Admin::EmailController do
expect(json["error"]).to eq(error_message)
end
- it 'returns an incoming email sent to the notification_email address' do
+ it "returns an incoming email sent to the notification_email address" do
SiteSetting.reply_by_email_address = "replies+%{reply_key}@subdomain.example.com"
- Fabricate(:incoming_email,
- is_bounce: true,
- error: error_message,
- to_addresses: "subdomain+verp-#{email_log.bounce_key}@example.com"
+ Fabricate(
+ :incoming_email,
+ is_bounce: true,
+ error: error_message,
+ to_addresses: "subdomain+verp-#{email_log.bounce_key}@example.com",
)
get "/admin/email/incoming_from_bounced/#{email_log.id}.json"
@@ -552,7 +564,7 @@ RSpec.describe Admin::EmailController do
expect(json["error"]).to eq(error_message)
end
- it 'raises an error if the bounce_key is blank' do
+ it "raises an error if the bounce_key is blank" do
email_log.update(bounce_key: nil)
get "/admin/email/incoming_from_bounced/#{email_log.id}.json"
@@ -562,7 +574,7 @@ RSpec.describe Admin::EmailController do
expect(json["errors"]).to include("Discourse::InvalidParameters")
end
- it 'raises an error if there is no incoming email' do
+ it "raises an error if there is no incoming email" do
get "/admin/email/incoming_from_bounced/#{email_log.id}.json"
expect(response.status).to eq(404)
@@ -578,10 +590,11 @@ RSpec.describe Admin::EmailController do
error_message = "Email::Receiver::BouncedEmailError"
SiteSetting.reply_by_email_address = "replies+%{reply_key}@example.com"
- Fabricate(:incoming_email,
- is_bounce: true,
- error: error_message,
- to_addresses: Email::Sender.bounce_address(email_log.bounce_key)
+ Fabricate(
+ :incoming_email,
+ is_bounce: true,
+ error: error_message,
+ to_addresses: Email::Sender.bounce_address(email_log.bounce_key),
)
get "/admin/email/incoming_from_bounced/#{email_log.id}.json"
@@ -598,15 +611,14 @@ RSpec.describe Admin::EmailController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "bounced incoming emails inaccessible"
end
end
- describe '#advanced_test' do
- let(:email) do
- <<~EMAIL
+ describe "#advanced_test" do
+ let(:email) { <<~EMAIL }
From: "somebody"
To: someone@example.com
Date: Mon, 3 Dec 2018 00:00:00 -0000
@@ -619,19 +631,18 @@ RSpec.describe Admin::EmailController do
This part should be elided.
EMAIL
- end
context "when logged in as an admin" do
before { sign_in(admin) }
- it 'should ...' do
+ it "should ..." do
post "/admin/email/advanced-test.json", params: { email: email }
expect(response.status).to eq(200)
incoming = response.parsed_body
- expect(incoming['format']).to eq(1)
- expect(incoming['text']).to eq("Hello, this is a test!")
- expect(incoming['elided']).to eq("---\n\nThis part should be elided.")
+ expect(incoming["format"]).to eq(1)
+ expect(incoming["text"]).to eq("Hello, this is a test!")
+ expect(incoming["elided"]).to eq("---\n\nThis part should be elided.")
end
end
@@ -651,7 +662,7 @@ RSpec.describe Admin::EmailController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "advanced email tests not allowed"
end
diff --git a/spec/requests/admin/email_styles_controller_spec.rb b/spec/requests/admin/email_styles_controller_spec.rb
index a7727ffb580..7f8df5733b8 100644
--- a/spec/requests/admin/email_styles_controller_spec.rb
+++ b/spec/requests/admin/email_styles_controller_spec.rb
@@ -13,34 +13,34 @@ RSpec.describe Admin::EmailStylesController do
SiteSetting.remove_override!(:email_custom_css)
end
- describe 'show' do
+ describe "show" do
context "when logged in as an admin" do
before { sign_in(admin) }
- it 'returns default values' do
- get '/admin/customize/email_style.json'
+ it "returns default values" do
+ get "/admin/customize/email_style.json"
expect(response.status).to eq(200)
- json = response.parsed_body['email_style']
- expect(json['html']).to eq(default_html)
- expect(json['css']).to eq(default_css)
+ json = response.parsed_body["email_style"]
+ expect(json["html"]).to eq(default_html)
+ expect(json["css"]).to eq(default_css)
end
- it 'returns customized values' do
+ it "returns customized values" do
SiteSetting.email_custom_template = "For you: %{email_content}"
SiteSetting.email_custom_css = ".user-name { font-size: 24px; }"
- get '/admin/customize/email_style.json'
+ get "/admin/customize/email_style.json"
expect(response.status).to eq(200)
- json = response.parsed_body['email_style']
- expect(json['html']).to eq("For you: %{email_content}")
- expect(json['css']).to eq(".user-name { font-size: 24px; }")
+ json = response.parsed_body["email_style"]
+ expect(json["html"]).to eq("For you: %{email_content}")
+ expect(json["css"]).to eq(".user-name { font-size: 24px; }")
end
end
shared_examples "email styles inaccessible" do
it "denies access with a 404 response" do
- get '/admin/customize/email_style.json'
+ get "/admin/customize/email_style.json"
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -54,49 +54,44 @@ RSpec.describe Admin::EmailStylesController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "email styles inaccessible"
end
end
- describe 'update' do
+ describe "update" do
let(:valid_params) do
- {
- html: 'For you: %{email_content}',
- css: '.user-name { color: purple; }'
- }
+ { html: "For you: %{email_content}", css: ".user-name { color: purple; }" }
end
context "when logged in as an admin" do
before { sign_in(admin) }
- it 'changes the settings' do
+ it "changes the settings" do
SiteSetting.email_custom_css = ".user-name { font-size: 24px; }"
- put '/admin/customize/email_style.json', params: { email_style: valid_params }
+ put "/admin/customize/email_style.json", params: { email_style: valid_params }
expect(response.status).to eq(200)
expect(SiteSetting.email_custom_template).to eq(valid_params[:html])
expect(SiteSetting.email_custom_css).to eq(valid_params[:css])
end
- it 'reports errors' do
- put '/admin/customize/email_style.json', params: {
- email_style: valid_params.merge(html: 'No email content')
- }
+ it "reports errors" do
+ put "/admin/customize/email_style.json",
+ params: {
+ email_style: valid_params.merge(html: "No email content"),
+ }
expect(response.status).to eq(422)
json = response.parsed_body
- expect(json['errors']).to include(
- I18n.t(
- 'email_style.html_missing_placeholder',
- placeholder: '%{email_content}'
- )
+ expect(json["errors"]).to include(
+ I18n.t("email_style.html_missing_placeholder", placeholder: "%{email_content}"),
)
end
end
shared_examples "email style update not allowed" do
it "denies access with a 404 response" do
- put '/admin/customize/email_style.json', params: { email_style: valid_params }
+ put "/admin/customize/email_style.json", params: { email_style: valid_params }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -110,7 +105,7 @@ RSpec.describe Admin::EmailStylesController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "email style update not allowed"
end
diff --git a/spec/requests/admin/email_templates_controller_spec.rb b/spec/requests/admin/email_templates_controller_spec.rb
index ec6fc3d315b..e9e15341bfb 100644
--- a/spec/requests/admin/email_templates_controller_spec.rb
+++ b/spec/requests/admin/email_templates_controller_spec.rb
@@ -9,9 +9,9 @@ RSpec.describe Admin::EmailTemplatesController do
I18n.overrides_disabled { I18n.t(key) }
end
- let(:original_subject) { original_text('user_notifications.admin_login.subject_template') }
- let(:original_body) { original_text('user_notifications.admin_login.text_body_template') }
- let(:headers) { { ACCEPT: 'application/json' } }
+ let(:original_subject) { original_text("user_notifications.admin_login.subject_template") }
+ let(:original_body) { original_text("user_notifications.admin_login.text_body_template") }
+ let(:headers) { { ACCEPT: "application/json" } }
after do
TranslationOverride.delete_all
@@ -23,33 +23,38 @@ RSpec.describe Admin::EmailTemplatesController do
before { sign_in(admin) }
it "should work if you are an admin" do
- get '/admin/customize/email_templates.json'
+ get "/admin/customize/email_templates.json"
expect(response.status).to eq(200)
json = response.parsed_body
- expect(json['email_templates']).to be_present
+ expect(json["email_templates"]).to be_present
end
- it 'returns overridden = true if subject or body has translation_overrides record' do
- put '/admin/customize/email_templates/user_notifications.admin_login', params: {
- email_template: { subject: original_subject, body: original_body }
- }, headers: headers
+ it "returns overridden = true if subject or body has translation_overrides record" do
+ put "/admin/customize/email_templates/user_notifications.admin_login",
+ params: {
+ email_template: {
+ subject: original_subject,
+ body: original_body,
+ },
+ },
+ headers: headers
expect(response.status).to eq(200)
- get '/admin/customize/email_templates.json'
+ get "/admin/customize/email_templates.json"
expect(response.status).to eq(200)
- templates = response.parsed_body['email_templates']
- template = templates.find { |t| t['id'] == 'user_notifications.admin_login' }
- expect(template['can_revert']).to eq(true)
+ templates = response.parsed_body["email_templates"]
+ template = templates.find { |t| t["id"] == "user_notifications.admin_login" }
+ expect(template["can_revert"]).to eq(true)
TranslationOverride.destroy_all
- get '/admin/customize/email_templates.json'
+ get "/admin/customize/email_templates.json"
expect(response.status).to eq(200)
- templates = response.parsed_body['email_templates']
- template = templates.find { |t| t['id'] == 'user_notifications.admin_login' }
- expect(template['can_revert']).to eq(false)
+ templates = response.parsed_body["email_templates"]
+ template = templates.find { |t| t["id"] == "user_notifications.admin_login" }
+ expect(template["can_revert"]).to eq(false)
end
end
@@ -69,7 +74,7 @@ RSpec.describe Admin::EmailTemplatesController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "email templates inaccessible"
end
@@ -84,62 +89,84 @@ RSpec.describe Admin::EmailTemplatesController do
before { sign_in(admin) }
it "returns 'not found' when an unknown email template id is used" do
- put '/admin/customize/email_templates/non_existent_template', params: {
- email_template: { subject: 'Foo', body: 'Bar' }
- }, headers: headers
+ put "/admin/customize/email_templates/non_existent_template",
+ params: {
+ email_template: {
+ subject: "Foo",
+ body: "Bar",
+ },
+ },
+ headers: headers
expect(response).not_to be_successful
json = response.parsed_body
- expect(json['error_type']).to eq('not_found')
+ expect(json["error_type"]).to eq("not_found")
end
shared_examples "invalid email template" do
it "returns the right error messages" do
- put '/admin/customize/email_templates/user_notifications.admin_login', params: {
- email_template: { subject: email_subject, body: email_body }
- }, headers: headers
+ put "/admin/customize/email_templates/user_notifications.admin_login",
+ params: {
+ email_template: {
+ subject: email_subject,
+ body: email_body,
+ },
+ },
+ headers: headers
json = response.parsed_body
expect(json).to be_present
- errors = json['errors']
+ errors = json["errors"]
expect(errors).to be_present
expect(errors).to eq(expected_errors)
end
it "doesn't create translation overrides" do
- put '/admin/customize/email_templates/user_notifications.admin_login', params: {
- email_template: { subject: email_subject, body: email_body }
- }, headers: headers
+ put "/admin/customize/email_templates/user_notifications.admin_login",
+ params: {
+ email_template: {
+ subject: email_subject,
+ body: email_body,
+ },
+ },
+ headers: headers
- expect(I18n.t('user_notifications.admin_login.subject_template')).to eq(original_subject)
- expect(I18n.t('user_notifications.admin_login.text_body_template')).to eq(original_body)
+ expect(I18n.t("user_notifications.admin_login.subject_template")).to eq(original_subject)
+ expect(I18n.t("user_notifications.admin_login.text_body_template")).to eq(original_body)
end
it "doesn't create entries in the Staff Log" do
- put '/admin/customize/email_templates/user_notifications.admin_login', params: {
- email_template: { subject: email_subject, body: email_body }
- }, headers: headers
+ put "/admin/customize/email_templates/user_notifications.admin_login",
+ params: {
+ email_template: {
+ subject: email_subject,
+ body: email_body,
+ },
+ },
+ headers: headers
- log = UserHistory.find_by_subject('user_notifications.admin_login.subject_template')
+ log = UserHistory.find_by_subject("user_notifications.admin_login.subject_template")
expect(log).to be_nil
- log = UserHistory.find_by_subject('user_notifications.admin_login.text_body_template')
+ log = UserHistory.find_by_subject("user_notifications.admin_login.text_body_template")
expect(log).to be_nil
end
end
context "when subject is invalid" do
- let(:email_subject) { '%{email_wrongfix} Foo' }
- let(:email_body) { 'Body with missing interpolation keys' }
+ let(:email_subject) { "%{email_wrongfix} Foo" }
+ let(:email_body) { "Body with missing interpolation keys" }
let(:expected_errors) do
[
- "Subject : #{I18n.t(
- 'activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys',
- keys: 'email_wrongfix'
- )}"
+ "Subject : #{
+ I18n.t(
+ "activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys",
+ keys: "email_wrongfix",
+ )
+ }",
]
end
@@ -147,15 +174,17 @@ RSpec.describe Admin::EmailTemplatesController do
end
context "when body is invalid" do
- let(:email_subject) { 'Subject with missing interpolation key' }
- let(:email_body) { 'Body with %{invalid} interpolation key' }
+ let(:email_subject) { "Subject with missing interpolation key" }
+ let(:email_body) { "Body with %{invalid} interpolation key" }
let(:expected_errors) do
[
- "Body : #{I18n.t(
- 'activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys',
- keys: 'invalid'
- )}"
+ "Body : #{
+ I18n.t(
+ "activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys",
+ keys: "invalid",
+ )
+ }",
]
end
@@ -163,19 +192,23 @@ RSpec.describe Admin::EmailTemplatesController do
end
context "when subject and body are invalid" do
- let(:email_subject) { 'Subject with %{invalid} interpolation key' }
- let(:email_body) { 'Body with some invalid interpolation keys: %{invalid}' }
+ let(:email_subject) { "Subject with %{invalid} interpolation key" }
+ let(:email_body) { "Body with some invalid interpolation keys: %{invalid}" }
let(:expected_errors) do
[
- "Subject : #{I18n.t(
- 'activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys',
- keys: 'invalid'
- )}",
- "Body : #{I18n.t(
- 'activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys',
- keys: 'invalid'
- )}",
+ "Subject : #{
+ I18n.t(
+ "activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys",
+ keys: "invalid",
+ )
+ }",
+ "Body : #{
+ I18n.t(
+ "activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys",
+ keys: "invalid",
+ )
+ }",
]
end
@@ -183,51 +216,66 @@ RSpec.describe Admin::EmailTemplatesController do
end
context "when subject and body contain all required interpolation keys" do
- let(:email_subject) { '%{email_prefix} Foo' }
- let(:email_body) { 'The body contains [%{site_name}](%{base_url}) and %{email_token}.' }
+ let(:email_subject) { "%{email_prefix} Foo" }
+ let(:email_body) { "The body contains [%{site_name}](%{base_url}) and %{email_token}." }
it "returns the successfully updated email template" do
- put '/admin/customize/email_templates/user_notifications.admin_login', params: {
- email_template: { subject: email_subject, body: email_body }
- }, headers: headers
+ put "/admin/customize/email_templates/user_notifications.admin_login",
+ params: {
+ email_template: {
+ subject: email_subject,
+ body: email_body,
+ },
+ },
+ headers: headers
expect(response.status).to eq(200)
json = response.parsed_body
expect(json).to be_present
- template = json['email_template']
+ template = json["email_template"]
expect(template).to be_present
- expect(template['id']).to eq('user_notifications.admin_login')
- expect(template['title']).to eq('Admin Login')
- expect(template['subject']).to eq(email_subject)
- expect(template['body']).to eq(email_body)
- expect(template['can_revert']).to eq(true)
+ expect(template["id"]).to eq("user_notifications.admin_login")
+ expect(template["title"]).to eq("Admin Login")
+ expect(template["subject"]).to eq(email_subject)
+ expect(template["body"]).to eq(email_body)
+ expect(template["can_revert"]).to eq(true)
end
it "creates translation overrides" do
- put '/admin/customize/email_templates/user_notifications.admin_login', params: {
- email_template: { subject: email_subject, body: email_body }
- }, headers: headers
+ put "/admin/customize/email_templates/user_notifications.admin_login",
+ params: {
+ email_template: {
+ subject: email_subject,
+ body: email_body,
+ },
+ },
+ headers: headers
- expect(I18n.t('user_notifications.admin_login.subject_template')).to eq(email_subject)
- expect(I18n.t('user_notifications.admin_login.text_body_template')).to eq(email_body)
+ expect(I18n.t("user_notifications.admin_login.subject_template")).to eq(email_subject)
+ expect(I18n.t("user_notifications.admin_login.text_body_template")).to eq(email_body)
end
it "creates entries in the Staff Log" do
- put '/admin/customize/email_templates/user_notifications.admin_login', params: {
- email_template: { subject: email_subject, body: email_body }
- }, headers: headers
+ put "/admin/customize/email_templates/user_notifications.admin_login",
+ params: {
+ email_template: {
+ subject: email_subject,
+ body: email_body,
+ },
+ },
+ headers: headers
- log = UserHistory.find_by_subject('user_notifications.admin_login.subject_template')
+ log = UserHistory.find_by_subject("user_notifications.admin_login.subject_template")
expect(log).to be_present
expect(log.action).to eq(UserHistory.actions[:change_site_text])
expect(log.previous_value).to eq(original_subject)
expect(log.new_value).to eq(email_subject)
- log = UserHistory.find_by_subject('user_notifications.admin_login.text_body_template')
+ log = UserHistory.find_by_subject("user_notifications.admin_login.text_body_template")
expect(log).to be_present
expect(log.action).to eq(UserHistory.actions[:change_site_text])
@@ -238,26 +286,40 @@ RSpec.describe Admin::EmailTemplatesController do
context "when subject has plural keys" do
it "doesn't update the subject" do
- old_subject = I18n.t('system_messages.pending_users_reminder.subject_template')
+ old_subject = I18n.t("system_messages.pending_users_reminder.subject_template")
expect(old_subject).to be_a(Hash)
- put '/admin/customize/email_templates/system_messages.pending_users_reminder', params: {
- email_template: { subject: '', body: 'Lorem ipsum' }
- }, headers: headers
+ put "/admin/customize/email_templates/system_messages.pending_users_reminder",
+ params: {
+ email_template: {
+ subject: "",
+ body: "Lorem ipsum",
+ },
+ },
+ headers: headers
expect(response.status).to eq(200)
- expect(I18n.t('system_messages.pending_users_reminder.subject_template')).to eq(old_subject)
- expect(I18n.t('system_messages.pending_users_reminder.text_body_template')).to eq('Lorem ipsum')
+ expect(I18n.t("system_messages.pending_users_reminder.subject_template")).to eq(
+ old_subject,
+ )
+ expect(I18n.t("system_messages.pending_users_reminder.text_body_template")).to eq(
+ "Lorem ipsum",
+ )
end
end
end
shared_examples "email template update not allowed" do
it "prevents updates with a 404 response" do
- put "/admin/customize/email_templates/some_id", params: {
- email_template: { subject: 'Subject', body: 'Body' }
- }, headers: headers
+ put "/admin/customize/email_templates/some_id",
+ params: {
+ email_template: {
+ subject: "Subject",
+ body: "Body",
+ },
+ },
+ headers: headers
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -286,62 +348,67 @@ RSpec.describe Admin::EmailTemplatesController do
before { sign_in(admin) }
it "returns 'not found' when an unknown email template id is used" do
- delete '/admin/customize/email_templates/non_existent_template', headers: headers
+ delete "/admin/customize/email_templates/non_existent_template", headers: headers
expect(response).not_to be_successful
json = response.parsed_body
- expect(json['error_type']).to eq('not_found')
+ expect(json["error_type"]).to eq("not_found")
end
context "when email template has translation overrides" do
- let(:email_subject) { '%{email_prefix} Foo' }
- let(:email_body) { 'The body contains [%{site_name}](%{base_url}) and %{email_token}.' }
+ let(:email_subject) { "%{email_prefix} Foo" }
+ let(:email_body) { "The body contains [%{site_name}](%{base_url}) and %{email_token}." }
before do
- put '/admin/customize/email_templates/user_notifications.admin_login', params: {
- email_template: { subject: email_subject, body: email_body }
- }, headers: headers
+ put "/admin/customize/email_templates/user_notifications.admin_login",
+ params: {
+ email_template: {
+ subject: email_subject,
+ body: email_body,
+ },
+ },
+ headers: headers
end
it "restores the original subject and body" do
- expect(I18n.t('user_notifications.admin_login.subject_template')).to eq(email_subject)
- expect(I18n.t('user_notifications.admin_login.text_body_template')).to eq(email_body)
+ expect(I18n.t("user_notifications.admin_login.subject_template")).to eq(email_subject)
+ expect(I18n.t("user_notifications.admin_login.text_body_template")).to eq(email_body)
- delete '/admin/customize/email_templates/user_notifications.admin_login', headers: headers
+ delete "/admin/customize/email_templates/user_notifications.admin_login", headers: headers
- expect(I18n.t('user_notifications.admin_login.subject_template')).to eq(original_subject)
- expect(I18n.t('user_notifications.admin_login.text_body_template')).to eq(original_body)
+ expect(I18n.t("user_notifications.admin_login.subject_template")).to eq(original_subject)
+ expect(I18n.t("user_notifications.admin_login.text_body_template")).to eq(original_body)
end
it "returns the restored email template" do
- delete '/admin/customize/email_templates/user_notifications.admin_login', headers: headers
+ delete "/admin/customize/email_templates/user_notifications.admin_login", headers: headers
expect(response.status).to eq(200)
json = response.parsed_body
expect(json).to be_present
- template = json['email_template']
+ template = json["email_template"]
expect(template).to be_present
- expect(template['id']).to eq('user_notifications.admin_login')
- expect(template['title']).to eq('Admin Login')
- expect(template['subject']).to eq(original_subject)
- expect(template['body']).to eq(original_body)
- expect(template['can_revert']).to eq(false)
+ expect(template["id"]).to eq("user_notifications.admin_login")
+ expect(template["title"]).to eq("Admin Login")
+ expect(template["subject"]).to eq(original_subject)
+ expect(template["body"]).to eq(original_body)
+ expect(template["can_revert"]).to eq(false)
end
it "creates entries in the Staff Log" do
UserHistory.delete_all
- delete '/admin/customize/email_templates/user_notifications.admin_login', headers: headers
+ delete "/admin/customize/email_templates/user_notifications.admin_login", headers: headers
- log = UserHistory.find_by_subject('user_notifications.admin_login.subject_template')
+ log = UserHistory.find_by_subject("user_notifications.admin_login.subject_template")
expect(log).to be_present
expect(log.action).to eq(UserHistory.actions[:change_site_text])
expect(log.previous_value).to eq(email_subject)
expect(log.new_value).to eq(original_subject)
- log = UserHistory.find_by_subject('user_notifications.admin_login.text_body_template')
+ log = UserHistory.find_by_subject("user_notifications.admin_login.text_body_template")
expect(log).to be_present
expect(log.action).to eq(UserHistory.actions[:change_site_text])
@@ -379,7 +446,7 @@ RSpec.describe Admin::EmailTemplatesController do
it "uses only existing email templates" do
Admin::EmailTemplatesController.email_keys.each do |key|
- expect(I18n.t(key)).to_not include('translation missing')
+ expect(I18n.t(key)).to_not include("translation missing")
end
end
end
diff --git a/spec/requests/admin/embeddable_hosts_controller_spec.rb b/spec/requests/admin/embeddable_hosts_controller_spec.rb
index cd3ab6689f1..b7b557c5352 100644
--- a/spec/requests/admin/embeddable_hosts_controller_spec.rb
+++ b/spec/requests/admin/embeddable_hosts_controller_spec.rb
@@ -6,26 +6,26 @@ RSpec.describe Admin::EmbeddableHostsController do
fab!(:user) { Fabricate(:user) }
fab!(:embeddable_host) { Fabricate(:embeddable_host) }
- describe '#create' do
+ describe "#create" do
context "when logged in as an admin" do
before { sign_in(admin) }
it "logs embeddable host create" do
- post "/admin/embeddable_hosts.json", params: {
- embeddable_host: { host: "test.com" }
- }
+ post "/admin/embeddable_hosts.json", params: { embeddable_host: { host: "test.com" } }
expect(response.status).to eq(200)
- expect(UserHistory.where(acting_user_id: admin.id,
- action: UserHistory.actions[:embeddable_host_create]).exists?).to eq(true)
+ expect(
+ UserHistory.where(
+ acting_user_id: admin.id,
+ action: UserHistory.actions[:embeddable_host_create],
+ ).exists?,
+ ).to eq(true)
end
end
shared_examples "embeddable host creation not allowed" do
it "prevents embeddable host creation with a 404 response" do
- post "/admin/embeddable_hosts.json", params: {
- embeddable_host: { host: "test.com" }
- }
+ post "/admin/embeddable_hosts.json", params: { embeddable_host: { host: "test.com" } }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -39,29 +39,36 @@ RSpec.describe Admin::EmbeddableHostsController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "embeddable host creation not allowed"
end
end
- describe '#update' do
+ describe "#update" do
context "when logged in as an admin" do
before { sign_in(admin) }
it "logs embeddable host update" do
category = Fabricate(:category)
- put "/admin/embeddable_hosts/#{embeddable_host.id}.json", params: {
- embeddable_host: { host: "test.com", class_name: "test-class", category_id: category.id }
- }
+ put "/admin/embeddable_hosts/#{embeddable_host.id}.json",
+ params: {
+ embeddable_host: {
+ host: "test.com",
+ class_name: "test-class",
+ category_id: category.id,
+ },
+ }
expect(response.status).to eq(200)
- history_exists = UserHistory.where(
+ history_exists =
+ UserHistory.where(
acting_user_id: admin.id,
action: UserHistory.actions[:embeddable_host_update],
- new_value: "category_id: #{category.id}, class_name: test-class, host: test.com").exists?
+ new_value: "category_id: #{category.id}, class_name: test-class, host: test.com",
+ ).exists?
expect(history_exists).to eq(true)
end
@@ -71,9 +78,14 @@ RSpec.describe Admin::EmbeddableHostsController do
it "prevents updates with a 404 response" do
category = Fabricate(:category)
- put "/admin/embeddable_hosts/#{embeddable_host.id}.json", params: {
- embeddable_host: { host: "test.com", class_name: "test-class", category_id: category.id }
- }
+ put "/admin/embeddable_hosts/#{embeddable_host.id}.json",
+ params: {
+ embeddable_host: {
+ host: "test.com",
+ class_name: "test-class",
+ category_id: category.id,
+ },
+ }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -93,7 +105,7 @@ RSpec.describe Admin::EmbeddableHostsController do
end
end
- describe '#destroy' do
+ describe "#destroy" do
context "when logged in as an admin" do
before { sign_in(admin) }
@@ -101,7 +113,12 @@ RSpec.describe Admin::EmbeddableHostsController do
delete "/admin/embeddable_hosts/#{embeddable_host.id}.json", params: {}
expect(response.status).to eq(200)
- expect(UserHistory.where(acting_user_id: admin.id, action: UserHistory.actions[:embeddable_host_destroy]).exists?).to eq(true)
+ expect(
+ UserHistory.where(
+ acting_user_id: admin.id,
+ action: UserHistory.actions[:embeddable_host_destroy],
+ ).exists?,
+ ).to eq(true)
end
end
diff --git a/spec/requests/admin/embedding_controller_spec.rb b/spec/requests/admin/embedding_controller_spec.rb
index 7f28786b837..fa1108a4c02 100644
--- a/spec/requests/admin/embedding_controller_spec.rb
+++ b/spec/requests/admin/embedding_controller_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe Admin::EmbeddingController do
fab!(:user) { Fabricate(:user) }
describe "#show" do
- context 'when logged in as an admin' do
+ context "when logged in as an admin" do
before { sign_in(admin) }
it "returns embedding" do
@@ -40,16 +40,17 @@ RSpec.describe Admin::EmbeddingController do
end
describe "#update" do
- context 'when logged in as an admin' do
+ context "when logged in as an admin" do
before { sign_in(admin) }
it "updates embedding" do
- put "/admin/customize/embedding.json", params: {
- embedding: {
- embed_by_username: "system",
- embed_post_limit: 200
- }
- }
+ put "/admin/customize/embedding.json",
+ params: {
+ embedding: {
+ embed_by_username: "system",
+ embed_post_limit: 200,
+ },
+ }
expect(response.status).to eq(200)
expect(response.parsed_body["embedding"]["embed_by_username"]).to eq("system")
@@ -59,12 +60,13 @@ RSpec.describe Admin::EmbeddingController do
shared_examples "embedding updates not allowed" do
it "prevents updates with a 404 response" do
- put "/admin/customize/embedding.json", params: {
- embedding: {
- embed_by_username: "system",
- embed_post_limit: 200
- }
- }
+ put "/admin/customize/embedding.json",
+ params: {
+ embedding: {
+ embed_by_username: "system",
+ embed_post_limit: 200,
+ },
+ }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
diff --git a/spec/requests/admin/emojis_controller_spec.rb b/spec/requests/admin/emojis_controller_spec.rb
index b6849347cf4..ceae3496993 100644
--- a/spec/requests/admin/emojis_controller_spec.rb
+++ b/spec/requests/admin/emojis_controller_spec.rb
@@ -6,12 +6,12 @@ RSpec.describe Admin::EmojisController do
fab!(:user) { Fabricate(:user) }
fab!(:upload) { Fabricate(:upload) }
- describe '#index' do
+ describe "#index" do
context "when logged in as an admin" do
before { sign_in(admin) }
it "returns a list of custom emojis" do
- CustomEmoji.create!(name: 'osama-test-emoji', upload: upload)
+ CustomEmoji.create!(name: "osama-test-emoji", upload: upload)
Emoji.clear_cache
get "/admin/customize/emojis.json"
@@ -39,7 +39,7 @@ RSpec.describe Admin::EmojisController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "custom emojis inaccessible"
end
@@ -49,49 +49,51 @@ RSpec.describe Admin::EmojisController do
context "when logged in as an admin" do
before { sign_in(admin) }
- context 'when upload is invalid' do
- it 'should publish the right error' do
-
- post "/admin/customize/emojis.json", params: {
- name: 'test',
- file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/fake.jpg")
- }
+ context "when upload is invalid" do
+ it "should publish the right error" do
+ post "/admin/customize/emojis.json",
+ params: {
+ name: "test",
+ file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/fake.jpg"),
+ }
expect(response.status).to eq(422)
parsed = response.parsed_body
- expect(parsed["errors"]).to eq([I18n.t('upload.images.size_not_found')])
+ expect(parsed["errors"]).to eq([I18n.t("upload.images.size_not_found")])
end
end
- context 'when emoji name already exists' do
- it 'should publish the right error' do
- CustomEmoji.create!(name: 'test', upload: upload)
+ context "when emoji name already exists" do
+ it "should publish the right error" do
+ CustomEmoji.create!(name: "test", upload: upload)
- post "/admin/customize/emojis.json", params: {
- name: 'test',
- file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/logo.png")
- }
+ post "/admin/customize/emojis.json",
+ params: {
+ name: "test",
+ file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/logo.png"),
+ }
expect(response.status).to eq(422)
parsed = response.parsed_body
- expect(parsed["errors"]).to eq([
- "Name #{I18n.t('activerecord.errors.models.custom_emoji.attributes.name.taken')}"
- ])
+ expect(parsed["errors"]).to eq(
+ ["Name #{I18n.t("activerecord.errors.models.custom_emoji.attributes.name.taken")}"],
+ )
end
end
- it 'should allow an admin to add a custom emoji' do
+ it "should allow an admin to add a custom emoji" do
Emoji.expects(:clear_cache)
- post "/admin/customize/emojis.json", params: {
- name: 'test',
- file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/logo.png")
- }
+ post "/admin/customize/emojis.json",
+ params: {
+ name: "test",
+ file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/logo.png"),
+ }
custom_emoji = CustomEmoji.last
upload = custom_emoji.upload
- expect(upload.original_filename).to eq('logo.png')
+ expect(upload.original_filename).to eq("logo.png")
data = response.parsed_body
expect(response.status).to eq(200)
@@ -101,14 +103,15 @@ RSpec.describe Admin::EmojisController do
expect(custom_emoji.group).to eq(nil)
end
- it 'should allow an admin to add a custom emoji with a custom group' do
+ it "should allow an admin to add a custom emoji with a custom group" do
Emoji.expects(:clear_cache)
- post "/admin/customize/emojis.json", params: {
- name: 'test',
- group: 'Foo',
- file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/logo.png")
- }
+ post "/admin/customize/emojis.json",
+ params: {
+ name: "test",
+ group: "Foo",
+ file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/logo.png"),
+ }
custom_emoji = CustomEmoji.last
@@ -117,34 +120,37 @@ RSpec.describe Admin::EmojisController do
expect(custom_emoji.group).to eq("foo")
end
- it 'should fix up the emoji name' do
+ it "should fix up the emoji name" do
Emoji.expects(:clear_cache).times(3)
- post "/admin/customize/emojis.json", params: {
- name: 'test.png',
- file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/logo.png")
- }
+ post "/admin/customize/emojis.json",
+ params: {
+ name: "test.png",
+ file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/logo.png"),
+ }
custom_emoji = CustomEmoji.last
upload = custom_emoji.upload
- expect(upload.original_filename).to eq('logo.png')
+ expect(upload.original_filename).to eq("logo.png")
expect(custom_emoji.name).to eq("test")
expect(response.status).to eq(200)
- post "/admin/customize/emojis.json", params: {
- name: 'st&#* onk$',
- file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/logo.png")
- }
+ post "/admin/customize/emojis.json",
+ params: {
+ name: "st&#* onk$",
+ file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/logo.png"),
+ }
custom_emoji = CustomEmoji.last
expect(custom_emoji.name).to eq("st_onk_")
expect(response.status).to eq(200)
- post "/admin/customize/emojis.json", params: {
- name: 'PaRTYpaRrot',
- file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/logo.png")
- }
+ post "/admin/customize/emojis.json",
+ params: {
+ name: "PaRTYpaRrot",
+ file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/logo.png"),
+ }
custom_emoji = CustomEmoji.last
expect(custom_emoji.name).to eq("partyparrot")
@@ -154,10 +160,11 @@ RSpec.describe Admin::EmojisController do
shared_examples "custom emoji creation not allowed" do
it "prevents creation with a 404 response" do
- post "/admin/customize/emojis.json", params: {
- name: 'test',
- file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/logo.png")
- }
+ post "/admin/customize/emojis.json",
+ params: {
+ name: "test",
+ file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/logo.png"),
+ }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -171,34 +178,32 @@ RSpec.describe Admin::EmojisController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "custom emoji creation not allowed"
end
end
- describe '#destroy' do
+ describe "#destroy" do
context "when logged in as an admin" do
- before { sign_in(admin) }
+ before { sign_in(admin) }
- it 'should allow an admin to delete a custom emoji' do
- custom_emoji = CustomEmoji.create!(name: 'test', upload: upload)
+ it "should allow an admin to delete a custom emoji" do
+ custom_emoji = CustomEmoji.create!(name: "test", upload: upload)
Emoji.clear_cache
expect do
- delete "/admin/customize/emojis/#{custom_emoji.name}.json",
- params: { name: 'test' }
+ delete "/admin/customize/emojis/#{custom_emoji.name}.json", params: { name: "test" }
end.to change { CustomEmoji.count }.by(-1)
end
end
shared_examples "custom emoji deletion not allowed" do
it "prevents deletion with a 404 response" do
- custom_emoji = CustomEmoji.create!(name: 'test', upload: upload)
+ custom_emoji = CustomEmoji.create!(name: "test", upload: upload)
Emoji.clear_cache
- delete "/admin/customize/emojis/#{custom_emoji.name}.json",
- params: { name: 'test' }
+ delete "/admin/customize/emojis/#{custom_emoji.name}.json", params: { name: "test" }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -212,7 +217,7 @@ RSpec.describe Admin::EmojisController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "custom emoji deletion not allowed"
end
diff --git a/spec/requests/admin/groups_controller_spec.rb b/spec/requests/admin/groups_controller_spec.rb
index bba0f375d1e..c09142449e2 100644
--- a/spec/requests/admin/groups_controller_spec.rb
+++ b/spec/requests/admin/groups_controller_spec.rb
@@ -6,34 +6,34 @@ RSpec.describe Admin::GroupsController do
fab!(:user) { Fabricate(:user) }
fab!(:group) { Fabricate(:group) }
- describe '#create' do
+ describe "#create" do
let(:group_params) do
{
group: {
- name: 'testing',
+ name: "testing",
usernames: [admin.username, user.username].join(","),
owner_usernames: [user.username].join(","),
allow_membership_requests: true,
- membership_request_template: 'Testing',
- members_visibility_level: Group.visibility_levels[:staff]
- }
+ membership_request_template: "Testing",
+ members_visibility_level: Group.visibility_levels[:staff],
+ },
}
end
context "when logged in as an admin" do
before { sign_in(admin) }
- it 'should work' do
+ it "should work" do
post "/admin/groups.json", params: group_params
expect(response.status).to eq(200)
group = Group.last
- expect(group.name).to eq('testing')
+ expect(group.name).to eq("testing")
expect(group.users).to contain_exactly(admin, user)
expect(group.allow_membership_requests).to eq(true)
- expect(group.membership_request_template).to eq('Testing')
+ expect(group.membership_request_template).to eq("Testing")
expect(group.members_visibility_level).to eq(Group.visibility_levels[:staff])
end
@@ -43,9 +43,7 @@ RSpec.describe Admin::GroupsController do
plugin.register_editable_group_custom_field :test
end
- after do
- DiscoursePluginRegistry.reset!
- end
+ after { DiscoursePluginRegistry.reset! }
it "only updates allowed user fields" do
params = group_params
@@ -56,8 +54,8 @@ RSpec.describe Admin::GroupsController do
group = Group.last
expect(response.status).to eq(200)
- expect(group.custom_fields['test']).to eq('hello1')
- expect(group.custom_fields['test2']).to be_blank
+ expect(group.custom_fields["test"]).to eq("hello1")
+ expect(group.custom_fields["test2"]).to be_blank
end
it "is secure when there are no registered editable fields" do
@@ -70,17 +68,15 @@ RSpec.describe Admin::GroupsController do
group = Group.last
expect(response.status).to eq(200)
- expect(group.custom_fields['test']).to be_blank
- expect(group.custom_fields['test2']).to be_blank
+ expect(group.custom_fields["test"]).to be_blank
+ expect(group.custom_fields["test2"]).to be_blank
end
end
- context 'with Group.plugin_permitted_params' do
- after do
- DiscoursePluginRegistry.reset!
- end
+ context "with Group.plugin_permitted_params" do
+ after { DiscoursePluginRegistry.reset! }
- it 'filter unpermitted params' do
+ it "filter unpermitted params" do
params = group_params
params[:group].merge!(allow_unknown_sender_topic_replies: true)
@@ -88,7 +84,7 @@ RSpec.describe Admin::GroupsController do
expect(Group.last.allow_unknown_sender_topic_replies).to eq(false)
end
- it 'allows plugin to allow custom params' do
+ it "allows plugin to allow custom params" do
params = group_params
params[:group].merge!(allow_unknown_sender_topic_replies: true)
@@ -105,36 +101,32 @@ RSpec.describe Admin::GroupsController do
before { sign_in(moderator) }
context "with moderators_manage_categories_and_groups enabled" do
- before do
- SiteSetting.moderators_manage_categories_and_groups = true
- end
+ before { SiteSetting.moderators_manage_categories_and_groups = true }
it "creates group" do
- expect do
- post "/admin/groups.json", params: group_params
- end.to change { Group.count }.by(1)
+ expect do post "/admin/groups.json", params: group_params end.to change {
+ Group.count
+ }.by(1)
expect(response.status).to eq(200)
group = Group.last
- expect(group.name).to eq('testing')
+ expect(group.name).to eq("testing")
expect(group.users).to contain_exactly(admin, user)
expect(group.allow_membership_requests).to eq(true)
- expect(group.membership_request_template).to eq('Testing')
+ expect(group.membership_request_template).to eq("Testing")
expect(group.members_visibility_level).to eq(Group.visibility_levels[:staff])
end
end
context "with moderators_manage_categories_and_groups disabled" do
- before do
- SiteSetting.moderators_manage_categories_and_groups = false
- end
+ before { SiteSetting.moderators_manage_categories_and_groups = false }
it "prevents creation with a 403 response" do
- expect do
- post "/admin/groups.json", params: group_params
- end.to_not change { Group.count }
+ expect do post "/admin/groups.json", params: group_params end.to_not change {
+ Group.count
+ }
expect(response.status).to eq(403)
expect(response.parsed_body["errors"]).to include(I18n.t("invalid_access"))
@@ -143,12 +135,10 @@ RSpec.describe Admin::GroupsController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
it "prevents creation with a 404 response" do
- expect do
- post "/admin/groups.json", params: group_params
- end.to_not change { Group.count }
+ expect do post "/admin/groups.json", params: group_params end.to_not change { Group.count }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -156,16 +146,17 @@ RSpec.describe Admin::GroupsController do
end
end
- describe '#add_owners' do
+ describe "#add_owners" do
context "when logged in as an admin" do
- before { sign_in(admin) }
+ before { sign_in(admin) }
- it 'should work' do
- put "/admin/groups/#{group.id}/owners.json", params: {
- group: {
- usernames: [user.username, admin.username].join(",")
- }
- }
+ it "should work" do
+ put "/admin/groups/#{group.id}/owners.json",
+ params: {
+ group: {
+ usernames: [user.username, admin.username].join(","),
+ },
+ }
expect(response.status).to eq(200)
@@ -173,65 +164,68 @@ RSpec.describe Admin::GroupsController do
expect(response_body["usernames"]).to contain_exactly(user.username, admin.username)
- expect(group.group_users.where(owner: true).map(&:user))
- .to contain_exactly(user, admin)
+ expect(group.group_users.where(owner: true).map(&:user)).to contain_exactly(user, admin)
end
- it 'returns not-found error when there is no group' do
+ it "returns not-found error when there is no group" do
group.destroy!
- put "/admin/groups/#{group.id}/owners.json", params: {
- group: {
- usernames: user.username
- }
- }
+ put "/admin/groups/#{group.id}/owners.json", params: { group: { usernames: user.username } }
expect(response.status).to eq(404)
end
- it 'does not allow adding owners to an automatic group' do
+ it "does not allow adding owners to an automatic group" do
group.update!(automatic: true)
expect do
- put "/admin/groups/#{group.id}/owners.json", params: {
- group: {
- usernames: user.username
- }
- }
+ put "/admin/groups/#{group.id}/owners.json",
+ params: {
+ group: {
+ usernames: user.username,
+ },
+ }
end.to_not change { group.group_users.count }
expect(response.status).to eq(422)
expect(response.parsed_body["errors"]).to eq(["You cannot modify an automatic group"])
end
- it 'does not notify users when the param is not present' do
- put "/admin/groups/#{group.id}/owners.json", params: {
- group: {
- usernames: user.username
- }
- }
+ it "does not notify users when the param is not present" do
+ put "/admin/groups/#{group.id}/owners.json", params: { group: { usernames: user.username } }
expect(response.status).to eq(200)
- topic = Topic.find_by(
- title: I18n.t("system_messages.user_added_to_group_as_owner.subject_template", group_name: group.name),
- archetype: "private_message"
- )
+ topic =
+ Topic.find_by(
+ title:
+ I18n.t(
+ "system_messages.user_added_to_group_as_owner.subject_template",
+ group_name: group.name,
+ ),
+ archetype: "private_message",
+ )
expect(topic.nil?).to eq(true)
end
- it 'notifies users when the param is present' do
- put "/admin/groups/#{group.id}/owners.json", params: {
- group: {
- usernames: user.username,
- notify_users: true
- }
- }
+ it "notifies users when the param is present" do
+ put "/admin/groups/#{group.id}/owners.json",
+ params: {
+ group: {
+ usernames: user.username,
+ notify_users: true,
+ },
+ }
expect(response.status).to eq(200)
- topic = Topic.find_by(
- title: I18n.t("system_messages.user_added_to_group_as_owner.subject_template", group_name: group.name),
- archetype: "private_message"
- )
+ topic =
+ Topic.find_by(
+ title:
+ I18n.t(
+ "system_messages.user_added_to_group_as_owner.subject_template",
+ group_name: group.name,
+ ),
+ archetype: "private_message",
+ )
expect(topic.nil?).to eq(false)
expect(topic.topic_users.map(&:user_id)).to include(-1, user.id)
end
@@ -241,46 +235,46 @@ RSpec.describe Admin::GroupsController do
before { sign_in(moderator) }
context "with moderators_manage_categories_and_groups enabled" do
- before do
- SiteSetting.moderators_manage_categories_and_groups = true
- end
+ before { SiteSetting.moderators_manage_categories_and_groups = true }
it "adds owners" do
- put "/admin/groups/#{group.id}/owners.json", params: {
- group: {
- usernames: [user.username, admin.username, moderator.username].join(",")
- }
- }
+ put "/admin/groups/#{group.id}/owners.json",
+ params: {
+ group: {
+ usernames: [user.username, admin.username, moderator.username].join(","),
+ },
+ }
- response_body = response.parsed_body
+ response_body = response.parsed_body
- expect(response.status).to eq(200)
- expect(response_body["usernames"]).to contain_exactly(
- user.username,
- admin.username,
- moderator.username
- )
- expect(group.group_users.where(owner: true).map(&:user))
- .to contain_exactly(user, admin, moderator)
+ expect(response.status).to eq(200)
+ expect(response_body["usernames"]).to contain_exactly(
+ user.username,
+ admin.username,
+ moderator.username,
+ )
+ expect(group.group_users.where(owner: true).map(&:user)).to contain_exactly(
+ user,
+ admin,
+ moderator,
+ )
end
end
context "with moderators_manage_categories_and_groups disabled" do
- before do
- SiteSetting.moderators_manage_categories_and_groups = false
- end
+ before { SiteSetting.moderators_manage_categories_and_groups = false }
it "prevents adding of owners with a 403 response" do
- put "/admin/groups/#{group.id}/owners.json", params: {
- group: {
- usernames: [user.username, admin.username, moderator.username].join(",")
- }
- }
+ put "/admin/groups/#{group.id}/owners.json",
+ params: {
+ group: {
+ usernames: [user.username, admin.username, moderator.username].join(","),
+ },
+ }
expect(response.status).to eq(403)
expect(response.parsed_body["errors"]).to include(I18n.t("invalid_access"))
- expect(group.group_users.where(owner: true).map(&:user))
- .to be_empty
+ expect(group.group_users.where(owner: true).map(&:user)).to be_empty
end
end
end
@@ -289,68 +283,63 @@ RSpec.describe Admin::GroupsController do
before { sign_in(user) }
it "prevents adding of owners with a 404 response" do
- put "/admin/groups/#{group.id}/owners.json", params: {
- group: {
- usernames: [user.username, admin.username].join(",")
- }
- }
+ put "/admin/groups/#{group.id}/owners.json",
+ params: {
+ group: {
+ usernames: [user.username, admin.username].join(","),
+ },
+ }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
- expect(group.group_users.where(owner: true).map(&:user))
- .to be_empty
+ expect(group.group_users.where(owner: true).map(&:user)).to be_empty
end
end
end
- describe '#remove_owner' do
+ describe "#remove_owner" do
let(:user2) { Fabricate(:user) }
let(:user3) { Fabricate(:user) }
context "when logged in as an admin" do
before { sign_in(admin) }
- it 'should work' do
+ it "should work" do
group.add_owner(user)
- delete "/admin/groups/#{group.id}/owners.json", params: {
- user_id: user.id
- }
+ delete "/admin/groups/#{group.id}/owners.json", params: { user_id: user.id }
expect(response.status).to eq(200)
expect(group.group_users.where(owner: true)).to eq([])
end
- it 'should work with multiple users' do
+ it "should work with multiple users" do
group.add_owner(user)
group.add_owner(user3)
- delete "/admin/groups/#{group.id}/owners.json", params: {
- group: {
- usernames: "#{user.username},#{user2.username},#{user3.username}"
- }
- }
+ delete "/admin/groups/#{group.id}/owners.json",
+ params: {
+ group: {
+ usernames: "#{user.username},#{user2.username},#{user3.username}",
+ },
+ }
expect(response.status).to eq(200)
expect(group.group_users.where(owner: true)).to eq([])
end
- it 'returns not-found error when there is no group' do
+ it "returns not-found error when there is no group" do
group.destroy!
- delete "/admin/groups/#{group.id}/owners.json", params: {
- user_id: user.id
- }
+ delete "/admin/groups/#{group.id}/owners.json", params: { user_id: user.id }
expect(response.status).to eq(404)
end
- it 'does not allow removing owners from an automatic group' do
+ it "does not allow removing owners from an automatic group" do
group.update!(automatic: true)
- delete "/admin/groups/#{group.id}/owners.json", params: {
- user_id: user.id
- }
+ delete "/admin/groups/#{group.id}/owners.json", params: { user_id: user.id }
expect(response.status).to eq(422)
expect(response.parsed_body["errors"]).to eq(["You cannot modify an automatic group"])
@@ -361,16 +350,12 @@ RSpec.describe Admin::GroupsController do
before { sign_in(moderator) }
context "with moderators_manage_categories_and_groups enabled" do
- before do
- SiteSetting.moderators_manage_categories_and_groups = true
- end
+ before { SiteSetting.moderators_manage_categories_and_groups = true }
it "removes owner" do
group.add_owner(user)
- delete "/admin/groups/#{group.id}/owners.json", params: {
- user_id: user.id
- }
+ delete "/admin/groups/#{group.id}/owners.json", params: { user_id: user.id }
expect(response.status).to eq(200)
expect(group.group_users.where(owner: true)).to eq([])
@@ -378,16 +363,12 @@ RSpec.describe Admin::GroupsController do
end
context "with moderators_manage_categories_and_groups disabled" do
- before do
- SiteSetting.moderators_manage_categories_and_groups = false
- end
+ before { SiteSetting.moderators_manage_categories_and_groups = false }
it "prevents owner removal with a 403 response" do
group.add_owner(user)
- delete "/admin/groups/#{group.id}/owners.json", params: {
- user_id: user.id
- }
+ delete "/admin/groups/#{group.id}/owners.json", params: { user_id: user.id }
expect(response.status).to eq(403)
expect(response.parsed_body["errors"]).to include(I18n.t("invalid_access"))
@@ -402,9 +383,7 @@ RSpec.describe Admin::GroupsController do
it "prevents owner removal with a 404 response" do
group.add_owner(user)
- delete "/admin/groups/#{group.id}/owners.json", params: {
- user_id: user.id
- }
+ delete "/admin/groups/#{group.id}/owners.json", params: { user_id: user.id }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -420,26 +399,32 @@ RSpec.describe Admin::GroupsController do
context "when logged in as an admin" do
before { sign_in(admin) }
- it 'sets with multiple users' do
+ it "sets with multiple users" do
user2.update!(primary_group_id: group.id)
- put "/admin/groups/#{group.id}/primary.json", params: {
- group: { usernames: "#{user.username},#{user2.username},#{user3.username}" },
- primary: "true"
- }
+ put "/admin/groups/#{group.id}/primary.json",
+ params: {
+ group: {
+ usernames: "#{user.username},#{user2.username},#{user3.username}",
+ },
+ primary: "true",
+ }
expect(response.status).to eq(200)
expect(User.where(primary_group_id: group.id).size).to eq(3)
end
- it 'unsets with multiple users' do
+ it "unsets with multiple users" do
user.update!(primary_group_id: group.id)
user3.update!(primary_group_id: group.id)
- put "/admin/groups/#{group.id}/primary.json", params: {
- group: { usernames: "#{user.username},#{user2.username},#{user3.username}" },
- primary: "false"
- }
+ put "/admin/groups/#{group.id}/primary.json",
+ params: {
+ group: {
+ usernames: "#{user.username},#{user2.username},#{user3.username}",
+ },
+ primary: "false",
+ }
expect(response.status).to eq(200)
expect(User.where(primary_group_id: group.id).size).to eq(0)
@@ -450,17 +435,18 @@ RSpec.describe Admin::GroupsController do
before { sign_in(moderator) }
context "with moderators_manage_categories_and_groups enabled" do
- before do
- SiteSetting.moderators_manage_categories_and_groups = true
- end
+ before { SiteSetting.moderators_manage_categories_and_groups = true }
it "sets multiple primary users" do
user2.update!(primary_group_id: group.id)
- put "/admin/groups/#{group.id}/primary.json", params: {
- group: { usernames: "#{user.username},#{user2.username},#{user3.username}" },
- primary: "true"
- }
+ put "/admin/groups/#{group.id}/primary.json",
+ params: {
+ group: {
+ usernames: "#{user.username},#{user2.username},#{user3.username}",
+ },
+ primary: "true",
+ }
expect(response.status).to eq(200)
expect(User.where(primary_group_id: group.id).size).to eq(3)
@@ -468,17 +454,18 @@ RSpec.describe Admin::GroupsController do
end
context "with moderators_manage_categories_and_groups disabled" do
- before do
- SiteSetting.moderators_manage_categories_and_groups = false
- end
+ before { SiteSetting.moderators_manage_categories_and_groups = false }
it "prevents setting of primary group with a 403 response" do
user2.update!(primary_group_id: group.id)
- put "/admin/groups/#{group.id}/primary.json", params: {
- group: { usernames: "#{user.username},#{user2.username},#{user3.username}" },
- primary: "true"
- }
+ put "/admin/groups/#{group.id}/primary.json",
+ params: {
+ group: {
+ usernames: "#{user.username},#{user2.username},#{user3.username}",
+ },
+ primary: "true",
+ }
expect(response.status).to eq(403)
expect(response.parsed_body["errors"]).to include(I18n.t("invalid_access"))
@@ -493,10 +480,13 @@ RSpec.describe Admin::GroupsController do
it "prevents setting of primary user with a 404 response" do
user2.update!(primary_group_id: group.id)
- put "/admin/groups/#{group.id}/primary.json", params: {
- group: { usernames: "#{user.username},#{user2.username},#{user3.username}" },
- primary: "true"
- }
+ put "/admin/groups/#{group.id}/primary.json",
+ params: {
+ group: {
+ usernames: "#{user.username},#{user2.username},#{user3.username}",
+ },
+ primary: "true",
+ }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -509,13 +499,13 @@ RSpec.describe Admin::GroupsController do
context "when logged in as an admin" do
before { sign_in(admin) }
- it 'should return the right response for an invalid group_id' do
+ it "should return the right response for an invalid group_id" do
max_id = Group.maximum(:id).to_i
delete "/admin/groups/#{max_id + 1}.json"
expect(response.status).to eq(404)
end
- it 'logs when a group is destroyed' do
+ it "logs when a group is destroyed" do
delete "/admin/groups/#{group.id}.json"
history = UserHistory.where(acting_user: admin).last
@@ -525,7 +515,7 @@ RSpec.describe Admin::GroupsController do
expect(history.details).to include("id: #{group.id}")
end
- it 'logs the grant_trust_level attribute' do
+ it "logs the grant_trust_level attribute" do
trust_level = TrustLevel[4]
group.update!(grant_trust_level: trust_level)
delete "/admin/groups/#{group.id}.json"
@@ -560,9 +550,7 @@ RSpec.describe Admin::GroupsController do
shared_examples "group deletion not allowed" do
it "prevents deletion with a 404 response" do
- expect do
- delete "/admin/groups/#{group.id}.json"
- end.not_to change { Group.count }
+ expect do delete "/admin/groups/#{group.id}.json" end.not_to change { Group.count }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -573,17 +561,13 @@ RSpec.describe Admin::GroupsController do
before { sign_in(moderator) }
context "with moderators_manage_categories_and_groups enabled" do
- before do
- SiteSetting.moderators_manage_categories_and_groups = true
- end
+ before { SiteSetting.moderators_manage_categories_and_groups = true }
include_examples "group deletion not allowed"
end
context "with moderators_manage_categories_and_groups disabled" do
- before do
- SiteSetting.moderators_manage_categories_and_groups = false
- end
+ before { SiteSetting.moderators_manage_categories_and_groups = false }
include_examples "group deletion not allowed"
end
@@ -596,20 +580,21 @@ RSpec.describe Admin::GroupsController do
end
end
- describe '#automatic_membership_count' do
+ describe "#automatic_membership_count" do
context "when logged in as admin" do
before { sign_in(admin) }
- it 'returns count of users whose emails match the domain' do
- Fabricate(:user, email: 'user1@somedomain.org')
- Fabricate(:user, email: 'user1@somedomain.com')
- Fabricate(:user, email: 'user1@notsomedomain.com')
+ it "returns count of users whose emails match the domain" do
+ Fabricate(:user, email: "user1@somedomain.org")
+ Fabricate(:user, email: "user1@somedomain.com")
+ Fabricate(:user, email: "user1@notsomedomain.com")
group = Fabricate(:group)
- put "/admin/groups/automatic_membership_count.json", params: {
- automatic_membership_email_domains: 'somedomain.org|somedomain.com',
- id: group.id
- }
+ put "/admin/groups/automatic_membership_count.json",
+ params: {
+ automatic_membership_email_domains: "somedomain.org|somedomain.com",
+ id: group.id,
+ }
expect(response.status).to eq(200)
expect(response.parsed_body["user_count"]).to eq(2)
end
@@ -617,10 +602,11 @@ RSpec.describe Admin::GroupsController do
it "doesn't responde with 500 if domain is invalid" do
group = Fabricate(:group)
- put "/admin/groups/automatic_membership_count.json", params: {
- automatic_membership_email_domains: '@somedomain.org|@somedomain.com',
- id: group.id
- }
+ put "/admin/groups/automatic_membership_count.json",
+ params: {
+ automatic_membership_email_domains: "@somedomain.org|@somedomain.com",
+ id: group.id,
+ }
expect(response.status).to eq(200)
expect(response.parsed_body["user_count"]).to eq(0)
end
@@ -628,10 +614,11 @@ RSpec.describe Admin::GroupsController do
shared_examples "automatic membership count inaccessible" do
it "denies access with a 404 response" do
- put "/admin/groups/automatic_membership_count.json", params: {
- automatic_membership_email_domains: 'somedomain.org|somedomain.com',
- id: group.id
- }
+ put "/admin/groups/automatic_membership_count.json",
+ params: {
+ automatic_membership_email_domains: "somedomain.org|somedomain.com",
+ id: group.id,
+ }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -642,17 +629,13 @@ RSpec.describe Admin::GroupsController do
before { sign_in(moderator) }
context "with moderators_manage_categories_and_groups enabled" do
- before do
- SiteSetting.moderators_manage_categories_and_groups = true
- end
+ before { SiteSetting.moderators_manage_categories_and_groups = true }
include_examples "automatic membership count inaccessible"
end
context "with moderators_manage_categories_and_groups disabled" do
- before do
- SiteSetting.moderators_manage_categories_and_groups = false
- end
+ before { SiteSetting.moderators_manage_categories_and_groups = false }
include_examples "automatic membership count inaccessible"
end
diff --git a/spec/requests/admin/impersonate_controller_spec.rb b/spec/requests/admin/impersonate_controller_spec.rb
index b60edd3c5ae..87fb4c7a61c 100644
--- a/spec/requests/admin/impersonate_controller_spec.rb
+++ b/spec/requests/admin/impersonate_controller_spec.rb
@@ -6,11 +6,11 @@ RSpec.describe Admin::ImpersonateController do
fab!(:user) { Fabricate(:user) }
fab!(:another_admin) { Fabricate(:admin) }
- describe '#index' do
+ describe "#index" do
context "when logged in as an admin" do
before { sign_in(admin) }
- it 'returns success' do
+ it "returns success" do
get "/admin/impersonate.json"
expect(response.status).to eq(200)
@@ -39,18 +39,18 @@ RSpec.describe Admin::ImpersonateController do
end
end
- describe '#create' do
+ describe "#create" do
context "when logged in as an admin" do
before { sign_in(admin) }
- it 'requires a username_or_email parameter' do
+ it "requires a username_or_email parameter" do
post "/admin/impersonate.json"
expect(response.status).to eq(400)
expect(session[:current_user_id]).to eq(admin.id)
end
- it 'returns 404 when that user does not exist' do
- post "/admin/impersonate.json", params: { username_or_email: 'hedonismbot' }
+ it "returns 404 when that user does not exist" do
+ post "/admin/impersonate.json", params: { username_or_email: "hedonismbot" }
expect(response.status).to eq(404)
expect(session[:current_user_id]).to eq(admin.id)
end
@@ -61,7 +61,7 @@ RSpec.describe Admin::ImpersonateController do
expect(session[:current_user_id]).to eq(admin.id)
end
- context 'with success' do
+ context "with success" do
it "succeeds and logs the impersonation" do
expect do
post "/admin/impersonate.json", params: { username_or_email: user.username }
diff --git a/spec/requests/admin/permalinks_controller_spec.rb b/spec/requests/admin/permalinks_controller_spec.rb
index 8ef11d4e330..e7614bd82a6 100644
--- a/spec/requests/admin/permalinks_controller_spec.rb
+++ b/spec/requests/admin/permalinks_controller_spec.rb
@@ -5,11 +5,11 @@ RSpec.describe Admin::PermalinksController do
fab!(:moderator) { Fabricate(:moderator) }
fab!(:user) { Fabricate(:user) }
- describe '#index' do
+ describe "#index" do
context "when logged in as an admin" do
before { sign_in(admin) }
- it 'filters url' do
+ it "filters url" do
Fabricate(:permalink, url: "/forum/23")
Fabricate(:permalink, url: "/forum/98")
Fabricate(:permalink, url: "/discuss/topic/45")
@@ -22,7 +22,7 @@ RSpec.describe Admin::PermalinksController do
expect(result.length).to eq(2)
end
- it 'filters external url' do
+ it "filters external url" do
Fabricate(:permalink, external_url: "http://google.com")
Fabricate(:permalink, external_url: "http://wikipedia.org")
Fabricate(:permalink, external_url: "http://www.discourse.org")
@@ -35,7 +35,7 @@ RSpec.describe Admin::PermalinksController do
expect(result.length).to eq(2)
end
- it 'filters url and external url both' do
+ it "filters url and external url both" do
Fabricate(:permalink, url: "/forum/23", external_url: "http://google.com")
Fabricate(:permalink, url: "/discourse/98", external_url: "http://wikipedia.org")
Fabricate(:permalink, url: "/discuss/topic/45", external_url: "http://discourse.org")
@@ -65,7 +65,7 @@ RSpec.describe Admin::PermalinksController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "permalinks inaccessible"
end
@@ -78,53 +78,81 @@ RSpec.describe Admin::PermalinksController do
it "works for topics" do
topic = Fabricate(:topic)
- post "/admin/permalinks.json", params: {
- url: "/topics/771",
- permalink_type: "topic_id",
- permalink_type_value: topic.id
- }
+ post "/admin/permalinks.json",
+ params: {
+ url: "/topics/771",
+ permalink_type: "topic_id",
+ permalink_type_value: topic.id,
+ }
expect(response.status).to eq(200)
- expect(Permalink.last).to have_attributes(url: "topics/771", topic_id: topic.id, post_id: nil, category_id: nil, tag_id: nil)
+ expect(Permalink.last).to have_attributes(
+ url: "topics/771",
+ topic_id: topic.id,
+ post_id: nil,
+ category_id: nil,
+ tag_id: nil,
+ )
end
it "works for posts" do
some_post = Fabricate(:post)
- post "/admin/permalinks.json", params: {
- url: "/topics/771/8291",
- permalink_type: "post_id",
- permalink_type_value: some_post.id
- }
+ post "/admin/permalinks.json",
+ params: {
+ url: "/topics/771/8291",
+ permalink_type: "post_id",
+ permalink_type_value: some_post.id,
+ }
expect(response.status).to eq(200)
- expect(Permalink.last).to have_attributes(url: "topics/771/8291", topic_id: nil, post_id: some_post.id, category_id: nil, tag_id: nil)
+ expect(Permalink.last).to have_attributes(
+ url: "topics/771/8291",
+ topic_id: nil,
+ post_id: some_post.id,
+ category_id: nil,
+ tag_id: nil,
+ )
end
it "works for categories" do
category = Fabricate(:category)
- post "/admin/permalinks.json", params: {
- url: "/forums/11",
- permalink_type: "category_id",
- permalink_type_value: category.id
- }
+ post "/admin/permalinks.json",
+ params: {
+ url: "/forums/11",
+ permalink_type: "category_id",
+ permalink_type_value: category.id,
+ }
expect(response.status).to eq(200)
- expect(Permalink.last).to have_attributes(url: "forums/11", topic_id: nil, post_id: nil, category_id: category.id, tag_id: nil)
+ expect(Permalink.last).to have_attributes(
+ url: "forums/11",
+ topic_id: nil,
+ post_id: nil,
+ category_id: category.id,
+ tag_id: nil,
+ )
end
it "works for tags" do
tag = Fabricate(:tag)
- post "/admin/permalinks.json", params: {
- url: "/forums/12",
- permalink_type: "tag_name",
- permalink_type_value: tag.name
- }
+ post "/admin/permalinks.json",
+ params: {
+ url: "/forums/12",
+ permalink_type: "tag_name",
+ permalink_type_value: tag.name,
+ }
expect(response.status).to eq(200)
- expect(Permalink.last).to have_attributes(url: "forums/12", topic_id: nil, post_id: nil, category_id: nil, tag_id: tag.id)
+ expect(Permalink.last).to have_attributes(
+ url: "forums/12",
+ topic_id: nil,
+ post_id: nil,
+ category_id: nil,
+ tag_id: tag.id,
+ )
end
end
@@ -133,11 +161,12 @@ RSpec.describe Admin::PermalinksController do
topic = Fabricate(:topic)
expect do
- post "/admin/permalinks.json", params: {
- url: "/topics/771",
- permalink_type: "topic_id",
- permalink_type_value: topic.id
- }
+ post "/admin/permalinks.json",
+ params: {
+ url: "/topics/771",
+ permalink_type: "topic_id",
+ permalink_type_value: topic.id,
+ }
end.not_to change { Permalink.count }
expect(response.status).to eq(404)
@@ -152,7 +181,7 @@ RSpec.describe Admin::PermalinksController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "permalink creation not allowed"
end
diff --git a/spec/requests/admin/plugins_controller_spec.rb b/spec/requests/admin/plugins_controller_spec.rb
index de2b8225030..4c1656bc24e 100644
--- a/spec/requests/admin/plugins_controller_spec.rb
+++ b/spec/requests/admin/plugins_controller_spec.rb
@@ -13,7 +13,7 @@ RSpec.describe Admin::PluginsController do
get "/admin/plugins.json"
expect(response.status).to eq(200)
- expect(response.parsed_body.has_key?('plugins')).to eq(true)
+ expect(response.parsed_body.has_key?("plugins")).to eq(true)
end
end
@@ -24,12 +24,12 @@ RSpec.describe Admin::PluginsController do
get "/admin/plugins.json"
expect(response.status).to eq(200)
- expect(response.parsed_body.has_key?('plugins')).to eq(true)
+ expect(response.parsed_body.has_key?("plugins")).to eq(true)
end
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
it "denies access with a 404 response" do
get "/admin/plugins.json"
diff --git a/spec/requests/admin/reports_controller_spec.rb b/spec/requests/admin/reports_controller_spec.rb
index 71d5f52cb83..5494fc230ac 100644
--- a/spec/requests/admin/reports_controller_spec.rb
+++ b/spec/requests/admin/reports_controller_spec.rb
@@ -5,19 +5,24 @@ RSpec.describe Admin::ReportsController do
fab!(:moderator) { Fabricate(:moderator) }
fab!(:user) { Fabricate(:user) }
- describe '#bulk' do
+ describe "#bulk" do
context "when logged in as an admin" do
before { sign_in(admin) }
context "with valid params" do
it "renders the reports as JSON" do
Fabricate(:topic)
- get "/admin/reports/bulk.json", params: {
- reports: {
- topics: { limit: 10 },
- likes: { limit: 10 }
- }
- }
+ get "/admin/reports/bulk.json",
+ params: {
+ reports: {
+ topics: {
+ limit: 10,
+ },
+ likes: {
+ limit: 10,
+ },
+ },
+ }
expect(response.status).to eq(200)
expect(response.parsed_body["reports"].count).to eq(2)
@@ -27,12 +32,17 @@ RSpec.describe Admin::ReportsController do
context "with invalid params" do
context "with nonexistent report" do
it "returns not found reports" do
- get "/admin/reports/bulk.json", params: {
- reports: {
- topics: { limit: 10 },
- not_found: { limit: 10 }
- }
- }
+ get "/admin/reports/bulk.json",
+ params: {
+ reports: {
+ topics: {
+ limit: 10,
+ },
+ not_found: {
+ limit: 10,
+ },
+ },
+ }
expect(response.status).to eq(200)
expect(response.parsed_body["reports"].count).to eq(2)
@@ -43,18 +53,26 @@ RSpec.describe Admin::ReportsController do
context "with invalid start or end dates" do
it "doesn't return 500 error" do
- get "/admin/reports/bulk.json", params: {
- reports: {
- topics: { limit: 10, start_date: "2015-0-1" }
- }
- }
+ get "/admin/reports/bulk.json",
+ params: {
+ reports: {
+ topics: {
+ limit: 10,
+ start_date: "2015-0-1",
+ },
+ },
+ }
expect(response.status).to eq(400)
- get "/admin/reports/bulk.json", params: {
- reports: {
- topics: { limit: 10, end_date: "2015-0-1" }
- }
- }
+ get "/admin/reports/bulk.json",
+ params: {
+ reports: {
+ topics: {
+ limit: 10,
+ end_date: "2015-0-1",
+ },
+ },
+ }
expect(response.status).to eq(400)
end
end
@@ -67,12 +85,17 @@ RSpec.describe Admin::ReportsController do
it "returns report" do
Fabricate(:topic)
- get "/admin/reports/bulk.json", params: {
- reports: {
- topics: { limit: 10 },
- likes: { limit: 10 }
- }
- }
+ get "/admin/reports/bulk.json",
+ params: {
+ reports: {
+ topics: {
+ limit: 10,
+ },
+ likes: {
+ limit: 10,
+ },
+ },
+ }
expect(response.status).to eq(200)
expect(response.parsed_body["reports"].count).to eq(2)
@@ -80,15 +103,20 @@ RSpec.describe Admin::ReportsController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
it "denies access with a 404 response" do
- get "/admin/reports/bulk.json", params: {
- reports: {
- topics: { limit: 10 },
- not_found: { limit: 10 }
- }
- }
+ get "/admin/reports/bulk.json",
+ params: {
+ reports: {
+ topics: {
+ limit: 10,
+ },
+ not_found: {
+ limit: 10,
+ },
+ },
+ }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -96,7 +124,7 @@ RSpec.describe Admin::ReportsController do
end
end
- describe '#show' do
+ describe "#show" do
context "when logged in as an admin" do
before { sign_in(admin) }
@@ -110,14 +138,14 @@ RSpec.describe Admin::ReportsController do
end
context "with valid type form" do
- context 'with missing report' do
+ context "with missing report" do
it "returns a 404 error" do
get "/admin/reports/nonexistent.json"
expect(response.status).to eq(404)
end
end
- context 'when a report is found' do
+ context "when a report is found" do
it "renders the report as JSON" do
Fabricate(:topic)
get "/admin/reports/topics.json"
@@ -128,29 +156,29 @@ RSpec.describe Admin::ReportsController do
end
end
- describe 'when report is scoped to a category' do
+ describe "when report is scoped to a category" do
fab!(:category) { Fabricate(:category) }
fab!(:topic) { Fabricate(:topic, category: category) }
fab!(:other_topic) { Fabricate(:topic) }
- it 'should render the report as JSON' do
+ it "should render the report as JSON" do
get "/admin/reports/topics.json", params: { category_id: category.id }
expect(response.status).to eq(200)
report = response.parsed_body["report"]
- expect(report["type"]).to eq('topics')
+ expect(report["type"]).to eq("topics")
expect(report["data"].count).to eq(1)
end
end
- describe 'when report is scoped to a group' do
+ describe "when report is scoped to a group" do
fab!(:user) { Fabricate(:user) }
fab!(:other_user) { Fabricate(:user) }
fab!(:group) { Fabricate(:group) }
- it 'should render the report as JSON' do
+ it "should render the report as JSON" do
group.add(user)
get "/admin/reports/signups.json", params: { group_id: group.id }
@@ -159,14 +187,14 @@ RSpec.describe Admin::ReportsController do
report = response.parsed_body["report"]
- expect(report["type"]).to eq('signups')
+ expect(report["type"]).to eq("signups")
expect(report["data"].count).to eq(1)
end
end
end
context "when logged in as a moderator" do
- before { sign_in(moderator) }
+ before { sign_in(moderator) }
it "returns report" do
Fabricate(:topic)
@@ -179,7 +207,7 @@ RSpec.describe Admin::ReportsController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
it "denies access with a 404 response" do
get "/admin/reports/topics.json"
diff --git a/spec/requests/admin/robots_txt_controller_spec.rb b/spec/requests/admin/robots_txt_controller_spec.rb
index fd9464c3add..f7b79b52193 100644
--- a/spec/requests/admin/robots_txt_controller_spec.rb
+++ b/spec/requests/admin/robots_txt_controller_spec.rb
@@ -43,7 +43,7 @@ RSpec.describe Admin::RobotsTxtController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "robot.txt inaccessible"
end
@@ -89,7 +89,7 @@ RSpec.describe Admin::RobotsTxtController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "robot.txt update not allowed"
end
@@ -129,7 +129,7 @@ RSpec.describe Admin::RobotsTxtController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "robot.txt reset not allowed"
end
diff --git a/spec/requests/admin/screened_emails_controller_spec.rb b/spec/requests/admin/screened_emails_controller_spec.rb
index da2b177d507..cb9a003cacf 100644
--- a/spec/requests/admin/screened_emails_controller_spec.rb
+++ b/spec/requests/admin/screened_emails_controller_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe Admin::ScreenedEmailsController do
fab!(:user) { Fabricate(:user) }
fab!(:screened_email) { Fabricate(:screened_email) }
- describe '#index' do
+ describe "#index" do
shared_examples "screened emails accessible" do
it "returns screened emails" do
get "/admin/logs/screened_emails.json"
@@ -30,7 +30,7 @@ RSpec.describe Admin::ScreenedEmailsController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
it "denies access with a 404 response" do
get "/admin/logs/screened_emails.json"
@@ -44,9 +44,9 @@ RSpec.describe Admin::ScreenedEmailsController do
describe "#destroy" do
shared_examples "screened email deletion possible" do
it "deletes screened email" do
- expect do
- delete "/admin/logs/screened_emails/#{screened_email.id}.json"
- end.to change { ScreenedEmail.count }.by(-1)
+ expect do delete "/admin/logs/screened_emails/#{screened_email.id}.json" end.to change {
+ ScreenedEmail.count
+ }.by(-1)
expect(response.status).to eq(200)
end
@@ -65,7 +65,7 @@ RSpec.describe Admin::ScreenedEmailsController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
it "prevents deletion with a 404 response" do
delete "/admin/logs/screened_emails/#{screened_email.id}.json"
diff --git a/spec/requests/admin/screened_ip_addresses_controller_spec.rb b/spec/requests/admin/screened_ip_addresses_controller_spec.rb
index 3073b509793..71559f1b943 100644
--- a/spec/requests/admin/screened_ip_addresses_controller_spec.rb
+++ b/spec/requests/admin/screened_ip_addresses_controller_spec.rb
@@ -5,9 +5,9 @@ RSpec.describe Admin::ScreenedIpAddressesController do
fab!(:moderator) { Fabricate(:moderator) }
fab!(:user) { Fabricate(:user) }
- describe '#index' do
+ describe "#index" do
shared_examples "screened ip addresses accessible" do
- it 'filters screened ip addresses' do
+ it "filters screened ip addresses" do
Fabricate(:screened_ip_address, ip_address: "1.2.3.4")
Fabricate(:screened_ip_address, ip_address: "1.2.3.5")
Fabricate(:screened_ip_address, ip_address: "1.2.3.6")
@@ -17,20 +17,25 @@ RSpec.describe Admin::ScreenedIpAddressesController do
get "/admin/logs/screened_ip_addresses.json", params: { filter: "1.2.*" }
expect(response.status).to eq(200)
- expect(response.parsed_body.map { |record| record["ip_address"] })
- .to contain_exactly("1.2.3.4", "1.2.3.5", "1.2.3.6")
+ expect(response.parsed_body.map { |record| record["ip_address"] }).to contain_exactly(
+ "1.2.3.4",
+ "1.2.3.5",
+ "1.2.3.6",
+ )
get "/admin/logs/screened_ip_addresses.json", params: { filter: "4.5.6.7" }
expect(response.status).to eq(200)
- expect(response.parsed_body.map { |record| record["ip_address"] })
- .to contain_exactly("4.5.6.7")
+ expect(response.parsed_body.map { |record| record["ip_address"] }).to contain_exactly(
+ "4.5.6.7",
+ )
get "/admin/logs/screened_ip_addresses.json", params: { filter: "5.0.0.1" }
expect(response.status).to eq(200)
- expect(response.parsed_body.map { |record| record["ip_address"] })
- .to contain_exactly("5.0.0.0/8")
+ expect(response.parsed_body.map { |record| record["ip_address"] }).to contain_exactly(
+ "5.0.0.0/8",
+ )
get "/admin/logs/screened_ip_addresses.json", params: { filter: "6.0.0.1" }
@@ -52,7 +57,7 @@ RSpec.describe Admin::ScreenedIpAddressesController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
it "denies access with a 404 response" do
get "/admin/logs/screened_ip_addresses.json", params: { filter: "1.2.*" }
diff --git a/spec/requests/admin/screened_urls_controller_spec.rb b/spec/requests/admin/screened_urls_controller_spec.rb
index c7db4dba0b9..7c6d7b9eb9c 100644
--- a/spec/requests/admin/screened_urls_controller_spec.rb
+++ b/spec/requests/admin/screened_urls_controller_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe Admin::ScreenedUrlsController do
fab!(:user) { Fabricate(:user) }
fab!(:screened_url) { Fabricate(:screened_url) }
- describe '#index' do
+ describe "#index" do
shared_examples "screened urls accessible" do
it "returns screened urls" do
get "/admin/logs/screened_urls.json"
@@ -30,7 +30,7 @@ RSpec.describe Admin::ScreenedUrlsController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
it "denies access with a 404 response" do
get "/admin/logs/screened_urls.json"
diff --git a/spec/requests/admin/search_logs_spec.rb b/spec/requests/admin/search_logs_spec.rb
index caab13f5793..d94d5b06b2b 100644
--- a/spec/requests/admin/search_logs_spec.rb
+++ b/spec/requests/admin/search_logs_spec.rb
@@ -5,18 +5,14 @@ RSpec.describe Admin::SearchLogsController do
fab!(:moderator) { Fabricate(:moderator) }
fab!(:user) { Fabricate(:user) }
- before do
- SearchLog.log(term: "ruby", search_type: :header, ip_address: "127.0.0.1")
- end
+ before { SearchLog.log(term: "ruby", search_type: :header, ip_address: "127.0.0.1") }
- after do
- SearchLog.clear_debounce_cache!
- end
+ after { SearchLog.clear_debounce_cache! }
describe "#index" do
shared_examples "search logs accessible" do
it "returns search logs" do
- get '/admin/logs/search_logs.json'
+ get "/admin/logs/search_logs.json"
expect(response.status).to eq(200)
@@ -40,7 +36,7 @@ RSpec.describe Admin::SearchLogsController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
it "denies access with a 404 response" do
get "/admin/logs/search_logs.json"
@@ -54,15 +50,13 @@ RSpec.describe Admin::SearchLogsController do
describe "#term" do
shared_examples "search log term accessible" do
it "returns search log term" do
- get '/admin/logs/search_logs/term.json', params: {
- term: "ruby"
- }
+ get "/admin/logs/search_logs/term.json", params: { term: "ruby" }
expect(response.status).to eq(200)
json = response.parsed_body
- expect(json['term']['type']).to eq('search_log_term')
- expect(json['term']['search_result']).to be_present
+ expect(json["term"]["type"]).to eq("search_log_term")
+ expect(json["term"]["search_result"]).to be_present
end
end
@@ -79,12 +73,10 @@ RSpec.describe Admin::SearchLogsController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
it "denies access with a 404 response" do
- get "/admin/logs/search_logs/term.json", params: {
- term: "ruby"
- }
+ get "/admin/logs/search_logs/term.json", params: { term: "ruby" }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
diff --git a/spec/requests/admin/site_settings_controller_spec.rb b/spec/requests/admin/site_settings_controller_spec.rb
index 64fc9b6c6b4..693a6612825 100644
--- a/spec/requests/admin/site_settings_controller_spec.rb
+++ b/spec/requests/admin/site_settings_controller_spec.rb
@@ -16,9 +16,7 @@ RSpec.describe Admin::SiteSettingsController do
json = response.parsed_body
expect(json["site_settings"].length).to be > 100
- locale = json["site_settings"].select do |s|
- s["setting"] == "default_locale"
- end
+ locale = json["site_settings"].select { |s| s["setting"] == "default_locale" }
expect(locale.length).to eq(1)
end
@@ -40,7 +38,7 @@ RSpec.describe Admin::SiteSettingsController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "site settings inaccessible"
end
@@ -59,40 +57,44 @@ RSpec.describe Admin::SiteSettingsController do
context "when logged in as an admin" do
before { sign_in(admin) }
- it 'should return correct user count for default categories change' do
+ it "should return correct user count for default categories change" do
category_id = Fabricate(:category).id
- put "/admin/site_settings/default_categories_watching/user_count.json", params: {
- default_categories_watching: category_id
- }
+ put "/admin/site_settings/default_categories_watching/user_count.json",
+ params: {
+ default_categories_watching: category_id,
+ }
expect(response.parsed_body["user_count"]).to eq(User.real.where(staged: false).count)
CategoryUser.create!(category_id: category_id, notification_level: tracking, user: user)
- put "/admin/site_settings/default_categories_watching/user_count.json", params: {
- default_categories_watching: category_id
- }
+ put "/admin/site_settings/default_categories_watching/user_count.json",
+ params: {
+ default_categories_watching: category_id,
+ }
expect(response.parsed_body["user_count"]).to eq(User.real.where(staged: false).count - 1)
SiteSetting.setting(:default_categories_watching, "")
end
- it 'should return correct user count for default tags change' do
+ it "should return correct user count for default tags change" do
tag = Fabricate(:tag)
- put "/admin/site_settings/default_tags_watching/user_count.json", params: {
- default_tags_watching: tag.name
- }
+ put "/admin/site_settings/default_tags_watching/user_count.json",
+ params: {
+ default_tags_watching: tag.name,
+ }
expect(response.parsed_body["user_count"]).to eq(User.real.where(staged: false).count)
TagUser.create!(tag_id: tag.id, notification_level: tracking, user: user)
- put "/admin/site_settings/default_tags_watching/user_count.json", params: {
- default_tags_watching: tag.name
- }
+ put "/admin/site_settings/default_tags_watching/user_count.json",
+ params: {
+ default_tags_watching: tag.name,
+ }
expect(response.parsed_body["user_count"]).to eq(User.real.where(staged: false).count - 1)
@@ -100,23 +102,25 @@ RSpec.describe Admin::SiteSettingsController do
end
context "for sidebar defaults" do
- it 'returns the right count for the default_sidebar_categories site setting' do
+ it "returns the right count for the default_sidebar_categories site setting" do
category = Fabricate(:category)
- put "/admin/site_settings/default_sidebar_categories/user_count.json", params: {
- default_sidebar_categories: "#{category.id}"
- }
+ put "/admin/site_settings/default_sidebar_categories/user_count.json",
+ params: {
+ default_sidebar_categories: "#{category.id}",
+ }
expect(response.status).to eq(200)
expect(response.parsed_body["user_count"]).to eq(User.real.not_staged.count)
end
- it 'returns the right count for the default_sidebar_tags site setting' do
+ it "returns the right count for the default_sidebar_tags site setting" do
tag = Fabricate(:tag)
- put "/admin/site_settings/default_sidebar_tags/user_count.json", params: {
- default_sidebar_tags: "#{tag.name}"
- }
+ put "/admin/site_settings/default_sidebar_tags/user_count.json",
+ params: {
+ default_sidebar_tags: "#{tag.name}",
+ }
expect(response.status).to eq(200)
expect(response.parsed_body["user_count"]).to eq(User.real.not_staged.count)
@@ -124,9 +128,14 @@ RSpec.describe Admin::SiteSettingsController do
end
context "with user options" do
- def expect_user_count(site_setting_name:, user_setting_name:, current_site_setting_value:, new_site_setting_value:,
- current_user_setting_value: nil, new_user_setting_value: nil)
-
+ def expect_user_count(
+ site_setting_name:,
+ user_setting_name:,
+ current_site_setting_value:,
+ new_site_setting_value:,
+ current_user_setting_value: nil,
+ new_user_setting_value: nil
+ )
current_user_setting_value ||= current_site_setting_value
new_user_setting_value ||= new_site_setting_value
@@ -135,23 +144,26 @@ RSpec.describe Admin::SiteSettingsController do
user_count = User.human_users.count
# Correctly counts users when all of them have default value
- put "/admin/site_settings/#{site_setting_name}/user_count.json", params: {
- site_setting_name => new_site_setting_value
- }
+ put "/admin/site_settings/#{site_setting_name}/user_count.json",
+ params: {
+ site_setting_name => new_site_setting_value,
+ }
expect(response.parsed_body["user_count"]).to eq(user_count)
# Correctly counts users when one of them already has new value
user.user_option.update!(user_setting_name => new_user_setting_value)
- put "/admin/site_settings/#{site_setting_name}/user_count.json", params: {
- site_setting_name => new_site_setting_value
- }
+ put "/admin/site_settings/#{site_setting_name}/user_count.json",
+ params: {
+ site_setting_name => new_site_setting_value,
+ }
expect(response.parsed_body["user_count"]).to eq(user_count - 1)
# Correctly counts users when site setting value has been changed
SiteSetting.public_send("#{site_setting_name}=", new_site_setting_value)
- put "/admin/site_settings/#{site_setting_name}/user_count.json", params: {
- site_setting_name => current_site_setting_value
- }
+ put "/admin/site_settings/#{site_setting_name}/user_count.json",
+ params: {
+ site_setting_name => current_site_setting_value,
+ }
expect(response.parsed_body["user_count"]).to eq(1)
end
@@ -160,7 +172,7 @@ RSpec.describe Admin::SiteSettingsController do
site_setting_name: "default_other_external_links_in_new_tab",
user_setting_name: "external_links_in_new_tab",
current_site_setting_value: false,
- new_site_setting_value: true
+ new_site_setting_value: true,
)
end
@@ -171,7 +183,7 @@ RSpec.describe Admin::SiteSettingsController do
current_site_setting_value: "normal",
new_site_setting_value: "larger",
current_user_setting_value: UserOption.text_sizes[:normal],
- new_user_setting_value: UserOption.text_sizes[:larger]
+ new_user_setting_value: UserOption.text_sizes[:larger],
)
end
@@ -182,7 +194,7 @@ RSpec.describe Admin::SiteSettingsController do
current_site_setting_value: "notifications",
new_site_setting_value: "contextual",
current_user_setting_value: UserOption.title_count_modes[:notifications],
- new_user_setting_value: UserOption.title_count_modes[:contextual]
+ new_user_setting_value: UserOption.title_count_modes[:contextual],
)
end
end
@@ -192,9 +204,10 @@ RSpec.describe Admin::SiteSettingsController do
it "denies access with a 404 response" do
category_id = Fabricate(:category).id
- put "/admin/site_settings/default_categories_watching/user_count.json", params: {
- default_categories_watching: category_id
- }
+ put "/admin/site_settings/default_categories_watching/user_count.json",
+ params: {
+ default_categories_watching: category_id,
+ }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -208,13 +221,13 @@ RSpec.describe Admin::SiteSettingsController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "user counts inaccessible"
end
end
- describe '#update' do
+ describe "#update" do
before do
SiteSetting.setting(:test_setting, "default")
SiteSetting.setting(:test_upload, "", type: :upload)
@@ -224,119 +237,140 @@ RSpec.describe Admin::SiteSettingsController do
context "when logged in as an admin" do
before { sign_in(admin) }
- it 'sets the value when the param is present' do
- put "/admin/site_settings/test_setting.json", params: {
- test_setting: 'hello'
- }
+ it "sets the value when the param is present" do
+ put "/admin/site_settings/test_setting.json", params: { test_setting: "hello" }
expect(response.status).to eq(200)
- expect(SiteSetting.test_setting).to eq('hello')
+ expect(SiteSetting.test_setting).to eq("hello")
end
- it 'works for deprecated settings' do
- put "/admin/site_settings/search_tokenize_chinese_japanese_korean.json", params: {
- search_tokenize_chinese_japanese_korean: true
- }
+ it "works for deprecated settings" do
+ put "/admin/site_settings/search_tokenize_chinese_japanese_korean.json",
+ params: {
+ search_tokenize_chinese_japanese_korean: true,
+ }
expect(response.status).to eq(200)
expect(SiteSetting.search_tokenize_chinese).to eq(true)
end
- it 'throws an error when trying to change a deprecated setting with override = false' do
+ it "throws an error when trying to change a deprecated setting with override = false" do
SiteSetting.personal_message_enabled_groups = Group::AUTO_GROUPS[:trust_level_4]
- put "/admin/site_settings/enable_personal_messages.json", params: {
- enable_personal_messages: false
- }
+ put "/admin/site_settings/enable_personal_messages.json",
+ params: {
+ enable_personal_messages: false,
+ }
expect(response.status).to eq(422)
- expect(SiteSetting.personal_message_enabled_groups).to eq(Group::AUTO_GROUPS[:trust_level_4])
+ expect(SiteSetting.personal_message_enabled_groups).to eq(
+ Group::AUTO_GROUPS[:trust_level_4],
+ )
end
- it 'allows value to be a blank string' do
- put "/admin/site_settings/test_setting.json", params: {
- test_setting: ''
- }
+ it "allows value to be a blank string" do
+ put "/admin/site_settings/test_setting.json", params: { test_setting: "" }
expect(response.status).to eq(200)
- expect(SiteSetting.test_setting).to eq('')
+ expect(SiteSetting.test_setting).to eq("")
end
context "with default user options" do
let!(:user1) { Fabricate(:user) }
let!(:user2) { Fabricate(:user) }
- it 'should update all existing user options' do
+ it "should update all existing user options" do
SiteSetting.default_email_in_reply_to = true
user2.user_option.email_in_reply_to = true
user2.user_option.save!
- put "/admin/site_settings/default_email_in_reply_to.json", params: {
- default_email_in_reply_to: false,
- update_existing_user: true
- }
+ put "/admin/site_settings/default_email_in_reply_to.json",
+ params: {
+ default_email_in_reply_to: false,
+ update_existing_user: true,
+ }
user2.reload
expect(user2.user_option.email_in_reply_to).to eq(false)
end
- it 'should not update existing user options' do
+ it "should not update existing user options" do
expect {
- put "/admin/site_settings/default_email_in_reply_to.json", params: {
- default_email_in_reply_to: false
- }
+ put "/admin/site_settings/default_email_in_reply_to.json",
+ params: {
+ default_email_in_reply_to: false,
+ }
}.not_to change { UserOption.where(email_in_reply_to: false).count }
end
- it 'should update `email_digests` column in existing user options' do
+ it "should update `email_digests` column in existing user options" do
UserOption.last.update(email_digests: false)
expect {
- put "/admin/site_settings/default_email_digest_frequency.json", params: {
- default_email_digest_frequency: 30,
- update_existing_user: true
- }
+ put "/admin/site_settings/default_email_digest_frequency.json",
+ params: {
+ default_email_digest_frequency: 30,
+ update_existing_user: true,
+ }
}.to change { UserOption.where(email_digests: true).count }.by(1)
expect {
- put "/admin/site_settings/default_email_digest_frequency.json", params: {
- default_email_digest_frequency: 0,
- update_existing_user: true
- }
+ put "/admin/site_settings/default_email_digest_frequency.json",
+ params: {
+ default_email_digest_frequency: 0,
+ update_existing_user: true,
+ }
}.to change { UserOption.where(email_digests: false).count }.by(User.human_users.count)
end
end
- context 'when updating default sidebar categories and tags' do
- it 'does not enqueue the backfilling job if update_existing_user param is not present' do
+ context "when updating default sidebar categories and tags" do
+ it "does not enqueue the backfilling job if update_existing_user param is not present" do
expect_not_enqueued_with(job: :backfill_sidebar_site_settings) do
- put "/admin/site_settings/default_sidebar_categories.json", params: {
- default_sidebar_categories: "1|2",
- }
+ put "/admin/site_settings/default_sidebar_categories.json",
+ params: {
+ default_sidebar_categories: "1|2",
+ }
expect(response.status).to eq(200)
end
end
- it 'enqueus the backfilling job if update_existing_user param is present when updating default sidebar tags' do
+ it "enqueus the backfilling job if update_existing_user param is present when updating default sidebar tags" do
SiteSetting.default_sidebar_tags = "tag3"
- expect_enqueued_with(job: :backfill_sidebar_site_settings, args: { setting_name: 'default_sidebar_tags', new_value: 'tag1|tag2', previous_value: 'tag3' }) do
- put "/admin/site_settings/default_sidebar_tags.json", params: {
- default_sidebar_tags: "tag1|tag2",
- update_existing_user: true
- }
+ expect_enqueued_with(
+ job: :backfill_sidebar_site_settings,
+ args: {
+ setting_name: "default_sidebar_tags",
+ new_value: "tag1|tag2",
+ previous_value: "tag3",
+ },
+ ) do
+ put "/admin/site_settings/default_sidebar_tags.json",
+ params: {
+ default_sidebar_tags: "tag1|tag2",
+ update_existing_user: true,
+ }
expect(response.status).to eq(200)
end
end
- it 'enqueus the backfilling job if update_existing_user param is present when updating default sidebar categories' do
+ it "enqueus the backfilling job if update_existing_user param is present when updating default sidebar categories" do
SiteSetting.default_sidebar_categories = "3|4"
- expect_enqueued_with(job: :backfill_sidebar_site_settings, args: { setting_name: 'default_sidebar_categories', new_value: '1|2', previous_value: '3|4' }) do
- put "/admin/site_settings/default_sidebar_categories.json", params: {
- default_sidebar_categories: "1|2",
- update_existing_user: true
- }
+ expect_enqueued_with(
+ job: :backfill_sidebar_site_settings,
+ args: {
+ setting_name: "default_sidebar_categories",
+ new_value: "1|2",
+ previous_value: "3|4",
+ },
+ ) do
+ put "/admin/site_settings/default_sidebar_categories.json",
+ params: {
+ default_sidebar_categories: "1|2",
+ update_existing_user: true,
+ }
expect(response.status).to eq(200)
end
@@ -354,57 +388,107 @@ RSpec.describe Admin::SiteSettingsController do
before do
SiteSetting.setting(:default_categories_watching, category_ids.first(2).join("|"))
- CategoryUser.create!(category_id: category_ids.last, notification_level: tracking, user: user2)
+ CategoryUser.create!(
+ category_id: category_ids.last,
+ notification_level: tracking,
+ user: user2,
+ )
end
- after do
- SiteSetting.setting(:default_categories_watching, "")
- end
+ after { SiteSetting.setting(:default_categories_watching, "") }
- it 'should update existing users user preference' do
- put "/admin/site_settings/default_categories_watching.json", params: {
- default_categories_watching: category_ids.last(2).join("|"),
- update_existing_user: true
- }
+ it "should update existing users user preference" do
+ put "/admin/site_settings/default_categories_watching.json",
+ params: {
+ default_categories_watching: category_ids.last(2).join("|"),
+ update_existing_user: true,
+ }
expect(response.status).to eq(200)
- expect(CategoryUser.where(category_id: category_ids.first, notification_level: watching).count).to eq(0)
- expect(CategoryUser.where(category_id: category_ids.last, notification_level: watching).count).to eq(User.real.where(staged: false).count - 1)
+ expect(
+ CategoryUser.where(category_id: category_ids.first, notification_level: watching).count,
+ ).to eq(0)
+ expect(
+ CategoryUser.where(category_id: category_ids.last, notification_level: watching).count,
+ ).to eq(User.real.where(staged: false).count - 1)
topic = Fabricate(:topic, category_id: category_ids.last)
- topic_user1 = Fabricate(:topic_user, topic: topic, notification_level: TopicUser.notification_levels[:watching], notifications_reason_id: TopicUser.notification_reasons[:auto_watch_category])
- topic_user2 = Fabricate(:topic_user, topic: topic, notification_level: TopicUser.notification_levels[:watching], notifications_reason_id: TopicUser.notification_reasons[:user_changed])
+ topic_user1 =
+ Fabricate(
+ :topic_user,
+ topic: topic,
+ notification_level: TopicUser.notification_levels[:watching],
+ notifications_reason_id: TopicUser.notification_reasons[:auto_watch_category],
+ )
+ topic_user2 =
+ Fabricate(
+ :topic_user,
+ topic: topic,
+ notification_level: TopicUser.notification_levels[:watching],
+ notifications_reason_id: TopicUser.notification_reasons[:user_changed],
+ )
- put "/admin/site_settings/default_categories_watching.json", params: {
- default_categories_watching: "",
- update_existing_user: true
- }
+ put "/admin/site_settings/default_categories_watching.json",
+ params: {
+ default_categories_watching: "",
+ update_existing_user: true,
+ }
expect(response.status).to eq(200)
- expect(CategoryUser.where(category_id: category_ids, notification_level: watching).count).to eq(0)
- expect(topic_user1.reload.notification_level).to eq(TopicUser.notification_levels[:regular])
- expect(topic_user2.reload.notification_level).to eq(TopicUser.notification_levels[:watching])
+ expect(
+ CategoryUser.where(category_id: category_ids, notification_level: watching).count,
+ ).to eq(0)
+ expect(topic_user1.reload.notification_level).to eq(
+ TopicUser.notification_levels[:regular],
+ )
+ expect(topic_user2.reload.notification_level).to eq(
+ TopicUser.notification_levels[:watching],
+ )
end
- it 'should not update existing users user preference' do
+ it "should not update existing users user preference" do
expect {
- put "/admin/site_settings/default_categories_watching.json", params: {
- default_categories_watching: category_ids.last(2).join("|")
- }
- }.not_to change { CategoryUser.where(category_id: category_ids.first, notification_level: watching).count }
+ put "/admin/site_settings/default_categories_watching.json",
+ params: {
+ default_categories_watching: category_ids.last(2).join("|"),
+ }
+ }.not_to change {
+ CategoryUser.where(category_id: category_ids.first, notification_level: watching).count
+ }
expect(response.status).to eq(200)
- expect(CategoryUser.where(category_id: category_ids.last, notification_level: watching).count).to eq(0)
+ expect(
+ CategoryUser.where(category_id: category_ids.last, notification_level: watching).count,
+ ).to eq(0)
topic = Fabricate(:topic, category_id: category_ids.last)
- topic_user1 = Fabricate(:topic_user, topic: topic, notification_level: TopicUser.notification_levels[:watching], notifications_reason_id: TopicUser.notification_reasons[:auto_watch_category])
- topic_user2 = Fabricate(:topic_user, topic: topic, notification_level: TopicUser.notification_levels[:watching], notifications_reason_id: TopicUser.notification_reasons[:user_changed])
- put "/admin/site_settings/default_categories_watching.json", params: {
- default_categories_watching: "",
- }
+ topic_user1 =
+ Fabricate(
+ :topic_user,
+ topic: topic,
+ notification_level: TopicUser.notification_levels[:watching],
+ notifications_reason_id: TopicUser.notification_reasons[:auto_watch_category],
+ )
+ topic_user2 =
+ Fabricate(
+ :topic_user,
+ topic: topic,
+ notification_level: TopicUser.notification_levels[:watching],
+ notifications_reason_id: TopicUser.notification_reasons[:user_changed],
+ )
+ put "/admin/site_settings/default_categories_watching.json",
+ params: {
+ default_categories_watching: "",
+ }
expect(response.status).to eq(200)
- expect(CategoryUser.where(category_id: category_ids.first, notification_level: watching).count).to eq(0)
- expect(topic_user1.reload.notification_level).to eq(TopicUser.notification_levels[:watching])
- expect(topic_user2.reload.notification_level).to eq(TopicUser.notification_levels[:watching])
+ expect(
+ CategoryUser.where(category_id: category_ids.first, notification_level: watching).count,
+ ).to eq(0)
+ expect(topic_user1.reload.notification_level).to eq(
+ TopicUser.notification_levels[:watching],
+ )
+ expect(topic_user2.reload.notification_level).to eq(
+ TopicUser.notification_levels[:watching],
+ )
end
end
@@ -422,112 +506,104 @@ RSpec.describe Admin::SiteSettingsController do
TagUser.create!(tag_id: tags.last.id, notification_level: tracking, user: user2)
end
- after do
- SiteSetting.setting(:default_tags_watching, "")
- end
+ after { SiteSetting.setting(:default_tags_watching, "") }
- it 'should update existing users user preference' do
- put "/admin/site_settings/default_tags_watching.json", params: {
- default_tags_watching: tags.last(2).pluck(:name).join("|"),
- update_existing_user: true
- }
+ it "should update existing users user preference" do
+ put "/admin/site_settings/default_tags_watching.json",
+ params: {
+ default_tags_watching: tags.last(2).pluck(:name).join("|"),
+ update_existing_user: true,
+ }
expect(TagUser.where(tag_id: tags.first.id, notification_level: watching).count).to eq(0)
- expect(TagUser.where(tag_id: tags.last.id, notification_level: watching).count).to eq(User.real.where(staged: false).count - 1)
+ expect(TagUser.where(tag_id: tags.last.id, notification_level: watching).count).to eq(
+ User.real.where(staged: false).count - 1,
+ )
end
- it 'should not update existing users user preference' do
+ it "should not update existing users user preference" do
expect {
- put "/admin/site_settings/default_tags_watching.json", params: {
- default_tags_watching: tags.last(2).pluck(:name).join("|")
- }
- }.not_to change { TagUser.where(tag_id: tags.first.id, notification_level: watching).count }
+ put "/admin/site_settings/default_tags_watching.json",
+ params: {
+ default_tags_watching: tags.last(2).pluck(:name).join("|"),
+ }
+ }.not_to change {
+ TagUser.where(tag_id: tags.first.id, notification_level: watching).count
+ }
expect(TagUser.where(tag_id: tags.last.id, notification_level: watching).count).to eq(0)
end
end
context "with upload site settings" do
- it 'can remove the site setting' do
+ it "can remove the site setting" do
SiteSetting.test_upload = Fabricate(:upload)
- put "/admin/site_settings/test_upload.json", params: {
- test_upload: nil
- }
+ put "/admin/site_settings/test_upload.json", params: { test_upload: nil }
expect(response.status).to eq(200)
expect(SiteSetting.test_upload).to eq(nil)
end
- it 'can reset the site setting to the default' do
+ it "can reset the site setting to the default" do
SiteSetting.test_upload = nil
default_upload = Upload.find(-1)
- put "/admin/site_settings/test_upload.json", params: {
- test_upload: default_upload.url
- }
+ put "/admin/site_settings/test_upload.json", params: { test_upload: default_upload.url }
expect(response.status).to eq(200)
expect(SiteSetting.test_upload).to eq(default_upload)
end
- it 'can update the site setting' do
+ it "can update the site setting" do
upload = Fabricate(:upload)
- put "/admin/site_settings/test_upload.json", params: {
- test_upload: upload.url
- }
+ put "/admin/site_settings/test_upload.json", params: { test_upload: upload.url }
expect(response.status).to eq(200)
expect(SiteSetting.test_upload).to eq(upload)
user_history = UserHistory.last
- expect(user_history.action).to eq(
- UserHistory.actions[:change_site_setting]
- )
+ expect(user_history.action).to eq(UserHistory.actions[:change_site_setting])
expect(user_history.previous_value).to eq(nil)
expect(user_history.new_value).to eq(upload.url)
end
end
- it 'logs the change' do
- SiteSetting.test_setting = 'previous'
+ it "logs the change" do
+ SiteSetting.test_setting = "previous"
expect do
- put "/admin/site_settings/test_setting.json", params: {
- test_setting: 'hello'
- }
- end.to change { UserHistory.where(action: UserHistory.actions[:change_site_setting]).count }.by(1)
+ put "/admin/site_settings/test_setting.json", params: { test_setting: "hello" }
+ end.to change {
+ UserHistory.where(action: UserHistory.actions[:change_site_setting]).count
+ }.by(1)
expect(response.status).to eq(200)
- expect(SiteSetting.test_setting).to eq('hello')
+ expect(SiteSetting.test_setting).to eq("hello")
end
- it 'does not allow changing of hidden settings' do
+ it "does not allow changing of hidden settings" do
SiteSetting.setting(:hidden_setting, "hidden", hidden: true)
SiteSetting.refresh!
- put "/admin/site_settings/hidden_setting.json", params: {
- hidden_setting: 'not allowed'
- }
+ put "/admin/site_settings/hidden_setting.json", params: { hidden_setting: "not allowed" }
expect(SiteSetting.hidden_setting).to eq("hidden")
expect(response.status).to eq(422)
end
- it 'fails when a setting does not exist' do
- put "/admin/site_settings/provider.json", params: { provider: 'gotcha' }
+ it "fails when a setting does not exist" do
+ put "/admin/site_settings/provider.json", params: { provider: "gotcha" }
expect(response.status).to eq(422)
end
end
shared_examples "site setting update not allowed" do
it "prevents updates with a 404 response" do
- put "/admin/site_settings/test_setting.json", params: {
- test_setting: 'hello'
- }
+ put "/admin/site_settings/test_setting.json", params: { test_setting: "hello" }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -541,7 +617,7 @@ RSpec.describe Admin::SiteSettingsController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "site setting update not allowed"
end
diff --git a/spec/requests/admin/site_texts_controller_spec.rb b/spec/requests/admin/site_texts_controller_spec.rb
index e11787c3449..0bdace38ede 100644
--- a/spec/requests/admin/site_texts_controller_spec.rb
+++ b/spec/requests/admin/site_texts_controller_spec.rb
@@ -11,140 +11,196 @@ RSpec.describe Admin::SiteTextsController do
I18n.reload!
end
- describe '#index' do
+ describe "#index" do
context "when logged in as an admin" do
before { sign_in(admin) }
- it 'returns json' do
- get "/admin/customize/site_texts.json", params: { q: 'title', locale: default_locale }
+ it "returns json" do
+ get "/admin/customize/site_texts.json", params: { q: "title", locale: default_locale }
expect(response.status).to eq(200)
- expect(response.parsed_body['site_texts']).to include(include("id" => "title"))
+ expect(response.parsed_body["site_texts"]).to include(include("id" => "title"))
end
- it 'sets has_more to true if more than 50 results were found' do
- get "/admin/customize/site_texts.json", params: { q: 'e', locale: default_locale }
+ it "sets has_more to true if more than 50 results were found" do
+ get "/admin/customize/site_texts.json", params: { q: "e", locale: default_locale }
expect(response.status).to eq(200)
- expect(response.parsed_body['site_texts'].size).to eq(50)
- expect(response.parsed_body['extras']['has_more']).to be_truthy
+ expect(response.parsed_body["site_texts"].size).to eq(50)
+ expect(response.parsed_body["extras"]["has_more"]).to be_truthy
end
- it 'works with pages' do
+ it "works with pages" do
texts = Set.new
- get "/admin/customize/site_texts.json", params: { q: 'e', locale: default_locale }
- response.parsed_body['site_texts'].each { |text| texts << text['id'] }
+ get "/admin/customize/site_texts.json", params: { q: "e", locale: default_locale }
+ response.parsed_body["site_texts"].each { |text| texts << text["id"] }
expect(texts.size).to eq(50)
- get "/admin/customize/site_texts.json", params: { q: 'e', page: 1, locale: default_locale }
- response.parsed_body['site_texts'].each { |text| texts << text['id'] }
+ get "/admin/customize/site_texts.json", params: { q: "e", page: 1, locale: default_locale }
+ response.parsed_body["site_texts"].each { |text| texts << text["id"] }
expect(texts.size).to eq(100)
end
- it 'works with locales' do
- get "/admin/customize/site_texts.json", params: { q: 'yes_value', locale: default_locale }
- value = response.parsed_body['site_texts'].find { |text| text['id'] == 'js.yes_value' }['value']
- expect(value).to eq(I18n.t('js.yes_value', locale: default_locale))
+ it "works with locales" do
+ get "/admin/customize/site_texts.json", params: { q: "yes_value", locale: default_locale }
+ value =
+ response.parsed_body["site_texts"].find { |text| text["id"] == "js.yes_value" }["value"]
+ expect(value).to eq(I18n.t("js.yes_value", locale: default_locale))
- get "/admin/customize/site_texts.json", params: { q: 'yes_value', locale: 'de' }
- value = response.parsed_body['site_texts'].find { |text| text['id'] == 'js.yes_value' }['value']
- expect(value).to eq(I18n.t('js.yes_value', locale: :de))
+ get "/admin/customize/site_texts.json", params: { q: "yes_value", locale: "de" }
+ value =
+ response.parsed_body["site_texts"].find { |text| text["id"] == "js.yes_value" }["value"]
+ expect(value).to eq(I18n.t("js.yes_value", locale: :de))
end
- it 'returns an error on invalid locale' do
- get "/admin/customize/site_texts.json", params: { locale: '?' }
+ it "returns an error on invalid locale" do
+ get "/admin/customize/site_texts.json", params: { locale: "?" }
expect(response.status).to eq(400)
end
- it 'returns an error on empty locale' do
+ it "returns an error on empty locale" do
get "/admin/customize/site_texts.json"
expect(response.status).to eq(400)
end
- it 'normalizes quotes during search' do
- value = %q|“That’s a ‘magic’ sock.”|
- put "/admin/customize/site_texts/title.json", params: { site_text: { value: value, locale: default_locale } }
+ it "normalizes quotes during search" do
+ value = "“That’s a ‘magic’ sock.”"
+ put "/admin/customize/site_texts/title.json",
+ params: {
+ site_text: {
+ value: value,
+ locale: default_locale,
+ },
+ }
[
- %q|That's a 'magic' sock.|,
- %q|That’s a ‘magic’ sock.|,
- %q|“That's a 'magic' sock.”|,
+ "That's a 'magic' sock.",
+ "That’s a ‘magic’ sock.",
+ "“That's a 'magic' sock.”",
%q|"That's a 'magic' sock."|,
- %q|«That's a 'magic' sock.»|,
- %q|„That’s a ‚magic‘ sock.“|
+ "«That's a 'magic' sock.»",
+ "„That’s a ‚magic‘ sock.“",
].each do |search_term|
get "/admin/customize/site_texts.json", params: { q: search_term, locale: default_locale }
expect(response.status).to eq(200)
- expect(response.parsed_body['site_texts']).to include(include("id" => "title", "value" => value))
+ expect(response.parsed_body["site_texts"]).to include(
+ include("id" => "title", "value" => value),
+ )
end
end
- it 'normalizes ellipsis' do
+ it "normalizes ellipsis" do
value = "Loading Discussion…"
- put "/admin/customize/site_texts/embed.loading.json", params: { site_text: { value: value, locale: default_locale } }
+ put "/admin/customize/site_texts/embed.loading.json",
+ params: {
+ site_text: {
+ value: value,
+ locale: default_locale,
+ },
+ }
- [
- "Loading Discussion",
- "Loading Discussion...",
- "Loading Discussion…"
- ].each do |search_term|
+ ["Loading Discussion", "Loading Discussion...", "Loading Discussion…"].each do |search_term|
get "/admin/customize/site_texts.json", params: { q: search_term, locale: default_locale }
expect(response.status).to eq(200)
- expect(response.parsed_body['site_texts']).to include(include("id" => "embed.loading", "value" => value))
+ expect(response.parsed_body["site_texts"]).to include(
+ include("id" => "embed.loading", "value" => value),
+ )
end
end
- it 'does not return overrides for keys that do not exist in English' do
+ it "does not return overrides for keys that do not exist in English" do
SiteSetting.default_locale = :ru
- TranslationOverride.create!(locale: :ru, translation_key: 'missing_plural_key.one', value: 'ONE')
- TranslationOverride.create!(locale: :ru, translation_key: 'another_missing_key', value: 'foo')
+ TranslationOverride.create!(
+ locale: :ru,
+ translation_key: "missing_plural_key.one",
+ value: "ONE",
+ )
+ TranslationOverride.create!(
+ locale: :ru,
+ translation_key: "another_missing_key",
+ value: "foo",
+ )
- get "/admin/customize/site_texts.json", params: { q: 'missing_plural_key', locale: default_locale }
+ get "/admin/customize/site_texts.json",
+ params: {
+ q: "missing_plural_key",
+ locale: default_locale,
+ }
expect(response.status).to eq(200)
- expect(response.parsed_body['site_texts']).to be_empty
+ expect(response.parsed_body["site_texts"]).to be_empty
- get "/admin/customize/site_texts.json", params: { q: 'another_missing_key', locale: default_locale }
+ get "/admin/customize/site_texts.json",
+ params: {
+ q: "another_missing_key",
+ locale: default_locale,
+ }
expect(response.status).to eq(200)
- expect(response.parsed_body['site_texts']).to be_empty
+ expect(response.parsed_body["site_texts"]).to be_empty
end
it "returns site text from fallback locale if current locale doesn't have a translation" do
- TranslationOverride.upsert!(:en, 'js.summary.description_time_MF', 'description_time_MF override')
- TranslationOverride.upsert!(:en, 'education.new-topic', 'education.new-topic override')
+ TranslationOverride.upsert!(
+ :en,
+ "js.summary.description_time_MF",
+ "description_time_MF override",
+ )
+ TranslationOverride.upsert!(:en, "education.new-topic", "education.new-topic override")
- get "/admin/customize/site_texts.json", params: { q: 'js.summary.description_time_MF', locale: 'en_GB' }
+ get "/admin/customize/site_texts.json",
+ params: {
+ q: "js.summary.description_time_MF",
+ locale: "en_GB",
+ }
expect(response.status).to eq(200)
- value = response.parsed_body['site_texts'].find { |text| text['id'] == 'js.summary.description_time_MF' }['value']
- expect(value).to eq('description_time_MF override')
+ value =
+ response.parsed_body["site_texts"].find do |text|
+ text["id"] == "js.summary.description_time_MF"
+ end[
+ "value"
+ ]
+ expect(value).to eq("description_time_MF override")
- get "/admin/customize/site_texts.json", params: { q: 'education.new-topic', locale: 'en_GB' }
+ get "/admin/customize/site_texts.json",
+ params: {
+ q: "education.new-topic",
+ locale: "en_GB",
+ }
expect(response.status).to eq(200)
- value = response.parsed_body['site_texts'].find { |text| text['id'] == 'education.new-topic' }['value']
- expect(value).to eq('education.new-topic override')
+ value =
+ response.parsed_body["site_texts"].find { |text| text["id"] == "education.new-topic" }[
+ "value"
+ ]
+ expect(value).to eq("education.new-topic override")
end
it "returns only overridden translations" do
- TranslationOverride.upsert!(:en, 'education.new-topic', 'education.new-topic override')
+ TranslationOverride.upsert!(:en, "education.new-topic", "education.new-topic override")
- get "/admin/customize/site_texts.json", params: { locale: 'en', overridden: true }
+ get "/admin/customize/site_texts.json", params: { locale: "en", overridden: true }
expect(response.status).to eq(200)
- site_texts = response.parsed_body['site_texts']
+ site_texts = response.parsed_body["site_texts"]
expect(site_texts.size).to eq(1)
- value = site_texts.find { |text| text['id'] == 'education.new-topic' }['value']
- expect(value).to eq('education.new-topic override')
+ value = site_texts.find { |text| text["id"] == "education.new-topic" }["value"]
+ expect(value).to eq("education.new-topic override")
end
- context 'with plural keys' do
+ context "with plural keys" do
before do
- I18n.backend.store_translations(:en, colour: { one: '%{count} colour', other: '%{count} colours' })
+ I18n.backend.store_translations(
+ :en,
+ colour: {
+ one: "%{count} colour",
+ other: "%{count} colours",
+ },
+ )
end
- shared_examples 'finds correct plural keys' do
- it 'finds the correct plural keys for the locale' do
+ shared_examples "finds correct plural keys" do
+ it "finds the correct plural keys for the locale" do
SiteSetting.default_locale = locale
- get '/admin/customize/site_texts.json', params: { q: 'colour', locale: locale }
+ get "/admin/customize/site_texts.json", params: { q: "colour", locale: locale }
expect(response.status).to eq(200)
json = ::JSON.parse(response.body, symbolize_names: true)
@@ -153,59 +209,94 @@ RSpec.describe Admin::SiteTextsController do
site_texts = json[:site_texts]
expect(site_texts).to be_present
- expected_search_result = expected_translations.map do |key, value|
- overridden = defined?(expected_overridden) ? expected_overridden[key] || false : false
- { id: "colour.#{key}", value: value, can_revert: overridden, overridden: overridden }
- end
+ expected_search_result =
+ expected_translations.map do |key, value|
+ overridden =
+ defined?(expected_overridden) ? expected_overridden[key] || false : false
+ {
+ id: "colour.#{key}",
+ value: value,
+ can_revert: overridden,
+ overridden: overridden,
+ }
+ end
expect(site_texts).to match_array(expected_search_result)
end
end
- context 'with English' do
+ context "with English" do
let(:locale) { :en }
- let(:expected_translations) { { one: '%{count} colour', other: '%{count} colours' } }
+ let(:expected_translations) { { one: "%{count} colour", other: "%{count} colours" } }
- include_examples 'finds correct plural keys'
+ include_examples "finds correct plural keys"
end
- context 'with language with different plural keys and missing translations' do
+ context "with language with different plural keys and missing translations" do
let(:locale) { :ru }
- let(:expected_translations) { { one: '%{count} colour', few: '%{count} colours', many: '%{count} colours', other: '%{count} colours' } }
+ let(:expected_translations) do
+ {
+ one: "%{count} colour",
+ few: "%{count} colours",
+ many: "%{count} colours",
+ other: "%{count} colours",
+ }
+ end
- include_examples 'finds correct plural keys'
+ include_examples "finds correct plural keys"
end
- context 'with language with different plural keys and partial translation' do
+ context "with language with different plural keys and partial translation" do
before do
- I18n.backend.store_translations(:ru, colour: { few: '%{count} цвета', many: '%{count} цветов' })
+ I18n.backend.store_translations(
+ :ru,
+ colour: {
+ few: "%{count} цвета",
+ many: "%{count} цветов",
+ },
+ )
end
let(:locale) { :ru }
- let(:expected_translations) { { one: '%{count} colour', few: '%{count} цвета', many: '%{count} цветов', other: '%{count} colours' } }
+ let(:expected_translations) do
+ {
+ one: "%{count} colour",
+ few: "%{count} цвета",
+ many: "%{count} цветов",
+ other: "%{count} colours",
+ }
+ end
- include_examples 'finds correct plural keys'
+ include_examples "finds correct plural keys"
end
- context 'with overridden translation not in original translation' do
+ context "with overridden translation not in original translation" do
before do
- I18n.backend.store_translations(:ru, colour: { few: '%{count} цвета', many: '%{count} цветов' })
- TranslationOverride.create!(locale: :ru, translation_key: 'colour.one', value: 'ONE')
- TranslationOverride.create!(locale: :ru, translation_key: 'colour.few', value: 'FEW')
+ I18n.backend.store_translations(
+ :ru,
+ colour: {
+ few: "%{count} цвета",
+ many: "%{count} цветов",
+ },
+ )
+ TranslationOverride.create!(locale: :ru, translation_key: "colour.one", value: "ONE")
+ TranslationOverride.create!(locale: :ru, translation_key: "colour.few", value: "FEW")
end
let(:locale) { :ru }
- let(:expected_translations) { { one: 'ONE', few: 'FEW', many: '%{count} цветов', other: '%{count} colours' } }
+ let(:expected_translations) do
+ { one: "ONE", few: "FEW", many: "%{count} цветов", other: "%{count} colours" }
+ end
let(:expected_overridden) { { one: true, few: true } }
- include_examples 'finds correct plural keys'
+ include_examples "finds correct plural keys"
end
end
end
shared_examples "site texts inaccessible" do
it "denies access with a 404 response" do
- get "/admin/customize/site_texts.json", params: { q: 'title', locale: default_locale }
+ get "/admin/customize/site_texts.json", params: { q: "title", locale: default_locale }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -219,111 +310,134 @@ RSpec.describe Admin::SiteTextsController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "site texts inaccessible"
end
end
- describe '#show' do
+ describe "#show" do
context "when logged in as an admin" do
before { sign_in(admin) }
- it 'returns a site text for a key that exists' do
+ it "returns a site text for a key that exists" do
get "/admin/customize/site_texts/js.topic.list.json", params: { locale: default_locale }
expect(response.status).to eq(200)
json = response.parsed_body
- site_text = json['site_text']
+ site_text = json["site_text"]
- expect(site_text['id']).to eq('js.topic.list')
- expect(site_text['value']).to eq(I18n.t("js.topic.list"))
+ expect(site_text["id"]).to eq("js.topic.list")
+ expect(site_text["value"]).to eq(I18n.t("js.topic.list"))
end
- it 'returns a site text for a key with ampersand' do
- get "/admin/customize/site_texts/js.emoji_picker.food_&_drink.json", params: { locale: default_locale }
+ it "returns a site text for a key with ampersand" do
+ get "/admin/customize/site_texts/js.emoji_picker.food_&_drink.json",
+ params: {
+ locale: default_locale,
+ }
expect(response.status).to eq(200)
json = response.parsed_body
- site_text = json['site_text']
+ site_text = json["site_text"]
- expect(site_text['id']).to eq('js.emoji_picker.food_&_drink')
- expect(site_text['value']).to eq(I18n.t("js.emoji_picker.food_&_drink"))
+ expect(site_text["id"]).to eq("js.emoji_picker.food_&_drink")
+ expect(site_text["value"]).to eq(I18n.t("js.emoji_picker.food_&_drink"))
end
- it 'returns not found for missing keys' do
- get "/admin/customize/site_texts/made_up_no_key_exists.json", params: { locale: default_locale }
+ it "returns not found for missing keys" do
+ get "/admin/customize/site_texts/made_up_no_key_exists.json",
+ params: {
+ locale: default_locale,
+ }
expect(response.status).to eq(404)
end
- it 'returns overridden = true if there is a translation_overrides record for the key' do
- key = 'js.topic.list'
- put "/admin/customize/site_texts/#{key}.json", params: {
- site_text: { value: I18n.t(key, locale: default_locale), locale: default_locale }
- }
+ it "returns overridden = true if there is a translation_overrides record for the key" do
+ key = "js.topic.list"
+ put "/admin/customize/site_texts/#{key}.json",
+ params: {
+ site_text: {
+ value: I18n.t(key, locale: default_locale),
+ locale: default_locale,
+ },
+ }
expect(response.status).to eq(200)
get "/admin/customize/site_texts/#{key}.json", params: { locale: default_locale }
expect(response.status).to eq(200)
json = response.parsed_body
- expect(json['site_text']['overridden']).to eq(true)
+ expect(json["site_text"]["overridden"]).to eq(true)
TranslationOverride.destroy_all
get "/admin/customize/site_texts/#{key}.json", params: { locale: default_locale }
expect(response.status).to eq(200)
json = response.parsed_body
- expect(json['site_text']['overridden']).to eq(false)
+ expect(json["site_text"]["overridden"]).to eq(false)
end
- it 'returns a site text in the given locale' do
- get "/admin/customize/site_texts/js.topic.list.json", params: { locale: 'es' }
+ it "returns a site text in the given locale" do
+ get "/admin/customize/site_texts/js.topic.list.json", params: { locale: "es" }
expect(response.status).to eq(200)
json = response.parsed_body
- site_text = json['site_text']
+ site_text = json["site_text"]
- expect(site_text['id']).to eq('js.topic.list')
- expect(site_text['value']).to eq(I18n.t("js.topic.list", locale: :es))
+ expect(site_text["id"]).to eq("js.topic.list")
+ expect(site_text["value"]).to eq(I18n.t("js.topic.list", locale: :es))
end
- it 'fails if locale is not given' do
+ it "fails if locale is not given" do
get "/admin/customize/site_texts/js.topic.list.json"
expect(response.status).to eq(400)
end
it "returns site text from fallback locale if current locale doesn't have a translation" do
- TranslationOverride.upsert!(:en, 'js.summary.description_time_MF', 'description_time_MF override')
- TranslationOverride.upsert!(:en, 'education.new-topic', 'education.new-topic override')
+ TranslationOverride.upsert!(
+ :en,
+ "js.summary.description_time_MF",
+ "description_time_MF override",
+ )
+ TranslationOverride.upsert!(:en, "education.new-topic", "education.new-topic override")
- get "/admin/customize/site_texts/js.summary.description_time_MF.json", params: { locale: 'en_GB' }
+ get "/admin/customize/site_texts/js.summary.description_time_MF.json",
+ params: {
+ locale: "en_GB",
+ }
expect(response.status).to eq(200)
json = response.parsed_body
- site_text = json['site_text']
+ site_text = json["site_text"]
- expect(site_text['id']).to eq('js.summary.description_time_MF')
- expect(site_text['value']).to eq('description_time_MF override')
+ expect(site_text["id"]).to eq("js.summary.description_time_MF")
+ expect(site_text["value"]).to eq("description_time_MF override")
- get "/admin/customize/site_texts/education.new-topic.json", params: { locale: 'en_GB' }
+ get "/admin/customize/site_texts/education.new-topic.json", params: { locale: "en_GB" }
expect(response.status).to eq(200)
json = response.parsed_body
- site_text = json['site_text']
+ site_text = json["site_text"]
- expect(site_text['id']).to eq('education.new-topic')
- expect(site_text['value']).to eq('education.new-topic override')
+ expect(site_text["id"]).to eq("education.new-topic")
+ expect(site_text["value"]).to eq("education.new-topic override")
end
- context 'with plural keys' do
+ context "with plural keys" do
before do
- I18n.backend.store_translations(:en, colour: { one: '%{count} colour', other: '%{count} colours' })
+ I18n.backend.store_translations(
+ :en,
+ colour: {
+ one: "%{count} colour",
+ other: "%{count} colours",
+ },
+ )
end
- shared_examples 'has correct plural keys' do
- it 'returns the correct plural keys for the locale' do
+ shared_examples "has correct plural keys" do
+ it "returns the correct plural keys for the locale" do
expected_translations.each do |key, value|
id = "colour.#{key}"
@@ -333,38 +447,40 @@ RSpec.describe Admin::SiteTextsController do
json = response.parsed_body
expect(json).to be_present
- site_text = json['site_text']
+ site_text = json["site_text"]
expect(site_text).to be_present
- expect(site_text['id']).to eq(id)
- expect(site_text['value']).to eq(value)
+ expect(site_text["id"]).to eq(id)
+ expect(site_text["value"]).to eq(value)
end
end
end
- context 'with English' do
+ context "with English" do
let(:locale) { :en }
- let(:expected_translations) { { one: '%{count} colour', other: '%{count} colours' } }
+ let(:expected_translations) { { one: "%{count} colour", other: "%{count} colours" } }
- include_examples 'has correct plural keys'
+ include_examples "has correct plural keys"
end
- context 'with language with different plural keys and missing translations' do
+ context "with language with different plural keys and missing translations" do
let(:locale) { :ru }
- let(:expected_translations) { { one: '%{count} colour', few: '%{count} colours', other: '%{count} colours' } }
-
- include_examples 'has correct plural keys'
- end
-
- context 'with language with different plural keys and partial translation' do
- before do
- I18n.backend.store_translations(:ru, colour: { few: '%{count} цвета' })
+ let(:expected_translations) do
+ { one: "%{count} colour", few: "%{count} colours", other: "%{count} colours" }
end
- let(:locale) { :ru }
- let(:expected_translations) { { one: '%{count} colour', few: '%{count} цвета', other: '%{count} colours' } }
+ include_examples "has correct plural keys"
+ end
- include_examples 'has correct plural keys'
+ context "with language with different plural keys and partial translation" do
+ before { I18n.backend.store_translations(:ru, colour: { few: "%{count} цвета" }) }
+
+ let(:locale) { :ru }
+ let(:expected_translations) do
+ { one: "%{count} colour", few: "%{count} цвета", other: "%{count} colours" }
+ end
+
+ include_examples "has correct plural keys"
end
end
end
@@ -385,83 +501,105 @@ RSpec.describe Admin::SiteTextsController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "site text inaccessible"
end
end
- describe '#update & #revert' do
+ describe "#update & #revert" do
context "when logged in as an admin" do
before { sign_in(admin) }
it "returns 'not found' when an unknown key is used" do
- put '/admin/customize/site_texts/some_key.json', params: {
- site_text: { value: 'foo', locale: default_locale }
- }
+ put "/admin/customize/site_texts/some_key.json",
+ params: {
+ site_text: {
+ value: "foo",
+ locale: default_locale,
+ },
+ }
expect(response.status).to eq(404)
json = response.parsed_body
- expect(json['error_type']).to eq('not_found')
+ expect(json["error_type"]).to eq("not_found")
end
it "works as expected with correct keys" do
- put '/admin/customize/site_texts/js.emoji_picker.animals_%26_nature.json', params: {
- site_text: { value: 'foo', locale: default_locale }
- }
+ put "/admin/customize/site_texts/js.emoji_picker.animals_%26_nature.json",
+ params: {
+ site_text: {
+ value: "foo",
+ locale: default_locale,
+ },
+ }
expect(response.status).to eq(200)
json = response.parsed_body
- site_text = json['site_text']
+ site_text = json["site_text"]
- expect(site_text['id']).to eq('js.emoji_picker.animals_&_nature')
- expect(site_text['value']).to eq('foo')
+ expect(site_text["id"]).to eq("js.emoji_picker.animals_&_nature")
+ expect(site_text["value"]).to eq("foo")
end
it "does not update restricted keys" do
- put '/admin/customize/site_texts/user_notifications.confirm_old_email.title.json', params: {
- site_text: { value: 'foo', locale: default_locale }
- }
+ put "/admin/customize/site_texts/user_notifications.confirm_old_email.title.json",
+ params: {
+ site_text: {
+ value: "foo",
+ locale: default_locale,
+ },
+ }
expect(response.status).to eq(403)
json = response.parsed_body
- expect(json['error_type']).to eq('invalid_access')
- expect(json['errors'].size).to eq(1)
- expect(json['errors'].first).to eq(I18n.t('email_template_cant_be_modified'))
+ expect(json["error_type"]).to eq("invalid_access")
+ expect(json["errors"].size).to eq(1)
+ expect(json["errors"].first).to eq(I18n.t("email_template_cant_be_modified"))
end
it "returns the right error message" do
- I18n.backend.store_translations(SiteSetting.default_locale, some_key: '%{first} %{second}')
+ I18n.backend.store_translations(SiteSetting.default_locale, some_key: "%{first} %{second}")
- put "/admin/customize/site_texts/some_key.json", params: {
- site_text: { value: 'hello %{key} %{omg}', locale: default_locale }
- }
+ put "/admin/customize/site_texts/some_key.json",
+ params: {
+ site_text: {
+ value: "hello %{key} %{omg}",
+ locale: default_locale,
+ },
+ }
expect(response.status).to eq(422)
body = response.parsed_body
- expect(body['message']).to eq(I18n.t(
- 'activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys',
- keys: 'key, omg'
- ))
+ expect(body["message"]).to eq(
+ I18n.t(
+ "activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys",
+ keys: "key, omg",
+ ),
+ )
end
- it 'logs the change' do
+ it "logs the change" do
original_title = I18n.t(:title)
- put "/admin/customize/site_texts/title.json", params: {
- site_text: { value: 'yay', locale: default_locale }
- }
+ put "/admin/customize/site_texts/title.json",
+ params: {
+ site_text: {
+ value: "yay",
+ locale: default_locale,
+ },
+ }
expect(response.status).to eq(200)
log = UserHistory.last
expect(log.previous_value).to eq(original_title)
- expect(log.new_value).to eq('yay')
+ expect(log.new_value).to eq("yay")
expect(log.action).to eq(UserHistory.actions[:change_site_text])
delete "/admin/customize/site_texts/title.json", params: { locale: default_locale }
@@ -469,23 +607,29 @@ RSpec.describe Admin::SiteTextsController do
log = UserHistory.last
- expect(log.previous_value).to eq('yay')
+ expect(log.previous_value).to eq("yay")
expect(log.new_value).to eq(original_title)
expect(log.action).to eq(UserHistory.actions[:change_site_text])
end
- it 'updates and reverts the key' do
+ it "updates and reverts the key" do
orig_title = I18n.t(:title)
- put "/admin/customize/site_texts/title.json", params: { site_text: { value: 'hello', locale: default_locale } }
+ put "/admin/customize/site_texts/title.json",
+ params: {
+ site_text: {
+ value: "hello",
+ locale: default_locale,
+ },
+ }
expect(response.status).to eq(200)
json = response.parsed_body
- site_text = json['site_text']
+ site_text = json["site_text"]
- expect(site_text['id']).to eq('title')
- expect(site_text['value']).to eq('hello')
+ expect(site_text["id"]).to eq("title")
+ expect(site_text["value"]).to eq("hello")
# Revert
delete "/admin/customize/site_texts/title.json", params: { locale: default_locale }
@@ -493,80 +637,109 @@ RSpec.describe Admin::SiteTextsController do
json = response.parsed_body
- site_text = json['site_text']
+ site_text = json["site_text"]
- expect(site_text['id']).to eq('title')
- expect(site_text['value']).to eq(orig_title)
+ expect(site_text["id"]).to eq("title")
+ expect(site_text["value"]).to eq(orig_title)
end
- it 'returns site texts for the correct locale' do
+ it "returns site texts for the correct locale" do
locale = :ru
- ru_title = 'title ru'
- ru_mf_text = 'ru {NUM_RESULTS, plural, one {1 result} other {many} }'
+ ru_title = "title ru"
+ ru_mf_text = "ru {NUM_RESULTS, plural, one {1 result} other {many} }"
- put "/admin/customize/site_texts/title.json", params: { site_text: { value: ru_title, locale: locale } }
+ put "/admin/customize/site_texts/title.json",
+ params: {
+ site_text: {
+ value: ru_title,
+ locale: locale,
+ },
+ }
expect(response.status).to eq(200)
- put "/admin/customize/site_texts/js.topic.read_more_MF.json", params: { site_text: { value: ru_mf_text, locale: locale } }
+ put "/admin/customize/site_texts/js.topic.read_more_MF.json",
+ params: {
+ site_text: {
+ value: ru_mf_text,
+ locale: locale,
+ },
+ }
expect(response.status).to eq(200)
get "/admin/customize/site_texts/title.json", params: { locale: locale }
expect(response.status).to eq(200)
json = response.parsed_body
- expect(json['site_text']['value']).to eq(ru_title)
+ expect(json["site_text"]["value"]).to eq(ru_title)
get "/admin/customize/site_texts/js.topic.read_more_MF.json", params: { locale: locale }
expect(response.status).to eq(200)
json = response.parsed_body
- expect(json['site_text']['value']).to eq(ru_mf_text)
+ expect(json["site_text"]["value"]).to eq(ru_mf_text)
en_locale = :en
get "/admin/customize/site_texts/title.json", params: { locale: en_locale }
expect(response.status).to eq(200)
json = response.parsed_body
- expect(json['site_text']['value']).to_not eq(ru_title)
+ expect(json["site_text"]["value"]).to_not eq(ru_title)
get "/admin/customize/site_texts/js.topic.read_more_MF.json", params: { locale: en_locale }
expect(response.status).to eq(200)
json = response.parsed_body
- expect(json['site_text']['value']).to_not eq(ru_mf_text)
+ expect(json["site_text"]["value"]).to_not eq(ru_mf_text)
end
- context 'when updating a translation override for a system badge' do
+ context "when updating a translation override for a system badge" do
fab!(:user_with_badge_title) { Fabricate(:active_user) }
let(:badge) { Badge.find(Badge::Regular) }
before do
BadgeGranter.grant(badge, user_with_badge_title)
- user_with_badge_title.update(title: 'Regular')
+ user_with_badge_title.update(title: "Regular")
end
- it 'updates matching user titles to the override text in a job' do
- expect_enqueued_with(job: :bulk_user_title_update, args: {
- new_title: 'Terminator',
- granted_badge_id: badge.id,
- action: Jobs::BulkUserTitleUpdate::UPDATE_ACTION
- }) do
- put '/admin/customize/site_texts/badges.regular.name.json', params: {
- site_text: { value: 'Terminator', locale: default_locale }
- }
+ it "updates matching user titles to the override text in a job" do
+ expect_enqueued_with(
+ job: :bulk_user_title_update,
+ args: {
+ new_title: "Terminator",
+ granted_badge_id: badge.id,
+ action: Jobs::BulkUserTitleUpdate::UPDATE_ACTION,
+ },
+ ) do
+ put "/admin/customize/site_texts/badges.regular.name.json",
+ params: {
+ site_text: {
+ value: "Terminator",
+ locale: default_locale,
+ },
+ }
end
# Revert
- expect_enqueued_with(job: :bulk_user_title_update, args: {
- granted_badge_id: badge.id,
- action: Jobs::BulkUserTitleUpdate::RESET_ACTION
- }) do
- delete "/admin/customize/site_texts/badges.regular.name.json", params: { locale: default_locale }
+ expect_enqueued_with(
+ job: :bulk_user_title_update,
+ args: {
+ granted_badge_id: badge.id,
+ action: Jobs::BulkUserTitleUpdate::RESET_ACTION,
+ },
+ ) do
+ delete "/admin/customize/site_texts/badges.regular.name.json",
+ params: {
+ locale: default_locale,
+ }
end
end
- it 'does not update matching user titles when overriding non-title badge text' do
+ it "does not update matching user titles when overriding non-title badge text" do
expect_not_enqueued_with(job: :bulk_user_title_update) do
- put '/admin/customize/site_texts/badges.regular.long_description.json', params: {
- site_text: { value: 'Terminator', locale: default_locale }
- }
+ put "/admin/customize/site_texts/badges.regular.long_description.json",
+ params: {
+ site_text: {
+ value: "Terminator",
+ locale: default_locale,
+ },
+ }
end
end
end
@@ -574,9 +747,13 @@ RSpec.describe Admin::SiteTextsController do
shared_examples "site text update not allowed" do
it "prevents updates with a 404 response" do
- put "/admin/customize/site_texts/js.emoji_picker.animals_%26_nature.json", params: {
- site_text: { value: 'foo', locale: default_locale }
- }
+ put "/admin/customize/site_texts/js.emoji_picker.animals_%26_nature.json",
+ params: {
+ site_text: {
+ value: "foo",
+ locale: default_locale,
+ },
+ }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -590,7 +767,7 @@ RSpec.describe Admin::SiteTextsController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "site text update not allowed"
end
@@ -598,37 +775,38 @@ RSpec.describe Admin::SiteTextsController do
context "when reseeding" do
before do
- staff_category = Fabricate(
- :category,
- name: "Staff EN",
- user: Discourse.system_user
- )
+ staff_category = Fabricate(:category, name: "Staff EN", user: Discourse.system_user)
SiteSetting.staff_category_id = staff_category.id
- guidelines_topic = Fabricate(
- :topic,
- title: "The English Guidelines",
- category: @staff_category,
- user: Discourse.system_user
- )
+ guidelines_topic =
+ Fabricate(
+ :topic,
+ title: "The English Guidelines",
+ category: @staff_category,
+ user: Discourse.system_user,
+ )
Fabricate(:post, topic: guidelines_topic, user: Discourse.system_user)
SiteSetting.guidelines_topic_id = guidelines_topic.id
end
- describe '#get_reseed_options' do
+ describe "#get_reseed_options" do
context "when logged in as an admin" do
before { sign_in(admin) }
- it 'returns correct json' do
+ it "returns correct json" do
get "/admin/customize/reseed.json"
expect(response.status).to eq(200)
expected_reseed_options = {
categories: [
- { id: "uncategorized_category_id", name: I18n.t("uncategorized_category_name"), selected: true },
- { id: "staff_category_id", name: "Staff EN", selected: true }
+ {
+ id: "uncategorized_category_id",
+ name: I18n.t("uncategorized_category_name"),
+ selected: true,
+ },
+ { id: "staff_category_id", name: "Staff EN", selected: true },
],
- topics: [{ id: "guidelines_topic_id", name: "The English Guidelines", selected: true }]
+ topics: [{ id: "guidelines_topic_id", name: "The English Guidelines", selected: true }],
}
expect(JSON.parse(response.body, symbolize_names: true)).to eq(expected_reseed_options)
@@ -651,36 +829,42 @@ RSpec.describe Admin::SiteTextsController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "reseed options inaccessible"
end
end
- describe '#reseed' do
+ describe "#reseed" do
context "when logged in as an admin" do
before { sign_in(admin) }
- it 'reseeds categories and topics' do
+ it "reseeds categories and topics" do
SiteSetting.default_locale = :de
- post "/admin/customize/reseed.json", params: {
- category_ids: ["staff_category_id"],
- topic_ids: ["guidelines_topic_id"]
- }
+ post "/admin/customize/reseed.json",
+ params: {
+ category_ids: ["staff_category_id"],
+ topic_ids: ["guidelines_topic_id"],
+ }
expect(response.status).to eq(200)
- expect(Category.find(SiteSetting.staff_category_id).name).to eq(I18n.t("staff_category_name", locale: :de))
- expect(Topic.find(SiteSetting.guidelines_topic_id).title).to eq(I18n.t("guidelines_topic.title", locale: :de))
+ expect(Category.find(SiteSetting.staff_category_id).name).to eq(
+ I18n.t("staff_category_name", locale: :de),
+ )
+ expect(Topic.find(SiteSetting.guidelines_topic_id).title).to eq(
+ I18n.t("guidelines_topic.title", locale: :de),
+ )
end
end
shared_examples "reseed not allowed" do
it "prevents reseeds with a 404 response" do
- post "/admin/customize/reseed.json", params: {
- category_ids: ["staff_category_id"],
- topic_ids: ["guidelines_topic_id"]
- }
+ post "/admin/customize/reseed.json",
+ params: {
+ category_ids: ["staff_category_id"],
+ topic_ids: ["guidelines_topic_id"],
+ }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -694,7 +878,7 @@ RSpec.describe Admin::SiteTextsController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "reseed not allowed"
end
diff --git a/spec/requests/admin/staff_action_logs_controller_spec.rb b/spec/requests/admin/staff_action_logs_controller_spec.rb
index 873fa8218d3..24d52c2e736 100644
--- a/spec/requests/admin/staff_action_logs_controller_spec.rb
+++ b/spec/requests/admin/staff_action_logs_controller_spec.rb
@@ -5,13 +5,16 @@ RSpec.describe Admin::StaffActionLogsController do
fab!(:moderator) { Fabricate(:moderator) }
fab!(:user) { Fabricate(:user) }
- describe '#index' do
+ describe "#index" do
shared_examples "staff action logs accessible" do
- it 'returns logs' do
+ it "returns logs" do
topic = Fabricate(:topic)
StaffActionLogger.new(Discourse.system_user).log_topic_delete_recover(topic, "delete_topic")
- get "/admin/logs/staff_action_logs.json", params: { action_id: UserHistory.actions[:delete_topic] }
+ get "/admin/logs/staff_action_logs.json",
+ params: {
+ action_id: UserHistory.actions[:delete_topic],
+ }
json = response.parsed_body
expect(response.status).to eq(200)
@@ -20,7 +23,8 @@ RSpec.describe Admin::StaffActionLogsController do
expect(json["staff_action_logs"][0]["action_name"]).to eq("delete_topic")
expect(json["extras"]["user_history_actions"]).to include(
- "id" => 'delete_topic', "action_id" => UserHistory.actions[:delete_topic]
+ "id" => "delete_topic",
+ "action_id" => UserHistory.actions[:delete_topic],
)
end
end
@@ -30,10 +34,16 @@ RSpec.describe Admin::StaffActionLogsController do
include_examples "staff action logs accessible"
- it 'generates logs with pages' do
- 1.upto(4).each do |idx|
- StaffActionLogger.new(Discourse.system_user).log_site_setting_change("title", "value #{idx - 1}", "value #{idx}")
- end
+ it "generates logs with pages" do
+ 1
+ .upto(4)
+ .each do |idx|
+ StaffActionLogger.new(Discourse.system_user).log_site_setting_change(
+ "title",
+ "value #{idx - 1}",
+ "value #{idx}",
+ )
+ end
get "/admin/logs/staff_action_logs.json", params: { limit: 3 }
@@ -50,19 +60,19 @@ RSpec.describe Admin::StaffActionLogsController do
expect(json["staff_action_logs"][0]["new_value"]).to eq("value 1")
end
- context 'when staff actions are extended' do
+ context "when staff actions are extended" do
let(:plugin_extended_action) { :confirmed_ham }
before { UserHistory.stubs(:staff_actions).returns([plugin_extended_action]) }
after { UserHistory.unstub(:staff_actions) }
- it 'Uses the custom_staff id' do
+ it "Uses the custom_staff id" do
get "/admin/logs/staff_action_logs.json", params: {}
json = response.parsed_body
- action = json['extras']['user_history_actions'].first
+ action = json["extras"]["user_history_actions"].first
- expect(action['id']).to eq plugin_extended_action.to_s
- expect(action['action_id']).to eq UserHistory.actions[:custom_staff]
+ expect(action["id"]).to eq plugin_extended_action.to_s
+ expect(action["action_id"]).to eq UserHistory.actions[:custom_staff]
end
end
end
@@ -74,10 +84,13 @@ RSpec.describe Admin::StaffActionLogsController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
it "denies access with a 404 response" do
- get "/admin/logs/staff_action_logs.json", params: { action_id: UserHistory.actions[:delete_topic] }
+ get "/admin/logs/staff_action_logs.json",
+ params: {
+ action_id: UserHistory.actions[:delete_topic],
+ }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -85,19 +98,18 @@ RSpec.describe Admin::StaffActionLogsController do
end
end
- describe '#diff' do
+ describe "#diff" do
shared_examples "theme diffs accessible" do
- it 'generates diffs for theme changes' do
+ it "generates diffs for theme changes" do
theme = Fabricate(:theme)
- theme.set_field(target: :mobile, name: :scss, value: 'body {.up}')
- theme.set_field(target: :common, name: :scss, value: 'omit-dupe')
+ theme.set_field(target: :mobile, name: :scss, value: "body {.up}")
+ theme.set_field(target: :common, name: :scss, value: "omit-dupe")
original_json = ThemeSerializer.new(theme, root: false).to_json
- theme.set_field(target: :mobile, name: :scss, value: 'body {.down}')
+ theme.set_field(target: :mobile, name: :scss, value: "body {.down}")
- record = StaffActionLogger.new(Discourse.system_user)
- .log_theme_change(original_json, theme)
+ record = StaffActionLogger.new(Discourse.system_user).log_theme_change(original_json, theme)
get "/admin/logs/staff_action_logs/#{record.id}/diff.json"
expect(response.status).to eq(200)
@@ -115,7 +127,7 @@ RSpec.describe Admin::StaffActionLogsController do
include_examples "theme diffs accessible"
- it 'is not erroring when current value is empty' do
+ it "is not erroring when current value is empty" do
theme = Fabricate(:theme)
StaffActionLogger.new(admin).log_theme_destroy(theme)
get "/admin/logs/staff_action_logs/#{UserHistory.last.id}/diff.json"
@@ -130,7 +142,7 @@ RSpec.describe Admin::StaffActionLogsController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
it "denies access with a 404 response" do
theme = Fabricate(:theme)
diff --git a/spec/requests/admin/themes_controller_spec.rb b/spec/requests/admin/themes_controller_spec.rb
index 9d2585cfa50..0b09e698e3b 100644
--- a/spec/requests/admin/themes_controller_spec.rb
+++ b/spec/requests/admin/themes_controller_spec.rb
@@ -6,26 +6,20 @@ RSpec.describe Admin::ThemesController do
fab!(:user) { Fabricate(:user) }
let! :repo do
- setup_git_repo(
- "about.json" => { name: "discourse-branch-header" }.to_json,
- )
+ setup_git_repo("about.json" => { name: "discourse-branch-header" }.to_json)
end
let! :repo_url do
- MockGitImporter.register('https://github.com/discourse/discourse-brand-header.git', repo)
+ MockGitImporter.register("https://github.com/discourse/discourse-brand-header.git", repo)
end
- around(:each) do |group|
- MockGitImporter.with_mock do
- group.run
- end
- end
+ around(:each) { |group| MockGitImporter.with_mock { group.run } }
- describe '#generate_key_pair' do
+ describe "#generate_key_pair" do
context "when logged in as an admin" do
before { sign_in(admin) }
- it 'can generate key pairs' do
+ it "can generate key pairs" do
post "/admin/themes/generate_key_pair.json"
expect(response.status).to eq(200)
json = response.parsed_body
@@ -51,23 +45,21 @@ RSpec.describe Admin::ThemesController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "key pair generation not allowed"
end
end
- describe '#upload_asset' do
+ describe "#upload_asset" do
let(:file) { file_from_fixtures("fake.woff2", "woff2") }
let(:filename) { File.basename(file) }
- let(:upload) do
- Rack::Test::UploadedFile.new(file)
- end
+ let(:upload) { Rack::Test::UploadedFile.new(file) }
context "when logged in as an admin" do
before { sign_in(admin) }
- it 'can create a theme upload' do
+ it "can create a theme upload" do
post "/admin/themes/upload_asset.json", params: { file: upload }
expect(response.status).to eq(201)
@@ -111,28 +103,32 @@ RSpec.describe Admin::ThemesController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "theme asset upload not allowed"
end
end
- describe '#export' do
+ describe "#export" do
context "when logged in as an admin" do
before { sign_in(admin) }
it "exports correctly" do
theme = Fabricate(:theme, name: "Awesome Theme")
- theme.set_field(target: :common, name: :scss, value: '.body{color: black;}')
- theme.set_field(target: :desktop, name: :after_header, value: 'test ')
- theme.set_field(target: :extra_js, name: "discourse/controller/blah", value: 'console.log("test");')
+ theme.set_field(target: :common, name: :scss, value: ".body{color: black;}")
+ theme.set_field(target: :desktop, name: :after_header, value: "test ")
+ theme.set_field(
+ target: :extra_js,
+ name: "discourse/controller/blah",
+ value: 'console.log("test");',
+ )
theme.save!
get "/admin/customize/themes/#{theme.id}/export"
expect(response.status).to eq(200)
# Save the output in a temp file (automatically cleaned up)
- file = Tempfile.new('archive.zip')
+ file = Tempfile.new("archive.zip")
file.write(response.body)
file.rewind
uploaded_file = Rack::Test::UploadedFile.new(file.path, "application/zip")
@@ -167,39 +163,45 @@ RSpec.describe Admin::ThemesController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "theme export not allowed"
end
end
- describe '#import' do
+ describe "#import" do
let(:theme_json_file) do
- Rack::Test::UploadedFile.new(file_from_fixtures("sam-s-simple-theme.dcstyle.json", "json"), "application/json")
+ Rack::Test::UploadedFile.new(
+ file_from_fixtures("sam-s-simple-theme.dcstyle.json", "json"),
+ "application/json",
+ )
end
let(:theme_archive) do
- Rack::Test::UploadedFile.new(file_from_fixtures("discourse-test-theme.zip", "themes"), "application/zip")
+ Rack::Test::UploadedFile.new(
+ file_from_fixtures("discourse-test-theme.zip", "themes"),
+ "application/zip",
+ )
end
- let(:image) do
- file_from_fixtures("logo.png")
- end
+ let(:image) { file_from_fixtures("logo.png") }
context "when logged in as an admin" do
before { sign_in(admin) }
- context 'when theme allowlist mode is enabled' do
+ context "when theme allowlist mode is enabled" do
before do
- global_setting :allowed_theme_repos, "https://github.com/discourse/discourse-brand-header.git"
+ global_setting :allowed_theme_repos,
+ "https://github.com/discourse/discourse-brand-header.git"
end
it "allows allowlisted imports" do
expect(Theme.allowed_remote_theme_ids.length).to eq(0)
- post "/admin/themes/import.json", params: {
- remote: ' https://github.com/discourse/discourse-brand-header.git '
- }
+ post "/admin/themes/import.json",
+ params: {
+ remote: " https://github.com/discourse/discourse-brand-header.git ",
+ }
expect(Theme.allowed_remote_theme_ids.length).to eq(1)
expect(response.status).to eq(201)
@@ -207,12 +209,14 @@ RSpec.describe Admin::ThemesController do
it "prevents adding disallowed themes" do
RemoteTheme.stubs(:import_theme)
- remote = ' https://bad.com/discourse/discourse-brand-header.git '
+ remote = " https://bad.com/discourse/discourse-brand-header.git "
post "/admin/themes/import.json", params: { remote: remote }
expect(response.status).to eq(403)
- expect(response.parsed_body['errors']).to include(I18n.t("themes.import_error.not_allowed_theme", { repo: remote.strip }))
+ expect(response.parsed_body["errors"]).to include(
+ I18n.t("themes.import_error.not_allowed_theme", { repo: remote.strip }),
+ )
end
it "bans json file import" do
@@ -221,44 +225,44 @@ RSpec.describe Admin::ThemesController do
end
end
- it 'can import a theme from Git' do
+ it "can import a theme from Git" do
RemoteTheme.stubs(:import_theme)
- post "/admin/themes/import.json", params: {
- remote: ' https://github.com/discourse/discourse-brand-header.git '
- }
+ post "/admin/themes/import.json",
+ params: {
+ remote: " https://github.com/discourse/discourse-brand-header.git ",
+ }
expect(response.status).to eq(201)
end
- it 'fails to import with a failing status' do
- post "/admin/themes/import.json", params: {
- remote: 'non-existant'
- }
+ it "fails to import with a failing status" do
+ post "/admin/themes/import.json", params: { remote: "non-existant" }
expect(response.status).to eq(422)
end
- it 'can lookup a private key by public key' do
- Discourse.redis.setex('ssh_key_abcdef', 1.hour, 'rsa private key')
+ it "can lookup a private key by public key" do
+ Discourse.redis.setex("ssh_key_abcdef", 1.hour, "rsa private key")
ThemeStore::GitImporter.any_instance.stubs(:import!)
RemoteTheme.stubs(:extract_theme_info).returns(
- 'name' => 'discourse-brand-header',
- 'component' => true
+ "name" => "discourse-brand-header",
+ "component" => true,
)
RemoteTheme.any_instance.stubs(:update_from_remote)
- post '/admin/themes/import.json', params: {
- remote: ' https://github.com/discourse/discourse-brand-header.git ',
- public_key: 'abcdef',
- }
+ post "/admin/themes/import.json",
+ params: {
+ remote: " https://github.com/discourse/discourse-brand-header.git ",
+ public_key: "abcdef",
+ }
- expect(RemoteTheme.last.private_key).to eq('rsa private key')
+ expect(RemoteTheme.last.private_key).to eq("rsa private key")
expect(response.status).to eq(201)
end
- it 'imports a theme' do
+ it "imports a theme" do
post "/admin/themes/import.json", params: { theme: theme_json_file }
expect(response.status).to eq(201)
@@ -270,41 +274,43 @@ RSpec.describe Admin::ThemesController do
expect(UserHistory.where(action: UserHistory.actions[:change_theme]).count).to eq(1)
end
- it 'can fail if theme is not accessible' do
- post "/admin/themes/import.json", params: {
- remote: 'git@github.com:discourse/discourse-inexistent-theme.git'
- }
+ it "can fail if theme is not accessible" do
+ post "/admin/themes/import.json",
+ params: {
+ remote: "git@github.com:discourse/discourse-inexistent-theme.git",
+ }
expect(response.status).to eq(422)
expect(response.parsed_body["errors"]).to contain_exactly(I18n.t("themes.import_error.git"))
end
- it 'can force install theme' do
- post "/admin/themes/import.json", params: {
- remote: 'git@github.com:discourse/discourse-inexistent-theme.git',
- force: true
- }
+ it "can force install theme" do
+ post "/admin/themes/import.json",
+ params: {
+ remote: "git@github.com:discourse/discourse-inexistent-theme.git",
+ force: true,
+ }
expect(response.status).to eq(201)
expect(response.parsed_body["theme"]["name"]).to eq("discourse-inexistent-theme")
end
- it 'fails to import with an error if uploads are not allowed' do
+ it "fails to import with an error if uploads are not allowed" do
SiteSetting.theme_authorized_extensions = "nothing"
- expect do
- post "/admin/themes/import.json", params: { theme: theme_archive }
- end.to change { Theme.count }.by (0)
+ expect do post "/admin/themes/import.json", params: { theme: theme_archive } end.to change {
+ Theme.count
+ }.by (0)
expect(response.status).to eq(422)
end
- it 'imports a theme from an archive' do
+ it "imports a theme from an archive" do
_existing_theme = Fabricate(:theme, name: "Header Icons")
- expect do
- post "/admin/themes/import.json", params: { theme: theme_archive }
- end.to change { Theme.count }.by (1)
+ expect do post "/admin/themes/import.json", params: { theme: theme_archive } end.to change {
+ Theme.count
+ }.by (1)
expect(response.status).to eq(201)
json = response.parsed_body
@@ -314,7 +320,7 @@ RSpec.describe Admin::ThemesController do
expect(UserHistory.where(action: UserHistory.actions[:change_theme]).count).to eq(1)
end
- it 'updates an existing theme from an archive by name' do
+ it "updates an existing theme from an archive by name" do
# Old theme CLI method, remove Jan 2020
_existing_theme = Fabricate(:theme, name: "Header Icons")
@@ -329,16 +335,21 @@ RSpec.describe Admin::ThemesController do
expect(UserHistory.where(action: UserHistory.actions[:change_theme]).count).to eq(1)
end
- it 'updates an existing theme from an archive by id' do
+ it "updates an existing theme from an archive by id" do
# Used by theme CLI
_existing_theme = Fabricate(:theme, name: "Header Icons")
other_existing_theme = Fabricate(:theme, name: "Some other name")
- messages = MessageBus.track_publish do
- expect do
- post "/admin/themes/import.json", params: { bundle: theme_archive, theme_id: other_existing_theme.id }
- end.to change { Theme.count }.by (0)
- end
+ messages =
+ MessageBus.track_publish do
+ expect do
+ post "/admin/themes/import.json",
+ params: {
+ bundle: theme_archive,
+ theme_id: other_existing_theme.id,
+ }
+ end.to change { Theme.count }.by (0)
+ end
expect(response.status).to eq(201)
json = response.parsed_body
@@ -354,7 +365,7 @@ RSpec.describe Admin::ThemesController do
expect(UserHistory.where(action: UserHistory.actions[:change_theme]).count).to eq(1)
end
- it 'creates a new theme when id specified as nil' do
+ it "creates a new theme when id specified as nil" do
# Used by theme CLI
existing_theme = Fabricate(:theme, name: "Header Icons")
@@ -388,30 +399,31 @@ RSpec.describe Admin::ThemesController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "theme import not allowed"
end
end
- describe '#index' do
+ describe "#index" do
context "when logged in as an admin" do
- before { sign_in(admin) }
+ before { sign_in(admin) }
- it 'correctly returns themes' do
+ it "correctly returns themes" do
ColorScheme.destroy_all
Theme.destroy_all
theme = Fabricate(:theme)
- theme.set_field(target: :common, name: :scss, value: '.body{color: black;}')
- theme.set_field(target: :desktop, name: :after_header, value: 'test ')
+ theme.set_field(target: :common, name: :scss, value: ".body{color: black;}")
+ theme.set_field(target: :desktop, name: :after_header, value: "test ")
- theme.remote_theme = RemoteTheme.new(
- remote_url: 'awesome.git',
- remote_version: '7',
- local_version: '8',
- remote_updated_at: Time.zone.now
- )
+ theme.remote_theme =
+ RemoteTheme.new(
+ remote_url: "awesome.git",
+ remote_version: "7",
+ local_version: "8",
+ remote_updated_at: Time.zone.now,
+ )
theme.save!
@@ -447,23 +459,24 @@ RSpec.describe Admin::ThemesController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "themes inaccessible"
end
end
- describe '#create' do
+ describe "#create" do
context "when logged in as an admin" do
- before { sign_in(admin) }
+ before { sign_in(admin) }
- it 'creates a theme' do
- post "/admin/themes.json", params: {
- theme: {
- name: 'my test name',
- theme_fields: [name: 'scss', target: 'common', value: 'body{color: red;}']
- }
- }
+ it "creates a theme" do
+ post "/admin/themes.json",
+ params: {
+ theme: {
+ name: "my test name",
+ theme_fields: [name: "scss", target: "common", value: "body{color: red;}"],
+ },
+ }
expect(response.status).to eq(201)
@@ -477,12 +490,13 @@ RSpec.describe Admin::ThemesController do
shared_examples "theme creation not allowed" do
it "prevents creation with a 404 response" do
expect do
- post "/admin/themes.json", params: {
- theme: {
- name: 'my test name',
- theme_fields: [name: 'scss', target: 'common', value: 'body{color: red;}']
- }
- }
+ post "/admin/themes.json",
+ params: {
+ theme: {
+ name: "my test name",
+ theme_fields: [name: "scss", target: "common", value: "body{color: red;}"],
+ },
+ }
end.not_to change { Theme.count }
expect(response.status).to eq(404)
@@ -497,88 +511,89 @@ RSpec.describe Admin::ThemesController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "theme creation not allowed"
end
end
- describe '#update' do
+ describe "#update" do
let!(:theme) { Fabricate(:theme) }
context "when logged in as an admin" do
- before { sign_in(admin) }
+ before { sign_in(admin) }
- it 'returns the right response when an invalid id is given' do
+ it "returns the right response when an invalid id is given" do
put "/admin/themes/99999.json"
expect(response.status).to eq(400)
end
- it 'can change default theme' do
+ it "can change default theme" do
SiteSetting.default_theme_id = -1
- put "/admin/themes/#{theme.id}.json", params: {
- id: theme.id, theme: { default: true }
- }
+ put "/admin/themes/#{theme.id}.json", params: { id: theme.id, theme: { default: true } }
expect(response.status).to eq(200)
expect(SiteSetting.default_theme_id).to eq(theme.id)
end
- it 'can unset default theme' do
+ it "can unset default theme" do
SiteSetting.default_theme_id = theme.id
- put "/admin/themes/#{theme.id}.json", params: {
- theme: { default: false }
- }
+ put "/admin/themes/#{theme.id}.json", params: { theme: { default: false } }
expect(response.status).to eq(200)
expect(SiteSetting.default_theme_id).to eq(-1)
end
- context 'when theme allowlist mode is enabled' do
+ context "when theme allowlist mode is enabled" do
before do
global_setting :allowed_theme_repos, " https://magic.com/repo.git, https://x.com/git"
end
- it 'unconditionally bans theme_fields from updating' do
+ it "unconditionally bans theme_fields from updating" do
r = RemoteTheme.create!(remote_url: "https://magic.com/repo.git")
theme.update!(remote_theme_id: r.id)
- put "/admin/themes/#{theme.id}.json", params: {
- theme: {
- name: 'my test name',
- theme_fields: [
- { name: 'scss', target: 'common', value: '' },
- { name: 'scss', target: 'desktop', value: 'body{color: blue;}' },
- ]
- }
- }
+ put "/admin/themes/#{theme.id}.json",
+ params: {
+ theme: {
+ name: "my test name",
+ theme_fields: [
+ { name: "scss", target: "common", value: "" },
+ { name: "scss", target: "desktop", value: "body{color: blue;}" },
+ ],
+ },
+ }
expect(response.status).to eq(403)
end
end
- it 'updates a theme' do
- theme.set_field(target: :common, name: :scss, value: '.body{color: black;}')
+ it "updates a theme" do
+ theme.set_field(target: :common, name: :scss, value: ".body{color: black;}")
theme.save
child_theme = Fabricate(:theme, component: true)
- upload = UploadCreator.new(file_from_fixtures("logo.png"), "logo.png").create_for(Discourse.system_user.id)
+ upload =
+ UploadCreator.new(file_from_fixtures("logo.png"), "logo.png").create_for(
+ Discourse.system_user.id,
+ )
- put "/admin/themes/#{theme.id}.json", params: {
- theme: {
- child_theme_ids: [child_theme.id],
- name: 'my test name',
- theme_fields: [
- { name: 'scss', target: 'common', value: '' },
- { name: 'scss', target: 'desktop', value: 'body{color: blue;}' },
- { name: 'bob', target: 'common', value: '', type_id: 2, upload_id: upload.id },
- ]
- }
- }
+ put "/admin/themes/#{theme.id}.json",
+ params: {
+ theme: {
+ child_theme_ids: [child_theme.id],
+ name: "my test name",
+ theme_fields: [
+ { name: "scss", target: "common", value: "" },
+ { name: "scss", target: "desktop", value: "body{color: blue;}" },
+ { name: "bob", target: "common", value: "", type_id: 2, upload_id: upload.id },
+ ],
+ },
+ }
expect(response.status).to eq(200)
@@ -586,27 +601,28 @@ RSpec.describe Admin::ThemesController do
fields = json["theme"]["theme_fields"].sort { |a, b| a["value"] <=> b["value"] }
- expect(fields[0]["value"]).to eq('')
+ expect(fields[0]["value"]).to eq("")
expect(fields[0]["upload_id"]).to eq(upload.id)
- expect(fields[1]["value"]).to eq('body{color: blue;}')
+ expect(fields[1]["value"]).to eq("body{color: blue;}")
expect(fields.length).to eq(2)
expect(json["theme"]["child_themes"].length).to eq(1)
expect(UserHistory.where(action: UserHistory.actions[:change_theme]).count).to eq(1)
end
- it 'prevents theme update when using ember css selectors' do
+ it "prevents theme update when using ember css selectors" do
child_theme = Fabricate(:theme, component: true)
- put "/admin/themes/#{theme.id}.json", params: {
- theme: {
- child_theme_ids: [child_theme.id],
- name: 'my test name',
- theme_fields: [
- { name: 'scss', target: 'common', value: '' },
- { name: 'scss', target: 'desktop', value: '.ember-view{color: blue;}' },
- ]
- }
- }
+ put "/admin/themes/#{theme.id}.json",
+ params: {
+ theme: {
+ child_theme_ids: [child_theme.id],
+ name: "my test name",
+ theme_fields: [
+ { name: "scss", target: "common", value: "" },
+ { name: "scss", target: "desktop", value: ".ember-view{color: blue;}" },
+ ],
+ },
+ }
expect(response.status).to eq(200)
@@ -615,16 +631,17 @@ RSpec.describe Admin::ThemesController do
fields = json["theme"]["theme_fields"].sort { |a, b| a["value"] <=> b["value"] }
expect(fields[0]["error"]).to eq(I18n.t("themes.ember_selector_error"))
- put "/admin/themes/#{theme.id}.json", params: {
- theme: {
- child_theme_ids: [child_theme.id],
- name: 'my test name',
- theme_fields: [
- { name: 'scss', target: 'common', value: '' },
- { name: 'scss', target: 'desktop', value: '#ember392{color: blue;}' },
- ]
- }
- }
+ put "/admin/themes/#{theme.id}.json",
+ params: {
+ theme: {
+ child_theme_ids: [child_theme.id],
+ name: "my test name",
+ theme_fields: [
+ { name: "scss", target: "common", value: "" },
+ { name: "scss", target: "desktop", value: "#ember392{color: blue;}" },
+ ],
+ },
+ }
expect(response.status).to eq(200)
json = response.parsed_body
@@ -633,59 +650,67 @@ RSpec.describe Admin::ThemesController do
expect(fields[0]["error"]).to eq(I18n.t("themes.ember_selector_error"))
end
- it 'blocks remote theme fields from being locally edited' do
+ it "blocks remote theme fields from being locally edited" do
r = RemoteTheme.create!(remote_url: "https://magic.com/repo.git")
theme.update!(remote_theme_id: r.id)
- put "/admin/themes/#{theme.id}.json", params: {
- theme: {
- theme_fields: [
- { name: 'scss', target: 'common', value: '' },
- { name: 'header', target: 'common', value: 'filename.jpg', upload_id: 4 }
- ]
- }
- }
+ put "/admin/themes/#{theme.id}.json",
+ params: {
+ theme: {
+ theme_fields: [
+ { name: "scss", target: "common", value: "" },
+ { name: "header", target: "common", value: "filename.jpg", upload_id: 4 },
+ ],
+ },
+ }
expect(response.status).to eq(403)
end
- it 'allows zip-imported theme fields to be locally edited' do
+ it "allows zip-imported theme fields to be locally edited" do
r = RemoteTheme.create!(remote_url: "")
theme.update!(remote_theme_id: r.id)
- put "/admin/themes/#{theme.id}.json", params: {
- theme: {
- theme_fields: [
- { name: 'scss', target: 'common', value: '' },
- { name: 'header', target: 'common', value: 'filename.jpg', upload_id: 4 }
- ]
- }
- }
+ put "/admin/themes/#{theme.id}.json",
+ params: {
+ theme: {
+ theme_fields: [
+ { name: "scss", target: "common", value: "" },
+ { name: "header", target: "common", value: "filename.jpg", upload_id: 4 },
+ ],
+ },
+ }
expect(response.status).to eq(200)
end
- it 'updates a child theme' do
+ it "updates a child theme" do
child_theme = Fabricate(:theme, component: true)
- put "/admin/themes/#{child_theme.id}.json", params: {
- theme: {
- parent_theme_ids: [theme.id],
- }
- }
+ put "/admin/themes/#{child_theme.id}.json",
+ params: {
+ theme: {
+ parent_theme_ids: [theme.id],
+ },
+ }
expect(child_theme.parent_themes).to eq([theme])
end
- it 'can update translations' do
- theme.set_field(target: :translations, name: :en, value: { en: { somegroup: { somestring: "defaultstring" } } }.deep_stringify_keys.to_yaml)
+ it "can update translations" do
+ theme.set_field(
+ target: :translations,
+ name: :en,
+ value: { en: { somegroup: { somestring: "defaultstring" } } }.deep_stringify_keys.to_yaml,
+ )
theme.save!
- put "/admin/themes/#{theme.id}.json", params: {
- theme: {
- translations: {
- "somegroup.somestring" => "overriddenstring"
+ put "/admin/themes/#{theme.id}.json",
+ params: {
+ theme: {
+ translations: {
+ "somegroup.somestring" => "overriddenstring",
+ },
+ },
}
- }
- }
# Response correct
expect(response.status).to eq(200)
@@ -695,16 +720,19 @@ RSpec.describe Admin::ThemesController do
# Database correct
theme.reload
expect(theme.theme_translation_overrides.count).to eq(1)
- expect(theme.theme_translation_overrides.first.translation_key).to eq("somegroup.somestring")
+ expect(theme.theme_translation_overrides.first.translation_key).to eq(
+ "somegroup.somestring",
+ )
# Set back to default
- put "/admin/themes/#{theme.id}.json", params: {
- theme: {
- translations: {
- "somegroup.somestring" => "defaultstring"
+ put "/admin/themes/#{theme.id}.json",
+ params: {
+ theme: {
+ translations: {
+ "somegroup.somestring" => "defaultstring",
+ },
+ },
}
- }
- }
# Response correct
expect(response.status).to eq(200)
json = response.parsed_body
@@ -715,37 +743,37 @@ RSpec.describe Admin::ThemesController do
expect(theme.theme_translation_overrides.count).to eq(0)
end
- it 'checking for updates saves the remote_theme record' do
- theme.remote_theme = RemoteTheme.create!(remote_url: "http://discourse.org", remote_version: "a", local_version: "a", commits_behind: 0)
+ it "checking for updates saves the remote_theme record" do
+ theme.remote_theme =
+ RemoteTheme.create!(
+ remote_url: "http://discourse.org",
+ remote_version: "a",
+ local_version: "a",
+ commits_behind: 0,
+ )
theme.save!
ThemeStore::GitImporter.any_instance.stubs(:import!)
ThemeStore::GitImporter.any_instance.stubs(:commits_since).returns(["b", 1])
- put "/admin/themes/#{theme.id}.json", params: {
- theme: {
- remote_check: true
- }
- }
+ put "/admin/themes/#{theme.id}.json", params: { theme: { remote_check: true } }
theme.reload
expect(theme.remote_theme.remote_version).to eq("b")
expect(theme.remote_theme.commits_behind).to eq(1)
end
- it 'can disable component' do
+ it "can disable component" do
child = Fabricate(:theme, component: true)
- put "/admin/themes/#{child.id}.json", params: {
- theme: {
- enabled: false
- }
- }
+ put "/admin/themes/#{child.id}.json", params: { theme: { enabled: false } }
expect(response.status).to eq(200)
json = response.parsed_body
expect(json["theme"]["enabled"]).to eq(false)
- expect(UserHistory.where(
- context: child.id.to_s,
- action: UserHistory.actions[:disable_theme_component]
- ).size).to eq(1)
+ expect(
+ UserHistory.where(
+ context: child.id.to_s,
+ action: UserHistory.actions[:disable_theme_component],
+ ).size,
+ ).to eq(1)
expect(json["theme"]["disabled_by"]["id"]).to eq(admin.id)
end
@@ -753,78 +781,77 @@ RSpec.describe Admin::ThemesController do
child = Fabricate(:theme, component: true)
UserHistory.destroy_all
- put "/admin/themes/#{child.id}.json", params: {
- theme: {
- enabled: false
- }
- }
+ put "/admin/themes/#{child.id}.json", params: { theme: { enabled: false } }
expect(response.status).to eq(200)
- expect(UserHistory.where(
- context: child.id.to_s,
- action: UserHistory.actions[:disable_theme_component]
- ).size).to eq(1)
- expect(UserHistory.where(
- context: child.id.to_s,
- action: UserHistory.actions[:enable_theme_component]
- ).size).to eq(0)
+ expect(
+ UserHistory.where(
+ context: child.id.to_s,
+ action: UserHistory.actions[:disable_theme_component],
+ ).size,
+ ).to eq(1)
+ expect(
+ UserHistory.where(
+ context: child.id.to_s,
+ action: UserHistory.actions[:enable_theme_component],
+ ).size,
+ ).to eq(0)
- put "/admin/themes/#{child.id}.json", params: {
- theme: {
- enabled: true
- }
- }
+ put "/admin/themes/#{child.id}.json", params: { theme: { enabled: true } }
expect(response.status).to eq(200)
json = response.parsed_body
- expect(UserHistory.where(
- context: child.id.to_s,
- action: UserHistory.actions[:disable_theme_component]
- ).size).to eq(1)
- expect(UserHistory.where(
- context: child.id.to_s,
- action: UserHistory.actions[:enable_theme_component]
- ).size).to eq(1)
+ expect(
+ UserHistory.where(
+ context: child.id.to_s,
+ action: UserHistory.actions[:disable_theme_component],
+ ).size,
+ ).to eq(1)
+ expect(
+ UserHistory.where(
+ context: child.id.to_s,
+ action: UserHistory.actions[:enable_theme_component],
+ ).size,
+ ).to eq(1)
expect(json["theme"]["disabled_by"]).to eq(nil)
expect(json["theme"]["enabled"]).to eq(true)
end
- it 'handles import errors on update' do
+ it "handles import errors on update" do
theme.create_remote_theme!(remote_url: "https://example.com/repository")
theme.save!
# RemoteTheme is extensively tested, and setting up the test scaffold is a large overhead
# So use a stub here to test the controller
- RemoteTheme.any_instance.stubs(:update_from_remote).raises(RemoteTheme::ImportError.new("error message"))
- put "/admin/themes/#{theme.id}.json", params: {
- theme: { remote_update: true }
- }
+ RemoteTheme
+ .any_instance
+ .stubs(:update_from_remote)
+ .raises(RemoteTheme::ImportError.new("error message"))
+ put "/admin/themes/#{theme.id}.json", params: { theme: { remote_update: true } }
expect(response.status).to eq(422)
expect(response.parsed_body["errors"].first).to eq("error message")
end
- it 'returns the right error message' do
+ it "returns the right error message" do
theme.update!(component: true)
- put "/admin/themes/#{theme.id}.json", params: {
- theme: { default: true }
- }
+ put "/admin/themes/#{theme.id}.json", params: { theme: { default: true } }
expect(response.status).to eq(400)
- expect(response.parsed_body["errors"].first).to include(I18n.t("themes.errors.component_no_default"))
+ expect(response.parsed_body["errors"].first).to include(
+ I18n.t("themes.errors.component_no_default"),
+ )
end
- it 'prevents converting the default theme to a component' do
+ it "prevents converting the default theme to a component" do
SiteSetting.default_theme_id = theme.id
- put "/admin/themes/#{theme.id}.json", params: {
- theme: { component: true }
- }
+ put "/admin/themes/#{theme.id}.json", params: { theme: { component: true } }
# should this error message be localized? InvalidParameters :component
expect(response.status).to eq(400)
- expect(response.parsed_body["errors"].first).to include('component')
+ expect(response.parsed_body["errors"].first).to include("component")
end
end
@@ -832,9 +859,7 @@ RSpec.describe Admin::ThemesController do
it "prevents updates with a 404 response" do
SiteSetting.default_theme_id = -1
- put "/admin/themes/#{theme.id}.json", params: {
- id: theme.id, theme: { default: true }
- }
+ put "/admin/themes/#{theme.id}.json", params: { id: theme.id, theme: { default: true } }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -849,29 +874,37 @@ RSpec.describe Admin::ThemesController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "theme update not allowed"
end
end
- describe '#destroy' do
+ describe "#destroy" do
let!(:theme) { Fabricate(:theme) }
context "when logged in as an admin" do
before { sign_in(admin) }
- it 'returns the right response when an invalid id is given' do
+ it "returns the right response when an invalid id is given" do
delete "/admin/themes/9999.json"
expect(response.status).to eq(400)
end
it "deletes the field's javascript cache" do
- theme.set_field(target: :common, name: :header, value: '')
+ theme.set_field(
+ target: :common,
+ name: :header,
+ value: '',
+ )
theme.save!
- javascript_cache = theme.theme_fields.find_by(target_id: Theme.targets[:common], name: :header).javascript_cache
+ javascript_cache =
+ theme
+ .theme_fields
+ .find_by(target_id: Theme.targets[:common], name: :header)
+ .javascript_cache
expect(javascript_cache).to_not eq(nil)
delete "/admin/themes/#{theme.id}.json"
@@ -899,13 +932,13 @@ RSpec.describe Admin::ThemesController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "theme deletion not allowed"
end
end
- describe '#preview' do
+ describe "#preview" do
context "when logged in as an admin" do
before { sign_in(admin) }
@@ -934,13 +967,13 @@ RSpec.describe Admin::ThemesController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "theme previews inaccessible"
end
end
- describe '#update_single_setting' do
+ describe "#update_single_setting" do
let(:theme) { Fabricate(:theme) }
before do
@@ -952,10 +985,7 @@ RSpec.describe Admin::ThemesController do
before { sign_in(admin) }
it "should update a theme setting" do
- put "/admin/themes/#{theme.id}/setting.json", params: {
- name: "bg",
- value: "green"
- }
+ put "/admin/themes/#{theme.id}/setting.json", params: { name: "bg", value: "green" }
expect(response.status).to eq(200)
expect(response.parsed_body["bg"]).to eq("green")
@@ -964,9 +994,7 @@ RSpec.describe Admin::ThemesController do
expect(theme.cached_settings[:bg]).to eq("green")
user_history = UserHistory.last
- expect(user_history.action).to eq(
- UserHistory.actions[:change_theme_setting]
- )
+ expect(user_history.action).to eq(UserHistory.actions[:change_theme_setting])
end
it "should clear a theme setting" do
@@ -980,10 +1008,7 @@ RSpec.describe Admin::ThemesController do
shared_examples "theme update not allowed" do
it "prevents updates with a 404 response" do
- put "/admin/themes/#{theme.id}/setting.json", params: {
- name: "bg",
- value: "green"
- }
+ put "/admin/themes/#{theme.id}/setting.json", params: { name: "bg", value: "green" }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -1000,7 +1025,7 @@ RSpec.describe Admin::ThemesController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "theme update not allowed"
end
diff --git a/spec/requests/admin/user_fields_controller_spec.rb b/spec/requests/admin/user_fields_controller_spec.rb
index 450c689cee1..a2bc2a3803b 100644
--- a/spec/requests/admin/user_fields_controller_spec.rb
+++ b/spec/requests/admin/user_fields_controller_spec.rb
@@ -5,15 +5,20 @@ RSpec.describe Admin::UserFieldsController do
fab!(:moderator) { Fabricate(:moderator) }
fab!(:user) { Fabricate(:user) }
- describe '#create' do
+ describe "#create" do
context "when logged in as an admin" do
before { sign_in(admin) }
it "creates a user field" do
expect {
- post "/admin/customize/user_fields.json", params: {
- user_field: { name: 'hello', description: 'hello desc', field_type: 'text' }
- }
+ post "/admin/customize/user_fields.json",
+ params: {
+ user_field: {
+ name: "hello",
+ description: "hello desc",
+ field_type: "text",
+ },
+ }
expect(response.status).to eq(200)
}.to change(UserField, :count).by(1)
@@ -21,14 +26,15 @@ RSpec.describe Admin::UserFieldsController do
it "creates a user field with options" do
expect do
- post "/admin/customize/user_fields.json", params: {
- user_field: {
- name: 'hello',
- description: 'hello desc',
- field_type: 'dropdown',
- options: ['a', 'b', 'c']
- }
- }
+ post "/admin/customize/user_fields.json",
+ params: {
+ user_field: {
+ name: "hello",
+ description: "hello desc",
+ field_type: "dropdown",
+ options: %w[a b c],
+ },
+ }
expect(response.status).to eq(200)
end.to change(UserField, :count).by(1)
@@ -40,9 +46,14 @@ RSpec.describe Admin::UserFieldsController do
shared_examples "user field creation not allowed" do
it "prevents creation with a 404 response" do
expect do
- post "/admin/customize/user_fields.json", params: {
- user_field: { name: 'hello', description: 'hello desc', field_type: 'text' }
- }
+ post "/admin/customize/user_fields.json",
+ params: {
+ user_field: {
+ name: "hello",
+ description: "hello desc",
+ field_type: "text",
+ },
+ }
end.not_to change { UserField.count }
expect(response.status).to eq(404)
@@ -57,13 +68,13 @@ RSpec.describe Admin::UserFieldsController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "user field creation not allowed"
end
end
- describe '#index' do
+ describe "#index" do
fab!(:user_field) { Fabricate(:user_field) }
context "when logged in as an admin" do
@@ -73,7 +84,7 @@ RSpec.describe Admin::UserFieldsController do
get "/admin/customize/user_fields.json"
expect(response.status).to eq(200)
json = response.parsed_body
- expect(json['user_fields']).to be_present
+ expect(json["user_fields"]).to be_present
end
end
@@ -83,7 +94,7 @@ RSpec.describe Admin::UserFieldsController do
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
- expect(response.parsed_body['user_fields']).to be_nil
+ expect(response.parsed_body["user_fields"]).to be_nil
end
end
@@ -94,13 +105,13 @@ RSpec.describe Admin::UserFieldsController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "user fields inaccessible"
end
end
- describe '#destroy' do
+ describe "#destroy" do
fab!(:user_field) { Fabricate(:user_field) }
context "when logged in as an admin" do
@@ -116,9 +127,9 @@ RSpec.describe Admin::UserFieldsController do
shared_examples "user field deletion not allowed" do
it "prevents deletion with a 404 response" do
- expect do
- delete "/admin/customize/user_fields/#{user_field.id}.json"
- end.not_to change { UserField.count }
+ expect do delete "/admin/customize/user_fields/#{user_field.id}.json" end.not_to change {
+ UserField.count
+ }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -132,69 +143,77 @@ RSpec.describe Admin::UserFieldsController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "user field deletion not allowed"
end
end
- describe '#update' do
+ describe "#update" do
fab!(:user_field) { Fabricate(:user_field) }
context "when logged in as an admin" do
before { sign_in(admin) }
it "updates the user field" do
- put "/admin/customize/user_fields/#{user_field.id}.json", params: {
- user_field: { name: 'fraggle', field_type: 'confirm', description: 'muppet' }
- }
+ put "/admin/customize/user_fields/#{user_field.id}.json",
+ params: {
+ user_field: {
+ name: "fraggle",
+ field_type: "confirm",
+ description: "muppet",
+ },
+ }
expect(response.status).to eq(200)
user_field.reload
- expect(user_field.name).to eq('fraggle')
- expect(user_field.field_type).to eq('confirm')
+ expect(user_field.name).to eq("fraggle")
+ expect(user_field.field_type).to eq("confirm")
end
it "updates the user field options" do
- put "/admin/customize/user_fields/#{user_field.id}.json", params: {
- user_field: {
- name: 'fraggle',
- field_type: 'dropdown',
- description: 'muppet',
- options: ['hello', 'hello', 'world']
- }
- }
+ put "/admin/customize/user_fields/#{user_field.id}.json",
+ params: {
+ user_field: {
+ name: "fraggle",
+ field_type: "dropdown",
+ description: "muppet",
+ options: %w[hello hello world],
+ },
+ }
expect(response.status).to eq(200)
user_field.reload
- expect(user_field.name).to eq('fraggle')
- expect(user_field.field_type).to eq('dropdown')
+ expect(user_field.name).to eq("fraggle")
+ expect(user_field.field_type).to eq("dropdown")
expect(user_field.user_field_options.size).to eq(2)
end
it "keeps options when updating the user field" do
- put "/admin/customize/user_fields/#{user_field.id}.json", params: {
- user_field: {
- name: 'fraggle',
- field_type: 'dropdown',
- description: 'muppet',
- options: ['hello', 'hello', 'world'],
- position: 1
- }
- }
+ put "/admin/customize/user_fields/#{user_field.id}.json",
+ params: {
+ user_field: {
+ name: "fraggle",
+ field_type: "dropdown",
+ description: "muppet",
+ options: %w[hello hello world],
+ position: 1,
+ },
+ }
expect(response.status).to eq(200)
user_field.reload
expect(user_field.user_field_options.size).to eq(2)
- put "/admin/customize/user_fields/#{user_field.id}.json", params: {
- user_field: {
- name: 'fraggle',
- field_type: 'dropdown',
- description: 'muppet',
- position: 2
- }
- }
+ put "/admin/customize/user_fields/#{user_field.id}.json",
+ params: {
+ user_field: {
+ name: "fraggle",
+ field_type: "dropdown",
+ description: "muppet",
+ position: 2,
+ },
+ }
expect(response.status).to eq(200)
user_field.reload
@@ -207,12 +226,17 @@ RSpec.describe Admin::UserFieldsController do
user_field_id: user_field.id,
enabled: false,
type: DirectoryColumn.types[:user_field],
- position: next_position
+ position: next_position,
)
expect {
- put "/admin/customize/user_fields/#{user_field.id}.json", params: {
- user_field: { show_on_profile: false, show_on_user_card: false, searchable: true }
- }
+ put "/admin/customize/user_fields/#{user_field.id}.json",
+ params: {
+ user_field: {
+ show_on_profile: false,
+ show_on_user_card: false,
+ searchable: true,
+ },
+ }
}.to change { DirectoryColumn.count }.by(-1)
end
end
@@ -222,9 +246,14 @@ RSpec.describe Admin::UserFieldsController do
user_field.reload
original_name = user_field.name
- put "/admin/customize/user_fields/#{user_field.id}.json", params: {
- user_field: { name: 'fraggle', field_type: 'confirm', description: 'muppet' }
- }
+ put "/admin/customize/user_fields/#{user_field.id}.json",
+ params: {
+ user_field: {
+ name: "fraggle",
+ field_type: "confirm",
+ description: "muppet",
+ },
+ }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -241,7 +270,7 @@ RSpec.describe Admin::UserFieldsController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "user field update not allowed"
end
diff --git a/spec/requests/admin/users_controller_spec.rb b/spec/requests/admin/users_controller_spec.rb
index 31c7080de93..602f84710ea 100644
--- a/spec/requests/admin/users_controller_spec.rb
+++ b/spec/requests/admin/users_controller_spec.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
-require 'discourse_ip_info'
-require 'rotp'
+require "discourse_ip_info"
+require "rotp"
RSpec.describe Admin::UsersController do
fab!(:admin) { Fabricate(:admin) }
@@ -9,30 +9,31 @@ RSpec.describe Admin::UsersController do
fab!(:user) { Fabricate(:user) }
fab!(:coding_horror) { Fabricate(:coding_horror) }
- describe '#index' do
+ describe "#index" do
context "when logged in as an admin" do
before { sign_in(admin) }
- it 'returns success with JSON' do
+ it "returns success with JSON" do
get "/admin/users/list.json"
expect(response.status).to eq(200)
expect(response.parsed_body).to be_present
end
- context 'when showing emails' do
+ context "when showing emails" do
it "returns email for all the users" do
get "/admin/users/list.json", params: { show_emails: "true" }
expect(response.status).to eq(200)
data = response.parsed_body
- data.each do |user|
- expect(user["email"]).to be_present
- end
+ data.each { |user| expect(user["email"]).to be_present }
end
it "logs only 1 entry" do
- expect do
- get "/admin/users/list.json", params: { show_emails: "true" }
- end.to change { UserHistory.where(action: UserHistory.actions[:check_email], acting_user_id: admin.id).count }.by(1)
+ expect do get "/admin/users/list.json", params: { show_emails: "true" } end.to change {
+ UserHistory.where(
+ action: UserHistory.actions[:check_email],
+ acting_user_id: admin.id,
+ ).count
+ }.by(1)
expect(response.status).to eq(200)
end
@@ -46,7 +47,7 @@ RSpec.describe Admin::UsersController do
context "when logged in as a moderator" do
before { sign_in(moderator) }
- it 'returns users' do
+ it "returns users" do
get "/admin/users/list.json"
expect(response.status).to eq(200)
@@ -55,7 +56,7 @@ RSpec.describe Admin::UsersController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
it "denies access with a 404 response" do
get "/admin/users/list.json"
@@ -66,28 +67,31 @@ RSpec.describe Admin::UsersController do
end
end
- describe '#show' do
+ describe "#show" do
context "when logged in as an admin" do
before { sign_in(admin) }
- context 'with an existing user' do
- it 'returns success' do
+ context "with an existing user" do
+ it "returns success" do
get "/admin/users/#{user.id}.json"
expect(response.status).to eq(200)
end
- it 'includes associated accounts' do
- user.user_associated_accounts.create!(provider_name: 'pluginauth', provider_uid: 'pluginauth_uid')
+ it "includes associated accounts" do
+ user.user_associated_accounts.create!(
+ provider_name: "pluginauth",
+ provider_uid: "pluginauth_uid",
+ )
get "/admin/users/#{user.id}.json"
expect(response.status).to eq(200)
- expect(response.parsed_body['external_ids'].size).to eq(1)
- expect(response.parsed_body['external_ids']['pluginauth']).to eq('pluginauth_uid')
+ expect(response.parsed_body["external_ids"].size).to eq(1)
+ expect(response.parsed_body["external_ids"]["pluginauth"]).to eq("pluginauth_uid")
end
end
- context 'with a non-existing user' do
- it 'returns 404 error' do
+ context "with a non-existing user" do
+ it "returns 404 error" do
get "/admin/users/0.json"
expect(response.status).to eq(404)
end
@@ -97,15 +101,15 @@ RSpec.describe Admin::UsersController do
context "when logged in as a moderator" do
before { sign_in(moderator) }
- it 'returns user' do
+ it "returns user" do
get "/admin/users/#{user.id}.json"
expect(response.status).to eq(200)
expect(response.parsed_body["id"]).to eq(user.id)
end
- it 'returns similar users' do
- Fabricate(:user, ip_address: '88.88.88.88')
+ it "returns similar users" do
+ Fabricate(:user, ip_address: "88.88.88.88")
similar_user = Fabricate(:user, ip_address: user.ip_address)
get "/admin/users/#{user.id}.json"
@@ -113,12 +117,14 @@ RSpec.describe Admin::UsersController do
expect(response.status).to eq(200)
expect(response.parsed_body["id"]).to eq(user.id)
expect(response.parsed_body["similar_users_count"]).to eq(1)
- expect(response.parsed_body["similar_users"].map { |u| u["id"] }).to contain_exactly(similar_user.id)
+ expect(response.parsed_body["similar_users"].map { |u| u["id"] }).to contain_exactly(
+ similar_user.id,
+ )
end
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
it "denies access with a 404 response" do
get "/admin/users/#{user.id}.json"
@@ -129,12 +135,10 @@ RSpec.describe Admin::UsersController do
end
end
- describe '#approve' do
+ describe "#approve" do
let(:evil_trout) { Fabricate(:evil_trout) }
- before do
- SiteSetting.must_approve_users = true
- end
+ before { SiteSetting.must_approve_users = true }
shared_examples "user approval possible" do
it "creates a reviewable if one does not exist" do
@@ -157,7 +161,12 @@ RSpec.describe Admin::UsersController do
expect(response.status).to eq(200)
evil_trout.reload
expect(evil_trout.approved).to eq(true)
- expect(UserHistory.where(action: UserHistory.actions[:approve_user], target_user_id: evil_trout.id).count).to eq(1)
+ expect(
+ UserHistory.where(
+ action: UserHistory.actions[:approve_user],
+ target_user_id: evil_trout.id,
+ ).count,
+ ).to eq(1)
end
end
@@ -174,7 +183,7 @@ RSpec.describe Admin::UsersController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
it "prevents user approvals with a 404 response" do
put "/admin/users/#{evil_trout.id}/approve.json"
@@ -188,12 +197,10 @@ RSpec.describe Admin::UsersController do
end
end
- describe '#approve_bulk' do
+ describe "#approve_bulk" do
let(:evil_trout) { Fabricate(:evil_trout) }
- before do
- SiteSetting.must_approve_users = true
- end
+ before { SiteSetting.must_approve_users = true }
shared_examples "bulk user approval possible" do
it "does nothing without users" do
@@ -226,7 +233,7 @@ RSpec.describe Admin::UsersController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
it "prevents bulk user approvals with a 404 response" do
put "/admin/users/approve-bulk.json", params: { users: [evil_trout.id] }
@@ -239,13 +246,11 @@ RSpec.describe Admin::UsersController do
end
end
- describe '#suspend' do
+ describe "#suspend" do
fab!(:created_post) { Fabricate(:post) }
fab!(:other_user) { Fabricate(:user) }
let(:suspend_params) do
- { suspend_until: 5.hours.from_now,
- reason: "because of this post",
- post_id: created_post.id }
+ { suspend_until: 5.hours.from_now, reason: "because of this post", post_id: created_post.id }
end
shared_examples "suspension of active user possible" do
@@ -253,10 +258,11 @@ RSpec.describe Admin::UsersController do
expect(user).not_to be_suspended
expect do
- put "/admin/users/#{user.id}/suspend.json", params: {
- suspend_until: 5.hours.from_now,
- reason: "because I said so"
- }
+ put "/admin/users/#{user.id}/suspend.json",
+ params: {
+ suspend_until: 5.hours.from_now,
+ reason: "because I said so",
+ }
end.not_to change { Jobs::CriticalUserEmail.jobs.size }
expect(response.status).to eq(200)
@@ -267,7 +273,7 @@ RSpec.describe Admin::UsersController do
expect(user.suspended_till).to be_present
expect(user.suspend_record).to be_present
- log = UserHistory.where(target_user_id: user.id).order('id desc').first
+ log = UserHistory.where(target_user_id: user.id).order("id desc").first
expect(log.details).to match(/because I said so/)
end
end
@@ -278,23 +284,30 @@ RSpec.describe Admin::UsersController do
include_examples "suspension of active user possible"
it "checks if user is suspended" do
- put "/admin/users/#{user.id}/suspend.json", params: {
- suspend_until: 5.hours.from_now,
- reason: "because I said so"
- }
+ put "/admin/users/#{user.id}/suspend.json",
+ params: {
+ suspend_until: 5.hours.from_now,
+ reason: "because I said so",
+ }
- put "/admin/users/#{user.id}/suspend.json", params: {
- suspend_until: 5.hours.from_now,
- reason: "because I said so too"
- }
+ put "/admin/users/#{user.id}/suspend.json",
+ params: {
+ suspend_until: 5.hours.from_now,
+ reason: "because I said so too",
+ }
expect(response.status).to eq(409)
expect(response.parsed_body["message"]).to eq(
I18n.t(
"user.already_suspended",
staff: admin.username,
- time_ago: FreedomPatches::Rails4.time_ago_in_words(user.suspend_record.created_at, true, scope: :'datetime.distance_in_words_verbose')
- )
+ time_ago:
+ FreedomPatches::Rails4.time_ago_in_words(
+ user.suspend_record.created_at,
+ true,
+ scope: :"datetime.distance_in_words_verbose",
+ ),
+ ),
)
end
@@ -306,9 +319,7 @@ RSpec.describe Admin::UsersController do
expect(user).not_to be_suspended
expect(user).not_to be_suspended
- put "/admin/users/#{user.id}/suspend.json", params: {
- suspend_until: 5.hours.from_now
- }
+ put "/admin/users/#{user.id}/suspend.json", params: { suspend_until: 5.hours.from_now }
expect(response.status).to eq(400)
user.reload
expect(user).not_to be_suspended
@@ -320,12 +331,13 @@ RSpec.describe Admin::UsersController do
expect(response.status).to eq(200)
- log = UserHistory.where(target_user_id: user.id).order('id desc').first
+ log = UserHistory.where(target_user_id: user.id).order("id desc").first
expect(log.post_id).to eq(created_post.id)
end
it "can delete an associated post" do
- put "/admin/users/#{user.id}/suspend.json", params: suspend_params.merge(post_action: 'delete')
+ put "/admin/users/#{user.id}/suspend.json",
+ params: suspend_params.merge(post_action: "delete")
created_post.reload
expect(created_post.deleted_at).to be_present
expect(response.status).to eq(200)
@@ -336,10 +348,7 @@ RSpec.describe Admin::UsersController do
cat_post = c.topic.posts.first
put(
"/admin/users/#{user.id}/suspend.json",
- params: suspend_params.merge(
- post_action: 'delete',
- post_id: cat_post.id
- )
+ params: suspend_params.merge(post_action: "delete", post_id: cat_post.id),
)
cat_post.reload
expect(cat_post.deleted_at).to be_blank
@@ -351,10 +360,7 @@ RSpec.describe Admin::UsersController do
cat_post = c.topic.posts.first
put(
"/admin/users/#{user.id}/suspend.json",
- params: suspend_params.merge(
- post_action: 'delete_replies',
- post_id: cat_post.id
- )
+ params: suspend_params.merge(post_action: "delete_replies", post_id: cat_post.id),
)
cat_post.reload
expect(cat_post.deleted_at).to be_blank
@@ -362,19 +368,22 @@ RSpec.describe Admin::UsersController do
end
it "can delete an associated post and its replies" do
- reply = PostCreator.create(
- Fabricate(:user),
- raw: 'this is the reply text',
- reply_to_post_number: created_post.post_number,
- topic_id: created_post.topic_id
- )
- nested_reply = PostCreator.create(
- Fabricate(:user),
- raw: 'this is the reply text2',
- reply_to_post_number: reply.post_number,
- topic_id: created_post.topic_id
- )
- put "/admin/users/#{user.id}/suspend.json", params: suspend_params.merge(post_action: 'delete_replies')
+ reply =
+ PostCreator.create(
+ Fabricate(:user),
+ raw: "this is the reply text",
+ reply_to_post_number: created_post.post_number,
+ topic_id: created_post.topic_id,
+ )
+ nested_reply =
+ PostCreator.create(
+ Fabricate(:user),
+ raw: "this is the reply text2",
+ reply_to_post_number: reply.post_number,
+ topic_id: created_post.topic_id,
+ )
+ put "/admin/users/#{user.id}/suspend.json",
+ params: suspend_params.merge(post_action: "delete_replies")
expect(created_post.reload.deleted_at).to be_present
expect(reply.reload.deleted_at).to be_present
expect(nested_reply.reload.deleted_at).to be_present
@@ -382,10 +391,9 @@ RSpec.describe Admin::UsersController do
end
it "can edit an associated post" do
- put "/admin/users/#{user.id}/suspend.json", params: suspend_params.merge(
- post_action: 'edit',
- post_edit: 'this is the edited content'
- )
+ put "/admin/users/#{user.id}/suspend.json",
+ params:
+ suspend_params.merge(post_action: "edit", post_edit: "this is the edited content")
expect(response.status).to eq(200)
created_post.reload
@@ -396,11 +404,12 @@ RSpec.describe Admin::UsersController do
end
it "can send a message to the user" do
- put "/admin/users/#{user.id}/suspend.json", params: {
- suspend_until: 10.days.from_now,
- reason: "short reason",
- message: "long reason"
- }
+ put "/admin/users/#{user.id}/suspend.json",
+ params: {
+ suspend_until: 10.days.from_now,
+ reason: "short reason",
+ message: "long reason",
+ }
expect(response.status).to eq(200)
@@ -409,7 +418,7 @@ RSpec.describe Admin::UsersController do
expect(job_args["type"]).to eq("account_suspended")
expect(job_args["user_id"]).to eq(user.id)
- log = UserHistory.where(target_user_id: user.id).order('id desc').first
+ log = UserHistory.where(target_user_id: user.id).order("id desc").first
expect(log).to be_present
expect(log.details).to match(/short reason/)
expect(log.details).to match(/long reason/)
@@ -417,10 +426,14 @@ RSpec.describe Admin::UsersController do
it "also prevents use of any api keys" do
api_key = Fabricate(:api_key, user: user)
- post "/bookmarks.json", params: {
- bookmarkable_id: Fabricate(:post).id,
- bookmarkable_type: "Post"
- }, headers: { HTTP_API_KEY: api_key.key }
+ post "/bookmarks.json",
+ params: {
+ bookmarkable_id: Fabricate(:post).id,
+ bookmarkable_type: "Post",
+ },
+ headers: {
+ HTTP_API_KEY: api_key.key,
+ }
expect(response.status).to eq(200)
put "/admin/users/#{user.id}/suspend.json", params: suspend_params
@@ -429,19 +442,24 @@ RSpec.describe Admin::UsersController do
user.reload
expect(user).to be_suspended
- post "/bookmarks.json", params: {
- post_id: Fabricate(:post).id
- }, headers: { HTTP_API_KEY: api_key.key }
+ post "/bookmarks.json",
+ params: {
+ post_id: Fabricate(:post).id,
+ },
+ headers: {
+ HTTP_API_KEY: api_key.key,
+ }
expect(response.status).to eq(403)
end
it "can silence multiple users" do
- put "/admin/users/#{user.id}/suspend.json", params: {
- suspend_until: 10.days.from_now,
- reason: "short reason",
- message: "long reason",
- other_user_ids: [other_user.id],
- }
+ put "/admin/users/#{user.id}/suspend.json",
+ params: {
+ suspend_until: 10.days.from_now,
+ reason: "short reason",
+ message: "long reason",
+ other_user_ids: [other_user.id],
+ }
expect(response.status).to eq(200)
expect(user.reload).to be_suspended
expect(other_user.reload).to be_suspended
@@ -455,14 +473,15 @@ RSpec.describe Admin::UsersController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
it "prevents user suspensions with a 404 response" do
expect do
- put "/admin/users/#{user.id}/suspend.json", params: {
- suspend_until: 5.hours.from_now,
- reason: "because I said so"
- }
+ put "/admin/users/#{user.id}/suspend.json",
+ params: {
+ suspend_until: 5.hours.from_now,
+ reason: "because I said so",
+ }
end.not_to change { Jobs::CriticalUserEmail.jobs.size }
expect(response.status).to eq(404)
@@ -477,22 +496,22 @@ RSpec.describe Admin::UsersController do
end
end
- describe '#revoke_admin' do
+ describe "#revoke_admin" do
fab!(:another_admin) { Fabricate(:admin) }
context "when logged in as an admin" do
before { sign_in(admin) }
- it 'updates the admin flag' do
+ it "updates the admin flag" do
put "/admin/users/#{another_admin.id}/revoke_admin.json"
expect(response.status).to eq(200)
another_admin.reload
expect(another_admin.admin).to eq(false)
- expect(response.parsed_body['can_be_merged']).to eq(true)
- expect(response.parsed_body['can_be_deleted']).to eq(true)
- expect(response.parsed_body['can_be_anonymized']).to eq(true)
- expect(response.parsed_body['can_delete_all_posts']).to eq(true)
+ expect(response.parsed_body["can_be_merged"]).to eq(true)
+ expect(response.parsed_body["can_be_deleted"]).to eq(true)
+ expect(response.parsed_body["can_be_anonymized"]).to eq(true)
+ expect(response.parsed_body["can_delete_all_posts"]).to eq(true)
end
end
@@ -514,18 +533,16 @@ RSpec.describe Admin::UsersController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "admin access revocation not allowed"
end
end
- describe '#grant_admin' do
+ describe "#grant_admin" do
fab!(:another_user) { coding_horror }
- after do
- Discourse.redis.flushdb
- end
+ after { Discourse.redis.flushdb }
context "when logged in as an admin" do
before { sign_in(admin) }
@@ -535,14 +552,14 @@ RSpec.describe Admin::UsersController do
expect(response.status).to eq(404)
end
- it 'sends a confirmation email if the acting admin does not have a second factor method enabled' do
+ it "sends a confirmation email if the acting admin does not have a second factor method enabled" do
expect(AdminConfirmation.exists_for?(another_user.id)).to eq(false)
put "/admin/users/#{another_user.id}/grant_admin.json"
expect(response.status).to eq(200)
expect(AdminConfirmation.exists_for?(another_user.id)).to eq(true)
end
- it 'asks the acting admin for second factor if it is enabled' do
+ it "asks the acting admin for second factor if it is enabled" do
Fabricate(:user_second_factor_totp, user: admin)
put "/admin/users/#{another_user.id}/grant_admin.json", xhr: true
@@ -551,7 +568,7 @@ RSpec.describe Admin::UsersController do
expect(another_user.reload.admin).to eq(false)
end
- it 'grants admin if second factor is correct' do
+ it "grants admin if second factor is correct" do
user_second_factor = Fabricate(:user_second_factor_totp, user: admin)
put "/admin/users/#{another_user.id}/grant_admin.json", xhr: true
@@ -559,27 +576,28 @@ RSpec.describe Admin::UsersController do
expect(nonce).to be_present
expect(another_user.reload.admin).to eq(false)
- post "/session/2fa.json", params: {
- nonce: nonce,
- second_factor_token: ROTP::TOTP.new(user_second_factor.data).now,
- second_factor_method: UserSecondFactor.methods[:totp]
- }
+ post "/session/2fa.json",
+ params: {
+ nonce: nonce,
+ second_factor_token: ROTP::TOTP.new(user_second_factor.data).now,
+ second_factor_method: UserSecondFactor.methods[:totp],
+ }
res = response.parsed_body
expect(response.status).to eq(200)
expect(res["ok"]).to eq(true)
expect(res["callback_method"]).to eq("PUT")
expect(res["callback_path"]).to eq("/admin/users/#{another_user.id}/grant_admin.json")
- expect(res["redirect_url"]).to eq("/admin/users/#{another_user.id}/#{another_user.username}")
+ expect(res["redirect_url"]).to eq(
+ "/admin/users/#{another_user.id}/#{another_user.username}",
+ )
expect(another_user.reload.admin).to eq(false)
- put res["callback_path"], params: {
- second_factor_nonce: nonce
- }
+ put res["callback_path"], params: { second_factor_nonce: nonce }
expect(response.status).to eq(200)
expect(another_user.reload.admin).to eq(true)
end
- it 'does not grant admin if second factor auth is not successful' do
+ it "does not grant admin if second factor auth is not successful" do
user_second_factor = Fabricate(:user_second_factor_totp, user: admin)
put "/admin/users/#{another_user.id}/grant_admin.json", xhr: true
@@ -589,22 +607,24 @@ RSpec.describe Admin::UsersController do
token = ROTP::TOTP.new(user_second_factor.data).now.to_i
token = (token == 999_999 ? token - 1 : token + 1).to_s
- post "/session/2fa.json", params: {
- nonce: nonce,
- second_factor_token: token,
- second_factor_method: UserSecondFactor.methods[:totp]
- }
+ post "/session/2fa.json",
+ params: {
+ nonce: nonce,
+ second_factor_token: token,
+ second_factor_method: UserSecondFactor.methods[:totp],
+ }
expect(response.status).to eq(400)
expect(another_user.reload.admin).to eq(false)
- put "/admin/users/#{another_user.id}/grant_admin.json", params: {
- second_factor_nonce: nonce
- }
+ put "/admin/users/#{another_user.id}/grant_admin.json",
+ params: {
+ second_factor_nonce: nonce,
+ }
expect(response.status).to eq(401)
expect(another_user.reload.admin).to eq(false)
end
- it 'does not grant admin if the acting admin loses permission in the middle of the process' do
+ it "does not grant admin if the acting admin loses permission in the middle of the process" do
user_second_factor = Fabricate(:user_second_factor_totp, user: admin)
put "/admin/users/#{another_user.id}/grant_admin.json", xhr: true
@@ -612,28 +632,29 @@ RSpec.describe Admin::UsersController do
expect(nonce).to be_present
expect(another_user.reload.admin).to eq(false)
- post "/session/2fa.json", params: {
- nonce: nonce,
- second_factor_token: ROTP::TOTP.new(user_second_factor.data).now,
- second_factor_method: UserSecondFactor.methods[:totp]
- }
+ post "/session/2fa.json",
+ params: {
+ nonce: nonce,
+ second_factor_token: ROTP::TOTP.new(user_second_factor.data).now,
+ second_factor_method: UserSecondFactor.methods[:totp],
+ }
res = response.parsed_body
expect(response.status).to eq(200)
expect(res["ok"]).to eq(true)
expect(res["callback_method"]).to eq("PUT")
expect(res["callback_path"]).to eq("/admin/users/#{another_user.id}/grant_admin.json")
- expect(res["redirect_url"]).to eq("/admin/users/#{another_user.id}/#{another_user.username}")
+ expect(res["redirect_url"]).to eq(
+ "/admin/users/#{another_user.id}/#{another_user.username}",
+ )
expect(another_user.reload.admin).to eq(false)
admin.update!(admin: false)
- put res["callback_path"], params: {
- second_factor_nonce: nonce
- }
+ put res["callback_path"], params: { second_factor_nonce: nonce }
expect(response.status).to eq(404)
expect(another_user.reload.admin).to eq(false)
end
- it 'does not accept backup codes' do
+ it "does not accept backup codes" do
Fabricate(:user_second_factor_totp, user: admin)
Fabricate(:user_second_factor_backup, user: admin)
@@ -642,11 +663,12 @@ RSpec.describe Admin::UsersController do
expect(nonce).to be_present
expect(another_user.reload.admin).to eq(false)
- post "/session/2fa.json", params: {
- nonce: nonce,
- second_factor_token: "iAmValidBackupCode",
- second_factor_method: UserSecondFactor.methods[:backup_codes]
- }
+ post "/session/2fa.json",
+ params: {
+ nonce: nonce,
+ second_factor_token: "iAmValidBackupCode",
+ second_factor_method: UserSecondFactor.methods[:backup_codes],
+ }
expect(response.status).to eq(403)
expect(another_user.reload.admin).to eq(false)
end
@@ -654,9 +676,7 @@ RSpec.describe Admin::UsersController do
shared_examples "admin grants not allowed" do
context "with 2FA enabled" do
- before do
- Fabricate(:user_second_factor_totp, user: user)
- end
+ before { Fabricate(:user_second_factor_totp, user: user) }
it "prevents granting admin with a 404 response" do
put "/admin/users/#{another_user.id}/grant_admin.json"
@@ -685,22 +705,20 @@ RSpec.describe Admin::UsersController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "admin grants not allowed"
end
end
- describe '#add_group' do
+ describe "#add_group" do
fab!(:group) { Fabricate(:group) }
context "when logged in as an admin" do
before { sign_in(admin) }
- it 'adds the user to the group' do
- post "/admin/users/#{user.id}/groups.json", params: {
- group_id: group.id
- }
+ it "adds the user to the group" do
+ post "/admin/users/#{user.id}/groups.json", params: { group_id: group.id }
expect(response.status).to eq(200)
expect(GroupUser.where(user_id: user.id, group_id: group.id).exists?).to eq(true)
@@ -712,30 +730,24 @@ RSpec.describe Admin::UsersController do
expect(group_history.target_user).to eq(user)
# Doing it again doesn't raise an error
- post "/admin/users/#{user.id}/groups.json", params: {
- group_id: group.id
- }
+ post "/admin/users/#{user.id}/groups.json", params: { group_id: group.id }
expect(response.status).to eq(200)
end
- it 'returns not-found error when there is no group' do
+ it "returns not-found error when there is no group" do
group.destroy!
- put "/admin/users/#{user.id}/groups.json", params: {
- group_id: group.id
- }
+ put "/admin/users/#{user.id}/groups.json", params: { group_id: group.id }
expect(response.status).to eq(404)
end
- it 'does not allow adding users to an automatic group' do
+ it "does not allow adding users to an automatic group" do
group.update!(automatic: true)
expect do
- post "/admin/users/#{user.id}/groups.json", params: {
- group_id: group.id
- }
+ post "/admin/users/#{user.id}/groups.json", params: { group_id: group.id }
end.to_not change { group.users.count }
expect(response.status).to eq(422)
@@ -745,9 +757,7 @@ RSpec.describe Admin::UsersController do
shared_examples "adding users to groups not allowed" do
it "prevents adding user to group with a 404 response" do
- post "/admin/users/#{user.id}/groups.json", params: {
- group_id: group.id
- }
+ post "/admin/users/#{user.id}/groups.json", params: { group_id: group.id }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -762,13 +772,13 @@ RSpec.describe Admin::UsersController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "adding users to groups not allowed"
end
end
- describe '#remove_group' do
+ describe "#remove_group" do
context "when logged in as an admin" do
before { sign_in(admin) }
@@ -781,13 +791,13 @@ RSpec.describe Admin::UsersController do
expect(user.reload.primary_group).to eq(nil)
end
- it 'returns not-found error when there is no group' do
+ it "returns not-found error when there is no group" do
delete "/admin/users/#{user.id}/groups/9090.json"
expect(response.status).to eq(404)
end
- it 'does not allow removing owners from an automatic group' do
+ it "does not allow removing owners from an automatic group" do
group = Fabricate(:group, users: [user], automatic: true)
delete "/admin/users/#{user.id}/groups/#{group.id}.json"
@@ -817,13 +827,13 @@ RSpec.describe Admin::UsersController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "removing user from groups not allowed"
end
end
- describe '#trust_level' do
+ describe "#trust_level" do
fab!(:another_user) do
coding_horror.update!(created_at: 1.month.ago)
coding_horror
@@ -842,11 +852,13 @@ RSpec.describe Admin::UsersController do
another_user.reload
expect(another_user.trust_level).to eq(2)
- expect(UserHistory.where(
- target_user: another_user,
- acting_user: acting_user,
- action: UserHistory.actions[:change_trust_level]
- ).count).to eq(1)
+ expect(
+ UserHistory.where(
+ target_user: another_user,
+ acting_user: acting_user,
+ action: UserHistory.actions[:change_trust_level],
+ ).count,
+ ).to eq(1)
end
it "raises no error when demoting a user below their current trust level (locks trust level)" do
@@ -857,9 +869,7 @@ RSpec.describe Admin::UsersController do
stat.save!
another_user.update(trust_level: TrustLevel[1])
- put "/admin/users/#{another_user.id}/trust_level.json", params: {
- level: TrustLevel[0]
- }
+ put "/admin/users/#{another_user.id}/trust_level.json", params: { level: TrustLevel[0] }
expect(response.status).to eq(200)
another_user.reload
@@ -885,7 +895,7 @@ RSpec.describe Admin::UsersController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
it "prevents updates trust level with a 404 response" do
put "/admin/users/#{another_user.id}/trust_level.json"
@@ -896,7 +906,7 @@ RSpec.describe Admin::UsersController do
end
end
- describe '#grant_moderation' do
+ describe "#grant_moderation" do
fab!(:another_user) { coding_horror }
context "when logged in as an admin" do
@@ -907,21 +917,24 @@ RSpec.describe Admin::UsersController do
expect(response.status).to eq(404)
end
- it 'updates the moderator flag' do
- expect_enqueued_with(job: :send_system_message, args: {
- user_id: another_user.id,
- message_type: 'welcome_staff',
- message_options: { role: :moderator }
- }) do
- put "/admin/users/#{another_user.id}/grant_moderation.json"
- end
+ it "updates the moderator flag" do
+ expect_enqueued_with(
+ job: :send_system_message,
+ args: {
+ user_id: another_user.id,
+ message_type: "welcome_staff",
+ message_options: {
+ role: :moderator,
+ },
+ },
+ ) { put "/admin/users/#{another_user.id}/grant_moderation.json" }
expect(response.status).to eq(200)
another_user.reload
expect(another_user.moderator).to eq(true)
- expect(response.parsed_body['can_be_merged']).to eq(false)
- expect(response.parsed_body['can_be_anonymized']).to eq(false)
+ expect(response.parsed_body["can_be_merged"]).to eq(false)
+ expect(response.parsed_body["can_be_anonymized"]).to eq(false)
end
end
@@ -941,26 +954,26 @@ RSpec.describe Admin::UsersController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "moderator access grant not allowed"
end
end
- describe '#revoke_moderation' do
+ describe "#revoke_moderation" do
fab!(:another_moderator) { Fabricate(:moderator) }
context "when logged in as an admin" do
before { sign_in(admin) }
- it 'updates the moderator flag' do
+ it "updates the moderator flag" do
put "/admin/users/#{another_moderator.id}/revoke_moderation.json"
expect(response.status).to eq(200)
another_moderator.reload
expect(another_moderator.moderator).to eq(false)
- expect(response.parsed_body['can_be_merged']).to eq(true)
- expect(response.parsed_body['can_be_anonymized']).to eq(true)
+ expect(response.parsed_body["can_be_merged"]).to eq(true)
+ expect(response.parsed_body["can_be_anonymized"]).to eq(true)
end
end
@@ -982,16 +995,16 @@ RSpec.describe Admin::UsersController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "moderator access revocation not allowed"
end
end
- describe '#primary_group' do
+ describe "#primary_group" do
fab!(:group) { Fabricate(:group) }
fab!(:another_user) { coding_horror }
- fab!(:another_group) { Fabricate(:group, title: 'New') }
+ fab!(:another_group) { Fabricate(:group, title: "New") }
shared_examples "primary group updates possible" do
it "returns a 404 if the user doesn't exist" do
@@ -1001,9 +1014,10 @@ RSpec.describe Admin::UsersController do
it "changes the user's primary group" do
group.add(another_user)
- put "/admin/users/#{another_user.id}/primary_group.json", params: {
- primary_group_id: group.id
- }
+ put "/admin/users/#{another_user.id}/primary_group.json",
+ params: {
+ primary_group_id: group.id,
+ }
expect(response.status).to eq(200)
another_user.reload
@@ -1011,9 +1025,10 @@ RSpec.describe Admin::UsersController do
end
it "doesn't change primary group if they aren't a member of the group" do
- put "/admin/users/#{another_user.id}/primary_group.json", params: {
- primary_group_id: group.id
- }
+ put "/admin/users/#{another_user.id}/primary_group.json",
+ params: {
+ primary_group_id: group.id,
+ }
expect(response.status).to eq(200)
another_user.reload
@@ -1023,9 +1038,7 @@ RSpec.describe Admin::UsersController do
it "remove user's primary group" do
group.add(another_user)
- put "/admin/users/#{another_user.id}/primary_group.json", params: {
- primary_group_id: ""
- }
+ put "/admin/users/#{another_user.id}/primary_group.json", params: { primary_group_id: "" }
expect(response.status).to eq(200)
another_user.reload
@@ -1033,38 +1046,40 @@ RSpec.describe Admin::UsersController do
end
it "updates user's title when it matches the previous primary group title" do
- group.update_columns(primary_group: true, title: 'Previous')
+ group.update_columns(primary_group: true, title: "Previous")
group.add(another_user)
another_group.add(another_user)
- expect(another_user.reload.title).to eq('Previous')
+ expect(another_user.reload.title).to eq("Previous")
- put "/admin/users/#{another_user.id}/primary_group.json", params: {
- primary_group_id: another_group.id
- }
+ put "/admin/users/#{another_user.id}/primary_group.json",
+ params: {
+ primary_group_id: another_group.id,
+ }
another_user.reload
expect(response.status).to eq(200)
expect(another_user.primary_group_id).to eq(another_group.id)
- expect(another_user.title).to eq('New')
+ expect(another_user.title).to eq("New")
end
it "doesn't update user's title when it does not match the previous primary group title" do
- another_user.update_columns(title: 'Different')
- group.update_columns(primary_group: true, title: 'Previous')
+ another_user.update_columns(title: "Different")
+ group.update_columns(primary_group: true, title: "Previous")
another_group.add(another_user)
group.add(another_user)
- expect(another_user.reload.title).to eq('Different')
+ expect(another_user.reload.title).to eq("Different")
- put "/admin/users/#{another_user.id}/primary_group.json", params: {
- primary_group_id: another_group.id
- }
+ put "/admin/users/#{another_user.id}/primary_group.json",
+ params: {
+ primary_group_id: another_group.id,
+ }
another_user.reload
expect(response.status).to eq(200)
expect(another_user.primary_group_id).to eq(another_group.id)
- expect(another_user.title).to eq('Different')
+ expect(another_user.title).to eq("Different")
end
end
@@ -1078,23 +1093,20 @@ RSpec.describe Admin::UsersController do
before { sign_in(moderator) }
context "when moderators_manage_categories_and_groups site setting is enabled" do
- before do
- SiteSetting.moderators_manage_categories_and_groups = true
- end
+ before { SiteSetting.moderators_manage_categories_and_groups = true }
include_examples "primary group updates possible"
end
context "when moderators_manage_categories_and_groups site setting is disabled" do
- before do
- SiteSetting.moderators_manage_categories_and_groups = false
- end
+ before { SiteSetting.moderators_manage_categories_and_groups = false }
it "prevents setting primary group with a 403 response" do
group.add(another_user)
- put "/admin/users/#{another_user.id}/primary_group.json", params: {
- primary_group_id: group.id
- }
+ put "/admin/users/#{another_user.id}/primary_group.json",
+ params: {
+ primary_group_id: group.id,
+ }
expect(response.status).to eq(403)
expect(response.parsed_body["errors"]).to include(I18n.t("invalid_access"))
@@ -1105,13 +1117,14 @@ RSpec.describe Admin::UsersController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
it "prevents setting primary group with a 404 response" do
group.add(another_user)
- put "/admin/users/#{another_user.id}/primary_group.json", params: {
- primary_group_id: group.id
- }
+ put "/admin/users/#{another_user.id}/primary_group.json",
+ params: {
+ primary_group_id: group.id,
+ }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -1121,7 +1134,7 @@ RSpec.describe Admin::UsersController do
end
end
- describe '#destroy' do
+ describe "#destroy" do
fab!(:delete_me) { Fabricate(:user) }
shared_examples "user deletion possible" do
@@ -1143,8 +1156,10 @@ RSpec.describe Admin::UsersController do
delete "/admin/users/#{delete_me.id}.json"
expect(response.status).to eq(403)
json = response.parsed_body
- expect(json['deleted']).to eq(false)
- expect(json['message']).to eq(I18n.t("user.cannot_delete_has_posts", username: delete_me.username, count: post_count))
+ expect(json["deleted"]).to eq(false)
+ expect(json["message"]).to eq(
+ I18n.t("user.cannot_delete_has_posts", username: delete_me.username, count: post_count),
+ )
end
it "doesn't return an error if delete_posts == true" do
@@ -1156,10 +1171,23 @@ RSpec.describe Admin::UsersController do
end
context "when user has reviewable flagged post which was handled" do
- let!(:reviewable) { Fabricate(:reviewable_flagged_post, created_by: admin, target_created_by: delete_me, target: post, topic: topic, status: 4) }
+ let!(:reviewable) do
+ Fabricate(
+ :reviewable_flagged_post,
+ created_by: admin,
+ target_created_by: delete_me,
+ target: post,
+ topic: topic,
+ status: 4,
+ )
+ end
it "deletes the user record" do
- delete "/admin/users/#{delete_me.id}.json", params: { delete_posts: true, delete_as_spammer: true }
+ delete "/admin/users/#{delete_me.id}.json",
+ params: {
+ delete_posts: true,
+ delete_as_spammer: true,
+ }
expect(response.status).to eq(200)
expect(User.where(id: delete_me.id).count).to eq(0)
end
@@ -1219,25 +1247,39 @@ RSpec.describe Admin::UsersController do
@post = Fabricate(:post_with_external_links, user: delete_me)
TopicLink.extract_from(@post)
- @urls = TopicLink.where(user: delete_me, internal: false)
- .pluck(:url)
- .map { |url| ScreenedUrl.normalize_url(url) }
+ @urls =
+ TopicLink
+ .where(user: delete_me, internal: false)
+ .pluck(:url)
+ .map { |url| ScreenedUrl.normalize_url(url) }
end
it "blocks the urls if block_url param is true" do
- delete "/admin/users/#{delete_me.id}.json", params: { delete_posts: true, block_urls: true }
+ delete "/admin/users/#{delete_me.id}.json",
+ params: {
+ delete_posts: true,
+ block_urls: true,
+ }
expect(response.status).to eq(200)
expect(ScreenedUrl.exists?(url: @urls)).to eq(true)
end
it "does not block the urls if block_url param is false" do
- delete "/admin/users/#{delete_me.id}.json", params: { delete_posts: true, block_urls: false }
+ delete "/admin/users/#{delete_me.id}.json",
+ params: {
+ delete_posts: true,
+ block_urls: false,
+ }
expect(response.status).to eq(200)
expect(ScreenedUrl.exists?(url: @urls)).to eq(false)
end
it "does not block the urls by default" do
- delete "/admin/users/#{delete_me.id}.json", params: { delete_posts: true, block_urls: false }
+ delete "/admin/users/#{delete_me.id}.json",
+ params: {
+ delete_posts: true,
+ block_urls: false,
+ }
expect(response.status).to eq(200)
expect(ScreenedUrl.exists?(url: @urls)).to eq(false)
end
@@ -1263,7 +1305,7 @@ RSpec.describe Admin::UsersController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
it "prevents deleting user with a 404 response" do
delete "/admin/users/#{delete_me.id}.json"
@@ -1275,7 +1317,7 @@ RSpec.describe Admin::UsersController do
end
end
- describe '#activate' do
+ describe "#activate" do
fab!(:reg_user) { Fabricate(:inactive_user) }
shared_examples "user activation possible" do
@@ -1283,7 +1325,7 @@ RSpec.describe Admin::UsersController do
put "/admin/users/#{reg_user.id}/activate.json"
expect(response.status).to eq(200)
json = response.parsed_body
- expect(json['success']).to eq("OK")
+ expect(json["success"]).to eq("OK")
reg_user.reload
expect(reg_user.active).to eq(true)
end
@@ -1315,7 +1357,7 @@ RSpec.describe Admin::UsersController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
it "prevents activation of user with a 404 response" do
put "/admin/users/#{reg_user.id}/activate.json"
@@ -1328,7 +1370,7 @@ RSpec.describe Admin::UsersController do
end
end
- describe '#deactivate' do
+ describe "#deactivate" do
fab!(:reg_user) { Fabricate(:active_user) }
shared_examples "user deactivation possible" do
@@ -1336,7 +1378,7 @@ RSpec.describe Admin::UsersController do
put "/admin/users/#{reg_user.id}/deactivate.json"
expect(response.status).to eq(200)
json = response.parsed_body
- expect(json['success']).to eq("OK")
+ expect(json["success"]).to eq("OK")
reg_user.reload
expect(reg_user.active).to eq(false)
end
@@ -1355,7 +1397,7 @@ RSpec.describe Admin::UsersController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
it "prevents deactivation of user with a 404 response" do
put "/admin/users/#{reg_user.id}/deactivate.json"
@@ -1368,7 +1410,7 @@ RSpec.describe Admin::UsersController do
end
end
- describe '#log_out' do
+ describe "#log_out" do
fab!(:reg_user) { Fabricate(:user) }
context "when logged in as an admin" do
@@ -1378,7 +1420,7 @@ RSpec.describe Admin::UsersController do
post "/admin/users/#{reg_user.id}/log_out.json"
expect(response.status).to eq(200)
json = response.parsed_body
- expect(json['success']).to eq("OK")
+ expect(json["success"]).to eq("OK")
end
it "returns 404 when user_id does not exist" do
@@ -1403,13 +1445,13 @@ RSpec.describe Admin::UsersController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "user log out not allowed"
end
end
- describe '#silence' do
+ describe "#silence" do
fab!(:reg_user) { Fabricate(:user) }
fab!(:other_user) { Fabricate(:user) }
@@ -1432,20 +1474,22 @@ RSpec.describe Admin::UsersController do
it "can have an associated post" do
silence_post = Fabricate(:post, user: reg_user)
- put "/admin/users/#{reg_user.id}/silence.json", params: {
- post_id: silence_post.id,
- post_action: 'edit',
- post_edit: "this is the new contents for the post"
- }
+ put "/admin/users/#{reg_user.id}/silence.json",
+ params: {
+ post_id: silence_post.id,
+ post_action: "edit",
+ post_edit: "this is the new contents for the post",
+ }
expect(response.status).to eq(200)
silence_post.reload
expect(silence_post.raw).to eq("this is the new contents for the post")
- log = UserHistory.where(
- target_user_id: reg_user.id,
- action: UserHistory.actions[:silence_user]
- ).first
+ log =
+ UserHistory.where(
+ target_user_id: reg_user.id,
+ action: UserHistory.actions[:silence_user],
+ ).first
expect(log).to be_present
expect(log.post_id).to eq(silence_post.id)
@@ -1455,9 +1499,7 @@ RSpec.describe Admin::UsersController do
it "will set a length of time if provided" do
future_date = 1.month.from_now.to_date
- put "/admin/users/#{reg_user.id}/silence.json", params: {
- silenced_till: future_date
- }
+ put "/admin/users/#{reg_user.id}/silence.json", params: { silenced_till: future_date }
expect(response.status).to eq(200)
reg_user.reload
@@ -1467,9 +1509,10 @@ RSpec.describe Admin::UsersController do
it "will send a message if provided" do
expect do
- put "/admin/users/#{reg_user.id}/silence.json", params: {
- message: "Email this to the user"
- }
+ put "/admin/users/#{reg_user.id}/silence.json",
+ params: {
+ message: "Email this to the user",
+ }
end.to change { Jobs::CriticalUserEmail.jobs.size }.by(1)
expect(response.status).to eq(200)
@@ -1478,23 +1521,30 @@ RSpec.describe Admin::UsersController do
end
it "checks if user is silenced" do
- put "/admin/users/#{user.id}/silence.json", params: {
- silenced_till: 5.hours.from_now,
- reason: "because I said so"
- }
+ put "/admin/users/#{user.id}/silence.json",
+ params: {
+ silenced_till: 5.hours.from_now,
+ reason: "because I said so",
+ }
- put "/admin/users/#{user.id}/silence.json", params: {
- silenced_till: 5.hours.from_now,
- reason: "because I said so too"
- }
+ put "/admin/users/#{user.id}/silence.json",
+ params: {
+ silenced_till: 5.hours.from_now,
+ reason: "because I said so too",
+ }
expect(response.status).to eq(409)
expect(response.parsed_body["message"]).to eq(
I18n.t(
"user.already_silenced",
staff: admin.username,
- time_ago: FreedomPatches::Rails4.time_ago_in_words(user.silenced_record.created_at, true, scope: :'datetime.distance_in_words_verbose')
- )
+ time_ago:
+ FreedomPatches::Rails4.time_ago_in_words(
+ user.silenced_record.created_at,
+ true,
+ scope: :"datetime.distance_in_words_verbose",
+ ),
+ ),
)
end
@@ -1520,7 +1570,7 @@ RSpec.describe Admin::UsersController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
it "prevents silencing user with a 404 response" do
put "/admin/users/#{reg_user.id}/silence.json"
@@ -1533,7 +1583,7 @@ RSpec.describe Admin::UsersController do
end
end
- describe '#unsilence' do
+ describe "#unsilence" do
fab!(:reg_user) { Fabricate(:user, silenced_till: 10.years.from_now) }
shared_examples "unsilencing user possible" do
@@ -1547,10 +1597,11 @@ RSpec.describe Admin::UsersController do
expect(response.status).to eq(200)
reg_user.reload
expect(reg_user.silenced?).to eq(false)
- log = UserHistory.where(
- target_user_id: reg_user.id,
- action: UserHistory.actions[:unsilence_user]
- ).first
+ log =
+ UserHistory.where(
+ target_user_id: reg_user.id,
+ action: UserHistory.actions[:unsilence_user],
+ ).first
expect(log).to be_present
end
end
@@ -1568,7 +1619,7 @@ RSpec.describe Admin::UsersController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
it "prevents unsilencing user with a 404 response" do
put "/admin/users/#{reg_user.id}/unsilence.json"
@@ -1579,12 +1630,12 @@ RSpec.describe Admin::UsersController do
end
end
- describe '#ip_info' do
+ describe "#ip_info" do
shared_examples "IP info retrieval possible" do
it "retrieves IP info" do
ip = "81.2.69.142"
- DiscourseIpInfo.open_db(File.join(Rails.root, 'spec', 'fixtures', 'mmdb'))
+ DiscourseIpInfo.open_db(File.join(Rails.root, "spec", "fixtures", "mmdb"))
Resolv::DNS.any_instance.stubs(:getname).with(ip).returns("ip-81-2-69-142.example.com")
get "/admin/users/ip-info.json", params: { ip: ip }
@@ -1593,7 +1644,7 @@ RSpec.describe Admin::UsersController do
city: "London",
country: "United Kingdom",
country_code: "GB",
- geoname_ids: [6255148, 2635167, 2643743, 6269131],
+ geoname_ids: [6_255_148, 2_635_167, 2_643_743, 6_269_131],
hostname: "ip-81-2-69-142.example.com",
location: "London, England, United Kingdom",
region: "England",
@@ -1616,12 +1667,12 @@ RSpec.describe Admin::UsersController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
it "prevents retrieval of IP info with a 404 response" do
ip = "81.2.69.142"
- DiscourseIpInfo.open_db(File.join(Rails.root, 'spec', 'fixtures', 'mmdb'))
+ DiscourseIpInfo.open_db(File.join(Rails.root, "spec", "fixtures", "mmdb"))
Resolv::DNS.any_instance.stubs(:getname).with(ip).returns("ip-81-2-69-142.example.com")
get "/admin/users/ip-info.json", params: { ip: ip }
@@ -1632,15 +1683,18 @@ RSpec.describe Admin::UsersController do
end
end
- describe '#delete_other_accounts_with_same_ip' do
+ describe "#delete_other_accounts_with_same_ip" do
shared_examples "deleting other accounts with same ip possible" do
it "works" do
user_a = Fabricate(:user, ip_address: "42.42.42.42")
user_b = Fabricate(:user, ip_address: "42.42.42.42")
- delete "/admin/users/delete-others-with-same-ip.json", params: {
- ip: "42.42.42.42", exclude: -1, order: "trust_level DESC"
- }
+ delete "/admin/users/delete-others-with-same-ip.json",
+ params: {
+ ip: "42.42.42.42",
+ exclude: -1,
+ order: "trust_level DESC",
+ }
expect(response.status).to eq(200)
expect(User.where(id: user_a.id).count).to eq(0)
expect(User.where(id: user_b.id).count).to eq(0)
@@ -1660,15 +1714,18 @@ RSpec.describe Admin::UsersController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
it "prevents deletion of other accounts with same ip with a 404 response" do
user_a = Fabricate(:user, ip_address: "42.42.42.42")
user_b = Fabricate(:user, ip_address: "42.42.42.42")
- delete "/admin/users/delete-others-with-same-ip.json", params: {
- ip: "42.42.42.42", exclude: -1, order: "trust_level DESC"
- }
+ delete "/admin/users/delete-others-with-same-ip.json",
+ params: {
+ ip: "42.42.42.42",
+ exclude: -1,
+ order: "trust_level DESC",
+ }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
expect(User.where(id: user_a.id).count).to eq(1)
@@ -1677,7 +1734,7 @@ RSpec.describe Admin::UsersController do
end
end
- describe '#sync_sso' do
+ describe "#sync_sso" do
let(:sso) { DiscourseConnectBase.new }
let(:sso_secret) { "sso secret" }
@@ -1695,13 +1752,17 @@ RSpec.describe Admin::UsersController do
context "when logged in as an admin" do
before { sign_in(admin) }
- it 'can sync up with the sso' do
+ it "can sync up with the sso" do
sso.name = "Bob The Bob"
sso.username = "bob"
sso.email = "bob@bob.com"
sso.external_id = "1"
- user = DiscourseConnect.parse(sso.payload, secure_session: read_secure_session).lookup_or_create_user
+ user =
+ DiscourseConnect.parse(
+ sso.payload,
+ secure_session: read_secure_session,
+ ).lookup_or_create_user
sso.name = "Bill"
sso.username = "Hokli$$!!"
@@ -1716,7 +1777,7 @@ RSpec.describe Admin::UsersController do
expect(user.username).to eq("Hokli")
end
- it 'should create new users' do
+ it "should create new users" do
sso.name = "Dr. Claw"
sso.username = "dr_claw"
sso.email = "dr@claw.com"
@@ -1724,7 +1785,7 @@ RSpec.describe Admin::UsersController do
post "/admin/users/sync_sso.json", params: Rack::Utils.parse_query(sso.payload)
expect(response.status).to eq(200)
- user = User.find_by_email('dr@claw.com')
+ user = User.find_by_email("dr@claw.com")
expect(user).to be_present
expect(user.ip_address).to be_blank
end
@@ -1735,19 +1796,24 @@ RSpec.describe Admin::UsersController do
sso.email = "bob@bob.com"
sso.external_id = "1"
- user = DiscourseConnect.parse(sso.payload, secure_session: read_secure_session).lookup_or_create_user
+ user =
+ DiscourseConnect.parse(
+ sso.payload,
+ secure_session: read_secure_session,
+ ).lookup_or_create_user
sso.name = "Bill"
sso.username = "Hokli$$!!"
sso.email = "bob2@bob.com"
- events = DiscourseEvent.track_events do
- post "/admin/users/sync_sso.json", params: Rack::Utils.parse_query(sso.payload)
- end
+ events =
+ DiscourseEvent.track_events do
+ post "/admin/users/sync_sso.json", params: Rack::Utils.parse_query(sso.payload)
+ end
expect(events).to include(event_name: :sync_sso, params: [user])
end
- it 'should return the right message if the record is invalid' do
+ it "should return the right message if the record is invalid" do
sso.email = ""
sso.name = ""
sso.external_id = "1"
@@ -1757,16 +1823,17 @@ RSpec.describe Admin::UsersController do
expect(response.parsed_body["message"]).to include("Primary email can't be blank")
end
- it 'should return the right message if the signature is invalid' do
+ it "should return the right message if the signature is invalid" do
sso.name = "Dr. Claw"
sso.username = "dr_claw"
sso.email = "dr@claw.com"
sso.external_id = "2"
correct_payload = Rack::Utils.parse_query(sso.payload)
- post "/admin/users/sync_sso.json", params: correct_payload.merge(sig: "someincorrectsignature")
+ post "/admin/users/sync_sso.json",
+ params: correct_payload.merge(sig: "someincorrectsignature")
expect(response.status).to eq(422)
- expect(response.parsed_body["message"]).to include(I18n.t('discourse_connect.login_error'))
+ expect(response.parsed_body["message"]).to include(I18n.t("discourse_connect.login_error"))
expect(response.parsed_body["message"]).not_to include(correct_payload["sig"])
end
@@ -1777,7 +1844,9 @@ RSpec.describe Admin::UsersController do
sso.external_id = ""
post "/admin/users/sync_sso.json", params: Rack::Utils.parse_query(sso.payload)
expect(response.status).to eq(422)
- expect(response.parsed_body["message"]).to include(I18n.t('discourse_connect.blank_id_error'))
+ expect(response.parsed_body["message"]).to include(
+ I18n.t("discourse_connect.blank_id_error"),
+ )
end
end
@@ -1788,7 +1857,11 @@ RSpec.describe Admin::UsersController do
sso.email = "bob@bob.com"
sso.external_id = "1"
- user = DiscourseConnect.parse(sso.payload, secure_session: read_secure_session).lookup_or_create_user
+ user =
+ DiscourseConnect.parse(
+ sso.payload,
+ secure_session: read_secure_session,
+ ).lookup_or_create_user
sso.name = "Bill"
sso.username = "Hokli$$!!"
@@ -1813,13 +1886,13 @@ RSpec.describe Admin::UsersController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "sso sync not allowed"
end
end
- describe '#disable_second_factor' do
+ describe "#disable_second_factor" do
let(:second_factor) { user.create_totp(enabled: true) }
let(:second_factor_backup) { user.generate_backup_codes }
let(:security_key) { Fabricate(:user_security_key, user: user) }
@@ -1836,10 +1909,10 @@ RSpec.describe Admin::UsersController do
expect(user.reload.user_second_factors.totps.first).to eq(second_factor)
end
- it 'should able to disable the second factor for another user' do
- expect do
- put "/admin/users/#{user.id}/disable_second_factor.json"
- end.to change { Jobs::CriticalUserEmail.jobs.length }.by(1)
+ it "should able to disable the second factor for another user" do
+ expect do put "/admin/users/#{user.id}/disable_second_factor.json" end.to change {
+ Jobs::CriticalUserEmail.jobs.length
+ }.by(1)
expect(response.status).to eq(200)
expect(user.reload.user_second_factors).to be_empty
@@ -1848,24 +1921,24 @@ RSpec.describe Admin::UsersController do
job_args = Jobs::CriticalUserEmail.jobs.first["args"].first
expect(job_args["user_id"]).to eq(user.id)
- expect(job_args["type"]).to eq('account_second_factor_disabled')
+ expect(job_args["type"]).to eq("account_second_factor_disabled")
end
- it 'should not be able to disable the second factor for the current user' do
+ it "should not be able to disable the second factor for the current user" do
put "/admin/users/#{admin.id}/disable_second_factor.json"
expect(response.status).to eq(403)
end
- describe 'when user has only one second factor type enabled' do
- it 'should succeed with security keys' do
+ describe "when user has only one second factor type enabled" do
+ it "should succeed with security keys" do
user.user_second_factors.destroy_all
put "/admin/users/#{user.id}/disable_second_factor.json"
expect(response.status).to eq(200)
end
- it 'should succeed with totp' do
+ it "should succeed with totp" do
user.security_keys.destroy_all
put "/admin/users/#{user.id}/disable_second_factor.json"
@@ -1874,8 +1947,8 @@ RSpec.describe Admin::UsersController do
end
end
- describe 'when user does not have second factor enabled' do
- it 'should raise the right error' do
+ describe "when user does not have second factor enabled" do
+ it "should raise the right error" do
user.user_second_factors.destroy_all
user.security_keys.destroy_all
@@ -1890,9 +1963,9 @@ RSpec.describe Admin::UsersController do
before { sign_in(moderator) }
it "prevents disabling the second factor with a 403 response" do
- expect do
- put "/admin/users/#{user.id}/disable_second_factor.json"
- end.not_to change { Jobs::CriticalUserEmail.jobs.length }
+ expect do put "/admin/users/#{user.id}/disable_second_factor.json" end.not_to change {
+ Jobs::CriticalUserEmail.jobs.length
+ }
expect(response.status).to eq(403)
expect(response.parsed_body["errors"]).to include(I18n.t("invalid_access"))
@@ -1903,12 +1976,12 @@ RSpec.describe Admin::UsersController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
it "prevents disabling the second factor with a 403 response" do
- expect do
- put "/admin/users/#{user.id}/disable_second_factor.json"
- end.not_to change { Jobs::CriticalUserEmail.jobs.length }
+ expect do put "/admin/users/#{user.id}/disable_second_factor.json" end.not_to change {
+ Jobs::CriticalUserEmail.jobs.length
+ }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -1966,7 +2039,7 @@ RSpec.describe Admin::UsersController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "penalty history deletion not allowed"
end
@@ -1974,8 +2047,8 @@ RSpec.describe Admin::UsersController do
describe "#delete_posts_batch" do
shared_examples "post batch deletion possible" do
- context 'when user is is invalid' do
- it 'should return the right response' do
+ context "when user is is invalid" do
+ it "should return the right response" do
put "/admin/users/nothing/delete_posts_batch.json"
expect(response.status).to eq(404)
@@ -1989,7 +2062,7 @@ RSpec.describe Admin::UsersController do
Fabricate(:post, user: user)
end
- it 'returns how many posts were deleted' do
+ it "returns how many posts were deleted" do
put "/admin/users/#{user.id}/delete_posts_batch.json"
expect(response.status).to eq(200)
expect(response.parsed_body["posts_deleted"]).to eq(3)
@@ -2018,7 +2091,7 @@ RSpec.describe Admin::UsersController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
it "prevents batch deletion of posts with a 404 response" do
put "/admin/users/#{user.id}/delete_posts_batch.json"
@@ -2038,11 +2111,9 @@ RSpec.describe Admin::UsersController do
context "when logged in as an admin" do
before { sign_in(admin) }
- it 'should merge source user to target user' do
+ it "should merge source user to target user" do
Jobs.run_immediately!
- post "/admin/users/#{user.id}/merge.json", params: {
- target_username: target_user.username
- }
+ post "/admin/users/#{user.id}/merge.json", params: { target_username: target_user.username }
expect(response.status).to eq(200)
expect(topic.reload.user_id).to eq(target_user.id)
@@ -2053,11 +2124,9 @@ RSpec.describe Admin::UsersController do
context "when logged in as a moderator" do
before { sign_in(moderator) }
- it 'fails to merge source user to target user with 403 response' do
+ it "fails to merge source user to target user with 403 response" do
Jobs.run_immediately!
- post "/admin/users/#{user.id}/merge.json", params: {
- target_username: target_user.username
- }
+ post "/admin/users/#{user.id}/merge.json", params: { target_username: target_user.username }
expect(response.status).to eq(403)
expect(response.parsed_body["errors"]).to include(I18n.t("invalid_access"))
@@ -2068,13 +2137,11 @@ RSpec.describe Admin::UsersController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
- it 'prevents merging source user to target user with a 404 response' do
+ it "prevents merging source user to target user with a 404 response" do
Jobs.run_immediately!
- post "/admin/users/#{user.id}/merge.json", params: {
- target_username: target_user.username
- }
+ post "/admin/users/#{user.id}/merge.json", params: { target_username: target_user.username }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -2085,13 +2152,13 @@ RSpec.describe Admin::UsersController do
end
end
- describe '#sso_record' do
+ describe "#sso_record" do
fab!(:sso_record) do
SingleSignOnRecord.create!(
user_id: user.id,
- external_id: '12345',
+ external_id: "12345",
external_email: user.email,
- last_payload: ''
+ last_payload: "",
)
end
@@ -2124,7 +2191,7 @@ RSpec.describe Admin::UsersController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
it "prevents deletion of sso record with a 404 response" do
delete "/admin/users/#{user.id}/sso_record.json"
@@ -2141,7 +2208,7 @@ RSpec.describe Admin::UsersController do
it "will make the user anonymous" do
put "/admin/users/#{user.id}/anonymize.json"
expect(response.status).to eq(200)
- expect(response.parsed_body['username']).to be_present
+ expect(response.parsed_body["username"]).to be_present
end
it "supports `anonymize_ip`" do
@@ -2149,8 +2216,8 @@ RSpec.describe Admin::UsersController do
sl = Fabricate(:search_log, user_id: user.id)
put "/admin/users/#{user.id}/anonymize.json?anonymize_ip=127.0.0.2"
expect(response.status).to eq(200)
- expect(response.parsed_body['username']).to be_present
- expect(sl.reload.ip_address).to eq('127.0.0.2')
+ expect(response.parsed_body["username"]).to be_present
+ expect(sl.reload.ip_address).to eq("127.0.0.2")
end
end
@@ -2167,14 +2234,14 @@ RSpec.describe Admin::UsersController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
it "prevents anonymizing user with a 404 response" do
put "/admin/users/#{user.id}/anonymize.json"
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
- expect(response.parsed_body['username']).to be_nil
+ expect(response.parsed_body["username"]).to be_nil
end
end
end
diff --git a/spec/requests/admin/versions_controller_spec.rb b/spec/requests/admin/versions_controller_spec.rb
index 1d138641909..d8ee7b93a12 100644
--- a/spec/requests/admin/versions_controller_spec.rb
+++ b/spec/requests/admin/versions_controller_spec.rb
@@ -8,28 +8,28 @@ RSpec.describe Admin::VersionsController do
before do
Jobs::VersionCheck.any_instance.stubs(:execute).returns(true)
DiscourseUpdates.stubs(:updated_at).returns(2.hours.ago)
- DiscourseUpdates.stubs(:latest_version).returns('1.2.33')
+ DiscourseUpdates.stubs(:latest_version).returns("1.2.33")
DiscourseUpdates.stubs(:critical_updates_available?).returns(false)
end
describe "#show" do
shared_examples "version info accessible" do
- it 'should return the currently available version' do
+ it "should return the currently available version" do
get "/admin/version_check.json"
expect(response.status).to eq(200)
json = response.parsed_body
- expect(json['latest_version']).to eq('1.2.33')
+ expect(json["latest_version"]).to eq("1.2.33")
end
it "should return the installed version" do
get "/admin/version_check.json"
json = response.parsed_body
expect(response.status).to eq(200)
- expect(json['installed_version']).to eq(Discourse::VERSION::STRING)
+ expect(json["installed_version"]).to eq(Discourse::VERSION::STRING)
end
end
- context 'when logged in as admin' do
+ context "when logged in as admin" do
before { sign_in(admin) }
include_examples "version info accessible"
@@ -42,7 +42,7 @@ RSpec.describe Admin::VersionsController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
it "denies access with a 404 response" do
get "/admin/version_check.json"
diff --git a/spec/requests/admin/watched_words_controller_spec.rb b/spec/requests/admin/watched_words_controller_spec.rb
index 80fbd2e32cc..ef140bbdcf3 100644
--- a/spec/requests/admin/watched_words_controller_spec.rb
+++ b/spec/requests/admin/watched_words_controller_spec.rb
@@ -1,18 +1,16 @@
# frozen_string_literal: true
-require 'csv'
+require "csv"
RSpec.describe Admin::WatchedWordsController do
fab!(:admin) { Fabricate(:admin) }
fab!(:user) { Fabricate(:user) }
- describe '#destroy' do
+ describe "#destroy" do
fab!(:watched_word) { Fabricate(:watched_word) }
context "when logged in as a non-staff user" do
- before do
- sign_in(user)
- end
+ before { sign_in(user) }
it "can't delete a watched word" do
delete "/admin/customize/watched_words/#{watched_word.id}.json"
@@ -22,11 +20,9 @@ RSpec.describe Admin::WatchedWordsController do
end
context "when logged in as staff user" do
- before do
- sign_in(admin)
- end
+ before { sign_in(admin) }
- it 'should return the right response when given an invalid id param' do
+ it "should return the right response when given an invalid id param" do
delete "/admin/customize/watched_words/9999.json"
expect(response.status).to eq(400)
@@ -42,149 +38,152 @@ RSpec.describe Admin::WatchedWordsController do
end
end
- describe '#create' do
+ describe "#create" do
context "when logged in as a non-staff user" do
- before do
- sign_in(user)
- end
+ before { sign_in(user) }
it "can't create a watched word" do
- post "/admin/customize/watched_words.json", params: {
- action_key: 'flag',
- word: 'Fr33'
- }
+ post "/admin/customize/watched_words.json", params: { action_key: "flag", word: "Fr33" }
expect(response.status).to eq(404)
end
end
context "when logged in as a staff user" do
- before do
- sign_in(admin)
- end
+ before { sign_in(admin) }
- it 'creates a word with default case sensitivity' do
- post '/admin/customize/watched_words.json', params: {
- action_key: 'flag',
- word: 'Deals'
- }
+ it "creates a word with default case sensitivity" do
+ post "/admin/customize/watched_words.json", params: { action_key: "flag", word: "Deals" }
expect(response.status).to eq(200)
- expect(WatchedWord.take.word).to eq('Deals')
+ expect(WatchedWord.take.word).to eq("Deals")
end
- it 'creates a word with the given case sensitivity' do
- post '/admin/customize/watched_words.json', params: {
- action_key: 'flag',
- word: 'PNG',
- case_sensitive: true
- }
+ it "creates a word with the given case sensitivity" do
+ post "/admin/customize/watched_words.json",
+ params: {
+ action_key: "flag",
+ word: "PNG",
+ case_sensitive: true,
+ }
expect(response.status).to eq(200)
expect(WatchedWord.take.case_sensitive?).to eq(true)
- expect(WatchedWord.take.word).to eq('PNG')
+ expect(WatchedWord.take.word).to eq("PNG")
end
end
end
- describe '#upload' do
+ describe "#upload" do
context "when logged in as a non-staff user" do
- before do
- sign_in(user)
- end
+ before { sign_in(user) }
it "can't create watched words via file upload" do
- post "/admin/customize/watched_words/upload.json", params: {
- action_key: 'flag',
- file: Rack::Test::UploadedFile.new(file_from_fixtures("words.csv", "csv"))
- }
+ post "/admin/customize/watched_words/upload.json",
+ params: {
+ action_key: "flag",
+ file: Rack::Test::UploadedFile.new(file_from_fixtures("words.csv", "csv")),
+ }
expect(response.status).to eq(404)
end
end
- context 'when logged in as admin' do
+ context "when logged in as admin" do
before do
sign_in(admin)
- Fabricate(:tag, name: 'tag1')
- Fabricate(:tag, name: 'tag2')
- Fabricate(:tag, name: 'tag3')
+ Fabricate(:tag, name: "tag1")
+ Fabricate(:tag, name: "tag2")
+ Fabricate(:tag, name: "tag3")
end
- it 'creates the words from the file' do
- post '/admin/customize/watched_words/upload.json', params: {
- action_key: 'flag',
- file: Rack::Test::UploadedFile.new(file_from_fixtures("words.csv", "csv"))
- }
+ it "creates the words from the file" do
+ post "/admin/customize/watched_words/upload.json",
+ params: {
+ action_key: "flag",
+ file: Rack::Test::UploadedFile.new(file_from_fixtures("words.csv", "csv")),
+ }
expect(response.status).to eq(200)
expect(WatchedWord.count).to eq(6)
expect(WatchedWord.pluck(:word)).to contain_exactly(
- 'thread', '线', 'धागा', '실', 'tråd', 'нить'
+ "thread",
+ "线",
+ "धागा",
+ "실",
+ "tråd",
+ "нить",
)
expect(WatchedWord.pluck(:action).uniq).to eq([WatchedWord.actions[:flag]])
expect(UserHistory.where(action: UserHistory.actions[:watched_word_create]).count).to eq(6)
end
- it 'creates the words from the file' do
- post '/admin/customize/watched_words/upload.json', params: {
- action_key: 'tag',
- file: Rack::Test::UploadedFile.new(file_from_fixtures("words_tag.csv", "csv"))
- }
+ it "creates the words from the file" do
+ post "/admin/customize/watched_words/upload.json",
+ params: {
+ action_key: "tag",
+ file: Rack::Test::UploadedFile.new(file_from_fixtures("words_tag.csv", "csv")),
+ }
expect(response.status).to eq(200)
expect(WatchedWord.count).to eq(2)
expect(WatchedWord.pluck(:word, :replacement)).to contain_exactly(
- ['hello', 'tag1,tag2'],
- ['world', 'tag2,tag3']
+ %w[hello tag1,tag2],
+ %w[world tag2,tag3],
)
expect(WatchedWord.pluck(:action).uniq).to eq([WatchedWord.actions[:tag]])
expect(UserHistory.where(action: UserHistory.actions[:watched_word_create]).count).to eq(2)
end
- it 'creates case-sensitive words from the file' do
- post '/admin/customize/watched_words/upload.json', params: {
- action_key: 'flag',
- file: Rack::Test::UploadedFile.new(file_from_fixtures("words_case_sensitive.csv", "csv"))
- }
+ it "creates case-sensitive words from the file" do
+ post "/admin/customize/watched_words/upload.json",
+ params: {
+ action_key: "flag",
+ file:
+ Rack::Test::UploadedFile.new(
+ file_from_fixtures("words_case_sensitive.csv", "csv"),
+ ),
+ }
expect(response.status).to eq(200)
expect(WatchedWord.pluck(:word, :case_sensitive)).to contain_exactly(
- ['hello', true],
- ['UN', true],
- ['world', false],
- ['test', false]
+ ["hello", true],
+ ["UN", true],
+ ["world", false],
+ ["test", false],
)
end
end
end
- describe '#download' do
- context 'when not logged in as admin' do
+ describe "#download" do
+ context "when not logged in as admin" do
it "doesn't allow performing #download" do
get "/admin/customize/watched_words/action/block/download"
expect(response.status).to eq(404)
end
end
- context 'when logged in as admin' do
+ context "when logged in as admin" do
before do
sign_in(admin)
- Fabricate(:tag, name: 'tag1')
- Fabricate(:tag, name: 'tag2')
- Fabricate(:tag, name: 'tag3')
+ Fabricate(:tag, name: "tag1")
+ Fabricate(:tag, name: "tag2")
+ Fabricate(:tag, name: "tag3")
end
it "words of different actions are downloaded separately" do
block_word_1 = Fabricate(:watched_word, action: WatchedWord.actions[:block])
block_word_2 = Fabricate(:watched_word, action: WatchedWord.actions[:block])
censor_word_1 = Fabricate(:watched_word, action: WatchedWord.actions[:censor])
- autotag_1 = Fabricate(:watched_word, action: WatchedWord.actions[:tag], replacement: "tag1,tag2")
- autotag_2 = Fabricate(:watched_word, action: WatchedWord.actions[:tag], replacement: "tag3,tag2")
+ autotag_1 =
+ Fabricate(:watched_word, action: WatchedWord.actions[:tag], replacement: "tag1,tag2")
+ autotag_2 =
+ Fabricate(:watched_word, action: WatchedWord.actions[:tag], replacement: "tag3,tag2")
get "/admin/customize/watched_words/action/block/download"
expect(response.status).to eq(200)
@@ -201,14 +200,14 @@ RSpec.describe Admin::WatchedWordsController do
tag_words = response.body.split("\n").map(&:parse_csv)
expect(tag_words).to contain_exactly(
[autotag_1.word, autotag_1.replacement],
- [autotag_2.word, autotag_2.replacement]
+ [autotag_2.word, autotag_2.replacement],
)
end
end
end
- describe '#clear_all' do
- context 'with non admins' do
+ describe "#clear_all" do
+ context "with non admins" do
it "doesn't allow them to perform #clear_all" do
word = Fabricate(:watched_word, action: WatchedWord.actions[:block])
delete "/admin/customize/watched_words/action/block"
@@ -217,10 +216,8 @@ RSpec.describe Admin::WatchedWordsController do
end
end
- context 'with admins' do
- before do
- sign_in(admin)
- end
+ context "with admins" do
+ before { sign_in(admin) }
it "allows them to perform #clear_all" do
word = Fabricate(:watched_word, action: WatchedWord.actions[:block])
diff --git a/spec/requests/admin/web_hooks_controller_spec.rb b/spec/requests/admin/web_hooks_controller_spec.rb
index 66713bf57ec..bea9f637e13 100644
--- a/spec/requests/admin/web_hooks_controller_spec.rb
+++ b/spec/requests/admin/web_hooks_controller_spec.rb
@@ -6,45 +6,52 @@ RSpec.describe Admin::WebHooksController do
fab!(:moderator) { Fabricate(:moderator) }
fab!(:user) { Fabricate(:user) }
- describe '#create' do
+ describe "#create" do
context "when logged in as admin" do
before { sign_in(admin) }
- it 'creates a webhook' do
- post "/admin/api/web_hooks.json", params: {
- web_hook: {
- payload_url: 'https://meta.discourse.org/',
- content_type: 1,
- secret: "a_secret_for_webhooks",
- wildcard_web_hook: false,
- active: true,
- verify_certificate: true,
- web_hook_event_type_ids: [1],
- group_ids: [],
- category_ids: []
- }
- }
+ it "creates a webhook" do
+ post "/admin/api/web_hooks.json",
+ params: {
+ web_hook: {
+ payload_url: "https://meta.discourse.org/",
+ content_type: 1,
+ secret: "a_secret_for_webhooks",
+ wildcard_web_hook: false,
+ active: true,
+ verify_certificate: true,
+ web_hook_event_type_ids: [1],
+ group_ids: [],
+ category_ids: [],
+ },
+ }
expect(response.status).to eq(200)
json = response.parsed_body
expect(json["web_hook"]["payload_url"]).to eq("https://meta.discourse.org/")
- expect(UserHistory.where(acting_user_id: admin.id, action: UserHistory.actions[:web_hook_create]).count).to eq(1)
+ expect(
+ UserHistory.where(
+ acting_user_id: admin.id,
+ action: UserHistory.actions[:web_hook_create],
+ ).count,
+ ).to eq(1)
end
- it 'returns error when field is not filled correctly' do
- post "/admin/api/web_hooks.json", params: {
- web_hook: {
- content_type: 1,
- secret: "a_secret_for_webhooks",
- wildcard_web_hook: false,
- active: true,
- verify_certificate: true,
- web_hook_event_type_ids: [1],
- group_ids: [],
- category_ids: []
- }
- }
+ it "returns error when field is not filled correctly" do
+ post "/admin/api/web_hooks.json",
+ params: {
+ web_hook: {
+ content_type: 1,
+ secret: "a_secret_for_webhooks",
+ wildcard_web_hook: false,
+ active: true,
+ verify_certificate: true,
+ web_hook_event_type_ids: [1],
+ group_ids: [],
+ category_ids: [],
+ },
+ }
expect(response.status).to eq(422)
response_body = response.parsed_body
@@ -55,19 +62,20 @@ RSpec.describe Admin::WebHooksController do
shared_examples "webhook creation not allowed" do
it "prevents creation with a 404 response" do
- post "/admin/api/web_hooks.json", params: {
- web_hook: {
- payload_url: 'https://meta.discourse.org/',
- content_type: 1,
- secret: "a_secret_for_webhooks",
- wildcard_web_hook: false,
- active: true,
- verify_certificate: true,
- web_hook_event_type_ids: [1],
- group_ids: [],
- category_ids: []
- }
- }
+ post "/admin/api/web_hooks.json",
+ params: {
+ web_hook: {
+ payload_url: "https://meta.discourse.org/",
+ content_type: 1,
+ secret: "a_secret_for_webhooks",
+ wildcard_web_hook: false,
+ active: true,
+ verify_certificate: true,
+ web_hook_event_type_ids: [1],
+ group_ids: [],
+ category_ids: [],
+ },
+ }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -82,34 +90,46 @@ RSpec.describe Admin::WebHooksController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "webhook creation not allowed"
end
end
- describe '#update' do
+ describe "#update" do
context "when logged in as admin" do
before { sign_in(admin) }
it "logs webhook update" do
- put "/admin/api/web_hooks/#{web_hook.id}.json", params: {
- web_hook: { active: false, payload_url: "https://test.com" }
- }
+ put "/admin/api/web_hooks/#{web_hook.id}.json",
+ params: {
+ web_hook: {
+ active: false,
+ payload_url: "https://test.com",
+ },
+ }
expect(response.status).to eq(200)
- expect(UserHistory.where(acting_user_id: admin.id,
- action: UserHistory.actions[:web_hook_update],
- new_value: "active: false, payload_url: https://test.com").exists?).to eq(true)
+ expect(
+ UserHistory.where(
+ acting_user_id: admin.id,
+ action: UserHistory.actions[:web_hook_update],
+ new_value: "active: false, payload_url: https://test.com",
+ ).exists?,
+ ).to eq(true)
end
end
shared_examples "webhook update not allowed" do
it "prevents updates with a 404 response" do
current_payload_url = web_hook.payload_url
- put "/admin/api/web_hooks/#{web_hook.id}.json", params: {
- web_hook: { active: false, payload_url: "https://test.com" }
- }
+ put "/admin/api/web_hooks/#{web_hook.id}.json",
+ params: {
+ web_hook: {
+ active: false,
+ payload_url: "https://test.com",
+ },
+ }
web_hook.reload
expect(response.status).to eq(404)
@@ -125,23 +145,32 @@ RSpec.describe Admin::WebHooksController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "webhook update not allowed"
end
end
- describe '#destroy' do
+ describe "#destroy" do
context "when logged in as admin" do
before { sign_in(admin) }
it "logs webhook destroy" do
- delete "/admin/api/web_hooks/#{web_hook.id}.json", params: {
- web_hook: { active: false, payload_url: "https://test.com" }
- }
+ delete "/admin/api/web_hooks/#{web_hook.id}.json",
+ params: {
+ web_hook: {
+ active: false,
+ payload_url: "https://test.com",
+ },
+ }
expect(response.status).to eq(200)
- expect(UserHistory.where(acting_user_id: admin.id, action: UserHistory.actions[:web_hook_destroy]).exists?).to eq(true)
+ expect(
+ UserHistory.where(
+ acting_user_id: admin.id,
+ action: UserHistory.actions[:web_hook_destroy],
+ ).exists?,
+ ).to eq(true)
end
end
@@ -162,20 +191,20 @@ RSpec.describe Admin::WebHooksController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "webhook deletion not allowed"
end
end
- describe '#ping' do
+ describe "#ping" do
context "when logged in as admin" do
before { sign_in(admin) }
- it 'enqueues the ping event' do
- expect do
- post "/admin/api/web_hooks/#{web_hook.id}/ping.json"
- end.to change { Jobs::EmitWebHookEvent.jobs.size }.by(1)
+ it "enqueues the ping event" do
+ expect do post "/admin/api/web_hooks/#{web_hook.id}/ping.json" end.to change {
+ Jobs::EmitWebHookEvent.jobs.size
+ }.by(1)
expect(response.status).to eq(200)
job_args = Jobs::EmitWebHookEvent.jobs.first["args"].first
@@ -186,9 +215,9 @@ RSpec.describe Admin::WebHooksController do
shared_examples "webhook ping not allowed" do
it "fails to enqueue a ping with 404 response" do
- expect do
- post "/admin/api/web_hooks/#{web_hook.id}/ping.json"
- end.not_to change { Jobs::EmitWebHookEvent.jobs.size }
+ expect do post "/admin/api/web_hooks/#{web_hook.id}/ping.json" end.not_to change {
+ Jobs::EmitWebHookEvent.jobs.size
+ }
expect(response.status).to eq(404)
expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
@@ -202,31 +231,34 @@ RSpec.describe Admin::WebHooksController do
end
context "when logged in as a non-staff user" do
- before { sign_in(user) }
+ before { sign_in(user) }
include_examples "webhook ping not allowed"
end
end
- describe '#redeliver_event' do
+ describe "#redeliver_event" do
let!(:web_hook_event) do
- WebHookEvent.create!(
- web_hook: web_hook,
- payload: "abc",
- headers: JSON.dump(aa: "1", bb: "2"),
- )
+ WebHookEvent.create!(web_hook: web_hook, payload: "abc", headers: JSON.dump(aa: "1", bb: "2"))
end
before { sign_in(admin) }
- it 'emits the web hook and updates the response headers and body' do
- stub_request(:post, web_hook.payload_url)
- .with(body: "abc", headers: { "aa" => 1, "bb" => 2 })
- .to_return(
- status: 402,
- body: "efg",
- headers: { "Content-Type" => "application/json", "yoo" => "man" }
- )
+ it "emits the web hook and updates the response headers and body" do
+ stub_request(:post, web_hook.payload_url).with(
+ body: "abc",
+ headers: {
+ "aa" => 1,
+ "bb" => 2,
+ },
+ ).to_return(
+ status: 402,
+ body: "efg",
+ headers: {
+ "Content-Type" => "application/json",
+ "yoo" => "man",
+ },
+ )
post "/admin/api/web_hooks/#{web_hook.id}/events/#{web_hook_event.id}/redeliver.json"
expect(response.status).to eq(200)
@@ -237,7 +269,9 @@ RSpec.describe Admin::WebHooksController do
expect(JSON.parse(parsed_event["headers"])).to eq({ "aa" => "1", "bb" => "2" })
expect(parsed_event["payload"]).to eq("abc")
- expect(JSON.parse(parsed_event["response_headers"])).to eq({ "content-type" => "application/json", "yoo" => "man" })
+ expect(JSON.parse(parsed_event["response_headers"])).to eq(
+ { "content-type" => "application/json", "yoo" => "man" },
+ )
expect(parsed_event["response_body"]).to eq("efg")
end
@@ -249,7 +283,9 @@ RSpec.describe Admin::WebHooksController do
parsed_event = response.parsed_body["web_hook_event"]
expect(parsed_event["id"]).to eq(web_hook_event.id)
- expect(parsed_event["response_headers"]).to eq({ error: I18n.t("webhooks.payload_url.blocked_or_internal") }.to_json)
+ expect(parsed_event["response_headers"]).to eq(
+ { error: I18n.t("webhooks.payload_url.blocked_or_internal") }.to_json,
+ )
expect(parsed_event["status"]).to eq(-1)
expect(parsed_event["response_body"]).to eq(nil)
end
@@ -262,7 +298,9 @@ RSpec.describe Admin::WebHooksController do
parsed_event = response.parsed_body["web_hook_event"]
expect(parsed_event["id"]).to eq(web_hook_event.id)
- expect(parsed_event["response_headers"]).to eq({ error: I18n.t("webhooks.payload_url.blocked_or_internal") }.to_json)
+ expect(parsed_event["response_headers"]).to eq(
+ { error: I18n.t("webhooks.payload_url.blocked_or_internal") }.to_json,
+ )
expect(parsed_event["status"]).to eq(-1)
expect(parsed_event["response_body"]).to eq(nil)
end
diff --git a/spec/requests/api/backups_spec.rb b/spec/requests/api/backups_spec.rb
index 27a5dd512e0..f2561514960 100644
--- a/spec/requests/api/backups_spec.rb
+++ b/spec/requests/api/backups_spec.rb
@@ -1,18 +1,18 @@
# frozen_string_literal: true
-require 'swagger_helper'
-
-RSpec.describe 'backups' do
+require "swagger_helper"
+RSpec.describe "backups" do
let(:admin) { Fabricate(:admin) }
let(:backup_filename) { "2021-02-10-065935.tar.gz" }
let(:backup_filename2) { "2021-02-11-065935.tar.gz" }
def create_backup_files(*filenames)
- @paths = filenames.map do |filename|
- path = backup_path(filename)
- File.open(path, "w") { |f| f.write("test backup") }
- path
- end
+ @paths =
+ filenames.map do |filename|
+ path = backup_path(filename)
+ File.open(path, "w") { |f| f.write("test backup") }
+ path
+ end
end
def backup_path(filename)
@@ -33,16 +33,16 @@ RSpec.describe 'backups' do
@paths = nil
end
- path '/admin/backups.json' do
- get 'List backups' do
- tags 'Backups'
- operationId 'getBackups'
- consumes 'application/json'
+ path "/admin/backups.json" do
+ get "List backups" do
+ tags "Backups"
+ operationId "getBackups"
+ consumes "application/json"
expected_request_schema = nil
- produces 'application/json'
- response '200', 'success response' do
- expected_response_schema = load_spec_schema('backups_list_response')
+ produces "application/json"
+ response "200", "success response" do
+ expected_response_schema = load_spec_schema("backups_list_response")
schema expected_response_schema
it_behaves_like "a JSON endpoint", 200 do
@@ -52,20 +52,20 @@ RSpec.describe 'backups' do
end
end
- post 'Create backup' do
- tags 'Backups'
- operationId 'createBackup'
- consumes 'application/json'
- expected_request_schema = load_spec_schema('backups_create_request')
+ post "Create backup" do
+ tags "Backups"
+ operationId "createBackup"
+ consumes "application/json"
+ expected_request_schema = load_spec_schema("backups_create_request")
parameter name: :params, in: :body, schema: expected_request_schema
- produces 'application/json'
- response '200', 'success response' do
- expected_response_schema = load_spec_schema('success_ok_response')
+ produces "application/json"
+ response "200", "success response" do
+ expected_response_schema = load_spec_schema("success_ok_response")
schema expected_response_schema
#BackupRestore.expects(:backup!).with(admin.id, publish_to_message_bus: true, with_uploads: false, client_id: "foo")
- let(:params) { { 'with_uploads' => false } }
+ let(:params) { { "with_uploads" => false } }
#it_behaves_like "a JSON endpoint", 200 do
# let(:expected_response_schema) { expected_response_schema }
@@ -80,16 +80,16 @@ RSpec.describe 'backups' do
end
end
- path '/admin/backups/{filename}' do
- put 'Send download backup email' do
- tags 'Backups'
- operationId 'sendDownloadBackupEmail'
- consumes 'application/json'
+ path "/admin/backups/{filename}" do
+ put "Send download backup email" do
+ tags "Backups"
+ operationId "sendDownloadBackupEmail"
+ consumes "application/json"
expected_request_schema = nil
parameter name: :filename, in: :path, type: :string, required: true
- produces 'application/json'
- response '200', 'success response' do
+ produces "application/json"
+ response "200", "success response" do
expected_response_schema = nil
let(:filename) { backup_filename }
@@ -101,16 +101,16 @@ RSpec.describe 'backups' do
end
end
- get 'Download backup' do
- tags 'Backups'
- operationId 'downloadBackup'
- consumes 'application/json'
+ get "Download backup" do
+ tags "Backups"
+ operationId "downloadBackup"
+ consumes "application/json"
expected_request_schema = nil
parameter name: :filename, in: :path, type: :string, required: true
parameter name: :token, in: :query, type: :string, required: true
- produces 'application/json'
- response '200', 'success response' do
+ produces "application/json"
+ response "200", "success response" do
expected_response_schema = nil
let(:filename) { backup_filename }
diff --git a/spec/requests/api/badges_spec.rb b/spec/requests/api/badges_spec.rb
index a41ce764490..ddc46f16c85 100644
--- a/spec/requests/api/badges_spec.rb
+++ b/spec/requests/api/badges_spec.rb
@@ -1,8 +1,7 @@
# frozen_string_literal: true
-require 'swagger_helper'
-
-RSpec.describe 'badges' do
+require "swagger_helper"
+RSpec.describe "badges" do
fab!(:admin) { Fabricate(:admin) }
fab!(:badge) { Fabricate(:badge) }
@@ -11,17 +10,16 @@ RSpec.describe 'badges' do
sign_in(admin)
end
- path '/admin/badges.json' do
-
- get 'List badges' do
- tags 'Badges'
- operationId 'adminListBadges'
- consumes 'application/json'
+ path "/admin/badges.json" do
+ get "List badges" do
+ tags "Badges"
+ operationId "adminListBadges"
+ consumes "application/json"
expected_request_schema = nil
- produces 'application/json'
- response '200', 'success response' do
- expected_response_schema = load_spec_schema('badge_list_response')
+ produces "application/json"
+ response "200", "success response" do
+ expected_response_schema = load_spec_schema("badge_list_response")
schema expected_response_schema
it_behaves_like "a JSON endpoint", 200 do
@@ -31,22 +29,19 @@ RSpec.describe 'badges' do
end
end
- post 'Create badge' do
- tags 'Badges'
- operationId 'createBadge'
- consumes 'application/json'
- expected_request_schema = load_spec_schema('badge_create_request')
+ post "Create badge" do
+ tags "Badges"
+ operationId "createBadge"
+ consumes "application/json"
+ expected_request_schema = load_spec_schema("badge_create_request")
parameter name: :params, in: :body, schema: expected_request_schema
- produces 'application/json'
- response '200', 'success response' do
- expected_response_schema = load_spec_schema('badge_create_response')
+ produces "application/json"
+ response "200", "success response" do
+ expected_response_schema = load_spec_schema("badge_create_response")
schema expected_response_schema
- let(:params) { {
- 'name' => 'badge1',
- 'badge_type_id' => 2
- } }
+ let(:params) { { "name" => "badge1", "badge_type_id" => 2 } }
it_behaves_like "a JSON endpoint", 200 do
let(:expected_response_schema) { expected_response_schema }
@@ -56,27 +51,23 @@ RSpec.describe 'badges' do
end
end
- path '/admin/badges/{id}.json' do
-
- put 'Update badge' do
- tags 'Badges'
- operationId 'updateBadge'
- consumes 'application/json'
- expected_request_schema = load_spec_schema('badge_update_request')
+ path "/admin/badges/{id}.json" do
+ put "Update badge" do
+ tags "Badges"
+ operationId "updateBadge"
+ consumes "application/json"
+ expected_request_schema = load_spec_schema("badge_update_request")
parameter name: :id, in: :path, schema: { type: :integer }
parameter name: :params, in: :body, schema: expected_request_schema
- produces 'application/json'
- response '200', 'success response' do
- expected_response_schema = load_spec_schema('badge_update_response')
+ produces "application/json"
+ response "200", "success response" do
+ expected_response_schema = load_spec_schema("badge_update_response")
schema expected_response_schema
let(:id) { badge.id }
- let(:params) { {
- 'name' => 'badge1',
- 'badge_type_id' => 2
- } }
+ let(:params) { { "name" => "badge1", "badge_type_id" => 2 } }
it_behaves_like "a JSON endpoint", 200 do
let(:expected_response_schema) { expected_response_schema }
@@ -85,15 +76,15 @@ RSpec.describe 'badges' do
end
end
- delete 'Delete badge' do
- tags 'Badges'
- operationId 'deleteBadge'
- consumes 'application/json'
+ delete "Delete badge" do
+ tags "Badges"
+ operationId "deleteBadge"
+ consumes "application/json"
expected_request_schema = nil
parameter name: :id, in: :path, schema: { type: :integer }
- produces 'application/json'
- response '200', 'success response' do
+ produces "application/json"
+ response "200", "success response" do
expected_response_schema = nil
schema expected_response_schema
diff --git a/spec/requests/api/categories_spec.rb b/spec/requests/api/categories_spec.rb
index a204d1d44f8..e65e217aa4f 100644
--- a/spec/requests/api/categories_spec.rb
+++ b/spec/requests/api/categories_spec.rb
@@ -1,8 +1,7 @@
# frozen_string_literal: true
-require 'swagger_helper'
-
-RSpec.describe 'categories' do
+require "swagger_helper"
+RSpec.describe "categories" do
let(:admin) { Fabricate(:admin) }
let!(:category) { Fabricate(:category, user: admin) }
@@ -11,21 +10,20 @@ RSpec.describe 'categories' do
sign_in(admin)
end
- path '/categories.json' do
-
- post 'Creates a category' do
- tags 'Categories'
- operationId 'createCategory'
- consumes 'application/json'
- expected_request_schema = load_spec_schema('category_create_request')
+ path "/categories.json" do
+ post "Creates a category" do
+ tags "Categories"
+ operationId "createCategory"
+ consumes "application/json"
+ expected_request_schema = load_spec_schema("category_create_request")
parameter name: :params, in: :body, schema: expected_request_schema
- produces 'application/json'
- response '200', 'success response' do
- expected_response_schema = load_spec_schema('category_create_response')
+ produces "application/json"
+ response "200", "success response" do
+ expected_response_schema = load_spec_schema("category_create_response")
schema expected_response_schema
- let(:params) { { 'name' => 'todo' } }
+ let(:params) { { "name" => "todo" } }
it_behaves_like "a JSON endpoint", 200 do
let(:expected_response_schema) { expected_response_schema }
@@ -34,21 +32,16 @@ RSpec.describe 'categories' do
end
end
- get 'Retrieves a list of categories' do
- tags 'Categories'
- operationId 'listCategories'
- consumes 'application/json'
+ get "Retrieves a list of categories" do
+ tags "Categories"
+ operationId "listCategories"
+ consumes "application/json"
expected_request_schema = nil
- parameter name: :include_subcategories,
- in: :query,
- schema: {
- type: :boolean,
- enum: [true]
- }
+ parameter name: :include_subcategories, in: :query, schema: { type: :boolean, enum: [true] }
- produces 'application/json'
- response '200', 'success response' do
- expected_response_schema = load_spec_schema('category_list_response')
+ produces "application/json"
+ response "200", "success response" do
+ expected_response_schema = load_spec_schema("category_list_response")
schema expected_response_schema
let(:include_subcategories) { true }
@@ -61,23 +54,22 @@ RSpec.describe 'categories' do
end
end
- path '/categories/{id}.json' do
-
- put 'Updates a category' do
- tags 'Categories'
- operationId 'updateCategory'
- consumes 'application/json'
- expected_request_schema = load_spec_schema('category_create_request')
+ path "/categories/{id}.json" do
+ put "Updates a category" do
+ tags "Categories"
+ operationId "updateCategory"
+ consumes "application/json"
+ expected_request_schema = load_spec_schema("category_create_request")
parameter name: :id, in: :path, schema: { type: :integer }
parameter name: :params, in: :body, schema: expected_request_schema
- produces 'application/json'
- response '200', 'success response' do
- expected_response_schema = load_spec_schema('category_update_response')
+ produces "application/json"
+ response "200", "success response" do
+ expected_response_schema = load_spec_schema("category_update_response")
schema expected_response_schema
let(:id) { category.id }
- let(:params) { { 'name' => 'todo' } }
+ let(:params) { { "name" => "todo" } }
it_behaves_like "a JSON endpoint", 200 do
let(:expected_response_schema) { expected_response_schema }
@@ -87,19 +79,18 @@ RSpec.describe 'categories' do
end
end
- path '/c/{slug}/{id}.json' do
-
- get 'List topics' do
- tags 'Categories'
- operationId 'listCategoryTopics'
- produces 'application/json'
+ path "/c/{slug}/{id}.json" do
+ get "List topics" do
+ tags "Categories"
+ operationId "listCategoryTopics"
+ produces "application/json"
parameter name: :slug, in: :path, schema: { type: :string }
parameter name: :id, in: :path, schema: { type: :integer }
expected_request_schema = nil
- produces 'application/json'
- response '200', 'success response' do
- expected_response_schema = load_spec_schema('category_topics_response')
+ produces "application/json"
+ response "200", "success response" do
+ expected_response_schema = load_spec_schema("category_topics_response")
schema expected_response_schema
let(:id) { category.id }
@@ -113,18 +104,17 @@ RSpec.describe 'categories' do
end
end
- path '/c/{id}/show.json' do
-
- get 'Show category' do
- tags 'Categories'
- operationId 'getCategory'
- consumes 'application/json'
+ path "/c/{id}/show.json" do
+ get "Show category" do
+ tags "Categories"
+ operationId "getCategory"
+ consumes "application/json"
parameter name: :id, in: :path, schema: { type: :integer }
expected_request_schema = nil
- produces 'application/json'
- response '200', 'response' do
- expected_response_schema = load_spec_schema('category_create_response')
+ produces "application/json"
+ response "200", "response" do
+ expected_response_schema = load_spec_schema("category_create_response")
schema expected_response_schema
let(:id) { category.id }
@@ -136,5 +126,4 @@ RSpec.describe 'categories' do
end
end
end
-
end
diff --git a/spec/requests/api/groups_spec.rb b/spec/requests/api/groups_spec.rb
index fb58ae03d0e..c90f8aa6c05 100644
--- a/spec/requests/api/groups_spec.rb
+++ b/spec/requests/api/groups_spec.rb
@@ -1,8 +1,7 @@
# frozen_string_literal: true
-require 'swagger_helper'
-
-RSpec.describe 'groups' do
+require "swagger_helper"
+RSpec.describe "groups" do
let(:admin) { Fabricate(:admin) }
before do
@@ -10,20 +9,20 @@ RSpec.describe 'groups' do
sign_in(admin)
end
- path '/admin/groups.json' do
- post 'Create a group' do
- tags 'Groups'
- operationId 'createGroup'
- consumes 'application/json'
- expected_request_schema = load_spec_schema('group_create_request')
+ path "/admin/groups.json" do
+ post "Create a group" do
+ tags "Groups"
+ operationId "createGroup"
+ consumes "application/json"
+ expected_request_schema = load_spec_schema("group_create_request")
parameter name: :params, in: :body, schema: expected_request_schema
- produces 'application/json'
- response '200', 'group created' do
- expected_response_schema = load_spec_schema('group_create_response')
+ produces "application/json"
+ response "200", "group created" do
+ expected_response_schema = load_spec_schema("group_create_response")
schema expected_response_schema
- let(:params) { { 'group' => { 'name' => 'awesome' } } }
+ let(:params) { { "group" => { "name" => "awesome" } } }
it_behaves_like "a JSON endpoint", 200 do
let(:expected_response_schema) { expected_response_schema }
let(:expected_request_schema) { expected_request_schema }
@@ -32,17 +31,17 @@ RSpec.describe 'groups' do
end
end
- path '/admin/groups/{id}.json' do
- delete 'Delete a group' do
- tags 'Groups'
- operationId 'deleteGroup'
- consumes 'application/json'
+ path "/admin/groups/{id}.json" do
+ delete "Delete a group" do
+ tags "Groups"
+ operationId "deleteGroup"
+ consumes "application/json"
parameter name: :id, in: :path, type: :integer
expected_request_schema = nil
- produces 'application/json'
- response '200', 'response' do
- expected_response_schema = load_spec_schema('success_ok_response')
+ produces "application/json"
+ response "200", "response" do
+ expected_response_schema = load_spec_schema("success_ok_response")
schema expected_response_schema
let(:id) { Fabricate(:group).id }
@@ -54,39 +53,41 @@ RSpec.describe 'groups' do
end
end
- path '/groups/{id}.json' do
- put 'Update a group' do
- tags 'Groups'
- operationId 'updateGroup'
- consumes 'application/json'
+ path "/groups/{id}.json" do
+ put "Update a group" do
+ tags "Groups"
+ operationId "updateGroup"
+ consumes "application/json"
parameter name: :id, in: :path, type: :integer
- expected_request_schema = load_spec_schema('group_create_request')
+ expected_request_schema = load_spec_schema("group_create_request")
parameter name: :params, in: :body, schema: expected_request_schema
- produces 'application/json'
- response '200', 'success response' do
- schema type: :object, properties: {
- success: { type: :string, example: "OK" }
- }
+ produces "application/json"
+ response "200", "success response" do
+ schema type: :object, properties: { success: { type: :string, example: "OK" } }
let(:id) { Fabricate(:group).id }
- let(:params) { { 'group' => { 'name' => 'awesome' } } }
+ let(:params) { { "group" => { "name" => "awesome" } } }
run_test!
end
end
- get 'Get a group' do
- tags 'Groups'
- operationId 'getGroup'
- consumes 'application/json'
- parameter name: :id, in: :path, type: :string, example: 'name', description: "Use group name instead of id"
+ get "Get a group" do
+ tags "Groups"
+ operationId "getGroup"
+ consumes "application/json"
+ parameter name: :id,
+ in: :path,
+ type: :string,
+ example: "name",
+ description: "Use group name instead of id"
expected_request_schema = nil
- produces 'application/json'
- response '200', 'success response' do
- expected_response_schema = load_spec_schema('group_response')
+ produces "application/json"
+ response "200", "success response" do
+ expected_response_schema = load_spec_schema("group_response")
schema expected_response_schema
let(:id) { Fabricate(:group).name }
@@ -99,17 +100,21 @@ RSpec.describe 'groups' do
end
end
- path '/groups/{id}/members.json' do
- get 'List group members' do
- tags 'Groups'
- operationId 'listGroupMembers'
- consumes 'application/json'
- parameter name: :id, in: :path, type: :string, example: 'name', description: "Use group name instead of id"
+ path "/groups/{id}/members.json" do
+ get "List group members" do
+ tags "Groups"
+ operationId "listGroupMembers"
+ consumes "application/json"
+ parameter name: :id,
+ in: :path,
+ type: :string,
+ example: "name",
+ description: "Use group name instead of id"
expected_request_schema = nil
- produces 'application/json'
- response '200', 'success response' do
- expected_response_schema = load_spec_schema('group_members_response')
+ produces "application/json"
+ response "200", "success response" do
+ expected_response_schema = load_spec_schema("group_members_response")
schema expected_response_schema
let(:id) { Fabricate(:group).name }
@@ -121,24 +126,24 @@ RSpec.describe 'groups' do
end
end
- put 'Add group members' do
- tags 'Groups'
- operationId 'addGroupMembers'
- consumes 'application/json'
+ put "Add group members" do
+ tags "Groups"
+ operationId "addGroupMembers"
+ consumes "application/json"
parameter name: :id, in: :path, type: :integer
- expected_request_schema = load_spec_schema('group_add_members_request')
+ expected_request_schema = load_spec_schema("group_add_members_request")
parameter name: :params, in: :body, schema: expected_request_schema
- produces 'application/json'
- response '200', 'success response' do
- expected_response_schema = load_spec_schema('group_add_members_response')
+ produces "application/json"
+ response "200", "success response" do
+ expected_response_schema = load_spec_schema("group_add_members_response")
schema expected_response_schema
let(:id) { Fabricate(:group).id }
let(:user) { Fabricate(:user) }
let(:user2) { Fabricate(:user) }
let(:usernames) { "#{user.username},#{user2.username}" }
- let(:params) { { 'usernames' => usernames } }
+ let(:params) { { "usernames" => usernames } }
it_behaves_like "a JSON endpoint", 200 do
let(:expected_response_schema) { expected_response_schema }
@@ -147,24 +152,24 @@ RSpec.describe 'groups' do
end
end
- delete 'Remove group members' do
- tags 'Groups'
- operationId 'removeGroupMembers'
- consumes 'application/json'
+ delete "Remove group members" do
+ tags "Groups"
+ operationId "removeGroupMembers"
+ consumes "application/json"
parameter name: :id, in: :path, type: :integer
- expected_request_schema = load_spec_schema('group_remove_members_request')
+ expected_request_schema = load_spec_schema("group_remove_members_request")
parameter name: :params, in: :body, schema: expected_request_schema
- produces 'application/json'
- response '200', 'success response' do
- expected_response_schema = load_spec_schema('group_remove_members_response')
+ produces "application/json"
+ response "200", "success response" do
+ expected_response_schema = load_spec_schema("group_remove_members_response")
schema expected_response_schema
let(:id) { Fabricate(:group).id }
let(:user) { Fabricate(:user) }
let(:user2) { Fabricate(:user) }
let(:usernames) { "#{user.username},#{user2.username}" }
- let(:params) { { 'usernames' => usernames } }
+ let(:params) { { "usernames" => usernames } }
it_behaves_like "a JSON endpoint", 200 do
let(:expected_response_schema) { expected_response_schema }
@@ -174,16 +179,16 @@ RSpec.describe 'groups' do
end
end
- path '/groups.json' do
- get 'List groups' do
- tags 'Groups'
- operationId 'listGroups'
- consumes 'application/json'
+ path "/groups.json" do
+ get "List groups" do
+ tags "Groups"
+ operationId "listGroups"
+ consumes "application/json"
expected_request_schema = nil
- produces 'application/json'
- response '200', 'response' do
- expected_response_schema = load_spec_schema('groups_list_response')
+ produces "application/json"
+ response "200", "response" do
+ expected_response_schema = load_spec_schema("groups_list_response")
schema expected_response_schema
it_behaves_like "a JSON endpoint", 200 do
@@ -193,5 +198,4 @@ RSpec.describe 'groups' do
end
end
end
-
end
diff --git a/spec/requests/api/invites_spec.rb b/spec/requests/api/invites_spec.rb
index b9d814bbd5b..e80013d8459 100644
--- a/spec/requests/api/invites_spec.rb
+++ b/spec/requests/api/invites_spec.rb
@@ -1,50 +1,116 @@
# frozen_string_literal: true
-require 'swagger_helper'
+require "swagger_helper"
-RSpec.describe 'invites' do
+RSpec.describe "invites" do
+ let(:"Api-Key") { Fabricate(:api_key).key }
+ let(:"Api-Username") { "system" }
- let(:'Api-Key') { Fabricate(:api_key).key }
- let(:'Api-Username') { 'system' }
+ path "/invites.json" do
+ post "Create an invite" do
+ tags "Invites"
+ operationId "createInvite"
+ consumes "application/json"
+ parameter name: "Api-Key", in: :header, type: :string, required: true
+ parameter name: "Api-Username", in: :header, type: :string, required: true
- path '/invites.json' do
- post 'Create an invite' do
- tags 'Invites'
- operationId 'createInvite'
- consumes 'application/json'
- parameter name: 'Api-Key', in: :header, type: :string, required: true
- parameter name: 'Api-Username', in: :header, type: :string, required: true
+ parameter name: :request_body,
+ in: :body,
+ schema: {
+ type: :object,
+ properties: {
+ email: {
+ type: :string,
+ example: "not-a-user-yet@example.com",
+ description: "required for email invites only",
+ },
+ skip_email: {
+ type: :boolean,
+ default: false,
+ },
+ custom_message: {
+ type: :string,
+ description: "optional, for email invites",
+ },
+ max_redemptions_allowed: {
+ type: :integer,
+ example: 5,
+ default: 1,
+ description: "optional, for link invites",
+ },
+ topic_id: {
+ type: :integer,
+ },
+ group_id: {
+ type: :integer,
+ description: "optional, either this or `group_names`",
+ },
+ group_names: {
+ type: :string,
+ description: "optional, either this or `group_id`",
+ },
+ expires_at: {
+ type: :string,
+ description:
+ "optional, if not supplied, the invite_expiry_days site setting is used",
+ },
+ },
+ }
- parameter name: :request_body, in: :body, schema: {
- type: :object,
- properties: {
- email: { type: :string, example: "not-a-user-yet@example.com", description: "required for email invites only" },
- skip_email: { type: :boolean, default: false },
- custom_message: { type: :string, description: "optional, for email invites" },
- max_redemptions_allowed: { type: :integer, example: 5, default: 1, description: "optional, for link invites" },
- topic_id: { type: :integer },
- group_id: { type: :integer, description: "optional, either this or `group_names`" },
- group_names: { type: :string, description: "optional, either this or `group_id`" },
- expires_at: { type: :string, description: "optional, if not supplied, the invite_expiry_days site setting is used" },
- }
- }
+ produces "application/json"
+ response "200", "success response" do
+ schema type: :object,
+ properties: {
+ id: {
+ type: :integer,
+ example: 42,
+ },
+ link: {
+ type: :string,
+ example: "http://example.com/invites/9045fd767efe201ca60c6658bcf14158",
+ },
+ email: {
+ type: :string,
+ example: "not-a-user-yet@example.com",
+ },
+ emailed: {
+ type: :boolean,
+ example: false,
+ },
+ custom_message: {
+ type: %i[string null],
+ example: "Hello world!",
+ },
+ topics: {
+ type: :array,
+ items: {
+ },
+ example: [],
+ },
+ groups: {
+ type: :array,
+ items: {
+ },
+ example: [],
+ },
+ created_at: {
+ type: :string,
+ example: "2021-01-01T12:00:00.000Z",
+ },
+ updated_at: {
+ type: :string,
+ example: "2021-01-01T12:00:00.000Z",
+ },
+ expires_at: {
+ type: :string,
+ example: "2021-02-01T12:00:00.000Z",
+ },
+ expired: {
+ type: :boolean,
+ example: false,
+ },
+ }
- produces 'application/json'
- response '200', 'success response' do
- schema type: :object, properties: {
- id: { type: :integer, example: 42 },
- link: { type: :string, example: "http://example.com/invites/9045fd767efe201ca60c6658bcf14158" },
- email: { type: :string, example: "not-a-user-yet@example.com" },
- emailed: { type: :boolean, example: false },
- custom_message: { type: [:string, :null], example: "Hello world!" },
- topics: { type: :array, items: {}, example: [] },
- groups: { type: :array, items: {}, example: [] },
- created_at: { type: :string, example: "2021-01-01T12:00:00.000Z" },
- updated_at: { type: :string, example: "2021-01-01T12:00:00.000Z" },
- expires_at: { type: :string, example: "2021-02-01T12:00:00.000Z" },
- expired: { type: :boolean, example: false },
- }
-
- let(:request_body) { { email: 'not-a-user-yet@example.com' } }
+ let(:request_body) { { email: "not-a-user-yet@example.com" } }
run_test!
end
end
diff --git a/spec/requests/api/notifications_spec.rb b/spec/requests/api/notifications_spec.rb
index dc3a9d18fa0..58c5c88ad30 100644
--- a/spec/requests/api/notifications_spec.rb
+++ b/spec/requests/api/notifications_spec.rb
@@ -1,8 +1,7 @@
# frozen_string_literal: true
-require 'swagger_helper'
-
-RSpec.describe 'notifications' do
+require "swagger_helper"
+RSpec.describe "notifications" do
let(:admin) { Fabricate(:admin) }
let!(:notification) { Fabricate(:notification, user: admin) }
@@ -11,73 +10,103 @@ RSpec.describe 'notifications' do
sign_in(admin)
end
- path '/notifications.json' do
+ path "/notifications.json" do
+ get "Get the notifications that belong to the current user" do
+ tags "Notifications"
+ operationId "getNotifications"
- get 'Get the notifications that belong to the current user' do
- tags 'Notifications'
- operationId 'getNotifications'
-
- produces 'application/json'
- response '200', 'notifications' do
- schema type: :object, properties: {
- notifications: {
- type: :array,
- items: {
- type: :object,
- properties: {
- id: { type: :integer },
- user_id: { type: :integer },
- notification_type: { type: :integer },
- read: { type: :boolean },
- created_at: { type: :string },
- post_number: { type: [:string, :null] },
- topic_id: { type: [:integer, :null] },
- slug: { type: [:string, :null] },
- data: {
- type: :object,
- properties: {
- badge_id: { type: :integer },
- badge_name: { type: :string },
- badge_slug: { type: :string },
- badge_title: { type: :boolean },
- username: { type: :string },
- }
- },
- }
- },
- },
- total_rows_notifications: { type: :integer },
- seen_notification_id: { type: :integer },
- load_more_notifications: { type: :string },
- }
+ produces "application/json"
+ response "200", "notifications" do
+ schema type: :object,
+ properties: {
+ notifications: {
+ type: :array,
+ items: {
+ type: :object,
+ properties: {
+ id: {
+ type: :integer,
+ },
+ user_id: {
+ type: :integer,
+ },
+ notification_type: {
+ type: :integer,
+ },
+ read: {
+ type: :boolean,
+ },
+ created_at: {
+ type: :string,
+ },
+ post_number: {
+ type: %i[string null],
+ },
+ topic_id: {
+ type: %i[integer null],
+ },
+ slug: {
+ type: %i[string null],
+ },
+ data: {
+ type: :object,
+ properties: {
+ badge_id: {
+ type: :integer,
+ },
+ badge_name: {
+ type: :string,
+ },
+ badge_slug: {
+ type: :string,
+ },
+ badge_title: {
+ type: :boolean,
+ },
+ username: {
+ type: :string,
+ },
+ },
+ },
+ },
+ },
+ },
+ total_rows_notifications: {
+ type: :integer,
+ },
+ seen_notification_id: {
+ type: :integer,
+ },
+ load_more_notifications: {
+ type: :string,
+ },
+ }
run_test!
end
end
-
end
- path '/notifications/mark-read.json' do
+ path "/notifications/mark-read.json" do
+ put "Mark notifications as read" do
+ tags "Notifications"
+ operationId "markNotificationsAsRead"
+ consumes "application/json"
+ parameter name: :notification,
+ in: :body,
+ schema: {
+ type: :object,
+ properties: {
+ id: {
+ type: :integer,
+ description: "(optional) Leave off to mark all notifications as read",
+ },
+ },
+ }
- put 'Mark notifications as read' do
- tags 'Notifications'
- operationId 'markNotificationsAsRead'
- consumes 'application/json'
- parameter name: :notification, in: :body, schema: {
- type: :object,
- properties: {
- id: {
- type: :integer,
- description: '(optional) Leave off to mark all notifications as read'
- }
- },
- }
-
- produces 'application/json'
- response '200', 'notifications marked read' do
- schema type: :object, properties: {
- success: { type: :string },
- }
+ produces "application/json"
+ response "200", "notifications marked read" do
+ schema type: :object, properties: { success: { type: :string } }
run_test!
end
diff --git a/spec/requests/api/posts_spec.rb b/spec/requests/api/posts_spec.rb
index c7b8a26384e..0662571445e 100644
--- a/spec/requests/api/posts_spec.rb
+++ b/spec/requests/api/posts_spec.rb
@@ -1,10 +1,9 @@
# frozen_string_literal: true
-require 'swagger_helper'
+require "swagger_helper"
-RSpec.describe 'posts' do
-
- let(:'Api-Key') { Fabricate(:api_key).key }
- let(:'Api-Username') { 'system' }
+RSpec.describe "posts" do
+ let(:"Api-Key") { Fabricate(:api_key).key }
+ let(:"Api-Username") { "system" }
let(:admin) { Fabricate(:admin) }
before do
@@ -12,102 +11,208 @@ RSpec.describe 'posts' do
sign_in(admin)
end
- path '/posts.json' do
+ path "/posts.json" do
+ get "List latest posts across topics" do
+ tags "Posts"
+ operationId "listPosts"
+ parameter name: "Api-Key", in: :header, type: :string, required: true
+ parameter name: "Api-Username", in: :header, type: :string, required: true
+ parameter name: "before",
+ in: :query,
+ type: :string,
+ description: "Load posts with an id lower than this value. Useful for pagination.",
+ required: false
+ produces "application/json"
- get 'List latest posts across topics' do
- tags 'Posts'
- operationId 'listPosts'
- parameter name: 'Api-Key', in: :header, type: :string, required: true
- parameter name: 'Api-Username', in: :header, type: :string, required: true
- parameter name: 'before', in: :query, type: :string, description: "Load posts with an id lower than this value. Useful for pagination.", required: false
- produces 'application/json'
-
- response '200', 'latest posts' do
- schema type: :object, properties: {
- latest_posts: {
- type: :array,
- items: {
- type: :object,
- properties: {
- id: { type: :integer },
- name: { type: :string },
- username: { type: :string },
- avatar_template: { type: :string },
- created_at: { type: :string },
- cooked: { type: :string },
- post_number: { type: :integer },
- post_type: { type: :integer },
- updated_at: { type: :string },
- reply_count: { type: :integer },
- reply_to_post_number: { type: [:string, :null] },
- quote_count: { type: :integer },
- incoming_link_count: { type: :integer },
- reads: { type: :integer },
- readers_count: { type: :integer },
- score: { type: :number },
- yours: { type: :boolean },
- topic_id: { type: :integer },
- topic_slug: { type: :string },
- topic_title: { type: :string },
- topic_html_title: { type: :string },
- category_id: { type: :integer },
- display_username: { type: :string },
- primary_group_name: { type: [:string, :null] },
- flair_name: { type: [:string, :null] },
- flair_url: { type: [:string, :null] },
- flair_bg_color: { type: [:string, :null] },
- flair_color: { type: [:string, :null] },
- version: { type: :integer },
- can_edit: { type: :boolean },
- can_delete: { type: :boolean },
- can_recover: { type: :boolean },
- can_wiki: { type: :boolean },
- user_title: { type: [:string, :null] },
- raw: { type: :string },
- actions_summary: {
- type: :array,
- items: {
- type: :object,
- properties: {
- id: { type: :integer },
- can_act: { type: :boolean },
- }
- },
- },
- moderator: { type: :boolean },
- admin: { type: :boolean },
- staff: { type: :boolean },
- user_id: { type: :integer },
- hidden: { type: :boolean },
- trust_level: { type: :integer },
- deleted_at: { type: [:string, :null] },
- user_deleted: { type: :boolean },
- edit_reason: { type: [:string, :null] },
- can_view_edit_history: { type: :boolean },
- wiki: { type: :boolean },
- reviewable_id: { type: [:string, :null] },
- reviewable_score_count: { type: :integer },
- reviewable_score_pending_count: { type: :integer },
- }
- },
- },
- }
+ response "200", "latest posts" do
+ schema type: :object,
+ properties: {
+ latest_posts: {
+ type: :array,
+ items: {
+ type: :object,
+ properties: {
+ id: {
+ type: :integer,
+ },
+ name: {
+ type: :string,
+ },
+ username: {
+ type: :string,
+ },
+ avatar_template: {
+ type: :string,
+ },
+ created_at: {
+ type: :string,
+ },
+ cooked: {
+ type: :string,
+ },
+ post_number: {
+ type: :integer,
+ },
+ post_type: {
+ type: :integer,
+ },
+ updated_at: {
+ type: :string,
+ },
+ reply_count: {
+ type: :integer,
+ },
+ reply_to_post_number: {
+ type: %i[string null],
+ },
+ quote_count: {
+ type: :integer,
+ },
+ incoming_link_count: {
+ type: :integer,
+ },
+ reads: {
+ type: :integer,
+ },
+ readers_count: {
+ type: :integer,
+ },
+ score: {
+ type: :number,
+ },
+ yours: {
+ type: :boolean,
+ },
+ topic_id: {
+ type: :integer,
+ },
+ topic_slug: {
+ type: :string,
+ },
+ topic_title: {
+ type: :string,
+ },
+ topic_html_title: {
+ type: :string,
+ },
+ category_id: {
+ type: :integer,
+ },
+ display_username: {
+ type: :string,
+ },
+ primary_group_name: {
+ type: %i[string null],
+ },
+ flair_name: {
+ type: %i[string null],
+ },
+ flair_url: {
+ type: %i[string null],
+ },
+ flair_bg_color: {
+ type: %i[string null],
+ },
+ flair_color: {
+ type: %i[string null],
+ },
+ version: {
+ type: :integer,
+ },
+ can_edit: {
+ type: :boolean,
+ },
+ can_delete: {
+ type: :boolean,
+ },
+ can_recover: {
+ type: :boolean,
+ },
+ can_wiki: {
+ type: :boolean,
+ },
+ user_title: {
+ type: %i[string null],
+ },
+ raw: {
+ type: :string,
+ },
+ actions_summary: {
+ type: :array,
+ items: {
+ type: :object,
+ properties: {
+ id: {
+ type: :integer,
+ },
+ can_act: {
+ type: :boolean,
+ },
+ },
+ },
+ },
+ moderator: {
+ type: :boolean,
+ },
+ admin: {
+ type: :boolean,
+ },
+ staff: {
+ type: :boolean,
+ },
+ user_id: {
+ type: :integer,
+ },
+ hidden: {
+ type: :boolean,
+ },
+ trust_level: {
+ type: :integer,
+ },
+ deleted_at: {
+ type: %i[string null],
+ },
+ user_deleted: {
+ type: :boolean,
+ },
+ edit_reason: {
+ type: %i[string null],
+ },
+ can_view_edit_history: {
+ type: :boolean,
+ },
+ wiki: {
+ type: :boolean,
+ },
+ reviewable_id: {
+ type: %i[string null],
+ },
+ reviewable_score_count: {
+ type: :integer,
+ },
+ reviewable_score_pending_count: {
+ type: :integer,
+ },
+ },
+ },
+ },
+ }
let!(:post) { Fabricate(:post) }
run_test!
end
end
- post 'Creates a new topic, a new post, or a private message' do
- tags 'Posts', 'Topics', 'Private Messages'
- operationId 'createTopicPostPM'
- consumes 'application/json'
- expected_request_schema = load_spec_schema('topic_create_request')
+ post "Creates a new topic, a new post, or a private message" do
+ tags "Posts", "Topics", "Private Messages"
+ operationId "createTopicPostPM"
+ consumes "application/json"
+ expected_request_schema = load_spec_schema("topic_create_request")
parameter name: :params, in: :body, schema: expected_request_schema
- produces 'application/json'
- response '200', 'post created' do
- expected_response_schema = load_spec_schema('topic_create_response')
+ produces "application/json"
+ response "200", "post created" do
+ expected_response_schema = load_spec_schema("topic_create_response")
schema expected_response_schema
let(:params) { Fabricate(:post) }
@@ -120,196 +225,394 @@ RSpec.describe 'posts' do
end
end
- path '/posts/{id}.json' do
-
- get 'Retrieve a single post' do
- tags 'Posts'
- operationId 'getPost'
- parameter name: 'Api-Key', in: :header, type: :string, required: true
- parameter name: 'Api-Username', in: :header, type: :string, required: true
+ path "/posts/{id}.json" do
+ get "Retrieve a single post" do
+ tags "Posts"
+ operationId "getPost"
+ parameter name: "Api-Key", in: :header, type: :string, required: true
+ parameter name: "Api-Username", in: :header, type: :string, required: true
parameter name: :id, in: :path, schema: { type: :string }
- produces 'application/json'
+ produces "application/json"
- response '200', 'latest posts' do
- schema type: :object, properties: {
- id: { type: :integer },
- name: { type: [:string, :null] },
- username: { type: :string },
- avatar_template: { type: :string },
- created_at: { type: :string },
- cooked: { type: :string },
- post_number: { type: :integer },
- post_type: { type: :integer },
- updated_at: { type: :string },
- reply_count: { type: :integer },
- reply_to_post_number: { type: [:string, :null] },
- quote_count: { type: :integer },
- incoming_link_count: { type: :integer },
- reads: { type: :integer },
- readers_count: { type: :integer },
- score: { type: :integer },
- yours: { type: :boolean },
- topic_id: { type: :integer },
- topic_slug: { type: :string },
- display_username: { type: [:string, :null] },
- primary_group_name: { type: [:string, :null] },
- flair_name: { type: [:string, :null] },
- flair_url: { type: [:string, :null] },
- flair_bg_color: { type: [:string, :null] },
- flair_color: { type: [:string, :null] },
- version: { type: :integer },
- can_edit: { type: :boolean },
- can_delete: { type: :boolean },
- can_recover: { type: :boolean },
- can_wiki: { type: :boolean },
- user_title: { type: [:string, :null] },
- raw: { type: :string },
- actions_summary: {
- type: :array,
- items: {
- type: :object,
- properties: {
- id: { type: :integer },
- can_act: { type: :boolean },
- }
- },
- },
- moderator: { type: :boolean },
- admin: { type: :boolean },
- staff: { type: :boolean },
- user_id: { type: :integer },
- hidden: { type: :boolean },
- trust_level: { type: :integer },
- deleted_at: { type: [:string, :null] },
- user_deleted: { type: :boolean },
- edit_reason: { type: [:string, :null] },
- can_view_edit_history: { type: :boolean },
- wiki: { type: :boolean },
- reviewable_id: { type: [:string, :null] },
- reviewable_score_count: { type: :integer },
- reviewable_score_pending_count: { type: :integer },
- }
+ response "200", "latest posts" do
+ schema type: :object,
+ properties: {
+ id: {
+ type: :integer,
+ },
+ name: {
+ type: %i[string null],
+ },
+ username: {
+ type: :string,
+ },
+ avatar_template: {
+ type: :string,
+ },
+ created_at: {
+ type: :string,
+ },
+ cooked: {
+ type: :string,
+ },
+ post_number: {
+ type: :integer,
+ },
+ post_type: {
+ type: :integer,
+ },
+ updated_at: {
+ type: :string,
+ },
+ reply_count: {
+ type: :integer,
+ },
+ reply_to_post_number: {
+ type: %i[string null],
+ },
+ quote_count: {
+ type: :integer,
+ },
+ incoming_link_count: {
+ type: :integer,
+ },
+ reads: {
+ type: :integer,
+ },
+ readers_count: {
+ type: :integer,
+ },
+ score: {
+ type: :integer,
+ },
+ yours: {
+ type: :boolean,
+ },
+ topic_id: {
+ type: :integer,
+ },
+ topic_slug: {
+ type: :string,
+ },
+ display_username: {
+ type: %i[string null],
+ },
+ primary_group_name: {
+ type: %i[string null],
+ },
+ flair_name: {
+ type: %i[string null],
+ },
+ flair_url: {
+ type: %i[string null],
+ },
+ flair_bg_color: {
+ type: %i[string null],
+ },
+ flair_color: {
+ type: %i[string null],
+ },
+ version: {
+ type: :integer,
+ },
+ can_edit: {
+ type: :boolean,
+ },
+ can_delete: {
+ type: :boolean,
+ },
+ can_recover: {
+ type: :boolean,
+ },
+ can_wiki: {
+ type: :boolean,
+ },
+ user_title: {
+ type: %i[string null],
+ },
+ raw: {
+ type: :string,
+ },
+ actions_summary: {
+ type: :array,
+ items: {
+ type: :object,
+ properties: {
+ id: {
+ type: :integer,
+ },
+ can_act: {
+ type: :boolean,
+ },
+ },
+ },
+ },
+ moderator: {
+ type: :boolean,
+ },
+ admin: {
+ type: :boolean,
+ },
+ staff: {
+ type: :boolean,
+ },
+ user_id: {
+ type: :integer,
+ },
+ hidden: {
+ type: :boolean,
+ },
+ trust_level: {
+ type: :integer,
+ },
+ deleted_at: {
+ type: %i[string null],
+ },
+ user_deleted: {
+ type: :boolean,
+ },
+ edit_reason: {
+ type: %i[string null],
+ },
+ can_view_edit_history: {
+ type: :boolean,
+ },
+ wiki: {
+ type: :boolean,
+ },
+ reviewable_id: {
+ type: %i[string null],
+ },
+ reviewable_score_count: {
+ type: :integer,
+ },
+ reviewable_score_pending_count: {
+ type: :integer,
+ },
+ }
let(:id) { Fabricate(:post).id }
run_test!
end
end
- put 'Update a single post' do
- tags 'Posts'
- operationId 'updatePost'
- consumes 'application/json'
- parameter name: 'Api-Key', in: :header, type: :string, required: true
- parameter name: 'Api-Username', in: :header, type: :string, required: true
+ put "Update a single post" do
+ tags "Posts"
+ operationId "updatePost"
+ consumes "application/json"
+ parameter name: "Api-Key", in: :header, type: :string, required: true
+ parameter name: "Api-Username", in: :header, type: :string, required: true
parameter name: :id, in: :path, schema: { type: :string }
- parameter name: :post_body, in: :body, schema: {
- type: :object,
- properties: {
- post: {
- type: :object,
- properties: {
- raw: { type: :string },
- edit_reason: { type: :string },
- }, required: [ 'raw' ]
- }
- }
- }
-
- produces 'application/json'
- response '200', 'post updated' do
- schema type: :object, properties: {
- post: {
- type: :object,
- properties: {
- id: { type: :integer },
- name: { type: [:string, :null] },
- username: { type: :string },
- avatar_template: { type: :string },
- created_at: { type: :string },
- cooked: { type: :string },
- post_number: { type: :integer },
- post_type: { type: :integer },
- updated_at: { type: :string },
- reply_count: { type: :integer },
- reply_to_post_number: { type: [:string, :null] },
- quote_count: { type: :integer },
- incoming_link_count: { type: :integer },
- reads: { type: :integer },
- readers_count: { type: :integer },
- score: { type: :number },
- yours: { type: :boolean },
- topic_id: { type: :integer },
- topic_slug: { type: :string },
- display_username: { type: [:string, :null] },
- primary_group_name: { type: [:string, :null] },
- flair_url: { type: [:string, :null] },
- flair_bg_color: { type: [:string, :null] },
- flair_color: { type: [:string, :null] },
- version: { type: :integer },
- can_edit: { type: :boolean },
- can_delete: { type: :boolean },
- can_recover: { type: :boolean },
- can_wiki: { type: :boolean },
- user_title: { type: [:string, :null] },
- actions_summary: {
- type: :array,
- items: {
+ parameter name: :post_body,
+ in: :body,
+ schema: {
type: :object,
properties: {
- id: { type: :integer },
- can_act: { type: :boolean },
- }
- },
- },
- moderator: { type: :boolean },
- admin: { type: :boolean },
- staff: { type: :boolean },
- user_id: { type: :integer },
- draft_sequence: { type: :integer },
- hidden: { type: :boolean },
- trust_level: { type: :integer },
- deleted_at: { type: [:string, :null] },
- user_deleted: { type: :boolean },
- edit_reason: { type: [:string, :null] },
- can_view_edit_history: { type: :boolean },
- wiki: { type: :boolean },
- reviewable_id: { type: [:string, :null] },
- reviewable_score_count: { type: :integer },
- reviewable_score_pending_count: { type: :integer },
- }
- },
- }
+ post: {
+ type: :object,
+ properties: {
+ raw: {
+ type: :string,
+ },
+ edit_reason: {
+ type: :string,
+ },
+ },
+ required: ["raw"],
+ },
+ },
+ }
- let(:post_body) { { 'post': { 'raw': 'Updated content!', 'edit_reason': 'fixed typo' } } }
+ produces "application/json"
+ response "200", "post updated" do
+ schema type: :object,
+ properties: {
+ post: {
+ type: :object,
+ properties: {
+ id: {
+ type: :integer,
+ },
+ name: {
+ type: %i[string null],
+ },
+ username: {
+ type: :string,
+ },
+ avatar_template: {
+ type: :string,
+ },
+ created_at: {
+ type: :string,
+ },
+ cooked: {
+ type: :string,
+ },
+ post_number: {
+ type: :integer,
+ },
+ post_type: {
+ type: :integer,
+ },
+ updated_at: {
+ type: :string,
+ },
+ reply_count: {
+ type: :integer,
+ },
+ reply_to_post_number: {
+ type: %i[string null],
+ },
+ quote_count: {
+ type: :integer,
+ },
+ incoming_link_count: {
+ type: :integer,
+ },
+ reads: {
+ type: :integer,
+ },
+ readers_count: {
+ type: :integer,
+ },
+ score: {
+ type: :number,
+ },
+ yours: {
+ type: :boolean,
+ },
+ topic_id: {
+ type: :integer,
+ },
+ topic_slug: {
+ type: :string,
+ },
+ display_username: {
+ type: %i[string null],
+ },
+ primary_group_name: {
+ type: %i[string null],
+ },
+ flair_url: {
+ type: %i[string null],
+ },
+ flair_bg_color: {
+ type: %i[string null],
+ },
+ flair_color: {
+ type: %i[string null],
+ },
+ version: {
+ type: :integer,
+ },
+ can_edit: {
+ type: :boolean,
+ },
+ can_delete: {
+ type: :boolean,
+ },
+ can_recover: {
+ type: :boolean,
+ },
+ can_wiki: {
+ type: :boolean,
+ },
+ user_title: {
+ type: %i[string null],
+ },
+ actions_summary: {
+ type: :array,
+ items: {
+ type: :object,
+ properties: {
+ id: {
+ type: :integer,
+ },
+ can_act: {
+ type: :boolean,
+ },
+ },
+ },
+ },
+ moderator: {
+ type: :boolean,
+ },
+ admin: {
+ type: :boolean,
+ },
+ staff: {
+ type: :boolean,
+ },
+ user_id: {
+ type: :integer,
+ },
+ draft_sequence: {
+ type: :integer,
+ },
+ hidden: {
+ type: :boolean,
+ },
+ trust_level: {
+ type: :integer,
+ },
+ deleted_at: {
+ type: %i[string null],
+ },
+ user_deleted: {
+ type: :boolean,
+ },
+ edit_reason: {
+ type: %i[string null],
+ },
+ can_view_edit_history: {
+ type: :boolean,
+ },
+ wiki: {
+ type: :boolean,
+ },
+ reviewable_id: {
+ type: %i[string null],
+ },
+ reviewable_score_count: {
+ type: :integer,
+ },
+ reviewable_score_pending_count: {
+ type: :integer,
+ },
+ },
+ },
+ }
+
+ let(:post_body) { { post: { raw: "Updated content!", edit_reason: "fixed typo" } } }
let(:id) { Fabricate(:post).id }
run_test! do |response|
data = JSON.parse(response.body)
- expect(data['post']['cooked']).to eq("Updated content!
")
- expect(data['post']['edit_reason']).to eq("fixed typo")
+ expect(data["post"]["cooked"]).to eq("Updated content!
")
+ expect(data["post"]["edit_reason"]).to eq("fixed typo")
end
end
end
- delete 'delete a single post' do
- tags 'Posts'
- operationId 'deletePost'
- consumes 'application/json'
- expected_request_schema = load_spec_schema('post_delete_request')
+ delete "delete a single post" do
+ tags "Posts"
+ operationId "deletePost"
+ consumes "application/json"
+ expected_request_schema = load_spec_schema("post_delete_request")
parameter name: :id, in: :path, schema: { type: :integer }
parameter name: :params, in: :body, schema: expected_request_schema
- produces 'application/json'
- response '200', 'success response' do
+ produces "application/json"
+ response "200", "success response" do
expected_response_schema = nil
schema expected_response_schema
let(:topic) { Fabricate(:topic) }
let(:post) { Fabricate(:post, topic_id: topic.id, post_number: 3) }
let(:id) { post.id }
- let(:params) { { 'force_destroy' => false } }
+ let(:params) { { "force_destroy" => false } }
it_behaves_like "a JSON endpoint", 200 do
let(:expected_response_schema) { expected_response_schema }
@@ -319,23 +622,30 @@ RSpec.describe 'posts' do
end
end
- path '/posts/{id}/replies.json' do
- get 'List replies to a post' do
- tags 'Posts'
- operationId 'postReplies'
- consumes 'application/json'
+ path "/posts/{id}/replies.json" do
+ get "List replies to a post" do
+ tags "Posts"
+ operationId "postReplies"
+ consumes "application/json"
expected_request_schema = nil
parameter name: :id, in: :path, schema: { type: :string }
- produces 'application/json'
- response '200', 'post replies' do
- expected_response_schema = load_spec_schema('post_replies_response')
+ produces "application/json"
+ response "200", "post replies" do
+ expected_response_schema = load_spec_schema("post_replies_response")
schema expected_response_schema
fab!(:user) { Fabricate(:user) }
fab!(:topic) { Fabricate(:topic) }
fab!(:post) { Fabricate(:post, topic: topic, user: user) }
- let!(:reply) { PostCreator.new(user, raw: "this is some text for my post", topic_id: topic.id, reply_to_post_number: post.post_number).create }
+ let!(:reply) do
+ PostCreator.new(
+ user,
+ raw: "this is some text for my post",
+ topic_id: topic.id,
+ reply_to_post_number: post.post_number,
+ ).create
+ end
let!(:id) { post.id }
it_behaves_like "a JSON endpoint", 200 do
@@ -346,129 +656,241 @@ RSpec.describe 'posts' do
end
end
- path '/posts/{id}/locked.json' do
- put 'Lock a post from being edited' do
- tags 'Posts'
- operationId 'lockPost'
- consumes 'application/json'
- parameter name: 'Api-Key', in: :header, type: :string, required: true
- parameter name: 'Api-Username', in: :header, type: :string, required: true
+ path "/posts/{id}/locked.json" do
+ put "Lock a post from being edited" do
+ tags "Posts"
+ operationId "lockPost"
+ consumes "application/json"
+ parameter name: "Api-Key", in: :header, type: :string, required: true
+ parameter name: "Api-Username", in: :header, type: :string, required: true
parameter name: :id, in: :path, schema: { type: :string }
- parameter name: :post_body, in: :body, schema: {
- type: :object,
- properties: {
- locked: { type: :string }
- }, required: [ 'locked' ]
- }
+ parameter name: :post_body,
+ in: :body,
+ schema: {
+ type: :object,
+ properties: {
+ locked: {
+ type: :string,
+ },
+ },
+ required: ["locked"],
+ }
- produces 'application/json'
- response '200', 'post updated' do
- schema type: :object, properties: {
- locked: { type: :boolean },
- }
+ produces "application/json"
+ response "200", "post updated" do
+ schema type: :object, properties: { locked: { type: :boolean } }
- let(:post_body) { { 'locked': 'true' } }
+ let(:post_body) { { locked: "true" } }
let(:id) { Fabricate(:post).id }
run_test! do |response|
data = JSON.parse(response.body)
- expect(data['locked']).to eq(true)
+ expect(data["locked"]).to eq(true)
end
end
end
end
- path '/post_actions.json' do
- post 'Like a post and other actions' do
- tags 'Posts'
- operationId 'performPostAction'
- consumes 'application/json'
- parameter name: 'Api-Key', in: :header, type: :string, required: true
- parameter name: 'Api-Username', in: :header, type: :string, required: true
+ path "/post_actions.json" do
+ post "Like a post and other actions" do
+ tags "Posts"
+ operationId "performPostAction"
+ consumes "application/json"
+ parameter name: "Api-Key", in: :header, type: :string, required: true
+ parameter name: "Api-Username", in: :header, type: :string, required: true
- parameter name: :post_body, in: :body, schema: {
- type: :object,
- properties: {
- id: { type: :integer },
- post_action_type_id: { type: :integer },
- flag_topic: { type: :boolean },
- }, required: [ 'id', 'post_action_type_id' ]
- }
+ parameter name: :post_body,
+ in: :body,
+ schema: {
+ type: :object,
+ properties: {
+ id: {
+ type: :integer,
+ },
+ post_action_type_id: {
+ type: :integer,
+ },
+ flag_topic: {
+ type: :boolean,
+ },
+ },
+ required: %w[id post_action_type_id],
+ }
- produces 'application/json'
- response '200', 'post updated' do
- schema type: :object, properties: {
- id: { type: :integer },
- name: { type: :string },
- username: { type: :string },
- avatar_template: { type: :string },
- created_at: { type: :string },
- cooked: { type: :string },
- post_number: { type: :integer },
- post_type: { type: :integer },
- updated_at: { type: :string },
- reply_count: { type: :integer },
- reply_to_post_number: { type: [:string, :null] },
- quote_count: { type: :integer },
- incoming_link_count: { type: :integer },
- reads: { type: :integer },
- readers_count: { type: :integer },
- score: { type: :number },
- yours: { type: :boolean },
- topic_id: { type: :integer },
- topic_slug: { type: :string },
- display_username: { type: :string },
- primary_group_name: { type: [:string, :null] },
- flair_name: { type: [:string, :null] },
- flair_url: { type: [:string, :null] },
- flair_bg_color: { type: [:string, :null] },
- flair_color: { type: [:string, :null] },
- version: { type: :integer },
- can_edit: { type: :boolean },
- can_delete: { type: :boolean },
- can_recover: { type: :boolean },
- can_wiki: { type: :boolean },
- user_title: { type: [:string, :null] },
- actions_summary: {
- type: :array,
- items: {
- type: :object,
- properties: {
- id: { type: :integer },
- count: { type: :integer },
- acted: { type: :boolean },
- can_undo: { type: :boolean },
- }
- },
- },
- moderator: { type: :boolean },
- admin: { type: :boolean },
- staff: { type: :boolean },
- user_id: { type: :integer },
- hidden: { type: :boolean },
- trust_level: { type: :integer },
- deleted_at: { type: [:string, :null] },
- user_deleted: { type: :boolean },
- edit_reason: { type: [:string, :null] },
- can_view_edit_history: { type: :boolean },
- wiki: { type: :boolean },
- notice: { type: :object },
- reviewable_id: { type: [:string, :null] },
- reviewable_score_count: { type: :integer },
- reviewable_score_pending_count: { type: :integer },
- }
+ produces "application/json"
+ response "200", "post updated" do
+ schema type: :object,
+ properties: {
+ id: {
+ type: :integer,
+ },
+ name: {
+ type: :string,
+ },
+ username: {
+ type: :string,
+ },
+ avatar_template: {
+ type: :string,
+ },
+ created_at: {
+ type: :string,
+ },
+ cooked: {
+ type: :string,
+ },
+ post_number: {
+ type: :integer,
+ },
+ post_type: {
+ type: :integer,
+ },
+ updated_at: {
+ type: :string,
+ },
+ reply_count: {
+ type: :integer,
+ },
+ reply_to_post_number: {
+ type: %i[string null],
+ },
+ quote_count: {
+ type: :integer,
+ },
+ incoming_link_count: {
+ type: :integer,
+ },
+ reads: {
+ type: :integer,
+ },
+ readers_count: {
+ type: :integer,
+ },
+ score: {
+ type: :number,
+ },
+ yours: {
+ type: :boolean,
+ },
+ topic_id: {
+ type: :integer,
+ },
+ topic_slug: {
+ type: :string,
+ },
+ display_username: {
+ type: :string,
+ },
+ primary_group_name: {
+ type: %i[string null],
+ },
+ flair_name: {
+ type: %i[string null],
+ },
+ flair_url: {
+ type: %i[string null],
+ },
+ flair_bg_color: {
+ type: %i[string null],
+ },
+ flair_color: {
+ type: %i[string null],
+ },
+ version: {
+ type: :integer,
+ },
+ can_edit: {
+ type: :boolean,
+ },
+ can_delete: {
+ type: :boolean,
+ },
+ can_recover: {
+ type: :boolean,
+ },
+ can_wiki: {
+ type: :boolean,
+ },
+ user_title: {
+ type: %i[string null],
+ },
+ actions_summary: {
+ type: :array,
+ items: {
+ type: :object,
+ properties: {
+ id: {
+ type: :integer,
+ },
+ count: {
+ type: :integer,
+ },
+ acted: {
+ type: :boolean,
+ },
+ can_undo: {
+ type: :boolean,
+ },
+ },
+ },
+ },
+ moderator: {
+ type: :boolean,
+ },
+ admin: {
+ type: :boolean,
+ },
+ staff: {
+ type: :boolean,
+ },
+ user_id: {
+ type: :integer,
+ },
+ hidden: {
+ type: :boolean,
+ },
+ trust_level: {
+ type: :integer,
+ },
+ deleted_at: {
+ type: %i[string null],
+ },
+ user_deleted: {
+ type: :boolean,
+ },
+ edit_reason: {
+ type: %i[string null],
+ },
+ can_view_edit_history: {
+ type: :boolean,
+ },
+ wiki: {
+ type: :boolean,
+ },
+ notice: {
+ type: :object,
+ },
+ reviewable_id: {
+ type: %i[string null],
+ },
+ reviewable_score_count: {
+ type: :integer,
+ },
+ reviewable_score_pending_count: {
+ type: :integer,
+ },
+ }
let(:id) { Fabricate(:post).id }
let(:post_body) { { id: id, post_action_type_id: 2 } }
run_test! do |response|
data = JSON.parse(response.body)
- expect(data['actions_summary'][0]['id']).to eq(2)
- expect(data['actions_summary'][0]['count']).to eq(1)
+ expect(data["actions_summary"][0]["id"]).to eq(2)
+ expect(data["actions_summary"][0]["count"]).to eq(1)
end
end
end
end
-
end
diff --git a/spec/requests/api/private_messages_spec.rb b/spec/requests/api/private_messages_spec.rb
index d85345e5a65..2086302e785 100644
--- a/spec/requests/api/private_messages_spec.rb
+++ b/spec/requests/api/private_messages_spec.rb
@@ -1,8 +1,7 @@
# frozen_string_literal: true
-require 'swagger_helper'
-
-RSpec.describe 'private messages' do
+require "swagger_helper"
+RSpec.describe "private messages" do
let(:admin) { Fabricate(:admin) }
before do
@@ -10,208 +9,398 @@ RSpec.describe 'private messages' do
sign_in(admin)
end
- path '/topics/private-messages/{username}.json' do
-
- get 'Get a list of private messages for a user' do
- tags 'Private Messages'
- operationId 'listUserPrivateMessages'
+ path "/topics/private-messages/{username}.json" do
+ get "Get a list of private messages for a user" do
+ tags "Private Messages"
+ operationId "listUserPrivateMessages"
parameter name: :username, in: :path, schema: { type: :string }
- produces 'application/json'
- response '200', 'private messages' do
- schema type: :object, properties: {
- users: {
- type: :array,
- items: {
- type: :object,
- properties: {
- id: { type: :integer },
- username: { type: :string },
- name: { type: :string },
- avatar_template: { type: :string },
- }
- },
- },
- primary_groups: {
- type: :array,
- items: {},
- },
- topic_list: {
- type: :object,
- properties: {
- can_create_topic: { type: :boolean },
- draft: { type: [:string, :null] },
- draft_key: { type: :string },
- draft_sequence: { type: :integer },
- per_page: { type: :integer },
- topics: {
- type: :array,
- items: {
- type: :object,
- properties: {
- id: { type: :integer },
- title: { type: :string },
- fancy_title: { type: :string },
- slug: { type: :string },
- posts_count: { type: :integer },
- reply_count: { type: :integer },
- highest_post_number: { type: :integer },
- image_url: { type: [:string, :null] },
- created_at: { type: :string },
- last_posted_at: { type: :string },
- bumped: { type: :boolean },
- bumped_at: { type: :string },
- archetype: { type: :string },
- unseen: { type: :boolean },
- last_read_post_number: { type: :integer },
- unread_posts: { type: :integer },
- pinned: { type: :boolean },
- unpinned: { type: [:string, :null] },
- visible: { type: :boolean },
- closed: { type: :boolean },
- archived: { type: :boolean },
- notification_level: { type: :integer },
- bookmarked: { type: :boolean },
- liked: { type: :boolean },
- views: { type: :integer },
- like_count: { type: :integer },
- has_summary: { type: :boolean },
- last_poster_username: { type: :string },
- category_id: { type: [:string, :null] },
- pinned_globally: { type: :boolean },
- featured_link: { type: [:string, :null] },
- allowed_user_count: { type: :integer },
- posters: {
- type: :array,
- items: {
- type: :object,
- properties: {
- extras: { type: :string },
- description: { type: :string },
- user_id: { type: :integer },
- primary_group_id: { type: [:string, :null] },
- }
- },
- },
- participants: {
- type: :array,
- items: {
- type: :object,
- properties: {
- extras: { type: :string },
- description: { type: [:string, :null] },
- user_id: { type: :integer },
- primary_group_id: { type: [:string, :null] },
- }
- },
- },
- }
- },
- },
- }
- },
- }
+ produces "application/json"
+ response "200", "private messages" do
+ schema type: :object,
+ properties: {
+ users: {
+ type: :array,
+ items: {
+ type: :object,
+ properties: {
+ id: {
+ type: :integer,
+ },
+ username: {
+ type: :string,
+ },
+ name: {
+ type: :string,
+ },
+ avatar_template: {
+ type: :string,
+ },
+ },
+ },
+ },
+ primary_groups: {
+ type: :array,
+ items: {
+ },
+ },
+ topic_list: {
+ type: :object,
+ properties: {
+ can_create_topic: {
+ type: :boolean,
+ },
+ draft: {
+ type: %i[string null],
+ },
+ draft_key: {
+ type: :string,
+ },
+ draft_sequence: {
+ type: :integer,
+ },
+ per_page: {
+ type: :integer,
+ },
+ topics: {
+ type: :array,
+ items: {
+ type: :object,
+ properties: {
+ id: {
+ type: :integer,
+ },
+ title: {
+ type: :string,
+ },
+ fancy_title: {
+ type: :string,
+ },
+ slug: {
+ type: :string,
+ },
+ posts_count: {
+ type: :integer,
+ },
+ reply_count: {
+ type: :integer,
+ },
+ highest_post_number: {
+ type: :integer,
+ },
+ image_url: {
+ type: %i[string null],
+ },
+ created_at: {
+ type: :string,
+ },
+ last_posted_at: {
+ type: :string,
+ },
+ bumped: {
+ type: :boolean,
+ },
+ bumped_at: {
+ type: :string,
+ },
+ archetype: {
+ type: :string,
+ },
+ unseen: {
+ type: :boolean,
+ },
+ last_read_post_number: {
+ type: :integer,
+ },
+ unread_posts: {
+ type: :integer,
+ },
+ pinned: {
+ type: :boolean,
+ },
+ unpinned: {
+ type: %i[string null],
+ },
+ visible: {
+ type: :boolean,
+ },
+ closed: {
+ type: :boolean,
+ },
+ archived: {
+ type: :boolean,
+ },
+ notification_level: {
+ type: :integer,
+ },
+ bookmarked: {
+ type: :boolean,
+ },
+ liked: {
+ type: :boolean,
+ },
+ views: {
+ type: :integer,
+ },
+ like_count: {
+ type: :integer,
+ },
+ has_summary: {
+ type: :boolean,
+ },
+ last_poster_username: {
+ type: :string,
+ },
+ category_id: {
+ type: %i[string null],
+ },
+ pinned_globally: {
+ type: :boolean,
+ },
+ featured_link: {
+ type: %i[string null],
+ },
+ allowed_user_count: {
+ type: :integer,
+ },
+ posters: {
+ type: :array,
+ items: {
+ type: :object,
+ properties: {
+ extras: {
+ type: :string,
+ },
+ description: {
+ type: :string,
+ },
+ user_id: {
+ type: :integer,
+ },
+ primary_group_id: {
+ type: %i[string null],
+ },
+ },
+ },
+ },
+ participants: {
+ type: :array,
+ items: {
+ type: :object,
+ properties: {
+ extras: {
+ type: :string,
+ },
+ description: {
+ type: %i[string null],
+ },
+ user_id: {
+ type: :integer,
+ },
+ primary_group_id: {
+ type: %i[string null],
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+ }
let(:username) { Fabricate(:user).username }
run_test!
end
end
-
end
- path '/topics/private-messages-sent/{username}.json' do
-
- get 'Get a list of private messages sent for a user' do
- tags 'Private Messages'
- operationId 'getUserSentPrivateMessages'
+ path "/topics/private-messages-sent/{username}.json" do
+ get "Get a list of private messages sent for a user" do
+ tags "Private Messages"
+ operationId "getUserSentPrivateMessages"
parameter name: :username, in: :path, schema: { type: :string }
- produces 'application/json'
- response '200', 'private messages' do
- schema type: :object, properties: {
- users: {
- type: :array,
- items: {
- type: :object,
- properties: {
- id: { type: :integer },
- username: { type: :string },
- name: { type: [:string, :null] },
- avatar_template: { type: :string },
- }
- },
- },
- primary_groups: {
- type: :array,
- items: {},
- },
- topic_list: {
- type: :object,
- properties: {
- can_create_topic: { type: :boolean },
- draft: { type: [:string, :null] },
- draft_key: { type: :string },
- draft_sequence: { type: :integer },
- per_page: { type: :integer },
- topics: {
- type: :array,
- items: {
- type: :object,
- properties: {
- id: { type: :integer },
- title: { type: :string },
- fancy_title: { type: :string },
- slug: { type: :string },
- posts_count: { type: :integer },
- reply_count: { type: :integer },
- highest_post_number: { type: :integer },
- image_url: { type: [:string, :null] },
- created_at: { type: :string },
- last_posted_at: { type: :string },
- bumped: { type: :boolean },
- bumped_at: { type: :string },
- archetype: { type: :string },
- unseen: { type: :boolean },
- last_read_post_number: { type: :integer },
- unread_posts: { type: :integer },
- pinned: { type: :boolean },
- unpinned: { type: [:string, :null] },
- visible: { type: :boolean },
- closed: { type: :boolean },
- archived: { type: :boolean },
- notification_level: { type: :integer },
- bookmarked: { type: :boolean },
- liked: { type: :boolean },
- views: { type: :integer },
- like_count: { type: :integer },
- has_summary: { type: :boolean },
- last_poster_username: { type: :string },
- category_id: { type: [:string, :null] },
- pinned_globally: { type: :boolean },
- featured_link: { type: [:string, :null] },
- allowed_user_count: { type: :integer },
- posters: {
- type: :array,
- items: {
- type: :object,
- properties: {
- extras: { type: :string },
- description: { type: :string },
- user_id: { type: :integer },
- primary_group_id: { type: [:string, :null] },
- }
- },
- },
- participants: {
- type: :array,
- items: {},
- },
- }
- },
- },
- }
- },
- }
+ produces "application/json"
+ response "200", "private messages" do
+ schema type: :object,
+ properties: {
+ users: {
+ type: :array,
+ items: {
+ type: :object,
+ properties: {
+ id: {
+ type: :integer,
+ },
+ username: {
+ type: :string,
+ },
+ name: {
+ type: %i[string null],
+ },
+ avatar_template: {
+ type: :string,
+ },
+ },
+ },
+ },
+ primary_groups: {
+ type: :array,
+ items: {
+ },
+ },
+ topic_list: {
+ type: :object,
+ properties: {
+ can_create_topic: {
+ type: :boolean,
+ },
+ draft: {
+ type: %i[string null],
+ },
+ draft_key: {
+ type: :string,
+ },
+ draft_sequence: {
+ type: :integer,
+ },
+ per_page: {
+ type: :integer,
+ },
+ topics: {
+ type: :array,
+ items: {
+ type: :object,
+ properties: {
+ id: {
+ type: :integer,
+ },
+ title: {
+ type: :string,
+ },
+ fancy_title: {
+ type: :string,
+ },
+ slug: {
+ type: :string,
+ },
+ posts_count: {
+ type: :integer,
+ },
+ reply_count: {
+ type: :integer,
+ },
+ highest_post_number: {
+ type: :integer,
+ },
+ image_url: {
+ type: %i[string null],
+ },
+ created_at: {
+ type: :string,
+ },
+ last_posted_at: {
+ type: :string,
+ },
+ bumped: {
+ type: :boolean,
+ },
+ bumped_at: {
+ type: :string,
+ },
+ archetype: {
+ type: :string,
+ },
+ unseen: {
+ type: :boolean,
+ },
+ last_read_post_number: {
+ type: :integer,
+ },
+ unread_posts: {
+ type: :integer,
+ },
+ pinned: {
+ type: :boolean,
+ },
+ unpinned: {
+ type: %i[string null],
+ },
+ visible: {
+ type: :boolean,
+ },
+ closed: {
+ type: :boolean,
+ },
+ archived: {
+ type: :boolean,
+ },
+ notification_level: {
+ type: :integer,
+ },
+ bookmarked: {
+ type: :boolean,
+ },
+ liked: {
+ type: :boolean,
+ },
+ views: {
+ type: :integer,
+ },
+ like_count: {
+ type: :integer,
+ },
+ has_summary: {
+ type: :boolean,
+ },
+ last_poster_username: {
+ type: :string,
+ },
+ category_id: {
+ type: %i[string null],
+ },
+ pinned_globally: {
+ type: :boolean,
+ },
+ featured_link: {
+ type: %i[string null],
+ },
+ allowed_user_count: {
+ type: :integer,
+ },
+ posters: {
+ type: :array,
+ items: {
+ type: :object,
+ properties: {
+ extras: {
+ type: :string,
+ },
+ description: {
+ type: :string,
+ },
+ user_id: {
+ type: :integer,
+ },
+ primary_group_id: {
+ type: %i[string null],
+ },
+ },
+ },
+ },
+ participants: {
+ type: :array,
+ items: {
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+ }
let(:username) { Fabricate(:user).username }
run_test!
diff --git a/spec/requests/api/schemas/schema_loader.rb b/spec/requests/api/schemas/schema_loader.rb
index 872e47d74a0..51da348bcea 100644
--- a/spec/requests/api/schemas/schema_loader.rb
+++ b/spec/requests/api/schemas/schema_loader.rb
@@ -1,11 +1,9 @@
# frozen_string_literal: true
-require 'json'
+require "json"
module SpecSchemas
-
class SpecLoader
-
def initialize(filename)
@filename = filename
end
@@ -14,5 +12,4 @@ module SpecSchemas
JSON.parse(File.read(File.join(__dir__, "json", "#{@filename}.json")))
end
end
-
end
diff --git a/spec/requests/api/search_spec.rb b/spec/requests/api/search_spec.rb
index 88f528e1833..0cce833b233 100644
--- a/spec/requests/api/search_spec.rb
+++ b/spec/requests/api/search_spec.rb
@@ -1,8 +1,7 @@
# frozen_string_literal: true
-require 'swagger_helper'
-
-RSpec.describe 'groups' do
+require "swagger_helper"
+RSpec.describe "groups" do
let(:admin) { Fabricate(:admin) }
before do
@@ -10,17 +9,18 @@ RSpec.describe 'groups' do
sign_in(admin)
end
- path '/search.json' do
- get 'Search for a term' do
- tags 'Search'
- operationId 'search'
- consumes 'application/json'
+ path "/search.json" do
+ get "Search for a term" do
+ tags "Search"
+ operationId "search"
+ consumes "application/json"
parameter(
name: :q,
in: :query,
type: :string,
- example: 'api @blake #support tags:api after:2021-06-04 in:unseen in:open order:latest_topic',
- description: <<~MD
+ example:
+ "api @blake #support tags:api after:2021-06-04 in:unseen in:open order:latest_topic",
+ description: <<~MD,
The query string needs to be url encoded and is made up of the following options:
- Search term. This is just a string. Usually it would be the first item in the query.
- `@`: Use the `@` followed by the username to specify posts by this user.
@@ -49,12 +49,12 @@ RSpec.describe 'groups' do
)
parameter name: :page, in: :query, type: :integer, example: 1
- produces 'application/json'
- response '200', 'success response' do
- expected_response_schema = load_spec_schema('search_response')
+ produces "application/json"
+ response "200", "success response" do
+ expected_response_schema = load_spec_schema("search_response")
schema expected_response_schema
- let(:q) { 'awesome post' }
+ let(:q) { "awesome post" }
let(:page) { 1 }
run_test!
diff --git a/spec/requests/api/shared/shared_examples.rb b/spec/requests/api/shared/shared_examples.rb
index eb21df58c5d..4bcead54997 100644
--- a/spec/requests/api/shared/shared_examples.rb
+++ b/spec/requests/api/shared/shared_examples.rb
@@ -1,9 +1,7 @@
# frozen_string_literal: true
RSpec.shared_examples "a JSON endpoint" do |expected_response_status|
- before do |example|
- submit_request(example.metadata)
- end
+ before { |example| submit_request(example.metadata) }
def expect_schema_valid(schemer, params)
valid = schemer.valid?(params)
@@ -15,7 +13,7 @@ RSpec.shared_examples "a JSON endpoint" do |expected_response_status|
if details
puts "VALIDATION DETAILS: #{details}"
else
- puts "POSSIBLE ISSUE W/: #{validation_result['data_pointer']}"
+ puts "POSSIBLE ISSUE W/: #{validation_result["data_pointer"]}"
end
end
expect(valid).to eq(true)
diff --git a/spec/requests/api/site_spec.rb b/spec/requests/api/site_spec.rb
index e779c045ae6..ba056f519e2 100644
--- a/spec/requests/api/site_spec.rb
+++ b/spec/requests/api/site_spec.rb
@@ -1,8 +1,7 @@
# frozen_string_literal: true
-require 'swagger_helper'
-
-RSpec.describe 'site' do
+require "swagger_helper"
+RSpec.describe "site" do
fab!(:admin) { Fabricate(:admin) }
fab!(:category) { Fabricate(:category) }
fab!(:subcategory) { Fabricate(:category, parent_category: category) }
@@ -12,21 +11,20 @@ RSpec.describe 'site' do
sign_in(admin)
end
- path '/site.json' do
-
- get 'Get site info' do
- tags 'Site', 'Categories'
- operationId 'getSite'
- description 'Can be used to fetch all categories and subcategories'
- consumes 'application/json'
+ path "/site.json" do
+ get "Get site info" do
+ tags "Site", "Categories"
+ operationId "getSite"
+ description "Can be used to fetch all categories and subcategories"
+ consumes "application/json"
expected_request_schema = nil
- produces 'application/json'
- response '200', 'success response' do
+ produces "application/json"
+ response "200", "success response" do
begin
Site.preloaded_category_custom_fields << "no_oddjob"
- expected_response_schema = load_spec_schema('site_response')
+ expected_response_schema = load_spec_schema("site_response")
schema expected_response_schema
it_behaves_like "a JSON endpoint", 200 do
diff --git a/spec/requests/api/tags_spec.rb b/spec/requests/api/tags_spec.rb
index 95bfd028832..2c282aab592 100644
--- a/spec/requests/api/tags_spec.rb
+++ b/spec/requests/api/tags_spec.rb
@@ -1,10 +1,9 @@
# frozen_string_literal: true
-require 'swagger_helper'
-
-RSpec.describe 'tags' do
+require "swagger_helper"
+RSpec.describe "tags" do
let(:admin) { Fabricate(:admin) }
- let!(:tag) { Fabricate(:tag, name: 'foo') }
+ let!(:tag) { Fabricate(:tag, name: "foo") }
let!(:tag_group) { Fabricate(:tag_group, tags: [tag]) }
before do
@@ -13,62 +12,71 @@ RSpec.describe 'tags' do
sign_in(admin)
end
- path '/tag_groups.json' do
+ path "/tag_groups.json" do
+ get "Get a list of tag groups" do
+ tags "Tags"
+ operationId "listTagGroups"
- get 'Get a list of tag groups' do
- tags 'Tags'
- operationId 'listTagGroups'
-
- produces 'application/json'
- response '200', 'tags' do
- schema type: :object, properties: {
- tag_groups: {
- type: :array,
- items: {
- type: :object,
- properties: {
- id: { type: :integer },
- name: { type: :string },
- tag_names: {
- type: :array,
- items: {},
- },
- parent_tag_name: {
- type: :array,
- items: {},
- },
- one_per_topic: { type: :boolean },
- permissions: {
- type: :object,
- properties: {
- staff: { type: :integer },
- }
- },
- }
- },
- },
- }
+ produces "application/json"
+ response "200", "tags" do
+ schema type: :object,
+ properties: {
+ tag_groups: {
+ type: :array,
+ items: {
+ type: :object,
+ properties: {
+ id: {
+ type: :integer,
+ },
+ name: {
+ type: :string,
+ },
+ tag_names: {
+ type: :array,
+ items: {
+ },
+ },
+ parent_tag_name: {
+ type: :array,
+ items: {
+ },
+ },
+ one_per_topic: {
+ type: :boolean,
+ },
+ permissions: {
+ type: :object,
+ properties: {
+ staff: {
+ type: :integer,
+ },
+ },
+ },
+ },
+ },
+ },
+ }
run_test!
end
end
end
- path '/tag_groups.json' do
-
- post 'Creates a tag group' do
- tags 'Tags'
- operationId 'createTagGroup'
- consumes 'application/json'
- expected_request_schema = load_spec_schema('tag_group_create_request')
+ path "/tag_groups.json" do
+ post "Creates a tag group" do
+ tags "Tags"
+ operationId "createTagGroup"
+ consumes "application/json"
+ expected_request_schema = load_spec_schema("tag_group_create_request")
parameter name: :params, in: :body, schema: expected_request_schema
- produces 'application/json'
- response '200', 'tag group created' do
- expected_response_schema = load_spec_schema('tag_group_create_response')
+ produces "application/json"
+ response "200", "tag group created" do
+ expected_response_schema = load_spec_schema("tag_group_create_response")
- let(:params) { { 'name' => 'todo' } }
+ let(:params) { { "name" => "todo" } }
schema(expected_response_schema)
@@ -78,43 +86,52 @@ RSpec.describe 'tags' do
end
end
end
-
end
- path '/tag_groups/{id}.json' do
-
- get 'Get a single tag group' do
- tags 'Tags'
- operationId 'getTagGroup'
- consumes 'application/json'
+ path "/tag_groups/{id}.json" do
+ get "Get a single tag group" do
+ tags "Tags"
+ operationId "getTagGroup"
+ consumes "application/json"
parameter name: :id, in: :path, schema: { type: :string }
- produces 'application/json'
- response '200', 'notifications' do
- schema type: :object, properties: {
- tag_group: {
- type: :object,
- properties: {
- id: { type: :integer },
- name: { type: :string },
- tag_names: {
- type: :array,
- items: {},
- },
- parent_tag_name: {
- type: :array,
- items: {},
- },
- one_per_topic: { type: :boolean },
- permissions: {
- type: :object,
- properties: {
- everyone: { type: :integer },
- }
- },
- }
- },
- }
+ produces "application/json"
+ response "200", "notifications" do
+ schema type: :object,
+ properties: {
+ tag_group: {
+ type: :object,
+ properties: {
+ id: {
+ type: :integer,
+ },
+ name: {
+ type: :string,
+ },
+ tag_names: {
+ type: :array,
+ items: {
+ },
+ },
+ parent_tag_name: {
+ type: :array,
+ items: {
+ },
+ },
+ one_per_topic: {
+ type: :boolean,
+ },
+ permissions: {
+ type: :object,
+ properties: {
+ everyone: {
+ type: :integer,
+ },
+ },
+ },
+ },
+ },
+ }
let(:id) { tag_group.id }
run_test!
@@ -122,201 +139,325 @@ RSpec.describe 'tags' do
end
end
- path '/tag_groups/{id}.json' do
-
- put 'Update tag group' do
- tags 'Tags'
- operationId 'updateTagGroup'
- consumes 'application/json'
+ path "/tag_groups/{id}.json" do
+ put "Update tag group" do
+ tags "Tags"
+ operationId "updateTagGroup"
+ consumes "application/json"
parameter name: :id, in: :path, schema: { type: :string }
- parameter name: :put_body, in: :body, schema: {
- type: :object,
- properties: {
- name: { type: :string }
- }
- }
-
- produces 'application/json'
- response '200', 'Tag group updated' do
- schema type: :object, properties: {
- success: { type: :string },
- tag_group: {
- type: :object,
- properties: {
- id: { type: :integer },
- name: { type: :string },
- tag_names: {
- type: :array,
- items: {},
- },
- parent_tag_name: {
- type: :array,
- items: {},
- },
- one_per_topic: { type: :boolean },
- permissions: {
- type: :object,
- properties: {
- everyone: { type: :integer },
+ parameter name: :put_body,
+ in: :body,
+ schema: {
+ type: :object,
+ properties: {
+ name: {
+ type: :string,
+ },
+ },
}
- },
- }
- },
- }
+
+ produces "application/json"
+ response "200", "Tag group updated" do
+ schema type: :object,
+ properties: {
+ success: {
+ type: :string,
+ },
+ tag_group: {
+ type: :object,
+ properties: {
+ id: {
+ type: :integer,
+ },
+ name: {
+ type: :string,
+ },
+ tag_names: {
+ type: :array,
+ items: {
+ },
+ },
+ parent_tag_name: {
+ type: :array,
+ items: {
+ },
+ },
+ one_per_topic: {
+ type: :boolean,
+ },
+ permissions: {
+ type: :object,
+ properties: {
+ everyone: {
+ type: :integer,
+ },
+ },
+ },
+ },
+ },
+ }
let(:id) { tag_group.id }
- let(:put_body) { { name: 'todo2' } }
+ let(:put_body) { { name: "todo2" } }
run_test!
end
end
end
- path '/tags.json' do
+ path "/tags.json" do
+ get "Get a list of tags" do
+ tags "Tags"
+ operationId "listTags"
- get 'Get a list of tags' do
- tags 'Tags'
- operationId 'listTags'
-
- produces 'application/json'
- response '200', 'notifications' do
- schema type: :object, properties: {
- tags: {
- type: :array,
- items: {
- type: :object,
- properties: {
- id: { type: :string },
- text: { type: :string },
- count: { type: :integer },
- pm_count: { type: :integer },
- target_tag: { type: [:string, :null] },
- }
- },
- },
- extras: {
- type: :object,
- properties: {
- categories: {
- type: :array,
- items: {},
- },
- }
- },
- }
+ produces "application/json"
+ response "200", "notifications" do
+ schema type: :object,
+ properties: {
+ tags: {
+ type: :array,
+ items: {
+ type: :object,
+ properties: {
+ id: {
+ type: :string,
+ },
+ text: {
+ type: :string,
+ },
+ count: {
+ type: :integer,
+ },
+ pm_count: {
+ type: :integer,
+ },
+ target_tag: {
+ type: %i[string null],
+ },
+ },
+ },
+ },
+ extras: {
+ type: :object,
+ properties: {
+ categories: {
+ type: :array,
+ items: {
+ },
+ },
+ },
+ },
+ }
run_test!
end
end
end
- path '/tag/{name}.json' do
-
- get 'Get a specific tag' do
- tags 'Tags'
- operationId 'getTag'
+ path "/tag/{name}.json" do
+ get "Get a specific tag" do
+ tags "Tags"
+ operationId "getTag"
parameter name: :name, in: :path, schema: { type: :string }
- produces 'application/json'
- response '200', 'notifications' do
- schema type: :object, properties: {
- users: {
- type: :array,
- items: {
- type: :object,
- properties: {
- id: { type: :integer },
- username: { type: :string },
- name: { type: [:string, :null] },
- avatar_template: { type: :string },
- }
- },
- },
- primary_groups: {
- type: :array,
- items: {},
- },
- topic_list: {
- type: :object,
- properties: {
- can_create_topic: { type: :boolean },
- draft: { type: [:string, :null] },
- draft_key: { type: :string },
- draft_sequence: { type: :integer },
- per_page: { type: :integer },
- tags: {
- type: :array,
- items: {
- type: :object,
- properties: {
- id: { type: :integer },
- name: { type: :string },
- topic_count: { type: :integer },
- staff: { type: :boolean },
- }
- },
- },
- topics: {
- type: :array,
- items: {
- type: :object,
- properties: {
- id: { type: :integer },
- title: { type: :string },
- fancy_title: { type: :string },
- slug: { type: :string },
- posts_count: { type: :integer },
- reply_count: { type: :integer },
- highest_post_number: { type: :integer },
- image_url: { type: [:string, :null] },
- created_at: { type: :string },
- last_posted_at: { type: :string },
- bumped: { type: :boolean },
- bumped_at: { type: :string },
- archetype: { type: :string },
- unseen: { type: :boolean },
- last_read_post_number: { type: :integer },
- unread_posts: { type: :integer },
- pinned: { type: :boolean },
- unpinned: { type: [:string, :null] },
- visible: { type: :boolean },
- closed: { type: :boolean },
- archived: { type: :boolean },
- notification_level: { type: :integer },
- bookmarked: { type: :boolean },
- liked: { type: :boolean },
- tags: {
- type: :array,
- items: {},
- },
- views: { type: :integer },
- like_count: { type: :integer },
- has_summary: { type: :boolean },
- last_poster_username: { type: :string },
- category_id: { type: :integer },
- pinned_globally: { type: :boolean },
- featured_link: { type: [:string, :null] },
- posters: {
- type: :array,
- items: {
- type: :object,
- properties: {
- extras: { type: :string },
- description: { type: :string },
- user_id: { type: :integer },
- primary_group_id: { type: [:string, :null] },
- }
- },
- },
- }
- },
- },
- }
- },
- }
+ produces "application/json"
+ response "200", "notifications" do
+ schema type: :object,
+ properties: {
+ users: {
+ type: :array,
+ items: {
+ type: :object,
+ properties: {
+ id: {
+ type: :integer,
+ },
+ username: {
+ type: :string,
+ },
+ name: {
+ type: %i[string null],
+ },
+ avatar_template: {
+ type: :string,
+ },
+ },
+ },
+ },
+ primary_groups: {
+ type: :array,
+ items: {
+ },
+ },
+ topic_list: {
+ type: :object,
+ properties: {
+ can_create_topic: {
+ type: :boolean,
+ },
+ draft: {
+ type: %i[string null],
+ },
+ draft_key: {
+ type: :string,
+ },
+ draft_sequence: {
+ type: :integer,
+ },
+ per_page: {
+ type: :integer,
+ },
+ tags: {
+ type: :array,
+ items: {
+ type: :object,
+ properties: {
+ id: {
+ type: :integer,
+ },
+ name: {
+ type: :string,
+ },
+ topic_count: {
+ type: :integer,
+ },
+ staff: {
+ type: :boolean,
+ },
+ },
+ },
+ },
+ topics: {
+ type: :array,
+ items: {
+ type: :object,
+ properties: {
+ id: {
+ type: :integer,
+ },
+ title: {
+ type: :string,
+ },
+ fancy_title: {
+ type: :string,
+ },
+ slug: {
+ type: :string,
+ },
+ posts_count: {
+ type: :integer,
+ },
+ reply_count: {
+ type: :integer,
+ },
+ highest_post_number: {
+ type: :integer,
+ },
+ image_url: {
+ type: %i[string null],
+ },
+ created_at: {
+ type: :string,
+ },
+ last_posted_at: {
+ type: :string,
+ },
+ bumped: {
+ type: :boolean,
+ },
+ bumped_at: {
+ type: :string,
+ },
+ archetype: {
+ type: :string,
+ },
+ unseen: {
+ type: :boolean,
+ },
+ last_read_post_number: {
+ type: :integer,
+ },
+ unread_posts: {
+ type: :integer,
+ },
+ pinned: {
+ type: :boolean,
+ },
+ unpinned: {
+ type: %i[string null],
+ },
+ visible: {
+ type: :boolean,
+ },
+ closed: {
+ type: :boolean,
+ },
+ archived: {
+ type: :boolean,
+ },
+ notification_level: {
+ type: :integer,
+ },
+ bookmarked: {
+ type: :boolean,
+ },
+ liked: {
+ type: :boolean,
+ },
+ tags: {
+ type: :array,
+ items: {
+ },
+ },
+ views: {
+ type: :integer,
+ },
+ like_count: {
+ type: :integer,
+ },
+ has_summary: {
+ type: :boolean,
+ },
+ last_poster_username: {
+ type: :string,
+ },
+ category_id: {
+ type: :integer,
+ },
+ pinned_globally: {
+ type: :boolean,
+ },
+ featured_link: {
+ type: %i[string null],
+ },
+ posters: {
+ type: :array,
+ items: {
+ type: :object,
+ properties: {
+ extras: {
+ type: :string,
+ },
+ description: {
+ type: :string,
+ },
+ user_id: {
+ type: :integer,
+ },
+ primary_group_id: {
+ type: %i[string null],
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+ }
let(:name) { tag.name }
run_test!
end
end
end
-
end
diff --git a/spec/requests/api/topics_spec.rb b/spec/requests/api/topics_spec.rb
index c576e7a3c9a..fc6a6f62eb3 100644
--- a/spec/requests/api/topics_spec.rb
+++ b/spec/requests/api/topics_spec.rb
@@ -1,103 +1,206 @@
# frozen_string_literal: true
-require 'swagger_helper'
+require "swagger_helper"
-RSpec.describe 'topics' do
+RSpec.describe "topics" do
+ let(:"Api-Key") { Fabricate(:api_key).key }
+ let(:"Api-Username") { "system" }
- let(:'Api-Key') { Fabricate(:api_key).key }
- let(:'Api-Username') { 'system' }
-
- path '/t/{id}/posts.json' do
- get 'Get specific posts from a topic' do
- tags 'Topics'
- operationId 'getSpecificPostsFromTopic'
- consumes 'application/json'
- parameter name: 'Api-Key', in: :header, type: :string, required: true
- parameter name: 'Api-Username', in: :header, type: :string, required: true
+ path "/t/{id}/posts.json" do
+ get "Get specific posts from a topic" do
+ tags "Topics"
+ operationId "getSpecificPostsFromTopic"
+ consumes "application/json"
+ parameter name: "Api-Key", in: :header, type: :string, required: true
+ parameter name: "Api-Username", in: :header, type: :string, required: true
parameter name: :id, in: :path, schema: { type: :string }
- parameter name: :post_body, in: :body, schema: {
- type: :object,
- properties: {
- 'post_ids[]': { type: :integer }
- }, required: [ 'post_ids[]' ]
- }
-
- produces 'application/json'
- response '200', 'specific posts' do
- schema type: :object, properties: {
- post_stream: {
- type: :object,
- properties: {
- posts: {
- type: :array,
- items: {
+ parameter name: :post_body,
+ in: :body,
+ schema: {
type: :object,
properties: {
- id: { type: :integer },
- name: { type: [:string, :null] },
- username: { type: :string },
- avatar_template: { type: :string },
- created_at: { type: :string },
- cooked: { type: :string },
- post_number: { type: :integer },
- post_type: { type: :integer },
- updated_at: { type: :string },
- reply_count: { type: :integer },
- reply_to_post_number: { type: [:string, :null] },
- quote_count: { type: :integer },
- incoming_link_count: { type: :integer },
- reads: { type: :integer },
- readers_count: { type: :integer },
- score: { type: :integer },
- yours: { type: :boolean },
- topic_id: { type: :integer },
- topic_slug: { type: :string },
- display_username: { type: [:string, :null] },
- primary_group_name: { type: [:string, :null] },
- flair_name: { type: [:string, :null] },
- flair_url: { type: [:string, :null] },
- flair_bg_color: { type: [:string, :null] },
- flair_color: { type: [:string, :null] },
- version: { type: :integer },
- can_edit: { type: :boolean },
- can_delete: { type: :boolean },
- can_recover: { type: :boolean },
- can_wiki: { type: :boolean },
- read: { type: :boolean },
- user_title: { type: [:string, :null] },
- actions_summary: {
- type: :array,
- items: {
- type: :object,
- properties: {
- id: { type: :integer },
- can_act: { type: :boolean },
- }
- },
+ "post_ids[]": {
+ type: :integer,
},
- moderator: { type: :boolean },
- admin: { type: :boolean },
- staff: { type: :boolean },
- user_id: { type: :integer },
- hidden: { type: :boolean },
- trust_level: { type: :integer },
- deleted_at: { type: [:string, :null] },
- user_deleted: { type: :boolean },
- edit_reason: { type: [:string, :null] },
- can_view_edit_history: { type: :boolean },
- wiki: { type: :boolean },
- reviewable_id: { type: :integer },
- reviewable_score_count: { type: :integer },
- reviewable_score_pending_count: { type: :integer },
- }
- },
- },
- }
- },
- id: { type: :integer },
- }
+ },
+ required: ["post_ids[]"],
+ }
- let(:post_body) { { 'post_ids[]': 1 } }
+ produces "application/json"
+ response "200", "specific posts" do
+ schema type: :object,
+ properties: {
+ post_stream: {
+ type: :object,
+ properties: {
+ posts: {
+ type: :array,
+ items: {
+ type: :object,
+ properties: {
+ id: {
+ type: :integer,
+ },
+ name: {
+ type: %i[string null],
+ },
+ username: {
+ type: :string,
+ },
+ avatar_template: {
+ type: :string,
+ },
+ created_at: {
+ type: :string,
+ },
+ cooked: {
+ type: :string,
+ },
+ post_number: {
+ type: :integer,
+ },
+ post_type: {
+ type: :integer,
+ },
+ updated_at: {
+ type: :string,
+ },
+ reply_count: {
+ type: :integer,
+ },
+ reply_to_post_number: {
+ type: %i[string null],
+ },
+ quote_count: {
+ type: :integer,
+ },
+ incoming_link_count: {
+ type: :integer,
+ },
+ reads: {
+ type: :integer,
+ },
+ readers_count: {
+ type: :integer,
+ },
+ score: {
+ type: :integer,
+ },
+ yours: {
+ type: :boolean,
+ },
+ topic_id: {
+ type: :integer,
+ },
+ topic_slug: {
+ type: :string,
+ },
+ display_username: {
+ type: %i[string null],
+ },
+ primary_group_name: {
+ type: %i[string null],
+ },
+ flair_name: {
+ type: %i[string null],
+ },
+ flair_url: {
+ type: %i[string null],
+ },
+ flair_bg_color: {
+ type: %i[string null],
+ },
+ flair_color: {
+ type: %i[string null],
+ },
+ version: {
+ type: :integer,
+ },
+ can_edit: {
+ type: :boolean,
+ },
+ can_delete: {
+ type: :boolean,
+ },
+ can_recover: {
+ type: :boolean,
+ },
+ can_wiki: {
+ type: :boolean,
+ },
+ read: {
+ type: :boolean,
+ },
+ user_title: {
+ type: %i[string null],
+ },
+ actions_summary: {
+ type: :array,
+ items: {
+ type: :object,
+ properties: {
+ id: {
+ type: :integer,
+ },
+ can_act: {
+ type: :boolean,
+ },
+ },
+ },
+ },
+ moderator: {
+ type: :boolean,
+ },
+ admin: {
+ type: :boolean,
+ },
+ staff: {
+ type: :boolean,
+ },
+ user_id: {
+ type: :integer,
+ },
+ hidden: {
+ type: :boolean,
+ },
+ trust_level: {
+ type: :integer,
+ },
+ deleted_at: {
+ type: %i[string null],
+ },
+ user_deleted: {
+ type: :boolean,
+ },
+ edit_reason: {
+ type: %i[string null],
+ },
+ can_view_edit_history: {
+ type: :boolean,
+ },
+ wiki: {
+ type: :boolean,
+ },
+ reviewable_id: {
+ type: :integer,
+ },
+ reviewable_score_count: {
+ type: :integer,
+ },
+ reviewable_score_pending_count: {
+ type: :integer,
+ },
+ },
+ },
+ },
+ },
+ },
+ id: {
+ type: :integer,
+ },
+ }
+
+ let(:post_body) { { "post_ids[]": 1 } }
let(:id) { Fabricate(:topic).id }
run_test!
@@ -105,22 +208,21 @@ RSpec.describe 'topics' do
end
end
- path '/t/{id}.json' do
- get 'Get a single topic' do
- tags 'Topics'
- operationId 'getTopic'
- consumes 'application/json'
- parameter name: 'Api-Key', in: :header, type: :string, required: true
- parameter name: 'Api-Username', in: :header, type: :string, required: true
+ path "/t/{id}.json" do
+ get "Get a single topic" do
+ tags "Topics"
+ operationId "getTopic"
+ consumes "application/json"
+ parameter name: "Api-Key", in: :header, type: :string, required: true
+ parameter name: "Api-Username", in: :header, type: :string, required: true
parameter name: :id, in: :path, schema: { type: :string }
expected_request_schema = nil
- produces 'application/json'
- response '200', 'specific posts' do
-
+ produces "application/json"
+ response "200", "specific posts" do
let(:id) { Fabricate(:topic).id }
- expected_response_schema = load_spec_schema('topic_show_response')
+ expected_response_schema = load_spec_schema("topic_show_response")
schema expected_response_schema
it_behaves_like "a JSON endpoint", 200 do
@@ -130,15 +232,14 @@ RSpec.describe 'topics' do
end
end
- delete 'Remove a topic' do
- tags 'Topics'
- operationId 'removeTopic'
- consumes 'application/json'
- parameter name: 'Api-Key', in: :header, type: :string, required: true
- parameter name: 'Api-Username', in: :header, type: :string, required: true
+ delete "Remove a topic" do
+ tags "Topics"
+ operationId "removeTopic"
+ consumes "application/json"
+ parameter name: "Api-Key", in: :header, type: :string, required: true
+ parameter name: "Api-Username", in: :header, type: :string, required: true
parameter name: :id, in: :path, schema: { type: :string }
- response '200', 'specific posts' do
-
+ response "200", "specific posts" do
let!(:post) { Fabricate(:post) }
let(:id) { post.topic.id }
@@ -147,85 +248,117 @@ RSpec.describe 'topics' do
end
end
- path '/t/-/{id}.json' do
- put 'Update a topic' do
- tags 'Topics'
- operationId 'updateTopic'
- consumes 'application/json'
- parameter name: 'Api-Key', in: :header, type: :string, required: true
- parameter name: 'Api-Username', in: :header, type: :string, required: true
+ path "/t/-/{id}.json" do
+ put "Update a topic" do
+ tags "Topics"
+ operationId "updateTopic"
+ consumes "application/json"
+ parameter name: "Api-Key", in: :header, type: :string, required: true
+ parameter name: "Api-Username", in: :header, type: :string, required: true
parameter name: :id, in: :path, schema: { type: :string }
- parameter name: :post_body, in: :body, schema: {
- type: :object,
- properties: {
- topic: {
- type: :object,
- properties: {
- title: { type: :string },
- category_id: { type: :integer },
- }
- }
- }
- }
+ parameter name: :post_body,
+ in: :body,
+ schema: {
+ type: :object,
+ properties: {
+ topic: {
+ type: :object,
+ properties: {
+ title: {
+ type: :string,
+ },
+ category_id: {
+ type: :integer,
+ },
+ },
+ },
+ },
+ }
- produces 'application/json'
- response '200', 'topic updated' do
- schema type: :object, properties: {
- basic_topic: {
- type: :object,
- properties: {
- id: { type: :integer },
- title: { type: :string },
- fancy_title: { type: :string },
- slug: { type: :string },
- posts_count: { type: :integer },
- }
- },
- }
+ produces "application/json"
+ response "200", "topic updated" do
+ schema type: :object,
+ properties: {
+ basic_topic: {
+ type: :object,
+ properties: {
+ id: {
+ type: :integer,
+ },
+ title: {
+ type: :string,
+ },
+ fancy_title: {
+ type: :string,
+ },
+ slug: {
+ type: :string,
+ },
+ posts_count: {
+ type: :integer,
+ },
+ },
+ },
+ }
- let(:post_body) { { title: 'New topic title' } }
+ let(:post_body) { { title: "New topic title" } }
let!(:post) { Fabricate(:post) }
let(:id) { post.topic.id }
run_test! do |response|
data = JSON.parse(response.body)
- expect(data['basic_topic']['title']).to eq("New topic title")
+ expect(data["basic_topic"]["title"]).to eq("New topic title")
end
end
end
end
- path '/t/{id}/invite.json' do
- post 'Invite to topic' do
- tags 'Topics', 'Invites'
- operationId 'inviteToTopic'
- consumes 'application/json'
- parameter name: 'Api-Key', in: :header, type: :string, required: true
- parameter name: 'Api-Username', in: :header, type: :string, required: true
+ path "/t/{id}/invite.json" do
+ post "Invite to topic" do
+ tags "Topics", "Invites"
+ operationId "inviteToTopic"
+ consumes "application/json"
+ parameter name: "Api-Key", in: :header, type: :string, required: true
+ parameter name: "Api-Username", in: :header, type: :string, required: true
parameter name: :id, in: :path, schema: { type: :string }
- parameter name: :request_body, in: :body, schema: {
- type: :object,
- properties: {
- user: { type: :string },
- email: { type: :string },
- }
- }
+ parameter name: :request_body,
+ in: :body,
+ schema: {
+ type: :object,
+ properties: {
+ user: {
+ type: :string,
+ },
+ email: {
+ type: :string,
+ },
+ },
+ }
- produces 'application/json'
- response '200', 'topic updated' do
- schema type: :object, properties: {
- user: {
- type: :object,
- properties: {
- id: { type: :integer },
- username: { type: :string },
- name: { type: :string },
- avatar_template: { type: :string },
- }
- },
- }
+ produces "application/json"
+ response "200", "topic updated" do
+ schema type: :object,
+ properties: {
+ user: {
+ type: :object,
+ properties: {
+ id: {
+ type: :integer,
+ },
+ username: {
+ type: :string,
+ },
+ name: {
+ type: :string,
+ },
+ avatar_template: {
+ type: :string,
+ },
+ },
+ },
+ }
let(:username) { Fabricate(:user).username }
let(:request_body) { { user: username } }
@@ -233,24 +366,23 @@ RSpec.describe 'topics' do
run_test! do |response|
data = JSON.parse(response.body)
- expect(data['user']['username']).to eq(username)
+ expect(data["user"]["username"]).to eq(username)
end
end
end
end
- path '/t/{id}/bookmark.json' do
- put 'Bookmark topic' do
- tags 'Topics'
- operationId 'bookmarkTopic'
- consumes 'application/json'
- parameter name: 'Api-Key', in: :header, type: :string, required: true
- parameter name: 'Api-Username', in: :header, type: :string, required: true
+ path "/t/{id}/bookmark.json" do
+ put "Bookmark topic" do
+ tags "Topics"
+ operationId "bookmarkTopic"
+ consumes "application/json"
+ parameter name: "Api-Key", in: :header, type: :string, required: true
+ parameter name: "Api-Username", in: :header, type: :string, required: true
parameter name: :id, in: :path, schema: { type: :string }
- produces 'application/json'
- response '200', 'topic updated' do
-
+ produces "application/json"
+ response "200", "topic updated" do
let!(:post) { Fabricate(:post) }
let(:id) { post.topic.id }
@@ -259,42 +391,51 @@ RSpec.describe 'topics' do
end
end
- path '/t/{id}/status.json' do
- put 'Update the status of a topic' do
- tags 'Topics'
- operationId 'updateTopicStatus'
- consumes 'application/json'
- parameter name: 'Api-Key', in: :header, type: :string, required: true
- parameter name: 'Api-Username', in: :header, type: :string, required: true
+ path "/t/{id}/status.json" do
+ put "Update the status of a topic" do
+ tags "Topics"
+ operationId "updateTopicStatus"
+ consumes "application/json"
+ parameter name: "Api-Key", in: :header, type: :string, required: true
+ parameter name: "Api-Username", in: :header, type: :string, required: true
parameter name: :id, in: :path, schema: { type: :string }
- parameter name: :request_body, in: :body, schema: {
- type: :object,
- properties: {
- status: {
- type: :string,
- enum: ['closed', 'pinned', 'pinned_globally', 'archived', 'visible'],
- },
- enabled: {
- type: :string,
- enum: ['true', 'false']
- },
- until: {
- type: :string,
- description: 'Only required for `pinned` and `pinned_globally`',
- example: '2030-12-31'
- }
- }, required: [ 'status', 'enabled' ]
- }
+ parameter name: :request_body,
+ in: :body,
+ schema: {
+ type: :object,
+ properties: {
+ status: {
+ type: :string,
+ enum: %w[closed pinned pinned_globally archived visible],
+ },
+ enabled: {
+ type: :string,
+ enum: %w[true false],
+ },
+ until: {
+ type: :string,
+ description: "Only required for `pinned` and `pinned_globally`",
+ example: "2030-12-31",
+ },
+ },
+ required: %w[status enabled],
+ }
- produces 'application/json'
- response '200', 'topic updated' do
- schema type: :object, properties: {
- success: { type: :string, example: "OK" },
- topic_status_update: { type: [:string, :null] },
- }
+ produces "application/json"
+ response "200", "topic updated" do
+ schema type: :object,
+ properties: {
+ success: {
+ type: :string,
+ example: "OK",
+ },
+ topic_status_update: {
+ type: %i[string null],
+ },
+ }
- let(:request_body) { { status: 'closed', enabled: 'true' } }
+ let(:request_body) { { status: "closed", enabled: "true" } }
let(:id) { Fabricate(:topic).id }
run_test!
@@ -302,245 +443,436 @@ RSpec.describe 'topics' do
end
end
- path '/latest.json' do
- get 'Get the latest topics' do
- tags 'Topics'
- operationId 'listLatestTopics'
- consumes 'application/json'
- parameter name: 'Api-Key', in: :header, type: :string, required: true
- parameter name: 'Api-Username', in: :header, type: :string, required: true
+ path "/latest.json" do
+ get "Get the latest topics" do
+ tags "Topics"
+ operationId "listLatestTopics"
+ consumes "application/json"
+ parameter name: "Api-Key", in: :header, type: :string, required: true
+ parameter name: "Api-Username", in: :header, type: :string, required: true
parameter(
name: :order,
in: :query,
type: :string,
- description: 'Enum: `default`, `created`, `activity`, `views`, `posts`, `category`, `likes`, `op_likes`, `posters`')
+ description:
+ "Enum: `default`, `created`, `activity`, `views`, `posts`, `category`, `likes`, `op_likes`, `posters`",
+ )
parameter(
name: :ascending,
in: :query,
type: :string,
- description: 'Defaults to `desc`, add `ascending=true` to sort asc')
+ description: "Defaults to `desc`, add `ascending=true` to sort asc",
+ )
- produces 'application/json'
- response '200', 'topic updated' do
- schema type: :object, properties: {
- users: {
- type: :array,
- items: {
- type: :object,
- properties: {
- id: { type: :integer },
- username: { type: :string },
- name: { type: [:string, :null] },
- avatar_template: { type: :string },
- }
- },
- },
- primary_groups: {
- type: :array,
- items: {},
- },
- topic_list: {
- type: :object,
- properties: {
- can_create_topic: { type: :boolean },
- draft: { type: [:string, :null] },
- draft_key: { type: :string },
- draft_sequence: { type: :integer },
- per_page: { type: :integer },
- topics: {
- type: :array,
- items: {
- type: :object,
- properties: {
- id: { type: :integer },
- title: { type: :string },
- fancy_title: { type: :string },
- slug: { type: :string },
- posts_count: { type: :integer },
- reply_count: { type: :integer },
- highest_post_number: { type: :integer },
- image_url: { type: :string },
- created_at: { type: :string },
- last_posted_at: { type: :string },
- bumped: { type: :boolean },
- bumped_at: { type: :string },
- archetype: { type: :string },
- unseen: { type: :boolean },
- last_read_post_number: { type: :integer },
- unread_posts: { type: :integer },
- pinned: { type: :boolean },
- unpinned: { type: [:string, :null] },
- visible: { type: :boolean },
- closed: { type: :boolean },
- archived: { type: :boolean },
- notification_level: { type: :integer },
- bookmarked: { type: :boolean },
- liked: { type: :boolean },
- views: { type: :integer },
- like_count: { type: :integer },
- has_summary: { type: :boolean },
- last_poster_username: { type: :string },
- category_id: { type: :integer },
- op_like_count: { type: :integer },
- pinned_globally: { type: :boolean },
- featured_link: { type: [:string, :null] },
- posters: {
- type: :array,
- items: {
- type: :object,
- properties: {
- extras: { type: :string },
- description: { type: :string },
- user_id: { type: :integer },
- primary_group_id: { type: [:string, :null] },
- }
- },
- },
- }
- },
- },
- }
- },
- }
+ produces "application/json"
+ response "200", "topic updated" do
+ schema type: :object,
+ properties: {
+ users: {
+ type: :array,
+ items: {
+ type: :object,
+ properties: {
+ id: {
+ type: :integer,
+ },
+ username: {
+ type: :string,
+ },
+ name: {
+ type: %i[string null],
+ },
+ avatar_template: {
+ type: :string,
+ },
+ },
+ },
+ },
+ primary_groups: {
+ type: :array,
+ items: {
+ },
+ },
+ topic_list: {
+ type: :object,
+ properties: {
+ can_create_topic: {
+ type: :boolean,
+ },
+ draft: {
+ type: %i[string null],
+ },
+ draft_key: {
+ type: :string,
+ },
+ draft_sequence: {
+ type: :integer,
+ },
+ per_page: {
+ type: :integer,
+ },
+ topics: {
+ type: :array,
+ items: {
+ type: :object,
+ properties: {
+ id: {
+ type: :integer,
+ },
+ title: {
+ type: :string,
+ },
+ fancy_title: {
+ type: :string,
+ },
+ slug: {
+ type: :string,
+ },
+ posts_count: {
+ type: :integer,
+ },
+ reply_count: {
+ type: :integer,
+ },
+ highest_post_number: {
+ type: :integer,
+ },
+ image_url: {
+ type: :string,
+ },
+ created_at: {
+ type: :string,
+ },
+ last_posted_at: {
+ type: :string,
+ },
+ bumped: {
+ type: :boolean,
+ },
+ bumped_at: {
+ type: :string,
+ },
+ archetype: {
+ type: :string,
+ },
+ unseen: {
+ type: :boolean,
+ },
+ last_read_post_number: {
+ type: :integer,
+ },
+ unread_posts: {
+ type: :integer,
+ },
+ pinned: {
+ type: :boolean,
+ },
+ unpinned: {
+ type: %i[string null],
+ },
+ visible: {
+ type: :boolean,
+ },
+ closed: {
+ type: :boolean,
+ },
+ archived: {
+ type: :boolean,
+ },
+ notification_level: {
+ type: :integer,
+ },
+ bookmarked: {
+ type: :boolean,
+ },
+ liked: {
+ type: :boolean,
+ },
+ views: {
+ type: :integer,
+ },
+ like_count: {
+ type: :integer,
+ },
+ has_summary: {
+ type: :boolean,
+ },
+ last_poster_username: {
+ type: :string,
+ },
+ category_id: {
+ type: :integer,
+ },
+ op_like_count: {
+ type: :integer,
+ },
+ pinned_globally: {
+ type: :boolean,
+ },
+ featured_link: {
+ type: %i[string null],
+ },
+ posters: {
+ type: :array,
+ items: {
+ type: :object,
+ properties: {
+ extras: {
+ type: :string,
+ },
+ description: {
+ type: :string,
+ },
+ user_id: {
+ type: :integer,
+ },
+ primary_group_id: {
+ type: %i[string null],
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+ }
- let(:order) { 'default' }
- let(:ascending) { 'false' }
+ let(:order) { "default" }
+ let(:ascending) { "false" }
run_test!
end
end
end
- path '/top.json' do
- get 'Get the top topics filtered by period' do
- tags 'Topics'
- operationId 'listTopTopics'
- consumes 'application/json'
- parameter name: 'Api-Key', in: :header, type: :string, required: true
- parameter name: 'Api-Username', in: :header, type: :string, required: true
+ path "/top.json" do
+ get "Get the top topics filtered by period" do
+ tags "Topics"
+ operationId "listTopTopics"
+ consumes "application/json"
+ parameter name: "Api-Key", in: :header, type: :string, required: true
+ parameter name: "Api-Username", in: :header, type: :string, required: true
parameter(
name: :period,
in: :query,
type: :string,
- description: 'Enum: `all`, `yearly`, `quarterly`, `monthly`, `weekly`, `daily`')
+ description: "Enum: `all`, `yearly`, `quarterly`, `monthly`, `weekly`, `daily`",
+ )
- produces 'application/json'
- response '200', 'response' do
- schema type: :object, properties: {
- users: {
- type: :array,
- items: {
- type: :object,
- properties: {
- id: { type: :integer },
- username: { type: :string },
- name: { type: :string },
- avatar_template: { type: :string },
- }
- },
- },
- primary_groups: {
- type: :array,
- items: {},
- },
- topic_list: {
- type: :object,
- properties: {
- can_create_topic: { type: :boolean },
- draft: { type: [:string, :null] },
- draft_key: { type: :string },
- draft_sequence: { type: :integer },
- for_period: { type: :string },
- per_page: { type: :integer },
- topics: {
- type: :array,
- items: {
- type: :object,
- properties: {
- id: { type: :integer },
- title: { type: :string },
- fancy_title: { type: :string },
- slug: { type: :string },
- posts_count: { type: :integer },
- reply_count: { type: :integer },
- highest_post_number: { type: :integer },
- image_url: { type: [:string, :null] },
- created_at: { type: :string },
- last_posted_at: { type: :string },
- bumped: { type: :boolean },
- bumped_at: { type: :string },
- archetype: { type: :string },
- unseen: { type: :boolean },
- last_read_post_number: { type: :integer },
- unread_posts: { type: :integer },
- pinned: { type: :boolean },
- unpinned: { type: :boolean },
- visible: { type: :boolean },
- closed: { type: :boolean },
- archived: { type: :boolean },
- notification_level: { type: :integer },
- bookmarked: { type: :boolean },
- liked: { type: :boolean },
- views: { type: :integer },
- like_count: { type: :integer },
- has_summary: { type: :boolean },
- last_poster_username: { type: :string },
- category_id: { type: :integer },
- op_like_count: { type: :integer },
- pinned_globally: { type: :boolean },
- featured_link: { type: [:string, :null] },
- posters: {
- type: :array,
- items: {
- type: :object,
- properties: {
- extras: { type: [:string, :null] },
- description: { type: :string },
- user_id: { type: :integer },
- primary_group_id: { type: [:string, :null] },
- }
- },
- },
- }
- },
- },
- }
- },
- }
+ produces "application/json"
+ response "200", "response" do
+ schema type: :object,
+ properties: {
+ users: {
+ type: :array,
+ items: {
+ type: :object,
+ properties: {
+ id: {
+ type: :integer,
+ },
+ username: {
+ type: :string,
+ },
+ name: {
+ type: :string,
+ },
+ avatar_template: {
+ type: :string,
+ },
+ },
+ },
+ },
+ primary_groups: {
+ type: :array,
+ items: {
+ },
+ },
+ topic_list: {
+ type: :object,
+ properties: {
+ can_create_topic: {
+ type: :boolean,
+ },
+ draft: {
+ type: %i[string null],
+ },
+ draft_key: {
+ type: :string,
+ },
+ draft_sequence: {
+ type: :integer,
+ },
+ for_period: {
+ type: :string,
+ },
+ per_page: {
+ type: :integer,
+ },
+ topics: {
+ type: :array,
+ items: {
+ type: :object,
+ properties: {
+ id: {
+ type: :integer,
+ },
+ title: {
+ type: :string,
+ },
+ fancy_title: {
+ type: :string,
+ },
+ slug: {
+ type: :string,
+ },
+ posts_count: {
+ type: :integer,
+ },
+ reply_count: {
+ type: :integer,
+ },
+ highest_post_number: {
+ type: :integer,
+ },
+ image_url: {
+ type: %i[string null],
+ },
+ created_at: {
+ type: :string,
+ },
+ last_posted_at: {
+ type: :string,
+ },
+ bumped: {
+ type: :boolean,
+ },
+ bumped_at: {
+ type: :string,
+ },
+ archetype: {
+ type: :string,
+ },
+ unseen: {
+ type: :boolean,
+ },
+ last_read_post_number: {
+ type: :integer,
+ },
+ unread_posts: {
+ type: :integer,
+ },
+ pinned: {
+ type: :boolean,
+ },
+ unpinned: {
+ type: :boolean,
+ },
+ visible: {
+ type: :boolean,
+ },
+ closed: {
+ type: :boolean,
+ },
+ archived: {
+ type: :boolean,
+ },
+ notification_level: {
+ type: :integer,
+ },
+ bookmarked: {
+ type: :boolean,
+ },
+ liked: {
+ type: :boolean,
+ },
+ views: {
+ type: :integer,
+ },
+ like_count: {
+ type: :integer,
+ },
+ has_summary: {
+ type: :boolean,
+ },
+ last_poster_username: {
+ type: :string,
+ },
+ category_id: {
+ type: :integer,
+ },
+ op_like_count: {
+ type: :integer,
+ },
+ pinned_globally: {
+ type: :boolean,
+ },
+ featured_link: {
+ type: %i[string null],
+ },
+ posters: {
+ type: :array,
+ items: {
+ type: :object,
+ properties: {
+ extras: {
+ type: %i[string null],
+ },
+ description: {
+ type: :string,
+ },
+ user_id: {
+ type: :integer,
+ },
+ primary_group_id: {
+ type: %i[string null],
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+ }
- let(:period) { 'all' }
+ let(:period) { "all" }
run_test!
end
end
end
- path '/t/{id}/notifications.json' do
- post 'Set notification level' do
- tags 'Topics'
- operationId 'setNotificationLevel'
- consumes 'application/json'
- parameter name: 'Api-Key', in: :header, type: :string, required: true
- parameter name: 'Api-Username', in: :header, type: :string, required: true
+ path "/t/{id}/notifications.json" do
+ post "Set notification level" do
+ tags "Topics"
+ operationId "setNotificationLevel"
+ consumes "application/json"
+ parameter name: "Api-Key", in: :header, type: :string, required: true
+ parameter name: "Api-Username", in: :header, type: :string, required: true
parameter name: :id, in: :path, schema: { type: :string }
- parameter name: :request_body, in: :body, schema: {
- type: :object,
- properties: {
- notification_level: {
- type: :string,
- enum: ['0', '1', '2', '3'],
- }
- }, required: [ 'notification_level' ]
- }
+ parameter name: :request_body,
+ in: :body,
+ schema: {
+ type: :object,
+ properties: {
+ notification_level: {
+ type: :string,
+ enum: %w[0 1 2 3],
+ },
+ },
+ required: ["notification_level"],
+ }
- produces 'application/json'
- response '200', 'topic updated' do
- schema type: :object, properties: {
- success: { type: :string, example: "OK" }
- }
+ produces "application/json"
+ response "200", "topic updated" do
+ schema type: :object, properties: { success: { type: :string, example: "OK" } }
- let(:request_body) { { notification_level: '3' } }
+ let(:request_body) { { notification_level: "3" } }
let(:id) { Fabricate(:topic).id }
run_test!
@@ -548,32 +880,33 @@ RSpec.describe 'topics' do
end
end
- path '/t/{id}/change-timestamp.json' do
- put 'Update topic timestamp' do
- tags 'Topics'
- operationId 'updateTopicTimestamp'
- consumes 'application/json'
- parameter name: 'Api-Key', in: :header, type: :string, required: true
- parameter name: 'Api-Username', in: :header, type: :string, required: true
+ path "/t/{id}/change-timestamp.json" do
+ put "Update topic timestamp" do
+ tags "Topics"
+ operationId "updateTopicTimestamp"
+ consumes "application/json"
+ parameter name: "Api-Key", in: :header, type: :string, required: true
+ parameter name: "Api-Username", in: :header, type: :string, required: true
parameter name: :id, in: :path, schema: { type: :string }
- parameter name: :request_body, in: :body, schema: {
- type: :object,
- properties: {
- timestamp: {
- type: :string,
- example: '1594291380'
- }
- }, required: [ 'timestamp' ]
- }
+ parameter name: :request_body,
+ in: :body,
+ schema: {
+ type: :object,
+ properties: {
+ timestamp: {
+ type: :string,
+ example: "1594291380",
+ },
+ },
+ required: ["timestamp"],
+ }
- produces 'application/json'
- response '200', 'topic updated' do
- schema type: :object, properties: {
- success: { type: :string, example: "OK" }
- }
+ produces "application/json"
+ response "200", "topic updated" do
+ schema type: :object, properties: { success: { type: :string, example: "OK" } }
- let(:request_body) { { timestamp: '1594291380' } }
+ let(:request_body) { { timestamp: "1594291380" } }
let!(:post) { Fabricate(:post) }
let(:id) { post.topic.id }
@@ -582,46 +915,62 @@ RSpec.describe 'topics' do
end
end
- path '/t/{id}/timer.json' do
- post 'Create topic timer' do
- tags 'Topics'
- operationId 'createTopicTimer'
- consumes 'application/json'
- parameter name: 'Api-Key', in: :header, type: :string, required: true
- parameter name: 'Api-Username', in: :header, type: :string, required: true
+ path "/t/{id}/timer.json" do
+ post "Create topic timer" do
+ tags "Topics"
+ operationId "createTopicTimer"
+ consumes "application/json"
+ parameter name: "Api-Key", in: :header, type: :string, required: true
+ parameter name: "Api-Username", in: :header, type: :string, required: true
parameter name: :id, in: :path, schema: { type: :string }
- parameter name: :request_body, in: :body, schema: {
- type: :object,
- properties: {
- time: {
- type: :string,
- example: ''
- },
- status_type: {
- type: :string,
- },
- based_on_last_post: {
- type: :boolean,
- },
- category_id: {
- type: :integer
- }
- }
- }
+ parameter name: :request_body,
+ in: :body,
+ schema: {
+ type: :object,
+ properties: {
+ time: {
+ type: :string,
+ example: "",
+ },
+ status_type: {
+ type: :string,
+ },
+ based_on_last_post: {
+ type: :boolean,
+ },
+ category_id: {
+ type: :integer,
+ },
+ },
+ }
- produces 'application/json'
- response '200', 'topic updated' do
- schema type: :object, properties: {
- success: { type: :string, example: "OK" },
- execute_at: { type: :string },
- duration: { type: [:string, :null] },
- based_on_last_post: { type: :boolean },
- closed: { type: :boolean },
- category_id: { type: [:string, :null] },
- }
+ produces "application/json"
+ response "200", "topic updated" do
+ schema type: :object,
+ properties: {
+ success: {
+ type: :string,
+ example: "OK",
+ },
+ execute_at: {
+ type: :string,
+ },
+ duration: {
+ type: %i[string null],
+ },
+ based_on_last_post: {
+ type: :boolean,
+ },
+ closed: {
+ type: :boolean,
+ },
+ category_id: {
+ type: %i[string null],
+ },
+ }
- let(:request_body) { { time: Time.current + 1.day, status_type: 'close' } }
+ let(:request_body) { { time: Time.current + 1.day, status_type: "close" } }
let!(:topic_post) { Fabricate(:post) }
let(:id) { topic_post.topic.id }
@@ -630,27 +979,24 @@ RSpec.describe 'topics' do
end
end
- path '/t/external_id/{external_id}.json' do
- get 'Get topic by external_id' do
- tags 'Topics'
- operationId 'getTopicByExternalId'
- consumes 'application/json'
+ path "/t/external_id/{external_id}.json" do
+ get "Get topic by external_id" do
+ tags "Topics"
+ operationId "getTopicByExternalId"
+ consumes "application/json"
parameter name: :external_id, in: :path, type: :string, required: true
expected_request_schema = nil
- produces 'application/json'
- response '301', 'redirects to /t/{topic_id}.json' do
+ produces "application/json"
+ response "301", "redirects to /t/{topic_id}.json" do
expected_response_schema = nil
schema expected_response_schema
- let(:topic) { Fabricate(:topic, external_id: 'external_id_1') }
+ let(:topic) { Fabricate(:topic, external_id: "external_id_1") }
let(:external_id) { topic.external_id }
- run_test! do |response|
- expect(response).to redirect_to(topic.relative_url + ".json")
- end
+ run_test! { |response| expect(response).to redirect_to(topic.relative_url + ".json") }
end
end
end
-
end
diff --git a/spec/requests/api/uploads_spec.rb b/spec/requests/api/uploads_spec.rb
index f303d87fff5..d2a8d72fdb5 100644
--- a/spec/requests/api/uploads_spec.rb
+++ b/spec/requests/api/uploads_spec.rb
@@ -1,8 +1,7 @@
# frozen_string_literal: true
-require 'swagger_helper'
-
-RSpec.describe 'uploads' do
+require "swagger_helper"
+RSpec.describe "uploads" do
let(:admin) { Fabricate(:admin) }
let(:logo_file) { file_from_fixtures("logo.png") }
let(:logo) { Rack::Test::UploadedFile.new(logo_file) }
@@ -12,32 +11,28 @@ RSpec.describe 'uploads' do
sign_in(admin)
end
- path '/uploads.json' do
- post 'Creates an upload' do
- tags 'Uploads'
- operationId 'createUpload'
- consumes 'multipart/form-data'
+ path "/uploads.json" do
+ post "Creates an upload" do
+ tags "Uploads"
+ operationId "createUpload"
+ consumes "multipart/form-data"
- expected_request_schema = load_spec_schema('upload_create_request')
+ expected_request_schema = load_spec_schema("upload_create_request")
parameter name: :params, in: :body, schema: expected_request_schema
- let(:params) { {
- 'type' => 'avatar',
- 'user_id' => admin.id,
- 'synchronous' => true,
- 'file' => logo
- } }
+ let(:params) do
+ { "type" => "avatar", "user_id" => admin.id, "synchronous" => true, "file" => logo }
+ end
- produces 'application/json'
- response '200', 'file uploaded' do
- expected_response_schema = load_spec_schema('upload_create_response')
+ produces "application/json"
+ response "200", "file uploaded" do
+ expected_response_schema = load_spec_schema("upload_create_response")
schema(expected_response_schema)
# Skipping this test for now until https://github.com/rswag/rswag/issues/348
# is resolved. This still allows the docs to be generated for this endpoint though.
xit
end
-
end
end
@@ -47,11 +42,11 @@ RSpec.describe 'uploads' do
SiteSetting.enable_direct_s3_uploads = true
end
- path '/uploads/generate-presigned-put.json' do
- post 'Initiates a direct external upload' do
- tags 'Uploads'
- operationId 'generatePresignedPut'
- consumes 'application/json'
+ path "/uploads/generate-presigned-put.json" do
+ post "Initiates a direct external upload" do
+ tags "Uploads"
+ operationId "generatePresignedPut"
+ consumes "application/json"
description <<~TEXT
Direct external uploads bypass the usual method of creating uploads
via the POST /uploads route, and upload directly to an external provider,
@@ -68,22 +63,24 @@ RSpec.describe 'uploads' do
#{direct_uploads_disclaimer}
TEXT
- expected_request_schema = load_spec_schema('upload_generate_presigned_put_request')
+ expected_request_schema = load_spec_schema("upload_generate_presigned_put_request")
parameter name: :params, in: :body, schema: expected_request_schema
- produces 'application/json'
- response '200', 'external upload initialized' do
- expected_response_schema = load_spec_schema('upload_generate_presigned_put_response')
+ produces "application/json"
+ response "200", "external upload initialized" do
+ expected_response_schema = load_spec_schema("upload_generate_presigned_put_response")
schema(expected_response_schema)
- let(:params) { {
- 'file_name' => "test.png",
- 'type' => "composer",
- 'file_size' => 4096,
- 'metadata' => {
- 'sha1-checksum' => "830869e4ed99128e4352aa72ff5b0ffc26fdc390"
+ let(:params) do
+ {
+ "file_name" => "test.png",
+ "type" => "composer",
+ "file_size" => 4096,
+ "metadata" => {
+ "sha1-checksum" => "830869e4ed99128e4352aa72ff5b0ffc26fdc390",
+ },
}
- } }
+ end
it_behaves_like "a JSON endpoint", 200 do
let(:expected_response_schema) { expected_response_schema }
@@ -93,8 +90,8 @@ RSpec.describe 'uploads' do
end
end
- path '/uploads/complete-external-upload.json' do
- post 'Completes a direct external upload' do
+ path "/uploads/complete-external-upload.json" do
+ post "Completes a direct external upload" do
let(:unique_identifier) { "66e86218-80d9-4bda-b4d5-2b6def968705" }
let!(:external_stub) { Fabricate(:external_upload_stub, created_by: admin) }
let!(:upload) { Fabricate(:upload) }
@@ -105,9 +102,9 @@ RSpec.describe 'uploads' do
external_stub.update(unique_identifier: unique_identifier)
end
- tags 'Uploads'
- operationId 'completeExternalUpload'
- consumes 'application/json'
+ tags "Uploads"
+ operationId "completeExternalUpload"
+ consumes "application/json"
description <<~TEXT
Completes an external upload initialized with /get-presigned-put. The
file will be moved from its temporary location in external storage to
@@ -121,17 +118,15 @@ RSpec.describe 'uploads' do
#{direct_uploads_disclaimer}
TEXT
- expected_request_schema = load_spec_schema('upload_complete_external_upload_request')
+ expected_request_schema = load_spec_schema("upload_complete_external_upload_request")
parameter name: :params, in: :body, schema: expected_request_schema
- produces 'application/json'
- response '200', 'external upload initialized' do
- expected_response_schema = load_spec_schema('upload_create_response')
+ produces "application/json"
+ response "200", "external upload initialized" do
+ expected_response_schema = load_spec_schema("upload_create_response")
schema(expected_response_schema)
- let(:params) { {
- 'unique_identifier' => unique_identifier,
- } }
+ let(:params) { { "unique_identifier" => unique_identifier } }
it_behaves_like "a JSON endpoint", 200 do
let(:expected_response_schema) { expected_response_schema }
@@ -141,19 +136,22 @@ RSpec.describe 'uploads' do
end
end
- path '/uploads/create-multipart.json' do
- post 'Creates a multipart external upload' do
+ path "/uploads/create-multipart.json" do
+ post "Creates a multipart external upload" do
before do
- ExternalUploadManager.stubs(:create_direct_multipart_upload).returns({
- external_upload_identifier: "66e86218-80d9-4bda-b4d5-2b6def968705",
- key: "temp/site/uploads/default/12345/67890.jpg",
- unique_identifier: "84x83tmxy398t3y._Q_z8CoJYVr69bE6D7f8J6Oo0434QquLFoYdGVerWFx9X5HDEI_TP_95c34n853495x35345394.d.ghQ"
- })
+ ExternalUploadManager.stubs(:create_direct_multipart_upload).returns(
+ {
+ external_upload_identifier: "66e86218-80d9-4bda-b4d5-2b6def968705",
+ key: "temp/site/uploads/default/12345/67890.jpg",
+ unique_identifier:
+ "84x83tmxy398t3y._Q_z8CoJYVr69bE6D7f8J6Oo0434QquLFoYdGVerWFx9X5HDEI_TP_95c34n853495x35345394.d.ghQ",
+ },
+ )
end
- tags 'Uploads'
- operationId 'createMultipartUpload'
- consumes 'application/json'
+ tags "Uploads"
+ operationId "createMultipartUpload"
+ consumes "application/json"
description <<~TEXT
Creates a multipart upload in the external storage provider, storing
a temporary reference to the external upload similar to /get-presigned-put.
@@ -161,22 +159,24 @@ RSpec.describe 'uploads' do
#{direct_uploads_disclaimer}
TEXT
- expected_request_schema = load_spec_schema('upload_create_multipart_request')
+ expected_request_schema = load_spec_schema("upload_create_multipart_request")
parameter name: :params, in: :body, schema: expected_request_schema
- produces 'application/json'
- response '200', 'external upload initialized' do
- expected_response_schema = load_spec_schema('upload_create_multipart_response')
+ produces "application/json"
+ response "200", "external upload initialized" do
+ expected_response_schema = load_spec_schema("upload_create_multipart_response")
schema(expected_response_schema)
- let(:params) { {
- 'file_name' => "test.png",
- 'upload_type' => "composer",
- 'file_size' => 4096,
- 'metadata' => {
- 'sha1-checksum' => "830869e4ed99128e4352aa72ff5b0ffc26fdc390"
+ let(:params) do
+ {
+ "file_name" => "test.png",
+ "upload_type" => "composer",
+ "file_size" => 4096,
+ "metadata" => {
+ "sha1-checksum" => "830869e4ed99128e4352aa72ff5b0ffc26fdc390",
+ },
}
- } }
+ end
it_behaves_like "a JSON endpoint", 200 do
let(:expected_response_schema) { expected_response_schema }
@@ -186,8 +186,8 @@ RSpec.describe 'uploads' do
end
end
- path '/uploads/batch-presign-multipart-parts.json' do
- post 'Generates batches of presigned URLs for multipart parts' do
+ path "/uploads/batch-presign-multipart-parts.json" do
+ post "Generates batches of presigned URLs for multipart parts" do
let(:unique_identifier) { "66e86218-80d9-4bda-b4d5-2b6def968705" }
let!(:external_stub) { Fabricate(:multipart_external_upload_stub, created_by: admin) }
let!(:upload) { Fabricate(:upload) }
@@ -197,9 +197,9 @@ RSpec.describe 'uploads' do
external_stub.update(unique_identifier: unique_identifier)
end
- tags 'Uploads'
- operationId 'batchPresignMultipartParts'
- consumes 'application/json'
+ tags "Uploads"
+ operationId "batchPresignMultipartParts"
+ consumes "application/json"
description <<~TEXT
Multipart uploads are uploaded in chunks or parts to individual presigned
URLs, similar to the one generated by /generate-presigned-put. The part
@@ -217,18 +217,21 @@ RSpec.describe 'uploads' do
#{direct_uploads_disclaimer}
TEXT
- expected_request_schema = load_spec_schema('upload_batch_presign_multipart_parts_request')
+ expected_request_schema = load_spec_schema("upload_batch_presign_multipart_parts_request")
parameter name: :params, in: :body, schema: expected_request_schema
- produces 'application/json'
- response '200', 'external upload initialized' do
- expected_response_schema = load_spec_schema('upload_batch_presign_multipart_parts_response')
+ produces "application/json"
+ response "200", "external upload initialized" do
+ expected_response_schema =
+ load_spec_schema("upload_batch_presign_multipart_parts_response")
schema(expected_response_schema)
- let(:params) { {
- 'part_numbers' => [1, 2, 3],
- 'unique_identifier' => "66e86218-80d9-4bda-b4d5-2b6def968705"
- } }
+ let(:params) do
+ {
+ "part_numbers" => [1, 2, 3],
+ "unique_identifier" => "66e86218-80d9-4bda-b4d5-2b6def968705",
+ }
+ end
it_behaves_like "a JSON endpoint", 200 do
let(:expected_response_schema) { expected_response_schema }
@@ -238,8 +241,8 @@ RSpec.describe 'uploads' do
end
end
- path '/uploads/abort-multipart.json' do
- post 'Abort multipart upload' do
+ path "/uploads/abort-multipart.json" do
+ post "Abort multipart upload" do
let(:unique_identifier) { "66e86218-80d9-4bda-b4d5-2b6def968705" }
let!(:external_stub) { Fabricate(:multipart_external_upload_stub, created_by: admin) }
let!(:upload) { Fabricate(:upload) }
@@ -248,13 +251,14 @@ RSpec.describe 'uploads' do
stub_s3_store
external_stub.update(
unique_identifier: unique_identifier,
- external_upload_identifier: "84x83tmxy398t3y._Q_z8CoJYVr69bE6D7f8J6Oo0434QquLFoYdGVerWFx9X5HDEI_TP_95c34n853495x35345394.d.ghQ"
+ external_upload_identifier:
+ "84x83tmxy398t3y._Q_z8CoJYVr69bE6D7f8J6Oo0434QquLFoYdGVerWFx9X5HDEI_TP_95c34n853495x35345394.d.ghQ",
)
end
- tags 'Uploads'
- operationId 'abortMultipart'
- consumes 'application/json'
+ tags "Uploads"
+ operationId "abortMultipart"
+ consumes "application/json"
description <<~TEXT
This endpoint aborts the multipart upload initiated with /create-multipart.
This should be used when cancelling the upload. It does not matter if parts
@@ -263,17 +267,20 @@ RSpec.describe 'uploads' do
#{direct_uploads_disclaimer}
TEXT
- expected_request_schema = load_spec_schema('upload_abort_multipart_request')
+ expected_request_schema = load_spec_schema("upload_abort_multipart_request")
parameter name: :params, in: :body, schema: expected_request_schema
- produces 'application/json'
- response '200', 'external upload initialized' do
- expected_response_schema = load_spec_schema('success_ok_response')
+ produces "application/json"
+ response "200", "external upload initialized" do
+ expected_response_schema = load_spec_schema("success_ok_response")
schema(expected_response_schema)
- let(:params) { {
- 'external_upload_identifier' => "84x83tmxy398t3y._Q_z8CoJYVr69bE6D7f8J6Oo0434QquLFoYdGVerWFx9X5HDEI_TP_95c34n853495x35345394.d.ghQ"
- } }
+ let(:params) do
+ {
+ "external_upload_identifier" =>
+ "84x83tmxy398t3y._Q_z8CoJYVr69bE6D7f8J6Oo0434QquLFoYdGVerWFx9X5HDEI_TP_95c34n853495x35345394.d.ghQ",
+ }
+ end
it_behaves_like "a JSON endpoint", 200 do
let(:expected_response_schema) { expected_response_schema }
@@ -283,8 +290,8 @@ RSpec.describe 'uploads' do
end
end
- path '/uploads/complete-multipart.json' do
- post 'Complete multipart upload' do
+ path "/uploads/complete-multipart.json" do
+ post "Complete multipart upload" do
let(:unique_identifier) { "66e86218-80d9-4bda-b4d5-2b6def968705" }
let!(:external_stub) { Fabricate(:multipart_external_upload_stub, created_by: admin) }
let!(:upload) { Fabricate(:upload) }
@@ -296,9 +303,9 @@ RSpec.describe 'uploads' do
external_stub.update(unique_identifier: unique_identifier)
end
- tags 'Uploads'
- operationId 'completeMultipart'
- consumes 'application/json'
+ tags "Uploads"
+ operationId "completeMultipart"
+ consumes "application/json"
description <<~TEXT
Completes the multipart upload in the external store, and copies the
file from its temporary location to its final location in the store.
@@ -309,23 +316,20 @@ RSpec.describe 'uploads' do
#{direct_uploads_disclaimer}
TEXT
- expected_request_schema = load_spec_schema('upload_complete_multipart_request')
+ expected_request_schema = load_spec_schema("upload_complete_multipart_request")
parameter name: :params, in: :body, schema: expected_request_schema
- produces 'application/json'
- response '200', 'external upload initialized' do
- expected_response_schema = load_spec_schema('upload_create_response')
+ produces "application/json"
+ response "200", "external upload initialized" do
+ expected_response_schema = load_spec_schema("upload_create_response")
schema(expected_response_schema)
- let(:params) { {
- 'unique_identifier' => unique_identifier,
- 'parts' => [
- {
- 'part_number' => 1,
- 'etag' => '0c376dcfcc2606f4335bbc732de93344'
- }
- ]
- } }
+ let(:params) do
+ {
+ "unique_identifier" => unique_identifier,
+ "parts" => [{ "part_number" => 1, "etag" => "0c376dcfcc2606f4335bbc732de93344" }],
+ }
+ end
it_behaves_like "a JSON endpoint", 200 do
let(:expected_response_schema) { expected_response_schema }
diff --git a/spec/requests/api/user_badges_spec.rb b/spec/requests/api/user_badges_spec.rb
index fdf20c7a18f..e3198f47126 100644
--- a/spec/requests/api/user_badges_spec.rb
+++ b/spec/requests/api/user_badges_spec.rb
@@ -1,8 +1,7 @@
# frozen_string_literal: true
-require 'swagger_helper'
-
-RSpec.describe 'user_badges' do
+require "swagger_helper"
+RSpec.describe "user_badges" do
let(:admin) { Fabricate(:admin) }
before do
@@ -10,18 +9,17 @@ RSpec.describe 'user_badges' do
sign_in(admin)
end
- path '/user-badges/{username}.json' do
-
- get 'List badges for a user' do
- tags 'Badges', 'Users'
- operationId 'listUserBadges'
- consumes 'application/json'
+ path "/user-badges/{username}.json" do
+ get "List badges for a user" do
+ tags "Badges", "Users"
+ operationId "listUserBadges"
+ consumes "application/json"
expected_request_schema = nil
parameter name: :username, in: :path, schema: { type: :string }
- produces 'application/json'
- response '200', 'success response' do
- expected_response_schema = load_spec_schema('user_badges_response')
+ produces "application/json"
+ response "200", "success response" do
+ expected_response_schema = load_spec_schema("user_badges_response")
schema expected_response_schema
let(:username) { admin.username }
diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb
index a11864bd635..d311267db41 100644
--- a/spec/requests/api/users_spec.rb
+++ b/spec/requests/api/users_spec.rb
@@ -1,10 +1,9 @@
# frozen_string_literal: true
-require 'swagger_helper'
+require "swagger_helper"
-RSpec.describe 'users' do
-
- let(:'Api-Key') { Fabricate(:api_key).key }
- let(:'Api-Username') { 'system' }
+RSpec.describe "users" do
+ let(:"Api-Key") { Fabricate(:api_key).key }
+ let(:"Api-Username") { "system" }
let(:admin) { Fabricate(:admin) }
before do
@@ -14,644 +13,29 @@ RSpec.describe 'users' do
sign_in(admin)
end
- path '/users.json' do
-
- post 'Creates a user' do
- tags 'Users'
- operationId 'createUser'
- consumes 'application/json'
+ path "/users.json" do
+ post "Creates a user" do
+ tags "Users"
+ operationId "createUser"
+ consumes "application/json"
# This endpoint requires an api key or the active param is ignored
- parameter name: 'Api-Key', in: :header, type: :string, required: true
- parameter name: 'Api-Username', in: :header, type: :string, required: true
- expected_request_schema = load_spec_schema('user_create_request')
+ parameter name: "Api-Key", in: :header, type: :string, required: true
+ parameter name: "Api-Username", in: :header, type: :string, required: true
+ expected_request_schema = load_spec_schema("user_create_request")
parameter name: :params, in: :body, schema: expected_request_schema
- produces 'application/json'
- response '200', 'user created' do
- expected_response_schema = load_spec_schema('user_create_response')
+ produces "application/json"
+ response "200", "user created" do
+ expected_response_schema = load_spec_schema("user_create_response")
schema expected_response_schema
- let(:params) { {
- 'name' => 'user',
- 'username' => 'user1',
- 'email' => 'user1@example.com',
- 'password' => '13498428e9597cab689b468ebc0a5d33',
- 'active' => true,
- } }
-
- it_behaves_like "a JSON endpoint", 200 do
- let(:expected_response_schema) { expected_response_schema }
- let(:expected_request_schema) { expected_request_schema }
- end
- end
- end
-
- end
-
- path '/u/{username}.json' do
-
- get 'Get a single user by username' do
- tags 'Users'
- operationId 'getUser'
- consumes 'application/json'
- parameter name: 'Api-Key', in: :header, type: :string, required: true
- parameter name: 'Api-Username', in: :header, type: :string, required: true
- parameter name: :username, in: :path, type: :string, required: true
- expected_request_schema = nil
-
- produces 'application/json'
- response '200', 'user response' do
- expected_response_schema = load_spec_schema('user_get_response')
- schema expected_response_schema
-
- let(:username) { Fabricate(:user).username }
-
- it_behaves_like "a JSON endpoint", 200 do
- let(:expected_response_schema) { expected_response_schema }
- let(:expected_request_schema) { expected_request_schema }
- end
- end
- end
-
- put 'Update a user' do
- tags 'Users'
- operationId 'updateUser'
- consumes 'application/json'
-
- parameter name: 'Api-Key', in: :header, type: :string, required: true
- parameter name: 'Api-Username', in: :header, type: :string, required: true
- expected_request_schema = load_spec_schema('user_update_request')
- parameter name: :username, in: :path, type: :string, required: true
- parameter name: :params, in: :body, schema: expected_request_schema
-
- produces 'application/json'
- response '200', 'user updated' do
- expected_response_schema = load_spec_schema('user_update_response')
- schema expected_response_schema
-
- let(:username) { Fabricate(:user).username }
- let(:params) { { 'name' => 'user' } }
-
- it_behaves_like "a JSON endpoint", 200 do
- let(:expected_response_schema) { expected_response_schema }
- let(:expected_request_schema) { expected_request_schema }
- end
- end
- end
- end
-
- path '/u/by-external/{external_id}.json' do
-
- get 'Get a user by external_id' do
- tags 'Users'
- operationId 'getUserExternalId'
- consumes 'application/json'
- parameter name: 'Api-Key', in: :header, type: :string, required: true
- parameter name: 'Api-Username', in: :header, type: :string, required: true
- parameter name: :external_id, in: :path, type: :string, required: true
- expected_request_schema = nil
-
- produces 'application/json'
- response '200', 'user response' do
- expected_response_schema = load_spec_schema('user_get_response')
- schema expected_response_schema
-
- let(:user) { Fabricate(:user) }
- let(:external_id) { '1' }
-
- before do
- SiteSetting.discourse_connect_url = 'http://someurl.com'
- SiteSetting.enable_discourse_connect = true
- user.create_single_sign_on_record(external_id: '1', last_payload: '')
- end
-
- it_behaves_like "a JSON endpoint", 200 do
- let(:expected_response_schema) { expected_response_schema }
- let(:expected_request_schema) { expected_request_schema }
- end
- end
- end
- end
-
- path '/u/by-external/{provider}/{external_id}.json' do
-
- get 'Get a user by identity provider external ID' do
- tags 'Users'
- operationId 'getUserIdentiyProviderExternalId'
- consumes 'application/json'
- parameter name: 'Api-Key', in: :header, type: :string, required: true
- parameter name: 'Api-Username', in: :header, type: :string, required: true
- parameter name: :provider,
- in: :path,
- type: :string,
- required: true,
- description: "Authentication provider name. Can be found in the provider callback URL: `/auth/{provider}/callback`"
- parameter name: :external_id, in: :path, type: :string, required: true
- expected_request_schema = nil
-
- produces 'application/json'
- response '200', 'user response' do
- expected_response_schema = load_spec_schema('user_get_response')
- schema expected_response_schema
-
- let(:user) { Fabricate(:user) }
- let(:provider) { 'google_oauth2' }
- let(:external_id) { 'myuid' }
-
- before do
- SiteSetting.enable_google_oauth2_logins = true
- UserAssociatedAccount.create!(user: user, provider_uid: 'myuid', provider_name: 'google_oauth2')
- end
-
- it_behaves_like "a JSON endpoint", 200 do
- let(:expected_response_schema) { expected_response_schema }
- let(:expected_request_schema) { expected_request_schema }
- end
- end
- end
- end
-
- path '/u/{username}/preferences/avatar/pick.json' do
-
- put 'Update avatar' do
- tags 'Users'
- operationId 'updateAvatar'
- consumes 'application/json'
- expected_request_schema = load_spec_schema('user_update_avatar_request')
-
- parameter name: :username, in: :path, type: :string, required: true
- parameter name: :params, in: :body, schema: expected_request_schema
-
- produces 'application/json'
- response '200', 'avatar updated' do
- expected_response_schema = load_spec_schema('success_ok_response')
-
- let(:user) { Fabricate(:user) }
- let(:username) { user.username }
- let(:upload) { Fabricate(:upload, user: user) }
- let(:params) { { 'upload_id' => upload.id, 'type' => 'uploaded' } }
-
- schema(expected_response_schema)
-
- it_behaves_like "a JSON endpoint", 200 do
- let(:expected_response_schema) { expected_response_schema }
- let(:expected_request_schema) { expected_request_schema }
- end
- end
- end
-
- end
-
- path '/u/{username}/preferences/email.json' do
- put 'Update email' do
- tags 'Users'
- operationId 'updateEmail'
- consumes 'application/json'
- expected_request_schema = load_spec_schema('user_update_email_request')
-
- parameter name: :username, in: :path, type: :string, required: true
- parameter name: :params, in: :body, schema: expected_request_schema
-
- produces 'application/json'
- response '200', 'email updated' do
-
- let(:user) { Fabricate(:user) }
- let(:username) { user.username }
- let(:params) { { 'email' => "test@example.com" } }
-
- expected_response_schema = nil
-
- it_behaves_like "a JSON endpoint", 200 do
- let(:expected_response_schema) { expected_response_schema }
- let(:expected_request_schema) { expected_request_schema }
- end
- end
- end
- end
-
- path '/u/{username}/preferences/username.json' do
- put 'Update username' do
- tags 'Users'
- operationId 'updateUsername'
- consumes 'application/json'
- expected_request_schema = load_spec_schema('user_update_username_request')
-
- parameter name: :username, in: :path, type: :string, required: true
- parameter name: :params, in: :body, schema: expected_request_schema
-
- produces 'application/json'
- response '200', 'username updated' do
-
- let(:user) { Fabricate(:user) }
- let(:username) { user.username }
- let(:params) { { 'new_username' => "#{user.username}1" } }
-
- expected_response_schema = nil
-
- it_behaves_like "a JSON endpoint", 200 do
- let(:expected_response_schema) { expected_response_schema }
- let(:expected_request_schema) { expected_request_schema }
- end
- end
- end
- end
-
- path '/directory_items.json' do
-
- get 'Get a public list of users' do
- tags 'Users'
- operationId 'listUsersPublic'
- consumes 'application/json'
- expected_request_schema = nil
-
- parameter name: :period,
- in: :query,
- schema: {
- type: :string,
- enum: ['daily', 'weekly', 'monthly', 'quarterly', 'yearly', 'all']
- },
- required: true
- parameter name: :order,
- in: :query,
- schema: {
- type: :string,
- enum: [
- 'likes_received',
- 'likes_given',
- 'topic_count',
- 'post_count',
- 'topics_entered',
- 'posts_read',
- 'days_visited'
- ]
- },
- required: true
- parameter name: :asc,
- in: :query,
- schema: {
- type: :string,
- enum: ['true']
- }
- parameter name: :page, in: :query, type: :integer
-
- produces 'application/json'
- response '200', 'directory items response' do
-
- let(:period) { 'weekly' }
- let(:order) { 'likes_received' }
- let(:asc) { 'true' }
- let(:page) { 0 }
-
- expected_response_schema = load_spec_schema('users_public_list_response')
- schema(expected_response_schema)
-
- it_behaves_like "a JSON endpoint", 200 do
- let(:expected_response_schema) { expected_response_schema }
- let(:expected_request_schema) { expected_request_schema }
- end
- end
- end
-
- end
-
- path '/admin/users/{id}.json' do
-
- get 'Get a user by id' do
- tags 'Users', 'Admin'
- operationId 'adminGetUser'
- consumes 'application/json'
- expected_request_schema = nil
-
- parameter name: :id, in: :path, type: :integer, required: true
-
- produces 'application/json'
- response '200', 'response' do
-
- let(:id) { Fabricate(:user).id }
-
- expected_response_schema = load_spec_schema('admin_user_response')
- schema(expected_response_schema)
-
- it_behaves_like "a JSON endpoint", 200 do
- let(:expected_response_schema) { expected_response_schema }
- let(:expected_request_schema) { expected_request_schema }
- end
- end
- end
-
- delete 'Delete a user' do
- tags 'Users', 'Admin'
- operationId 'deleteUser'
- consumes 'application/json'
- expected_request_schema = load_spec_schema('user_delete_request')
-
- parameter name: :id, in: :path, type: :integer, required: true
- parameter name: :params, in: :body, schema: expected_request_schema
-
- produces 'application/json'
- response '200', 'response' do
-
- let(:id) { Fabricate(:user).id }
- let(:params) { {
- 'delete_posts' => true,
- 'block_email' => false,
- 'block_urls' => false,
- 'block_ip' => false
- } }
-
- expected_response_schema = load_spec_schema('user_delete_response')
- schema(expected_response_schema)
-
- it_behaves_like "a JSON endpoint", 200 do
- let(:expected_response_schema) { expected_response_schema }
- let(:expected_request_schema) { expected_request_schema }
- end
- end
- end
-
- end
-
- path '/admin/users/{id}/suspend.json' do
- put 'Suspend a user' do
- tags 'Users', 'Admin'
- operationId 'suspendUser'
- consumes 'application/json'
- expected_request_schema = load_spec_schema('user_suspend_request')
-
- parameter name: :id, in: :path, type: :integer, required: true
- parameter name: :params, in: :body, schema: expected_request_schema
-
- produces 'application/json'
- response '200', 'response' do
-
- let(:id) { Fabricate(:user).id }
- let(:params) { {
- 'suspend_until' => '2121-02-22',
- 'reason' => 'inactivity'
- } }
-
- expected_response_schema = load_spec_schema('user_suspend_response')
- schema(expected_response_schema)
-
- it_behaves_like "a JSON endpoint", 200 do
- let(:expected_response_schema) { expected_response_schema }
- let(:expected_request_schema) { expected_request_schema }
- end
- end
- end
- end
-
- path '/admin/users/{id}/silence.json' do
- put 'Silence a user' do
- tags 'Users', 'Admin'
- operationId 'silenceUser'
- consumes 'application/json'
- expected_request_schema = load_spec_schema('user_silence_request')
-
- parameter name: :id, in: :path, type: :integer, required: true
- parameter name: :params, in: :body, schema: expected_request_schema
-
- produces 'application/json'
- response '200', 'response' do
-
- let(:id) { Fabricate(:user).id }
- let(:params) {}
-
- expected_response_schema = load_spec_schema('user_silence_response')
- schema(expected_response_schema)
-
- it_behaves_like "a JSON endpoint", 200 do
- let(:expected_response_schema) { expected_response_schema }
- let(:expected_request_schema) { expected_request_schema }
- end
- end
- end
- end
-
- path '/admin/users/{id}/anonymize.json' do
- put 'Anonymize a user' do
- tags 'Users', 'Admin'
- operationId 'anonymizeUser'
- consumes 'application/json'
- expected_request_schema = nil
-
- parameter name: :id, in: :path, type: :integer, required: true
-
- produces 'application/json'
- response '200', 'response' do
-
- let(:id) { Fabricate(:user).id }
-
- expected_response_schema = load_spec_schema('user_anonymize_response')
- schema(expected_response_schema)
-
- it_behaves_like "a JSON endpoint", 200 do
- let(:expected_response_schema) { expected_response_schema }
- let(:expected_request_schema) { expected_request_schema }
- end
- end
- end
- end
-
- path '/admin/users/{id}/log_out.json' do
-
- post 'Log a user out' do
- tags 'Users', 'Admin'
- operationId 'logOutUser'
- consumes 'application/json'
- expected_request_schema = nil
-
- parameter name: :id, in: :path, type: :integer, required: true
-
- produces 'application/json'
- response '200', 'response' do
-
- let(:id) { Fabricate(:user).id }
-
- expected_response_schema = load_spec_schema('success_ok_response')
- schema(expected_response_schema)
-
- it_behaves_like "a JSON endpoint", 200 do
- let(:expected_response_schema) { expected_response_schema }
- let(:expected_request_schema) { expected_request_schema }
- end
- end
- end
- end
-
- path '/user_avatar/{username}/refresh_gravatar.json' do
-
- before do
- stub_request(:get, /https:\/\/www.gravatar.com\/avatar\/\w+.png\?d=404&reset_cache=\S+&s=360/).
- with(
- headers: {
- 'Accept' => '*/*',
- 'Accept-Encoding' => 'gzip',
- 'Host' => 'www.gravatar.com'
- }).
- to_return(status: 200, body: "", headers: {})
- end
-
- post 'Refresh gravatar' do
- tags 'Users', 'Admin'
- operationId 'refreshGravatar'
- consumes 'application/json'
- expected_request_schema = nil
-
- parameter name: :username, in: :path, type: :string, required: true
-
- produces 'application/json'
- response '200', 'response' do
-
- let(:user) { Fabricate(:user) }
- let(:username) { user.username }
-
- expected_response_schema = load_spec_schema('user_refresh_gravatar_response')
- schema(expected_response_schema)
-
- it_behaves_like "a JSON endpoint", 200 do
- let(:expected_response_schema) { expected_response_schema }
- let(:expected_request_schema) { expected_request_schema }
- end
- end
- end
- end
-
- path '/admin/users/list/{flag}.json' do
-
- get 'Get a list of users' do
- tags 'Users', 'Admin'
- operationId 'adminListUsers'
- consumes 'application/json'
- expected_request_schema = nil
-
- parameter name: :flag,
- in: :path,
- schema: {
- type: :string,
- enum: ['active', 'new', 'staff', 'suspended', 'blocked', 'suspect']
- },
- required: true
- parameter name: :order,
- in: :query,
- schema: {
- type: :string,
- enum: [
- 'created',
- 'last_emailed',
- 'seen',
- 'username',
- 'email',
- 'trust_level',
- 'days_visited',
- 'posts_read',
- 'topics_viewed',
- 'posts',
- 'read_time'
- ]
- }
- parameter name: :asc,
- in: :query,
- schema: {
- type: :string,
- enum: ['true']
- }
- parameter name: :page, in: :query, type: :integer
- parameter name: :show_emails, in: :query, type: :boolean
-
- produces 'application/json'
- response '200', 'response' do
-
- let(:flag) { 'active' }
- let(:order) { 'created' }
- let(:asc) { 'true' }
- let(:page) { 0 }
- let(:show_emails) { false }
-
- expected_response_schema = load_spec_schema('admin_user_list_response')
- schema(expected_response_schema)
-
- it_behaves_like "a JSON endpoint", 200 do
- let(:expected_response_schema) { expected_response_schema }
- let(:expected_request_schema) { expected_request_schema }
- end
- end
- end
- end
-
- path '/user_actions.json' do
-
- get 'Get a list of user actions' do
- tags 'Users'
- operationId 'listUserActions'
- consumes 'application/json'
- expected_request_schema = nil
-
- parameter name: :offset, in: :query, type: :integer, required: true
- parameter name: :username, in: :query, type: :string, required: true
- parameter name: :filter, in: :query, type: :string, required: true
-
- produces 'application/json'
- response '200', 'response' do
-
- let(:offset) { 0 }
- let(:username) { Fabricate(:user).username }
- let(:filter) { '4,5' }
-
- expected_response_schema = load_spec_schema('user_actions_response')
- schema(expected_response_schema)
-
- it_behaves_like "a JSON endpoint", 200 do
- let(:expected_response_schema) { expected_response_schema }
- let(:expected_request_schema) { expected_request_schema }
- end
- end
- end
- end
-
- path '/session/forgot_password.json' do
- post 'Send password reset email' do
- tags 'Users'
- operationId 'sendPasswordResetEmail'
- consumes 'application/json'
- expected_request_schema = load_spec_schema('user_password_reset_request')
- parameter name: :params, in: :body, schema: expected_request_schema
-
- produces 'application/json'
- response '200', 'success response' do
- expected_response_schema = load_spec_schema('user_password_reset_response')
- schema expected_response_schema
-
- let(:user) { Fabricate(:user) }
- let(:params) { { 'login' => user.username } }
-
- it_behaves_like "a JSON endpoint", 200 do
- let(:expected_response_schema) { expected_response_schema }
- let(:expected_request_schema) { expected_request_schema }
- end
- end
- end
- end
-
- path '/users/password-reset/{token}.json' do
- put 'Change password' do
- tags 'Users'
- operationId 'changePassword'
- consumes 'application/json'
- expected_request_schema = load_spec_schema('user_password_change_request')
- parameter name: :token, in: :path, type: :string, required: true
- parameter name: :params, in: :body, schema: expected_request_schema
-
- produces 'application/json'
- response '200', 'success response' do
- expected_response_schema = nil
-
- let(:user) { Fabricate(:user) }
- let(:token) { Fabricate(:email_token, user: user, scope: EmailToken.scopes[:password_reset]).token }
let(:params) do
{
- 'username' => user.username,
- 'password' => 'NH8QYbxYS5Zv5qEFzA4jULvM'
+ "name" => "user",
+ "username" => "user1",
+ "email" => "user1@example.com",
+ "password" => "13498428e9597cab689b468ebc0a5d33",
+ "active" => true,
}
end
@@ -663,17 +47,600 @@ RSpec.describe 'users' do
end
end
- path '/u/{username}/emails.json' do
- get 'Get email addresses belonging to a user' do
- tags 'Users'
- operationId 'getUserEmails'
- consumes 'application/json'
+ path "/u/{username}.json" do
+ get "Get a single user by username" do
+ tags "Users"
+ operationId "getUser"
+ consumes "application/json"
+ parameter name: "Api-Key", in: :header, type: :string, required: true
+ parameter name: "Api-Username", in: :header, type: :string, required: true
+ parameter name: :username, in: :path, type: :string, required: true
+ expected_request_schema = nil
+
+ produces "application/json"
+ response "200", "user response" do
+ expected_response_schema = load_spec_schema("user_get_response")
+ schema expected_response_schema
+
+ let(:username) { Fabricate(:user).username }
+
+ it_behaves_like "a JSON endpoint", 200 do
+ let(:expected_response_schema) { expected_response_schema }
+ let(:expected_request_schema) { expected_request_schema }
+ end
+ end
+ end
+
+ put "Update a user" do
+ tags "Users"
+ operationId "updateUser"
+ consumes "application/json"
+
+ parameter name: "Api-Key", in: :header, type: :string, required: true
+ parameter name: "Api-Username", in: :header, type: :string, required: true
+ expected_request_schema = load_spec_schema("user_update_request")
+ parameter name: :username, in: :path, type: :string, required: true
+ parameter name: :params, in: :body, schema: expected_request_schema
+
+ produces "application/json"
+ response "200", "user updated" do
+ expected_response_schema = load_spec_schema("user_update_response")
+ schema expected_response_schema
+
+ let(:username) { Fabricate(:user).username }
+ let(:params) { { "name" => "user" } }
+
+ it_behaves_like "a JSON endpoint", 200 do
+ let(:expected_response_schema) { expected_response_schema }
+ let(:expected_request_schema) { expected_request_schema }
+ end
+ end
+ end
+ end
+
+ path "/u/by-external/{external_id}.json" do
+ get "Get a user by external_id" do
+ tags "Users"
+ operationId "getUserExternalId"
+ consumes "application/json"
+ parameter name: "Api-Key", in: :header, type: :string, required: true
+ parameter name: "Api-Username", in: :header, type: :string, required: true
+ parameter name: :external_id, in: :path, type: :string, required: true
+ expected_request_schema = nil
+
+ produces "application/json"
+ response "200", "user response" do
+ expected_response_schema = load_spec_schema("user_get_response")
+ schema expected_response_schema
+
+ let(:user) { Fabricate(:user) }
+ let(:external_id) { "1" }
+
+ before do
+ SiteSetting.discourse_connect_url = "http://someurl.com"
+ SiteSetting.enable_discourse_connect = true
+ user.create_single_sign_on_record(external_id: "1", last_payload: "")
+ end
+
+ it_behaves_like "a JSON endpoint", 200 do
+ let(:expected_response_schema) { expected_response_schema }
+ let(:expected_request_schema) { expected_request_schema }
+ end
+ end
+ end
+ end
+
+ path "/u/by-external/{provider}/{external_id}.json" do
+ get "Get a user by identity provider external ID" do
+ tags "Users"
+ operationId "getUserIdentiyProviderExternalId"
+ consumes "application/json"
+ parameter name: "Api-Key", in: :header, type: :string, required: true
+ parameter name: "Api-Username", in: :header, type: :string, required: true
+ parameter name: :provider,
+ in: :path,
+ type: :string,
+ required: true,
+ description:
+ "Authentication provider name. Can be found in the provider callback URL: `/auth/{provider}/callback`"
+ parameter name: :external_id, in: :path, type: :string, required: true
+ expected_request_schema = nil
+
+ produces "application/json"
+ response "200", "user response" do
+ expected_response_schema = load_spec_schema("user_get_response")
+ schema expected_response_schema
+
+ let(:user) { Fabricate(:user) }
+ let(:provider) { "google_oauth2" }
+ let(:external_id) { "myuid" }
+
+ before do
+ SiteSetting.enable_google_oauth2_logins = true
+ UserAssociatedAccount.create!(
+ user: user,
+ provider_uid: "myuid",
+ provider_name: "google_oauth2",
+ )
+ end
+
+ it_behaves_like "a JSON endpoint", 200 do
+ let(:expected_response_schema) { expected_response_schema }
+ let(:expected_request_schema) { expected_request_schema }
+ end
+ end
+ end
+ end
+
+ path "/u/{username}/preferences/avatar/pick.json" do
+ put "Update avatar" do
+ tags "Users"
+ operationId "updateAvatar"
+ consumes "application/json"
+ expected_request_schema = load_spec_schema("user_update_avatar_request")
+
+ parameter name: :username, in: :path, type: :string, required: true
+ parameter name: :params, in: :body, schema: expected_request_schema
+
+ produces "application/json"
+ response "200", "avatar updated" do
+ expected_response_schema = load_spec_schema("success_ok_response")
+
+ let(:user) { Fabricate(:user) }
+ let(:username) { user.username }
+ let(:upload) { Fabricate(:upload, user: user) }
+ let(:params) { { "upload_id" => upload.id, "type" => "uploaded" } }
+
+ schema(expected_response_schema)
+
+ it_behaves_like "a JSON endpoint", 200 do
+ let(:expected_response_schema) { expected_response_schema }
+ let(:expected_request_schema) { expected_request_schema }
+ end
+ end
+ end
+ end
+
+ path "/u/{username}/preferences/email.json" do
+ put "Update email" do
+ tags "Users"
+ operationId "updateEmail"
+ consumes "application/json"
+ expected_request_schema = load_spec_schema("user_update_email_request")
+
+ parameter name: :username, in: :path, type: :string, required: true
+ parameter name: :params, in: :body, schema: expected_request_schema
+
+ produces "application/json"
+ response "200", "email updated" do
+ let(:user) { Fabricate(:user) }
+ let(:username) { user.username }
+ let(:params) { { "email" => "test@example.com" } }
+
+ expected_response_schema = nil
+
+ it_behaves_like "a JSON endpoint", 200 do
+ let(:expected_response_schema) { expected_response_schema }
+ let(:expected_request_schema) { expected_request_schema }
+ end
+ end
+ end
+ end
+
+ path "/u/{username}/preferences/username.json" do
+ put "Update username" do
+ tags "Users"
+ operationId "updateUsername"
+ consumes "application/json"
+ expected_request_schema = load_spec_schema("user_update_username_request")
+
+ parameter name: :username, in: :path, type: :string, required: true
+ parameter name: :params, in: :body, schema: expected_request_schema
+
+ produces "application/json"
+ response "200", "username updated" do
+ let(:user) { Fabricate(:user) }
+ let(:username) { user.username }
+ let(:params) { { "new_username" => "#{user.username}1" } }
+
+ expected_response_schema = nil
+
+ it_behaves_like "a JSON endpoint", 200 do
+ let(:expected_response_schema) { expected_response_schema }
+ let(:expected_request_schema) { expected_request_schema }
+ end
+ end
+ end
+ end
+
+ path "/directory_items.json" do
+ get "Get a public list of users" do
+ tags "Users"
+ operationId "listUsersPublic"
+ consumes "application/json"
+ expected_request_schema = nil
+
+ parameter name: :period,
+ in: :query,
+ schema: {
+ type: :string,
+ enum: %w[daily weekly monthly quarterly yearly all],
+ },
+ required: true
+ parameter name: :order,
+ in: :query,
+ schema: {
+ type: :string,
+ enum: %w[
+ likes_received
+ likes_given
+ topic_count
+ post_count
+ topics_entered
+ posts_read
+ days_visited
+ ],
+ },
+ required: true
+ parameter name: :asc, in: :query, schema: { type: :string, enum: ["true"] }
+ parameter name: :page, in: :query, type: :integer
+
+ produces "application/json"
+ response "200", "directory items response" do
+ let(:period) { "weekly" }
+ let(:order) { "likes_received" }
+ let(:asc) { "true" }
+ let(:page) { 0 }
+
+ expected_response_schema = load_spec_schema("users_public_list_response")
+ schema(expected_response_schema)
+
+ it_behaves_like "a JSON endpoint", 200 do
+ let(:expected_response_schema) { expected_response_schema }
+ let(:expected_request_schema) { expected_request_schema }
+ end
+ end
+ end
+ end
+
+ path "/admin/users/{id}.json" do
+ get "Get a user by id" do
+ tags "Users", "Admin"
+ operationId "adminGetUser"
+ consumes "application/json"
+ expected_request_schema = nil
+
+ parameter name: :id, in: :path, type: :integer, required: true
+
+ produces "application/json"
+ response "200", "response" do
+ let(:id) { Fabricate(:user).id }
+
+ expected_response_schema = load_spec_schema("admin_user_response")
+ schema(expected_response_schema)
+
+ it_behaves_like "a JSON endpoint", 200 do
+ let(:expected_response_schema) { expected_response_schema }
+ let(:expected_request_schema) { expected_request_schema }
+ end
+ end
+ end
+
+ delete "Delete a user" do
+ tags "Users", "Admin"
+ operationId "deleteUser"
+ consumes "application/json"
+ expected_request_schema = load_spec_schema("user_delete_request")
+
+ parameter name: :id, in: :path, type: :integer, required: true
+ parameter name: :params, in: :body, schema: expected_request_schema
+
+ produces "application/json"
+ response "200", "response" do
+ let(:id) { Fabricate(:user).id }
+ let(:params) do
+ {
+ "delete_posts" => true,
+ "block_email" => false,
+ "block_urls" => false,
+ "block_ip" => false,
+ }
+ end
+
+ expected_response_schema = load_spec_schema("user_delete_response")
+ schema(expected_response_schema)
+
+ it_behaves_like "a JSON endpoint", 200 do
+ let(:expected_response_schema) { expected_response_schema }
+ let(:expected_request_schema) { expected_request_schema }
+ end
+ end
+ end
+ end
+
+ path "/admin/users/{id}/suspend.json" do
+ put "Suspend a user" do
+ tags "Users", "Admin"
+ operationId "suspendUser"
+ consumes "application/json"
+ expected_request_schema = load_spec_schema("user_suspend_request")
+
+ parameter name: :id, in: :path, type: :integer, required: true
+ parameter name: :params, in: :body, schema: expected_request_schema
+
+ produces "application/json"
+ response "200", "response" do
+ let(:id) { Fabricate(:user).id }
+ let(:params) { { "suspend_until" => "2121-02-22", "reason" => "inactivity" } }
+
+ expected_response_schema = load_spec_schema("user_suspend_response")
+ schema(expected_response_schema)
+
+ it_behaves_like "a JSON endpoint", 200 do
+ let(:expected_response_schema) { expected_response_schema }
+ let(:expected_request_schema) { expected_request_schema }
+ end
+ end
+ end
+ end
+
+ path "/admin/users/{id}/silence.json" do
+ put "Silence a user" do
+ tags "Users", "Admin"
+ operationId "silenceUser"
+ consumes "application/json"
+ expected_request_schema = load_spec_schema("user_silence_request")
+
+ parameter name: :id, in: :path, type: :integer, required: true
+ parameter name: :params, in: :body, schema: expected_request_schema
+
+ produces "application/json"
+ response "200", "response" do
+ let(:id) { Fabricate(:user).id }
+ let(:params) {}
+
+ expected_response_schema = load_spec_schema("user_silence_response")
+ schema(expected_response_schema)
+
+ it_behaves_like "a JSON endpoint", 200 do
+ let(:expected_response_schema) { expected_response_schema }
+ let(:expected_request_schema) { expected_request_schema }
+ end
+ end
+ end
+ end
+
+ path "/admin/users/{id}/anonymize.json" do
+ put "Anonymize a user" do
+ tags "Users", "Admin"
+ operationId "anonymizeUser"
+ consumes "application/json"
+ expected_request_schema = nil
+
+ parameter name: :id, in: :path, type: :integer, required: true
+
+ produces "application/json"
+ response "200", "response" do
+ let(:id) { Fabricate(:user).id }
+
+ expected_response_schema = load_spec_schema("user_anonymize_response")
+ schema(expected_response_schema)
+
+ it_behaves_like "a JSON endpoint", 200 do
+ let(:expected_response_schema) { expected_response_schema }
+ let(:expected_request_schema) { expected_request_schema }
+ end
+ end
+ end
+ end
+
+ path "/admin/users/{id}/log_out.json" do
+ post "Log a user out" do
+ tags "Users", "Admin"
+ operationId "logOutUser"
+ consumes "application/json"
+ expected_request_schema = nil
+
+ parameter name: :id, in: :path, type: :integer, required: true
+
+ produces "application/json"
+ response "200", "response" do
+ let(:id) { Fabricate(:user).id }
+
+ expected_response_schema = load_spec_schema("success_ok_response")
+ schema(expected_response_schema)
+
+ it_behaves_like "a JSON endpoint", 200 do
+ let(:expected_response_schema) { expected_response_schema }
+ let(:expected_request_schema) { expected_request_schema }
+ end
+ end
+ end
+ end
+
+ path "/user_avatar/{username}/refresh_gravatar.json" do
+ before do
+ stub_request(
+ :get,
+ %r{https://www.gravatar.com/avatar/\w+.png\?d=404&reset_cache=\S+&s=360},
+ ).with(
+ headers: {
+ "Accept" => "*/*",
+ "Accept-Encoding" => "gzip",
+ "Host" => "www.gravatar.com",
+ },
+ ).to_return(status: 200, body: "", headers: {})
+ end
+
+ post "Refresh gravatar" do
+ tags "Users", "Admin"
+ operationId "refreshGravatar"
+ consumes "application/json"
+ expected_request_schema = nil
+
+ parameter name: :username, in: :path, type: :string, required: true
+
+ produces "application/json"
+ response "200", "response" do
+ let(:user) { Fabricate(:user) }
+ let(:username) { user.username }
+
+ expected_response_schema = load_spec_schema("user_refresh_gravatar_response")
+ schema(expected_response_schema)
+
+ it_behaves_like "a JSON endpoint", 200 do
+ let(:expected_response_schema) { expected_response_schema }
+ let(:expected_request_schema) { expected_request_schema }
+ end
+ end
+ end
+ end
+
+ path "/admin/users/list/{flag}.json" do
+ get "Get a list of users" do
+ tags "Users", "Admin"
+ operationId "adminListUsers"
+ consumes "application/json"
+ expected_request_schema = nil
+
+ parameter name: :flag,
+ in: :path,
+ schema: {
+ type: :string,
+ enum: %w[active new staff suspended blocked suspect],
+ },
+ required: true
+ parameter name: :order,
+ in: :query,
+ schema: {
+ type: :string,
+ enum: %w[
+ created
+ last_emailed
+ seen
+ username
+ email
+ trust_level
+ days_visited
+ posts_read
+ topics_viewed
+ posts
+ read_time
+ ],
+ }
+ parameter name: :asc, in: :query, schema: { type: :string, enum: ["true"] }
+ parameter name: :page, in: :query, type: :integer
+ parameter name: :show_emails, in: :query, type: :boolean
+
+ produces "application/json"
+ response "200", "response" do
+ let(:flag) { "active" }
+ let(:order) { "created" }
+ let(:asc) { "true" }
+ let(:page) { 0 }
+ let(:show_emails) { false }
+
+ expected_response_schema = load_spec_schema("admin_user_list_response")
+ schema(expected_response_schema)
+
+ it_behaves_like "a JSON endpoint", 200 do
+ let(:expected_response_schema) { expected_response_schema }
+ let(:expected_request_schema) { expected_request_schema }
+ end
+ end
+ end
+ end
+
+ path "/user_actions.json" do
+ get "Get a list of user actions" do
+ tags "Users"
+ operationId "listUserActions"
+ consumes "application/json"
+ expected_request_schema = nil
+
+ parameter name: :offset, in: :query, type: :integer, required: true
+ parameter name: :username, in: :query, type: :string, required: true
+ parameter name: :filter, in: :query, type: :string, required: true
+
+ produces "application/json"
+ response "200", "response" do
+ let(:offset) { 0 }
+ let(:username) { Fabricate(:user).username }
+ let(:filter) { "4,5" }
+
+ expected_response_schema = load_spec_schema("user_actions_response")
+ schema(expected_response_schema)
+
+ it_behaves_like "a JSON endpoint", 200 do
+ let(:expected_response_schema) { expected_response_schema }
+ let(:expected_request_schema) { expected_request_schema }
+ end
+ end
+ end
+ end
+
+ path "/session/forgot_password.json" do
+ post "Send password reset email" do
+ tags "Users"
+ operationId "sendPasswordResetEmail"
+ consumes "application/json"
+ expected_request_schema = load_spec_schema("user_password_reset_request")
+ parameter name: :params, in: :body, schema: expected_request_schema
+
+ produces "application/json"
+ response "200", "success response" do
+ expected_response_schema = load_spec_schema("user_password_reset_response")
+ schema expected_response_schema
+
+ let(:user) { Fabricate(:user) }
+ let(:params) { { "login" => user.username } }
+
+ it_behaves_like "a JSON endpoint", 200 do
+ let(:expected_response_schema) { expected_response_schema }
+ let(:expected_request_schema) { expected_request_schema }
+ end
+ end
+ end
+ end
+
+ path "/users/password-reset/{token}.json" do
+ put "Change password" do
+ tags "Users"
+ operationId "changePassword"
+ consumes "application/json"
+ expected_request_schema = load_spec_schema("user_password_change_request")
+ parameter name: :token, in: :path, type: :string, required: true
+ parameter name: :params, in: :body, schema: expected_request_schema
+
+ produces "application/json"
+ response "200", "success response" do
+ expected_response_schema = nil
+
+ let(:user) { Fabricate(:user) }
+ let(:token) do
+ Fabricate(:email_token, user: user, scope: EmailToken.scopes[:password_reset]).token
+ end
+ let(:params) { { "username" => user.username, "password" => "NH8QYbxYS5Zv5qEFzA4jULvM" } }
+
+ it_behaves_like "a JSON endpoint", 200 do
+ let(:expected_response_schema) { expected_response_schema }
+ let(:expected_request_schema) { expected_request_schema }
+ end
+ end
+ end
+ end
+
+ path "/u/{username}/emails.json" do
+ get "Get email addresses belonging to a user" do
+ tags "Users"
+ operationId "getUserEmails"
+ consumes "application/json"
expected_request_schema = nil
parameter name: :username, in: :path, type: :string, required: true
- produces 'application/json'
- response '200', 'success response' do
- expected_response_schema = load_spec_schema('user_emails_response')
+ produces "application/json"
+ response "200", "success response" do
+ expected_response_schema = load_spec_schema("user_emails_response")
schema expected_response_schema
let(:username) { Fabricate(:user).username }
@@ -685,5 +652,4 @@ RSpec.describe 'users' do
end
end
end
-
end
diff --git a/spec/requests/application_controller_spec.rb b/spec/requests/application_controller_spec.rb
index 77d348098c6..dd86c50c841 100644
--- a/spec/requests/application_controller_spec.rb
+++ b/spec/requests/application_controller_spec.rb
@@ -1,11 +1,11 @@
# frozen_string_literal: true
RSpec.describe ApplicationController do
- describe '#redirect_to_login_if_required' do
+ describe "#redirect_to_login_if_required" do
let(:admin) { Fabricate(:admin) }
before do
- admin # to skip welcome wizard at home page `/`
+ admin # to skip welcome wizard at home page `/`
SiteSetting.login_required = true
end
@@ -20,7 +20,7 @@ RSpec.describe ApplicationController do
end
it "should redirect to SSO if enabled" do
- SiteSetting.discourse_connect_url = 'http://someurl.com'
+ SiteSetting.discourse_connect_url = "http://someurl.com"
SiteSetting.enable_discourse_connect = true
get "/"
expect(response).to redirect_to("/session/sso")
@@ -45,7 +45,7 @@ RSpec.describe ApplicationController do
it "should not redirect to SSO when auth_immediately is disabled" do
SiteSetting.auth_immediately = false
- SiteSetting.discourse_connect_url = 'http://someurl.com'
+ SiteSetting.discourse_connect_url = "http://someurl.com"
SiteSetting.enable_discourse_connect = true
get "/"
@@ -64,22 +64,20 @@ RSpec.describe ApplicationController do
context "with omniauth in test mode" do
before do
OmniAuth.config.test_mode = true
- OmniAuth.config.add_mock(:google_oauth2,
- info: OmniAuth::AuthHash::InfoHash.new(
- email: "address@example.com",
- ),
+ OmniAuth.config.add_mock(
+ :google_oauth2,
+ info: OmniAuth::AuthHash::InfoHash.new(email: "address@example.com"),
extra: {
- raw_info: OmniAuth::AuthHash.new(
- email_verified: true,
- email: "address@example.com",
- )
- }
+ raw_info: OmniAuth::AuthHash.new(email_verified: true, email: "address@example.com"),
+ },
)
Rails.application.env_config["omniauth.auth"] = OmniAuth.config.mock_auth[:google_oauth2]
end
after do
- Rails.application.env_config["omniauth.auth"] = OmniAuth.config.mock_auth[:google_oauth2] = nil
+ Rails.application.env_config["omniauth.auth"] = OmniAuth.config.mock_auth[
+ :google_oauth2
+ ] = nil
OmniAuth.config.test_mode = false
end
@@ -101,34 +99,34 @@ RSpec.describe ApplicationController do
end
end
- it 'contains authentication data when cookies exist' do
+ it "contains authentication data when cookies exist" do
cookie_data = "someauthenticationdata"
- cookies['authentication_data'] = cookie_data
- get '/login'
+ cookies["authentication_data"] = cookie_data
+ get "/login"
expect(response.status).to eq(200)
expect(response.body).to include("data-authentication-data=\"#{cookie_data}\"")
expect(response.headers["Set-Cookie"]).to include("authentication_data=;") # Delete cookie
end
- it 'deletes authentication data cookie even if already authenticated' do
+ it "deletes authentication data cookie even if already authenticated" do
sign_in(Fabricate(:user))
- cookies['authentication_data'] = "someauthenticationdata"
- get '/'
+ cookies["authentication_data"] = "someauthenticationdata"
+ get "/"
expect(response.status).to eq(200)
expect(response.body).not_to include("data-authentication-data=")
expect(response.headers["Set-Cookie"]).to include("authentication_data=;") # Delete cookie
end
it "returns a 403 for json requests" do
- get '/latest'
+ get "/latest"
expect(response.status).to eq(302)
- get '/latest.json'
+ get "/latest.json"
expect(response.status).to eq(403)
end
end
- describe '#redirect_to_second_factor_if_required' do
+ describe "#redirect_to_second_factor_if_required" do
let(:admin) { Fabricate(:admin) }
fab!(:user) { Fabricate(:user) }
@@ -219,9 +217,7 @@ RSpec.describe ApplicationController do
end
context "when the staff member has enabled TOTP" do
- before do
- Fabricate(:user_second_factor_totp, user: admin)
- end
+ before { Fabricate(:user_second_factor_totp, user: admin) }
it "does not redirects the staff to set up 2FA" do
get "/"
@@ -230,9 +226,7 @@ RSpec.describe ApplicationController do
end
context "when the staff member has enabled security keys" do
- before do
- Fabricate(:user_security_key_with_random_credential, user: admin)
- end
+ before { Fabricate(:user_security_key_with_random_credential, user: admin) }
it "does not redirects the staff to set up 2FA" do
get "/"
@@ -242,19 +236,17 @@ RSpec.describe ApplicationController do
end
end
- describe 'invalid request params' do
+ describe "invalid request params" do
before do
@old_logger = Rails.logger
@logs = StringIO.new
Rails.logger = Logger.new(@logs)
end
- after do
- Rails.logger = @old_logger
- end
+ after { Rails.logger = @old_logger }
- it 'should not raise a 500 (nor should it log a warning) for bad params' do
- bad_str = (+"d\xDE").force_encoding('utf-8')
+ it "should not raise a 500 (nor should it log a warning) for bad params" do
+ bad_str = (+"d\xDE").force_encoding("utf-8")
expect(bad_str.valid_encoding?).to eq(false)
get "/latest.json", params: { test: bad_str }
@@ -263,39 +255,36 @@ RSpec.describe ApplicationController do
log = @logs.string
- if (log.include? 'exception app middleware')
+ if (log.include? "exception app middleware")
# heisentest diagnostics
puts
puts "EXTRA DIAGNOSTICS FOR INTERMITTENT TEST FAIL"
puts log
puts ">> action_dispatch.exception"
- ex = request.env['action_dispatch.exception']
+ ex = request.env["action_dispatch.exception"]
puts ">> exception class: #{ex.class} : #{ex}"
end
- expect(log).not_to include('exception app middleware')
-
- expect(response.parsed_body).to eq(
- "status" => 400,
- "error" => "Bad Request"
- )
+ expect(log).not_to include("exception app middleware")
+ expect(response.parsed_body).to eq("status" => 400, "error" => "Bad Request")
end
end
- describe 'missing required param' do
- it 'should return a 400' do
+ describe "missing required param" do
+ it "should return a 400" do
get "/search/query.json", params: { trem: "misspelled term" }
expect(response.status).to eq(400)
- expect(response.parsed_body["errors"].first).to include("param is missing or the value is empty: term")
+ expect(response.parsed_body["errors"].first).to include(
+ "param is missing or the value is empty: term",
+ )
end
end
- describe 'build_not_found_page' do
- describe 'topic not found' do
-
- it 'should not redirect to permalink if topic/category does not exist' do
+ describe "build_not_found_page" do
+ describe "topic not found" do
+ it "should not redirect to permalink if topic/category does not exist" do
topic = create_post.topic
Permalink.create!(url: topic.relative_url, topic_id: topic.id + 1)
topic.trash!
@@ -309,9 +298,9 @@ RSpec.describe ApplicationController do
expect(response.status).to eq(410)
end
- it 'should return permalink for deleted topics' do
+ it "should return permalink for deleted topics" do
topic = create_post.topic
- external_url = 'https://somewhere.over.rainbow'
+ external_url = "https://somewhere.over.rainbow"
Permalink.create!(url: topic.relative_url, external_url: external_url)
topic.trash!
@@ -328,7 +317,7 @@ RSpec.describe ApplicationController do
expect(response.body).to eq(external_url)
end
- it 'supports subfolder with permalinks' do
+ it "supports subfolder with permalinks" do
set_subfolder "/forum"
trashed_topic = create_post.topic
@@ -349,51 +338,58 @@ RSpec.describe ApplicationController do
expect(response).to redirect_to("/forum/c/#{category.slug}/#{category.id}")
permalink.destroy
- permalink = Permalink.create!(url: trashed_topic.relative_url, post_id: new_topic.posts.last.id)
+ permalink =
+ Permalink.create!(url: trashed_topic.relative_url, post_id: new_topic.posts.last.id)
get "/t/#{trashed_topic.slug}/#{trashed_topic.id}"
expect(response.status).to eq(301)
- expect(response).to redirect_to("/forum/t/#{new_topic.slug}/#{new_topic.id}/#{new_topic.posts.last.post_number}")
+ expect(response).to redirect_to(
+ "/forum/t/#{new_topic.slug}/#{new_topic.id}/#{new_topic.posts.last.post_number}",
+ )
end
- it 'should return 404 and show Google search for an invalid topic route' do
+ it "should return 404 and show Google search for an invalid topic route" do
get "/t/nope-nope/99999999"
expect(response.status).to eq(404)
response_body = response.body
- expect(response_body).to include(I18n.t('page_not_found.search_button'))
- expect(response_body).to have_tag("input", with: { value: 'nope nope' })
+ expect(response_body).to include(I18n.t("page_not_found.search_button"))
+ expect(response_body).to have_tag("input", with: { value: "nope nope" })
end
- it 'should not include Google search if login_required is enabled' do
+ it "should not include Google search if login_required is enabled" do
SiteSetting.login_required = true
sign_in(Fabricate(:user))
get "/t/nope-nope/99999999"
expect(response.status).to eq(404)
- expect(response.body).to_not include('google.com/search')
+ expect(response.body).to_not include("google.com/search")
end
- describe 'no logspam' do
+ describe "no logspam" do
before do
@orig_logger = Rails.logger
Rails.logger = @fake_logger = FakeLogger.new
end
- after do
- Rails.logger = @orig_logger
- end
+ after { Rails.logger = @orig_logger }
- it 'should handle 404 to a css file' do
+ it "should handle 404 to a css file" do
Discourse.cache.delete("page_not_found_topics:#{I18n.locale}")
topic1 = Fabricate(:topic)
- get '/stylesheets/mobile_1_4cd559272273fe6d3c7db620c617d596a5fdf240.css', headers: { 'HTTP_ACCEPT' => 'text/css,*/*,q=0.1' }
+ get "/stylesheets/mobile_1_4cd559272273fe6d3c7db620c617d596a5fdf240.css",
+ headers: {
+ "HTTP_ACCEPT" => "text/css,*/*,q=0.1",
+ }
expect(response.status).to eq(404)
expect(response.body).to include(topic1.title)
topic2 = Fabricate(:topic)
- get '/stylesheets/mobile_1_4cd559272273fe6d3c7db620c617d596a5fdf240.css', headers: { 'HTTP_ACCEPT' => 'text/css,*/*,q=0.1' }
+ get "/stylesheets/mobile_1_4cd559272273fe6d3c7db620c617d596a5fdf240.css",
+ headers: {
+ "HTTP_ACCEPT" => "text/css,*/*,q=0.1",
+ }
expect(response.status).to eq(404)
expect(response.body).to include(topic1.title)
expect(response.body).to_not include(topic2.title)
@@ -404,24 +400,24 @@ RSpec.describe ApplicationController do
end
end
- it 'should cache results' do
+ it "should cache results" do
Discourse.cache.delete("page_not_found_topics:#{I18n.locale}")
Discourse.cache.delete("page_not_found_topics:fr")
topic1 = Fabricate(:topic)
- get '/t/nope-nope/99999999'
+ get "/t/nope-nope/99999999"
expect(response.status).to eq(404)
expect(response.body).to include(topic1.title)
topic2 = Fabricate(:topic)
- get '/t/nope-nope/99999999'
+ get "/t/nope-nope/99999999"
expect(response.status).to eq(404)
expect(response.body).to include(topic1.title)
expect(response.body).to_not include(topic2.title)
# Different locale should have different cache
SiteSetting.default_locale = :fr
- get '/t/nope-nope/99999999'
+ get "/t/nope-nope/99999999"
expect(response.status).to eq(404)
expect(response.body).to include(topic1.title)
expect(response.body).to include(topic2.title)
@@ -436,9 +432,7 @@ RSpec.describe ApplicationController do
fab!(:user) { Fabricate(:user) }
fab!(:admin) { Fabricate(:admin) }
- before do
- sign_in(user)
- end
+ before { sign_in(user) }
it "selects the theme the user has selected" do
user.user_option.update_columns(theme_ids: [theme.id])
@@ -457,7 +451,7 @@ RSpec.describe ApplicationController do
it "can be overridden with a cookie" do
user.user_option.update_columns(theme_ids: [theme.id])
- cookies['theme_ids'] = "#{theme2.id}|#{user.user_option.theme_key_seq}"
+ cookies["theme_ids"] = "#{theme2.id}|#{user.user_option.theme_key_seq}"
get "/"
expect(response.status).to eq(200)
@@ -476,7 +470,7 @@ RSpec.describe ApplicationController do
it "can be overridden with preview_theme_id param" do
sign_in(admin)
- cookies['theme_ids'] = "#{theme.id}|#{admin.user_option.theme_key_seq}"
+ cookies["theme_ids"] = "#{theme.id}|#{admin.user_option.theme_key_seq}"
get "/", params: { preview_theme_id: theme2.id }
expect(response.status).to eq(200)
@@ -494,7 +488,7 @@ RSpec.describe ApplicationController do
it "cookie can fail back to user if out of sync" do
user.user_option.update_columns(theme_ids: [theme.id])
- cookies['theme_ids'] = "#{theme2.id}|#{user.user_option.theme_key_seq - 1}"
+ cookies["theme_ids"] = "#{theme2.id}|#{user.user_option.theme_key_seq - 1}"
get "/"
expect(response.status).to eq(200)
@@ -502,56 +496,48 @@ RSpec.describe ApplicationController do
end
end
- describe 'Custom hostname' do
-
- it 'does not allow arbitrary host injection' do
- get("/latest",
- headers: {
- "X-Forwarded-Host" => "test123.com"
- }
- )
+ describe "Custom hostname" do
+ it "does not allow arbitrary host injection" do
+ get("/latest", headers: { "X-Forwarded-Host" => "test123.com" })
expect(response.body).not_to include("test123")
end
end
- describe 'allow_embedding_site_in_an_iframe' do
-
+ describe "allow_embedding_site_in_an_iframe" do
it "should have the 'X-Frame-Options' header with value 'sameorigin'" do
get("/latest")
- expect(response.headers['X-Frame-Options']).to eq("SAMEORIGIN")
+ expect(response.headers["X-Frame-Options"]).to eq("SAMEORIGIN")
end
it "should not include the 'X-Frame-Options' header" do
SiteSetting.allow_embedding_site_in_an_iframe = true
get("/latest")
- expect(response.headers).not_to include('X-Frame-Options')
+ expect(response.headers).not_to include("X-Frame-Options")
end
end
describe "splash_screen" do
let(:admin) { Fabricate(:admin) }
- before do
- admin
- end
+ before { admin }
- it 'adds a preloader splash screen when enabled' do
- get '/'
+ it "adds a preloader splash screen when enabled" do
+ get "/"
expect(response.status).to eq(200)
expect(response.body).to include("d-splash")
SiteSetting.splash_screen = false
- get '/'
+ get "/"
expect(response.status).to eq(200)
expect(response.body).not_to include("d-splash")
end
end
- describe 'Delegated auth' do
+ describe "Delegated auth" do
let :public_key do
<<~TXT
-----BEGIN PUBLIC KEY-----
@@ -564,27 +550,24 @@ RSpec.describe ApplicationController do
end
let :args do
- {
- auth_redirect: 'http://no-good.com',
- user_api_public_key: "not-a-valid-public-key"
- }
+ { auth_redirect: "http://no-good.com", user_api_public_key: "not-a-valid-public-key" }
end
- it 'disallows invalid public_key param' do
+ it "disallows invalid public_key param" do
args[:auth_redirect] = "discourse://auth_redirect"
get "/latest", params: args
expect(response.body).to eq(I18n.t("user_api_key.invalid_public_key"))
end
- it 'does not allow invalid auth_redirect' do
+ it "does not allow invalid auth_redirect" do
args[:user_api_public_key] = public_key
get "/latest", params: args
expect(response.body).to eq(I18n.t("user_api_key.invalid_auth_redirect"))
end
- it 'does not redirect if one_time_password scope is disallowed' do
+ it "does not redirect if one_time_password scope is disallowed" do
SiteSetting.allow_user_api_key_scopes = "read|write"
args[:user_api_public_key] = public_key
args[:auth_redirect] = "discourse://auth_redirect"
@@ -595,7 +578,7 @@ RSpec.describe ApplicationController do
expect(response).to_not redirect_to("#{args[:auth_redirect]}?otp=true")
end
- it 'redirects correctly with valid params' do
+ it "redirects correctly with valid params" do
SiteSetting.login_required = true
args[:user_api_public_key] = public_key
args[:auth_redirect] = "discourse://auth_redirect"
@@ -607,130 +590,161 @@ RSpec.describe ApplicationController do
end
end
- describe 'Content Security Policy' do
- it 'is enabled by SiteSettings' do
+ describe "Content Security Policy" do
+ it "is enabled by SiteSettings" do
SiteSetting.content_security_policy = false
SiteSetting.content_security_policy_report_only = false
- get '/'
+ get "/"
- expect(response.headers).to_not include('Content-Security-Policy')
- expect(response.headers).to_not include('Content-Security-Policy-Report-Only')
+ expect(response.headers).to_not include("Content-Security-Policy")
+ expect(response.headers).to_not include("Content-Security-Policy-Report-Only")
SiteSetting.content_security_policy = true
SiteSetting.content_security_policy_report_only = true
- get '/'
+ get "/"
- expect(response.headers).to include('Content-Security-Policy')
- expect(response.headers).to include('Content-Security-Policy-Report-Only')
+ expect(response.headers).to include("Content-Security-Policy")
+ expect(response.headers).to include("Content-Security-Policy-Report-Only")
end
- it 'can be customized with SiteSetting' do
+ it "can be customized with SiteSetting" do
SiteSetting.content_security_policy = true
- get '/'
- script_src = parse(response.headers['Content-Security-Policy'])['script-src']
+ get "/"
+ script_src = parse(response.headers["Content-Security-Policy"])["script-src"]
- expect(script_src).to_not include('example.com')
+ expect(script_src).to_not include("example.com")
- SiteSetting.content_security_policy_script_src = 'example.com'
+ SiteSetting.content_security_policy_script_src = "example.com"
- get '/'
- script_src = parse(response.headers['Content-Security-Policy'])['script-src']
+ get "/"
+ script_src = parse(response.headers["Content-Security-Policy"])["script-src"]
- expect(script_src).to include('example.com')
+ expect(script_src).to include("example.com")
end
- it 'does not set CSP when responding to non-HTML' do
+ it "does not set CSP when responding to non-HTML" do
SiteSetting.content_security_policy = true
SiteSetting.content_security_policy_report_only = true
- get '/latest.json'
+ get "/latest.json"
- expect(response.headers).to_not include('Content-Security-Policy')
- expect(response.headers).to_not include('Content-Security-Policy-Report-Only')
+ expect(response.headers).to_not include("Content-Security-Policy")
+ expect(response.headers).to_not include("Content-Security-Policy-Report-Only")
end
- it 'when GTM is enabled it adds the same nonce to the policy and the GTM tag' do
+ it "when GTM is enabled it adds the same nonce to the policy and the GTM tag" do
SiteSetting.content_security_policy = true
- SiteSetting.gtm_container_id = 'GTM-ABCDEF'
+ SiteSetting.gtm_container_id = "GTM-ABCDEF"
- get '/latest'
+ get "/latest"
nonce = ApplicationHelper.google_tag_manager_nonce
- expect(response.headers).to include('Content-Security-Policy')
+ expect(response.headers).to include("Content-Security-Policy")
- script_src = parse(response.headers['Content-Security-Policy'])['script-src']
+ script_src = parse(response.headers["Content-Security-Policy"])["script-src"]
expect(script_src.to_s).to include(nonce)
expect(response.body).to include(nonce)
end
- it 'when splash screen is enabled it adds the fingerprint to the policy' do
+ it "when splash screen is enabled it adds the fingerprint to the policy" do
SiteSetting.content_security_policy = true
SiteSetting.splash_screen = true
- get '/latest'
+ get "/latest"
fingerprint = SplashScreenHelper.fingerprint
- expect(response.headers).to include('Content-Security-Policy')
+ expect(response.headers).to include("Content-Security-Policy")
- script_src = parse(response.headers['Content-Security-Policy'])['script-src']
+ script_src = parse(response.headers["Content-Security-Policy"])["script-src"]
expect(script_src.to_s).to include(fingerprint)
expect(response.body).to include(SplashScreenHelper.inline_splash_screen_script)
end
def parse(csp_string)
- csp_string.split(';').map do |policy|
- directive, *sources = policy.split
- [directive, sources]
- end.to_h
+ csp_string
+ .split(";")
+ .map do |policy|
+ directive, *sources = policy.split
+ [directive, sources]
+ end
+ .to_h
end
end
- it 'can respond to a request with */* accept header' do
- get '/', headers: { HTTP_ACCEPT: '*/*' }
+ it "can respond to a request with */* accept header" do
+ get "/", headers: { HTTP_ACCEPT: "*/*" }
expect(response.status).to eq(200)
- expect(response.body).to include('Discourse')
+ expect(response.body).to include("Discourse")
end
- it 'has canonical tag' do
- get '/', headers: { HTTP_ACCEPT: '*/*' }
- expect(response.body).to have_tag("link", with: { rel: "canonical", href: "http://test.localhost/" })
- get '/?query_param=true', headers: { HTTP_ACCEPT: '*/*' }
- expect(response.body).to have_tag("link", with: { rel: "canonical", href: "http://test.localhost/" })
- get '/latest?page=2&additional_param=true', headers: { HTTP_ACCEPT: '*/*' }
- expect(response.body).to have_tag("link", with: { rel: "canonical", href: "http://test.localhost/latest?page=2" })
- get '/404', headers: { HTTP_ACCEPT: '*/*' }
- expect(response.body).to have_tag("link", with: { rel: "canonical", href: "http://test.localhost/404" })
+ it "has canonical tag" do
+ get "/", headers: { HTTP_ACCEPT: "*/*" }
+ expect(response.body).to have_tag(
+ "link",
+ with: {
+ rel: "canonical",
+ href: "http://test.localhost/",
+ },
+ )
+ get "/?query_param=true", headers: { HTTP_ACCEPT: "*/*" }
+ expect(response.body).to have_tag(
+ "link",
+ with: {
+ rel: "canonical",
+ href: "http://test.localhost/",
+ },
+ )
+ get "/latest?page=2&additional_param=true", headers: { HTTP_ACCEPT: "*/*" }
+ expect(response.body).to have_tag(
+ "link",
+ with: {
+ rel: "canonical",
+ href: "http://test.localhost/latest?page=2",
+ },
+ )
+ get "/404", headers: { HTTP_ACCEPT: "*/*" }
+ expect(response.body).to have_tag(
+ "link",
+ with: {
+ rel: "canonical",
+ href: "http://test.localhost/404",
+ },
+ )
topic = create_post.topic
get "/t/#{topic.slug}/#{topic.id}"
- expect(response.body).to have_tag("link", with: { rel: "canonical", href: "http://test.localhost/t/#{topic.slug}/#{topic.id}" })
+ expect(response.body).to have_tag(
+ "link",
+ with: {
+ rel: "canonical",
+ href: "http://test.localhost/t/#{topic.slug}/#{topic.id}",
+ },
+ )
end
it "adds a noindex header if non-canonical indexing is disabled" do
SiteSetting.allow_indexing_non_canonical_urls = false
- get '/'
- expect(response.headers['X-Robots-Tag']).to be_nil
+ get "/"
+ expect(response.headers["X-Robots-Tag"]).to be_nil
- get '/latest'
- expect(response.headers['X-Robots-Tag']).to be_nil
+ get "/latest"
+ expect(response.headers["X-Robots-Tag"]).to be_nil
- get '/categories'
- expect(response.headers['X-Robots-Tag']).to be_nil
+ get "/categories"
+ expect(response.headers["X-Robots-Tag"]).to be_nil
topic = create_post.topic
get "/t/#{topic.slug}/#{topic.id}"
- expect(response.headers['X-Robots-Tag']).to be_nil
+ expect(response.headers["X-Robots-Tag"]).to be_nil
post = create_post(topic_id: topic.id)
get "/t/#{topic.slug}/#{topic.id}/2"
- expect(response.headers['X-Robots-Tag']).to eq('noindex')
+ expect(response.headers["X-Robots-Tag"]).to eq("noindex")
- 20.times do
- create_post(topic_id: topic.id)
- end
+ 20.times { create_post(topic_id: topic.id) }
get "/t/#{topic.slug}/#{topic.id}/21"
- expect(response.headers['X-Robots-Tag']).to eq('noindex')
+ expect(response.headers["X-Robots-Tag"]).to eq("noindex")
get "/t/#{topic.slug}/#{topic.id}?page=2"
- expect(response.headers['X-Robots-Tag']).to be_nil
+ expect(response.headers["X-Robots-Tag"]).to be_nil
end
context "with default locale" do
@@ -739,9 +753,7 @@ RSpec.describe ApplicationController do
sign_in(Fabricate(:user))
end
- after do
- I18n.reload!
- end
+ after { I18n.reload! }
context "with rate limits" do
before do
@@ -753,32 +765,38 @@ RSpec.describe ApplicationController do
SiteSetting.max_likes_per_day = 1
post1 = Fabricate(:post)
post2 = Fabricate(:post)
- override = TranslationOverride.create(
- locale: "fr",
- translation_key: "rate_limiter.by_type.create_like",
- value: "French LimitExceeded error message"
- )
+ override =
+ TranslationOverride.create(
+ locale: "fr",
+ translation_key: "rate_limiter.by_type.create_like",
+ value: "French LimitExceeded error message",
+ )
I18n.reload!
- post "/post_actions.json", params: {
- id: post1.id, post_action_type_id: PostActionType.types[:like]
- }
+ post "/post_actions.json",
+ params: {
+ id: post1.id,
+ post_action_type_id: PostActionType.types[:like],
+ }
expect(response.status).to eq(200)
- post "/post_actions.json", params: {
- id: post2.id, post_action_type_id: PostActionType.types[:like]
- }
+ post "/post_actions.json",
+ params: {
+ id: post2.id,
+ post_action_type_id: PostActionType.types[:like],
+ }
expect(response.status).to eq(429)
expect(response.parsed_body["errors"].first).to eq(override.value)
end
end
it "serves an InvalidParameters error with the default locale" do
- override = TranslationOverride.create(
- locale: "fr",
- translation_key: "invalid_params",
- value: "French InvalidParameters error message"
- )
+ override =
+ TranslationOverride.create(
+ locale: "fr",
+ translation_key: "invalid_params",
+ value: "French InvalidParameters error message",
+ )
I18n.reload!
get "/search.json", params: { q: "hello\0hello" }
@@ -804,7 +822,7 @@ RSpec.describe ApplicationController do
it "uses the default locale" do
get "/bootstrap.json", headers: headers("fr")
expect(response.status).to eq(200)
- expect(response.parsed_body['bootstrap']['locale_script']).to end_with("en.js")
+ expect(response.parsed_body["bootstrap"]["locale_script"]).to end_with("en.js")
end
end
@@ -815,7 +833,7 @@ RSpec.describe ApplicationController do
get "/bootstrap.json", headers: headers("fr")
expect(response.status).to eq(200)
- expect(response.parsed_body['bootstrap']['locale_script']).to end_with("en.js")
+ expect(response.parsed_body["bootstrap"]["locale_script"]).to end_with("en.js")
end
end
end
@@ -833,13 +851,13 @@ RSpec.describe ApplicationController do
it "uses the locale from the headers" do
get "/bootstrap.json", headers: headers("fr")
expect(response.status).to eq(200)
- expect(response.parsed_body['bootstrap']['locale_script']).to end_with("fr.js")
+ expect(response.parsed_body["bootstrap"]["locale_script"]).to end_with("fr.js")
end
it "doesn't leak after requests" do
get "/bootstrap.json", headers: headers("fr")
expect(response.status).to eq(200)
- expect(response.parsed_body['bootstrap']['locale_script']).to end_with("fr.js")
+ expect(response.parsed_body["bootstrap"]["locale_script"]).to end_with("fr.js")
expect(I18n.locale.to_s).to eq(SiteSettings::DefaultsProvider::DEFAULT_LOCALE)
end
end
@@ -847,14 +865,12 @@ RSpec.describe ApplicationController do
context "with a logged in user" do
let(:user) { Fabricate(:user, locale: :fr) }
- before do
- sign_in(user)
- end
+ before { sign_in(user) }
it "uses the user's preferred locale" do
get "/bootstrap.json", headers: headers("fr")
expect(response.status).to eq(200)
- expect(response.parsed_body['bootstrap']['locale_script']).to end_with("fr.js")
+ expect(response.parsed_body["bootstrap"]["locale_script"]).to end_with("fr.js")
end
it "serves a 404 page in the preferred locale" do
@@ -867,7 +883,7 @@ RSpec.describe ApplicationController do
it "serves a RenderEmpty page in the preferred locale" do
get "/u/#{user.username}/preferences/interface"
expect(response.status).to eq(200)
- expect(response.body).to have_tag('script', with: { src: "/assets/locales/fr.js" })
+ expect(response.body).to have_tag("script", with: { src: "/assets/locales/fr.js" })
end
end
end
@@ -880,18 +896,18 @@ RSpec.describe ApplicationController do
get "/bootstrap.json", headers: headers("zh-CN")
expect(response.status).to eq(200)
- expect(response.parsed_body['bootstrap']['locale_script']).to end_with("zh_CN.js")
+ expect(response.parsed_body["bootstrap"]["locale_script"]).to end_with("zh_CN.js")
end
end
- context 'when accept-language header is not set' do
- it 'uses the site default locale' do
+ context "when accept-language header is not set" do
+ it "uses the site default locale" do
SiteSetting.allow_user_locale = true
- SiteSetting.default_locale = 'en'
+ SiteSetting.default_locale = "en"
get "/bootstrap.json", headers: headers("")
expect(response.status).to eq(200)
- expect(response.parsed_body['bootstrap']['locale_script']).to end_with("en.js")
+ expect(response.parsed_body["bootstrap"]["locale_script"]).to end_with("en.js")
end
end
end
@@ -908,7 +924,7 @@ RSpec.describe ApplicationController do
it "uses the locale from the cookie" do
get "/bootstrap.json", headers: { Cookie: "locale=es" }
expect(response.status).to eq(200)
- expect(response.parsed_body['bootstrap']['locale_script']).to end_with("es.js")
+ expect(response.parsed_body["bootstrap"]["locale_script"]).to end_with("es.js")
expect(I18n.locale.to_s).to eq(SiteSettings::DefaultsProvider::DEFAULT_LOCALE) # doesn't leak after requests
end
end
@@ -917,26 +933,26 @@ RSpec.describe ApplicationController do
it "returns the locale and region separated by an underscore" do
get "/bootstrap.json", headers: { Cookie: "locale=zh-CN" }
expect(response.status).to eq(200)
- expect(response.parsed_body['bootstrap']['locale_script']).to end_with("zh_CN.js")
+ expect(response.parsed_body["bootstrap"]["locale_script"]).to end_with("zh_CN.js")
end
end
end
- context 'when locale cookie is not set' do
- it 'uses the site default locale' do
+ context "when locale cookie is not set" do
+ it "uses the site default locale" do
SiteSetting.allow_user_locale = true
- SiteSetting.default_locale = 'en'
+ SiteSetting.default_locale = "en"
get "/bootstrap.json", headers: { Cookie: "" }
expect(response.status).to eq(200)
- expect(response.parsed_body['bootstrap']['locale_script']).to end_with("en.js")
+ expect(response.parsed_body["bootstrap"]["locale_script"]).to end_with("en.js")
end
end
end
end
- describe 'vary header' do
- it 'includes Vary:Accept on all requests where format is not explicit' do
+ describe "vary header" do
+ it "includes Vary:Accept on all requests where format is not explicit" do
# Rails default behaviour - include Vary:Accept when Accept is supplied
get "/latest", headers: { "Accept" => "application/json" }
expect(response.status).to eq(200)
@@ -966,55 +982,41 @@ RSpec.describe ApplicationController do
it "is included when API key is rate limited" do
global_setting :max_admin_api_reqs_per_minute, 1
api_key = ApiKey.create!(user_id: admin.id).key
- get "/latest.json", headers: {
- "Api-Key": api_key,
- "Api-Username": admin.username
- }
+ get "/latest.json", headers: { "Api-Key": api_key, "Api-Username": admin.username }
expect(response.status).to eq(200)
- get "/latest.json", headers: {
- "Api-Key": api_key,
- "Api-Username": admin.username
- }
+ get "/latest.json", headers: { "Api-Key": api_key, "Api-Username": admin.username }
expect(response.status).to eq(429)
expect(response.headers["Discourse-Rate-Limit-Error-Code"]).to eq("admin_api_key_rate_limit")
end
it "is included when user API key is rate limited" do
global_setting :max_user_api_reqs_per_minute, 1
- user_api_key = UserApiKey.create!(
- user_id: admin.id,
- client_id: "",
- application_name: "discourseapp"
- )
- user_api_key.scopes = UserApiKeyScope.all_scopes.keys.map do |name|
- UserApiKeyScope.create!(name: name, user_api_key_id: user_api_key.id)
- end
+ user_api_key =
+ UserApiKey.create!(user_id: admin.id, client_id: "", application_name: "discourseapp")
+ user_api_key.scopes =
+ UserApiKeyScope.all_scopes.keys.map do |name|
+ UserApiKeyScope.create!(name: name, user_api_key_id: user_api_key.id)
+ end
user_api_key.save!
- get "/session/current.json", headers: {
- "User-Api-Key": user_api_key.key,
- }
+ get "/session/current.json", headers: { "User-Api-Key": user_api_key.key }
expect(response.status).to eq(200)
- get "/session/current.json", headers: {
- "User-Api-Key": user_api_key.key,
- }
+ get "/session/current.json", headers: { "User-Api-Key": user_api_key.key }
expect(response.status).to eq(429)
- expect(
- response.headers["Discourse-Rate-Limit-Error-Code"]
- ).to eq("user_api_key_limiter_60_secs")
+ expect(response.headers["Discourse-Rate-Limit-Error-Code"]).to eq(
+ "user_api_key_limiter_60_secs",
+ )
global_setting :max_user_api_reqs_per_minute, 100
global_setting :max_user_api_reqs_per_day, 1
- get "/session/current.json", headers: {
- "User-Api-Key": user_api_key.key,
- }
+ get "/session/current.json", headers: { "User-Api-Key": user_api_key.key }
expect(response.status).to eq(429)
- expect(
- response.headers["Discourse-Rate-Limit-Error-Code"]
- ).to eq("user_api_key_limiter_1_day")
+ expect(response.headers["Discourse-Rate-Limit-Error-Code"]).to eq(
+ "user_api_key_limiter_1_day",
+ )
end
end
@@ -1030,48 +1032,32 @@ RSpec.describe ApplicationController do
now = Time.zone.now
freeze_time now
- get "/", headers: {
- "HTTP_USER_AGENT" => "iam badcrawler"
- }
+ get "/", headers: { "HTTP_USER_AGENT" => "iam badcrawler" }
expect(response.status).to eq(200)
- get "/", headers: {
- "HTTP_USER_AGENT" => "iam badcrawler"
- }
+ get "/", headers: { "HTTP_USER_AGENT" => "iam badcrawler" }
expect(response.status).to eq(429)
expect(response.headers["Retry-After"]).to eq("128")
- get "/", headers: {
- "HTTP_USER_AGENT" => "iam problematiccrawler"
- }
+ get "/", headers: { "HTTP_USER_AGENT" => "iam problematiccrawler" }
expect(response.status).to eq(200)
- get "/", headers: {
- "HTTP_USER_AGENT" => "iam problematiccrawler"
- }
+ get "/", headers: { "HTTP_USER_AGENT" => "iam problematiccrawler" }
expect(response.status).to eq(429)
expect(response.headers["Retry-After"]).to eq("128")
freeze_time now + 100.seconds
- get "/", headers: {
- "HTTP_USER_AGENT" => "iam badcrawler"
- }
+ get "/", headers: { "HTTP_USER_AGENT" => "iam badcrawler" }
expect(response.status).to eq(429)
expect(response.headers["Retry-After"]).to eq("28")
- get "/", headers: {
- "HTTP_USER_AGENT" => "iam problematiccrawler"
- }
+ get "/", headers: { "HTTP_USER_AGENT" => "iam problematiccrawler" }
expect(response.status).to eq(429)
expect(response.headers["Retry-After"]).to eq("28")
freeze_time now + 150.seconds
- get "/", headers: {
- "HTTP_USER_AGENT" => "iam badcrawler"
- }
+ get "/", headers: { "HTTP_USER_AGENT" => "iam badcrawler" }
expect(response.status).to eq(200)
- get "/", headers: {
- "HTTP_USER_AGENT" => "iam problematiccrawler"
- }
+ get "/", headers: { "HTTP_USER_AGENT" => "iam problematiccrawler" }
expect(response.status).to eq(200)
end
end
@@ -1087,15 +1073,13 @@ RSpec.describe ApplicationController do
end
context "with login_required" do
- before do
- SiteSetting.login_required = true
- end
+ before { SiteSetting.login_required = true }
it "does not include banner info for anonymous users" do
get "/login"
expect(response.body).to have_tag("div#data-preloaded") do |element|
- json = JSON.parse(element.current_scope.attribute('data-preloaded').value)
- expect(json['banner']).to eq("{}")
+ json = JSON.parse(element.current_scope.attribute("data-preloaded").value)
+ expect(json["banner"]).to eq("{}")
end
end
@@ -1104,57 +1088,51 @@ RSpec.describe ApplicationController do
get "/"
expect(response.body).to have_tag("div#data-preloaded") do |element|
- json = JSON.parse(element.current_scope.attribute('data-preloaded').value)
- expect(JSON.parse(json['banner'])["html"]).to eq("A banner topic
")
+ json = JSON.parse(element.current_scope.attribute("data-preloaded").value)
+ expect(JSON.parse(json["banner"])["html"]).to eq("A banner topic
")
end
end
end
context "with login not required" do
- before do
- SiteSetting.login_required = false
- end
+ before { SiteSetting.login_required = false }
it "does include banner info for anonymous users" do
get "/login"
expect(response.body).to have_tag("div#data-preloaded") do |element|
- json = JSON.parse(element.current_scope.attribute('data-preloaded').value)
- expect(JSON.parse(json['banner'])["html"]).to eq("A banner topic
")
+ json = JSON.parse(element.current_scope.attribute("data-preloaded").value)
+ expect(JSON.parse(json["banner"])["html"]).to eq("A banner topic
")
end
end
end
end
- describe 'preload Link header' do
+ describe "preload Link header" do
context "with GlobalSetting.preload_link_header" do
- before do
- global_setting :preload_link_header, true
- end
+ before { global_setting :preload_link_header, true }
it "should have the Link header with assets on full page requests" do
get("/latest")
- expect(response.headers).to include('Link')
+ expect(response.headers).to include("Link")
end
it "shouldn't have the Link header on xhr api requests" do
get("/latest.json")
- expect(response.headers).not_to include('Link')
+ expect(response.headers).not_to include("Link")
end
end
context "without GlobalSetting.preload_link_header" do
- before do
- global_setting :preload_link_header, false
- end
+ before { global_setting :preload_link_header, false }
it "shouldn't have the Link header with assets on full page requests" do
get("/latest")
- expect(response.headers).not_to include('Link')
+ expect(response.headers).not_to include("Link")
end
it "shouldn't have the Link header on xhr api requests" do
get("/latest.json")
- expect(response.headers).not_to include('Link')
+ expect(response.headers).not_to include("Link")
end
end
end
diff --git a/spec/requests/associate_accounts_controller_spec.rb b/spec/requests/associate_accounts_controller_spec.rb
index be549a0ac47..4c630867556 100644
--- a/spec/requests/associate_accounts_controller_spec.rb
+++ b/spec/requests/associate_accounts_controller_spec.rb
@@ -4,35 +4,33 @@ RSpec.describe Users::AssociateAccountsController do
fab!(:user) { Fabricate(:user) }
fab!(:user2) { Fabricate(:user) }
- before do
- OmniAuth.config.test_mode = true
- end
+ before { OmniAuth.config.test_mode = true }
after do
Rails.application.env_config["omniauth.auth"] = OmniAuth.config.mock_auth[:google_oauth2] = nil
OmniAuth.config.test_mode = false
end
- context 'when attempting reconnect' do
+ context "when attempting reconnect" do
before do
SiteSetting.enable_google_oauth2_logins = true
OmniAuth.config.mock_auth[:google_oauth2] = OmniAuth::AuthHash.new(
- provider: 'google_oauth2',
- uid: '12345',
+ provider: "google_oauth2",
+ uid: "12345",
info: {
- email: 'someemail@test.com',
+ email: "someemail@test.com",
},
extra: {
raw_info: {
email_verified: true,
- }
+ },
},
)
Rails.application.env_config["omniauth.auth"] = OmniAuth.config.mock_auth[:google_oauth2]
end
- it 'should work correctly' do
+ it "should work correctly" do
sign_in(user)
# Reconnect flow:
@@ -57,7 +55,12 @@ RSpec.describe Users::AssociateAccountsController do
# Make the connection
events = DiscourseEvent.track_events { post "#{uri.path}.json" }
expect(events.any? { |e| e[:event_name] == :before_auth }).to eq(true)
- expect(events.any? { |e| e[:event_name] === :after_auth && Auth::GoogleOAuth2Authenticator === e[:params][0] && !e[:params][1].failed? }).to eq(true)
+ expect(
+ events.any? do |e|
+ e[:event_name] === :after_auth && Auth::GoogleOAuth2Authenticator === e[:params][0] &&
+ !e[:params][1].failed?
+ end,
+ ).to eq(true)
expect(response.status).to eq(200)
expect(UserAssociatedAccount.count).to eq(1)
@@ -67,7 +70,7 @@ RSpec.describe Users::AssociateAccountsController do
expect(response.status).to eq(404)
end
- it 'should only work within the current session' do
+ it "should only work within the current session" do
sign_in(user)
post "/auth/google_oauth2?reconnect=true"
diff --git a/spec/requests/badges_controller_spec.rb b/spec/requests/badges_controller_spec.rb
index 19e59632de8..16480d6e9cc 100644
--- a/spec/requests/badges_controller_spec.rb
+++ b/spec/requests/badges_controller_spec.rb
@@ -4,22 +4,20 @@ RSpec.describe BadgesController do
fab!(:badge) { Fabricate(:badge) }
fab!(:user) { Fabricate(:user) }
- before do
- SiteSetting.enable_badges = true
- end
+ before { SiteSetting.enable_badges = true }
- describe '#index' do
- it 'should return a list of all badges' do
+ describe "#index" do
+ it "should return a list of all badges" do
get "/badges.json"
expect(response.status).to eq(200)
parsed = response.parsed_body
expect(parsed["badges"].length).to eq(Badge.enabled.count)
- expect(response.headers['X-Robots-Tag']).to eq('noindex')
+ expect(response.headers["X-Robots-Tag"]).to eq("noindex")
end
end
- describe '#show' do
+ describe "#show" do
it "should return a badge" do
get "/badges/#{badge.id}.json"
expect(response.status).to eq(200)
@@ -35,22 +33,27 @@ RSpec.describe BadgesController do
expect(user_badge.notification.reload.read).to eq(true)
end
- it 'renders rss feed of a badge' do
+ it "renders rss feed of a badge" do
get "/badges/#{badge.id}.rss"
expect(response.status).to eq(200)
- expect(response.media_type).to eq('application/rss+xml')
+ expect(response.media_type).to eq("application/rss+xml")
end
end
describe "user profiles" do
- let(:titled_badge) { Fabricate(:badge, name: 'Protector of the Realm', allow_title: true) }
- let!(:grant) { UserBadge.create!(user_id: user.id, badge_id: titled_badge.id, granted_at: 1.minute.ago, granted_by_id: -1) }
+ let(:titled_badge) { Fabricate(:badge, name: "Protector of the Realm", allow_title: true) }
+ let!(:grant) do
+ UserBadge.create!(
+ user_id: user.id,
+ badge_id: titled_badge.id,
+ granted_at: 1.minute.ago,
+ granted_by_id: -1,
+ )
+ end
it "can be assigned as a title by the user" do
sign_in(user)
- put "/u/#{user.username}/preferences/badge_title.json", params: {
- user_badge_id: grant.id,
- }
+ put "/u/#{user.username}/preferences/badge_title.json", params: { user_badge_id: grant.id }
expect(response.status).to eq(200)
user.reload
@@ -63,14 +66,19 @@ RSpec.describe BadgesController do
let(:admin) { Fabricate(:admin) }
context "while assigned as a title" do
- let(:titled_badge) { Fabricate(:badge, name: 'Protector of the Realm', allow_title: true) }
- let!(:grant) { UserBadge.create!(user_id: user.id, badge_id: titled_badge.id, granted_at: 1.minute.ago, granted_by_id: -1) }
+ let(:titled_badge) { Fabricate(:badge, name: "Protector of the Realm", allow_title: true) }
+ let!(:grant) do
+ UserBadge.create!(
+ user_id: user.id,
+ badge_id: titled_badge.id,
+ granted_at: 1.minute.ago,
+ granted_by_id: -1,
+ )
+ end
before do
sign_in(user)
- put "/u/#{user.username}/preferences/badge_title.json", params: {
- user_badge_id: grant.id,
- }
+ put "/u/#{user.username}/preferences/badge_title.json", params: { user_badge_id: grant.id }
user.reload
sign_out
end
diff --git a/spec/requests/bookmarks_controller_spec.rb b/spec/requests/bookmarks_controller_spec.rb
index e37d03539a2..5e359d8aec0 100644
--- a/spec/requests/bookmarks_controller_spec.rb
+++ b/spec/requests/bookmarks_controller_spec.rb
@@ -6,9 +6,7 @@ RSpec.describe BookmarksController do
let(:bookmark_topic) { Fabricate(:topic) }
let(:bookmark_user) { current_user }
- before do
- sign_in(current_user)
- end
+ before { sign_in(current_user) }
describe "#create" do
it "rate limits creates" do
@@ -16,41 +14,47 @@ RSpec.describe BookmarksController do
RateLimiter.enable
RateLimiter.clear_all!
- post "/bookmarks.json", params: {
- bookmarkable_id: bookmark_post.id,
- bookmarkable_type: "Post",
- reminder_at: (Time.zone.now + 1.day).iso8601
- }
+ post "/bookmarks.json",
+ params: {
+ bookmarkable_id: bookmark_post.id,
+ bookmarkable_type: "Post",
+ reminder_at: (Time.zone.now + 1.day).iso8601,
+ }
expect(response.status).to eq(200)
- post "/bookmarks.json", params: {
- bookmarkable_id: bookmark_post.id,
- bookmarkable_type: "Post",
- }
+ post "/bookmarks.json",
+ params: {
+ bookmarkable_id: bookmark_post.id,
+ bookmarkable_type: "Post",
+ }
expect(response.status).to eq(429)
end
context "if the user reached the max bookmark limit" do
- before do
- SiteSetting.max_bookmarks_per_user = 1
- end
+ before { SiteSetting.max_bookmarks_per_user = 1 }
it "returns failed JSON with a 400 error" do
- post "/bookmarks.json", params: {
- bookmarkable_id: bookmark_post.id,
- bookmarkable_type: "Post",
- reminder_at: (Time.zone.now + 1.day).iso8601
- }
- post "/bookmarks.json", params: {
- bookmarkable_id: bookmark_post.id,
- bookmarkable_type: "Post",
- }
+ post "/bookmarks.json",
+ params: {
+ bookmarkable_id: bookmark_post.id,
+ bookmarkable_type: "Post",
+ reminder_at: (Time.zone.now + 1.day).iso8601,
+ }
+ post "/bookmarks.json",
+ params: {
+ bookmarkable_id: bookmark_post.id,
+ bookmarkable_type: "Post",
+ }
expect(response.status).to eq(400)
user_bookmarks_url = "#{Discourse.base_url}/my/activity/bookmarks"
- expect(response.parsed_body['errors']).to include(
- I18n.t("bookmarks.errors.too_many", user_bookmarks_url: user_bookmarks_url, limit: SiteSetting.max_bookmarks_per_user)
+ expect(response.parsed_body["errors"]).to include(
+ I18n.t(
+ "bookmarks.errors.too_many",
+ user_bookmarks_url: user_bookmarks_url,
+ limit: SiteSetting.max_bookmarks_per_user,
+ ),
)
end
end
@@ -62,26 +66,28 @@ RSpec.describe BookmarksController do
end
it "returns failed JSON with a 400 error" do
- post "/bookmarks.json", params: {
- bookmarkable_id: bookmark_post.id,
- bookmarkable_type: "Post",
- reminder_at: (Time.zone.now + 1.day).iso8601
- }
+ post "/bookmarks.json",
+ params: {
+ bookmarkable_id: bookmark_post.id,
+ bookmarkable_type: "Post",
+ reminder_at: (Time.zone.now + 1.day).iso8601,
+ }
expect(response.status).to eq(400)
- expect(response.parsed_body['errors']).to include(
- I18n.t("bookmarks.errors.already_bookmarked", type: "Post")
+ expect(response.parsed_body["errors"]).to include(
+ I18n.t("bookmarks.errors.already_bookmarked", type: "Post"),
)
- post "/bookmarks.json", params: {
- bookmarkable_id: bookmark_topic.id,
- bookmarkable_type: "Topic",
- reminder_at: (Time.zone.now + 1.day).iso8601
- }
+ post "/bookmarks.json",
+ params: {
+ bookmarkable_id: bookmark_topic.id,
+ bookmarkable_type: "Topic",
+ reminder_at: (Time.zone.now + 1.day).iso8601,
+ }
expect(response.status).to eq(400)
- expect(response.parsed_body['errors']).to include(
- I18n.t("bookmarks.errors.already_bookmarked", type: "Topic")
+ expect(response.parsed_body["errors"]).to include(
+ I18n.t("bookmarks.errors.already_bookmarked", type: "Topic"),
)
end
end
@@ -99,7 +105,12 @@ RSpec.describe BookmarksController do
delete "/bookmarks/#{bookmark.id}.json"
expect(Bookmark.find_by(id: bookmark.id)).to eq(nil)
expect(response.parsed_body["topic_bookmarked"]).to eq(false)
- bm2 = Fabricate(:bookmark, user: bookmark_user, bookmarkable: Fabricate(:post, topic: bookmark_post.topic))
+ bm2 =
+ Fabricate(
+ :bookmark,
+ user: bookmark_user,
+ bookmarkable: Fabricate(:post, topic: bookmark_post.topic),
+ )
bm3 = Fabricate(:bookmark, user: bookmark_user, bookmarkable: bookmark_post.topic)
delete "/bookmarks/#{bm2.id}.json"
expect(Bookmark.find_by(id: bm2.id)).to eq(nil)
@@ -115,9 +126,7 @@ RSpec.describe BookmarksController do
delete "/bookmarks/#{bookmark.id}.json"
expect(response.status).to eq(404)
- expect(response.parsed_body['errors'].first).to include(
- I18n.t("not_found")
- )
+ expect(response.parsed_body["errors"].first).to include(I18n.t("not_found"))
end
end
@@ -128,9 +137,7 @@ RSpec.describe BookmarksController do
delete "/bookmarks/#{bookmark.id}.json"
expect(response.status).to eq(403)
- expect(response.parsed_body['errors'].first).to include(
- I18n.t("invalid_access")
- )
+ expect(response.parsed_body["errors"].first).to include(I18n.t("invalid_access"))
end
end
end
diff --git a/spec/requests/bootstrap_controller_spec.rb b/spec/requests/bootstrap_controller_spec.rb
index 31bb8b3a8b0..194fc15659c 100644
--- a/spec/requests/bootstrap_controller_spec.rb
+++ b/spec/requests/bootstrap_controller_spec.rb
@@ -4,8 +4,8 @@ RSpec.describe BootstrapController do
let(:theme) { Fabricate(:theme, enabled: true) }
before do
- DiscoursePluginRegistry.register_html_builder('server:before-head-close') { 'wat ' }
- theme.set_field(target: :desktop, name: :header, value: 'custom header ').save
+ DiscoursePluginRegistry.register_html_builder("server:before-head-close") { "wat " }
+ theme.set_field(target: :desktop, name: :header, value: "custom header ").save
SiteSetting.default_theme_id = theme.id
end
@@ -21,27 +21,27 @@ RSpec.describe BootstrapController do
json = response.parsed_body
expect(json).to be_present
- bootstrap = json['bootstrap']
+ bootstrap = json["bootstrap"]
expect(bootstrap).to be_present
- expect(bootstrap['title']).to be_present
- expect(bootstrap['theme_id']).to eq(theme.id)
- expect(bootstrap['setup_data']['base_url']).to eq(Discourse.base_url)
- expect(bootstrap['stylesheets']).to be_present
+ expect(bootstrap["title"]).to be_present
+ expect(bootstrap["theme_id"]).to eq(theme.id)
+ expect(bootstrap["setup_data"]["base_url"]).to eq(Discourse.base_url)
+ expect(bootstrap["stylesheets"]).to be_present
- expect(bootstrap['html']).to be_present
- expect(bootstrap['html']['before_head_close']).to eq('wat ')
+ expect(bootstrap["html"]).to be_present
+ expect(bootstrap["html"]["before_head_close"]).to eq("wat ")
- expect(bootstrap['theme_html']).to be_present
- expect(bootstrap['theme_html']['header']).to eq('custom header ')
+ expect(bootstrap["theme_html"]).to be_present
+ expect(bootstrap["theme_html"]["header"]).to eq("custom header ")
- preloaded = bootstrap['preloaded']
- expect(preloaded['site']).to be_present
- expect(preloaded['siteSettings']).to be_present
- expect(preloaded['currentUser']).to be_blank
- expect(preloaded['topicTrackingStates']).to be_blank
+ preloaded = bootstrap["preloaded"]
+ expect(preloaded["site"]).to be_present
+ expect(preloaded["siteSettings"]).to be_present
+ expect(preloaded["currentUser"]).to be_blank
+ expect(preloaded["topicTrackingStates"]).to be_blank
- expect(bootstrap['html_classes']).to eq("desktop-view not-mobile-device text-size-normal anon")
- expect(bootstrap['html_lang']).to eq('en')
+ expect(bootstrap["html_classes"]).to eq("desktop-view not-mobile-device text-size-normal anon")
+ expect(bootstrap["html_lang"]).to eq("en")
end
it "returns user data when authenticated" do
@@ -53,10 +53,10 @@ RSpec.describe BootstrapController do
json = response.parsed_body
expect(json).to be_present
- bootstrap = json['bootstrap']
- preloaded = bootstrap['preloaded']
- expect(preloaded['currentUser']).to be_present
- expect(preloaded['topicTrackingStates']).to be_present
+ bootstrap = json["bootstrap"]
+ preloaded = bootstrap["preloaded"]
+ expect(preloaded["currentUser"]).to be_present
+ expect(preloaded["topicTrackingStates"]).to be_present
end
it "returns extra locales (admin) when staff" do
@@ -68,8 +68,8 @@ RSpec.describe BootstrapController do
json = response.parsed_body
expect(json).to be_present
- bootstrap = json['bootstrap']
- expect(bootstrap['extra_locales']).to be_present
+ bootstrap = json["bootstrap"]
+ expect(bootstrap["extra_locales"]).to be_present
end
it "returns data when login_required is enabled" do
@@ -81,17 +81,17 @@ RSpec.describe BootstrapController do
context "when authentication data is present" do
it "returns authentication data" do
- cookie_data = 'someauthenticationdata'
- cookies['authentication_data'] = cookie_data
+ cookie_data = "someauthenticationdata"
+ cookies["authentication_data"] = cookie_data
get "/bootstrap.json"
- bootstrap = response.parsed_body['bootstrap']
- expect(bootstrap['authentication_data']).to eq(cookie_data)
+ bootstrap = response.parsed_body["bootstrap"]
+ expect(bootstrap["authentication_data"]).to eq(cookie_data)
end
end
- context 'with a plugin asset filter' do
+ context "with a plugin asset filter" do
let :plugin do
plugin = Plugin::Instance.new
plugin.path = "#{Rails.root}/spec/fixtures/plugins/my_plugin/plugin.rb"
@@ -107,9 +107,7 @@ RSpec.describe BootstrapController do
plugin.activate!
end
- after do
- Discourse.plugins.delete plugin
- end
+ after { Discourse.plugins.delete plugin }
it "filters assets using the given path" do
get "/bootstrap.json"
@@ -122,6 +120,5 @@ RSpec.describe BootstrapController do
plugin_assets = response.parsed_body.dig("bootstrap", "plugin_js")
expect(plugin_assets).to include(a_string_matching "my_plugin")
end
-
end
end
diff --git a/spec/requests/categories_controller_spec.rb b/spec/requests/categories_controller_spec.rb
index 8b853315556..fd01a787fd1 100644
--- a/spec/requests/categories_controller_spec.rb
+++ b/spec/requests/categories_controller_spec.rb
@@ -5,12 +5,12 @@ RSpec.describe CategoriesController do
let!(:category) { Fabricate(:category, user: admin) }
fab!(:user) { Fabricate(:user) }
- describe '#index' do
- it 'web crawler view has correct urls for subfolder install' do
+ describe "#index" do
+ it "web crawler view has correct urls for subfolder install" do
set_subfolder "/forum"
- get '/categories', headers: { 'HTTP_USER_AGENT' => 'Googlebot' }
- html = Nokogiri::HTML5(response.body)
- expect(html.css('body.crawler')).to be_present
+ get "/categories", headers: { "HTTP_USER_AGENT" => "Googlebot" }
+ html = Nokogiri.HTML5(response.body)
+ expect(html.css("body.crawler")).to be_present
expect(html.css("a[href=\"/forum/c/#{category.slug}/#{category.id}\"]")).to be_present
end
@@ -20,8 +20,8 @@ RSpec.describe CategoriesController do
get "/categories"
expect(response.body).to have_tag("div#data-preloaded") do |element|
- json = JSON.parse(element.current_scope.attribute('data-preloaded').value)
- expect(json['topic_list']).to include(%{"more_topics_url":"/latest"})
+ json = JSON.parse(element.current_scope.attribute("data-preloaded").value)
+ expect(json["topic_list"]).to include(%{"more_topics_url":"/latest"})
end
end
@@ -51,7 +51,7 @@ RSpec.describe CategoriesController do
expect(response.body).to include(category.slug)
end
- it 'returns the right response for a normal user' do
+ it "returns the right response for a normal user" do
sign_in(user)
get "/categories.json"
@@ -61,12 +61,13 @@ RSpec.describe CategoriesController do
category_list = response.parsed_body["category_list"]
expect(category_list["categories"].map { |c| c["id"] }).to contain_exactly(
- SiteSetting.get(:uncategorized_category_id), category.id
+ SiteSetting.get(:uncategorized_category_id),
+ category.id,
)
end
- it 'does not returns subcatgories without permission' do
- subcategory = Fabricate(:category, user: admin, parent_category: category)
+ it "does not returns subcatgories without permission" do
+ subcategory = Fabricate(:category, user: admin, parent_category: category)
subcategory.set_permissions(admins: :full)
subcategory.save!
@@ -82,7 +83,7 @@ RSpec.describe CategoriesController do
expect(subcategories_for_category).to eq(nil)
end
- it 'returns the right subcategory response with permission' do
+ it "returns the right subcategory response with permission" do
subcategory = Fabricate(:category, user: admin, parent_category: category)
sign_in(user)
@@ -99,7 +100,7 @@ RSpec.describe CategoriesController do
expect(subcategories_for_category.first["id"]).to eq(subcategory.id)
end
- it 'does not return subcategories without query param' do
+ it "does not return subcategories without query param" do
subcategory = Fabricate(:category, user: admin, parent_category: category)
sign_in(user)
@@ -114,7 +115,7 @@ RSpec.describe CategoriesController do
expect(subcategories_for_category).to eq(nil)
end
- it 'includes topics for categories, subcategories and subsubcategories when requested' do
+ it "includes topics for categories, subcategories and subsubcategories when requested" do
SiteSetting.max_category_nesting = 3
subcategory = Fabricate(:category, user: admin, parent_category: category)
subsubcategory = Fabricate(:category, user: admin, parent_category: subcategory)
@@ -130,25 +131,23 @@ RSpec.describe CategoriesController do
category_list = response.parsed_body["category_list"]
category_response = category_list["categories"].find { |c| c["id"] == category.id }
- expect(category_response["topics"].map { |c| c['id'] }).to contain_exactly(topic1.id)
+ expect(category_response["topics"].map { |c| c["id"] }).to contain_exactly(topic1.id)
subcategory_response = category_response["subcategory_list"][0]
- expect(subcategory_response["topics"].map { |c| c['id'] }).to contain_exactly(topic2.id)
+ expect(subcategory_response["topics"].map { |c| c["id"] }).to contain_exactly(topic2.id)
subsubcategory_response = subcategory_response["subcategory_list"][0]
- expect(subsubcategory_response["topics"].map { |c| c['id'] }).to contain_exactly(topic3.id)
+ expect(subsubcategory_response["topics"].map { |c| c["id"] }).to contain_exactly(topic3.id)
end
- describe 'topics filtered by tag for categories when requested' do
+ describe "topics filtered by tag for categories when requested" do
fab!(:tag) { Fabricate(:tag, name: "test-tag") }
fab!(:tag_2) { Fabricate(:tag, name: "second-test-tag") }
let(:topics_with_filter_tag) { [] }
- before do
- SiteSetting.max_category_nesting = 3
- end
+ before { SiteSetting.max_category_nesting = 3 }
- it 'includes filtered topics for categories' do
+ it "includes filtered topics for categories" do
2.times do |i|
topics_with_filter_tag << Fabricate(:topic, category: category, tags: [tag])
Fabricate(:topic, category: category, tags: [tag_2])
@@ -161,10 +160,12 @@ RSpec.describe CategoriesController do
category_list = response.parsed_body["category_list"]
category_response = category_list["categories"].find { |c| c["id"] == category.id }
- expect(category_response["topics"].map { |c| c['id'] }).to contain_exactly(*topics_with_filter_tag.map(&:id))
+ expect(category_response["topics"].map { |c| c["id"] }).to contain_exactly(
+ *topics_with_filter_tag.map(&:id),
+ )
end
- it 'includes filtered topics for subcategories' do
+ it "includes filtered topics for subcategories" do
subcategory = Fabricate(:category, user: admin, parent_category: category)
2.times do |i|
@@ -180,10 +181,12 @@ RSpec.describe CategoriesController do
category_response = category_list["categories"].find { |c| c["id"] == category.id }
subcategory_response = category_response["subcategory_list"][0]
- expect(subcategory_response["topics"].map { |c| c['id'] }).to contain_exactly(*topics_with_filter_tag.map(&:id))
+ expect(subcategory_response["topics"].map { |c| c["id"] }).to contain_exactly(
+ *topics_with_filter_tag.map(&:id),
+ )
end
- it 'includes filtered topics for subsubcategories' do
+ it "includes filtered topics for subsubcategories" do
subcategory = Fabricate(:category, user: admin, parent_category: category)
subsubcategory = Fabricate(:category, user: admin, parent_category: subcategory)
@@ -200,46 +203,74 @@ RSpec.describe CategoriesController do
category_response = category_list["categories"].find { |c| c["id"] == category.id }
subsubcategory_response = category_response["subcategory_list"][0]["subcategory_list"][0]
- expect(subsubcategory_response["topics"].map { |c| c['id'] }).to contain_exactly(*topics_with_filter_tag.map(&:id))
+ expect(subsubcategory_response["topics"].map { |c| c["id"] }).to contain_exactly(
+ *topics_with_filter_tag.map(&:id),
+ )
end
end
- describe 'categories and latest topics - ordered by created date' do
+ describe "categories and latest topics - ordered by created date" do
fab!(:category) { Fabricate(:category) }
- fab!(:topic1) { Fabricate(:topic, category: category, created_at: 5.days.ago, updated_at: Time.now, bumped_at: Time.now) }
- fab!(:topic2) { Fabricate(:topic, category: category, created_at: 2.days.ago, bumped_at: 2.days.ago) }
- fab!(:topic3) { Fabricate(:topic, category: category, created_at: 1.day.ago, bumped_at: 1.day.ago) }
+ fab!(:topic1) do
+ Fabricate(
+ :topic,
+ category: category,
+ created_at: 5.days.ago,
+ updated_at: Time.now,
+ bumped_at: Time.now,
+ )
+ end
+ fab!(:topic2) do
+ Fabricate(:topic, category: category, created_at: 2.days.ago, bumped_at: 2.days.ago)
+ end
+ fab!(:topic3) do
+ Fabricate(:topic, category: category, created_at: 1.day.ago, bumped_at: 1.day.ago)
+ end
- context 'when order is not set to created date' do
- before do
- SiteSetting.desktop_category_page_style = "categories_and_latest_topics"
- end
+ context "when order is not set to created date" do
+ before { SiteSetting.desktop_category_page_style = "categories_and_latest_topics" }
- it 'sorts topics by the default bump date' do
+ it "sorts topics by the default bump date" do
get "/categories_and_latest.json"
expect(response.status).to eq(200)
- expect(response.parsed_body['topic_list']['topics'].map { |t| t["id"] }).to eq([topic1.id, topic3.id, topic2.id])
+ expect(response.parsed_body["topic_list"]["topics"].map { |t| t["id"] }).to eq(
+ [topic1.id, topic3.id, topic2.id],
+ )
end
end
- context 'when order is set to created' do
+ context "when order is set to created" do
before do
SiteSetting.desktop_category_page_style = "categories_and_latest_topics_created_date"
end
- it 'sorts topics by crated at date' do
+ it "sorts topics by crated at date" do
get "/categories_and_latest.json"
expect(response.status).to eq(200)
- expect(response.parsed_body['topic_list']['topics'].map { |t| t["id"] }).to eq([topic3.id, topic2.id, topic1.id])
+ expect(response.parsed_body["topic_list"]["topics"].map { |t| t["id"] }).to eq(
+ [topic3.id, topic2.id, topic1.id],
+ )
end
end
end
describe "welcome topic" do
fab!(:category) { Fabricate(:category) }
- fab!(:topic1) { Fabricate(:topic, category: category, created_at: 5.days.ago, updated_at: Time.now, bumped_at: Time.now) }
- fab!(:topic2) { Fabricate(:topic, category: category, created_at: 2.days.ago, bumped_at: 2.days.ago) }
- fab!(:topic3) { Fabricate(:topic, category: category, created_at: 1.day.ago, bumped_at: 1.day.ago) }
+ fab!(:topic1) do
+ Fabricate(
+ :topic,
+ category: category,
+ created_at: 5.days.ago,
+ updated_at: Time.now,
+ bumped_at: Time.now,
+ )
+ end
+ fab!(:topic2) do
+ Fabricate(:topic, category: category, created_at: 2.days.ago, bumped_at: 2.days.ago)
+ end
+ fab!(:topic3) do
+ Fabricate(:topic, category: category, created_at: 1.day.ago, bumped_at: 1.day.ago)
+ end
fab!(:welcome_topic) { Fabricate(:topic) }
fab!(:post) { Fabricate(:post, topic: welcome_topic) }
@@ -253,7 +284,9 @@ RSpec.describe CategoriesController do
it "is hidden for non-admins" do
get "/categories_and_latest.json"
expect(response.status).to eq(200)
- expect(response.parsed_body['topic_list']['topics'].map { |t| t["id"] }).not_to include(welcome_topic.id)
+ expect(response.parsed_body["topic_list"]["topics"].map { |t| t["id"] }).not_to include(
+ welcome_topic.id,
+ )
end
it "is shown to non-admins when there is an edit" do
@@ -263,7 +296,9 @@ RSpec.describe CategoriesController do
get "/categories_and_latest.json"
expect(response.status).to eq(200)
- expect(response.parsed_body['topic_list']['topics'].map { |t| t["id"] }).to include(welcome_topic.id)
+ expect(response.parsed_body["topic_list"]["topics"].map { |t| t["id"] }).to include(
+ welcome_topic.id,
+ )
end
it "is hidden to admins" do
@@ -271,7 +306,9 @@ RSpec.describe CategoriesController do
get "/categories_and_latest.json"
expect(response.status).to eq(200)
- expect(response.parsed_body['topic_list']['topics'].map { |t| t["id"] }).not_to include(welcome_topic.id)
+ expect(response.parsed_body["topic_list"]["topics"].map { |t| t["id"] }).not_to include(
+ welcome_topic.id,
+ )
end
it "is shown to users when bootstrap mode is disabled" do
@@ -279,11 +316,13 @@ RSpec.describe CategoriesController do
get "/categories_and_latest.json"
expect(response.status).to eq(200)
- expect(response.parsed_body['topic_list']['topics'].map { |t| t["id"] }).to include(welcome_topic.id)
+ expect(response.parsed_body["topic_list"]["topics"].map { |t| t["id"] }).to include(
+ welcome_topic.id,
+ )
end
end
- it 'includes subcategories and topics by default when view is subcategories_with_featured_topics' do
+ it "includes subcategories and topics by default when view is subcategories_with_featured_topics" do
SiteSetting.max_category_nesting = 3
subcategory = Fabricate(:category, user: admin, parent_category: category)
@@ -297,7 +336,7 @@ RSpec.describe CategoriesController do
category_list = response.parsed_body["category_list"]
category_response = category_list["categories"].find { |c| c["id"] == category.id }
- expect(category_response["topics"].map { |c| c['id'] }).to contain_exactly(topic1.id)
+ expect(category_response["topics"].map { |c| c["id"] }).to contain_exactly(topic1.id)
expect(category_response["subcategory_list"][0]["id"]).to eq(subcategory.id)
end
@@ -316,32 +355,37 @@ RSpec.describe CategoriesController do
get "/categories.json"
expect(response.status).to eq(200)
- first_request_queries = track_sql_queries do
- get "/categories.json"
- expect(response.status).to eq(200)
- end
+ first_request_queries =
+ track_sql_queries do
+ get "/categories.json"
+ expect(response.status).to eq(200)
+ end
- category_response = response.parsed_body["category_list"]["categories"].find { |c| c["id"] == category1.id }
+ category_response =
+ response.parsed_body["category_list"]["categories"].find { |c| c["id"] == category1.id }
expect(category_response["topics"].count).to eq(2)
upload = Fabricate(:upload)
topic3 = Fabricate(:topic, category: category2, image_upload: upload)
CategoryFeaturedTopic.feature_topics
- second_request_queries = track_sql_queries do
- get "/categories.json"
- expect(response.status).to eq(200)
- end
+ second_request_queries =
+ track_sql_queries do
+ get "/categories.json"
+ expect(response.status).to eq(200)
+ end
- category1_response = response.parsed_body["category_list"]["categories"].find { |c| c["id"] == category1.id }
- category2_response = response.parsed_body["category_list"]["categories"].find { |c| c["id"] == category2.id }
+ category1_response =
+ response.parsed_body["category_list"]["categories"].find { |c| c["id"] == category1.id }
+ category2_response =
+ response.parsed_body["category_list"]["categories"].find { |c| c["id"] == category2.id }
expect(category1_response["topics"].size).to eq(2)
expect(category2_response["topics"].size).to eq(1)
expect(first_request_queries.count).to eq(second_request_queries.count)
end
- it 'does not show uncategorized unless allow_uncategorized_topics' do
+ it "does not show uncategorized unless allow_uncategorized_topics" do
SiteSetting.desktop_category_page_style = "categories_boxes_with_topics"
uncategorized = Category.find(SiteSetting.uncategorized_category_id)
@@ -351,30 +395,34 @@ RSpec.describe CategoriesController do
SiteSetting.allow_uncategorized_topics = false
get "/categories.json"
- expect(response.parsed_body["category_list"]["categories"].map { |x| x['id'] }).not_to include(uncategorized.id)
+ expect(
+ response.parsed_body["category_list"]["categories"].map { |x| x["id"] },
+ ).not_to include(uncategorized.id)
end
end
- describe 'extensibility event' do
- before do
- sign_in(admin)
- end
+ describe "extensibility event" do
+ before { sign_in(admin) }
it "triggers a extensibility event" do
- event = DiscourseEvent.track_events {
- put "/categories/#{category.id}.json", params: {
- name: 'hello',
- color: 'ff0',
- text_color: 'fff'
- }
- }.last
+ event =
+ DiscourseEvent
+ .track_events do
+ put "/categories/#{category.id}.json",
+ params: {
+ name: "hello",
+ color: "ff0",
+ text_color: "fff",
+ }
+ end
+ .last
expect(event[:event_name]).to eq(:category_updated)
expect(event[:params].first).to eq(category)
end
end
- describe '#create' do
+ describe "#create" do
it "requires the user to be logged in" do
post "/categories.json"
expect(response.status).to eq(403)
@@ -388,9 +436,7 @@ RSpec.describe CategoriesController do
it "raises an exception when they don't have permission to create it" do
sign_in(Fabricate(:user))
- post "/categories.json", params: {
- name: 'hello', color: 'ff0', text_color: 'fff'
- }
+ post "/categories.json", params: { name: "hello", color: "ff0", text_color: "fff" }
expect(response).to be_forbidden
end
@@ -404,9 +450,7 @@ RSpec.describe CategoriesController do
it "returns errors on a duplicate category name" do
category = Fabricate(:category, user: admin)
- post "/categories.json", params: {
- name: category.name, color: "ff0", text_color: "fff"
- }
+ post "/categories.json", params: { name: category.name, color: "ff0", text_color: "fff" }
expect(response.status).to eq(422)
end
@@ -415,12 +459,18 @@ RSpec.describe CategoriesController do
category = Fabricate(:category, user: admin)
readonly = CategoryGroup.permission_types[:readonly]
- post "/categories.json", params: {
- name: category.name, color: "ff0", text_color: "fff", permissions: { "invalid_group" => readonly }
- }
+ post "/categories.json",
+ params: {
+ name: category.name,
+ color: "ff0",
+ text_color: "fff",
+ permissions: {
+ "invalid_group" => readonly,
+ },
+ }
expect(response.status).to eq(422)
- expect(response.parsed_body['errors']).to be_present
+ expect(response.parsed_body["errors"]).to be_present
end
end
@@ -432,41 +482,42 @@ RSpec.describe CategoriesController do
create_post = CategoryGroup.permission_types[:create_post]
group = Fabricate(:group)
- post "/categories.json", params: {
- name: "hello",
- color: "ff0",
- text_color: "fff",
- slug: "hello-cat",
- auto_close_hours: 72,
- search_priority: Searchable::PRIORITIES[:ignore],
- reviewable_by_group_name: group.name,
- permissions: {
- "everyone" => readonly,
- "staff" => create_post
- }
- }
+ post "/categories.json",
+ params: {
+ name: "hello",
+ color: "ff0",
+ text_color: "fff",
+ slug: "hello-cat",
+ auto_close_hours: 72,
+ search_priority: Searchable::PRIORITIES[:ignore],
+ reviewable_by_group_name: group.name,
+ permissions: {
+ "everyone" => readonly,
+ "staff" => create_post,
+ },
+ }
expect(response.status).to eq(200)
- cat_json = response.parsed_body['category']
+ cat_json = response.parsed_body["category"]
expect(cat_json).to be_present
- expect(cat_json['reviewable_by_group_name']).to eq(group.name)
- expect(cat_json['name']).to eq('hello')
- expect(cat_json['slug']).to eq('hello-cat')
- expect(cat_json['color']).to eq('ff0')
- expect(cat_json['auto_close_hours']).to eq(72)
- expect(cat_json['search_priority']).to eq(Searchable::PRIORITIES[:ignore])
+ expect(cat_json["reviewable_by_group_name"]).to eq(group.name)
+ expect(cat_json["name"]).to eq("hello")
+ expect(cat_json["slug"]).to eq("hello-cat")
+ expect(cat_json["color"]).to eq("ff0")
+ expect(cat_json["auto_close_hours"]).to eq(72)
+ expect(cat_json["search_priority"]).to eq(Searchable::PRIORITIES[:ignore])
- category = Category.find(cat_json['id'])
- expect(category.category_groups.map { |g| [g.group_id, g.permission_type] }.sort).to eq([
- [Group[:everyone].id, readonly], [Group[:staff].id, create_post]
- ])
+ category = Category.find(cat_json["id"])
+ expect(category.category_groups.map { |g| [g.group_id, g.permission_type] }.sort).to eq(
+ [[Group[:everyone].id, readonly], [Group[:staff].id, create_post]],
+ )
expect(UserHistory.count).to eq(4) # 1 + 3 (bootstrap mode)
end
end
end
end
- describe '#show' do
+ describe "#show" do
before do
category.set_permissions(admins: :full)
category.save!
@@ -493,7 +544,7 @@ RSpec.describe CategoriesController do
end
end
- describe '#destroy' do
+ describe "#destroy" do
it "requires the user to be logged in" do
delete "/categories/category.json"
expect(response.status).to eq(403)
@@ -512,9 +563,7 @@ RSpec.describe CategoriesController do
id = Fabricate(:topic_timer, category: category).id
- expect do
- delete "/categories/#{category.slug}.json"
- end.to change(Category, :count).by(-1)
+ expect do delete "/categories/#{category.slug}.json" end.to change(Category, :count).by(-1)
expect(response.status).to eq(200)
expect(UserHistory.count).to eq(1)
expect(TopicTimer.where(id: id).exists?).to eq(false)
@@ -522,7 +571,7 @@ RSpec.describe CategoriesController do
end
end
- describe '#reorder' do
+ describe "#reorder" do
it "reorders the categories" do
sign_in(admin)
@@ -531,7 +580,9 @@ RSpec.describe CategoriesController do
c3 = Fabricate(:category)
c4 = Fabricate(:category)
if c3.id < c2.id
- tmp = c3; c2 = c3; c3 = tmp
+ tmp = c3
+ c2 = c3
+ c3 = tmp
end
c1.position = 8
c2.position = 6
@@ -549,20 +600,14 @@ RSpec.describe CategoriesController do
SiteSetting.fixed_category_positions = true
list = CategoryList.new(Guardian.new(admin))
- expect(list.categories).to eq([
- Category.find(SiteSetting.uncategorized_category_id),
- c1,
- c4,
- c2,
- c3
- ])
+ expect(list.categories).to eq(
+ [Category.find(SiteSetting.uncategorized_category_id), c1, c4, c2, c3],
+ )
end
end
- describe '#update' do
- before do
- Jobs.run_immediately!
- end
+ describe "#update" do
+ before { Jobs.run_immediately! }
it "requires the user to be logged in" do
put "/categories/category.json"
@@ -570,37 +615,42 @@ RSpec.describe CategoriesController do
end
describe "logged in" do
- before do
- sign_in(admin)
- end
+ before { sign_in(admin) }
it "raises an exception if they don't have permission to edit it" do
sign_in(Fabricate(:user))
- put "/categories/#{category.slug}.json", params: {
- name: 'hello',
- color: 'ff0',
- text_color: 'fff'
- }
+ put "/categories/#{category.slug}.json",
+ params: {
+ name: "hello",
+ color: "ff0",
+ text_color: "fff",
+ }
expect(response).to be_forbidden
end
it "returns errors on a duplicate category name" do
other_category = Fabricate(:category, name: "Other", user: admin)
- put "/categories/#{category.id}.json", params: {
- name: other_category.name,
- color: "ff0",
- text_color: "fff",
- }
+ put "/categories/#{category.id}.json",
+ params: {
+ name: other_category.name,
+ color: "ff0",
+ text_color: "fff",
+ }
expect(response.status).to eq(422)
end
it "returns errors when there is a name conflict while moving a category into another" do
parent_category = Fabricate(:category, name: "Parent", user: admin)
- other_category = Fabricate(:category, name: category.name, user: admin, parent_category: parent_category, slug: "a-different-slug")
+ other_category =
+ Fabricate(
+ :category,
+ name: category.name,
+ user: admin,
+ parent_category: parent_category,
+ slug: "a-different-slug",
+ )
- put "/categories/#{category.id}.json", params: {
- parent_category_id: parent_category.id,
- }
+ put "/categories/#{category.id}.json", params: { parent_category_id: parent_category.id }
expect(response.status).to eq(422)
end
@@ -608,12 +658,13 @@ RSpec.describe CategoriesController do
it "returns 422 if email_in address is already in use for other category" do
_other_category = Fabricate(:category, name: "Other", email_in: "mail@example.com")
- put "/categories/#{category.id}.json", params: {
- name: "Email",
- email_in: "mail@example.com",
- color: "ff0",
- text_color: "fff",
- }
+ put "/categories/#{category.id}.json",
+ params: {
+ name: "Email",
+ email_in: "mail@example.com",
+ color: "ff0",
+ text_color: "fff",
+ }
expect(response.status).to eq(422)
end
@@ -624,38 +675,39 @@ RSpec.describe CategoriesController do
create_post = CategoryGroup.permission_types[:create_post]
tag_group = Fabricate(:tag_group)
- put "/categories/#{category.id}.json", params: {
- name: "hello",
- color: "ff0",
- text_color: "fff",
- slug: "hello-category",
- auto_close_hours: 72,
- permissions: {
- "everyone" => readonly,
- "staff" => create_post
- },
- custom_fields: {
- "dancing" => "frogs",
- "running" => ["turtle", "salamander"]
- },
- minimum_required_tags: "",
- allow_global_tags: 'true',
- required_tag_groups: [{
- name: tag_group.name,
- min_count: 2
- }]
- }
+ put "/categories/#{category.id}.json",
+ params: {
+ name: "hello",
+ color: "ff0",
+ text_color: "fff",
+ slug: "hello-category",
+ auto_close_hours: 72,
+ permissions: {
+ "everyone" => readonly,
+ "staff" => create_post,
+ },
+ custom_fields: {
+ "dancing" => "frogs",
+ "running" => %w[turtle salamander],
+ },
+ minimum_required_tags: "",
+ allow_global_tags: "true",
+ required_tag_groups: [{ name: tag_group.name, min_count: 2 }],
+ }
expect(response.status).to eq(200)
category.reload
- expect(category.category_groups.map { |g| [g.group_id, g.permission_type] }.sort).to eq([
- [Group[:everyone].id, readonly], [Group[:staff].id, create_post]
- ])
+ expect(category.category_groups.map { |g| [g.group_id, g.permission_type] }.sort).to eq(
+ [[Group[:everyone].id, readonly], [Group[:staff].id, create_post]],
+ )
expect(category.name).to eq("hello")
expect(category.slug).to eq("hello-category")
expect(category.color).to eq("ff0")
expect(category.auto_close_hours).to eq(72)
- expect(category.custom_fields).to eq("dancing" => "frogs", "running" => ["turtle", "salamander"])
+ expect(category.custom_fields).to eq(
+ "dancing" => "frogs",
+ "running" => %w[turtle salamander],
+ )
expect(category.minimum_required_tags).to eq(0)
expect(category.allow_global_tags).to eq(true)
expect(category.category_required_tag_groups.count).to eq(1)
@@ -663,23 +715,28 @@ RSpec.describe CategoriesController do
expect(category.category_required_tag_groups.first.min_count).to eq(2)
end
- it 'logs the changes correctly' do
- category.update!(permissions: { "admins" => CategoryGroup.permission_types[:create_post] })
-
- put "/categories/#{category.id}.json", params: {
- name: 'new name',
- color: category.color,
- text_color: category.text_color,
- slug: category.slug,
+ it "logs the changes correctly" do
+ category.update!(
permissions: {
- "everyone" => CategoryGroup.permission_types[:create_post]
+ "admins" => CategoryGroup.permission_types[:create_post],
},
- }
+ )
+
+ put "/categories/#{category.id}.json",
+ params: {
+ name: "new name",
+ color: category.color,
+ text_color: category.text_color,
+ slug: category.slug,
+ permissions: {
+ "everyone" => CategoryGroup.permission_types[:create_post],
+ },
+ }
expect(response.status).to eq(200)
expect(UserHistory.count).to eq(5) # 2 + 3 (bootstrap mode)
end
- it 'updates per-category settings correctly' do
+ it "updates per-category settings correctly" do
category.custom_fields[Category::REQUIRE_TOPIC_APPROVAL] = false
category.custom_fields[Category::REQUIRE_REPLY_APPROVAL] = false
category.custom_fields[Category::NUM_AUTO_BUMP_DAILY] = 0
@@ -687,17 +744,18 @@ RSpec.describe CategoriesController do
category.navigate_to_first_post_after_read = false
category.save!
- put "/categories/#{category.id}.json", params: {
- name: category.name,
- color: category.color,
- text_color: category.text_color,
- navigate_to_first_post_after_read: true,
- custom_fields: {
- require_reply_approval: true,
- require_topic_approval: true,
- num_auto_bump_daily: 10
- }
- }
+ put "/categories/#{category.id}.json",
+ params: {
+ name: category.name,
+ color: category.color,
+ text_color: category.text_color,
+ navigate_to_first_post_after_read: true,
+ custom_fields: {
+ require_reply_approval: true,
+ require_topic_approval: true,
+ num_auto_bump_daily: 10,
+ },
+ }
category.reload
expect(category.require_topic_approval?).to eq(true)
@@ -708,15 +766,20 @@ RSpec.describe CategoriesController do
it "can remove required tag group" do
SiteSetting.tagging_enabled = true
- category.update!(category_required_tag_groups: [ CategoryRequiredTagGroup.new(tag_group: Fabricate(:tag_group)) ])
- put "/categories/#{category.id}.json", params: {
- name: category.name,
- color: category.color,
- text_color: category.text_color,
- allow_global_tags: 'false',
- min_tags_from_required_group: 1,
- required_tag_groups: []
- }
+ category.update!(
+ category_required_tag_groups: [
+ CategoryRequiredTagGroup.new(tag_group: Fabricate(:tag_group)),
+ ],
+ )
+ put "/categories/#{category.id}.json",
+ params: {
+ name: category.name,
+ color: category.color,
+ text_color: category.text_color,
+ allow_global_tags: "false",
+ min_tags_from_required_group: 1,
+ required_tag_groups: [],
+ }
expect(response.status).to eq(200)
category.reload
@@ -729,10 +792,13 @@ RSpec.describe CategoriesController do
tag_group_2 = Fabricate(:tag_group)
category.update!(
- allowed_tags: ["hello", "world"],
+ allowed_tags: %w[hello world],
allowed_tag_groups: [tag_group_1.name],
- category_required_tag_groups: [ CategoryRequiredTagGroup.new(tag_group: tag_group_2) ],
- custom_fields: { field_1: 'hello', field_2: 'hello' }
+ category_required_tag_groups: [CategoryRequiredTagGroup.new(tag_group: tag_group_2)],
+ custom_fields: {
+ field_1: "hello",
+ field_2: "hello",
+ },
)
put "/categories/#{category.id}.json"
@@ -741,117 +807,128 @@ RSpec.describe CategoriesController do
expect(category.tags.pluck(:name)).to contain_exactly("hello", "world")
expect(category.tag_groups.pluck(:name)).to contain_exactly(tag_group_1.name)
expect(category.category_required_tag_groups.first.tag_group).to eq(tag_group_2)
- expect(category.custom_fields).to eq({ 'field_1' => 'hello', 'field_2' => 'hello' })
+ expect(category.custom_fields).to eq({ "field_1" => "hello", "field_2" => "hello" })
- put "/categories/#{category.id}.json", params: { allowed_tags: [], custom_fields: { field_1: nil } }
+ put "/categories/#{category.id}.json",
+ params: {
+ allowed_tags: [],
+ custom_fields: {
+ field_1: nil,
+ },
+ }
expect(response.status).to eq(200)
category.reload
expect(category.tags).to be_blank
expect(category.tag_groups.pluck(:name)).to contain_exactly(tag_group_1.name)
expect(category.category_required_tag_groups.first.tag_group).to eq(tag_group_2)
- expect(category.custom_fields).to eq({ 'field_2' => 'hello' })
+ expect(category.custom_fields).to eq({ "field_2" => "hello" })
- put "/categories/#{category.id}.json", params: { allowed_tags: [], allowed_tag_groups: [], required_tag_groups: [], custom_fields: { field_1: 'hi', field_2: nil } }
+ put "/categories/#{category.id}.json",
+ params: {
+ allowed_tags: [],
+ allowed_tag_groups: [],
+ required_tag_groups: [],
+ custom_fields: {
+ field_1: "hi",
+ field_2: nil,
+ },
+ }
expect(response.status).to eq(200)
category.reload
expect(category.tags).to be_blank
expect(category.tag_groups).to be_blank
expect(category.category_required_tag_groups).to eq([])
- expect(category.custom_fields).to eq({ 'field_1' => 'hi' })
+ expect(category.custom_fields).to eq({ "field_1" => "hi" })
end
end
end
end
- describe '#update_slug' do
- it 'requires the user to be logged in' do
+ describe "#update_slug" do
+ it "requires the user to be logged in" do
put "/category/category/slug.json"
expect(response.status).to eq(403)
end
- describe 'logged in' do
- before do
- sign_in(admin)
- end
+ describe "logged in" do
+ before { sign_in(admin) }
- it 'rejects blank' do
- put "/category/#{category.id}/slug.json", params: { slug: ' ' }
+ it "rejects blank" do
+ put "/category/#{category.id}/slug.json", params: { slug: " " }
expect(response.status).to eq(422)
expect(response.parsed_body["errors"]).to eq(["Slug can't be blank"])
end
- it 'accepts valid custom slug' do
- put "/category/#{category.id}/slug.json", params: { slug: 'valid-slug' }
+ it "accepts valid custom slug" do
+ put "/category/#{category.id}/slug.json", params: { slug: "valid-slug" }
expect(response.status).to eq(200)
- expect(category.reload.slug).to eq('valid-slug')
+ expect(category.reload.slug).to eq("valid-slug")
end
- it 'accepts not well formed custom slug' do
- put "/category/#{category.id}/slug.json", params: { slug: ' valid slug' }
+ it "accepts not well formed custom slug" do
+ put "/category/#{category.id}/slug.json", params: { slug: " valid slug" }
expect(response.status).to eq(200)
- expect(category.reload.slug).to eq('valid-slug')
+ expect(category.reload.slug).to eq("valid-slug")
end
- it 'accepts and sanitize custom slug when the slug generation method is not ascii' do
- SiteSetting.slug_generation_method = 'none'
- put "/category/#{category.id}/slug.json", params: { slug: ' another !_ slug @' }
+ it "accepts and sanitize custom slug when the slug generation method is not ascii" do
+ SiteSetting.slug_generation_method = "none"
+ put "/category/#{category.id}/slug.json", params: { slug: " another !_ slug @" }
expect(response.status).to eq(200)
- expect(category.reload.slug).to eq('another-slug')
- SiteSetting.slug_generation_method = 'ascii'
+ expect(category.reload.slug).to eq("another-slug")
+ SiteSetting.slug_generation_method = "ascii"
end
- it 'rejects invalid custom slug' do
- put "/category/#{category.id}/slug.json", params: { slug: '.' }
+ it "rejects invalid custom slug" do
+ put "/category/#{category.id}/slug.json", params: { slug: "." }
expect(response.status).to eq(422)
expect(response.parsed_body["errors"]).to eq(["Slug is invalid"])
end
end
end
- describe '#categories_and_topics' do
- before do
- 10.times.each { Fabricate(:topic) }
- end
+ describe "#categories_and_topics" do
+ before { 10.times.each { Fabricate(:topic) } }
- it 'works when SiteSetting.categories_topics is non-null' do
+ it "works when SiteSetting.categories_topics is non-null" do
SiteSetting.categories_topics = 5
- get '/categories_and_latest.json'
- expect(response.parsed_body['topic_list']['topics'].size).to eq(5)
+ get "/categories_and_latest.json"
+ expect(response.parsed_body["topic_list"]["topics"].size).to eq(5)
end
- it 'works when SiteSetting.categories_topics is null' do
+ it "works when SiteSetting.categories_topics is null" do
SiteSetting.categories_topics = 0
- get '/categories_and_latest.json'
+ get "/categories_and_latest.json"
json = response.parsed_body
- category_list = json['category_list']
- topic_list = json['topic_list']
+ category_list = json["category_list"]
+ topic_list = json["topic_list"]
- expect(category_list['categories'].size).to eq(2) # 'Uncategorized' and category
- expect(topic_list['topics'].size).to eq(5)
+ expect(category_list["categories"].size).to eq(2) # 'Uncategorized' and category
+ expect(topic_list["topics"].size).to eq(5)
Fabricate(:category, parent_category: category)
- get '/categories_and_latest.json'
+ get "/categories_and_latest.json"
json = response.parsed_body
- expect(json['category_list']['categories'].size).to eq(2)
- expect(json['topic_list']['topics'].size).to eq(5)
+ expect(json["category_list"]["categories"].size).to eq(2)
+ expect(json["topic_list"]["topics"].size).to eq(5)
Fabricate(:category)
Fabricate(:category)
- get '/categories_and_latest.json'
+ get "/categories_and_latest.json"
json = response.parsed_body
- expect(json['category_list']['categories'].size).to eq(4)
- expect(json['topic_list']['topics'].size).to eq(6)
+ expect(json["category_list"]["categories"].size).to eq(4)
+ expect(json["topic_list"]["topics"].size).to eq(6)
end
- it 'does not show uncategorized unless allow_uncategorized_topics' do
+ it "does not show uncategorized unless allow_uncategorized_topics" do
uncategorized = Category.find(SiteSetting.uncategorized_category_id)
Fabricate(:topic, category: uncategorized)
CategoryFeaturedTopic.feature_topics
@@ -859,11 +936,13 @@ RSpec.describe CategoriesController do
SiteSetting.allow_uncategorized_topics = false
get "/categories_and_latest.json"
- expect(response.parsed_body["category_list"]["categories"].map { |x| x['id'] }).not_to include(uncategorized.id)
+ expect(
+ response.parsed_body["category_list"]["categories"].map { |x| x["id"] },
+ ).not_to include(uncategorized.id)
end
- describe 'Showing top topics from private categories' do
- it 'returns the top topic from the private category when the user is a member' do
+ describe "Showing top topics from private categories" do
+ it "returns the top topic from the private category when the user is a member" do
restricted_group = Fabricate(:group)
private_cat = Fabricate(:private_category, group: restricted_group)
private_topic = Fabricate(:topic, category: private_cat, like_count: 1000, posts_count: 100)
@@ -872,21 +951,29 @@ RSpec.describe CategoriesController do
sign_in(user)
get "/categories_and_top.json"
- parsed_topic = response.parsed_body.dig('topic_list', 'topics').detect do |t|
- t.dig('id') == private_topic.id
- end
+ parsed_topic =
+ response
+ .parsed_body
+ .dig("topic_list", "topics")
+ .detect { |t| t.dig("id") == private_topic.id }
expect(parsed_topic).to be_present
end
end
end
- describe '#visible_groups' do
- fab!(:public_group) { Fabricate(:group, visibility_level: Group.visibility_levels[:public], name: 'aaa') }
- fab!(:private_group) { Fabricate(:group, visibility_level: Group.visibility_levels[:staff], name: 'bbb') }
- fab!(:user_only_group) { Fabricate(:group, visibility_level: Group.visibility_levels[:members], name: 'ccc') }
+ describe "#visible_groups" do
+ fab!(:public_group) do
+ Fabricate(:group, visibility_level: Group.visibility_levels[:public], name: "aaa")
+ end
+ fab!(:private_group) do
+ Fabricate(:group, visibility_level: Group.visibility_levels[:staff], name: "bbb")
+ end
+ fab!(:user_only_group) do
+ Fabricate(:group, visibility_level: Group.visibility_levels[:members], name: "ccc")
+ end
- it 'responds with 404 when id param is invalid' do
+ it "responds with 404 when id param is invalid" do
get "/c/-9999/visible_groups.json"
expect(response.status).to eq(404)
@@ -915,7 +1002,9 @@ RSpec.describe CategoriesController do
get "/c/#{category.id}/visible_groups.json"
expect(response.status).to eq(200)
- expect(response.parsed_body["groups"]).to eq([public_group.name, private_group.name, user_only_group.name])
+ expect(response.parsed_body["groups"]).to eq(
+ [public_group.name, private_group.name, user_only_group.name],
+ )
end
it "returns the names of the groups that are visible to a user and excludes the everyone group" do
diff --git a/spec/requests/clicks_controller_spec.rb b/spec/requests/clicks_controller_spec.rb
index 6f4d5569d2a..8a6e0523f29 100644
--- a/spec/requests/clicks_controller_spec.rb
+++ b/spec/requests/clicks_controller_spec.rb
@@ -1,17 +1,22 @@
# frozen_string_literal: true
RSpec.describe ClicksController do
-
let(:url) { "https://discourse.org/" }
let(:headers) { { REMOTE_ADDR: "192.168.0.1" } }
let(:post_with_url) { create_post(raw: "this is a post with a link #{url}") }
- describe '#track' do
+ describe "#track" do
it "creates a TopicLinkClick" do
sign_in(Fabricate(:user))
expect {
- post "/clicks/track", params: { url: url, post_id: post_with_url.id, topic_id: post_with_url.topic_id }, headers: headers
+ post "/clicks/track",
+ params: {
+ url: url,
+ post_id: post_with_url.id,
+ topic_id: post_with_url.topic_id,
+ },
+ headers: headers
}.to change { TopicLinkClick.count }.by(1)
end
end
diff --git a/spec/requests/composer_controller_spec.rb b/spec/requests/composer_controller_spec.rb
index ca67ce8a04a..76297223d5c 100644
--- a/spec/requests/composer_controller_spec.rb
+++ b/spec/requests/composer_controller_spec.rb
@@ -1,140 +1,183 @@
# frozen_string_literal: true
RSpec.describe ComposerController do
- describe '#mentions' do
+ describe "#mentions" do
fab!(:current_user) { Fabricate(:user) }
fab!(:user) { Fabricate(:user) }
- fab!(:group) { Fabricate(:group, messageable_level: Group::ALIAS_LEVELS[:everyone], mentionable_level: Group::ALIAS_LEVELS[:everyone]) }
+ fab!(:group) do
+ Fabricate(
+ :group,
+ messageable_level: Group::ALIAS_LEVELS[:everyone],
+ mentionable_level: Group::ALIAS_LEVELS[:everyone],
+ )
+ end
fab!(:invisible_group) { Fabricate(:group, visibility_level: Group.visibility_levels[:owners]) }
- fab!(:unmessageable_group) { Fabricate(:group, messageable_level: Group::ALIAS_LEVELS[:nobody], mentionable_level: Group::ALIAS_LEVELS[:everyone]) }
- fab!(:unmentionable_group) { Fabricate(:group, messageable_level: Group::ALIAS_LEVELS[:everyone], mentionable_level: Group::ALIAS_LEVELS[:nobody]) }
-
- before do
- sign_in(current_user)
+ fab!(:unmessageable_group) do
+ Fabricate(
+ :group,
+ messageable_level: Group::ALIAS_LEVELS[:nobody],
+ mentionable_level: Group::ALIAS_LEVELS[:everyone],
+ )
+ end
+ fab!(:unmentionable_group) do
+ Fabricate(
+ :group,
+ messageable_level: Group::ALIAS_LEVELS[:everyone],
+ mentionable_level: Group::ALIAS_LEVELS[:nobody],
+ )
end
- context 'without a topic' do
- it 'finds mentions' do
- get '/composer/mentions.json', params: {
- names: [
- 'invaliduserorgroup',
- user.username,
- group.name,
- invisible_group.name,
- unmessageable_group.name,
- unmentionable_group.name
- ],
- }
+ before { sign_in(current_user) }
+
+ context "without a topic" do
+ it "finds mentions" do
+ get "/composer/mentions.json",
+ params: {
+ names: [
+ "invaliduserorgroup",
+ user.username,
+ group.name,
+ invisible_group.name,
+ unmessageable_group.name,
+ unmentionable_group.name,
+ ],
+ }
expect(response.status).to eq(200)
- expect(response.parsed_body['users']).to contain_exactly(user.username)
- expect(response.parsed_body['user_reasons']).to eq({})
+ expect(response.parsed_body["users"]).to contain_exactly(user.username)
+ expect(response.parsed_body["user_reasons"]).to eq({})
- expect(response.parsed_body['groups']).to eq({
- group.name => { 'user_count' => group.user_count },
- unmessageable_group.name => { 'user_count' => unmessageable_group.user_count },
- unmentionable_group.name => { 'user_count' => unmentionable_group.user_count },
- })
- expect(response.parsed_body['group_reasons']).to eq({
- unmentionable_group.name => 'not_mentionable',
- })
+ expect(response.parsed_body["groups"]).to eq(
+ {
+ group.name => {
+ "user_count" => group.user_count,
+ },
+ unmessageable_group.name => {
+ "user_count" => unmessageable_group.user_count,
+ },
+ unmentionable_group.name => {
+ "user_count" => unmentionable_group.user_count,
+ },
+ },
+ )
+ expect(response.parsed_body["group_reasons"]).to eq(
+ { unmentionable_group.name => "not_mentionable" },
+ )
- expect(response.parsed_body['max_users_notified_per_group_mention'])
- .to eq(SiteSetting.max_users_notified_per_group_mention)
+ expect(response.parsed_body["max_users_notified_per_group_mention"]).to eq(
+ SiteSetting.max_users_notified_per_group_mention,
+ )
end
end
- context 'with a regular topic' do
+ context "with a regular topic" do
fab!(:topic) { Fabricate(:topic) }
- it 'finds mentions' do
- get '/composer/mentions.json', params: {
- names: [
- 'invaliduserorgroup',
- user.username,
- group.name,
- invisible_group.name,
- unmessageable_group.name,
- unmentionable_group.name
- ],
- topic_id: topic.id,
- }
+ it "finds mentions" do
+ get "/composer/mentions.json",
+ params: {
+ names: [
+ "invaliduserorgroup",
+ user.username,
+ group.name,
+ invisible_group.name,
+ unmessageable_group.name,
+ unmentionable_group.name,
+ ],
+ topic_id: topic.id,
+ }
expect(response.status).to eq(200)
- expect(response.parsed_body['users']).to contain_exactly(user.username)
- expect(response.parsed_body['user_reasons']).to eq({})
+ expect(response.parsed_body["users"]).to contain_exactly(user.username)
+ expect(response.parsed_body["user_reasons"]).to eq({})
- expect(response.parsed_body['groups']).to eq(
- group.name => { 'user_count' => group.user_count },
- unmessageable_group.name => { 'user_count' => unmessageable_group.user_count },
- unmentionable_group.name => { 'user_count' => unmentionable_group.user_count },
+ expect(response.parsed_body["groups"]).to eq(
+ group.name => {
+ "user_count" => group.user_count,
+ },
+ unmessageable_group.name => {
+ "user_count" => unmessageable_group.user_count,
+ },
+ unmentionable_group.name => {
+ "user_count" => unmentionable_group.user_count,
+ },
)
- expect(response.parsed_body['group_reasons']).to eq(
- unmentionable_group.name => 'not_mentionable',
+ expect(response.parsed_body["group_reasons"]).to eq(
+ unmentionable_group.name => "not_mentionable",
)
- expect(response.parsed_body['max_users_notified_per_group_mention'])
- .to eq(SiteSetting.max_users_notified_per_group_mention)
+ expect(response.parsed_body["max_users_notified_per_group_mention"]).to eq(
+ SiteSetting.max_users_notified_per_group_mention,
+ )
end
end
- context 'with a private message' do
+ context "with a private message" do
fab!(:allowed_user) { Fabricate(:user) }
fab!(:topic) { Fabricate(:private_message_topic, user: allowed_user) }
- it 'does not work if topic is not visible' do
- get '/composer/mentions.json', params: {
- names: [allowed_user.username], topic_id: topic.id
- }
+ it "does not work if topic is not visible" do
+ get "/composer/mentions.json",
+ params: {
+ names: [allowed_user.username],
+ topic_id: topic.id,
+ }
expect(response.status).to eq(403)
end
- it 'finds mentions' do
+ it "finds mentions" do
sign_in(allowed_user)
topic.invite_group(Discourse.system_user, unmentionable_group)
- get '/composer/mentions.json', params: {
- names: [
- 'invaliduserorgroup',
- user.username,
- allowed_user.username,
- group.name,
- invisible_group.name,
- unmessageable_group.name,
- unmentionable_group.name
- ],
- topic_id: topic.id,
- }
+ get "/composer/mentions.json",
+ params: {
+ names: [
+ "invaliduserorgroup",
+ user.username,
+ allowed_user.username,
+ group.name,
+ invisible_group.name,
+ unmessageable_group.name,
+ unmentionable_group.name,
+ ],
+ topic_id: topic.id,
+ }
expect(response.status).to eq(200)
- expect(response.parsed_body['users']).to contain_exactly(
- user.username, allowed_user.username
+ expect(response.parsed_body["users"]).to contain_exactly(
+ user.username,
+ allowed_user.username,
)
- expect(response.parsed_body['user_reasons']).to eq(
- user.username => 'private'
+ expect(response.parsed_body["user_reasons"]).to eq(user.username => "private")
+
+ expect(response.parsed_body["groups"]).to eq(
+ group.name => {
+ "user_count" => group.user_count,
+ },
+ unmessageable_group.name => {
+ "user_count" => unmessageable_group.user_count,
+ },
+ unmentionable_group.name => {
+ "user_count" => unmentionable_group.user_count,
+ },
+ )
+ expect(response.parsed_body["group_reasons"]).to eq(
+ group.name => "not_allowed",
+ unmessageable_group.name => "not_allowed",
+ unmentionable_group.name => "not_mentionable",
)
- expect(response.parsed_body['groups']).to eq(
- group.name => { 'user_count' => group.user_count },
- unmessageable_group.name => { 'user_count' => unmessageable_group.user_count },
- unmentionable_group.name => { 'user_count' => unmentionable_group.user_count },
+ expect(response.parsed_body["max_users_notified_per_group_mention"]).to eq(
+ SiteSetting.max_users_notified_per_group_mention,
)
- expect(response.parsed_body['group_reasons']).to eq(
- group.name => 'not_allowed',
- unmessageable_group.name => 'not_allowed',
- unmentionable_group.name => 'not_mentionable',
- )
-
- expect(response.parsed_body['max_users_notified_per_group_mention'])
- .to eq(SiteSetting.max_users_notified_per_group_mention)
end
- it 'returns notified_count' do
+ it "returns notified_count" do
sign_in(allowed_user)
group.add(user)
topic.invite_group(Discourse.system_user, group)
@@ -146,64 +189,69 @@ RSpec.describe ComposerController do
# Trying to mention other_group which has not been invited, but two of
# its members have been (allowed_user directly and user via group).
- get '/composer/mentions.json', params: {
- names: [other_group.name],
- topic_id: topic.id,
- }
+ get "/composer/mentions.json", params: { names: [other_group.name], topic_id: topic.id }
expect(response.status).to eq(200)
- expect(response.parsed_body['groups']).to eq(
- other_group.name => { 'user_count' => 3, 'notified_count' => 2 }
- )
- expect(response.parsed_body['group_reasons']).to eq(
- other_group.name => 'some_not_allowed'
+ expect(response.parsed_body["groups"]).to eq(
+ other_group.name => {
+ "user_count" => 3,
+ "notified_count" => 2,
+ },
)
+ expect(response.parsed_body["group_reasons"]).to eq(other_group.name => "some_not_allowed")
end
end
- context 'with a new private message' do
+ context "with a new private message" do
fab!(:allowed_user) { Fabricate(:user) }
- it 'finds mentions' do
- get '/composer/mentions.json', params: {
- names: [
- 'invaliduserorgroup',
- user.username,
- allowed_user.username,
- group.name,
- invisible_group.name,
- unmessageable_group.name,
- unmentionable_group.name
- ],
- allowed_names: [allowed_user.username, unmentionable_group.name],
- }
+ it "finds mentions" do
+ get "/composer/mentions.json",
+ params: {
+ names: [
+ "invaliduserorgroup",
+ user.username,
+ allowed_user.username,
+ group.name,
+ invisible_group.name,
+ unmessageable_group.name,
+ unmentionable_group.name,
+ ],
+ allowed_names: [allowed_user.username, unmentionable_group.name],
+ }
expect(response.status).to eq(200)
- expect(response.parsed_body['users']).to contain_exactly(
- user.username, allowed_user.username
+ expect(response.parsed_body["users"]).to contain_exactly(
+ user.username,
+ allowed_user.username,
)
- expect(response.parsed_body['user_reasons']).to eq(
- user.username => 'private',
+ expect(response.parsed_body["user_reasons"]).to eq(user.username => "private")
+
+ expect(response.parsed_body["groups"]).to eq(
+ group.name => {
+ "user_count" => group.user_count,
+ },
+ unmessageable_group.name => {
+ "user_count" => unmessageable_group.user_count,
+ },
+ unmentionable_group.name => {
+ "user_count" => unmentionable_group.user_count,
+ },
+ )
+ expect(response.parsed_body["group_reasons"]).to eq(
+ group.name => "not_allowed",
+ unmessageable_group.name => "not_allowed",
+ unmentionable_group.name => "not_mentionable",
)
- expect(response.parsed_body['groups']).to eq(
- group.name => { 'user_count' => group.user_count },
- unmessageable_group.name => { 'user_count' => unmessageable_group.user_count },
- unmentionable_group.name => { 'user_count' => unmentionable_group.user_count },
+ expect(response.parsed_body["max_users_notified_per_group_mention"]).to eq(
+ SiteSetting.max_users_notified_per_group_mention,
)
- expect(response.parsed_body['group_reasons']).to eq(
- group.name => 'not_allowed',
- unmessageable_group.name => 'not_allowed',
- unmentionable_group.name => 'not_mentionable',
- )
-
- expect(response.parsed_body['max_users_notified_per_group_mention'])
- .to eq(SiteSetting.max_users_notified_per_group_mention)
end
- it 'returns notified_count' do
+ it "returns notified_count" do
sign_in(allowed_user)
group.add(user)
@@ -214,35 +262,38 @@ RSpec.describe ComposerController do
# Trying to mention other_group which has not been invited, but two of
# its members have been (allowed_user directly and user via group).
- get '/composer/mentions.json', params: {
- names: [other_group.name],
- allowed_names: [allowed_user.username, group.name],
- }
+ get "/composer/mentions.json",
+ params: {
+ names: [other_group.name],
+ allowed_names: [allowed_user.username, group.name],
+ }
expect(response.status).to eq(200)
- expect(response.parsed_body['groups']).to eq(
- other_group.name => { 'user_count' => 3, 'notified_count' => 2 }
- )
- expect(response.parsed_body['group_reasons']).to eq(
- other_group.name => 'some_not_allowed'
+ expect(response.parsed_body["groups"]).to eq(
+ other_group.name => {
+ "user_count" => 3,
+ "notified_count" => 2,
+ },
)
+ expect(response.parsed_body["group_reasons"]).to eq(other_group.name => "some_not_allowed")
end
end
- context 'with an invalid topic' do
- it 'returns an error' do
- get '/composer/mentions.json', params: {
- names: [
- 'invaliduserorgroup',
- user.username,
- group.name,
- invisible_group.name,
- unmessageable_group.name,
- unmentionable_group.name
- ],
- topic_id: -1,
- }
+ context "with an invalid topic" do
+ it "returns an error" do
+ get "/composer/mentions.json",
+ params: {
+ names: [
+ "invaliduserorgroup",
+ user.username,
+ group.name,
+ invisible_group.name,
+ unmessageable_group.name,
+ unmentionable_group.name,
+ ],
+ topic_id: -1,
+ }
expect(response.status).to eq(403)
end
diff --git a/spec/requests/composer_messages_controller_spec.rb b/spec/requests/composer_messages_controller_spec.rb
index 22af26f4563..ad32c860d19 100644
--- a/spec/requests/composer_messages_controller_spec.rb
+++ b/spec/requests/composer_messages_controller_spec.rb
@@ -4,22 +4,24 @@ RSpec.describe ComposerMessagesController do
fab!(:topic) { Fabricate(:topic, created_at: 10.years.ago, last_posted_at: 10.years.ago) }
fab!(:post) { Fabricate(:post, topic: topic, post_number: 1, created_at: 10.years.ago) }
- describe '#index' do
- it 'requires you to be logged in' do
+ describe "#index" do
+ it "requires you to be logged in" do
get "/composer_messages.json"
expect(response.status).to eq(403)
end
- context 'when logged in' do
+ context "when logged in" do
let!(:user) { sign_in(Fabricate(:user)) }
- let(:args) { { 'topic_id' => post.topic.id, 'post_id' => '333', 'composer_action' => 'reply' } }
+ let(:args) do
+ { "topic_id" => post.topic.id, "post_id" => "333", "composer_action" => "reply" }
+ end
- it 'redirects to your user preferences' do
+ it "redirects to your user preferences" do
get "/composer_messages.json"
expect(response.status).to eq(200)
end
- it 'delegates args to the finder' do
+ it "delegates args to the finder" do
user.user_stat.update!(post_count: 10)
SiteSetting.disable_avatar_education_message = true
@@ -31,39 +33,46 @@ RSpec.describe ComposerMessagesController do
end
end
- describe '#user_not_seen_in_a_while' do
+ describe "#user_not_seen_in_a_while" do
fab!(:user_1) { Fabricate(:user, last_seen_at: 3.years.ago) }
fab!(:user_2) { Fabricate(:user, last_seen_at: 2.years.ago) }
fab!(:user_3) { Fabricate(:user, last_seen_at: 6.months.ago) }
- it 'requires you to be logged in' do
- get '/composer_messages/user_not_seen_in_a_while.json', params: { usernames: [user_1.username, user_2.username, user_3.username] }
+ it "requires you to be logged in" do
+ get "/composer_messages/user_not_seen_in_a_while.json",
+ params: {
+ usernames: [user_1.username, user_2.username, user_3.username],
+ }
expect(response.status).to eq(403)
end
- context 'when logged in' do
+ context "when logged in" do
let!(:user) { sign_in(Fabricate(:user)) }
- before do
- SiteSetting.pm_warn_user_last_seen_months_ago = 24
- end
+ before { SiteSetting.pm_warn_user_last_seen_months_ago = 24 }
- it 'requires usernames parameter to be present' do
- get '/composer_messages/user_not_seen_in_a_while.json'
+ it "requires usernames parameter to be present" do
+ get "/composer_messages/user_not_seen_in_a_while.json"
expect(response.status).to eq(400)
end
- it 'returns users that have not been seen recently' do
- get '/composer_messages/user_not_seen_in_a_while.json', params: { usernames: [user_1.username, user_2.username, user_3.username] }
+ it "returns users that have not been seen recently" do
+ get "/composer_messages/user_not_seen_in_a_while.json",
+ params: {
+ usernames: [user_1.username, user_2.username, user_3.username],
+ }
expect(response.status).to eq(200)
json = response.parsed_body
expect(json["user_count"]).to eq(2)
expect(json["usernames"]).to contain_exactly(user_1.username, user_2.username)
end
- it 'accounts for pm_warn_user_last_seen_months_ago site setting' do
+ it "accounts for pm_warn_user_last_seen_months_ago site setting" do
SiteSetting.pm_warn_user_last_seen_months_ago = 30
- get '/composer_messages/user_not_seen_in_a_while.json', params: { usernames: [user_1.username, user_2.username, user_3.username] }
+ get "/composer_messages/user_not_seen_in_a_while.json",
+ params: {
+ usernames: [user_1.username, user_2.username, user_3.username],
+ }
expect(response.status).to eq(200)
json = response.parsed_body
expect(json["user_count"]).to eq(1)
diff --git a/spec/requests/csp_reports_controller_spec.rb b/spec/requests/csp_reports_controller_spec.rb
index 24133e47f84..cd3b429a493 100644
--- a/spec/requests/csp_reports_controller_spec.rb
+++ b/spec/requests/csp_reports_controller_spec.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
RSpec.describe CspReportsController do
- describe '#create' do
+ describe "#create" do
before do
SiteSetting.content_security_policy = true
SiteSetting.content_security_policy_collect_reports = true
@@ -10,41 +10,52 @@ RSpec.describe CspReportsController do
Rails.logger = @fake_logger = FakeLogger.new
end
- after do
- Rails.logger = @orig_logger
- end
+ after { Rails.logger = @orig_logger }
def send_report
- post '/csp_reports', params: {
- "csp-report": {
- "document-uri": "http://localhost:3000/",
- "referrer": "",
- "violated-directive": "script-src",
- "effective-directive": "script-src",
- "original-policy": "script-src 'unsafe-eval' www.google-analytics.com; report-uri /csp_reports",
- "disposition": "report",
- "blocked-uri": "http://suspicio.us/assets.js",
- "line-number": 25,
- "source-file": "http://localhost:3000/",
- "status-code": 200,
- "script-sample": "console.log('unsafe')"
- }
- }.to_json, headers: { "Content-Type": "application/csp-report" }
+ post "/csp_reports",
+ params: {
+ "csp-report": {
+ "document-uri": "http://localhost:3000/",
+ referrer: "",
+ "violated-directive": "script-src",
+ "effective-directive": "script-src",
+ "original-policy":
+ "script-src 'unsafe-eval' www.google-analytics.com; report-uri /csp_reports",
+ disposition: "report",
+ "blocked-uri": "http://suspicio.us/assets.js",
+ "line-number": 25,
+ "source-file": "http://localhost:3000/",
+ "status-code": 200,
+ "script-sample": "console.log('unsafe')",
+ },
+ }.to_json,
+ headers: {
+ "Content-Type": "application/csp-report",
+ }
end
- it 'returns an error for invalid reports' do
+ it "returns an error for invalid reports" do
SiteSetting.content_security_policy_collect_reports = true
- post '/csp_reports', params: "[ not-json", headers: { "Content-Type": "application/csp-report" }
+ post "/csp_reports",
+ params: "[ not-json",
+ headers: {
+ "Content-Type": "application/csp-report",
+ }
expect(response.status).to eq(422)
- post '/csp_reports', params: ["yes json"].to_json, headers: { "Content-Type": "application/csp-report" }
+ post "/csp_reports",
+ params: ["yes json"].to_json,
+ headers: {
+ "Content-Type": "application/csp-report",
+ }
expect(response.status).to eq(422)
end
- it 'is enabled by SiteSetting' do
+ it "is enabled by SiteSetting" do
SiteSetting.content_security_policy = false
SiteSetting.content_security_policy_report_only = false
SiteSetting.content_security_policy_collect_reports = true
@@ -60,9 +71,11 @@ RSpec.describe CspReportsController do
expect(response.status).to eq(404)
end
- it 'logs the violation report' do
+ it "logs the violation report" do
send_report
- expect(@fake_logger.warnings).to include("CSP Violation: 'http://suspicio.us/assets.js' \n\nconsole.log('unsafe')")
+ expect(@fake_logger.warnings).to include(
+ "CSP Violation: 'http://suspicio.us/assets.js' \n\nconsole.log('unsafe')",
+ )
end
end
end
diff --git a/spec/requests/directory_columns_controller_spec.rb b/spec/requests/directory_columns_controller_spec.rb
index a7be45ea775..ff5990ff923 100644
--- a/spec/requests/directory_columns_controller_spec.rb
+++ b/spec/requests/directory_columns_controller_spec.rb
@@ -11,20 +11,22 @@ RSpec.describe DirectoryColumnsController do
get "/directory-columns.json"
- expect(response.parsed_body["directory_columns"].map { |dc| dc["name"] }).not_to include("likes_given")
+ expect(response.parsed_body["directory_columns"].map { |dc| dc["name"] }).not_to include(
+ "likes_given",
+ )
end
end
describe "#edit-index" do
fab!(:public_user_field) { Fabricate(:user_field, show_on_profile: true) }
- fab!(:private_user_field) { Fabricate(:user_field, show_on_profile: false, show_on_user_card: false) }
+ fab!(:private_user_field) do
+ Fabricate(:user_field, show_on_profile: false, show_on_user_card: false)
+ end
it "creates directory column records for public user fields" do
sign_in(admin)
- expect {
- get "/edit-directory-columns.json"
- }.to change { DirectoryColumn.count }.by(1)
+ expect { get "/edit-directory-columns.json" }.to change { DirectoryColumn.count }.by(1)
end
it "returns a 403 when not logged in as staff member" do
@@ -38,29 +40,29 @@ RSpec.describe DirectoryColumnsController do
describe "#update" do
let(:first_directory_column_id) { DirectoryColumn.first.id }
let(:second_directory_column_id) { DirectoryColumn.second.id }
- let(:params) {
+ let(:params) do
{
directory_columns: {
"0": {
id: first_directory_column_id,
enabled: false,
- position: 1
+ position: 1,
},
"1": {
id: second_directory_column_id,
enabled: true,
- position: 1
- }
- }
+ position: 1,
+ },
+ },
}
- }
+ end
it "updates exising directory columns" do
sign_in(admin)
- expect {
- put "/edit-directory-columns.json", params: params
- }.to change { DirectoryColumn.find(first_directory_column_id).enabled }.from(true).to(false)
+ expect { put "/edit-directory-columns.json", params: params }.to change {
+ DirectoryColumn.find(first_directory_column_id).enabled
+ }.from(true).to(false)
end
it "does not let all columns be disabled" do
diff --git a/spec/requests/directory_items_controller_spec.rb b/spec/requests/directory_items_controller_spec.rb
index af9bc5caab2..e56ded8ae20 100644
--- a/spec/requests/directory_items_controller_spec.rb
+++ b/spec/requests/directory_items_controller_spec.rb
@@ -4,16 +4,16 @@ RSpec.describe DirectoryItemsController do
fab!(:user) { Fabricate(:user) }
fab!(:evil_trout) { Fabricate(:evil_trout) }
fab!(:walter_white) { Fabricate(:walter_white) }
- fab!(:stage_user) { Fabricate(:staged, username: 'stage_user') }
+ fab!(:stage_user) { Fabricate(:staged, username: "stage_user") }
fab!(:group) { Fabricate(:group, users: [evil_trout, stage_user]) }
it "requires a `period` param" do
- get '/directory_items.json'
+ get "/directory_items.json"
expect(response.status).to eq(400)
end
it "requires a proper `period` param" do
- get '/directory_items.json', params: { period: 'eviltrout' }
+ get "/directory_items.json", params: { period: "eviltrout" }
expect(response).not_to be_successful
end
@@ -22,115 +22,128 @@ RSpec.describe DirectoryItemsController do
before { sign_in(user) }
it "succeeds" do
- get '/directory_items.json', params: { period: 'all' }
+ get "/directory_items.json", params: { period: "all" }
expect(response.status).to eq(200)
end
end
-
end
context "with data" do
- before do
- DirectoryItem.refresh!
- end
+ before { DirectoryItem.refresh! }
it "succeeds with a valid value" do
- get '/directory_items.json', params: { period: 'all' }
+ get "/directory_items.json", params: { period: "all" }
expect(response.status).to eq(200)
json = response.parsed_body
expect(json).to be_present
- expect(json['directory_items']).to be_present
- expect(json['meta']['total_rows_directory_items']).to be_present
- expect(json['meta']['load_more_directory_items']).to be_present
- expect(json['meta']['last_updated_at']).to be_present
+ expect(json["directory_items"]).to be_present
+ expect(json["meta"]["total_rows_directory_items"]).to be_present
+ expect(json["meta"]["load_more_directory_items"]).to be_present
+ expect(json["meta"]["last_updated_at"]).to be_present
- expect(json['directory_items'].length).to eq(4)
- expect(json['meta']['total_rows_directory_items']).to eq(4)
- expect(json['meta']['load_more_directory_items']).to include('.json')
+ expect(json["directory_items"].length).to eq(4)
+ expect(json["meta"]["total_rows_directory_items"]).to eq(4)
+ expect(json["meta"]["load_more_directory_items"]).to include(".json")
end
it "respects more_params in load_more_directory_items" do
- get '/directory_items.json', params: { period: 'all', order: "likes_given", group: group.name, user_field_ids: "1|2" }
+ get "/directory_items.json",
+ params: {
+ period: "all",
+ order: "likes_given",
+ group: group.name,
+ user_field_ids: "1|2",
+ }
expect(response.status).to eq(200)
json = response.parsed_body
- expect(json['meta']['load_more_directory_items']).to include("group=#{group.name}")
- expect(json['meta']['load_more_directory_items']).to include("user_field_ids=#{CGI.escape('1|2')}")
- expect(json['meta']['load_more_directory_items']).to include("order=likes_given")
- expect(json['meta']['load_more_directory_items']).to include("period=all")
+ expect(json["meta"]["load_more_directory_items"]).to include("group=#{group.name}")
+ expect(json["meta"]["load_more_directory_items"]).to include(
+ "user_field_ids=#{CGI.escape("1|2")}",
+ )
+ expect(json["meta"]["load_more_directory_items"]).to include("order=likes_given")
+ expect(json["meta"]["load_more_directory_items"]).to include("period=all")
end
it "fails when the directory is disabled" do
SiteSetting.enable_user_directory = false
- get '/directory_items.json', params: { period: 'all' }
+ get "/directory_items.json", params: { period: "all" }
expect(response).not_to be_successful
end
it "sort username with asc as a parameter" do
- get '/directory_items.json', params: { asc: true, order: 'username', period: 'all' }
+ get "/directory_items.json", params: { asc: true, order: "username", period: "all" }
expect(response.status).to eq(200)
json = response.parsed_body
- names = json['directory_items'].map { |item| item['user']['username'] }
+ names = json["directory_items"].map { |item| item["user"]["username"] }
expect(names).to eq(names.sort)
end
it "sort username without asc as a parameter" do
- get '/directory_items.json', params: { order: 'username', period: 'all' }
+ get "/directory_items.json", params: { order: "username", period: "all" }
expect(response.status).to eq(200)
json = response.parsed_body
- names = json['directory_items'].map { |item| item['user']['username'] }
+ names = json["directory_items"].map { |item| item["user"]["username"] }
expect(names).to eq(names.sort.reverse)
end
it "finds user by name" do
- get '/directory_items.json', params: { period: 'all', name: 'eviltrout' }
+ get "/directory_items.json", params: { period: "all", name: "eviltrout" }
expect(response.status).to eq(200)
json = response.parsed_body
expect(json).to be_present
- expect(json['directory_items'].length).to eq(1)
- expect(json['meta']['total_rows_directory_items']).to eq(1)
- expect(json['directory_items'][0]['user']['username']).to eq('eviltrout')
+ expect(json["directory_items"].length).to eq(1)
+ expect(json["meta"]["total_rows_directory_items"]).to eq(1)
+ expect(json["directory_items"][0]["user"]["username"]).to eq("eviltrout")
end
it "finds staged user by name" do
- get '/directory_items.json', params: { period: 'all', name: 'stage_user' }
+ get "/directory_items.json", params: { period: "all", name: "stage_user" }
expect(response.status).to eq(200)
json = response.parsed_body
expect(json).to be_present
- expect(json['directory_items'].length).to eq(1)
- expect(json['meta']['total_rows_directory_items']).to eq(1)
- expect(json['directory_items'][0]['user']['username']).to eq('stage_user')
+ expect(json["directory_items"].length).to eq(1)
+ expect(json["meta"]["total_rows_directory_items"]).to eq(1)
+ expect(json["directory_items"][0]["user"]["username"]).to eq("stage_user")
end
it "excludes users by username" do
- get '/directory_items.json', params: { period: 'all', exclude_usernames: "stage_user,eviltrout" }
+ get "/directory_items.json",
+ params: {
+ period: "all",
+ exclude_usernames: "stage_user,eviltrout",
+ }
expect(response.status).to eq(200)
json = response.parsed_body
expect(json).to be_present
- expect(json['directory_items'].length).to eq(2)
- expect(json['meta']['total_rows_directory_items']).to eq(2)
- expect(json['directory_items'][0]['user']['username']).to eq(walter_white.username) | eq(user.username)
- expect(json['directory_items'][1]['user']['username']).to eq(walter_white.username) | eq(user.username)
+ expect(json["directory_items"].length).to eq(2)
+ expect(json["meta"]["total_rows_directory_items"]).to eq(2)
+ expect(json["directory_items"][0]["user"]["username"]).to eq(walter_white.username) |
+ eq(user.username)
+ expect(json["directory_items"][1]["user"]["username"]).to eq(walter_white.username) |
+ eq(user.username)
end
it "filters users by group" do
- get '/directory_items.json', params: { period: 'all', group: group.name }
+ get "/directory_items.json", params: { period: "all", group: group.name }
expect(response.status).to eq(200)
json = response.parsed_body
expect(json).to be_present
- expect(json['directory_items'].length).to eq(2)
- expect(json['meta']['total_rows_directory_items']).to eq(2)
- expect(json['directory_items'][0]['user']['username']).to eq(evil_trout.username) | eq(stage_user.username)
- expect(json['directory_items'][1]['user']['username']).to eq(evil_trout.username) | eq(stage_user.username)
+ expect(json["directory_items"].length).to eq(2)
+ expect(json["meta"]["total_rows_directory_items"]).to eq(2)
+ expect(json["directory_items"][0]["user"]["username"]).to eq(evil_trout.username) |
+ eq(stage_user.username)
+ expect(json["directory_items"][1]["user"]["username"]).to eq(evil_trout.username) |
+ eq(stage_user.username)
end
it "orders users by user fields" do
@@ -141,30 +154,37 @@ RSpec.describe DirectoryItemsController do
user_fields = [
{ user: walter_white, field: field1, value: "Yellow", order: 1 },
{ user: stage_user, field: field1, value: "Apple", order: 0 },
- { user: evil_trout, field: field2, value: "Moon", order: 2 }
+ { user: evil_trout, field: field2, value: "Moon", order: 2 },
]
user_fields.each do |data|
UserCustomField.create!(
user_id: data[:user].id,
name: "user_field_#{data[:field].id}",
- value: data[:value]
+ value: data[:value],
)
end
- get '/directory_items.json', params: { period: 'all', group: group.name, order: field1.name, user_field_ids: "#{field1.id}|#{field2.id}", asc: true }
+ get "/directory_items.json",
+ params: {
+ period: "all",
+ group: group.name,
+ order: field1.name,
+ user_field_ids: "#{field1.id}|#{field2.id}",
+ asc: true,
+ }
expect(response.status).to eq(200)
json = response.parsed_body
expect(json).to be_present
- items = json['directory_items']
+ items = json["directory_items"]
expect(items.length).to eq(3)
- expect(json['meta']['total_rows_directory_items']).to eq(3)
+ expect(json["meta"]["total_rows_directory_items"]).to eq(3)
user_fields.each do |data|
- user = items[data[:order]]['user']
- expect(user['username']).to eq(data[:user].username)
- expect(user['user_fields']).to eq({ data[:field].id.to_s => data[:value] })
+ user = items[data[:order]]["user"]
+ expect(user["username"]).to eq(data[:user].username)
+ expect(user["user_fields"]).to eq({ data[:field].id.to_s => data[:value] })
end
end
@@ -172,14 +192,14 @@ RSpec.describe DirectoryItemsController do
group.update!(visibility_level: Group.visibility_levels[:members])
sign_in(evil_trout)
- get '/directory_items.json', params: { period: 'all', group: group.name }
+ get "/directory_items.json", params: { period: "all", group: group.name }
expect(response.status).to eq(200)
- get '/directory_items.json', params: { period: 'all', group: 'not a group' }
+ get "/directory_items.json", params: { period: "all", group: "not a group" }
expect(response.status).to eq(400)
sign_in(user)
- get '/directory_items.json', params: { period: 'all', group: group.name }
+ get "/directory_items.json", params: { period: "all", group: group.name }
expect(response.status).to eq(403)
end
@@ -188,8 +208,8 @@ RSpec.describe DirectoryItemsController do
DirectoryItem.refresh!
sign_in(me)
- get '/directory_items.json', params: { period: 'all', group: group.name }
- expect(response.parsed_body['directory_items'].length).to eq(2)
+ get "/directory_items.json", params: { period: "all", group: group.name }
+ expect(response.parsed_body["directory_items"].length).to eq(2)
end
end
end
diff --git a/spec/requests/do_not_disturb_controller_spec.rb b/spec/requests/do_not_disturb_controller_spec.rb
index 675e06ac545..06c27e235d8 100644
--- a/spec/requests/do_not_disturb_controller_spec.rb
+++ b/spec/requests/do_not_disturb_controller_spec.rb
@@ -1,24 +1,22 @@
# frozen_string_literal: true
RSpec.describe DoNotDisturbController do
- it 'requires you to be logged in' do
+ it "requires you to be logged in" do
post "/do-not-disturb.json", params: { duration: 30 }
expect(response.status).to eq(403)
end
- describe 'logged in' do
+ describe "logged in" do
fab!(:user) { Fabricate(:user) }
- before do
- sign_in(user)
- end
+ before { sign_in(user) }
- it 'returns a 400 when a duration is not passed in' do
+ it "returns a 400 when a duration is not passed in" do
post "/do-not-disturb.json"
expect(response.status).to eq(400)
end
- it 'works properly with integer minute durations' do
+ it "works properly with integer minute durations" do
freeze_time
post "/do-not-disturb.json", params: { duration: 30 }
@@ -26,7 +24,7 @@ RSpec.describe DoNotDisturbController do
expect(user.do_not_disturb_timings.last.ends_at).to eq_time(30.minutes.from_now)
end
- it 'works properly with integer minute durations' do
+ it "works properly with integer minute durations" do
post "/do-not-disturb.json", params: { duration: -30 }
expect(response.status).to eq(422)
expect(response.parsed_body).to eq({ "errors" => ["Ends at is invalid"] })
@@ -35,20 +33,32 @@ RSpec.describe DoNotDisturbController do
include ActiveSupport::Testing::TimeHelpers
it "works properly with duration of 'tomorrow'" do
travel_to Time.new(2020, 11, 24, 01, 04, 44) do
- post "/do-not-disturb.json", params: { duration: 'tomorrow' }
+ post "/do-not-disturb.json", params: { duration: "tomorrow" }
expect(response.status).to eq(200)
- expect(user.do_not_disturb_timings.last.ends_at.to_i).to eq(Time.new(2020, 11, 24, 23, 59, 59).utc.to_i)
+ expect(user.do_not_disturb_timings.last.ends_at.to_i).to eq(
+ Time.new(2020, 11, 24, 23, 59, 59).utc.to_i,
+ )
end
end
describe "#destroy" do
it "process shelved notifications that came in during DND" do
user.do_not_disturb_timings.create(starts_at: 2.days.ago, ends_at: 2.days.from_now)
- notification = Notification.create(read: false, user_id: user.id, topic_id: 2, post_number: 1, data: '{}', notification_type: 1)
+ notification =
+ Notification.create(
+ read: false,
+ user_id: user.id,
+ topic_id: 2,
+ post_number: 1,
+ data: "{}",
+ notification_type: 1,
+ )
expect(notification.shelved_notification).to be_present
delete "/do-not-disturb.json"
- expect { notification.shelved_notification.reload }.to raise_error(ActiveRecord::RecordNotFound)
+ expect { notification.shelved_notification.reload }.to raise_error(
+ ActiveRecord::RecordNotFound,
+ )
expect(user.do_not_disturb?).to eq(false)
end
end
diff --git a/spec/requests/drafts_controller_spec.rb b/spec/requests/drafts_controller_spec.rb
index df487979e12..9cb50febee3 100644
--- a/spec/requests/drafts_controller_spec.rb
+++ b/spec/requests/drafts_controller_spec.rb
@@ -2,35 +2,35 @@
RSpec.describe DraftsController do
describe "#index" do
- it 'requires you to be logged in' do
+ it "requires you to be logged in" do
get "/drafts.json"
expect(response.status).to eq(403)
end
- it 'returns correct stream length after adding a draft' do
+ it "returns correct stream length after adding a draft" do
user = sign_in(Fabricate(:user))
- Draft.set(user, 'xxx', 0, '{}')
+ Draft.set(user, "xxx", 0, "{}")
get "/drafts.json"
expect(response.status).to eq(200)
parsed = response.parsed_body
expect(response.parsed_body["drafts"].length).to eq(1)
end
- it 'has empty stream after deleting last draft' do
+ it "has empty stream after deleting last draft" do
user = sign_in(Fabricate(:user))
- Draft.set(user, 'xxx', 0, '{}')
- Draft.clear(user, 'xxx', 0)
+ Draft.set(user, "xxx", 0, "{}")
+ Draft.clear(user, "xxx", 0)
get "/drafts.json"
expect(response.status).to eq(200)
expect(response.parsed_body["drafts"].length).to eq(0)
end
- it 'does not include topic details when user cannot see topic' do
+ it "does not include topic details when user cannot see topic" do
topic = Fabricate(:private_message_topic)
topic_user = topic.user
other_user = Fabricate(:user)
- Draft.set(topic_user, "topic_#{topic.id}", 0, '{}')
- Draft.set(other_user, "topic_#{topic.id}", 0, '{}')
+ Draft.set(topic_user, "topic_#{topic.id}", 0, "{}")
+ Draft.set(other_user, "topic_#{topic.id}", 0, "{}")
sign_in(topic_user)
get "/drafts.json"
@@ -47,31 +47,27 @@ RSpec.describe DraftsController do
describe "#show" do
it "returns a draft if requested" do
user = sign_in(Fabricate(:user))
- Draft.set(user, 'hello', 0, 'test')
+ Draft.set(user, "hello", 0, "test")
get "/drafts/hello.json"
expect(response.status).to eq(200)
- expect(response.parsed_body['draft']).to eq('test')
+ expect(response.parsed_body["draft"]).to eq("test")
end
end
describe "#create" do
- it 'requires you to be logged in' do
+ it "requires you to be logged in" do
post "/drafts.json"
expect(response.status).to eq(403)
end
- it 'saves a draft' do
+ it "saves a draft" do
user = sign_in(Fabricate(:user))
- post "/drafts.json", params: {
- draft_key: 'xyz',
- data: { my: "data" }.to_json,
- sequence: 0
- }
+ post "/drafts.json", params: { draft_key: "xyz", data: { my: "data" }.to_json, sequence: 0 }
expect(response.status).to eq(200)
- expect(Draft.get(user, 'xyz', 0)).to eq(%q({"my":"data"}))
+ expect(Draft.get(user, "xyz", 0)).to eq(%q({"my":"data"}))
end
it "returns 404 when the key is missing" do
@@ -80,131 +76,131 @@ RSpec.describe DraftsController do
expect(response.status).to eq(404)
end
- it 'checks for an conflict on update' do
+ it "checks for an conflict on update" do
user = sign_in(Fabricate(:user))
post = Fabricate(:post, user: user)
- post "/drafts.json", params: {
- draft_key: "topic",
- sequence: 0,
- data: {
- postId: post.id,
- originalText: post.raw,
- action: "edit"
- }.to_json
- }
+ post "/drafts.json",
+ params: {
+ draft_key: "topic",
+ sequence: 0,
+ data: { postId: post.id, originalText: post.raw, action: "edit" }.to_json,
+ }
expect(response.status).to eq(200)
- expect(response.parsed_body['conflict_user']).to eq(nil)
+ expect(response.parsed_body["conflict_user"]).to eq(nil)
- post "/drafts.json", params: {
- draft_key: "topic",
- sequence: 0,
- data: {
- postId: post.id,
- originalText: "something else",
- action: "edit"
- }.to_json
- }
+ post "/drafts.json",
+ params: {
+ draft_key: "topic",
+ sequence: 0,
+ data: { postId: post.id, originalText: "something else", action: "edit" }.to_json,
+ }
expect(response.status).to eq(200)
- expect(response.parsed_body['conflict_user']['id']).to eq(post.last_editor.id)
- expect(response.parsed_body['conflict_user']).to include('avatar_template')
+ expect(response.parsed_body["conflict_user"]["id"]).to eq(post.last_editor.id)
+ expect(response.parsed_body["conflict_user"]).to include("avatar_template")
end
- it 'cant trivially resolve conflicts without interaction' do
-
+ it "cant trivially resolve conflicts without interaction" do
user = sign_in(Fabricate(:user))
DraftSequence.next!(user, "abc")
- post "/drafts.json", params: {
- draft_key: "abc",
- sequence: 0,
- data: { a: "test" }.to_json,
- owner: "abcdefg"
- }
+ post "/drafts.json",
+ params: {
+ draft_key: "abc",
+ sequence: 0,
+ data: { a: "test" }.to_json,
+ owner: "abcdefg",
+ }
expect(response.status).to eq(200)
expect(response.parsed_body["draft_sequence"]).to eq(1)
end
- it 'has a clean protocol for ownership handover' do
+ it "has a clean protocol for ownership handover" do
user = sign_in(Fabricate(:user))
- post "/drafts.json", params: {
- draft_key: "abc",
- sequence: 0,
- data: { a: "test" }.to_json,
- owner: "abcdefg"
- }
+ post "/drafts.json",
+ params: {
+ draft_key: "abc",
+ sequence: 0,
+ data: { a: "test" }.to_json,
+ owner: "abcdefg",
+ }
expect(response.status).to eq(200)
expect(response.parsed_body["draft_sequence"]).to eq(0)
- post "/drafts.json", params: {
- draft_key: "abc",
- sequence: 0,
- data: { b: "test" }.to_json,
- owner: "hijklmnop"
- }
+ post "/drafts.json",
+ params: {
+ draft_key: "abc",
+ sequence: 0,
+ data: { b: "test" }.to_json,
+ owner: "hijklmnop",
+ }
expect(response.status).to eq(200)
expect(response.parsed_body["draft_sequence"]).to eq(1)
expect(DraftSequence.current(user, "abc")).to eq(1)
- post "/drafts.json", params: {
- draft_key: "abc",
- sequence: 1,
- data: { c: "test" }.to_json,
- owner: "hijklmnop"
- }
+ post "/drafts.json",
+ params: {
+ draft_key: "abc",
+ sequence: 1,
+ data: { c: "test" }.to_json,
+ owner: "hijklmnop",
+ }
expect(response.status).to eq(200)
expect(response.parsed_body["draft_sequence"]).to eq(2)
- post "/drafts.json", params: {
- draft_key: "abc",
- sequence: 2,
- data: { c: "test" }.to_json,
- owner: "abc"
- }
+ post "/drafts.json",
+ params: {
+ draft_key: "abc",
+ sequence: 2,
+ data: { c: "test" }.to_json,
+ owner: "abc",
+ }
expect(response.status).to eq(200)
expect(response.parsed_body["draft_sequence"]).to eq(3)
end
- it 'raises an error for out-of-sequence draft setting' do
+ it "raises an error for out-of-sequence draft setting" do
user = sign_in(Fabricate(:user))
seq = DraftSequence.next!(user, "abc")
Draft.set(user, "abc", seq, { b: "test" }.to_json)
- post "/drafts.json", params: {
- draft_key: "abc",
- sequence: seq - 1,
- data: { a: "test" }.to_json
- }
+ post "/drafts.json",
+ params: {
+ draft_key: "abc",
+ sequence: seq - 1,
+ data: { a: "test" }.to_json,
+ }
expect(response.status).to eq(409)
- post "/drafts.json", params: {
- draft_key: "abc",
- sequence: seq + 1,
- data: { a: "test" }.to_json
- }
+ post "/drafts.json",
+ params: {
+ draft_key: "abc",
+ sequence: seq + 1,
+ data: { a: "test" }.to_json,
+ }
expect(response.status).to eq(409)
end
end
describe "#destroy" do
- it 'destroys drafts when required' do
+ it "destroys drafts when required" do
user = sign_in(Fabricate(:user))
- Draft.set(user, 'xxx', 0, 'hi')
+ Draft.set(user, "xxx", 0, "hi")
delete "/drafts/xxx.json", params: { sequence: 0 }
expect(response.status).to eq(200)
- expect(Draft.get(user, 'xxx', 0)).to eq(nil)
+ expect(Draft.get(user, "xxx", 0)).to eq(nil)
end
end
end
diff --git a/spec/requests/email_controller_spec.rb b/spec/requests/email_controller_spec.rb
index 6cdd86267a9..57478f38fe5 100644
--- a/spec/requests/email_controller_spec.rb
+++ b/spec/requests/email_controller_spec.rb
@@ -3,20 +3,22 @@
RSpec.describe EmailController do
fab!(:user) { Fabricate(:user) }
- describe '#perform_unsubscribe' do
- it 'raises not found on invalid key' do
+ describe "#perform_unsubscribe" do
+ it "raises not found on invalid key" do
post "/email/unsubscribe/123.json"
expect(response.status).to eq(404)
end
- describe 'unsubscribe from all emails' do
+ describe "unsubscribe from all emails" do
let(:key) { UnsubscribeKey.create_key_for(user, UnsubscribeKey::ALL_TYPE) }
- it 'can fully unsubscribe' do
- user.user_option.update_columns(email_digests: true,
- email_level: UserOption.email_level_types[:never],
- email_messages_level: UserOption.email_level_types[:never],
- mailing_list_mode: true)
+ it "can fully unsubscribe" do
+ user.user_option.update_columns(
+ email_digests: true,
+ email_level: UserOption.email_level_types[:never],
+ email_messages_level: UserOption.email_level_types[:never],
+ mailing_list_mode: true,
+ )
post "/email/unsubscribe/#{key}.json", params: { unsubscribe_all: "1" }
@@ -35,36 +37,36 @@ RSpec.describe EmailController do
expect(user.user_option.mailing_list_mode).to eq(false)
end
- it 'can disable mailing list' do
+ it "can disable mailing list" do
user.user_option.update_columns(mailing_list_mode: true)
- post "/email/unsubscribe/#{key}.json",
- params: { disable_mailing_list: "1" }
+ post "/email/unsubscribe/#{key}.json", params: { disable_mailing_list: "1" }
expect(response.status).to eq(302)
expect(user.user_option.reload.mailing_list_mode).to eq(false)
end
end
- describe 'unsubscribe from digest' do
+ describe "unsubscribe from digest" do
let(:key) { UnsubscribeKey.create_key_for(user, UnsubscribeKey::DIGEST_TYPE) }
- it 'Can change digest frequency' do
- weekly_interval_minutes = 10080
+ it "Can change digest frequency" do
+ weekly_interval_minutes = 10_080
user.user_option.update_columns(email_digests: true, digest_after_minutes: 0)
post "/email/unsubscribe/#{key}.json",
- params: { digest_after_minutes: weekly_interval_minutes.to_s }
+ params: {
+ digest_after_minutes: weekly_interval_minutes.to_s,
+ }
expect(response.status).to eq(302)
expect(user.user_option.reload.digest_after_minutes).to eq(weekly_interval_minutes)
end
- it 'Can disable email digests setting frequency to zero' do
- user.user_option.update_columns(email_digests: true, digest_after_minutes: 10080)
+ it "Can disable email digests setting frequency to zero" do
+ user.user_option.update_columns(email_digests: true, digest_after_minutes: 10_080)
- post "/email/unsubscribe/#{key}.json",
- params: { digest_after_minutes: '0' }
+ post "/email/unsubscribe/#{key}.json", params: { digest_after_minutes: "0" }
expect(response.status).to eq(302)
user.user_option.reload
@@ -73,32 +75,47 @@ RSpec.describe EmailController do
end
end
- describe 'unsubscribe from a topic' do
+ describe "unsubscribe from a topic" do
fab!(:a_post) { Fabricate(:post) }
let(:key) { UnsubscribeKey.create_key_for(user, UnsubscribeKey::TOPIC_TYPE, post: a_post) }
- it 'can unwatch topic' do
- TopicUser.change(user.id, a_post.topic_id, notification_level: TopicUser.notification_levels[:watching])
+ it "can unwatch topic" do
+ TopicUser.change(
+ user.id,
+ a_post.topic_id,
+ notification_level: TopicUser.notification_levels[:watching],
+ )
post "/email/unsubscribe/#{key}.json", params: { unwatch_topic: "1" }
expect(response.status).to eq(302)
- expect(TopicUser.get(a_post.topic, user).notification_level).to eq(TopicUser.notification_levels[:tracking])
+ expect(TopicUser.get(a_post.topic, user).notification_level).to eq(
+ TopicUser.notification_levels[:tracking],
+ )
end
- it 'can mute topic' do
- TopicUser.change(user.id, a_post.topic_id, notification_level: TopicUser.notification_levels[:watching])
+ it "can mute topic" do
+ TopicUser.change(
+ user.id,
+ a_post.topic_id,
+ notification_level: TopicUser.notification_levels[:watching],
+ )
post "/email/unsubscribe/#{key}.json", params: { mute_topic: "1" }
expect(response.status).to eq(302)
- expect(TopicUser.get(a_post.topic, user).notification_level).to eq(TopicUser.notification_levels[:muted])
+ expect(TopicUser.get(a_post.topic, user).notification_level).to eq(
+ TopicUser.notification_levels[:muted],
+ )
end
- it 'can unwatch category' do
- cu = CategoryUser.create!(user_id: user.id,
- category_id: a_post.topic.category_id,
- notification_level: CategoryUser.notification_levels[:watching])
+ it "can unwatch category" do
+ cu =
+ CategoryUser.create!(
+ user_id: user.id,
+ category_id: a_post.topic.category_id,
+ notification_level: CategoryUser.notification_levels[:watching],
+ )
post "/email/unsubscribe/#{key}.json", params: { unwatch_category: "1" }
@@ -106,10 +123,13 @@ RSpec.describe EmailController do
expect(CategoryUser.find_by(id: cu.id)).to eq(nil)
end
- it 'can unwatch first post from category' do
- cu = CategoryUser.create!(user_id: user.id,
- category_id: a_post.topic.category_id,
- notification_level: CategoryUser.notification_levels[:watching_first_post])
+ it "can unwatch first post from category" do
+ cu =
+ CategoryUser.create!(
+ user_id: user.id,
+ category_id: a_post.topic.category_id,
+ notification_level: CategoryUser.notification_levels[:watching_first_post],
+ )
post "/email/unsubscribe/#{key}.json", params: { unwatch_category: "1" }
@@ -119,41 +139,41 @@ RSpec.describe EmailController do
end
end
- describe '#unsubscribed' do
- describe 'when email is invalid' do
- it 'should return the right response' do
- get '/email/unsubscribed', params: { email: 'somerandomstring' }
+ describe "#unsubscribed" do
+ describe "when email is invalid" do
+ it "should return the right response" do
+ get "/email/unsubscribed", params: { email: "somerandomstring" }
expect(response.status).to eq(404)
end
end
- describe 'when topic is public' do
+ describe "when topic is public" do
fab!(:topic) { Fabricate(:topic) }
- it 'should return the right response' do
+ it "should return the right response" do
key = SecureRandom.hex
Discourse.cache.write(key, user.email)
- get '/email/unsubscribed', params: { key: key, topic_id: topic.id }
+ get "/email/unsubscribed", params: { key: key, topic_id: topic.id }
expect(response.status).to eq(200)
expect(response.body).to include(topic.title)
end
end
- describe 'when topic is private' do
+ describe "when topic is private" do
fab!(:private_topic) { Fabricate(:private_message_topic) }
- it 'should return the right response' do
+ it "should return the right response" do
key = SecureRandom.hex
Discourse.cache.write(key, user.email)
- get '/email/unsubscribed', params: { key: key, topic_id: private_topic.id }
+ get "/email/unsubscribed", params: { key: key, topic_id: private_topic.id }
expect(response.status).to eq(200)
expect(response.body).to_not include(private_topic.title)
end
end
end
- describe '#unsubscribe' do
- it 'displays not found if key is not found' do
+ describe "#unsubscribe" do
+ it "displays not found if key is not found" do
navigate_to_unsubscribe(SecureRandom.hex)
expect(response.body).to include(CGI.escapeHTML(I18n.t("unsubscribe.not_found_description")))
@@ -167,16 +187,18 @@ RSpec.describe EmailController do
navigate_to_unsubscribe(key_without_owner)
- expect(response.body).to include(CGI.escapeHTML(I18n.t("unsubscribe.user_not_found_description")))
+ expect(response.body).to include(
+ CGI.escapeHTML(I18n.t("unsubscribe.user_not_found_description")),
+ )
end
let(:unsubscribe_key) { UnsubscribeKey.create_key_for(user, key_type, post: post) }
- context 'when unsubscribing from digest' do
+ context "when unsubscribing from digest" do
let(:key_type) { UnsubscribeKey::DIGEST_TYPE }
let(:post) { nil }
- it 'displays log out button if wrong user logged in' do
+ it "displays log out button if wrong user logged in" do
sign_in(Fabricate(:admin))
navigate_to_unsubscribe
@@ -185,8 +207,8 @@ RSpec.describe EmailController do
expect(response.body).to include(I18n.t("unsubscribe.different_user_description"))
end
- it 'displays correct label when email_digests is set to false' do
- user.user_option.update!(email_digests: false, digest_after_minutes: 10080)
+ it "displays correct label when email_digests is set to false" do
+ user.user_option.update!(email_digests: false, digest_after_minutes: 10_080)
navigate_to_unsubscribe
@@ -194,8 +216,13 @@ RSpec.describe EmailController do
expect(body).to include("Don’t send me any mail from Discourse")
end
- it 'hides unsubscribe from all checkbox when user already unsubscribed' do
- user.user_option.update!(email_digests: false, mailing_list_mode: false, email_level: 2, email_messages_level: 2)
+ it "hides unsubscribe from all checkbox when user already unsubscribed" do
+ user.user_option.update!(
+ email_digests: false,
+ mailing_list_mode: false,
+ email_level: 2,
+ email_messages_level: 2,
+ )
navigate_to_unsubscribe
@@ -203,7 +230,7 @@ RSpec.describe EmailController do
expect(body).not_to include("Don't send me any mail from Discourse")
end
- it 'correctly handles mailing list mode' do
+ it "correctly handles mailing list mode" do
SiteSetting.disable_mailing_list_mode = false
user.user_option.update_columns(mailing_list_mode: true)
@@ -222,50 +249,54 @@ RSpec.describe EmailController do
expect(response.body).not_to include(I18n.t("unsubscribe.mailing_list_mode"))
end
- it 'Lets you select the digest frequency ranging from never to half a year' do
+ it "Lets you select the digest frequency ranging from never to half a year" do
selected_digest_frequency = 0
- slow_digest_frequencies = ['weekly', 'every month', 'every six months', 'never']
+ slow_digest_frequencies = ["weekly", "every month", "every six months", "never"]
navigate_to_unsubscribe
- source = Nokogiri::HTML5::fragment(response.body)
+ source = Nokogiri::HTML5.fragment(response.body)
expect(source.css(".combobox option").map(&:inner_text)).to eq(slow_digest_frequencies)
end
- it 'Selects the next slowest frequency by default' do
- every_month_freq = 43200
- six_months_freq = 259200
+ it "Selects the next slowest frequency by default" do
+ every_month_freq = 43_200
+ six_months_freq = 259_200
user.user_option.update_columns(digest_after_minutes: every_month_freq)
navigate_to_unsubscribe
- source = Nokogiri::HTML5::fragment(response.body)
- expect(source.css(".combobox option[selected='selected']")[0]['value']).to eq(six_months_freq.to_s)
+ source = Nokogiri::HTML5.fragment(response.body)
+ expect(source.css(".combobox option[selected='selected']")[0]["value"]).to eq(
+ six_months_freq.to_s,
+ )
end
- it 'Uses never as the selected frequency if current one is six months' do
+ it "Uses never as the selected frequency if current one is six months" do
never_frequency = 0
- six_months_freq = 259200
+ six_months_freq = 259_200
user.user_option.update_columns(digest_after_minutes: six_months_freq)
navigate_to_unsubscribe
- source = Nokogiri::HTML5::fragment(response.body)
- expect(source.css(".combobox option[selected='selected']")[0]['value']).to eq(never_frequency.to_s)
+ source = Nokogiri::HTML5.fragment(response.body)
+ expect(source.css(".combobox option[selected='selected']")[0]["value"]).to eq(
+ never_frequency.to_s,
+ )
end
end
- context 'when unsubscribing from a post' do
+ context "when unsubscribing from a post" do
fab!(:post) { Fabricate(:post) }
let(:user) { post.user }
let(:key_type) { UnsubscribeKey::TOPIC_TYPE }
- it 'correctly handles watched categories' do
+ it "correctly handles watched categories" do
cu = create_category_user(:watching)
navigate_to_unsubscribe
expect(response.body).to include("unwatch_category")
- doc = Nokogiri::HTML5::fragment(response.body)
+ doc = Nokogiri::HTML5.fragment(response.body)
expect(doc.css('a.badge-wrapper[href="/c/uncategorized/1"]').size).to eq(1)
cu.destroy!
@@ -274,7 +305,7 @@ RSpec.describe EmailController do
expect(response.body).not_to include("unwatch_category")
end
- it 'correctly handles watched first post categories' do
+ it "correctly handles watched first post categories" do
cu = create_category_user(:watching_first_post)
navigate_to_unsubscribe
@@ -290,7 +321,7 @@ RSpec.describe EmailController do
CategoryUser.create!(
user_id: user.id,
category_id: post.topic.category_id,
- notification_level: CategoryUser.notification_levels[notification_level]
+ notification_level: CategoryUser.notification_levels[notification_level],
)
end
end
diff --git a/spec/requests/embed_controller_spec.rb b/spec/requests/embed_controller_spec.rb
index a926d93164e..7963526532b 100644
--- a/spec/requests/embed_controller_spec.rb
+++ b/spec/requests/embed_controller_spec.rb
@@ -6,25 +6,23 @@ RSpec.describe EmbedController do
let(:discourse_username) { "eviltrout" }
it "is 404 without an embed_url" do
- get '/embed/comments'
- expect(response.body).to match(I18n.t('embed.error'))
+ get "/embed/comments"
+ expect(response.body).to match(I18n.t("embed.error"))
end
it "raises an error with a missing host" do
- get '/embed/comments', params: { embed_url: embed_url }
- expect(response.body).to match(I18n.t('embed.error'))
+ get "/embed/comments", params: { embed_url: embed_url }
+ expect(response.body).to match(I18n.t("embed.error"))
end
describe "by topic id" do
- let(:headers) { { 'REFERER' => 'http://eviltrout.com/some-page' } }
+ let(:headers) { { "REFERER" => "http://eviltrout.com/some-page" } }
- before do
- Fabricate(:embeddable_host)
- end
+ before { Fabricate(:embeddable_host) }
it "allows a topic to be embedded by id" do
topic = Fabricate(:topic)
- get '/embed/comments', params: { topic_id: topic.id }, headers: headers
+ get "/embed/comments", params: { topic_id: topic.id }, headers: headers
expect(response.status).to eq(200)
end
end
@@ -32,8 +30,8 @@ RSpec.describe EmbedController do
describe "#info" do
context "without api key" do
it "fails" do
- get '/embed/info.json'
- expect(response.body).to match(I18n.t('embed.error'))
+ get "/embed/info.json"
+ expect(response.body).to match(I18n.t("embed.error"))
end
end
@@ -44,22 +42,32 @@ RSpec.describe EmbedController do
let(:topic_embed) { Fabricate(:topic_embed, embed_url: embed_url) }
it "returns information about the topic" do
- get '/embed/info.json',
- params: { embed_url: topic_embed.embed_url },
- headers: { HTTP_API_KEY: api_key.key, HTTP_API_USERNAME: "system" }
+ get "/embed/info.json",
+ params: {
+ embed_url: topic_embed.embed_url,
+ },
+ headers: {
+ HTTP_API_KEY: api_key.key,
+ HTTP_API_USERNAME: "system",
+ }
json = response.parsed_body
- expect(json['topic_id']).to eq(topic_embed.topic.id)
- expect(json['post_id']).to eq(topic_embed.post.id)
- expect(json['topic_slug']).to eq(topic_embed.topic.slug)
+ expect(json["topic_id"]).to eq(topic_embed.topic.id)
+ expect(json["post_id"]).to eq(topic_embed.post.id)
+ expect(json["topic_slug"]).to eq(topic_embed.topic.slug)
end
end
context "without invalid embed url" do
it "returns error response" do
- get '/embed/info.json',
- params: { embed_url: "http://nope.com" },
- headers: { HTTP_API_KEY: api_key.key, HTTP_API_USERNAME: "system" }
+ get "/embed/info.json",
+ params: {
+ embed_url: "http://nope.com",
+ },
+ headers: {
+ HTTP_API_KEY: api_key.key,
+ HTTP_API_USERNAME: "system",
+ }
json = response.parsed_body
expect(json["error_type"]).to eq("not_found")
@@ -70,27 +78,26 @@ RSpec.describe EmbedController do
describe "#topics" do
it "raises an error when not enabled" do
- get '/embed/topics?embed_id=de-1234'
+ get "/embed/topics?embed_id=de-1234"
expect(response.status).to eq(400)
end
context "when enabled" do
- before do
- SiteSetting.embed_topics_list = true
- end
+ before { SiteSetting.embed_topics_list = true }
it "raises an error with a weird id" do
- get '/embed/topics?discourse_embed_id=../asdf/-1234', headers: headers
+ get "/embed/topics?discourse_embed_id=../asdf/-1234", headers: headers
expect(response.status).to eq(400)
end
it "returns a list of topics" do
topic = Fabricate(:topic)
- get '/embed/topics?discourse_embed_id=de-1234', headers: {
- 'REFERER' => 'https://example.com/evil-trout'
- }
+ get "/embed/topics?discourse_embed_id=de-1234",
+ headers: {
+ "REFERER" => "https://example.com/evil-trout",
+ }
expect(response.status).to eq(200)
- expect(response.headers['X-Frame-Options']).to be_nil
+ expect(response.headers["X-Frame-Options"]).to be_nil
expect(response.body).to match("data-embed-id=\"de-1234\"")
expect(response.body).to match("data-topic-id=\"#{topic.id}\"")
expect(response.body).to match("data-referer=\"https://example.com/evil-trout\"")
@@ -101,11 +108,12 @@ RSpec.describe EmbedController do
good_topic = Fabricate(:topic, like_count: 1000, posts_count: 100)
TopTopic.refresh!
- get '/embed/topics?discourse_embed_id=de-1234&top_period=yearly', headers: {
- 'REFERER' => 'https://example.com/evil-trout'
- }
+ get "/embed/topics?discourse_embed_id=de-1234&top_period=yearly",
+ headers: {
+ "REFERER" => "https://example.com/evil-trout",
+ }
expect(response.status).to eq(200)
- expect(response.headers['X-Frame-Options']).to be_nil
+ expect(response.headers["X-Frame-Options"]).to be_nil
expect(response.body).to match("data-embed-id=\"de-1234\"")
expect(response.body).to match("data-topic-id=\"#{good_topic.id}\"")
expect(response.body).not_to match("data-topic-id=\"#{bad_topic.id}\"")
@@ -119,11 +127,12 @@ RSpec.describe EmbedController do
TopTopic.refresh!
TopicQuery.any_instance.expects(:list_top_for).never
- get '/embed/topics?discourse_embed_id=de-1234&top_period=decadely', headers: {
- 'REFERER' => 'https://example.com/evil-trout'
- }
+ get "/embed/topics?discourse_embed_id=de-1234&top_period=decadely",
+ headers: {
+ "REFERER" => "https://example.com/evil-trout",
+ }
expect(response.status).to eq(200)
- expect(response.headers['X-Frame-Options']).to be_nil
+ expect(response.headers["X-Frame-Options"]).to be_nil
expect(response.body).to match("data-embed-id=\"de-1234\"")
expect(response.body).to match("data-topic-id=\"#{good_topic.id}\"")
expect(response.body).to match("data-topic-id=\"#{topic1.id}\"")
@@ -133,49 +142,49 @@ RSpec.describe EmbedController do
it "wraps the list in a custom class" do
topic = Fabricate(:topic)
- get '/embed/topics?discourse_embed_id=de-1234&embed_class=my-special-class', headers: {
- 'REFERER' => 'https://example.com/evil-trout'
- }
+ get "/embed/topics?discourse_embed_id=de-1234&embed_class=my-special-class",
+ headers: {
+ "REFERER" => "https://example.com/evil-trout",
+ }
expect(response.status).to eq(200)
- expect(response.headers['X-Frame-Options']).to be_nil
+ expect(response.headers["X-Frame-Options"]).to be_nil
expect(response.body).to match("class='topics-list my-special-class'")
end
it "returns no referer if not supplied" do
- get '/embed/topics?discourse_embed_id=de-1234'
+ get "/embed/topics?discourse_embed_id=de-1234"
expect(response.status).to eq(200)
expect(response.body).to match("data-referer=\"\"")
end
it "returns * for the referer if `embed_any_origin` is set" do
SiteSetting.embed_any_origin = true
- get '/embed/topics?discourse_embed_id=de-1234'
+ get "/embed/topics?discourse_embed_id=de-1234"
expect(response.status).to eq(200)
expect(response.body).to match("data-referer=\"\\*\"")
end
it "disallows indexing the embed topic list" do
topic = Fabricate(:topic)
- get '/embed/topics?discourse_embed_id=de-1234', headers: {
- 'REFERER' => 'https://example.com/evil-trout'
- }
+ get "/embed/topics?discourse_embed_id=de-1234",
+ headers: {
+ "REFERER" => "https://example.com/evil-trout",
+ }
expect(response.status).to eq(200)
- expect(response.headers['X-Robots-Tag']).to match(/noindex/)
+ expect(response.headers["X-Robots-Tag"]).to match(/noindex/)
end
end
end
context "with a host" do
let!(:embeddable_host) { Fabricate(:embeddable_host) }
- let(:headers) { { 'REFERER' => embed_url } }
+ let(:headers) { { "REFERER" => embed_url } }
- before do
- Jobs.run_immediately!
- end
+ before { Jobs.run_immediately! }
it "doesn't raises an error with no referer" do
- get '/embed/comments', params: { embed_url: embed_url }
- expect(response.body).not_to match(I18n.t('embed.error'))
+ get "/embed/comments", params: { embed_url: embed_url }
+ expect(response.body).not_to match(I18n.t("embed.error"))
end
it "includes CSS from embedded_scss field" do
@@ -187,13 +196,13 @@ RSpec.describe EmbedController do
name: "embedded_scss",
target_id: 0,
type_id: 1,
- value: ".test-osama-15 {\n" + " color: red;\n" + "}\n"
+ value: ".test-osama-15 {\n" + " color: red;\n" + "}\n",
)
topic_embed = Fabricate(:topic_embed, embed_url: embed_url)
post = Fabricate(:post, topic: topic_embed.topic)
- get '/embed/comments', params: { embed_url: embed_url }, headers: headers
+ get "/embed/comments", params: { embed_url: embed_url }, headers: headers
html = Nokogiri::HTML5.fragment(response.body)
css_link = html.at("link[data-target=embedded_theme]").attribute("href").value
@@ -206,7 +215,7 @@ RSpec.describe EmbedController do
context "with success" do
after do
expect(response.status).to eq(200)
- expect(response.headers['X-Frame-Options']).to be_nil
+ expect(response.headers["X-Frame-Options"]).to be_nil
end
it "tells the topic retriever to work when no previous embed is found" do
@@ -214,30 +223,30 @@ RSpec.describe EmbedController do
retriever = mock
TopicRetriever.expects(:new).returns(retriever)
retriever.expects(:retrieve)
- get '/embed/comments', params: { embed_url: embed_url }, headers: headers
+ get "/embed/comments", params: { embed_url: embed_url }, headers: headers
end
it "displays the right view" do
topic_embed = Fabricate(:topic_embed, embed_url: embed_url)
- get '/embed/comments', params: { embed_url: embed_url_secure }, headers: headers
+ get "/embed/comments", params: { embed_url: embed_url_secure }, headers: headers
- expect(response.body).to match(I18n.t('embed.start_discussion'))
+ expect(response.body).to match(I18n.t("embed.start_discussion"))
end
it "creates a topic view when a topic_id is found" do
topic_embed = Fabricate(:topic_embed, embed_url: embed_url)
post = Fabricate(:post, topic: topic_embed.topic)
- get '/embed/comments', params: { embed_url: embed_url }, headers: headers
+ get "/embed/comments", params: { embed_url: embed_url }, headers: headers
- expect(response.body).to match(I18n.t('embed.continue'))
+ expect(response.body).to match(I18n.t("embed.continue"))
expect(response.body).to match(post.cooked)
expect(response.body).to match("1 reply ")
small_action = Fabricate(:small_action, topic: topic_embed.topic)
- get '/embed/comments', params: { embed_url: embed_url }, headers: headers
+ get "/embed/comments", params: { embed_url: embed_url }, headers: headers
expect(response.body).not_to match("post-#{small_action.id}")
expect(response.body).to match("1 reply ")
@@ -246,73 +255,97 @@ RSpec.describe EmbedController do
it "provides the topic retriever with the discourse username when provided" do
retriever = mock
retriever.expects(:retrieve).returns(nil)
- TopicRetriever.expects(:new)
+ TopicRetriever
+ .expects(:new)
.with(embed_url, has_entry(author_username: discourse_username))
.returns(retriever)
- get '/embed/comments',
- params: { embed_url: embed_url, discourse_username: discourse_username },
- headers: headers
+ get "/embed/comments",
+ params: {
+ embed_url: embed_url,
+ discourse_username: discourse_username,
+ },
+ headers: headers
end
-
end
end
context "with multiple hosts" do
before do
Fabricate(:embeddable_host)
- Fabricate(:embeddable_host, host: 'http://discourse.org')
- Fabricate(:embeddable_host, host: 'https://example.com/1234', class_name: 'example')
+ Fabricate(:embeddable_host, host: "http://discourse.org")
+ Fabricate(:embeddable_host, host: "https://example.com/1234", class_name: "example")
end
context "with success" do
it "works with the first host" do
- get '/embed/comments',
- params: { embed_url: embed_url },
- headers: { 'REFERER' => "http://eviltrout.com/wat/1-2-3.html" }
+ get "/embed/comments",
+ params: {
+ embed_url: embed_url,
+ },
+ headers: {
+ "REFERER" => "http://eviltrout.com/wat/1-2-3.html",
+ }
expect(response.status).to eq(200)
end
it "works with the second host" do
- get '/embed/comments',
- params: { embed_url: embed_url },
- headers: { 'REFERER' => "http://eviltrout.com/wat/1-2-3.html" }
+ get "/embed/comments",
+ params: {
+ embed_url: embed_url,
+ },
+ headers: {
+ "REFERER" => "http://eviltrout.com/wat/1-2-3.html",
+ }
expect(response.status).to eq(200)
end
it "works with a host with a path" do
- get '/embed/comments',
- params: { embed_url: embed_url },
- headers: { 'REFERER' => "https://example.com/some-other-path" }
+ get "/embed/comments",
+ params: {
+ embed_url: embed_url,
+ },
+ headers: {
+ "REFERER" => "https://example.com/some-other-path",
+ }
expect(response.status).to eq(200)
end
it "contains custom class name" do
- get '/embed/comments',
- params: { embed_url: embed_url },
- headers: { 'REFERER' => "https://example.com/some-other-path" }
+ get "/embed/comments",
+ params: {
+ embed_url: embed_url,
+ },
+ headers: {
+ "REFERER" => "https://example.com/some-other-path",
+ }
expect(response.body).to match('class="example"')
end
end
context "with CSP frame-ancestors enabled" do
- before do
- SiteSetting.content_security_policy_frame_ancestors = true
- end
+ before { SiteSetting.content_security_policy_frame_ancestors = true }
it "includes all the hosts" do
- get '/embed/comments',
- params: { embed_url: embed_url },
- headers: { 'REFERER' => "http://eviltrout.com/wat/1-2-3.html" }
+ get "/embed/comments",
+ params: {
+ embed_url: embed_url,
+ },
+ headers: {
+ "REFERER" => "http://eviltrout.com/wat/1-2-3.html",
+ }
- expect(response.headers['Content-Security-Policy']).to match(/frame-ancestors.*https:\/\/discourse\.org/)
- expect(response.headers['Content-Security-Policy']).to match(/frame-ancestors.*https:\/\/example\.com/)
+ expect(response.headers["Content-Security-Policy"]).to match(
+ %r{frame-ancestors.*https://discourse\.org},
+ )
+ expect(response.headers["Content-Security-Policy"]).to match(
+ %r{frame-ancestors.*https://example\.com},
+ )
end
end
-
end
end
diff --git a/spec/requests/exceptions_controller_spec.rb b/spec/requests/exceptions_controller_spec.rb
index e7d083c3b15..28ba04be81d 100644
--- a/spec/requests/exceptions_controller_spec.rb
+++ b/spec/requests/exceptions_controller_spec.rb
@@ -9,31 +9,21 @@ RSpec.describe ExceptionsController do
expect(response.body).to have_tag(
"title",
- text: "#{I18n.t("page_not_found.page_title")} - #{SiteSetting.title}"
+ text: "#{I18n.t("page_not_found.page_title")} - #{SiteSetting.title}",
)
- expect(response.body).to have_tag(
- "img",
- with: {
- src: SiteSetting.site_logo_url
- }
- )
+ expect(response.body).to have_tag("img", with: { src: SiteSetting.site_logo_url })
end
describe "text site logo" do
- before do
- SiteSetting.logo = nil
- end
+ before { SiteSetting.logo = nil }
it "should return the right response" do
get "/404"
expect(response.status).to eq(404)
- expect(response.body).to have_tag(
- "h2",
- text: SiteSetting.title
- )
+ expect(response.body).to have_tag("h2", text: SiteSetting.title)
end
end
end
diff --git a/spec/requests/export_csv_controller_spec.rb b/spec/requests/export_csv_controller_spec.rb
index 27322933b43..5c106842a5b 100644
--- a/spec/requests/export_csv_controller_spec.rb
+++ b/spec/requests/export_csv_controller_spec.rb
@@ -76,25 +76,25 @@ RSpec.describe ExportCsvController do
end
end
- context 'while logged in as a moderator' do
+ context "while logged in as a moderator" do
fab!(:moderator) { Fabricate(:moderator) }
before { sign_in(moderator) }
- describe '#export_entity' do
- it 'does not allow moderators to export user_list' do
- post '/export_csv/export_entity.json', params: { entity: 'user_list' }
+ describe "#export_entity" do
+ it "does not allow moderators to export user_list" do
+ post "/export_csv/export_entity.json", params: { entity: "user_list" }
expect(response.status).to eq(422)
end
- it 'allows moderator to export other entities' do
- post "/export_csv/export_entity.json", params: { entity: 'staff_action' }
+ it "allows moderator to export other entities" do
+ post "/export_csv/export_entity.json", params: { entity: "staff_action" }
expect(response.status).to eq(200)
expect(Jobs::ExportCsvFile.jobs.size).to eq(1)
- job_data = Jobs::ExportCsvFile.jobs.first['args'].first
- expect(job_data['entity']).to eq('staff_action')
- expect(job_data['user_id']).to eq(moderator.id)
+ job_data = Jobs::ExportCsvFile.jobs.first["args"].first
+ expect(job_data["entity"]).to eq("staff_action")
+ expect(job_data["user_id"]).to eq(moderator.id)
end
end
end
diff --git a/spec/requests/extra_locales_controller_spec.rb b/spec/requests/extra_locales_controller_spec.rb
index d194356e7db..35d554b6a83 100644
--- a/spec/requests/extra_locales_controller_spec.rb
+++ b/spec/requests/extra_locales_controller_spec.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
RSpec.describe ExtraLocalesController do
- describe '#show' do
+ describe "#show" do
it "won't work with a weird parameter" do
get "/extra-locales/-invalid..character!!"
expect(response.status).to eq(404)
@@ -21,7 +21,7 @@ RSpec.describe ExtraLocalesController do
end
it "requires a valid version" do
- get "/extra-locales/overrides", params: { v: 'a' }
+ get "/extra-locales/overrides", params: { v: "a" }
expect(response.status).to eq(400)
get "/extra-locales/overrides?v[foo]=1"
@@ -33,13 +33,13 @@ RSpec.describe ExtraLocalesController do
before { sign_in(moderator) }
it "caches for 1 year if version is provided and it matches current hash" do
- get "/extra-locales/admin", params: { v: ExtraLocalesController.bundle_js_hash('admin') }
+ get "/extra-locales/admin", params: { v: ExtraLocalesController.bundle_js_hash("admin") }
expect(response.status).to eq(200)
expect(response.headers["Cache-Control"]).to eq("max-age=31556952, public, immutable")
end
it "does not cache at all if version is invalid" do
- get "/extra-locales/admin", params: { v: 'a' * 32 }
+ get "/extra-locales/admin", params: { v: "a" * 32 }
expect(response.status).to eq(200)
expect(response.headers["Cache-Control"]).not_to include("max-age", "public", "immutable")
end
@@ -47,22 +47,24 @@ RSpec.describe ExtraLocalesController do
context "with plugin" do
before do
JsLocaleHelper.clear_cache!
- JsLocaleHelper.expects(:plugin_translations)
+ JsLocaleHelper
+ .expects(:plugin_translations)
.with(any_of("en", "en_GB"))
- .returns("admin_js" => {
- "admin" => {
- "site_settings" => {
- "categories" => {
- "github_badges" => "GitHub Badges"
- }
- }
- }
- }).at_least_once
+ .returns(
+ "admin_js" => {
+ "admin" => {
+ "site_settings" => {
+ "categories" => {
+ "github_badges" => "GitHub Badges",
+ },
+ },
+ },
+ },
+ )
+ .at_least_once
end
- after do
- JsLocaleHelper.clear_cache!
- end
+ after { JsLocaleHelper.clear_cache! }
it "includes plugin translations" do
get "/extra-locales/admin"
@@ -76,9 +78,12 @@ RSpec.describe ExtraLocalesController do
after { I18n.reload! }
it "works for anonymous users" do
- TranslationOverride.upsert!(I18n.locale, 'js.some_key', 'client-side translation')
+ TranslationOverride.upsert!(I18n.locale, "js.some_key", "client-side translation")
- get "/extra-locales/overrides", params: { v: ExtraLocalesController.bundle_js_hash('overrides') }
+ get "/extra-locales/overrides",
+ params: {
+ v: ExtraLocalesController.bundle_js_hash("overrides"),
+ }
expect(response.status).to eq(200)
expect(response.headers["Cache-Control"]).to eq("max-age=31556952, public, immutable")
end
@@ -91,11 +96,19 @@ RSpec.describe ExtraLocalesController do
context "with translations" do
it "returns the correct translations" do
- TranslationOverride.upsert!(I18n.locale, 'js.some_key', 'client-side translation')
- TranslationOverride.upsert!(I18n.locale, 'js.client_MF', '{NUM_RESULTS, plural, one {1 result} other {many} }')
- TranslationOverride.upsert!(I18n.locale, 'admin_js.another_key', 'admin client js')
- TranslationOverride.upsert!(I18n.locale, 'server.some_key', 'server-side translation')
- TranslationOverride.upsert!(I18n.locale, 'server.some_MF', '{NUM_RESULTS, plural, one {1 result} other {many} }')
+ TranslationOverride.upsert!(I18n.locale, "js.some_key", "client-side translation")
+ TranslationOverride.upsert!(
+ I18n.locale,
+ "js.client_MF",
+ "{NUM_RESULTS, plural, one {1 result} other {many} }",
+ )
+ TranslationOverride.upsert!(I18n.locale, "admin_js.another_key", "admin client js")
+ TranslationOverride.upsert!(I18n.locale, "server.some_key", "server-side translation")
+ TranslationOverride.upsert!(
+ I18n.locale,
+ "server.some_MF",
+ "{NUM_RESULTS, plural, one {1 result} other {many} }",
+ )
get "/extra-locales/overrides"
expect(response.status).to eq(200)
@@ -106,20 +119,42 @@ RSpec.describe ExtraLocalesController do
ctx.eval(response.body)
expect(ctx.eval("typeof I18n._mfOverrides['js.client_MF']")).to eq("function")
- expect(ctx.eval("I18n._overrides['#{I18n.locale}']['js.some_key']")).to eq("client-side translation")
- expect(ctx.eval("I18n._overrides['#{I18n.locale}']['js.client_MF'] === undefined")).to eq(true)
- expect(ctx.eval("I18n._overrides['#{I18n.locale}']['admin_js.another_key']")).to eq("admin client js")
+ expect(ctx.eval("I18n._overrides['#{I18n.locale}']['js.some_key']")).to eq(
+ "client-side translation",
+ )
+ expect(ctx.eval("I18n._overrides['#{I18n.locale}']['js.client_MF'] === undefined")).to eq(
+ true,
+ )
+ expect(ctx.eval("I18n._overrides['#{I18n.locale}']['admin_js.another_key']")).to eq(
+ "admin client js",
+ )
end
it "returns overrides from fallback locale" do
- TranslationOverride.upsert!(:en, 'js.some_key', 'some key (en)')
- TranslationOverride.upsert!(:fr, 'js.some_key', 'some key (fr)')
- TranslationOverride.upsert!(:en, 'js.only_en', 'only English')
- TranslationOverride.upsert!(:fr, 'js.only_fr', 'only French')
- TranslationOverride.upsert!(:en, 'js.some_client_MF', '{NUM_RESULTS, plural, one {1 result} other {many} }')
- TranslationOverride.upsert!(:fr, 'js.some_client_MF', '{NUM_RESULTS, plural, one {1 result} other {many} }')
- TranslationOverride.upsert!(:en, 'js.only_en_MF', '{NUM_RESULTS, plural, one {1 result} other {many} }')
- TranslationOverride.upsert!(:fr, 'js.only_fr_MF', '{NUM_RESULTS, plural, one {1 result} other {many} }')
+ TranslationOverride.upsert!(:en, "js.some_key", "some key (en)")
+ TranslationOverride.upsert!(:fr, "js.some_key", "some key (fr)")
+ TranslationOverride.upsert!(:en, "js.only_en", "only English")
+ TranslationOverride.upsert!(:fr, "js.only_fr", "only French")
+ TranslationOverride.upsert!(
+ :en,
+ "js.some_client_MF",
+ "{NUM_RESULTS, plural, one {1 result} other {many} }",
+ )
+ TranslationOverride.upsert!(
+ :fr,
+ "js.some_client_MF",
+ "{NUM_RESULTS, plural, one {1 result} other {many} }",
+ )
+ TranslationOverride.upsert!(
+ :en,
+ "js.only_en_MF",
+ "{NUM_RESULTS, plural, one {1 result} other {many} }",
+ )
+ TranslationOverride.upsert!(
+ :fr,
+ "js.only_fr_MF",
+ "{NUM_RESULTS, plural, one {1 result} other {many} }",
+ )
SiteSetting.allow_user_locale = true
user = Fabricate(:user, locale: :fr)
@@ -134,10 +169,16 @@ RSpec.describe ExtraLocalesController do
overrides = ctx.eval("I18n._overrides")
expect(overrides.keys).to contain_exactly("en", "fr")
- expect(overrides["en"]).to eq({ 'js.only_en' => 'only English' })
- expect(overrides["fr"]).to eq({ 'js.some_key' => 'some key (fr)', 'js.only_fr' => 'only French' })
+ expect(overrides["en"]).to eq({ "js.only_en" => "only English" })
+ expect(overrides["fr"]).to eq(
+ { "js.some_key" => "some key (fr)", "js.only_fr" => "only French" },
+ )
- expect(ctx.eval("Object.keys(I18n._mfOverrides)")).to contain_exactly("js.some_client_MF", "js.only_en_MF", "js.only_fr_MF")
+ expect(ctx.eval("Object.keys(I18n._mfOverrides)")).to contain_exactly(
+ "js.some_client_MF",
+ "js.only_en_MF",
+ "js.only_fr_MF",
+ )
end
end
end
@@ -179,14 +220,14 @@ RSpec.describe ExtraLocalesController do
it "returns false if there are no client-side translation overrides" do
expect(ExtraLocalesController.client_overrides_exist?).to eq(false)
- TranslationOverride.upsert!(I18n.locale, 'server.some_key', 'server-side translation')
+ TranslationOverride.upsert!(I18n.locale, "server.some_key", "server-side translation")
expect(ExtraLocalesController.client_overrides_exist?).to eq(false)
end
it "returns true if there are client-side translation overrides" do
expect(ExtraLocalesController.client_overrides_exist?).to eq(false)
- TranslationOverride.upsert!(I18n.locale, 'js.some_key', 'client-side translation')
+ TranslationOverride.upsert!(I18n.locale, "js.some_key", "client-side translation")
expect(ExtraLocalesController.client_overrides_exist?).to eq(true)
end
end
diff --git a/spec/requests/finish_installation_controller_spec.rb b/spec/requests/finish_installation_controller_spec.rb
index 1bbdac01cfc..6e0ae2abfc3 100644
--- a/spec/requests/finish_installation_controller_spec.rb
+++ b/spec/requests/finish_installation_controller_spec.rb
@@ -1,11 +1,9 @@
# frozen_string_literal: true
RSpec.describe FinishInstallationController do
- describe '#index' do
+ describe "#index" do
context "when has_login_hint is false" do
- before do
- SiteSetting.has_login_hint = false
- end
+ before { SiteSetting.has_login_hint = false }
it "doesn't allow access" do
get "/finish-installation"
@@ -14,9 +12,7 @@ RSpec.describe FinishInstallationController do
end
context "when has_login_hint is true" do
- before do
- SiteSetting.has_login_hint = true
- end
+ before { SiteSetting.has_login_hint = true }
it "allows access" do
get "/finish-installation"
@@ -25,11 +21,9 @@ RSpec.describe FinishInstallationController do
end
end
- describe '#register' do
+ describe "#register" do
context "when has_login_hint is false" do
- before do
- SiteSetting.has_login_hint = false
- end
+ before { SiteSetting.has_login_hint = false }
it "doesn't allow access" do
get "/finish-installation/register"
@@ -49,75 +43,72 @@ RSpec.describe FinishInstallationController do
end
it "raises an error when the email is not in the allowed list" do
- post "/finish-installation/register.json", params: {
- email: 'notrobin@example.com',
- username: 'eviltrout',
- password: 'disismypasswordokay'
- }
+ post "/finish-installation/register.json",
+ params: {
+ email: "notrobin@example.com",
+ username: "eviltrout",
+ password: "disismypasswordokay",
+ }
expect(response.status).to eq(400)
end
it "doesn't redirect when fields are wrong" do
- post "/finish-installation/register", params: {
- email: 'robin@example.com',
- username: '',
- password: 'disismypasswordokay'
- }
+ post "/finish-installation/register",
+ params: {
+ email: "robin@example.com",
+ username: "",
+ password: "disismypasswordokay",
+ }
expect(response).not_to be_redirect
end
context "with working params" do
let(:params) do
- {
- email: 'robin@example.com',
- username: 'eviltrout',
- password: 'disismypasswordokay'
- }
+ { email: "robin@example.com", username: "eviltrout", password: "disismypasswordokay" }
end
it "registers the admin when the email is in the list" do
- expect do
- post "/finish-installation/register.json", params: params
- end.to change { Jobs::CriticalUserEmail.jobs.size }.by(1)
+ expect do post "/finish-installation/register.json", params: params end.to change {
+ Jobs::CriticalUserEmail.jobs.size
+ }.by(1)
expect(response).to be_redirect
- expect(User.where(username: 'eviltrout').exists?).to eq(true)
+ expect(User.where(username: "eviltrout").exists?).to eq(true)
end
it "automatically resends the signup email when the user already exists" do
- expect do
- post "/finish-installation/register.json", params: params
- end.to change { Jobs::CriticalUserEmail.jobs.size }.by(1)
+ expect do post "/finish-installation/register.json", params: params end.to change {
+ Jobs::CriticalUserEmail.jobs.size
+ }.by(1)
- expect(User.where(username: 'eviltrout').exists?).to eq(true)
+ expect(User.where(username: "eviltrout").exists?).to eq(true)
- expect do
- post "/finish-installation/register.json", params: params
- end.to change { Jobs::CriticalUserEmail.jobs.size }.by(1)
+ expect do post "/finish-installation/register.json", params: params end.to change {
+ Jobs::CriticalUserEmail.jobs.size
+ }.by(1)
expect(response).to be_redirect
- expect(User.where(username: 'eviltrout').exists?).to eq(true)
+ expect(User.where(username: "eviltrout").exists?).to eq(true)
end
end
it "sets the admins trust level" do
- post "/finish-installation/register.json", params: {
- email: 'robin@example.com',
- username: 'eviltrout',
- password: 'disismypasswordokay'
- }
+ post "/finish-installation/register.json",
+ params: {
+ email: "robin@example.com",
+ username: "eviltrout",
+ password: "disismypasswordokay",
+ }
- expect(User.find_by(username: 'eviltrout').trust_level).to eq 1
+ expect(User.find_by(username: "eviltrout").trust_level).to eq 1
end
end
end
- describe '#confirm_email' do
+ describe "#confirm_email" do
context "when has_login_hint is false" do
- before do
- SiteSetting.has_login_hint = false
- end
+ before { SiteSetting.has_login_hint = false }
it "shows the page" do
get "/finish-installation/confirm-email"
@@ -126,22 +117,23 @@ RSpec.describe FinishInstallationController do
end
end
- describe '#resend_email' do
+ describe "#resend_email" do
before do
SiteSetting.has_login_hint = true
GlobalSetting.stubs(:developer_emails).returns("robin@example.com")
- post "/finish-installation/register", params: {
- email: 'robin@example.com',
- username: 'eviltrout',
- password: 'disismypasswordokay'
- }
+ post "/finish-installation/register",
+ params: {
+ email: "robin@example.com",
+ username: "eviltrout",
+ password: "disismypasswordokay",
+ }
end
it "resends the email" do
- expect do
- put "/finish-installation/resend-email"
- end.to change { Jobs::CriticalUserEmail.jobs.size }.by(1)
+ expect do put "/finish-installation/resend-email" end.to change {
+ Jobs::CriticalUserEmail.jobs.size
+ }.by(1)
expect(response.status).to eq(200)
end
diff --git a/spec/requests/forums_controller_spec.rb b/spec/requests/forums_controller_spec.rb
index fc94c012023..4bd141b3f8c 100644
--- a/spec/requests/forums_controller_spec.rb
+++ b/spec/requests/forums_controller_spec.rb
@@ -1,26 +1,25 @@
# frozen_string_literal: true
RSpec.describe ForumsController do
-
describe "read only header" do
it "returns no read only header by default" do
get "/srv/status"
expect(response.status).to eq(200)
- expect(response.headers['Discourse-Readonly']).to eq(nil)
+ expect(response.headers["Discourse-Readonly"]).to eq(nil)
end
it "returns a readonly header if the site is read only" do
Discourse.received_postgres_readonly!
get "/srv/status"
expect(response.status).to eq(200)
- expect(response.headers['Discourse-Readonly']).to eq('true')
+ expect(response.headers["Discourse-Readonly"]).to eq("true")
end
it "returns a readonly header if the site is in staff-writes-only mode" do
Discourse.stubs(:staff_writes_only_mode?).returns(true)
get "/srv/status"
expect(response.status).to eq(200)
- expect(response.headers['Discourse-Readonly']).to eq('true')
+ expect(response.headers["Discourse-Readonly"]).to eq("true")
end
end
@@ -50,5 +49,4 @@ RSpec.describe ForumsController do
expect(response.status).to eq(200)
end
end
-
end
diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rb
index 33ff0daf1c5..0e108963aee 100644
--- a/spec/requests/groups_controller_spec.rb
+++ b/spec/requests/groups_controller_spec.rb
@@ -9,9 +9,9 @@ RSpec.describe GroupsController do
fab!(:admin) { Fabricate(:admin) }
fab!(:moderator) { Fabricate(:moderator) }
- describe '#index' do
+ describe "#index" do
let(:staff_group) do
- Fabricate(:group, name: 'staff_group', visibility_level: Group.visibility_levels[:staff])
+ Fabricate(:group, name: "staff_group", visibility_level: Group.visibility_levels[:staff])
end
it "ensures that groups can be paginated" do
@@ -38,31 +38,29 @@ RSpec.describe GroupsController do
expect(body["load_more_groups"]).to eq("/groups?page=2")
end
- context 'when group directory is disabled' do
- before do
- SiteSetting.enable_group_directory = false
- end
+ context "when group directory is disabled" do
+ before { SiteSetting.enable_group_directory = false }
- it 'should deny access for an anon' do
+ it "should deny access for an anon" do
get "/groups.json"
expect(response.status).to eq(403)
end
- it 'should deny access for a normal user' do
+ it "should deny access for a normal user" do
sign_in(user)
get "/groups.json"
expect(response.status).to eq(403)
end
- it 'should allow access for an admin' do
+ it "should allow access for an admin" do
sign_in(admin)
get "/groups.json"
expect(response.status).to eq(200)
end
- it 'should allow access for a moderator' do
+ it "should allow access for a moderator" do
sign_in(moderator)
get "/groups.json"
@@ -70,11 +68,11 @@ RSpec.describe GroupsController do
end
end
- context 'with searchable' do
- it 'should return the searched groups' do
- testing_group = Fabricate(:group, name: 'testing')
+ context "with searchable" do
+ it "should return the searched groups" do
+ testing_group = Fabricate(:group, name: "testing")
- get "/groups.json", params: { filter: 'test' }
+ get "/groups.json", params: { filter: "test" }
expect(response.status).to eq(200)
@@ -85,13 +83,15 @@ RSpec.describe GroupsController do
end
end
- context 'with sortable' do
+ context "with sortable" do
before do
group
sign_in(user)
end
- fab!(:group_with_2_users) { Fabricate(:group, name: "other_group", users: [user, other_user]) }
+ fab!(:group_with_2_users) do
+ Fabricate(:group, name: "other_group", users: [user, other_user])
+ end
context "with default (descending) order" do
it "sorts by name" do
@@ -101,9 +101,9 @@ RSpec.describe GroupsController do
body = response.parsed_body
- expect(body["groups"].map { |g| g["id"] }).to eq([
- group_with_2_users.id, group.id, moderator_group_id
- ])
+ expect(body["groups"].map { |g| g["id"] }).to eq(
+ [group_with_2_users.id, group.id, moderator_group_id],
+ )
expect(body["load_more_groups"]).to eq("/groups?order=name&page=1")
end
@@ -115,9 +115,9 @@ RSpec.describe GroupsController do
body = response.parsed_body
- expect(body["groups"].map { |g| g["id"] }).to eq([
- group_with_2_users.id, moderator_group_id, group.id
- ])
+ expect(body["groups"].map { |g| g["id"] }).to eq(
+ [group_with_2_users.id, moderator_group_id, group.id],
+ )
expect(body["load_more_groups"]).to eq("/groups?order=user_count&page=1")
end
@@ -131,9 +131,9 @@ RSpec.describe GroupsController do
body = response.parsed_body
- expect(body["groups"].map { |g| g["id"] }).to eq([
- moderator_group_id, group.id, group_with_2_users.id
- ])
+ expect(body["groups"].map { |g| g["id"] }).to eq(
+ [moderator_group_id, group.id, group_with_2_users.id],
+ )
expect(body["load_more_groups"]).to eq("/groups?asc=true&order=name&page=1")
end
@@ -145,16 +145,16 @@ RSpec.describe GroupsController do
body = response.parsed_body
- expect(body["groups"].map { |g| g["id"] }).to eq([
- moderator_group_id, group.id, group_with_2_users.id
- ])
+ expect(body["groups"].map { |g| g["id"] }).to eq(
+ [moderator_group_id, group.id, group_with_2_users.id],
+ )
expect(body["load_more_groups"]).to eq("/groups?asc=true&order=user_count&page=1")
end
end
end
- it 'should return the right response' do
+ it "should return the right response" do
group
staff_group
@@ -171,38 +171,48 @@ RSpec.describe GroupsController do
expect(body["load_more_groups"]).to eq("/groups?page=1")
expect(body["total_rows_groups"]).to eq(1)
expect(body["extras"]["type_filters"].map(&:to_sym)).to eq(
- described_class::TYPE_FILTERS.keys - [:my, :owner, :automatic, :non_automatic]
+ described_class::TYPE_FILTERS.keys - %i[my owner automatic non_automatic],
)
end
- context 'when viewing groups of another user' do
- describe 'when an invalid username is given' do
- it 'should return the right response' do
+ context "when viewing groups of another user" do
+ describe "when an invalid username is given" do
+ it "should return the right response" do
group
- get "/groups.json", params: { username: 'asdasd' }
+ get "/groups.json", params: { username: "asdasd" }
expect(response.status).to eq(404)
end
end
- it 'should return the right response' do
+ it "should return the right response" do
u = Fabricate(:user)
m = Fabricate(:user)
o = Fabricate(:user)
levels = Group.visibility_levels.values
- levels.product(levels).each { |group_level, members_level|
- g = Fabricate(:group,
- name: "#{group_level}_#{members_level}",
- visibility_level: group_level,
- members_visibility_level: members_level,
- users: [u]
- )
+ levels
+ .product(levels)
+ .each do |group_level, members_level|
+ g =
+ Fabricate(
+ :group,
+ name: "#{group_level}_#{members_level}",
+ visibility_level: group_level,
+ members_visibility_level: members_level,
+ users: [u],
+ )
- g.add(m) if group_level == Group.visibility_levels[:members] || members_level == Group.visibility_levels[:members]
- g.add_owner(o) if group_level == Group.visibility_levels[:owners] || members_level == Group.visibility_levels[:owners]
- }
+ if group_level == Group.visibility_levels[:members] ||
+ members_level == Group.visibility_levels[:members]
+ g.add(m)
+ end
+ if group_level == Group.visibility_levels[:owners] ||
+ members_level == Group.visibility_levels[:owners]
+ g.add_owner(o)
+ end
+ end
# anonymous user
get "/groups.json", params: { username: u.username }
@@ -225,7 +235,17 @@ RSpec.describe GroupsController do
expect(response.status).to eq(200)
group_names = response.parsed_body["groups"].map { |g| g["name"] }
- expect(group_names).to contain_exactly("0_0", "0_1", "0_2", "1_0", "1_1", "1_2", "2_0", "2_1", "2_2")
+ expect(group_names).to contain_exactly(
+ "0_0",
+ "0_1",
+ "0_2",
+ "1_0",
+ "1_1",
+ "1_2",
+ "2_0",
+ "2_1",
+ "2_2",
+ )
# owner
sign_in(o)
@@ -233,7 +253,21 @@ RSpec.describe GroupsController do
expect(response.status).to eq(200)
group_names = response.parsed_body["groups"].map { |g| g["name"] }
- expect(group_names).to contain_exactly("0_0", "0_1", "0_4", "1_0", "1_1", "1_4", "2_4", "3_4", "4_0", "4_1", "4_2", "4_3", "4_4")
+ expect(group_names).to contain_exactly(
+ "0_0",
+ "0_1",
+ "0_4",
+ "1_0",
+ "1_1",
+ "1_4",
+ "2_4",
+ "3_4",
+ "4_0",
+ "4_1",
+ "4_2",
+ "4_3",
+ "4_4",
+ )
# moderator
sign_in(moderator)
@@ -241,7 +275,24 @@ RSpec.describe GroupsController do
expect(response.status).to eq(200)
group_names = response.parsed_body["groups"].map { |g| g["name"] }
- expect(group_names).to contain_exactly("0_0", "0_1", "0_2", "0_3", "1_0", "1_1", "1_2", "1_3", "2_0", "2_1", "2_2", "2_3", "3_0", "3_1", "3_2", "3_3")
+ expect(group_names).to contain_exactly(
+ "0_0",
+ "0_1",
+ "0_2",
+ "0_3",
+ "1_0",
+ "1_1",
+ "1_2",
+ "1_3",
+ "2_0",
+ "2_1",
+ "2_2",
+ "2_3",
+ "3_0",
+ "3_1",
+ "3_2",
+ "3_3",
+ )
# admin
sign_in(admin)
@@ -254,14 +305,14 @@ RSpec.describe GroupsController do
end
end
- context 'when viewing as an admin' do
+ context "when viewing as an admin" do
before do
sign_in(admin)
group.add(admin)
group.add_owner(admin)
end
- it 'should return the right response' do
+ it "should return the right response" do
staff_group
get "/groups.json"
@@ -279,11 +330,11 @@ RSpec.describe GroupsController do
expect(body["total_rows_groups"]).to eq(10)
expect(body["extras"]["type_filters"].map(&:to_sym)).to eq(
- described_class::TYPE_FILTERS.keys - [:non_automatic]
+ described_class::TYPE_FILTERS.keys - [:non_automatic],
)
end
- context 'when filterable by type' do
+ context "when filterable by type" do
def expect_type_to_return_right_groups(type, expected_group_ids)
get "/groups.json", params: { type: type }
@@ -296,62 +347,59 @@ RSpec.describe GroupsController do
expect(group_ids).to contain_exactly(*expected_group_ids)
end
- describe 'my groups' do
- it 'should return the groups admin is a member of' do
- expect_type_to_return_right_groups('my', admin.group_users.map(&:group_id))
+ describe "my groups" do
+ it "should return the groups admin is a member of" do
+ expect_type_to_return_right_groups("my", admin.group_users.map(&:group_id))
end
end
- describe 'owner groups' do
- it 'should return the groups admin is a owner of' do
+ describe "owner groups" do
+ it "should return the groups admin is a owner of" do
group2 = Fabricate(:group)
_group3 = Fabricate(:group)
group2.add_owner(admin)
- expect_type_to_return_right_groups('owner', admin.group_users.where(owner: true).map(&:group_id))
- end
- end
-
- describe 'automatic groups' do
- it 'should return the right response' do
expect_type_to_return_right_groups(
- 'automatic',
- Group::AUTO_GROUP_IDS.keys - [0]
+ "owner",
+ admin.group_users.where(owner: true).map(&:group_id),
)
end
end
- describe 'non automatic groups' do
- it 'should return the right response' do
+ describe "automatic groups" do
+ it "should return the right response" do
+ expect_type_to_return_right_groups("automatic", Group::AUTO_GROUP_IDS.keys - [0])
+ end
+ end
+
+ describe "non automatic groups" do
+ it "should return the right response" do
group2 = Fabricate(:group)
- expect_type_to_return_right_groups(
- 'non_automatic',
- [group.id, group2.id]
- )
+ expect_type_to_return_right_groups("non_automatic", [group.id, group2.id])
end
end
- describe 'public groups' do
- it 'should return the right response' do
+ describe "public groups" do
+ it "should return the right response" do
group2 = Fabricate(:group, public_admission: true)
- expect_type_to_return_right_groups('public', [group2.id])
+ expect_type_to_return_right_groups("public", [group2.id])
end
end
- describe 'close groups' do
- it 'should return the right response' do
+ describe "close groups" do
+ it "should return the right response" do
group2 = Fabricate(:group, public_admission: false)
_group3 = Fabricate(:group, public_admission: true)
- expect_type_to_return_right_groups('close', [group.id, group2.id])
+ expect_type_to_return_right_groups("close", [group.id, group2.id])
end
end
end
end
end
- describe '#show' do
+ describe "#show" do
it "ensures the group can be seen" do
sign_in(user)
group.update!(visibility_level: Group.visibility_levels[:owners])
@@ -370,12 +418,12 @@ RSpec.describe GroupsController do
body = response.parsed_body
- expect(body['group']['id']).to eq(group.id)
- expect(body['extras']["visible_group_names"]).to eq([mod_group.name, group.name])
- expect(response.headers['X-Robots-Tag']).to eq('noindex')
+ expect(body["group"]["id"]).to eq(group.id)
+ expect(body["extras"]["visible_group_names"]).to eq([mod_group.name, group.name])
+ expect(response.headers["X-Robots-Tag"]).to eq("noindex")
end
- context 'as an admin' do
+ context "as an admin" do
it "returns the right response" do
sign_in(admin)
get "/groups/#{group.name}.json"
@@ -384,42 +432,43 @@ RSpec.describe GroupsController do
body = response.parsed_body
- expect(body['group']['id']).to eq(group.id)
+ expect(body["group"]["id"]).to eq(group.id)
groups = Group::AUTO_GROUPS.keys
groups.delete(:everyone)
groups.push(group.name)
- expect(body['extras']["visible_group_names"])
- .to contain_exactly(*groups.map(&:to_s))
+ expect(body["extras"]["visible_group_names"]).to contain_exactly(*groups.map(&:to_s))
end
end
- it 'should respond to HTML' do
- group.update!(bio_raw: 'testing **group** bio')
+ it "should respond to HTML" do
+ group.update!(bio_raw: "testing **group** bio")
get "/groups/#{group.name}.html"
expect(response.status).to eq(200)
expect(response.body).to have_tag "title", text: "#{group.name} - #{SiteSetting.title}"
- expect(response.body).to have_tag(:meta, with: {
- property: 'og:title', content: group.name
- })
+ expect(response.body).to have_tag(:meta, with: { property: "og:title", content: group.name })
# note this uses an excerpt so it strips html
- expect(response.body).to have_tag(:meta, with: {
- property: 'og:description', content: 'testing group bio'
- })
+ expect(response.body).to have_tag(
+ :meta,
+ with: {
+ property: "og:description",
+ content: "testing group bio",
+ },
+ )
end
- describe 'when viewing activity filters' do
- it 'should return the right response' do
+ describe "when viewing activity filters" do
+ it "should return the right response" do
get "/groups/#{group.name}/activity/posts.json"
expect(response.status).to eq(200)
- body = response.parsed_body['group']
+ body = response.parsed_body["group"]
expect(body["id"]).to eq(group.id)
end
@@ -465,7 +514,6 @@ RSpec.describe GroupsController do
end
describe "#members" do
-
it "returns correct error code with invalid params" do
sign_in(user)
@@ -513,7 +561,7 @@ RSpec.describe GroupsController do
members = response.parsed_body["members"]
- expect(members.map { |m| m['username'] }).to eq(usernames[0..2])
+ expect(members.map { |m| m["username"] }).to eq(usernames[0..2])
get "/groups/#{group.name}/members.json", params: { limit: 3, offset: 3, asc: true }
@@ -521,12 +569,12 @@ RSpec.describe GroupsController do
members = response.parsed_body["members"]
- expect(members.map { |m| m['username'] }).to eq(usernames[3..5])
+ expect(members.map { |m| m["username"] }).to eq(usernames[3..5])
- get "/groups/#{group.name}/members.json", params: { order: 'added_at' }
+ get "/groups/#{group.name}/members.json", params: { order: "added_at" }
members = response.parsed_body["members"]
- expect(members.last['added_at']).to eq(first_user.created_at.as_json)
+ expect(members.last["added_at"]).to eq(first_user.created_at.as_json)
end
it "can sort items" do
@@ -547,24 +595,24 @@ RSpec.describe GroupsController do
end
end
- describe '#posts_feed' do
- it 'renders RSS' do
+ describe "#posts_feed" do
+ it "renders RSS" do
get "/groups/#{group.name}/posts.rss"
expect(response.status).to eq(200)
- expect(response.media_type).to eq('application/rss+xml')
+ expect(response.media_type).to eq("application/rss+xml")
end
end
- describe '#mentions_feed' do
- it 'renders RSS' do
+ describe "#mentions_feed" do
+ it "renders RSS" do
get "/groups/#{group.name}/mentions.rss"
expect(response.status).to eq(200)
- expect(response.media_type).to eq('application/rss+xml')
+ expect(response.media_type).to eq("application/rss+xml")
end
- it 'fails when disabled' do
+ it "fails when disabled" do
SiteSetting.enable_mentions = false
get "/groups/#{group.name}/mentions.rss"
@@ -573,13 +621,13 @@ RSpec.describe GroupsController do
end
end
- describe '#mentionable' do
+ describe "#mentionable" do
it "should return the right response" do
sign_in(user)
group.update!(
mentionable_level: Group::ALIAS_LEVELS[:owners_mods_and_admins],
- visibility_level: Group.visibility_levels[:logged_on_users]
+ visibility_level: Group.visibility_levels[:logged_on_users],
)
get "/groups/#{group.name}/mentionable.json"
@@ -590,7 +638,7 @@ RSpec.describe GroupsController do
group.update!(
mentionable_level: Group::ALIAS_LEVELS[:everyone],
- visibility_level: Group.visibility_levels[:staff]
+ visibility_level: Group.visibility_levels[:staff],
)
get "/groups/#{group.name}/mentionable.json"
@@ -601,7 +649,7 @@ RSpec.describe GroupsController do
group.update!(
mentionable_level: Group::ALIAS_LEVELS[:nobody],
- visibility_level: Group.visibility_levels[:public]
+ visibility_level: Group.visibility_levels[:public],
)
get "/groups/#{group.name}/mentionable.json"
@@ -612,7 +660,7 @@ RSpec.describe GroupsController do
end
end
- describe '#messageable' do
+ describe "#messageable" do
it "should return the right response" do
user.change_trust_level!(1)
sign_in(user)
@@ -625,7 +673,7 @@ RSpec.describe GroupsController do
group.update!(
messageable_level: Group::ALIAS_LEVELS[:everyone],
- visibility_level: Group.visibility_levels[:staff]
+ visibility_level: Group.visibility_levels[:staff],
)
get "/groups/#{group.name}/messageable.json"
@@ -642,9 +690,7 @@ RSpec.describe GroupsController do
body = response.parsed_body
expect(body["messageable"]).to eq(true)
- group.update!(
- messageable_level: Group::ALIAS_LEVELS[:only_admins],
- )
+ group.update!(messageable_level: Group::ALIAS_LEVELS[:only_admins])
get "/groups/#{group.name}/messageable.json"
expect(response.status).to eq(200)
@@ -654,14 +700,9 @@ RSpec.describe GroupsController do
end
end
- describe '#update' do
+ describe "#update" do
let!(:group) do
- Fabricate(:group,
- name: 'test',
- users: [user],
- public_admission: false,
- public_exit: false
- )
+ Fabricate(:group, name: "test", users: [user], public_admission: false, public_exit: false)
end
let(:category) { Fabricate(:category) }
let(:tag) { Fabricate(:tag) }
@@ -675,29 +716,43 @@ RSpec.describe GroupsController do
@group = Fabricate(:group)
end
- after do
- DiscoursePluginRegistry.reset!
- end
+ after { DiscoursePluginRegistry.reset! }
it "only updates allowed user fields" do
- put "/groups/#{@group.id}.json", params: { group: { custom_fields: { test: :hello1, test2: :hello2 } } }
+ put "/groups/#{@group.id}.json",
+ params: {
+ group: {
+ custom_fields: {
+ test: :hello1,
+ test2: :hello2,
+ },
+ },
+ }
@group.reload
expect(response.status).to eq(200)
- expect(@group.custom_fields['test']).to eq('hello1')
- expect(@group.custom_fields['test2']).to be_blank
+ expect(@group.custom_fields["test"]).to eq("hello1")
+ expect(@group.custom_fields["test2"]).to be_blank
end
it "is secure when there are no registered editable fields" do
DiscoursePluginRegistry.reset!
- put "/groups/#{@group.id}.json", params: { group: { custom_fields: { test: :hello1, test2: :hello2 } } }
+ put "/groups/#{@group.id}.json",
+ params: {
+ group: {
+ custom_fields: {
+ test: :hello1,
+ test2: :hello2,
+ },
+ },
+ }
@group.reload
expect(response.status).to eq(200)
- expect(@group.custom_fields['test']).to be_blank
- expect(@group.custom_fields['test2']).to be_blank
+ expect(@group.custom_fields["test"]).to be_blank
+ expect(@group.custom_fields["test2"]).to be_blank
end
end
@@ -714,58 +769,59 @@ RSpec.describe GroupsController do
mentionable_level: 2,
messageable_level: 2,
default_notification_level: 0,
- grant_trust_level: 0
+ grant_trust_level: 0,
)
expect do
- put "/groups/#{group.id}.json", params: {
- group: {
- mentionable_level: 1,
- messageable_level: 1,
- visibility_level: 1,
- automatic_membership_email_domains: 'test.org',
- title: 'haha',
- primary_group: true,
- grant_trust_level: 1,
- incoming_email: 'test@mail.org',
- flair_bg_color: 'FFF',
- flair_color: 'BBB',
- flair_icon: 'fa-adjust',
- bio_raw: 'testing',
- full_name: 'awesome team',
- public_admission: true,
- public_exit: true,
- allow_membership_requests: true,
- membership_request_template: 'testing',
- default_notification_level: 1,
- name: 'testing',
- tracking_category_ids: [category.id],
- tracking_tags: [tag.name]
- },
- update_existing_users: false
- }
+ put "/groups/#{group.id}.json",
+ params: {
+ group: {
+ mentionable_level: 1,
+ messageable_level: 1,
+ visibility_level: 1,
+ automatic_membership_email_domains: "test.org",
+ title: "haha",
+ primary_group: true,
+ grant_trust_level: 1,
+ incoming_email: "test@mail.org",
+ flair_bg_color: "FFF",
+ flair_color: "BBB",
+ flair_icon: "fa-adjust",
+ bio_raw: "testing",
+ full_name: "awesome team",
+ public_admission: true,
+ public_exit: true,
+ allow_membership_requests: true,
+ membership_request_template: "testing",
+ default_notification_level: 1,
+ name: "testing",
+ tracking_category_ids: [category.id],
+ tracking_tags: [tag.name],
+ },
+ update_existing_users: false,
+ }
end.to change { GroupHistory.count }.by(13)
expect(response.status).to eq(200)
group.reload
- expect(group.flair_bg_color).to eq('FFF')
- expect(group.flair_color).to eq('BBB')
- expect(group.flair_url).to eq('fa-adjust')
- expect(group.bio_raw).to eq('testing')
- expect(group.full_name).to eq('awesome team')
+ expect(group.flair_bg_color).to eq("FFF")
+ expect(group.flair_color).to eq("BBB")
+ expect(group.flair_url).to eq("fa-adjust")
+ expect(group.bio_raw).to eq("testing")
+ expect(group.full_name).to eq("awesome team")
expect(group.public_admission).to eq(true)
expect(group.public_exit).to eq(true)
expect(group.allow_membership_requests).to eq(true)
- expect(group.membership_request_template).to eq('testing')
- expect(group.name).to eq('test')
+ expect(group.membership_request_template).to eq("testing")
+ expect(group.name).to eq("test")
expect(group.visibility_level).to eq(2)
expect(group.mentionable_level).to eq(1)
expect(group.messageable_level).to eq(1)
expect(group.default_notification_level).to eq(1)
expect(group.automatic_membership_email_domains).to eq(nil)
- expect(group.title).to eq('haha')
+ expect(group.title).to eq("haha")
expect(group.primary_group).to eq(false)
expect(group.incoming_email).to eq(nil)
expect(group.grant_trust_level).to eq(0)
@@ -773,63 +829,53 @@ RSpec.describe GroupsController do
expect(group.group_tag_notification_defaults.first&.tag).to eq(tag)
end
- it 'should not be allowed to update automatic groups' do
+ it "should not be allowed to update automatic groups" do
group = Group.find(Group::AUTO_GROUPS[:admins])
- put "/groups/#{group.id}.json", params: {
- group: {
- messageable_level: 1
- }
- }
+ put "/groups/#{group.id}.json", params: { group: { messageable_level: 1 } }
expect(response.status).to eq(403)
end
end
context "when user is group admin" do
- before do
- sign_in(admin)
- end
+ before { sign_in(admin) }
- it 'should be able to update the group' do
- group.update!(
- visibility_level: 2,
- members_visibility_level: 2,
- grant_trust_level: 0
- )
+ it "should be able to update the group" do
+ group.update!(visibility_level: 2, members_visibility_level: 2, grant_trust_level: 0)
- put "/groups/#{group.id}.json", params: {
- group: {
- flair_color: 'BBB',
- name: 'testing',
- incoming_email: 'test@mail.org',
- primary_group: true,
- automatic_membership_email_domains: 'test.org',
- grant_trust_level: 2,
- visibility_level: 1,
- members_visibility_level: 3,
- tracking_category_ids: [category.id],
- tracking_tags: [tag.name]
- },
- update_existing_users: false
- }
+ put "/groups/#{group.id}.json",
+ params: {
+ group: {
+ flair_color: "BBB",
+ name: "testing",
+ incoming_email: "test@mail.org",
+ primary_group: true,
+ automatic_membership_email_domains: "test.org",
+ grant_trust_level: 2,
+ visibility_level: 1,
+ members_visibility_level: 3,
+ tracking_category_ids: [category.id],
+ tracking_tags: [tag.name],
+ },
+ update_existing_users: false,
+ }
expect(response.status).to eq(200)
group.reload
- expect(group.flair_color).to eq('BBB')
- expect(group.name).to eq('testing')
+ expect(group.flair_color).to eq("BBB")
+ expect(group.name).to eq("testing")
expect(group.incoming_email).to eq("test@mail.org")
expect(group.primary_group).to eq(true)
expect(group.visibility_level).to eq(1)
expect(group.members_visibility_level).to eq(3)
- expect(group.automatic_membership_email_domains).to eq('test.org')
+ expect(group.automatic_membership_email_domains).to eq("test.org")
expect(group.grant_trust_level).to eq(2)
expect(group.group_category_notification_defaults.first&.category).to eq(category)
expect(group.group_tag_notification_defaults.first&.tag).to eq(tag)
- expect(Jobs::AutomaticGroupMembership.jobs.first["args"].first["group_id"])
- .to eq(group.id)
+ expect(Jobs::AutomaticGroupMembership.jobs.first["args"].first["group_id"]).to eq(group.id)
end
it "they should be able to update an automatic group" do
@@ -839,33 +885,34 @@ RSpec.describe GroupsController do
visibility_level: 2,
mentionable_level: 2,
messageable_level: 2,
- default_notification_level: 2
+ default_notification_level: 2,
)
- put "/groups/#{group.id}.json", params: {
- group: {
- flair_bg_color: 'FFF',
- flair_color: 'BBB',
- flair_icon: 'fa-adjust',
- name: 'testing',
- visibility_level: 1,
- mentionable_level: 1,
- messageable_level: 1,
- default_notification_level: 1,
- tracking_category_ids: [category.id],
- tracking_tags: [tag.name]
- },
- update_existing_users: false
- }
+ put "/groups/#{group.id}.json",
+ params: {
+ group: {
+ flair_bg_color: "FFF",
+ flair_color: "BBB",
+ flair_icon: "fa-adjust",
+ name: "testing",
+ visibility_level: 1,
+ mentionable_level: 1,
+ messageable_level: 1,
+ default_notification_level: 1,
+ tracking_category_ids: [category.id],
+ tracking_tags: [tag.name],
+ },
+ update_existing_users: false,
+ }
expect(response.status).to eq(200)
group.reload
- expect(group.flair_bg_color).to eq('FFF')
- expect(group.flair_color).to eq('BBB')
- expect(group.flair_icon).to eq('fa-adjust')
- expect(group.flair_url).to eq('fa-adjust')
- expect(group.name).to eq('admins')
+ expect(group.flair_bg_color).to eq("FFF")
+ expect(group.flair_color).to eq("BBB")
+ expect(group.flair_icon).to eq("fa-adjust")
+ expect(group.flair_url).to eq("fa-adjust")
+ expect(group.name).to eq("admins")
expect(group.visibility_level).to eq(1)
expect(group.mentionable_level).to eq(1)
expect(group.messageable_level).to eq(1)
@@ -874,10 +921,13 @@ RSpec.describe GroupsController do
expect(group.group_tag_notification_defaults.first&.tag).to eq(tag)
end
- it 'triggers a extensibility event' do
- event = DiscourseEvent.track_events {
- put "/groups/#{group.id}.json", params: { group: { flair_color: 'BBB' } }
- }.last
+ it "triggers a extensibility event" do
+ event =
+ DiscourseEvent
+ .track_events do
+ put "/groups/#{group.id}.json", params: { group: { flair_color: "BBB" } }
+ end
+ .last
expect(event[:event_name]).to eq(:group_updated)
expect(event[:params].first).to eq(group)
@@ -892,11 +942,12 @@ RSpec.describe GroupsController do
group_user1 = user1.group_users.first
group_user2 = user2.group_users.first
- put "/groups/#{group.id}.json", params: {
- group: {
- default_notification_level: NotificationLevels.all[:tracking]
- }
- }
+ put "/groups/#{group.id}.json",
+ params: {
+ group: {
+ default_notification_level: NotificationLevels.all[:tracking],
+ },
+ }
expect(response.status).to eq(422)
expect(response.parsed_body["user_count"]).to eq(group.group_users.count)
@@ -906,35 +957,38 @@ RSpec.describe GroupsController do
group_user1.update!(notification_level: NotificationLevels.all[:regular])
- put "/groups/#{group.id}.json", params: {
- group: {
- default_notification_level: NotificationLevels.all[:tracking]
- }
- }
+ put "/groups/#{group.id}.json",
+ params: {
+ group: {
+ default_notification_level: NotificationLevels.all[:tracking],
+ },
+ }
expect(response.status).to eq(422)
expect(response.parsed_body["user_count"]).to eq(group.group_users.count - 1)
expect(group_user1.reload.notification_level).to eq(NotificationLevels.all[:regular])
expect(group_user2.reload.notification_level).to eq(NotificationLevels.all[:watching])
- put "/groups/#{group.id}.json", params: {
- group: {
- default_notification_level: NotificationLevels.all[:tracking]
- },
- update_existing_users: true
- }
+ put "/groups/#{group.id}.json",
+ params: {
+ group: {
+ default_notification_level: NotificationLevels.all[:tracking],
+ },
+ update_existing_users: true,
+ }
expect(response.status).to eq(200)
expect(response.parsed_body["success"]).to eq("OK")
expect(group_user1.reload.notification_level).to eq(NotificationLevels.all[:regular])
expect(group_user2.reload.notification_level).to eq(NotificationLevels.all[:tracking])
- put "/groups/#{group.id}.json", params: {
- group: {
- default_notification_level: NotificationLevels.all[:regular]
- },
- update_existing_users: false
- }
+ put "/groups/#{group.id}.json",
+ params: {
+ group: {
+ default_notification_level: NotificationLevels.all[:regular],
+ },
+ update_existing_users: false,
+ }
expect(response.status).to eq(200)
expect(response.parsed_body["success"]).to eq("OK")
@@ -950,62 +1004,67 @@ RSpec.describe GroupsController do
group.add(user1)
group.add(user2)
- put "/groups/#{group.id}.json", params: {
- group: {
- flair_color: 'BBB',
- name: 'testing',
- incoming_email: 'test@mail.org',
- primary_group: true,
- automatic_membership_email_domains: 'test.org',
- grant_trust_level: 2,
- visibility_level: 1,
- members_visibility_level: 3,
- tracking_category_ids: [category.id],
- tracking_tags: [tag.name]
- }
- }
+ put "/groups/#{group.id}.json",
+ params: {
+ group: {
+ flair_color: "BBB",
+ name: "testing",
+ incoming_email: "test@mail.org",
+ primary_group: true,
+ automatic_membership_email_domains: "test.org",
+ grant_trust_level: 2,
+ visibility_level: 1,
+ members_visibility_level: 3,
+ tracking_category_ids: [category.id],
+ tracking_tags: [tag.name],
+ },
+ }
expect(response.status).to eq(422)
expect(response.parsed_body["user_count"]).to eq(group.group_users.count - 1)
- put "/groups/#{group.id}.json", params: {
- group: {
- flair_color: 'BBB',
- name: 'testing',
- incoming_email: 'test@mail.org',
- primary_group: true,
- automatic_membership_email_domains: 'test.org',
- grant_trust_level: 2,
- visibility_level: 1,
- members_visibility_level: 3,
- tracking_category_ids: [category.id],
- tracking_tags: [tag.name]
- },
- update_existing_users: true
- }
+ put "/groups/#{group.id}.json",
+ params: {
+ group: {
+ flair_color: "BBB",
+ name: "testing",
+ incoming_email: "test@mail.org",
+ primary_group: true,
+ automatic_membership_email_domains: "test.org",
+ grant_trust_level: 2,
+ visibility_level: 1,
+ members_visibility_level: 3,
+ tracking_category_ids: [category.id],
+ tracking_tags: [tag.name],
+ },
+ update_existing_users: true,
+ }
expect(response.status).to eq(200)
expect(response.parsed_body["success"]).to eq("OK")
- put "/groups/#{group.id}.json", params: {
- group: {
- flair_color: 'BBB',
- name: 'testing',
- incoming_email: 'test@mail.org',
- primary_group: true,
- automatic_membership_email_domains: 'test.org',
- grant_trust_level: 2,
- visibility_level: 1,
- members_visibility_level: 3,
- watching_category_ids: [category.id],
- tracking_tags: [tag.name]
- },
- update_existing_users: true
- }
+ put "/groups/#{group.id}.json",
+ params: {
+ group: {
+ flair_color: "BBB",
+ name: "testing",
+ incoming_email: "test@mail.org",
+ primary_group: true,
+ automatic_membership_email_domains: "test.org",
+ grant_trust_level: 2,
+ visibility_level: 1,
+ members_visibility_level: 3,
+ watching_category_ids: [category.id],
+ tracking_tags: [tag.name],
+ },
+ update_existing_users: true,
+ }
expect(response.status).to eq(200)
expect(response.parsed_body["success"]).to eq("OK")
- expect(CategoryUser.exists?(user: user2, category: category, notification_level: 3)).to be_truthy
+ expect(
+ CategoryUser.exists?(user: user2, category: category, notification_level: 3),
+ ).to be_truthy
end
end
end
@@ -1016,94 +1075,94 @@ RSpec.describe GroupsController do
sign_in(moderator)
end
- it 'should not be able to update the group if the SiteSetting is false' do
+ it "should not be able to update the group if the SiteSetting is false" do
SiteSetting.moderators_manage_categories_and_groups = false
- put "/groups/#{group.id}.json", params: { group: { name: 'testing' } }
+ put "/groups/#{group.id}.json", params: { group: { name: "testing" } }
expect(response.status).to eq(403)
end
- it 'should not be able to update a group it cannot see' do
+ it "should not be able to update a group it cannot see" do
group.update!(visibility_level: Group.visibility_levels[:owners])
- put "/groups/#{group.id}.json", params: { group: { name: 'testing' } }
+ put "/groups/#{group.id}.json", params: { group: { name: "testing" } }
expect(response.status).to eq(403)
end
- it 'should be able to update the group' do
- put "/groups/#{group.id}.json", params: {
- group: {
- flair_color: 'BBB',
- name: 'testing',
- incoming_email: 'test@mail.org',
- primary_group: true,
- automatic_membership_email_domains: 'test.org',
- grant_trust_level: 2,
- visibility_level: 1,
- members_visibility_level: 3,
- tracking_category_ids: [category.id],
- tracking_tags: [tag.name]
- },
- update_existing_users: false
- }
+ it "should be able to update the group" do
+ put "/groups/#{group.id}.json",
+ params: {
+ group: {
+ flair_color: "BBB",
+ name: "testing",
+ incoming_email: "test@mail.org",
+ primary_group: true,
+ automatic_membership_email_domains: "test.org",
+ grant_trust_level: 2,
+ visibility_level: 1,
+ members_visibility_level: 3,
+ tracking_category_ids: [category.id],
+ tracking_tags: [tag.name],
+ },
+ update_existing_users: false,
+ }
expect(response.status).to eq(200)
group.reload
- expect(group.flair_color).to eq('BBB')
- expect(group.name).to eq('testing')
+ expect(group.flair_color).to eq("BBB")
+ expect(group.name).to eq("testing")
expect(group.incoming_email).to eq("test@mail.org")
expect(group.primary_group).to eq(true)
expect(group.visibility_level).to eq(1)
expect(group.members_visibility_level).to eq(3)
- expect(group.automatic_membership_email_domains).to eq('test.org')
+ expect(group.automatic_membership_email_domains).to eq("test.org")
expect(group.grant_trust_level).to eq(2)
expect(group.group_category_notification_defaults.first&.category).to eq(category)
expect(group.group_tag_notification_defaults.first&.tag).to eq(tag)
- expect(Jobs::AutomaticGroupMembership.jobs.first["args"].first["group_id"])
- .to eq(group.id)
+ expect(Jobs::AutomaticGroupMembership.jobs.first["args"].first["group_id"]).to eq(group.id)
end
it "should be able to update an automatic group" do
group = Group.find(Group::AUTO_GROUPS[:trust_level_4])
- group.update!(
- mentionable_level: 2,
- messageable_level: 2,
- default_notification_level: 2
- )
+ group.update!(mentionable_level: 2, messageable_level: 2, default_notification_level: 2)
- put "/groups/#{group.id}.json", params: {
- group: {
- flair_bg_color: 'FFF',
- flair_color: 'BBB',
- flair_icon: 'fa-adjust',
- mentionable_level: 1,
- messageable_level: 1,
- default_notification_level: 1
- }
- }
+ put "/groups/#{group.id}.json",
+ params: {
+ group: {
+ flair_bg_color: "FFF",
+ flair_color: "BBB",
+ flair_icon: "fa-adjust",
+ mentionable_level: 1,
+ messageable_level: 1,
+ default_notification_level: 1,
+ },
+ }
expect(response.status).to eq(200)
group.reload
- expect(group.flair_bg_color).to eq('FFF')
- expect(group.flair_color).to eq('BBB')
- expect(group.flair_icon).to eq('fa-adjust')
- expect(group.flair_url).to eq('fa-adjust')
- expect(group.name).to eq('trust_level_4')
+ expect(group.flair_bg_color).to eq("FFF")
+ expect(group.flair_color).to eq("BBB")
+ expect(group.flair_icon).to eq("fa-adjust")
+ expect(group.flair_url).to eq("fa-adjust")
+ expect(group.name).to eq("trust_level_4")
expect(group.mentionable_level).to eq(1)
expect(group.messageable_level).to eq(1)
expect(group.default_notification_level).to eq(1)
end
- it 'triggers a extensibility event' do
- event = DiscourseEvent.track_events {
- put "/groups/#{group.id}.json", params: { group: { flair_color: 'BBB' } }
- }.last
+ it "triggers a extensibility event" do
+ event =
+ DiscourseEvent
+ .track_events do
+ put "/groups/#{group.id}.json", params: { group: { flair_color: "BBB" } }
+ end
+ .last
expect(event[:event_name]).to eq(:group_updated)
expect(event[:params].first).to eq(group)
@@ -1111,48 +1170,42 @@ RSpec.describe GroupsController do
end
context "when user is not a group owner or admin" do
- it 'should not be able to update the group' do
+ it "should not be able to update the group" do
sign_in(user)
- put "/groups/#{group.id}.json", params: { group: { name: 'testing' } }
+ put "/groups/#{group.id}.json", params: { group: { name: "testing" } }
expect(response.status).to eq(403)
end
end
end
- describe '#members' do
+ describe "#members" do
let(:user1) do
- Fabricate(:user,
+ Fabricate(
+ :user,
last_seen_at: Time.zone.now,
last_posted_at: Time.zone.now - 1.day,
- email: 'b@test.org'
+ email: "b@test.org",
)
end
let(:user2) do
- Fabricate(:user,
- last_seen_at: Time.zone.now - 1 .day,
+ Fabricate(
+ :user,
+ last_seen_at: Time.zone.now - 1.day,
last_posted_at: Time.zone.now,
- email: 'a@test.org'
+ email: "a@test.org",
)
end
- fab!(:user3) do
- Fabricate(:user,
- last_seen_at: nil,
- last_posted_at: nil,
- email: 'c@test.org'
- )
- end
+ fab!(:user3) { Fabricate(:user, last_seen_at: nil, last_posted_at: nil, email: "c@test.org") }
fab!(:bot) { Fabricate(:bot) }
let(:group) { Fabricate(:group, users: [user1, user2, user3, bot]) }
it "should allow members to be sorted by" do
- get "/groups/#{group.name}/members.json", params: {
- order: 'last_seen_at'
- }
+ get "/groups/#{group.name}/members.json", params: { order: "last_seen_at" }
expect(response.status).to eq(200)
@@ -1160,7 +1213,7 @@ RSpec.describe GroupsController do
expect(members.map { |m| m["id"] }).to eq([user1.id, user2.id, user3.id])
- get "/groups/#{group.name}/members.json", params: { order: 'last_seen_at', asc: true }
+ get "/groups/#{group.name}/members.json", params: { order: "last_seen_at", asc: true }
expect(response.status).to eq(200)
@@ -1168,9 +1221,7 @@ RSpec.describe GroupsController do
expect(members.map { |m| m["id"] }).to eq([user2.id, user1.id, user3.id])
- get "/groups/#{group.name}/members.json", params: {
- order: 'last_posted_at'
- }
+ get "/groups/#{group.name}/members.json", params: { order: "last_posted_at" }
expect(response.status).to eq(200)
@@ -1180,14 +1231,13 @@ RSpec.describe GroupsController do
end
it "should not allow members to be sorted by columns that are not allowed" do
- get "/groups/#{group.name}/members.json", params: { order: 'email' }
+ get "/groups/#{group.name}/members.json", params: { order: "email" }
expect(response.status).to eq(200)
members = response.parsed_body["members"]
- expect(members.map { |m| m["id"] })
- .to contain_exactly(user1.id, user2.id, user3.id)
+ expect(members.map { |m| m["id"] }).to contain_exactly(user1.id, user2.id, user3.id)
end
it "can show group requests" do
@@ -1204,10 +1254,10 @@ RSpec.describe GroupsController do
expect(members.first["reason"]).to eq(request4.reason)
end
- describe 'filterable' do
- describe 'as a normal user' do
+ describe "filterable" do
+ describe "as a normal user" do
it "should not allow members to be filterable by email" do
- email = 'uniquetest@discourse.org'
+ email = "uniquetest@discourse.org"
user1.update!(email: email)
get "/groups/#{group.name}/members.json", params: { filter: email }
@@ -1218,19 +1268,17 @@ RSpec.describe GroupsController do
end
end
- describe 'as an admin' do
- before do
- sign_in(admin)
- end
+ describe "as an admin" do
+ before { sign_in(admin) }
it "should allow members to be filterable by username" do
- email = 'uniquetest@discourse.org'
+ email = "uniquetest@discourse.org"
user1.update!(email: email)
{
email.upcase => [user1.id],
- 'QUEtes' => [user1.id],
- "#{user1.email},#{user2.email}" => [user1.id, user2.id]
+ "QUEtes" => [user1.id],
+ "#{user1.email},#{user2.email}" => [user1.id, user2.id],
}.each do |filter, ids|
get "/groups/#{group.name}/members.json", params: { filter: filter }
@@ -1241,10 +1289,10 @@ RSpec.describe GroupsController do
end
it "should allow members to be filterable by email" do
- username = 'uniquetest'
+ username = "uniquetest"
user1.update!(username: username)
- [username.upcase, 'QUEtes'].each do |filter|
+ [username.upcase, "QUEtes"].each do |filter|
get "/groups/#{group.name}/members.json", params: { filter: filter }
expect(response.status).to eq(200)
@@ -1259,8 +1307,8 @@ RSpec.describe GroupsController do
describe "#edit" do
fab!(:group) { Fabricate(:group) }
- context 'when user is not signed in' do
- it 'should be forbidden' do
+ context "when user is not signed in" do
+ it "should be forbidden" do
put "/groups/#{group.id}/members.json", params: { usernames: "bob" }
expect(response).to be_forbidden
@@ -1268,12 +1316,9 @@ RSpec.describe GroupsController do
expect(response).to be_forbidden
end
- context 'with public group' do
- it 'should be forbidden' do
- group.update!(
- public_admission: true,
- public_exit: true
- )
+ context "with public group" do
+ it "should be forbidden" do
+ group.update!(public_admission: true, public_exit: true)
put "/groups/#{group.id}/members.json", params: { usernames: "bob" }
expect(response.status).to eq(403)
@@ -1284,10 +1329,8 @@ RSpec.describe GroupsController do
end
end
- context 'when user is not an owner of the group' do
- before do
- sign_in(user)
- end
+ context "when user is not an owner of the group" do
+ before { sign_in(user) }
it "refuses membership changes to unauthorized users" do
put "/groups/#{group.id}/members.json", params: { usernames: "bob" }
@@ -1298,12 +1341,10 @@ RSpec.describe GroupsController do
end
end
- context 'when user is an admin' do
+ context "when user is an admin" do
fab!(:group) { Fabricate(:group, users: [admin], automatic: true) }
- before do
- sign_in(admin)
- end
+ before { sign_in(admin) }
it "cannot add members to automatic groups" do
put "/groups/#{group.id}/members.json", params: { usernames: "bob" }
@@ -1316,10 +1357,8 @@ RSpec.describe GroupsController do
end
describe "membership edits" do
- describe '#add_members' do
- before do
- sign_in(admin)
- end
+ describe "#add_members" do
+ before { sign_in(admin) }
it "can make incremental adds" do
expect do
@@ -1352,15 +1391,22 @@ RSpec.describe GroupsController do
it "notifies users when the param is present" do
expect {
- put "/groups/#{group.id}/members.json", params: { usernames: user2.username, notify_users: true }
+ put "/groups/#{group.id}/members.json",
+ params: {
+ usernames: user2.username,
+ notify_users: true,
+ }
}.to change { Topic.where(archetype: "private_message").count }.by(1)
expect(response.status).to eq(200)
- expect(Topic.last.topic_users.map(&:user_id)).to include(Discourse::SYSTEM_USER_ID, user2.id)
+ expect(Topic.last.topic_users.map(&:user_id)).to include(
+ Discourse::SYSTEM_USER_ID,
+ user2.id,
+ )
end
- it 'does not add users without sufficient permission' do
+ it "does not add users without sufficient permission" do
group.add_owner(user)
sign_in(user)
@@ -1368,7 +1414,7 @@ RSpec.describe GroupsController do
expect(response.status).to eq(200)
end
- it 'does not send invites if user cannot invite' do
+ it "does not send invites if user cannot invite" do
group.add_owner(user)
sign_in(user)
@@ -1383,7 +1429,9 @@ RSpec.describe GroupsController do
it "adds by username" do
expect do
put "/groups/#{group.id}/members.json",
- params: { usernames: [user1.username, user2.username.upcase].join(",") }
+ params: {
+ usernames: [user1.username, user2.username.upcase].join(","),
+ }
end.to change { group.users.count }.by(2)
expect(response.status).to eq(200)
@@ -1392,7 +1440,9 @@ RSpec.describe GroupsController do
it "adds by id" do
expect do
put "/groups/#{group.id}/members.json",
- params: { user_ids: [user1.id, user2.id].join(",") }
+ params: {
+ user_ids: [user1.id, user2.id].join(","),
+ }
end.to change { group.users.count }.by(2)
expect(response.status).to eq(200)
@@ -1401,32 +1451,39 @@ RSpec.describe GroupsController do
it "adds by email" do
expect do
put "/groups/#{group.id}/members.json",
- params: { user_emails: [user1.email, user2.email].join(",") }
+ params: {
+ user_emails: [user1.email, user2.email].join(","),
+ }
end.to change { group.users.count }.by(2)
expect(response.status).to eq(200)
end
- it 'adds missing users even if some exists' do
- user2.update!(username: 'alice')
- user3 = Fabricate(:user, username: 'bob')
+ it "adds missing users even if some exists" do
+ user2.update!(username: "alice")
+ user3 = Fabricate(:user, username: "bob")
[user2, user3].each { |user| group.add(user) }
expect do
put "/groups/#{group.id}/members.json",
- params: { user_emails: [user1.email, user2.email, user3.email].join(",") }
+ params: {
+ user_emails: [user1.email, user2.email, user3.email].join(","),
+ }
end.to change { group.users.count }.by(1)
expect(response.status).to eq(200)
end
- it 'sends invites to new users and ignores existing users' do
- user1.update!(username: 'john')
- user2.update!(username: 'alice')
+ it "sends invites to new users and ignores existing users" do
+ user1.update!(username: "john")
+ user2.update!(username: "alice")
[user1, user2].each { |user| group.add(user) }
- emails = ["something@gmail.com", "anotherone@yahoo.com"]
+ emails = %w[something@gmail.com anotherone@yahoo.com]
put "/groups/#{group.id}/members.json",
- params: { user_emails: [user1.email, user2.email].join(","), emails: emails.join(",") }
+ params: {
+ user_emails: [user1.email, user2.email].join(","),
+ emails: emails.join(","),
+ }
expect(response.status).to eq(200)
expect(response.parsed_body["emails"]).to eq(emails)
@@ -1437,39 +1494,40 @@ RSpec.describe GroupsController do
end
end
- it 'displays warning when all members already exists' do
- user1.update!(username: 'john')
- user2.update!(username: 'alice')
- user3 = Fabricate(:user, username: 'bob')
+ it "displays warning when all members already exists" do
+ user1.update!(username: "john")
+ user2.update!(username: "alice")
+ user3 = Fabricate(:user, username: "bob")
[user1, user2, user3].each { |user| group.add(user) }
expect do
put "/groups/#{group.id}/members.json",
- params: { user_emails: [user1.email, user2.email, user3.email].join(",") }
+ params: {
+ user_emails: [user1.email, user2.email, user3.email].join(","),
+ }
end.not_to change { group.users.count }
expect(response.status).to eq(422)
- expect(response.parsed_body["errors"]).to include(I18n.t(
- "groups.errors.member_already_exist",
- username: "alice, bob, john",
- count: 3
- ))
+ expect(response.parsed_body["errors"]).to include(
+ I18n.t("groups.errors.member_already_exist", username: "alice, bob, john", count: 3),
+ )
end
- it 'display error when try to add to many users at once' do
+ it "display error when try to add to many users at once" do
stub_const(GroupsController, "ADD_MEMBERS_LIMIT", 1) do
expect do
put "/groups/#{group.id}/members.json",
- params: { user_emails: [user1.email, user2.email].join(",") }
+ params: {
+ user_emails: [user1.email, user2.email].join(","),
+ }
end.not_to change { group.reload.users.count }
expect(response.status).to eq(422)
- expect(response.parsed_body["errors"]).to include(I18n.t(
- "groups.errors.adding_too_many_users",
- count: 1
- ))
+ expect(response.parsed_body["errors"]).to include(
+ I18n.t("groups.errors.adding_too_many_users", count: 1),
+ )
end
end
end
@@ -1479,18 +1537,16 @@ RSpec.describe GroupsController do
expect(response.status).to eq(422)
- expect(response.parsed_body["errors"]).to include(I18n.t(
- "groups.errors.member_already_exist",
- username: user.username,
- count: 1
- ))
+ expect(response.parsed_body["errors"]).to include(
+ I18n.t("groups.errors.member_already_exist", username: user.username, count: 1),
+ )
end
it "returns 400 if member is not found" do
[
{ usernames: "some thing" },
{ user_ids: "-5,-6" },
- { user_emails: "some@test.org" }
+ { user_emails: "some@test.org" },
].each do |params|
put "/groups/#{group.id}/members.json", params: params
@@ -1505,7 +1561,7 @@ RSpec.describe GroupsController do
it "return a 400 if no user or emails are present" do
[
{ usernames: "nouserwiththisusername", emails: "" },
- { usernames: "", emails: "" }
+ { usernames: "", emails: "" },
].each do |params|
put "/groups/#{group.id}/members.json", params: params
expect(response.status).to eq(400)
@@ -1516,7 +1572,7 @@ RSpec.describe GroupsController do
end
it "will send invites to each email with group_id set" do
- emails = ["something@gmail.com", "anotherone@yahoo.com"]
+ emails = %w[something@gmail.com anotherone@yahoo.com]
put "/groups/#{group.id}/members.json", params: { emails: emails.join(",") }
expect(response.status).to eq(200)
@@ -1552,24 +1608,22 @@ RSpec.describe GroupsController do
it "will invite the user if their username and email are both invited" do
new_user = Fabricate(:user)
- put "/groups/#{group.id}/members.json", params: { usernames: new_user.username, emails: new_user.email }
+ put "/groups/#{group.id}/members.json",
+ params: {
+ usernames: new_user.username,
+ emails: new_user.email,
+ }
expect(response.status).to eq(200)
expect(new_user.reload.group_ids.include?(group.id)).to eq(true)
end
- context 'with public group' do
- before do
- group.update!(
- public_admission: true,
- public_exit: true
- )
- end
+ context "with public group" do
+ before { group.update!(public_admission: true, public_exit: true) }
- context 'when admin' do
+ context "when admin" do
it "can make incremental adds" do
expect do
- put "/groups/#{group.id}/members.json",
- params: { usernames: other_user.username }
+ put "/groups/#{group.id}/members.json", params: { usernames: other_user.username }
end.to change { group.users.count }.by(1)
expect(response.status).to eq(200)
@@ -1584,61 +1638,55 @@ RSpec.describe GroupsController do
end
end
- describe '#join' do
+ describe "#join" do
let(:public_group) { Fabricate(:public_group) }
- it 'should allow a user to join a public group' do
+ it "should allow a user to join a public group" do
sign_in(user)
- expect do
- put "/groups/#{public_group.id}/join.json"
- end.to change { public_group.users.count }.by(1)
+ expect do put "/groups/#{public_group.id}/join.json" end.to change {
+ public_group.users.count
+ }.by(1)
expect(response.status).to eq(204)
end
- it 'should not allow a user to join a nonpublic group' do
+ it "should not allow a user to join a nonpublic group" do
sign_in(user)
- expect do
- put "/groups/#{group.id}/join.json"
- end.not_to change { group.users.count }
+ expect do put "/groups/#{group.id}/join.json" end.not_to change { group.users.count }
expect(response).to be_forbidden
end
- it 'should not allow an anonymous user to call the join method' do
- expect do
- put "/groups/#{group.id}/join.json"
- end.not_to change { group.users.count }
+ it "should not allow an anonymous user to call the join method" do
+ expect do put "/groups/#{group.id}/join.json" end.not_to change { group.users.count }
expect(response).to be_forbidden
end
- it 'the join method is idempotent' do
+ it "the join method is idempotent" do
sign_in(user)
- expect do
- put "/groups/#{public_group.id}/join.json"
- end.to change { public_group.users.count }.by(1)
+ expect do put "/groups/#{public_group.id}/join.json" end.to change {
+ public_group.users.count
+ }.by(1)
expect(response.status).to eq(204)
- expect do
- put "/groups/#{public_group.id}/join.json"
- end.not_to change { public_group.users.count }
+ expect do put "/groups/#{public_group.id}/join.json" end.not_to change {
+ public_group.users.count
+ }
expect(response.status).to eq(204)
- expect do
- put "/groups/#{public_group.id}/join.json"
- end.not_to change { public_group.users.count }
+ expect do put "/groups/#{public_group.id}/join.json" end.not_to change {
+ public_group.users.count
+ }
expect(response.status).to eq(204)
end
end
- describe '#remove_member' do
- before do
- sign_in(admin)
- end
+ describe "#remove_member" do
+ before { sign_in(admin) }
it "cannot remove members from automatic groups" do
group.update!(automatic: true)
@@ -1672,8 +1720,10 @@ RSpec.describe GroupsController do
it "removes by id with integer in json" do
expect do
- headers = { "CONTENT_TYPE": "application/json" }
- delete "/groups/#{group.id}/members.json", params: "{\"user_id\":#{user.id}}", headers: headers
+ headers = { CONTENT_TYPE: "application/json" }
+ delete "/groups/#{group.id}/members.json",
+ params: "{\"user_id\":#{user.id}}",
+ headers: headers
end.to change { group.users.count }.by(-1)
expect(response.status).to eq(200)
@@ -1697,39 +1747,36 @@ RSpec.describe GroupsController do
it "removes by user_email" do
expect do
- delete "/groups/#{group.id}/members.json",
- params: { user_email: user.email }
+ delete "/groups/#{group.id}/members.json", params: { user_email: user.email }
end.to change { group.users.count }.by(-1)
expect(response.status).to eq(200)
end
- context 'with public group' do
+ context "with public group" do
let(:group) { Fabricate(:public_group, users: [other_user]) }
context "when admin" do
it "removes by username" do
expect do
- delete "/groups/#{group.id}/members.json",
- params: { username: other_user.username }
+ delete "/groups/#{group.id}/members.json", params: { username: other_user.username }
end.to change { group.users.count }.by(-1)
expect(response.status).to eq(200)
end
end
- it 'should not allow a underprivileged user to leave a group for another user' do
+ it "should not allow a underprivileged user to leave a group for another user" do
sign_in(user)
- delete "/groups/#{group.id}/members.json",
- params: { username: other_user.username }
+ delete "/groups/#{group.id}/members.json", params: { username: other_user.username }
expect(response).to be_forbidden
end
end
end
- describe '#remove_members' do
+ describe "#remove_members" do
context "when is able to remove several members from a group" do
fab!(:user1) { Fabricate(:user) }
fab!(:user2) { Fabricate(:user, username: "UsEr2") }
@@ -1738,7 +1785,9 @@ RSpec.describe GroupsController do
it "removes by username" do
expect do
delete "/groups/#{group1.id}/members.json",
- params: { usernames: [user1.username, user2.username.upcase].join(",") }
+ params: {
+ usernames: [user1.username, user2.username.upcase].join(","),
+ }
end.to change { group1.users.count }.by(-2)
expect(response.status).to eq(200)
end
@@ -1746,7 +1795,9 @@ RSpec.describe GroupsController do
it "removes by id" do
expect do
delete "/groups/#{group1.id}/members.json",
- params: { user_ids: [user1.id, user2.id].join(",") }
+ params: {
+ user_ids: [user1.id, user2.id].join(","),
+ }
end.to change { group1.users.count }.by(-2)
expect(response.status).to eq(200)
@@ -1754,8 +1805,10 @@ RSpec.describe GroupsController do
it "removes by id with integer in json" do
expect do
- headers = { "CONTENT_TYPE": "application/json" }
- delete "/groups/#{group1.id}/members.json", params: "{\"user_ids\":#{user1.id}}", headers: headers
+ headers = { CONTENT_TYPE: "application/json" }
+ delete "/groups/#{group1.id}/members.json",
+ params: "{\"user_ids\":#{user1.id}}",
+ headers: headers
end.to change { group1.users.count }.by(-1)
expect(response.status).to eq(200)
@@ -1764,7 +1817,9 @@ RSpec.describe GroupsController do
it "removes by email" do
expect do
delete "/groups/#{group1.id}/members.json",
- params: { user_emails: [user1.email, user2.email].join(",") }
+ params: {
+ user_emails: [user1.email, user2.email].join(","),
+ }
end.to change { group1.users.count }.by(-2)
expect(response.status).to eq(200)
@@ -1772,7 +1827,9 @@ RSpec.describe GroupsController do
it "only removes users in that group" do
delete "/groups/#{group1.id}/members.json",
- params: { usernames: [user.username, user2.username].join(",") }
+ params: {
+ usernames: [user.username, user2.username].join(","),
+ }
response_body = response.parsed_body
expect(response.status).to eq(200)
@@ -1783,53 +1840,51 @@ RSpec.describe GroupsController do
end
end
- describe '#leave' do
+ describe "#leave" do
let(:group_with_public_exit) { Fabricate(:group, public_exit: true, users: [user]) }
- it 'should allow a user to leave a group with public exit' do
+ it "should allow a user to leave a group with public exit" do
sign_in(user)
- expect do
- delete "/groups/#{group_with_public_exit.id}/leave.json"
- end.to change { group_with_public_exit.users.count }.by(-1)
+ expect do delete "/groups/#{group_with_public_exit.id}/leave.json" end.to change {
+ group_with_public_exit.users.count
+ }.by(-1)
expect(response.status).to eq(204)
end
- it 'should not allow a user to leave a group without public exit' do
+ it "should not allow a user to leave a group without public exit" do
sign_in(user)
- expect do
- delete "/groups/#{group.id}/leave.json"
- end.not_to change { group.users.count }
+ expect do delete "/groups/#{group.id}/leave.json" end.not_to change { group.users.count }
expect(response).to be_forbidden
end
- it 'should not allow an anonymous user to call the leave method' do
- expect do
- delete "/groups/#{group_with_public_exit.id}/leave.json"
- end.not_to change { group_with_public_exit.users.count }
+ it "should not allow an anonymous user to call the leave method" do
+ expect do delete "/groups/#{group_with_public_exit.id}/leave.json" end.not_to change {
+ group_with_public_exit.users.count
+ }
expect(response).to be_forbidden
end
- it 'the leave method is idempotent' do
+ it "the leave method is idempotent" do
sign_in(user)
- expect do
- delete "/groups/#{group_with_public_exit.id}/leave.json"
- end.to change { group_with_public_exit.users.count }.by(-1)
+ expect do delete "/groups/#{group_with_public_exit.id}/leave.json" end.to change {
+ group_with_public_exit.users.count
+ }.by(-1)
expect(response.status).to eq(204)
- expect do
- delete "/groups/#{group_with_public_exit.id}/leave.json"
- end.not_to change { group_with_public_exit.users.count }
+ expect do delete "/groups/#{group_with_public_exit.id}/leave.json" end.not_to change {
+ group_with_public_exit.users.count
+ }
expect(response.status).to eq(204)
- expect do
- delete "/groups/#{group_with_public_exit.id}/leave.json"
- end.not_to change { group_with_public_exit.users.count }
+ expect do delete "/groups/#{group_with_public_exit.id}/leave.json" end.not_to change {
+ group_with_public_exit.users.count
+ }
expect(response.status).to eq(204)
end
end
@@ -1843,54 +1898,55 @@ RSpec.describe GroupsController do
it "sends a private message when accepted" do
GroupRequest.create!(group: group, user: other_user)
- expect { put "/groups/#{group.id}/handle_membership_request.json", params: { user_id: other_user.id, accept: true } }
- .to change { Topic.count }.by(1)
- .and change { Post.count }.by(1)
+ expect {
+ put "/groups/#{group.id}/handle_membership_request.json",
+ params: {
+ user_id: other_user.id,
+ accept: true,
+ }
+ }.to change { Topic.count }.by(1).and change { Post.count }.by(1)
topic = Topic.last
expect(topic.archetype).to eq(Archetype.private_message)
- expect(topic.title).to eq(I18n.t('groups.request_accepted_pm.title', group_name: group.name))
- expect(topic.first_post.raw).to eq(I18n.t('groups.request_accepted_pm.body', group_name: group.name).strip)
+ expect(topic.title).to eq(I18n.t("groups.request_accepted_pm.title", group_name: group.name))
+ expect(topic.first_post.raw).to eq(
+ I18n.t("groups.request_accepted_pm.body", group_name: group.name).strip,
+ )
end
end
describe "#histories" do
- context 'when user is not signed in' do
- it 'should raise the right error' do
+ context "when user is not signed in" do
+ it "should raise the right error" do
get "/groups/#{group.name}/logs.json"
expect(response.status).to eq(403)
end
end
- context 'when user is not a group owner' do
- before do
- sign_in(user)
- end
+ context "when user is not a group owner" do
+ before { sign_in(user) }
- it 'should be forbidden' do
+ it "should be forbidden" do
get "/groups/#{group.name}/logs.json"
expect(response).to be_forbidden
end
end
- describe 'when user is a group owner' do
+ describe "when user is a group owner" do
before do
group.add_owner(user)
sign_in(user)
end
- describe 'when viewing a public group' do
+ describe "when viewing a public group" do
before do
- group.update!(
- public_admission: true,
- public_exit: true
- )
+ group.update!(public_admission: true, public_exit: true)
GroupActionLogger.new(user, group).log_change_group_settings
end
- it 'should allow group owner to view history' do
+ it "should allow group owner to view history" do
get "/groups/#{group.name}/logs.json"
expect(response.status).to eq(200)
@@ -1898,13 +1954,13 @@ RSpec.describe GroupsController do
result = response.parsed_body["logs"].find { |entry| entry["subject"] == "public_exit" }
expect(result["action"]).to eq(GroupHistory.actions[1].to_s)
- expect(result["subject"]).to eq('public_exit')
- expect(result["prev_value"]).to eq('f')
- expect(result["new_value"]).to eq('t')
+ expect(result["subject"]).to eq("public_exit")
+ expect(result["prev_value"]).to eq("f")
+ expect(result["new_value"]).to eq("t")
end
end
- it 'should not be allowed to view history of an automatic group' do
+ it "should not be allowed to view history of an automatic group" do
group = Group.find_by(id: Group::AUTO_GROUPS[:admins])
get "/groups/#{group.name}/logs.json"
@@ -1913,12 +1969,10 @@ RSpec.describe GroupsController do
end
end
- context 'when user is an admin' do
- before do
- sign_in(admin)
- end
+ context "when user is an admin" do
+ before { sign_in(admin) }
- it 'should be able to view history' do
+ it "should be able to view history" do
GroupActionLogger.new(admin, group).log_remove_user_from_group(user)
get "/groups/#{group.name}/logs.json"
@@ -1930,7 +1984,7 @@ RSpec.describe GroupsController do
expect(result["action"]).to eq(GroupHistory.actions[3].to_s)
end
- it 'should be able to view history of automatic groups' do
+ it "should be able to view history of automatic groups" do
group = Group.find_by(id: Group::AUTO_GROUPS[:admins])
get "/groups/#{group.name}/logs.json"
@@ -1938,13 +1992,16 @@ RSpec.describe GroupsController do
expect(response.status).to eq(200)
end
- it 'should be able to filter through the history' do
+ it "should be able to filter through the history" do
GroupActionLogger.new(admin, group).log_add_user_to_group(user)
GroupActionLogger.new(admin, group).log_remove_user_from_group(user)
- get "/groups/#{group.name}/logs.json", params: {
- filters: { "action" => "add_user_to_group" }
- }
+ get "/groups/#{group.name}/logs.json",
+ params: {
+ filters: {
+ "action" => "add_user_to_group",
+ },
+ }
expect(response.status).to eq(200)
@@ -1956,44 +2013,41 @@ RSpec.describe GroupsController do
end
end
- describe '#request_membership' do
+ describe "#request_membership" do
fab!(:new_user) { Fabricate(:user) }
- it 'requires the user to log in' do
+ it "requires the user to log in" do
post "/groups/#{group.name}/request_membership.json"
expect(response.status).to eq(403)
end
- it 'requires a reason' do
+ it "requires a reason" do
sign_in(user)
post "/groups/#{group.name}/request_membership.json"
expect(response.status).to eq(400)
end
- it 'checks for duplicates' do
+ it "checks for duplicates" do
sign_in(user)
- post "/groups/#{group.name}/request_membership.json",
- params: { reason: 'Please add me in' }
+ post "/groups/#{group.name}/request_membership.json", params: { reason: "Please add me in" }
expect(response.status).to eq(200)
- post "/groups/#{group.name}/request_membership.json",
- params: { reason: 'Please add me in' }
+ post "/groups/#{group.name}/request_membership.json", params: { reason: "Please add me in" }
expect(response.status).to eq(409)
end
- it 'should create the right PM' do
+ it "should create the right PM" do
owner1 = Fabricate(:user, last_seen_at: Time.zone.now)
- owner2 = Fabricate(:user, last_seen_at: Time.zone.now - 1 .day)
+ owner2 = Fabricate(:user, last_seen_at: Time.zone.now - 1.day)
[owner1, owner2].each { |owner| group.add_owner(owner) }
sign_in(user)
- post "/groups/#{group.name}/request_membership.json",
- params: { reason: 'Please add me in' }
+ post "/groups/#{group.name}/request_membership.json", params: { reason: "Please add me in" }
expect(response.status).to eq(200)
@@ -2001,51 +2055,48 @@ RSpec.describe GroupsController do
topic = post.topic
body = response.parsed_body
- expect(body['relative_url']).to eq(topic.relative_url)
- expect(post.topic.custom_fields['requested_group_id'].to_i).to eq(group.id)
+ expect(body["relative_url"]).to eq(topic.relative_url)
+ expect(post.topic.custom_fields["requested_group_id"].to_i).to eq(group.id)
expect(post.user).to eq(user)
- expect(topic.title).to eq(I18n.t('groups.request_membership_pm.title',
- group_name: group.name
- ))
+ expect(topic.title).to eq(
+ I18n.t("groups.request_membership_pm.title", group_name: group.name),
+ )
- expect(post.raw).to start_with('Please add me in')
+ expect(post.raw).to start_with("Please add me in")
expect(topic.archetype).to eq(Archetype.private_message)
expect(topic.allowed_users).to contain_exactly(user, owner1, owner2)
expect(topic.allowed_groups).to eq([])
end
end
- describe '#search ' do
+ describe "#search " do
fab!(:hidden_group) do
- Fabricate(:group,
- visibility_level: Group.visibility_levels[:owners],
- name: 'KingOfTheNorth'
- )
+ Fabricate(:group, visibility_level: Group.visibility_levels[:owners], name: "KingOfTheNorth")
end
before do
group.update!(
- name: 'GOT',
- full_name: 'Daenerys Targaryen',
- visibility_level: Group.visibility_levels[:logged_on_users]
+ name: "GOT",
+ full_name: "Daenerys Targaryen",
+ visibility_level: Group.visibility_levels[:logged_on_users],
)
hidden_group
end
- context 'as an anon user' do
+ context "as an anon user" do
it "returns the right response" do
- get '/groups/search.json'
+ get "/groups/search.json"
expect(response.status).to eq(403)
end
end
- context 'as a normal user' do
+ context "as a normal user" do
it "returns the right response" do
sign_in(user)
- get '/groups/search.json'
+ get "/groups/search.json"
expect(response.status).to eq(200)
groups = response.parsed_body
@@ -2056,14 +2107,14 @@ RSpec.describe GroupsController do
expect(groups.map { |group| group["id"] }).to contain_exactly(*expected_ids)
- ['GO', 'nerys'].each do |term|
+ %w[GO nerys].each do |term|
get "/groups/search.json?term=#{term}"
expect(response.status).to eq(200)
groups = response.parsed_body
expect(groups.length).to eq(1)
- expect(groups.first['id']).to eq(group.id)
+ expect(groups.first["id"]).to eq(group.id)
end
get "/groups/search.json?term=KingOfTheNorth"
@@ -2075,10 +2126,8 @@ RSpec.describe GroupsController do
end
end
- context 'as a group owner' do
- before do
- hidden_group.add_owner(user)
- end
+ context "as a group owner" do
+ before { hidden_group.add_owner(user) }
it "returns the right response" do
sign_in(user)
@@ -2089,69 +2138,68 @@ RSpec.describe GroupsController do
groups = response.parsed_body
expect(groups.length).to eq(1)
- expect(groups.first['id']).to eq(hidden_group.id)
+ expect(groups.first["id"]).to eq(hidden_group.id)
end
end
- context 'as an admin' do
+ context "as an admin" do
it "returns the right response" do
sign_in(admin)
- get '/groups/search.json?ignore_automatic=true'
+ get "/groups/search.json?ignore_automatic=true"
expect(response.status).to eq(200)
groups = response.parsed_body
expect(groups.length).to eq(2)
- expect(groups.map { |group| group['id'] })
- .to contain_exactly(group.id, hidden_group.id)
+ expect(groups.map { |group| group["id"] }).to contain_exactly(group.id, hidden_group.id)
end
end
end
- describe '#new' do
- describe 'for an anon user' do
- it 'should return 404' do
- get '/groups/custom/new'
+ describe "#new" do
+ describe "for an anon user" do
+ it "should return 404" do
+ get "/groups/custom/new"
expect(response.status).to eq(404)
end
end
- describe 'for a normal user' do
+ describe "for a normal user" do
before { sign_in(user) }
- it 'should return 404' do
- get '/groups/custom/new'
+ it "should return 404" do
+ get "/groups/custom/new"
expect(response.status).to eq(404)
end
end
- describe 'for an admin user' do
+ describe "for an admin user" do
before { sign_in(admin) }
- it 'should return 200' do
- get '/groups/custom/new'
+ it "should return 200" do
+ get "/groups/custom/new"
expect(response.status).to eq(200)
end
end
end
- describe '#check_name' do
- describe 'for an anon user' do
- it 'should return the right response' do
- get "/groups/check-name.json", params: { group_name: 'test' }
+ describe "#check_name" do
+ describe "for an anon user" do
+ it "should return the right response" do
+ get "/groups/check-name.json", params: { group_name: "test" }
expect(response.status).to eq(403)
end
end
- it 'should return the right response' do
+ it "should return the right response" do
sign_in(Fabricate(:user))
- SiteSetting.reserved_usernames = 'test|donkey'
- get "/groups/check-name.json", params: { group_name: 'test' }
+ SiteSetting.reserved_usernames = "test|donkey"
+ get "/groups/check-name.json", params: { group_name: "test" }
expect(response.status).to eq(200)
expect(response.parsed_body["available"]).to eq(true)
@@ -2159,9 +2207,7 @@ RSpec.describe GroupsController do
end
describe "#permissions" do
- before do
- sign_in(other_user)
- end
+ before { sign_in(other_user) }
it "ensures the group can be seen" do
group.update!(visibility_level: Group.visibility_levels[:owners])
@@ -2211,7 +2257,7 @@ RSpec.describe GroupsController do
expect(response.status).to eq(200)
expect(response.parsed_body.map { |permission| permission["category"]["name"] }).to eq(
- ["Abc", "Hello", "New Cat", "Three"]
+ ["Abc", "Hello", "New Cat", "Three"],
)
end
end
@@ -2224,7 +2270,7 @@ RSpec.describe GroupsController do
port: port,
host: host,
username: username,
- password: password
+ password: password,
}
end
@@ -2244,12 +2290,17 @@ RSpec.describe GroupsController do
context "when an error is raised" do
before do
- EmailSettingsValidator.expects(:validate_smtp).raises(Net::SMTPAuthenticationError, "Invalid credentials")
+ EmailSettingsValidator.expects(:validate_smtp).raises(
+ Net::SMTPAuthenticationError,
+ "Invalid credentials",
+ )
end
it "uses the friendly error message functionality to return the message to the user" do
post "/groups/#{group.id}/test_email_settings.json", params: params
expect(response.status).to eq(422)
- expect(response.parsed_body["errors"]).to include(I18n.t("email_settings.smtp_authentication_error"))
+ expect(response.parsed_body["errors"]).to include(
+ I18n.t("email_settings.smtp_authentication_error"),
+ )
end
end
end
@@ -2264,9 +2315,7 @@ RSpec.describe GroupsController do
let(:port) { 993 }
it "validates with the correct TLS settings" do
- EmailSettingsValidator.expects(:validate_imap).with(
- has_entry(ssl: true)
- )
+ EmailSettingsValidator.expects(:validate_imap).with(has_entry(ssl: true))
post "/groups/#{group.id}/test_email_settings.json", params: params
expect(response.status).to eq(200)
end
@@ -2274,13 +2323,16 @@ RSpec.describe GroupsController do
context "when an error is raised" do
before do
EmailSettingsValidator.expects(:validate_imap).raises(
- Net::IMAP::NoResponseError, stub(data: stub(text: "Invalid credentials"))
+ Net::IMAP::NoResponseError,
+ stub(data: stub(text: "Invalid credentials")),
)
end
it "uses the friendly error message functionality to return the message to the user" do
post "/groups/#{group.id}/test_email_settings.json", params: params
expect(response.status).to eq(422)
- expect(response.parsed_body["errors"]).to include(I18n.t("email_settings.imap_authentication_error"))
+ expect(response.parsed_body["errors"]).to include(
+ I18n.t("email_settings.imap_authentication_error"),
+ )
end
end
end
@@ -2298,14 +2350,14 @@ RSpec.describe GroupsController do
it "raises an invalid params error" do
post "/groups/#{group.id}/test_email_settings.json", params: params
expect(response.status).to eq(400)
- expect(response.parsed_body["errors"].first).to match(/Valid protocols to test are smtp and imap/)
+ expect(response.parsed_body["errors"].first).to match(
+ /Valid protocols to test are smtp and imap/,
+ )
end
end
context "when user does not have access to the group" do
- before do
- group.group_users.destroy_all
- end
+ before { group.group_users.destroy_all }
it "errors if the user does not have access to the group" do
post "/groups/#{group.id}/test_email_settings.json", params: params
@@ -2318,9 +2370,7 @@ RSpec.describe GroupsController do
RateLimiter.enable
RateLimiter.clear_all!
- 5.times do
- post "/groups/#{group.id}/test_email_settings.json", params: params
- end
+ 5.times { post "/groups/#{group.id}/test_email_settings.json", params: params }
post "/groups/#{group.id}/test_email_settings.json", params: params
expect(response.status).to eq(429)
end
diff --git a/spec/requests/hashtags_controller_spec.rb b/spec/requests/hashtags_controller_spec.rb
index 2eb51bfbc93..9cffbf5b96f 100644
--- a/spec/requests/hashtags_controller_spec.rb
+++ b/spec/requests/hashtags_controller_spec.rb
@@ -8,7 +8,9 @@ RSpec.describe HashtagsController do
fab!(:private_category) { Fabricate(:private_category, group: group) }
fab!(:hidden_tag) { Fabricate(:tag, name: "hidden") }
- let(:tag_group) { Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name]) }
+ let(:tag_group) do
+ Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name])
+ end
before do
SiteSetting.tagging_enabled = true
@@ -18,27 +20,38 @@ RSpec.describe HashtagsController do
describe "#lookup" do
context "when logged in" do
context "as regular user" do
- before do
- sign_in(Fabricate(:user))
- end
+ before { sign_in(Fabricate(:user)) }
it "returns only valid categories and tags" do
- get "/hashtags.json", params: { slugs: [category.slug, private_category.slug, "none", tag.name, hidden_tag.name] }
+ get "/hashtags.json",
+ params: {
+ slugs: [category.slug, private_category.slug, "none", tag.name, hidden_tag.name],
+ }
expect(response.status).to eq(200)
expect(response.parsed_body).to eq(
- "categories" => { category.slug => category.url },
- "tags" => { tag.name => tag.full_url }
+ "categories" => {
+ category.slug => category.url,
+ },
+ "tags" => {
+ tag.name => tag.full_url,
+ },
)
end
it "handles tags with the TAG_HASHTAG_POSTFIX" do
- get "/hashtags.json", params: { slugs: ["#{tag.name}#{PrettyText::Helpers::TAG_HASHTAG_POSTFIX}"] }
+ get "/hashtags.json",
+ params: {
+ slugs: ["#{tag.name}#{PrettyText::Helpers::TAG_HASHTAG_POSTFIX}"],
+ }
expect(response.status).to eq(200)
expect(response.parsed_body).to eq(
- "categories" => {},
- "tags" => { tag.name => tag.full_url }
+ "categories" => {
+ },
+ "tags" => {
+ tag.name => tag.full_url,
+ },
)
end
@@ -53,9 +66,7 @@ RSpec.describe HashtagsController do
context "as admin" do
fab!(:admin) { Fabricate(:admin) }
- before do
- sign_in(admin)
- end
+ before { sign_in(admin) }
it "returns restricted categories and hidden tags" do
group.add(admin)
@@ -64,8 +75,12 @@ RSpec.describe HashtagsController do
expect(response.status).to eq(200)
expect(response.parsed_body).to eq(
- "categories" => { private_category.slug => private_category.url },
- "tags" => { hidden_tag.name => hidden_tag.full_url }
+ "categories" => {
+ private_category.slug => private_category.url,
+ },
+ "tags" => {
+ hidden_tag.name => hidden_tag.full_url,
+ },
)
end
end
@@ -79,26 +94,29 @@ RSpec.describe HashtagsController do
it "works" do
foo = Fabricate(:category_with_definition, slug: "foo")
foobar = Fabricate(:category_with_definition, slug: "bar", parent_category_id: foo.id)
- foobarbaz = Fabricate(:category_with_definition, slug: "baz", parent_category_id: foobar.id)
+ foobarbaz =
+ Fabricate(:category_with_definition, slug: "baz", parent_category_id: foobar.id)
qux = Fabricate(:category_with_definition, slug: "qux")
quxbar = Fabricate(:category_with_definition, slug: "bar", parent_category_id: qux.id)
- quxbarbaz = Fabricate(:category_with_definition, slug: "baz", parent_category_id: quxbar.id)
+ quxbarbaz =
+ Fabricate(:category_with_definition, slug: "baz", parent_category_id: quxbar.id)
- get "/hashtags.json", params: {
- slugs: [
- ":", # should not work
- "foo",
- "bar", # should not work
- "baz", # should not work
- "foo:bar",
- "bar:baz",
- "foo:bar:baz", # should not work
- "qux",
- "qux:bar",
- "qux:bar:baz" # should not work
- ]
- }
+ get "/hashtags.json",
+ params: {
+ slugs: [
+ ":", # should not work
+ "foo",
+ "bar", # should not work
+ "baz", # should not work
+ "foo:bar",
+ "bar:baz",
+ "foo:bar:baz", # should not work
+ "qux",
+ "qux:bar",
+ "qux:bar:baz", # should not work
+ ],
+ }
expect(response.status).to eq(200)
expect(response.parsed_body["categories"]).to eq(
@@ -106,7 +124,7 @@ RSpec.describe HashtagsController do
"foo:bar" => foobar.url,
"bar:baz" => foobarbaz.id < quxbarbaz.id ? foobarbaz.url : quxbarbaz.url,
"qux" => qux.url,
- "qux:bar" => quxbar.url
+ "qux:bar" => quxbar.url,
)
end
end
diff --git a/spec/requests/inline_onebox_controller_spec.rb b/spec/requests/inline_onebox_controller_spec.rb
index f07eab6457c..ba3a25ae5b7 100644
--- a/spec/requests/inline_onebox_controller_spec.rb
+++ b/spec/requests/inline_onebox_controller_spec.rb
@@ -13,21 +13,21 @@ RSpec.describe InlineOneboxController do
get "/inline-onebox.json", params: { urls: [] }
expect(response.status).to eq(200)
json = response.parsed_body
- expect(json['inline-oneboxes']).to eq([])
+ expect(json["inline-oneboxes"]).to eq([])
end
context "with topic link" do
fab!(:topic) { Fabricate(:topic) }
it "returns information for a valid link" do
- get "/inline-onebox.json", params: { urls: [ topic.url ] }
+ get "/inline-onebox.json", params: { urls: [topic.url] }
expect(response.status).to eq(200)
json = response.parsed_body
- onebox = json['inline-oneboxes'][0]
+ onebox = json["inline-oneboxes"][0]
expect(onebox).to be_present
- expect(onebox['url']).to eq(topic.url)
- expect(onebox['title']).to eq(topic.title)
+ expect(onebox["url"]).to eq(topic.url)
+ expect(onebox["title"]).to eq(topic.title)
end
end
end
diff --git a/spec/requests/invites_controller_spec.rb b/spec/requests/invites_controller_spec.rb
index 60dc16785da..05c1757eac2 100644
--- a/spec/requests/invites_controller_spec.rb
+++ b/spec/requests/invites_controller_spec.rb
@@ -4,79 +4,85 @@ RSpec.describe InvitesController do
fab!(:admin) { Fabricate(:admin) }
fab!(:user) { Fabricate(:user, trust_level: SiteSetting.min_trust_level_to_allow_invite) }
- describe '#show' do
+ describe "#show" do
fab!(:invite) { Fabricate(:invite) }
- it 'shows the accept invite page' do
+ it "shows the accept invite page" do
get "/invites/#{invite.invite_key}"
expect(response.status).to eq(200)
expect(response.body).to have_tag(:script, with: { src: "/assets/discourse.js" })
expect(response.body).not_to include(invite.email)
- expect(response.body).to_not include(I18n.t('invite.not_found_template', site_name: SiteSetting.title, base_url: Discourse.base_url))
+ expect(response.body).to_not include(
+ I18n.t(
+ "invite.not_found_template",
+ site_name: SiteSetting.title,
+ base_url: Discourse.base_url,
+ ),
+ )
- expect(response.body).to have_tag('div#data-preloaded') do |element|
- json = JSON.parse(element.current_scope.attribute('data-preloaded').value)
- invite_info = JSON.parse(json['invite_info'])
- expect(invite_info['username']).to eq('')
- expect(invite_info['email']).to eq('i*****g@a***********e.ooo')
+ expect(response.body).to have_tag("div#data-preloaded") do |element|
+ json = JSON.parse(element.current_scope.attribute("data-preloaded").value)
+ invite_info = JSON.parse(json["invite_info"])
+ expect(invite_info["username"]).to eq("")
+ expect(invite_info["email"]).to eq("i*****g@a***********e.ooo")
end
end
- context 'when email data is present in authentication data' do
+ context "when email data is present in authentication data" do
let(:store) { ActionDispatch::Session::CookieStore.new({}) }
- let(:session_stub) { ActionDispatch::Request::Session.create(store, ActionDispatch::TestRequest.create, {}) }
+ let(:session_stub) do
+ ActionDispatch::Request::Session.create(store, ActionDispatch::TestRequest.create, {})
+ end
before do
session_stub[:authentication] = { email: invite.email }
ActionDispatch::Request.any_instance.stubs(:session).returns(session_stub)
end
- it 'shows unobfuscated email' do
+ it "shows unobfuscated email" do
get "/invites/#{invite.invite_key}"
expect(response.status).to eq(200)
expect(response.body).to have_tag(:script, with: { src: "/assets/discourse.js" })
expect(response.body).to include(invite.email)
- expect(response.body).not_to include('i*****g@a***********e.ooo')
+ expect(response.body).not_to include("i*****g@a***********e.ooo")
end
end
- it 'shows default user fields' do
+ it "shows default user fields" do
user_field = Fabricate(:user_field)
staged_user = Fabricate(:user, staged: true, email: invite.email)
- staged_user.set_user_field(user_field.id, 'some value')
+ staged_user.set_user_field(user_field.id, "some value")
staged_user.save_custom_fields
get "/invites/#{invite.invite_key}"
expect(response.body).to have_tag("div#data-preloaded") do |element|
- json = JSON.parse(element.current_scope.attribute('data-preloaded').value)
- invite_info = JSON.parse(json['invite_info'])
- expect(invite_info['username']).to eq(staged_user.username)
- expect(invite_info['user_fields'][user_field.id.to_s]).to eq('some value')
+ json = JSON.parse(element.current_scope.attribute("data-preloaded").value)
+ invite_info = JSON.parse(json["invite_info"])
+ expect(invite_info["username"]).to eq(staged_user.username)
+ expect(invite_info["user_fields"][user_field.id.to_s]).to eq("some value")
end
end
- it 'includes token validity boolean' do
+ it "includes token validity boolean" do
get "/invites/#{invite.invite_key}"
expect(response.body).to have_tag("div#data-preloaded") do |element|
- json = JSON.parse(element.current_scope.attribute('data-preloaded').value)
- invite_info = JSON.parse(json['invite_info'])
- expect(invite_info['email_verified_by_link']).to eq(false)
+ json = JSON.parse(element.current_scope.attribute("data-preloaded").value)
+ invite_info = JSON.parse(json["invite_info"])
+ expect(invite_info["email_verified_by_link"]).to eq(false)
end
get "/invites/#{invite.invite_key}?t=#{invite.email_token}"
expect(response.body).to have_tag("div#data-preloaded") do |element|
- json = JSON.parse(element.current_scope.attribute('data-preloaded').value)
- invite_info = JSON.parse(json['invite_info'])
- expect(invite_info['email_verified_by_link']).to eq(true)
+ json = JSON.parse(element.current_scope.attribute("data-preloaded").value)
+ invite_info = JSON.parse(json["invite_info"])
+ expect(invite_info["email_verified_by_link"]).to eq(true)
end
end
- describe 'logged in user viewing an invite' do
+ describe "logged in user viewing an invite" do
fab!(:group) { Fabricate(:group) }
- before do
- sign_in(user)
- end
+ before { sign_in(user) }
it "shows the accept invite page when user's email matches the invite email" do
invite.update_columns(email: user.email)
@@ -84,49 +90,63 @@ RSpec.describe InvitesController do
get "/invites/#{invite.invite_key}"
expect(response.status).to eq(200)
expect(response.body).to have_tag(:script, with: { src: "/assets/discourse.js" })
- expect(response.body).not_to include(I18n.t('invite.not_found_template', site_name: SiteSetting.title, base_url: Discourse.base_url))
+ expect(response.body).not_to include(
+ I18n.t(
+ "invite.not_found_template",
+ site_name: SiteSetting.title,
+ base_url: Discourse.base_url,
+ ),
+ )
- expect(response.body).to have_tag('div#data-preloaded') do |element|
- json = JSON.parse(element.current_scope.attribute('data-preloaded').value)
- invite_info = JSON.parse(json['invite_info'])
- expect(invite_info['username']).to eq(user.username)
- expect(invite_info['email']).to eq(user.email)
- expect(invite_info['existing_user_id']).to eq(user.id)
- expect(invite_info['existing_user_can_redeem']).to eq(true)
+ expect(response.body).to have_tag("div#data-preloaded") do |element|
+ json = JSON.parse(element.current_scope.attribute("data-preloaded").value)
+ invite_info = JSON.parse(json["invite_info"])
+ expect(invite_info["username"]).to eq(user.username)
+ expect(invite_info["email"]).to eq(user.email)
+ expect(invite_info["existing_user_id"]).to eq(user.id)
+ expect(invite_info["existing_user_can_redeem"]).to eq(true)
end
end
it "shows the accept invite page when user's email domain matches the domain an invite link is restricted to" do
- invite.update!(email: nil, domain: 'discourse.org')
+ invite.update!(email: nil, domain: "discourse.org")
user.update!(email: "someguy@discourse.org")
get "/invites/#{invite.invite_key}"
expect(response.status).to eq(200)
expect(response.body).to have_tag(:script, with: { src: "/assets/discourse.js" })
- expect(response.body).not_to include(I18n.t('invite.not_found_template', site_name: SiteSetting.title, base_url: Discourse.base_url))
+ expect(response.body).not_to include(
+ I18n.t(
+ "invite.not_found_template",
+ site_name: SiteSetting.title,
+ base_url: Discourse.base_url,
+ ),
+ )
- expect(response.body).to have_tag('div#data-preloaded') do |element|
- json = JSON.parse(element.current_scope.attribute('data-preloaded').value)
- invite_info = JSON.parse(json['invite_info'])
- expect(invite_info['username']).to eq(user.username)
- expect(invite_info['email']).to eq(user.email)
- expect(invite_info['existing_user_id']).to eq(user.id)
- expect(invite_info['existing_user_can_redeem']).to eq(true)
+ expect(response.body).to have_tag("div#data-preloaded") do |element|
+ json = JSON.parse(element.current_scope.attribute("data-preloaded").value)
+ invite_info = JSON.parse(json["invite_info"])
+ expect(invite_info["username"]).to eq(user.username)
+ expect(invite_info["email"]).to eq(user.email)
+ expect(invite_info["existing_user_id"]).to eq(user.id)
+ expect(invite_info["existing_user_can_redeem"]).to eq(true)
end
end
it "does not allow the user to accept the invite when their email domain does not match the domain of the invite" do
user.update!(email: "someguy@discourse.com")
- invite.update!(email: nil, domain: 'discourse.org')
+ invite.update!(email: nil, domain: "discourse.org")
get "/invites/#{invite.invite_key}"
expect(response.status).to eq(200)
- expect(response.body).to have_tag('div#data-preloaded') do |element|
- json = JSON.parse(element.current_scope.attribute('data-preloaded').value)
- invite_info = JSON.parse(json['invite_info'])
- expect(invite_info['existing_user_can_redeem']).to eq(false)
- expect(invite_info['existing_user_can_redeem_error']).to eq(I18n.t("invite.existing_user_cannot_redeem"))
+ expect(response.body).to have_tag("div#data-preloaded") do |element|
+ json = JSON.parse(element.current_scope.attribute("data-preloaded").value)
+ invite_info = JSON.parse(json["invite_info"])
+ expect(invite_info["existing_user_can_redeem"]).to eq(false)
+ expect(invite_info["existing_user_can_redeem_error"]).to eq(
+ I18n.t("invite.existing_user_cannot_redeem"),
+ )
end
end
@@ -136,10 +156,10 @@ RSpec.describe InvitesController do
get "/invites/#{invite.invite_key}"
expect(response.status).to eq(200)
- expect(response.body).to have_tag('div#data-preloaded') do |element|
- json = JSON.parse(element.current_scope.attribute('data-preloaded').value)
- invite_info = JSON.parse(json['invite_info'])
- expect(invite_info['existing_user_can_redeem']).to eq(false)
+ expect(response.body).to have_tag("div#data-preloaded") do |element|
+ json = JSON.parse(element.current_scope.attribute("data-preloaded").value)
+ invite_info = JSON.parse(json["invite_info"])
+ expect(invite_info["existing_user_can_redeem"]).to eq(false)
end
end
@@ -150,12 +170,14 @@ RSpec.describe InvitesController do
get "/invites/#{invite.invite_key}"
expect(response.status).to eq(200)
- expect(response.body).to have_tag('div#data-preloaded') do |element|
- json = JSON.parse(element.current_scope.attribute('data-preloaded').value)
- invite_info = JSON.parse(json['invite_info'])
- expect(invite_info['existing_user_id']).to eq(user.id)
- expect(invite_info['existing_user_can_redeem']).to eq(false)
- expect(invite_info['existing_user_can_redeem_error']).to eq(I18n.t("invite.existing_user_already_redemeed"))
+ expect(response.body).to have_tag("div#data-preloaded") do |element|
+ json = JSON.parse(element.current_scope.attribute("data-preloaded").value)
+ invite_info = JSON.parse(json["invite_info"])
+ expect(invite_info["existing_user_id"]).to eq(user.id)
+ expect(invite_info["existing_user_can_redeem"]).to eq(false)
+ expect(invite_info["existing_user_can_redeem_error"]).to eq(
+ I18n.t("invite.existing_user_already_redemeed"),
+ )
end
end
@@ -165,93 +187,108 @@ RSpec.describe InvitesController do
get "/invites/#{invite.invite_key}"
expect(response.status).to eq(200)
- expect(response.body).to have_tag('div#data-preloaded') do |element|
- json = JSON.parse(element.current_scope.attribute('data-preloaded').value)
- invite_info = JSON.parse(json['invite_info'])
- expect(invite_info['existing_user_id']).to eq(user.id)
- expect(invite_info['existing_user_can_redeem']).to eq(true)
+ expect(response.body).to have_tag("div#data-preloaded") do |element|
+ json = JSON.parse(element.current_scope.attribute("data-preloaded").value)
+ invite_info = JSON.parse(json["invite_info"])
+ expect(invite_info["existing_user_id"]).to eq(user.id)
+ expect(invite_info["existing_user_can_redeem"]).to eq(true)
end
end
end
- it 'fails if invite does not exist' do
- get '/invites/missing'
+ it "fails if invite does not exist" do
+ get "/invites/missing"
expect(response.status).to eq(200)
- expect(response.body).to_not have_tag(:script, with: { src: '/assets/application.js' })
- expect(response.body).to include(I18n.t('invite.not_found', base_url: Discourse.base_url))
+ expect(response.body).to_not have_tag(:script, with: { src: "/assets/application.js" })
+ expect(response.body).to include(I18n.t("invite.not_found", base_url: Discourse.base_url))
end
- it 'fails if invite expired' do
+ it "fails if invite expired" do
invite.update(expires_at: 1.day.ago)
get "/invites/#{invite.invite_key}"
expect(response.status).to eq(200)
- expect(response.body).to_not have_tag(:script, with: { src: '/assets/application.js' })
- expect(response.body).to include(I18n.t('invite.expired', base_url: Discourse.base_url))
+ expect(response.body).to_not have_tag(:script, with: { src: "/assets/application.js" })
+ expect(response.body).to include(I18n.t("invite.expired", base_url: Discourse.base_url))
end
- it 'stores the invite key in the secure session if invite exists' do
+ it "stores the invite key in the secure session if invite exists" do
get "/invites/#{invite.invite_key}"
expect(response.status).to eq(200)
- invite_key = read_secure_session['invite-key']
+ invite_key = read_secure_session["invite-key"]
expect(invite_key).to eq(invite.invite_key)
end
- it 'returns error if invite has already been redeemed' do
+ it "returns error if invite has already been redeemed" do
expect(invite.redeem).not_to eq(nil)
get "/invites/#{invite.invite_key}"
expect(response.status).to eq(200)
- expect(response.body).to_not have_tag(:script, with: { src: '/assets/application.js' })
- expect(response.body).to include(I18n.t('invite.not_found_template', site_name: SiteSetting.title, base_url: Discourse.base_url))
+ expect(response.body).to_not have_tag(:script, with: { src: "/assets/application.js" })
+ expect(response.body).to include(
+ I18n.t(
+ "invite.not_found_template",
+ site_name: SiteSetting.title,
+ base_url: Discourse.base_url,
+ ),
+ )
invite.update!(email: nil) # convert to email invite
get "/invites/#{invite.invite_key}"
expect(response.status).to eq(200)
- expect(response.body).to_not have_tag(:script, with: { src: '/assets/application.js' })
- expect(response.body).to include(I18n.t('invite.not_found_template_link', site_name: SiteSetting.title, base_url: Discourse.base_url))
+ expect(response.body).to_not have_tag(:script, with: { src: "/assets/application.js" })
+ expect(response.body).to include(
+ I18n.t(
+ "invite.not_found_template_link",
+ site_name: SiteSetting.title,
+ base_url: Discourse.base_url,
+ ),
+ )
end
end
- describe '#create' do
- it 'requires to be logged in' do
- post '/invites.json', params: { email: 'test@example.com' }
+ describe "#create" do
+ it "requires to be logged in" do
+ post "/invites.json", params: { email: "test@example.com" }
expect(response.status).to eq(403)
end
- context 'while logged in' do
- before do
- sign_in(user)
- end
+ context "while logged in" do
+ before { sign_in(user) }
- it 'fails if you cannot invite to the forum' do
+ it "fails if you cannot invite to the forum" do
sign_in(Fabricate(:user))
- post '/invites.json', params: { email: 'test@example.com' }
+ post "/invites.json", params: { email: "test@example.com" }
expect(response).to be_forbidden
end
end
- context 'with invite to topic' do
+ context "with invite to topic" do
fab!(:topic) { Fabricate(:topic) }
- it 'works' do
+ it "works" do
sign_in(user)
- post '/invites.json', params: { email: 'test@example.com', topic_id: topic.id, invite_to_topic: true }
+ post "/invites.json",
+ params: {
+ email: "test@example.com",
+ topic_id: topic.id,
+ invite_to_topic: true,
+ }
expect(response.status).to eq(200)
- expect(Jobs::InviteEmail.jobs.first['args'].first['invite_to_topic']).to be_truthy
+ expect(Jobs::InviteEmail.jobs.first["args"].first["invite_to_topic"]).to be_truthy
end
- it 'fails when topic_id is invalid' do
+ it "fails when topic_id is invalid" do
sign_in(user)
- post '/invites.json', params: { email: 'test@example.com', topic_id: -9999 }
+ post "/invites.json", params: { email: "test@example.com", topic_id: -9999 }
expect(response.status).to eq(400)
end
- context 'when topic is private' do
+ context "when topic is private" do
fab!(:group) { Fabricate(:group) }
fab!(:secured_category) do |category|
@@ -263,135 +300,139 @@ RSpec.describe InvitesController do
fab!(:topic) { Fabricate(:topic, category: secured_category) }
- it 'does not work and returns a list of required groups' do
+ it "does not work and returns a list of required groups" do
sign_in(admin)
- post '/invites.json', params: { email: 'test@example.com', topic_id: topic.id }
+ post "/invites.json", params: { email: "test@example.com", topic_id: topic.id }
expect(response.status).to eq(422)
- expect(response.parsed_body["errors"]).to contain_exactly(I18n.t("invite.requires_groups", groups: group.name))
+ expect(response.parsed_body["errors"]).to contain_exactly(
+ I18n.t("invite.requires_groups", groups: group.name),
+ )
end
- it 'does not work if user cannot edit groups' do
+ it "does not work if user cannot edit groups" do
group.add(user)
sign_in(user)
- post '/invites.json', params: { email: 'test@example.com', topic_id: topic.id }
+ post "/invites.json", params: { email: "test@example.com", topic_id: topic.id }
expect(response.status).to eq(403)
end
end
end
- context 'with invite to group' do
+ context "with invite to group" do
fab!(:group) { Fabricate(:group) }
- it 'works for admins' do
+ it "works for admins" do
sign_in(admin)
- post '/invites.json', params: { email: 'test@example.com', group_ids: [group.id] }
+ post "/invites.json", params: { email: "test@example.com", group_ids: [group.id] }
expect(response.status).to eq(200)
- expect(Invite.find_by(email: 'test@example.com').invited_groups.count).to eq(1)
+ expect(Invite.find_by(email: "test@example.com").invited_groups.count).to eq(1)
end
- it 'works for group owners' do
+ it "works for group owners" do
sign_in(user)
group.add_owner(user)
- post '/invites.json', params: { email: 'test@example.com', group_ids: [group.id] }
+ post "/invites.json", params: { email: "test@example.com", group_ids: [group.id] }
expect(response.status).to eq(200)
- expect(Invite.find_by(email: 'test@example.com').invited_groups.count).to eq(1)
+ expect(Invite.find_by(email: "test@example.com").invited_groups.count).to eq(1)
end
- it 'works with multiple groups' do
+ it "works with multiple groups" do
sign_in(admin)
group2 = Fabricate(:group)
- post '/invites.json', params: { email: 'test@example.com', group_names: "#{group.name},#{group2.name}" }
+ post "/invites.json",
+ params: {
+ email: "test@example.com",
+ group_names: "#{group.name},#{group2.name}",
+ }
expect(response.status).to eq(200)
- expect(Invite.find_by(email: 'test@example.com').invited_groups.count).to eq(2)
+ expect(Invite.find_by(email: "test@example.com").invited_groups.count).to eq(2)
end
- it 'fails for group members' do
+ it "fails for group members" do
sign_in(user)
group.add(user)
- post '/invites.json', params: { email: 'test@example.com', group_ids: [group.id] }
+ post "/invites.json", params: { email: "test@example.com", group_ids: [group.id] }
expect(response.status).to eq(403)
end
- it 'fails for other users' do
+ it "fails for other users" do
sign_in(user)
- post '/invites.json', params: { email: 'test@example.com', group_ids: [group.id] }
+ post "/invites.json", params: { email: "test@example.com", group_ids: [group.id] }
expect(response.status).to eq(403)
end
- it 'fails to invite new user to a group-private topic' do
+ it "fails to invite new user to a group-private topic" do
sign_in(user)
private_category = Fabricate(:private_category, group: group)
group_private_topic = Fabricate(:topic, category: private_category)
- post '/invites.json', params: { email: 'test@example.com', topic_id: group_private_topic.id }
+ post "/invites.json",
+ params: {
+ email: "test@example.com",
+ topic_id: group_private_topic.id,
+ }
expect(response.status).to eq(403)
end
end
- context 'with email invite' do
- subject(:create_invite) { post '/invites.json', params: params }
+ context "with email invite" do
+ subject(:create_invite) { post "/invites.json", params: params }
let(:params) { { email: email } }
- let(:email) { 'test@example.com' }
+ let(:email) { "test@example.com" }
- before do
- sign_in(user)
- end
+ before { sign_in(user) }
- context 'when doing successive calls' do
+ context "when doing successive calls" do
let(:invite) { Invite.last }
- it 'creates invite once and updates it after' do
+ it "creates invite once and updates it after" do
create_invite
expect(response).to have_http_status :ok
expect(Jobs::InviteEmail.jobs.size).to eq(1)
create_invite
expect(response).to have_http_status :ok
- expect(response.parsed_body['id']).to eq(invite.id)
+ expect(response.parsed_body["id"]).to eq(invite.id)
end
end
context 'when "skip_email" parameter is provided' do
- before do
- params[:skip_email] = true
- end
+ before { params[:skip_email] = true }
- it 'accepts the parameter' do
+ it "accepts the parameter" do
create_invite
expect(response).to have_http_status :ok
expect(Jobs::InviteEmail.jobs.size).to eq(0)
end
end
- context 'when validations fail' do
- let(:email) { 'test@mailinator.com' }
+ context "when validations fail" do
+ let(:email) { "test@mailinator.com" }
- it 'fails' do
+ it "fails" do
create_invite
expect(response).to have_http_status :unprocessable_entity
- expect(response.parsed_body['errors']).to be_present
+ expect(response.parsed_body["errors"]).to be_present
end
end
- context 'when providing an email belonging to an existing user' do
+ context "when providing an email belonging to an existing user" do
let(:email) { user.email }
- before do
- SiteSetting.hide_email_address_taken = hide_email_address_taken
- end
+ before { SiteSetting.hide_email_address_taken = hide_email_address_taken }
context 'when "hide_email_address_taken" setting is disabled' do
let(:hide_email_address_taken) { false }
- it 'returns an error' do
+ it "returns an error" do
create_invite
expect(response).to have_http_status :unprocessable_entity
expect(body).to match(/no need to invite/)
@@ -401,7 +442,7 @@ RSpec.describe InvitesController do
context 'when "hide_email_address_taken" setting is enabled' do
let(:hide_email_address_taken) { true }
- it 'doesn’t inform the user' do
+ it "doesn’t inform the user" do
create_invite
expect(response).to have_http_status :ok
expect(response.parsed_body).to be_blank
@@ -410,127 +451,134 @@ RSpec.describe InvitesController do
end
end
- context 'with link invite' do
- it 'works' do
+ context "with link invite" do
+ it "works" do
sign_in(admin)
- post '/invites.json'
+ post "/invites.json"
expect(response.status).to eq(200)
expect(Invite.last.email).to eq(nil)
expect(Invite.last.invited_by).to eq(admin)
expect(Invite.last.max_redemptions_allowed).to eq(1)
end
- it 'fails if over invite_link_max_redemptions_limit' do
+ it "fails if over invite_link_max_redemptions_limit" do
sign_in(admin)
- post '/invites.json', params: { max_redemptions_allowed: SiteSetting.invite_link_max_redemptions_limit - 1 }
+ post "/invites.json",
+ params: {
+ max_redemptions_allowed: SiteSetting.invite_link_max_redemptions_limit - 1,
+ }
expect(response.status).to eq(200)
- post '/invites.json', params: { max_redemptions_allowed: SiteSetting.invite_link_max_redemptions_limit + 1 }
+ post "/invites.json",
+ params: {
+ max_redemptions_allowed: SiteSetting.invite_link_max_redemptions_limit + 1,
+ }
expect(response.status).to eq(422)
end
- it 'fails if over invite_link_max_redemptions_limit_users' do
+ it "fails if over invite_link_max_redemptions_limit_users" do
sign_in(user)
- post '/invites.json', params: { max_redemptions_allowed: SiteSetting.invite_link_max_redemptions_limit_users - 1 }
+ post "/invites.json",
+ params: {
+ max_redemptions_allowed: SiteSetting.invite_link_max_redemptions_limit_users - 1,
+ }
expect(response.status).to eq(200)
- post '/invites.json', params: { max_redemptions_allowed: SiteSetting.invite_link_max_redemptions_limit_users + 1 }
+ post "/invites.json",
+ params: {
+ max_redemptions_allowed: SiteSetting.invite_link_max_redemptions_limit_users + 1,
+ }
expect(response.status).to eq(422)
end
end
end
- describe '#retrieve' do
- it 'requires to be logged in' do
- get '/invites/retrieve.json', params: { email: 'test@example.com' }
+ describe "#retrieve" do
+ it "requires to be logged in" do
+ get "/invites/retrieve.json", params: { email: "test@example.com" }
expect(response.status).to eq(403)
end
- context 'while logged in' do
- before do
- sign_in(user)
- end
+ context "while logged in" do
+ before { sign_in(user) }
- fab!(:invite) { Fabricate(:invite, invited_by: user, email: 'test@example.com') }
+ fab!(:invite) { Fabricate(:invite, invited_by: user, email: "test@example.com") }
- it 'raises an error when the email is missing' do
- get '/invites/retrieve.json'
+ it "raises an error when the email is missing" do
+ get "/invites/retrieve.json"
expect(response.status).to eq(400)
end
- it 'raises an error when the email cannot be found' do
- get '/invites/retrieve.json', params: { email: 'test2@example.com' }
+ it "raises an error when the email cannot be found" do
+ get "/invites/retrieve.json", params: { email: "test2@example.com" }
expect(response.status).to eq(400)
end
- it 'can retrieve the invite' do
- get '/invites/retrieve.json', params: { email: 'test@example.com' }
+ it "can retrieve the invite" do
+ get "/invites/retrieve.json", params: { email: "test@example.com" }
expect(response.status).to eq(200)
end
end
end
- describe '#update' do
- fab!(:invite) { Fabricate(:invite, invited_by: admin, email: 'test@example.com') }
+ describe "#update" do
+ fab!(:invite) { Fabricate(:invite, invited_by: admin, email: "test@example.com") }
- it 'requires to be logged in' do
- put "/invites/#{invite.id}", params: { email: 'test2@example.com' }
+ it "requires to be logged in" do
+ put "/invites/#{invite.id}", params: { email: "test2@example.com" }
expect(response.status).to eq(400)
end
- context 'while logged in' do
- before do
- sign_in(admin)
- end
+ context "while logged in" do
+ before { sign_in(admin) }
- it 'resends invite email if updating email address' do
- put "/invites/#{invite.id}", params: { email: 'test2@example.com' }
+ it "resends invite email if updating email address" do
+ put "/invites/#{invite.id}", params: { email: "test2@example.com" }
expect(response.status).to eq(200)
expect(Jobs::InviteEmail.jobs.size).to eq(1)
end
- it 'does not resend invite email if skip_email if updating email address' do
- put "/invites/#{invite.id}", params: { email: 'test2@example.com', skip_email: true }
+ it "does not resend invite email if skip_email if updating email address" do
+ put "/invites/#{invite.id}", params: { email: "test2@example.com", skip_email: true }
expect(response.status).to eq(200)
expect(Jobs::InviteEmail.jobs.size).to eq(0)
end
- it 'does not resend invite email when updating other fields' do
- put "/invites/#{invite.id}", params: { custom_message: 'new message' }
+ it "does not resend invite email when updating other fields" do
+ put "/invites/#{invite.id}", params: { custom_message: "new message" }
expect(response.status).to eq(200)
- expect(invite.reload.custom_message).to eq('new message')
+ expect(invite.reload.custom_message).to eq("new message")
expect(Jobs::InviteEmail.jobs.size).to eq(0)
end
- it 'can send invite email' do
+ it "can send invite email" do
sign_in(user)
RateLimiter.enable
RateLimiter.clear_all!
- invite = Fabricate(:invite, invited_by: user, email: 'test@example.com')
+ invite = Fabricate(:invite, invited_by: user, email: "test@example.com")
- expect { put "/invites/#{invite.id}", params: { send_email: true } }
- .to change { RateLimiter.new(user, 'resend-invite-per-hour', 10, 1.hour).remaining }.by(-1)
+ expect { put "/invites/#{invite.id}", params: { send_email: true } }.to change {
+ RateLimiter.new(user, "resend-invite-per-hour", 10, 1.hour).remaining
+ }.by(-1)
expect(response.status).to eq(200)
expect(Jobs::InviteEmail.jobs.size).to eq(1)
end
- it 'cannot create duplicated invites' do
- Fabricate(:invite, invited_by: admin, email: 'test2@example.com')
+ it "cannot create duplicated invites" do
+ Fabricate(:invite, invited_by: admin, email: "test2@example.com")
- put "/invites/#{invite.id}.json", params: { email: 'test2@example.com' }
+ put "/invites/#{invite.id}.json", params: { email: "test2@example.com" }
expect(response.status).to eq(409)
end
context "when providing an email belonging to an existing user" do
subject(:update_invite) { put "/invites/#{invite.id}.json", params: { email: admin.email } }
- before do
- SiteSetting.hide_email_address_taken = hide_email_address_taken
- end
+ before { SiteSetting.hide_email_address_taken = hide_email_address_taken }
context "when 'hide_email_address_taken' setting is disabled" do
let(:hide_email_address_taken) { false }
@@ -555,93 +603,98 @@ RSpec.describe InvitesController do
end
end
- describe '#destroy' do
- it 'requires to be logged in' do
- delete '/invites.json', params: { email: 'test@example.com' }
+ describe "#destroy" do
+ it "requires to be logged in" do
+ delete "/invites.json", params: { email: "test@example.com" }
expect(response.status).to eq(403)
end
- context 'while logged in' do
+ context "while logged in" do
fab!(:invite) { Fabricate(:invite, invited_by: user) }
before { sign_in(user) }
- it 'raises an error when id is missing' do
- delete '/invites.json'
+ it "raises an error when id is missing" do
+ delete "/invites.json"
expect(response.status).to eq(400)
end
- it 'raises an error when invite does not exist' do
- delete '/invites.json', params: { id: 848 }
+ it "raises an error when invite does not exist" do
+ delete "/invites.json", params: { id: 848 }
expect(response.status).to eq(400)
end
- it 'raises an error when invite is not created by user' do
- another_invite = Fabricate(:invite, email: 'test2@example.com')
+ it "raises an error when invite is not created by user" do
+ another_invite = Fabricate(:invite, email: "test2@example.com")
- delete '/invites.json', params: { id: another_invite.id }
+ delete "/invites.json", params: { id: another_invite.id }
expect(response.status).to eq(400)
end
- it 'destroys the invite' do
- delete '/invites.json', params: { id: invite.id }
+ it "destroys the invite" do
+ delete "/invites.json", params: { id: invite.id }
expect(response.status).to eq(200)
expect(invite.reload.trashed?).to be_truthy
end
end
end
- describe '#perform_accept_invitation' do
- context 'with an invalid invite' do
- it 'redirects to the root' do
- put '/invites/show/doesntexist.json'
+ describe "#perform_accept_invitation" do
+ context "with an invalid invite" do
+ it "redirects to the root" do
+ put "/invites/show/doesntexist.json"
expect(response.status).to eq(404)
- expect(response.parsed_body['message']).to eq(I18n.t('invite.not_found_json'))
+ expect(response.parsed_body["message"]).to eq(I18n.t("invite.not_found_json"))
expect(session[:current_user_id]).to be_blank
end
end
- context 'with a deleted invite' do
+ context "with a deleted invite" do
fab!(:invite) { Fabricate(:invite) }
- before do
- invite.trash!
- end
+ before { invite.trash! }
- it 'redirects to the root' do
+ it "redirects to the root" do
put "/invites/show/#{invite.invite_key}.json"
expect(response.status).to eq(404)
- expect(response.parsed_body['message']).to eq(I18n.t('invite.not_found_json'))
+ expect(response.parsed_body["message"]).to eq(I18n.t("invite.not_found_json"))
expect(session[:current_user_id]).to be_blank
end
end
- context 'with an expired invite' do
+ context "with an expired invite" do
fab!(:invite) { Fabricate(:invite, expires_at: 1.day.ago) }
- it 'response is not successful' do
+ it "response is not successful" do
put "/invites/show/#{invite.invite_key}.json"
expect(response.status).to eq(404)
- expect(response.parsed_body['message']).to eq(I18n.t('invite.not_found_json'))
+ expect(response.parsed_body["message"]).to eq(I18n.t("invite.not_found_json"))
expect(session[:current_user_id]).to be_blank
end
end
- context 'with an email invite' do
+ context "with an email invite" do
let(:topic) { Fabricate(:topic) }
- let(:invite) { Invite.generate(topic.user, email: 'iceking@adventuretime.ooo', topic: topic) }
+ let(:invite) { Invite.generate(topic.user, email: "iceking@adventuretime.ooo", topic: topic) }
- it 'redeems the invite' do
+ it "redeems the invite" do
put "/invites/show/#{invite.invite_key}.json"
expect(invite.reload.redeemed?).to be_truthy
end
- it 'logs in the user' do
- events = DiscourseEvent.track_events do
- put "/invites/show/#{invite.invite_key}.json", params: { email_token: invite.email_token }
- end
+ it "logs in the user" do
+ events =
+ DiscourseEvent.track_events do
+ put "/invites/show/#{invite.invite_key}.json",
+ params: {
+ email_token: invite.email_token,
+ }
+ end
- expect(events.map { |event| event[:event_name] }).to include(:user_logged_in, :user_first_logged_in)
+ expect(events.map { |event| event[:event_name] }).to include(
+ :user_logged_in,
+ :user_first_logged_in,
+ )
expect(response.status).to eq(200)
expect(session[:current_user_id]).to eq(invite.invited_users.first.user_id)
expect(invite.reload.redeemed?).to be_truthy
@@ -650,102 +703,112 @@ RSpec.describe InvitesController do
expect(user.registration_ip_address).to be_present
end
- it 'redirects to the first topic the user was invited to' do
+ it "redirects to the first topic the user was invited to" do
put "/invites/show/#{invite.invite_key}.json", params: { email_token: invite.email_token }
expect(response.status).to eq(200)
- expect(response.parsed_body['redirect_to']).to eq(topic.relative_url)
- expect(Notification.where(notification_type: Notification.types[:invited_to_topic], topic: topic).count).to eq(1)
+ expect(response.parsed_body["redirect_to"]).to eq(topic.relative_url)
+ expect(
+ Notification.where(
+ notification_type: Notification.types[:invited_to_topic],
+ topic: topic,
+ ).count,
+ ).to eq(1)
end
- it 'sets the timezone of the user in user_options' do
- put "/invites/show/#{invite.invite_key}.json", params: { timezone: 'Australia/Melbourne' }
+ it "sets the timezone of the user in user_options" do
+ put "/invites/show/#{invite.invite_key}.json", params: { timezone: "Australia/Melbourne" }
expect(response.status).to eq(200)
invite.reload
user = User.find(invite.invited_users.first.user_id)
- expect(user.user_option.timezone).to eq('Australia/Melbourne')
+ expect(user.user_option.timezone).to eq("Australia/Melbourne")
end
- it 'does not log in the user if there are validation errors' do
- put "/invites/show/#{invite.invite_key}.json", params: { password: 'password' }
+ it "does not log in the user if there are validation errors" do
+ put "/invites/show/#{invite.invite_key}.json", params: { password: "password" }
expect(response.status).to eq(412)
expect(session[:current_user_id]).to eq(nil)
end
- it 'does not log in the user if they were not approved' do
+ it "does not log in the user if they were not approved" do
SiteSetting.must_approve_users = true
- put "/invites/show/#{invite.invite_key}.json", params: { password: SecureRandom.hex, email_token: invite.email_token }
+ put "/invites/show/#{invite.invite_key}.json",
+ params: {
+ password: SecureRandom.hex,
+ email_token: invite.email_token,
+ }
expect(session[:current_user_id]).to eq(nil)
- expect(response.parsed_body["message"]).to eq(I18n.t('activation.approval_required'))
+ expect(response.parsed_body["message"]).to eq(I18n.t("activation.approval_required"))
end
- it 'does not log in the user if they were not activated' do
+ it "does not log in the user if they were not activated" do
put "/invites/show/#{invite.invite_key}.json", params: { password: SecureRandom.hex }
expect(session[:current_user_id]).to eq(nil)
- expect(response.parsed_body["message"]).to eq(I18n.t('invite.confirm_email'))
+ expect(response.parsed_body["message"]).to eq(I18n.t("invite.confirm_email"))
end
- it 'fails when local login is disabled and no external auth is configured' do
+ it "fails when local login is disabled and no external auth is configured" do
SiteSetting.enable_local_logins = false
put "/invites/show/#{invite.invite_key}.json"
expect(response.status).to eq(404)
end
- context 'with OmniAuth provider' do
- fab!(:authenticated_email) { 'test@example.com' }
+ context "with OmniAuth provider" do
+ fab!(:authenticated_email) { "test@example.com" }
before do
OmniAuth.config.test_mode = true
OmniAuth.config.mock_auth[:google_oauth2] = OmniAuth::AuthHash.new(
- provider: 'google_oauth2',
- uid: '12345',
- info: OmniAuth::AuthHash::InfoHash.new(
- email: authenticated_email,
- name: 'First Last'
- ),
+ provider: "google_oauth2",
+ uid: "12345",
+ info: OmniAuth::AuthHash::InfoHash.new(email: authenticated_email, name: "First Last"),
extra: {
- raw_info: OmniAuth::AuthHash.new(
- email_verified: true,
- email: authenticated_email,
- family_name: 'Last',
- given_name: 'First',
- gender: 'male',
- name: 'First Last',
- )
+ raw_info:
+ OmniAuth::AuthHash.new(
+ email_verified: true,
+ email: authenticated_email,
+ family_name: "Last",
+ given_name: "First",
+ gender: "male",
+ name: "First Last",
+ ),
},
)
- Rails.application.env_config['omniauth.auth'] = OmniAuth.config.mock_auth[:google_oauth2]
+ Rails.application.env_config["omniauth.auth"] = OmniAuth.config.mock_auth[:google_oauth2]
SiteSetting.enable_google_oauth2_logins = true
- get '/auth/google_oauth2/callback.json'
+ get "/auth/google_oauth2/callback.json"
expect(response.status).to eq(302)
end
after do
- Rails.application.env_config['omniauth.auth'] = OmniAuth.config.mock_auth[:google_oauth2] = nil
+ Rails.application.env_config["omniauth.auth"] = OmniAuth.config.mock_auth[
+ :google_oauth2
+ ] = nil
OmniAuth.config.test_mode = false
end
- it 'should associate the invited user with authenticator records' do
+ it "should associate the invited user with authenticator records" do
SiteSetting.auth_overrides_name = true
invite.update!(email: authenticated_email)
- expect { put "/invites/show/#{invite.invite_key}.json", params: { name: 'somename' } }
- .to change { User.with_email(authenticated_email).exists? }.to(true)
+ expect {
+ put "/invites/show/#{invite.invite_key}.json", params: { name: "somename" }
+ }.to change { User.with_email(authenticated_email).exists? }.to(true)
expect(response.status).to eq(200)
user = User.find_by_email(authenticated_email)
- expect(user.name).to eq('First Last')
- expect(user.user_associated_accounts.first.provider_name).to eq('google_oauth2')
+ expect(user.name).to eq("First Last")
+ expect(user.user_associated_accounts.first.provider_name).to eq("google_oauth2")
end
- it 'returns the right response even if local logins has been disabled' do
+ it "returns the right response even if local logins has been disabled" do
SiteSetting.enable_local_logins = false
invite.update!(email: authenticated_email)
@@ -753,14 +816,14 @@ RSpec.describe InvitesController do
expect(response.status).to eq(200)
end
- it 'returns the right response if authenticated email does not match invite email' do
+ it "returns the right response if authenticated email does not match invite email" do
put "/invites/show/#{invite.invite_key}.json"
expect(response.status).to eq(412)
end
end
- describe '.post_process_invite' do
- it 'sends a welcome message if set' do
+ describe ".post_process_invite" do
+ it "sends a welcome message if set" do
SiteSetting.send_welcome_message = true
user.send_welcome_message = true
put "/invites/show/#{invite.invite_key}.json"
@@ -769,18 +832,21 @@ RSpec.describe InvitesController do
expect(Jobs::SendSystemMessage.jobs.size).to eq(1)
end
- it 'refreshes automatic groups if staff' do
+ it "refreshes automatic groups if staff" do
topic.user.grant_admin!
invite.update!(moderator: true)
put "/invites/show/#{invite.invite_key}.json"
expect(response.status).to eq(200)
- expect(invite.invited_users.first.user.groups.pluck(:name)).to contain_exactly('moderators', 'staff')
+ expect(invite.invited_users.first.user.groups.pluck(:name)).to contain_exactly(
+ "moderators",
+ "staff",
+ )
end
- context 'without password' do
- it 'sends password reset email' do
+ context "without password" do
+ it "sends password reset email" do
put "/invites/show/#{invite.invite_key}.json"
expect(response.status).to eq(200)
@@ -789,13 +855,17 @@ RSpec.describe InvitesController do
end
end
- context 'with password' do
- context 'when user was invited via email' do
+ context "with password" do
+ context "when user was invited via email" do
before { invite.update_column(:emailed_status, Invite.emailed_status_types[:pending]) }
- it 'does not send an activation email and activates the user' do
+ it "does not send an activation email and activates the user" do
expect do
- put "/invites/show/#{invite.invite_key}.json", params: { password: 'verystrongpassword', email_token: invite.email_token }
+ put "/invites/show/#{invite.invite_key}.json",
+ params: {
+ password: "verystrongpassword",
+ email_token: invite.email_token,
+ }
end.to change { UserAuthToken.count }.by(1)
expect(response.status).to eq(200)
@@ -808,9 +878,12 @@ RSpec.describe InvitesController do
expect(invited_user.email_confirmed?).to eq(true)
end
- it 'does not activate user if email token is missing' do
+ it "does not activate user if email token is missing" do
expect do
- put "/invites/show/#{invite.invite_key}.json", params: { password: 'verystrongpassword' }
+ put "/invites/show/#{invite.invite_key}.json",
+ params: {
+ password: "verystrongpassword",
+ }
end.not_to change { UserAuthToken.count }
expect(response.status).to eq(200)
@@ -824,16 +897,21 @@ RSpec.describe InvitesController do
end
end
- context 'when user was invited via link' do
- before { invite.update_column(:emailed_status, Invite.emailed_status_types[:not_required]) }
+ context "when user was invited via link" do
+ before do
+ invite.update_column(:emailed_status, Invite.emailed_status_types[:not_required])
+ end
- it 'sends an activation email and does not activate the user' do
+ it "sends an activation email and does not activate the user" do
expect do
- put "/invites/show/#{invite.invite_key}.json", params: { password: 'verystrongpassword' }
+ put "/invites/show/#{invite.invite_key}.json",
+ params: {
+ password: "verystrongpassword",
+ }
end.not_to change { UserAuthToken.count }
expect(response.status).to eq(200)
- expect(response.parsed_body['message']).to eq(I18n.t('invite.confirm_email'))
+ expect(response.parsed_body["message"]).to eq(I18n.t("invite.confirm_email"))
invited_user = User.find_by_email(invite.email)
expect(invited_user.active).to eq(false)
@@ -845,54 +923,77 @@ RSpec.describe InvitesController do
tokens = EmailToken.where(user_id: invited_user.id, confirmed: false, expired: false)
expect(tokens.size).to eq(1)
- job_args = Jobs::CriticalUserEmail.jobs.first['args'].first
- expect(job_args['type']).to eq('signup')
- expect(job_args['user_id']).to eq(invited_user.id)
- expect(EmailToken.hash_token(job_args['email_token'])).to eq(tokens.first.token_hash)
+ job_args = Jobs::CriticalUserEmail.jobs.first["args"].first
+ expect(job_args["type"]).to eq("signup")
+ expect(job_args["user_id"]).to eq(invited_user.id)
+ expect(EmailToken.hash_token(job_args["email_token"])).to eq(tokens.first.token_hash)
end
end
end
end
end
- context 'with a domain invite' do
- fab!(:invite) { Fabricate(:invite, email: nil, emailed_status: Invite.emailed_status_types[:not_required], domain: 'example.com') }
+ context "with a domain invite" do
+ fab!(:invite) do
+ Fabricate(
+ :invite,
+ email: nil,
+ emailed_status: Invite.emailed_status_types[:not_required],
+ domain: "example.com",
+ )
+ end
- it 'creates an user if email matches domain' do
- expect { put "/invites/show/#{invite.invite_key}.json", params: { email: 'test@example.com', password: 'verystrongpassword' } }
- .to change { User.count }
+ it "creates an user if email matches domain" do
+ expect {
+ put "/invites/show/#{invite.invite_key}.json",
+ params: {
+ email: "test@example.com",
+ password: "verystrongpassword",
+ }
+ }.to change { User.count }
expect(response.status).to eq(200)
- expect(response.parsed_body['message']).to eq(I18n.t('invite.confirm_email'))
+ expect(response.parsed_body["message"]).to eq(I18n.t("invite.confirm_email"))
expect(invite.reload.redemption_count).to eq(1)
- invited_user = User.find_by_email('test@example.com')
+ invited_user = User.find_by_email("test@example.com")
expect(invited_user).to be_present
end
- it 'does not create an user if email does not match domain' do
- expect { put "/invites/show/#{invite.invite_key}.json", params: { email: 'test@example2.com', password: 'verystrongpassword' } }
- .not_to change { User.count }
+ it "does not create an user if email does not match domain" do
+ expect {
+ put "/invites/show/#{invite.invite_key}.json",
+ params: {
+ email: "test@example2.com",
+ password: "verystrongpassword",
+ }
+ }.not_to change { User.count }
expect(response.status).to eq(412)
- expect(response.parsed_body['message']).to eq(I18n.t('invite.domain_not_allowed'))
+ expect(response.parsed_body["message"]).to eq(I18n.t("invite.domain_not_allowed"))
expect(invite.reload.redemption_count).to eq(0)
end
end
- context 'with an invite link' do
- fab!(:invite) { Fabricate(:invite, email: nil, emailed_status: Invite.emailed_status_types[:not_required]) }
+ context "with an invite link" do
+ fab!(:invite) do
+ Fabricate(:invite, email: nil, emailed_status: Invite.emailed_status_types[:not_required])
+ end
- it 'sends an activation email and does not activate the user' do
+ it "sends an activation email and does not activate the user" do
expect {
- put "/invites/show/#{invite.invite_key}.json", params: { email: 'test@example.com', password: 'verystrongpassword' }
+ put "/invites/show/#{invite.invite_key}.json",
+ params: {
+ email: "test@example.com",
+ password: "verystrongpassword",
+ }
}.not_to change { UserAuthToken.count }
expect(response.status).to eq(200)
- expect(response.parsed_body['message']).to eq(I18n.t('invite.confirm_email'))
+ expect(response.parsed_body["message"]).to eq(I18n.t("invite.confirm_email"))
expect(invite.reload.redemption_count).to eq(1)
- invited_user = User.find_by_email('test@example.com')
+ invited_user = User.find_by_email("test@example.com")
expect(invited_user.active).to eq(false)
expect(invited_user.email_confirmed?).to eq(false)
@@ -902,55 +1003,63 @@ RSpec.describe InvitesController do
tokens = EmailToken.where(user_id: invited_user.id, confirmed: false, expired: false)
expect(tokens.size).to eq(1)
- job_args = Jobs::CriticalUserEmail.jobs.first['args'].first
- expect(job_args['type']).to eq('signup')
- expect(job_args['user_id']).to eq(invited_user.id)
- expect(EmailToken.hash_token(job_args['email_token'])).to eq(tokens.first.token_hash)
+ job_args = Jobs::CriticalUserEmail.jobs.first["args"].first
+ expect(job_args["type"]).to eq("signup")
+ expect(job_args["user_id"]).to eq(invited_user.id)
+ expect(EmailToken.hash_token(job_args["email_token"])).to eq(tokens.first.token_hash)
end
it "does not automatically log in the user if their email matches an existing user's and shows an error" do
- Fabricate(:user, email: 'test@example.com')
- put "/invites/show/#{invite.invite_key}.json", params: { email: 'test@example.com', password: 'verystrongpassword' }
+ Fabricate(:user, email: "test@example.com")
+ put "/invites/show/#{invite.invite_key}.json",
+ params: {
+ email: "test@example.com",
+ password: "verystrongpassword",
+ }
expect(session[:current_user_id]).to be_blank
expect(response.status).to eq(412)
- expect(response.parsed_body['message']).to include("Primary email has already been taken")
+ expect(response.parsed_body["message"]).to include("Primary email has already been taken")
expect(invite.reload.redemption_count).to eq(0)
end
it "does not automatically log in the user if their email matches an existing admin's and shows an error" do
- Fabricate(:admin, email: 'test@example.com')
- put "/invites/show/#{invite.invite_key}.json", params: { email: 'test@example.com', password: 'verystrongpassword' }
+ Fabricate(:admin, email: "test@example.com")
+ put "/invites/show/#{invite.invite_key}.json",
+ params: {
+ email: "test@example.com",
+ password: "verystrongpassword",
+ }
expect(session[:current_user_id]).to be_blank
expect(response.status).to eq(412)
- expect(response.parsed_body['message']).to include("Primary email has already been taken")
+ expect(response.parsed_body["message"]).to include("Primary email has already been taken")
expect(invite.reload.redemption_count).to eq(0)
end
end
- context 'when new registrations are disabled' do
+ context "when new registrations are disabled" do
fab!(:topic) { Fabricate(:topic) }
- fab!(:invite) { Invite.generate(topic.user, email: 'test@example.com', topic: topic) }
+ fab!(:invite) { Invite.generate(topic.user, email: "test@example.com", topic: topic) }
before { SiteSetting.allow_new_registrations = false }
- it 'does not redeem the invite' do
+ it "does not redeem the invite" do
put "/invites/show/#{invite.invite_key}.json"
expect(response.status).to eq(200)
expect(invite.reload.invited_users).to be_blank
expect(invite.redeemed?).to be_falsey
- expect(response.body).to include(I18n.t('login.new_registrations_disabled'))
+ expect(response.body).to include(I18n.t("login.new_registrations_disabled"))
end
end
- context 'when user is already logged in' do
+ context "when user is already logged in" do
before { sign_in(user) }
context "for an email invite" do
- fab!(:invite) { Fabricate(:invite, email: 'test@example.com') }
- fab!(:user) { Fabricate(:user, email: 'test@example.com') }
+ fab!(:invite) { Fabricate(:invite, email: "test@example.com") }
+ fab!(:user) { Fabricate(:user, email: "test@example.com") }
fab!(:group) { Fabricate(:group) }
- it 'redeems the invitation and creates the invite accepted notification' do
+ it "redeems the invitation and creates the invite accepted notification" do
put "/invites/show/#{invite.invite_key}.json", params: { id: invite.invite_key }
expect(response.status).to eq(200)
expect(response.parsed_body["message"]).to eq(I18n.t("invite.existing_user_success"))
@@ -959,18 +1068,24 @@ RSpec.describe InvitesController do
expect(invite.redeemed?).to be_truthy
expect(
Notification.exists?(
- user: invite.invited_by, notification_type: Notification.types[:invitee_accepted]
- )
+ user: invite.invited_by,
+ notification_type: Notification.types[:invitee_accepted],
+ ),
).to eq(true)
end
- it 'redirects to the first topic the user was invited to and creates the topic notification' do
+ it "redirects to the first topic the user was invited to and creates the topic notification" do
topic = Fabricate(:topic)
TopicInvite.create!(invite: invite, topic: topic)
put "/invites/show/#{invite.invite_key}.json", params: { id: invite.invite_key }
expect(response.status).to eq(200)
- expect(response.parsed_body['redirect_to']).to eq(topic.relative_url)
- expect(Notification.where(notification_type: Notification.types[:invited_to_topic], topic: topic).count).to eq(1)
+ expect(response.parsed_body["redirect_to"]).to eq(topic.relative_url)
+ expect(
+ Notification.where(
+ notification_type: Notification.types[:invited_to_topic],
+ topic: topic,
+ ).count,
+ ).to eq(1)
end
it "adds the user to the private topic" do
@@ -978,7 +1093,7 @@ RSpec.describe InvitesController do
TopicInvite.create!(invite: invite, topic: topic)
put "/invites/show/#{invite.invite_key}.json", params: { id: invite.invite_key }
expect(response.status).to eq(200)
- expect(response.parsed_body['redirect_to']).to eq(topic.relative_url)
+ expect(response.parsed_body["redirect_to"]).to eq(topic.relative_url)
expect(TopicAllowedUser.exists?(user: user, topic: topic)).to eq(true)
end
@@ -995,11 +1110,16 @@ RSpec.describe InvitesController do
put "/invites/show/#{invite.invite_key}.json", params: { id: invite.invite_key }
expect(response.status).to eq(200)
expect(response.parsed_body["message"]).to eq(I18n.t("invite.existing_user_success"))
- expect(response.parsed_body['redirect_to']).to eq(topic.relative_url)
+ expect(response.parsed_body["redirect_to"]).to eq(topic.relative_url)
invite.reload
expect(invite.redeemed?).to be_truthy
expect(user.reload.groups).to include(group)
- expect(Notification.where(notification_type: Notification.types[:invited_to_topic], topic: topic).count).to eq(1)
+ expect(
+ Notification.where(
+ notification_type: Notification.types[:invited_to_topic],
+ topic: topic,
+ ).count,
+ ).to eq(1)
end
it "does not try to log in the user automatically" do
@@ -1028,10 +1148,10 @@ RSpec.describe InvitesController do
context "for an invite link" do
fab!(:invite) { Fabricate(:invite, email: nil) }
- fab!(:user) { Fabricate(:user, email: 'test@example.com') }
+ fab!(:user) { Fabricate(:user, email: "test@example.com") }
fab!(:group) { Fabricate(:group) }
- it 'redeems the invitation and creates the invite accepted notification' do
+ it "redeems the invitation and creates the invite accepted notification" do
put "/invites/show/#{invite.invite_key}.json", params: { id: invite.invite_key }
expect(response.status).to eq(200)
expect(response.parsed_body["message"]).to eq(I18n.t("invite.existing_user_success"))
@@ -1040,18 +1160,24 @@ RSpec.describe InvitesController do
expect(invite.redeemed?).to be_truthy
expect(
Notification.exists?(
- user: invite.invited_by, notification_type: Notification.types[:invitee_accepted]
- )
+ user: invite.invited_by,
+ notification_type: Notification.types[:invitee_accepted],
+ ),
).to eq(true)
end
- it 'redirects to the first topic the user was invited to and creates the topic notification' do
+ it "redirects to the first topic the user was invited to and creates the topic notification" do
topic = Fabricate(:topic)
TopicInvite.create!(invite: invite, topic: topic)
put "/invites/show/#{invite.invite_key}.json", params: { id: invite.invite_key }
expect(response.status).to eq(200)
- expect(response.parsed_body['redirect_to']).to eq(topic.relative_url)
- expect(Notification.where(notification_type: Notification.types[:invited_to_topic], topic: topic).count).to eq(1)
+ expect(response.parsed_body["redirect_to"]).to eq(topic.relative_url)
+ expect(
+ Notification.where(
+ notification_type: Notification.types[:invited_to_topic],
+ topic: topic,
+ ).count,
+ ).to eq(1)
end
it "adds the user to the groups specified on the invite and allows them to access the secure topic" do
@@ -1067,11 +1193,16 @@ RSpec.describe InvitesController do
put "/invites/show/#{invite.invite_key}.json", params: { id: invite.invite_key }
expect(response.status).to eq(200)
expect(response.parsed_body["message"]).to eq(I18n.t("invite.existing_user_success"))
- expect(response.parsed_body['redirect_to']).to eq(topic.relative_url)
+ expect(response.parsed_body["redirect_to"]).to eq(topic.relative_url)
invite.reload
expect(invite.redeemed?).to be_truthy
expect(user.reload.groups).to include(group)
- expect(Notification.where(notification_type: Notification.types[:invited_to_topic], topic: topic).count).to eq(1)
+ expect(
+ Notification.where(
+ notification_type: Notification.types[:invited_to_topic],
+ topic: topic,
+ ).count,
+ ).to eq(1)
end
it "does not try to log in the user automatically" do
@@ -1084,8 +1215,8 @@ RSpec.describe InvitesController do
end
end
- context 'with topic invites' do
- fab!(:invite) { Fabricate(:invite, email: 'test@example.com') }
+ context "with topic invites" do
+ fab!(:invite) { Fabricate(:invite, email: "test@example.com") }
fab!(:secured_category) do
secured_category = Fabricate(:category)
@@ -1094,46 +1225,62 @@ RSpec.describe InvitesController do
secured_category
end
- it 'redirects user to topic if activated' do
+ it "redirects user to topic if activated" do
topic = Fabricate(:topic)
TopicInvite.create!(invite: invite, topic: topic)
put "/invites/show/#{invite.invite_key}.json", params: { email_token: invite.email_token }
- expect(response.parsed_body['redirect_to']).to eq(topic.relative_url)
- expect(Notification.where(notification_type: Notification.types[:invited_to_topic], topic: topic).count).to eq(1)
+ expect(response.parsed_body["redirect_to"]).to eq(topic.relative_url)
+ expect(
+ Notification.where(
+ notification_type: Notification.types[:invited_to_topic],
+ topic: topic,
+ ).count,
+ ).to eq(1)
end
- it 'sets destination_url cookie if user is not activated' do
+ it "sets destination_url cookie if user is not activated" do
topic = Fabricate(:topic)
TopicInvite.create!(invite: invite, topic: topic)
put "/invites/show/#{invite.invite_key}.json"
- expect(cookies['destination_url']).to eq(topic.relative_url)
- expect(Notification.where(notification_type: Notification.types[:invited_to_topic], topic: topic).count).to eq(1)
+ expect(cookies["destination_url"]).to eq(topic.relative_url)
+ expect(
+ Notification.where(
+ notification_type: Notification.types[:invited_to_topic],
+ topic: topic,
+ ).count,
+ ).to eq(1)
end
- it 'does not redirect user if they cannot see topic' do
+ it "does not redirect user if they cannot see topic" do
topic = Fabricate(:topic, category: secured_category)
TopicInvite.create!(invite: invite, topic: topic)
put "/invites/show/#{invite.invite_key}.json", params: { email_token: invite.email_token }
- expect(response.parsed_body['redirect_to']).to eq("/")
- expect(Notification.where(notification_type: Notification.types[:invited_to_topic], topic: topic).count).to eq(0)
+ expect(response.parsed_body["redirect_to"]).to eq("/")
+ expect(
+ Notification.where(
+ notification_type: Notification.types[:invited_to_topic],
+ topic: topic,
+ ).count,
+ ).to eq(0)
end
end
- context 'with staged user' do
+ context "with staged user" do
fab!(:invite) { Fabricate(:invite) }
fab!(:staged_user) { Fabricate(:user, staged: true, email: invite.email) }
- it 'can keep the old username' do
+ it "can keep the old username" do
old_username = staged_user.username
- put "/invites/show/#{invite.invite_key}.json", params: {
- username: staged_user.username,
- password: "Password123456",
- email_token: invite.email_token,
- }
+ put "/invites/show/#{invite.invite_key}.json",
+ params: {
+ username: staged_user.username,
+ password: "Password123456",
+ email_token: invite.email_token,
+ }
expect(response.status).to eq(200)
expect(invite.reload.redeemed?).to be_truthy
@@ -1141,12 +1288,13 @@ RSpec.describe InvitesController do
expect(user.username).to eq(old_username)
end
- it 'can change the username' do
- put "/invites/show/#{invite.invite_key}.json", params: {
- username: "new_username",
- password: "Password123456",
- email_token: invite.email_token,
- }
+ it "can change the username" do
+ put "/invites/show/#{invite.invite_key}.json",
+ params: {
+ username: "new_username",
+ password: "Password123456",
+ email_token: invite.email_token,
+ }
expect(response.status).to eq(200)
expect(invite.reload.redeemed?).to be_truthy
@@ -1156,8 +1304,8 @@ RSpec.describe InvitesController do
end
end
- describe '#destroy_all_expired' do
- it 'removes all expired invites sent by a user' do
+ describe "#destroy_all_expired" do
+ it "removes all expired invites sent by a user" do
SiteSetting.invite_expiry_days = 1
user = Fabricate(:admin)
@@ -1167,7 +1315,7 @@ RSpec.describe InvitesController do
expired_invite.update!(expires_at: 2.days.ago)
sign_in(user)
- post '/invites/destroy-all-expired'
+ post "/invites/destroy-all-expired"
expect(response.status).to eq(200)
expect(invite_1.reload.deleted_at).to eq(nil)
@@ -1176,48 +1324,46 @@ RSpec.describe InvitesController do
end
end
- describe '#resend_invite' do
- it 'requires to be logged in' do
- post '/invites/reinvite.json', params: { email: 'first_name@example.com' }
+ describe "#resend_invite" do
+ it "requires to be logged in" do
+ post "/invites/reinvite.json", params: { email: "first_name@example.com" }
expect(response.status).to eq(403)
end
- context 'while logged in' do
+ context "while logged in" do
fab!(:user) { sign_in(Fabricate(:user)) }
fab!(:invite) { Fabricate(:invite, invited_by: user) }
- fab!(:another_invite) { Fabricate(:invite, email: 'last_name@example.com') }
+ fab!(:another_invite) { Fabricate(:invite, email: "last_name@example.com") }
- it 'raises an error when the email is missing' do
- post '/invites/reinvite.json'
+ it "raises an error when the email is missing" do
+ post "/invites/reinvite.json"
expect(response.status).to eq(400)
end
- it 'raises an error when the email cannot be found' do
- post '/invites/reinvite.json', params: { email: 'first_name@example.com' }
+ it "raises an error when the email cannot be found" do
+ post "/invites/reinvite.json", params: { email: "first_name@example.com" }
expect(response.status).to eq(400)
end
- it 'raises an error when the invite is not yours' do
- post '/invites/reinvite.json', params: { email: another_invite.email }
+ it "raises an error when the invite is not yours" do
+ post "/invites/reinvite.json", params: { email: another_invite.email }
expect(response.status).to eq(400)
end
- it 'resends the invite' do
- post '/invites/reinvite.json', params: { email: invite.email }
+ it "resends the invite" do
+ post "/invites/reinvite.json", params: { email: invite.email }
expect(response.status).to eq(200)
expect(Jobs::InviteEmail.jobs.size).to eq(1)
end
end
end
- describe '#resend_all_invites' do
+ describe "#resend_all_invites" do
let(:admin) { Fabricate(:admin) }
- before do
- SiteSetting.invite_expiry_days = 30
- end
+ before { SiteSetting.invite_expiry_days = 30 }
- it 'resends all non-redeemed invites by a user' do
+ it "resends all non-redeemed invites by a user" do
freeze_time
new_invite = Fabricate(:invite, invited_by: admin)
@@ -1228,7 +1374,7 @@ RSpec.describe InvitesController do
redeemed_invite.update!(expires_at: 5.days.ago)
sign_in(admin)
- post '/invites/reinvite-all'
+ post "/invites/reinvite-all"
expect(response.status).to eq(200)
expect(new_invite.reload.expires_at).to eq_time(30.days.from_now)
@@ -1236,100 +1382,114 @@ RSpec.describe InvitesController do
expect(redeemed_invite.reload.expires_at).to eq_time(5.days.ago)
end
- it 'errors if admins try to exceed limit of one bulk invite per day' do
+ it "errors if admins try to exceed limit of one bulk invite per day" do
sign_in(admin)
RateLimiter.enable
RateLimiter.clear_all!
start = Time.now
freeze_time(start)
- post '/invites/reinvite-all'
- expect(response.parsed_body['errors']).to_not be_present
+ post "/invites/reinvite-all"
+ expect(response.parsed_body["errors"]).to_not be_present
freeze_time(start + 10.minutes)
- post '/invites/reinvite-all'
- expect(response.parsed_body['errors'][0]).to eq(I18n.t("rate_limiter.slow_down"))
+ post "/invites/reinvite-all"
+ expect(response.parsed_body["errors"][0]).to eq(I18n.t("rate_limiter.slow_down"))
end
end
- describe '#upload_csv' do
- it 'requires to be logged in' do
- post '/invites/upload_csv.json'
+ describe "#upload_csv" do
+ it "requires to be logged in" do
+ post "/invites/upload_csv.json"
expect(response.status).to eq(403)
end
- context 'while logged in' do
+ context "while logged in" do
let(:csv_file) { File.new("#{Rails.root}/spec/fixtures/csv/discourse.csv") }
let(:file) { Rack::Test::UploadedFile.new(File.open(csv_file)) }
- let(:csv_file_with_headers) { File.new("#{Rails.root}/spec/fixtures/csv/discourse_headers.csv") }
+ let(:csv_file_with_headers) do
+ File.new("#{Rails.root}/spec/fixtures/csv/discourse_headers.csv")
+ end
let(:file_with_headers) { Rack::Test::UploadedFile.new(File.open(csv_file_with_headers)) }
- let(:csv_file_with_locales) { File.new("#{Rails.root}/spec/fixtures/csv/invites_with_locales.csv") }
+ let(:csv_file_with_locales) do
+ File.new("#{Rails.root}/spec/fixtures/csv/invites_with_locales.csv")
+ end
let(:file_with_locales) { Rack::Test::UploadedFile.new(File.open(csv_file_with_locales)) }
- it 'fails if you cannot bulk invite to the forum' do
+ it "fails if you cannot bulk invite to the forum" do
sign_in(Fabricate(:user))
- post '/invites/upload_csv.json', params: { file: file, name: 'discourse.csv' }
+ post "/invites/upload_csv.json", params: { file: file, name: "discourse.csv" }
expect(response.status).to eq(403)
end
- it 'allows admin to bulk invite' do
+ it "allows admin to bulk invite" do
sign_in(admin)
- post '/invites/upload_csv.json', params: { file: file, name: 'discourse.csv' }
+ post "/invites/upload_csv.json", params: { file: file, name: "discourse.csv" }
expect(response.status).to eq(200)
expect(Jobs::BulkInvite.jobs.size).to eq(1)
end
- it 'allows admin to bulk invite when DiscourseConnect enabled' do
+ it "allows admin to bulk invite when DiscourseConnect enabled" do
SiteSetting.discourse_connect_url = "https://example.com"
SiteSetting.enable_discourse_connect = true
sign_in(admin)
- post '/invites/upload_csv.json', params: { file: file, name: 'discourse.csv' }
+ post "/invites/upload_csv.json", params: { file: file, name: "discourse.csv" }
expect(response.status).to eq(200)
expect(Jobs::BulkInvite.jobs.size).to eq(1)
end
- it 'sends limited invites at a time' do
+ it "sends limited invites at a time" do
SiteSetting.max_bulk_invites = 3
sign_in(admin)
- post '/invites/upload_csv.json', params: { file: file, name: 'discourse.csv' }
+ post "/invites/upload_csv.json", params: { file: file, name: "discourse.csv" }
expect(response.status).to eq(422)
expect(Jobs::BulkInvite.jobs.size).to eq(1)
- expect(response.parsed_body['errors'][0]).to eq(I18n.t('bulk_invite.max_rows', max_bulk_invites: SiteSetting.max_bulk_invites))
+ expect(response.parsed_body["errors"][0]).to eq(
+ I18n.t("bulk_invite.max_rows", max_bulk_invites: SiteSetting.max_bulk_invites),
+ )
end
- it 'can import user fields' do
+ it "can import user fields" do
Jobs.run_immediately!
user_field = Fabricate(:user_field, name: "location")
- Fabricate(:group, name: 'discourse')
- Fabricate(:group, name: 'ubuntu')
+ Fabricate(:group, name: "discourse")
+ Fabricate(:group, name: "ubuntu")
sign_in(admin)
- post '/invites/upload_csv.json', params: { file: file_with_headers, name: 'discourse_headers.csv' }
+ post "/invites/upload_csv.json",
+ params: {
+ file: file_with_headers,
+ name: "discourse_headers.csv",
+ }
expect(response.status).to eq(200)
- user = User.where(staged: true).find_by_email('test@example.com')
- expect(user.user_fields[user_field.id.to_s]).to eq('usa')
+ user = User.where(staged: true).find_by_email("test@example.com")
+ expect(user.user_fields[user_field.id.to_s]).to eq("usa")
- user2 = User.where(staged: true).find_by_email('test2@example.com')
- expect(user2.user_fields[user_field.id.to_s]).to eq('europe')
+ user2 = User.where(staged: true).find_by_email("test2@example.com")
+ expect(user2.user_fields[user_field.id.to_s]).to eq("europe")
end
- it 'can pre-set user locales' do
+ it "can pre-set user locales" do
Jobs.run_immediately!
sign_in(admin)
- post '/invites/upload_csv.json', params: { file: file_with_locales, name: 'discourse_headers.csv' }
+ post "/invites/upload_csv.json",
+ params: {
+ file: file_with_locales,
+ name: "discourse_headers.csv",
+ }
expect(response.status).to eq(200)
- user = User.where(staged: true).find_by_email('test@example.com')
- expect(user.locale).to eq('de')
+ user = User.where(staged: true).find_by_email("test@example.com")
+ expect(user.locale).to eq("de")
- user2 = User.where(staged: true).find_by_email('test2@example.com')
- expect(user2.locale).to eq('pl')
+ user2 = User.where(staged: true).find_by_email("test2@example.com")
+ expect(user2.locale).to eq("pl")
end
end
end
diff --git a/spec/requests/list_controller_spec.rb b/spec/requests/list_controller_spec.rb
index ee7ddbdfd24..9307d13353e 100644
--- a/spec/requests/list_controller_spec.rb
+++ b/spec/requests/list_controller_spec.rb
@@ -7,11 +7,11 @@ RSpec.describe ListController do
fab!(:admin) { Fabricate(:admin) }
before do
- admin # to skip welcome wizard at home page `/`
- SiteSetting.top_menu = 'latest|new|unread|categories'
+ admin # to skip welcome wizard at home page `/`
+ SiteSetting.top_menu = "latest|new|unread|categories"
end
- describe '#index' do
+ describe "#index" do
it "does not return a 500 for invalid input" do
get "/latest?min_posts=bob"
expect(response.status).to eq(400)
@@ -70,7 +70,7 @@ RSpec.describe ListController do
end
end
- it 'allows users to filter on a set of topic ids' do
+ it "allows users to filter on a set of topic ids" do
p = create_post
get "/latest.json", params: { topic_ids: "#{p.topic_id}" }
@@ -94,29 +94,32 @@ RSpec.describe ListController do
get "/latest"
expect(response.status).to eq(200)
- topic_list = Nokogiri::HTML5(response.body).css('.topic-list')
+ topic_list = Nokogiri.HTML5(response.body).css(".topic-list")
first_item = topic_list.css('[itemprop="itemListElement"]')
- expect(first_item.css('[itemprop="position"]')[0]['content']).to eq('1')
- expect(first_item.css('[itemprop="url"]')[0]['href']).to eq(topic.url)
+ expect(first_item.css('[itemprop="position"]')[0]["content"]).to eq("1")
+ expect(first_item.css('[itemprop="url"]')[0]["href"]).to eq(topic.url)
end
- it 'does not N+1 queries when topic featured users have different primary groups' do
+ it "does not N+1 queries when topic featured users have different primary groups" do
user.update!(primary_group: group)
# warm up
get "/latest.json"
expect(response.status).to eq(200)
- initial_sql_queries_count = track_sql_queries do
- get "/latest.json"
+ initial_sql_queries_count =
+ track_sql_queries do
+ get "/latest.json"
- expect(response.status).to eq(200)
+ expect(response.status).to eq(200)
- body = response.parsed_body
+ body = response.parsed_body
- expect(body["topic_list"]["topics"].map { |t| t["id"] }).to contain_exactly(topic.id)
- expect(body["topic_list"]["topics"][0]["posters"].map { |p| p["user_id"] }).to contain_exactly(user.id)
- end.count
+ expect(body["topic_list"]["topics"].map { |t| t["id"] }).to contain_exactly(topic.id)
+ expect(
+ body["topic_list"]["topics"][0]["posters"].map { |p| p["user_id"] },
+ ).to contain_exactly(user.id)
+ end.count
group2 = Fabricate(:group)
user2 = Fabricate(:user, primary_group: group2)
@@ -126,16 +129,19 @@ RSpec.describe ListController do
user3 = Fabricate(:user, flair_group: group3)
topic.update!(featured_user3_id: user3.id)
- new_sql_queries_count = track_sql_queries do
- get "/latest.json"
+ new_sql_queries_count =
+ track_sql_queries do
+ get "/latest.json"
- expect(response.status).to eq(200)
+ expect(response.status).to eq(200)
- body = response.parsed_body
+ body = response.parsed_body
- expect(body["topic_list"]["topics"].map { |t| t["id"] }).to contain_exactly(topic.id)
- expect(body["topic_list"]["topics"][0]["posters"].map { |p| p["user_id"] }).to contain_exactly(user.id, user2.id, user3.id)
- end.count
+ expect(body["topic_list"]["topics"].map { |t| t["id"] }).to contain_exactly(topic.id)
+ expect(
+ body["topic_list"]["topics"][0]["posters"].map { |p| p["user_id"] },
+ ).to contain_exactly(user.id, user2.id, user3.id)
+ end.count
expect(new_sql_queries_count).to be <= initial_sql_queries_count
end
@@ -165,27 +171,23 @@ RSpec.describe ListController do
end
end
- describe 'titles for crawler layout' do
- it 'has no title for the default URL' do
+ describe "titles for crawler layout" do
+ it "has no title for the default URL" do
topic
filter = Discourse.anonymous_filters[0]
- get "/#{filter}", params: { _escaped_fragment_: 'true' }
+ get "/#{filter}", params: { _escaped_fragment_: "true" }
expect(response.body).to include(I18n.t("rss_description.posts"))
- expect(response.body).to_not include(
- I18n.t('js.filters.with_topics', filter: filter)
- )
+ expect(response.body).to_not include(I18n.t("js.filters.with_topics", filter: filter))
end
- it 'has a title for non-default URLs' do
+ it "has a title for non-default URLs" do
topic
filter = Discourse.anonymous_filters[1]
- get "/#{filter}", params: { _escaped_fragment_: 'true' }
+ get "/#{filter}", params: { _escaped_fragment_: "true" }
- expect(response.body).to include(
- I18n.t('js.filters.with_topics', filter: filter)
- )
+ expect(response.body).to include(I18n.t("js.filters.with_topics", filter: filter))
end
end
@@ -202,13 +204,13 @@ RSpec.describe ListController do
Fabricate(:topic_tag, tag: tag, topic: private_message)
end
- it 'should fail for non-staff users' do
+ it "should fail for non-staff users" do
sign_in(user)
get "/topics/private-messages-tags/#{user.username}/#{tag.name}.json"
expect(response.status).to eq(404)
end
- it 'should fail for staff users if empty' do
+ it "should fail for staff users if empty" do
SiteSetting.pm_tags_allowed_for_groups = ""
[moderator, admin].each do |user|
@@ -218,7 +220,7 @@ RSpec.describe ListController do
end
end
- it 'should be success for staff users' do
+ it "should be success for staff users" do
[moderator, admin].each do |user|
sign_in(user)
get "/topics/private-messages-tags/#{user.username}/#{tag.name}.json"
@@ -226,18 +228,17 @@ RSpec.describe ListController do
end
end
- it 'should work for tag with unicode name' do
- unicode_tag = Fabricate(:tag, name: 'hello-🇺🇸')
+ it "should work for tag with unicode name" do
+ unicode_tag = Fabricate(:tag, name: "hello-🇺🇸")
Fabricate(:topic_tag, tag: unicode_tag, topic: private_message)
sign_in(admin)
get "/topics/private-messages-tags/#{admin.username}/#{UrlHelper.encode_component(unicode_tag.name)}.json"
expect(response.status).to eq(200)
- expect(response.parsed_body["topic_list"]["topics"].first["id"])
- .to eq(private_message.id)
+ expect(response.parsed_body["topic_list"]["topics"].first["id"]).to eq(private_message.id)
end
- it 'should work for users who are allowed and direct links' do
+ it "should work for users who are allowed and direct links" do
SiteSetting.pm_tags_allowed_for_groups = group.name
group.add(user)
sign_in(user)
@@ -248,8 +249,8 @@ RSpec.describe ListController do
end
end
- describe '#private_messages_group' do
- describe 'when user not in personal_message_enabled_groups group' do
+ describe "#private_messages_group" do
+ describe "when user not in personal_message_enabled_groups group" do
let!(:topic) { Fabricate(:private_message_topic, allowed_groups: [group]) }
before do
@@ -258,18 +259,17 @@ RSpec.describe ListController do
Group.refresh_automatic_groups!
end
- it 'should display group private messages for an admin' do
+ it "should display group private messages for an admin" do
sign_in(Fabricate(:admin))
get "/topics/private-messages-group/#{user.username}/#{group.name}.json"
expect(response.status).to eq(200)
- expect(response.parsed_body["topic_list"]["topics"].first["id"])
- .to eq(topic.id)
+ expect(response.parsed_body["topic_list"]["topics"].first["id"]).to eq(topic.id)
end
- it 'should display moderator group private messages for a moderator' do
+ it "should display moderator group private messages for a moderator" do
moderator = Fabricate(:moderator)
group = Group.find(Group::AUTO_GROUPS[:moderators])
topic = Fabricate(:private_message_topic, allowed_groups: [group])
@@ -290,7 +290,7 @@ RSpec.describe ListController do
end
end
- describe 'with unicode_usernames' do
+ describe "with unicode_usernames" do
before do
group.add(user)
sign_in(user)
@@ -298,7 +298,7 @@ RSpec.describe ListController do
Group.refresh_automatic_groups!
end
- it 'should return the right response when user does not belong to group' do
+ it "should return the right response when user does not belong to group" do
Fabricate(:private_message_topic, allowed_groups: [group])
group.remove(user)
@@ -308,39 +308,37 @@ RSpec.describe ListController do
expect(response.status).to eq(404)
end
- it 'should return the right response' do
+ it "should return the right response" do
topic = Fabricate(:private_message_topic, allowed_groups: [group])
get "/topics/private-messages-group/#{user.username}/awesomegroup.json"
expect(response.status).to eq(200)
- expect(response.parsed_body["topic_list"]["topics"].first["id"])
- .to eq(topic.id)
+ expect(response.parsed_body["topic_list"]["topics"].first["id"]).to eq(topic.id)
end
end
- describe 'with unicode_usernames' do
+ describe "with unicode_usernames" do
before do
sign_in(user)
SiteSetting.unicode_usernames = true
Group.refresh_automatic_groups!
end
- it 'Returns a 200 with unicode group name' do
- unicode_group = Fabricate(:group, name: '群群组')
+ it "Returns a 200 with unicode group name" do
+ unicode_group = Fabricate(:group, name: "群群组")
unicode_group.add(user)
topic = Fabricate(:private_message_topic, allowed_groups: [unicode_group])
get "/topics/private-messages-group/#{user.username}/#{UrlHelper.encode_component(unicode_group.name)}.json"
expect(response.status).to eq(200)
- expect(response.parsed_body["topic_list"]["topics"].first["id"])
- .to eq(topic.id)
+ expect(response.parsed_body["topic_list"]["topics"].first["id"]).to eq(topic.id)
end
end
end
- describe '#group_topics' do
- %i{user user2}.each do |user|
+ describe "#group_topics" do
+ %i[user user2].each do |user|
let(user) do
user = Fabricate(:user)
group.add(user)
@@ -352,17 +350,17 @@ RSpec.describe ListController do
let!(:topic2) { Fabricate(:topic, user: user2) }
let!(:another_topic) { Fabricate(:topic) }
- describe 'when an invalid group name is given' do
- it 'should return the right response' do
+ describe "when an invalid group name is given" do
+ it "should return the right response" do
get "/topics/groups/something.json"
expect(response.status).to eq(404)
end
end
- describe 'for an anon user' do
- describe 'public visible group' do
- it 'should return the right response' do
+ describe "for an anon user" do
+ describe "public visible group" do
+ it "should return the right response" do
get "/topics/groups/#{group.name}.json"
expect(response.status).to eq(200)
@@ -370,30 +368,32 @@ RSpec.describe ListController do
end
end
- describe 'group restricted to logged-on-users' do
+ describe "group restricted to logged-on-users" do
before { group.update!(visibility_level: Group.visibility_levels[:logged_on_users]) }
- it 'should return the right response' do
+ it "should return the right response" do
get "/topics/groups/#{group.name}.json"
expect(response.status).to eq(403)
end
end
- describe 'restricted group' do
+ describe "restricted group" do
before { group.update!(visibility_level: Group.visibility_levels[:staff]) }
- it 'should return the right response' do
+ it "should return the right response" do
get "/topics/groups/#{group.name}.json"
expect(response.status).to eq(403)
end
end
- describe 'group members visibility restricted to logged-on-users' do
- before { group.update!(members_visibility_level: Group.visibility_levels[:logged_on_users]) }
+ describe "group members visibility restricted to logged-on-users" do
+ before do
+ group.update!(members_visibility_level: Group.visibility_levels[:logged_on_users])
+ end
- it 'should return the right response' do
+ it "should return the right response" do
get "/topics/groups/#{group.name}.json"
expect(response.status).to eq(403)
@@ -401,23 +401,23 @@ RSpec.describe ListController do
end
end
- describe 'for a normal user' do
+ describe "for a normal user" do
before { sign_in(Fabricate(:user)) }
- describe 'restricted group' do
+ describe "restricted group" do
before { group.update!(visibility_level: Group.visibility_levels[:staff]) }
- it 'should return the right response' do
+ it "should return the right response" do
get "/topics/groups/#{group.name}.json"
expect(response.status).to eq(403)
end
end
- describe 'group restricted to logged-on-users' do
+ describe "group restricted to logged-on-users" do
before { group.update!(visibility_level: Group.visibility_levels[:logged_on_users]) }
- it 'should return the right response' do
+ it "should return the right response" do
get "/topics/groups/#{group.name}.json"
expect(response.status).to eq(200)
@@ -425,41 +425,37 @@ RSpec.describe ListController do
end
end
- describe 'for a group user' do
- before do
- sign_in(user)
- end
+ describe "for a group user" do
+ before { sign_in(user) }
- it 'should be able to view the topics started by group users' do
+ it "should be able to view the topics started by group users" do
get "/topics/groups/#{group.name}.json"
expect(response.status).to eq(200)
topics = response.parsed_body["topic_list"]["topics"]
- expect(topics.map { |topic| topic["id"] }).to contain_exactly(
- topic.id, topic2.id
- )
+ expect(topics.map { |topic| topic["id"] }).to contain_exactly(topic.id, topic2.id)
end
end
end
- describe 'RSS feeds' do
- it 'renders latest RSS' do
+ describe "RSS feeds" do
+ it "renders latest RSS" do
get "/latest.rss"
expect(response.status).to eq(200)
- expect(response.media_type).to eq('application/rss+xml')
- expect(response.headers['X-Robots-Tag']).to eq('noindex')
+ expect(response.media_type).to eq("application/rss+xml")
+ expect(response.headers["X-Robots-Tag"]).to eq("noindex")
end
- it 'renders latest RSS with query params' do
+ it "renders latest RSS with query params" do
get "/latest.rss?status=closed"
expect(response.status).to eq(200)
- expect(response.media_type).to eq('application/rss+xml')
+ expect(response.media_type).to eq("application/rss+xml")
expect(response.body).to_not include("- ")
end
- it 'renders links correctly with subfolder' do
+ it "renders links correctly with subfolder" do
set_subfolder "/forum"
_post = Fabricate(:post, topic: topic, user: user)
get "/latest.rss"
@@ -468,13 +464,13 @@ RSpec.describe ListController do
expect(response.body).to include("http://test.localhost/forum/t/#{topic.slug}")
end
- it 'renders top RSS' do
+ it "renders top RSS" do
get "/top.rss"
expect(response.status).to eq(200)
- expect(response.media_type).to eq('application/rss+xml')
+ expect(response.media_type).to eq("application/rss+xml")
end
- it 'errors for invalid periods on top RSS' do
+ it "errors for invalid periods on top RSS" do
get "/top.rss?period=decadely"
expect(response.status).to eq(400)
end
@@ -483,54 +479,52 @@ RSpec.describe ListController do
it "renders #{period} top RSS" do
get "/top.rss?period=#{period}"
expect(response.status).to eq(200)
- expect(response.media_type).to eq('application/rss+xml')
+ expect(response.media_type).to eq("application/rss+xml")
end
end
end
- describe 'Top' do
- it 'renders top' do
+ describe "Top" do
+ it "renders top" do
get "/top"
expect(response.status).to eq(200)
end
- it 'renders top with a period' do
+ it "renders top with a period" do
get "/top?period=weekly"
expect(response.status).to eq(200)
end
- it 'errors for invalid periods on top' do
+ it "errors for invalid periods on top" do
get "/top?period=decadely"
expect(response.status).to eq(400)
end
end
- describe 'category' do
- context 'when in a category' do
+ describe "category" do
+ context "when in a category" do
let(:category) { Fabricate(:category_with_definition) }
let(:group) { Fabricate(:group) }
let(:private_category) { Fabricate(:private_category, group: group) }
- context 'without access to see the category' do
+ context "without access to see the category" do
it "responds with a 404 error" do
get "/c/#{private_category.slug}/l/latest"
expect(response.status).to eq(404)
end
end
- context 'with access to see the category' do
+ context "with access to see the category" do
it "succeeds" do
get "/c/#{category.slug}/#{category.id}/l/latest"
expect(response.status).to eq(200)
end
end
- context 'with encoded slug in the category' do
+ context "with encoded slug in the category" do
let(:category) { Fabricate(:category, slug: "தமிழ்") }
- before do
- SiteSetting.slug_generation_method = "encoded"
- end
+ before { SiteSetting.slug_generation_method = "encoded" }
it "succeeds" do
get "/c/#{category.slug}/#{category.id}/l/latest"
@@ -538,7 +532,7 @@ RSpec.describe ListController do
end
end
- context 'with a link that has a parent slug, slug and id in its path' do
+ context "with a link that has a parent slug, slug and id in its path" do
let(:child_category) { Fabricate(:category_with_definition, parent_category: category) }
context "with valid slug" do
@@ -556,35 +550,36 @@ RSpec.describe ListController do
end
end
- context 'when another category exists with a number at the beginning of its name' do
+ context "when another category exists with a number at the beginning of its name" do
# One category has another category's id at the beginning of its name
- let!(:other_category) {
+ let!(:other_category) do
# Our validations don't allow this to happen now, but did historically
- Fabricate(:category_with_definition, name: "#{category.id} name", slug: 'will-be-changed').tap do |category|
- category.update_column(:slug, "#{category.id}-name")
- end
- }
+ Fabricate(
+ :category_with_definition,
+ name: "#{category.id} name",
+ slug: "will-be-changed",
+ ).tap { |category| category.update_column(:slug, "#{category.id}-name") }
+ end
- it 'uses the correct category' do
+ it "uses the correct category" do
get "/c/#{other_category.slug}/#{other_category.id}/l/latest.json"
expect(response.status).to eq(200)
body = response.parsed_body
- expect(body["topic_list"]["topics"].first["category_id"])
- .to eq(other_category.id)
+ expect(body["topic_list"]["topics"].first["category_id"]).to eq(other_category.id)
end
end
- context 'with a child category' do
+ context "with a child category" do
let(:sub_category) { Fabricate(:category_with_definition, parent_category_id: category.id) }
- context 'when parent and child are requested' do
+ context "when parent and child are requested" do
it "succeeds" do
get "/c/#{category.slug}/#{sub_category.slug}/#{sub_category.id}/l/latest"
expect(response.status).to eq(200)
end
end
- context 'when child is requested with the wrong parent' do
+ context "when child is requested with the wrong parent" do
it "responds with a 404 error" do
get "/c/not-the-right-slug/#{sub_category.slug}/l/latest"
expect(response.status).to eq(404)
@@ -592,11 +587,11 @@ RSpec.describe ListController do
end
end
- describe 'feed' do
- it 'renders RSS' do
+ describe "feed" do
+ it "renders RSS" do
get "/c/#{category.slug}/#{category.id}.rss"
expect(response.status).to eq(200)
- expect(response.media_type).to eq('application/rss+xml')
+ expect(response.media_type).to eq("application/rss+xml")
end
it "renders RSS in subfolder correctly" do
@@ -610,7 +605,7 @@ RSpec.describe ListController do
describe "category default views" do
it "has a top default view" do
- category.update!(default_view: 'top', default_top_period: 'monthly')
+ category.update!(default_view: "top", default_top_period: "monthly")
get "/c/#{category.slug}/#{category.id}.json"
expect(response.status).to eq(200)
json = response.parsed_body
@@ -626,7 +621,7 @@ RSpec.describe ListController do
end
it "has a default view of ''" do
- category.update!(default_view: '')
+ category.update!(default_view: "")
get "/c/#{category.slug}/#{category.id}.json"
expect(response.status).to eq(200)
json = response.parsed_body
@@ -634,7 +629,7 @@ RSpec.describe ListController do
end
it "has a default view of latest" do
- category.update!(default_view: 'latest')
+ category.update!(default_view: "latest")
get "/c/#{category.slug}/#{category.id}.json"
expect(response.status).to eq(200)
json = response.parsed_body
@@ -643,13 +638,13 @@ RSpec.describe ListController do
end
describe "renders canonical tag" do
- it 'for category default view' do
+ it "for category default view" do
get "/c/#{category.slug}/#{category.id}"
expect(response.status).to eq(200)
expect(css_select("link[rel=canonical]").length).to eq(1)
end
- it 'for category latest view' do
+ it "for category latest view" do
get "/c/#{category.slug}/#{category.id}/l/latest"
expect(response.status).to eq(200)
expect(css_select("link[rel=canonical]").length).to eq(1)
@@ -669,7 +664,7 @@ RSpec.describe ListController do
context "for category latest view" do
let!(:amazing_category) { Fabricate(:category_with_definition, name: "Amazing Category") }
- it 'renders correct title' do
+ it "renders correct title" do
SiteSetting.short_site_description = "Best community"
get "/c/#{amazing_category.slug}/#{amazing_category.id}/l/latest"
@@ -683,9 +678,7 @@ RSpec.describe ListController do
fab!(:topic2) { Fabricate(:topic, user: user) }
fab!(:user2) { Fabricate(:user) }
- before do
- sign_in(user2)
- end
+ before { sign_in(user2) }
it "should respond with a list" do
get "/topics/created-by/#{user.username}.json"
@@ -703,9 +696,7 @@ RSpec.describe ListController do
end
context "with unicode usernames" do
- before do
- SiteSetting.unicode_usernames = true
- end
+ before { SiteSetting.unicode_usernames = true }
it "should return the more_topics_url in the encoded form" do
stub_const(TopicQuery, "DEFAULT_PER_PAGE_COUNT", 1) do
@@ -717,15 +708,15 @@ RSpec.describe ListController do
json = response.parsed_body
- expect(json["topic_list"]["more_topics_url"]).to eq("/topics/created-by/%E5%BF%AB%E5%BF%AB%E5%BF%AB?page=1")
+ expect(json["topic_list"]["more_topics_url"]).to eq(
+ "/topics/created-by/%E5%BF%AB%E5%BF%AB%E5%BF%AB?page=1",
+ )
end
end
end
- context 'when `hide_profile_and_presence` is true' do
- before do
- user.user_option.update_columns(hide_profile_and_presence: true)
- end
+ context "when `hide_profile_and_presence` is true" do
+ before { user.user_option.update_columns(hide_profile_and_presence: true) }
it "returns 404" do
get "/topics/created-by/#{user.username}.json"
@@ -820,11 +811,13 @@ RSpec.describe ListController do
fab!(:moderator2) { Fabricate(:moderator) }
let(:create_args) do
- { title: 'you need a warning buddy!',
+ {
+ title: "you need a warning buddy!",
raw: "you did something bad and I'm telling you about it!",
is_warning: true,
target_usernames: target_user.username,
- archetype: Archetype.private_message }
+ archetype: Archetype.private_message,
+ }
end
let(:warning_post) do
@@ -833,9 +826,7 @@ RSpec.describe ListController do
end
let(:warning_topic) { warning_post.topic }
- before do
- warning_topic
- end
+ before { warning_topic }
it "returns 403 error for unrelated users" do
sign_in(Fabricate(:user))
@@ -865,13 +856,13 @@ RSpec.describe ListController do
end
end
- describe 'read' do
- it 'raises an error when not logged in' do
+ describe "read" do
+ it "raises an error when not logged in" do
get "/read"
expect(response.status).to eq(404)
end
- context 'when logged in' do
+ context "when logged in" do
it "succeeds" do
sign_in(user)
get "/read"
@@ -884,19 +875,23 @@ RSpec.describe ListController do
it "works" do
expect(ListController.best_periods_for(nil)).to eq([:all])
expect(ListController.best_periods_for(5.years.ago)).to eq([:all])
- expect(ListController.best_periods_for(2.years.ago)).to eq([:yearly, :all])
- expect(ListController.best_periods_for(6.months.ago)).to eq([:quarterly, :yearly, :all])
- expect(ListController.best_periods_for(2.months.ago)).to eq([:monthly, :quarterly, :yearly, :all])
- expect(ListController.best_periods_for(2.weeks.ago)).to eq([:weekly, :monthly, :quarterly, :yearly, :all])
- expect(ListController.best_periods_for(2.days.ago)).to eq([:daily, :weekly, :monthly, :quarterly, :yearly, :all])
+ expect(ListController.best_periods_for(2.years.ago)).to eq(%i[yearly all])
+ expect(ListController.best_periods_for(6.months.ago)).to eq(%i[quarterly yearly all])
+ expect(ListController.best_periods_for(2.months.ago)).to eq(%i[monthly quarterly yearly all])
+ expect(ListController.best_periods_for(2.weeks.ago)).to eq(
+ %i[weekly monthly quarterly yearly all],
+ )
+ expect(ListController.best_periods_for(2.days.ago)).to eq(
+ %i[daily weekly monthly quarterly yearly all],
+ )
end
it "supports default period" do
- expect(ListController.best_periods_for(nil, :yearly)).to eq([:yearly, :all])
- expect(ListController.best_periods_for(nil, :quarterly)).to eq([:quarterly, :all])
- expect(ListController.best_periods_for(nil, :monthly)).to eq([:monthly, :all])
- expect(ListController.best_periods_for(nil, :weekly)).to eq([:weekly, :all])
- expect(ListController.best_periods_for(nil, :daily)).to eq([:daily, :all])
+ expect(ListController.best_periods_for(nil, :yearly)).to eq(%i[yearly all])
+ expect(ListController.best_periods_for(nil, :quarterly)).to eq(%i[quarterly all])
+ expect(ListController.best_periods_for(nil, :monthly)).to eq(%i[monthly all])
+ expect(ListController.best_periods_for(nil, :weekly)).to eq(%i[weekly all])
+ expect(ListController.best_periods_for(nil, :daily)).to eq(%i[daily all])
end
end
@@ -911,16 +906,18 @@ RSpec.describe ListController do
describe "set_category" do
let(:category) { Fabricate(:category_with_definition) }
let(:subcategory) { Fabricate(:category_with_definition, parent_category_id: category.id) }
- let(:subsubcategory) { Fabricate(:category_with_definition, parent_category_id: subcategory.id) }
-
- before do
- SiteSetting.max_category_nesting = 3
+ let(:subsubcategory) do
+ Fabricate(:category_with_definition, parent_category_id: subcategory.id)
end
+ before { SiteSetting.max_category_nesting = 3 }
+
it "redirects to URL with the updated slug" do
get "/c/hello/world/bye/#{subsubcategory.id}"
expect(response.status).to eq(301)
- expect(response).to redirect_to("/c/#{category.slug}/#{subcategory.slug}/#{subsubcategory.slug}/#{subsubcategory.id}")
+ expect(response).to redirect_to(
+ "/c/#{category.slug}/#{subcategory.slug}/#{subsubcategory.slug}/#{subsubcategory.id}",
+ )
get "/c/#{category.slug}/#{subcategory.slug}/#{subsubcategory.slug}/#{subsubcategory.id}"
expect(response.status).to eq(200)
@@ -970,7 +967,9 @@ RSpec.describe ListController do
get "/c/hello/world/bye/#{subsubcategory.id}"
expect(response.status).to eq(301)
- expect(response).to redirect_to("/forum/c/#{category.slug}/#{subcategory.slug}/#{subsubcategory.slug}/#{subsubcategory.id}")
+ expect(response).to redirect_to(
+ "/forum/c/#{category.slug}/#{subcategory.slug}/#{subsubcategory.slug}/#{subsubcategory.id}",
+ )
end
end
end
@@ -990,8 +989,11 @@ RSpec.describe ListController do
sign_in(admin)
get "/c/#{category1.slug}/#{category1.id}.json"
- expect(response.parsed_body['topic_list']['shared_drafts']).to eq(nil)
- expect(response.parsed_body['topic_list']['topics'].map { |t| t['id'] }).to contain_exactly(topic1.id, shared_draft_topic.id)
+ expect(response.parsed_body["topic_list"]["shared_drafts"]).to eq(nil)
+ expect(response.parsed_body["topic_list"]["topics"].map { |t| t["id"] }).to contain_exactly(
+ topic1.id,
+ shared_draft_topic.id,
+ )
end
it "are displayed in both shared drafts category and target category" do
@@ -999,19 +1001,26 @@ RSpec.describe ListController do
sign_in(admin)
get "/c/#{category1.slug}/#{category1.id}.json"
- expect(response.parsed_body['topic_list']['shared_drafts']).to be_nil
- expect(response.parsed_body['topic_list']['topics'].map { |t| t['id'] }).to contain_exactly(topic1.id, shared_draft_topic.id)
+ expect(response.parsed_body["topic_list"]["shared_drafts"]).to be_nil
+ expect(response.parsed_body["topic_list"]["topics"].map { |t| t["id"] }).to contain_exactly(
+ topic1.id,
+ shared_draft_topic.id,
+ )
get "/c/#{category2.slug}/#{category2.id}.json"
- expect(response.parsed_body['topic_list']['shared_drafts'].map { |t| t['id'] }).to contain_exactly(shared_draft_topic.id)
- expect(response.parsed_body['topic_list']['topics'].map { |t| t['id'] }).to contain_exactly(topic2.id)
+ expect(
+ response.parsed_body["topic_list"]["shared_drafts"].map { |t| t["id"] },
+ ).to contain_exactly(shared_draft_topic.id)
+ expect(response.parsed_body["topic_list"]["topics"].map { |t| t["id"] }).to contain_exactly(
+ topic2.id,
+ )
end
end
describe "body class" do
it "pre-renders the correct body class for categories" do
- c = Fabricate(:category, slug: 'myparentslug')
- sub_c = Fabricate(:category, parent_category: c, slug: 'mychildslug')
+ c = Fabricate(:category, slug: "myparentslug")
+ sub_c = Fabricate(:category, parent_category: c, slug: "mychildslug")
get "/c/#{c.slug}/#{sub_c.slug}/#{sub_c.id}"
@@ -1030,7 +1039,6 @@ RSpec.describe ListController do
end
it "is hidden for non-admins" do
-
get "/latest.json"
expect(response.status).to eq(200)
parsed = response.parsed_body
diff --git a/spec/requests/metadata_controller_spec.rb b/spec/requests/metadata_controller_spec.rb
index b3f6256e8f6..2599d151253 100644
--- a/spec/requests/metadata_controller_spec.rb
+++ b/spec/requests/metadata_controller_spec.rb
@@ -2,37 +2,39 @@
# rubocop:disable Discourse/NoJsonParseResponse
RSpec.describe MetadataController do
-
- describe 'manifest.webmanifest' do
- before do
- SiteIconManager.enable
- end
+ describe "manifest.webmanifest" do
+ before { SiteIconManager.enable }
let(:upload) do
- UploadCreator.new(file_from_fixtures("smallest.png"), 'logo.png').create_for(Discourse.system_user.id)
+ UploadCreator.new(file_from_fixtures("smallest.png"), "logo.png").create_for(
+ Discourse.system_user.id,
+ )
end
- it 'returns the right output' do
- title = 'MyApp'
+ it "returns the right output" do
+ title = "MyApp"
SiteSetting.title = title
SiteSetting.manifest_icon = upload
get "/manifest.webmanifest"
expect(response.status).to eq(200)
- expect(response.media_type).to eq('application/manifest+json')
- expect(response.headers["Cache-Control"]).to eq('max-age=60, private')
+ expect(response.media_type).to eq("application/manifest+json")
+ expect(response.headers["Cache-Control"]).to eq("max-age=60, private")
manifest = JSON.parse(response.body)
expect(manifest["name"]).to eq(title)
expect(manifest["icons"].first["src"]).to eq(
- UrlHelper.absolute(SiteSetting.site_manifest_icon_url)
+ UrlHelper.absolute(SiteSetting.site_manifest_icon_url),
)
end
- it 'can guess mime types' do
- upload = UploadCreator.new(file_from_fixtures("logo.jpg"), 'logo.jpg').create_for(Discourse.system_user.id)
+ it "can guess mime types" do
+ upload =
+ UploadCreator.new(file_from_fixtures("logo.jpg"), "logo.jpg").create_for(
+ Discourse.system_user.id,
+ )
SiteSetting.manifest_icon = upload
get "/manifest.webmanifest"
@@ -42,7 +44,7 @@ RSpec.describe MetadataController do
expect(manifest["icons"].first["type"]).to eq("image/jpeg")
end
- it 'defaults to png' do
+ it "defaults to png" do
SiteSetting.manifest_icon = upload
get "/manifest.webmanifest"
expect(response.status).to eq(200)
@@ -50,28 +52,46 @@ RSpec.describe MetadataController do
expect(manifest["icons"].first["type"]).to eq("image/png")
end
- it 'defaults to display standalone for Android' do
- get "/manifest.webmanifest", params: {}, headers: { 'USER-AGENT' => 'Mozilla/5.0 (Linux; Android 7.0; SM-G892A Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/67.0.3396.87 Mobile Safari/537.36' }
+ it "defaults to display standalone for Android" do
+ get "/manifest.webmanifest",
+ params: {
+ },
+ headers: {
+ "USER-AGENT" =>
+ "Mozilla/5.0 (Linux; Android 7.0; SM-G892A Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/67.0.3396.87 Mobile Safari/537.36",
+ }
manifest = JSON.parse(response.body)
expect(manifest["display"]).to eq("standalone")
end
- it 'defaults to display standalone for iPhone' do
- get "/manifest.webmanifest", params: {}, headers: { 'USER-AGENT' => 'Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1' }
+ it "defaults to display standalone for iPhone" do
+ get "/manifest.webmanifest",
+ params: {
+ },
+ headers: {
+ "USER-AGENT" =>
+ "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1",
+ }
manifest = JSON.parse(response.body)
expect(manifest["display"]).to eq("standalone")
end
- it 'can be changed to display browser for iPhones using a site setting' do
+ it "can be changed to display browser for iPhones using a site setting" do
SiteSetting.pwa_display_browser_regex = "iPhone"
- get "/manifest.webmanifest", params: {}, headers: { 'USER-AGENT' => 'Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1' }
+ get "/manifest.webmanifest",
+ params: {
+ },
+ headers: {
+ "USER-AGENT" =>
+ "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1",
+ }
manifest = JSON.parse(response.body)
expect(manifest["display"]).to eq("browser")
end
- it 'uses the short_title if it is set' do
- title = 'FooBarBaz Forum'
+ it "uses the short_title if it is set" do
+ title = "FooBarBaz Forum"
SiteSetting.title = title
get "/manifest.webmanifest"
@@ -87,7 +107,7 @@ RSpec.describe MetadataController do
expect(manifest["short_name"]).to eq("foo")
end
- it 'contains valid shortcuts by default' do
+ it "contains valid shortcuts by default" do
get "/manifest.webmanifest"
expect(response.status).to eq(200)
manifest = JSON.parse(response.body)
@@ -96,33 +116,33 @@ RSpec.describe MetadataController do
end
end
- describe 'opensearch.xml' do
+ describe "opensearch.xml" do
fab!(:upload) { Fabricate(:upload) }
- it 'returns the right output' do
- title = 'MyApp'
+ it "returns the right output" do
+ title = "MyApp"
SiteSetting.title = title
SiteSetting.favicon = upload
get "/opensearch.xml"
- expect(response.headers["Cache-Control"]).to eq('max-age=60, private')
+ expect(response.headers["Cache-Control"]).to eq("max-age=60, private")
expect(response.status).to eq(200)
expect(response.body).to include(title)
expect(response.body).to include("/search?q={searchTerms}")
- expect(response.body).to include('image/png')
+ expect(response.body).to include("image/png")
expect(response.body).to include(UrlHelper.absolute(upload.url))
- expect(response.media_type).to eq('application/xml')
+ expect(response.media_type).to eq("application/xml")
end
end
- describe '#app_association_android' do
- it 'returns 404 by default' do
+ describe "#app_association_android" do
+ it "returns 404 by default" do
get "/.well-known/assetlinks.json"
expect(response.status).to eq(404)
end
- it 'returns the right output' do
+ it "returns the right output" do
SiteSetting.app_association_android = <<~JSON
[{
"relation": ["delegate_permission/common.handle_all_urls"],
@@ -132,22 +152,22 @@ RSpec.describe MetadataController do
JSON
get "/.well-known/assetlinks.json"
- expect(response.headers["Cache-Control"]).to eq('max-age=60, private')
+ expect(response.headers["Cache-Control"]).to eq("max-age=60, private")
expect(response.status).to eq(200)
expect(response.body).to include("hash_of_app_certificate")
expect(response.body).to include("com.example.app")
- expect(response.media_type).to eq('application/json')
+ expect(response.media_type).to eq("application/json")
end
end
- describe '#app_association_ios' do
- it 'returns 404 by default' do
+ describe "#app_association_ios" do
+ it "returns 404 by default" do
get "/apple-app-site-association"
expect(response.status).to eq(404)
end
- it 'returns the right output' do
+ it "returns the right output" do
SiteSetting.app_association_ios = <<~JSON
{
"applinks": {
@@ -159,12 +179,11 @@ RSpec.describe MetadataController do
expect(response.status).to eq(200)
expect(response.body).to include("applinks")
- expect(response.media_type).to eq('application/json')
- expect(response.headers["Cache-Control"]).to eq('max-age=60, private')
+ expect(response.media_type).to eq("application/json")
+ expect(response.headers["Cache-Control"]).to eq("max-age=60, private")
get "/apple-app-site-association.json"
expect(response.status).to eq(404)
end
end
-
end
diff --git a/spec/requests/notifications_controller_spec.rb b/spec/requests/notifications_controller_spec.rb
index da2f29b5846..c09ff9206e0 100644
--- a/spec/requests/notifications_controller_spec.rb
+++ b/spec/requests/notifications_controller_spec.rb
@@ -3,11 +3,11 @@
def create_notification(user_id, resp_code, matcher)
notification_count = Notification.count
post "/notifications.json",
- params: {
- notification_type: Notification.types[:mentioned],
- user_id: user_id,
- data: { message: 'tada' }.to_json
- }
+ params: {
+ notification_type: Notification.types[:mentioned],
+ user_id: user_id,
+ data: { message: "tada" }.to_json,
+ }
expect(response.status).to eq(resp_code)
expect(Notification.count).public_send(matcher, eq(notification_count))
end
@@ -29,18 +29,18 @@ def delete_notification(resp_code, matcher)
end
RSpec.describe NotificationsController do
- context 'when logged in' do
- context 'as normal user' do
+ context "when logged in" do
+ context "as normal user" do
fab!(:user) { sign_in(Fabricate(:user)) }
fab!(:notification) { Fabricate(:notification, user: user) }
- describe '#index' do
- it 'should succeed for recent' do
+ describe "#index" do
+ it "should succeed for recent" do
get "/notifications", params: { recent: true }
expect(response.status).to eq(200)
end
- it 'should succeed for history' do
+ it "should succeed for history" do
get "/notifications.json"
expect(response.status).to eq(200)
@@ -51,7 +51,7 @@ RSpec.describe NotificationsController do
expect(notifications.first["id"]).to eq(notification.id)
end
- it 'should mark notifications as viewed' do
+ it "should mark notifications as viewed" do
expect(user.reload.unread_notifications).to eq(1)
expect(user.reload.total_unread_notifications).to eq(1)
@@ -62,7 +62,7 @@ RSpec.describe NotificationsController do
expect(user.reload.total_unread_notifications).to eq(1)
end
- it 'should not mark notifications as viewed if silent param is present' do
+ it "should not mark notifications as viewed if silent param is present" do
expect(user.reload.unread_notifications).to eq(1)
expect(user.reload.total_unread_notifications).to eq(1)
@@ -73,7 +73,7 @@ RSpec.describe NotificationsController do
expect(user.reload.total_unread_notifications).to eq(1)
end
- it 'should not mark notifications as viewed in readonly mode' do
+ it "should not mark notifications as viewed in readonly mode" do
Discourse.received_redis_readonly!
expect(user.reload.unread_notifications).to eq(1)
expect(user.reload.total_unread_notifications).to eq(1)
@@ -96,19 +96,19 @@ RSpec.describe NotificationsController do
get "/notifications.json"
expect(response.status).to eq(200)
- expect(JSON.parse(response.body)['notifications'].length).to be >= 2
+ expect(JSON.parse(response.body)["notifications"].length).to be >= 2
get "/notifications.json", params: { filter: "read" }
expect(response.status).to eq(200)
- expect(JSON.parse(response.body)['notifications'].length).to be >= 1
- expect(JSON.parse(response.body)['notifications'][0]['read']).to eq(true)
+ expect(JSON.parse(response.body)["notifications"].length).to be >= 1
+ expect(JSON.parse(response.body)["notifications"][0]["read"]).to eq(true)
get "/notifications.json", params: { filter: "unread" }
expect(response.status).to eq(200)
- expect(JSON.parse(response.body)['notifications'].length).to be >= 1
- expect(JSON.parse(response.body)['notifications'][0]['read']).to eq(false)
+ expect(JSON.parse(response.body)["notifications"].length).to be >= 1
+ expect(JSON.parse(response.body)["notifications"][0]["read"]).to eq(false)
end
context "when navigation menu settings is non-legacy" do
@@ -118,7 +118,7 @@ RSpec.describe NotificationsController do
user: user,
high_priority: true,
read: false,
- created_at: 10.minutes.ago
+ created_at: 10.minutes.ago,
)
end
@@ -128,7 +128,7 @@ RSpec.describe NotificationsController do
user: user,
high_priority: true,
read: true,
- created_at: 8.minutes.ago
+ created_at: 8.minutes.ago,
)
end
@@ -138,7 +138,7 @@ RSpec.describe NotificationsController do
user: user,
high_priority: false,
read: false,
- created_at: 6.minutes.ago
+ created_at: 6.minutes.ago,
)
end
@@ -148,28 +148,28 @@ RSpec.describe NotificationsController do
user: user,
high_priority: false,
read: true,
- created_at: 4.minutes.ago
+ created_at: 4.minutes.ago,
)
end
fab!(:pending_reviewable) { Fabricate(:reviewable) }
- before do
- SiteSetting.navigation_menu = "sidebar"
- end
+ before { SiteSetting.navigation_menu = "sidebar" }
it "gets notifications list with unread ones at the top" do
get "/notifications.json", params: { recent: true }
expect(response.status).to eq(200)
- expect(response.parsed_body["notifications"].map { |n| n["id"] }).to eq([
- unread_high_priority.id,
- notification.id,
- unread_regular.id,
- read_regular.id,
- read_high_priority.id
- ])
+ expect(response.parsed_body["notifications"].map { |n| n["id"] }).to eq(
+ [
+ unread_high_priority.id,
+ notification.id,
+ unread_regular.id,
+ read_regular.id,
+ read_high_priority.id,
+ ],
+ )
end
it "gets notifications list with unread high priority notifications at the top when navigation menu is legacy" do
@@ -179,13 +179,15 @@ RSpec.describe NotificationsController do
expect(response.status).to eq(200)
- expect(response.parsed_body["notifications"].map { |n| n["id"] }).to eq([
- unread_high_priority.id,
- notification.id,
- read_regular.id,
- unread_regular.id,
- read_high_priority.id
- ])
+ expect(response.parsed_body["notifications"].map { |n| n["id"] }).to eq(
+ [
+ unread_high_priority.id,
+ notification.id,
+ read_regular.id,
+ unread_regular.id,
+ read_high_priority.id,
+ ],
+ )
end
it "should not bump last seen reviewable in readonly mode" do
@@ -212,11 +214,12 @@ RSpec.describe NotificationsController do
user.update!(admin: true)
expect {
- get "/notifications.json", params: {
- recent: true,
- silent: true,
- bump_last_seen_reviewable: true
- }
+ get "/notifications.json",
+ params: {
+ recent: true,
+ silent: true,
+ bump_last_seen_reviewable: true,
+ }
expect(response.status).to eq(200)
}.not_to change { user.reload.last_seen_reviewable_id }
end
@@ -258,16 +261,16 @@ RSpec.describe NotificationsController do
expect(response.status).to eq(200)
- expect(response.parsed_body["pending_reviewables"].map { |r| r["id"] }).to eq([
- pending_reviewable.id,
- pending_reviewable2.id
- ])
+ expect(response.parsed_body["pending_reviewables"].map { |r| r["id"] }).to eq(
+ [pending_reviewable.id, pending_reviewable2.id],
+ )
end
it "doesn't include reviewables that are claimed by someone that's not the current user" do
user.update!(admin: true)
- claimed_by_user = Fabricate(:reviewable, topic: Fabricate(:topic), created_at: 5.minutes.ago)
+ claimed_by_user =
+ Fabricate(:reviewable, topic: Fabricate(:topic), created_at: 5.minutes.ago)
Fabricate(:reviewable_claimed_topic, topic: claimed_by_user.topic, user: user)
user2 = Fabricate(:user)
@@ -278,11 +281,9 @@ RSpec.describe NotificationsController do
get "/notifications.json", params: { recent: true }
expect(response.status).to eq(200)
- expect(response.parsed_body["pending_reviewables"].map { |r| r["id"] }).to eq([
- pending_reviewable.id,
- claimed_by_user.id,
- unclaimed.id,
- ])
+ expect(response.parsed_body["pending_reviewables"].map { |r| r["id"] }).to eq(
+ [pending_reviewable.id, claimed_by_user.id, unclaimed.id],
+ )
end
it "doesn't include reviewables when navigation menu is legacy" do
@@ -310,7 +311,7 @@ RSpec.describe NotificationsController do
:notification,
user: user,
notification_type: Notification.types[:liked],
- created_at: 2.minutes.ago
+ created_at: 2.minutes.ago,
)
end
fab!(:liked2) do
@@ -318,7 +319,7 @@ RSpec.describe NotificationsController do
:notification,
user: user,
notification_type: Notification.types[:liked],
- created_at: 10.minutes.ago
+ created_at: 10.minutes.ago,
)
end
fab!(:replied) do
@@ -326,56 +327,48 @@ RSpec.describe NotificationsController do
:notification,
user: user,
notification_type: Notification.types[:replied],
- created_at: 7.minutes.ago
+ created_at: 7.minutes.ago,
)
end
fab!(:mentioned) do
- Fabricate(
- :notification,
- user: user,
- notification_type: Notification.types[:mentioned]
- )
+ Fabricate(:notification, user: user, notification_type: Notification.types[:mentioned])
end
it "correctly filters notifications to the type(s) given" do
get "/notifications.json", params: { recent: true, filter_by_types: "liked,replied" }
expect(response.status).to eq(200)
- expect(
- response.parsed_body["notifications"].map { |n| n["id"] }
- ).to eq([liked1.id, replied.id, liked2.id])
+ expect(response.parsed_body["notifications"].map { |n| n["id"] }).to eq(
+ [liked1.id, replied.id, liked2.id],
+ )
get "/notifications.json", params: { recent: true, filter_by_types: "replied" }
expect(response.status).to eq(200)
- expect(
- response.parsed_body["notifications"].map { |n| n["id"] }
- ).to eq([replied.id])
+ expect(response.parsed_body["notifications"].map { |n| n["id"] }).to eq([replied.id])
end
it "doesn't include notifications from other users" do
Fabricate(
:notification,
user: Fabricate(:user),
- notification_type: Notification.types[:liked]
+ notification_type: Notification.types[:liked],
)
get "/notifications.json", params: { recent: true, filter_by_types: "liked" }
expect(response.status).to eq(200)
- expect(
- response.parsed_body["notifications"].map { |n| n["id"] }
- ).to eq([liked1.id, liked2.id])
+ expect(response.parsed_body["notifications"].map { |n| n["id"] }).to eq(
+ [liked1.id, liked2.id],
+ )
end
it "limits the number of returned notifications according to the limit param" do
get "/notifications.json", params: { recent: true, filter_by_types: "liked", limit: 1 }
expect(response.status).to eq(200)
- expect(
- response.parsed_body["notifications"].map { |n| n["id"] }
- ).to eq([liked1.id])
+ expect(response.parsed_body["notifications"].map { |n| n["id"] }).to eq([liked1.id])
end
end
- context 'when username params is not valid' do
- it 'should raise the right error' do
- get "/notifications.json", params: { username: 'somedude' }
+ context "when username params is not valid" do
+ it "should raise the right error" do
+ get "/notifications.json", params: { username: "somedude" }
expect(response.status).to eq(404)
end
end
@@ -383,11 +376,24 @@ RSpec.describe NotificationsController do
context "with notifications for inaccessible topics" do
fab!(:sender) { Fabricate.build(:topic_allowed_user, user: Fabricate(:coding_horror)) }
fab!(:allowed_user) { Fabricate.build(:topic_allowed_user, user: user) }
- fab!(:another_allowed_user) { Fabricate.build(:topic_allowed_user, user: Fabricate(:user)) }
- fab!(:allowed_pm) { Fabricate(:private_message_topic, topic_allowed_users: [sender, allowed_user, another_allowed_user]) }
- fab!(:forbidden_pm) { Fabricate(:private_message_topic, topic_allowed_users: [sender, another_allowed_user]) }
- fab!(:allowed_pm_notification) { Fabricate(:private_message_notification, user: user, topic: allowed_pm) }
- fab!(:forbidden_pm_notification) { Fabricate(:private_message_notification, user: user, topic: forbidden_pm) }
+ fab!(:another_allowed_user) do
+ Fabricate.build(:topic_allowed_user, user: Fabricate(:user))
+ end
+ fab!(:allowed_pm) do
+ Fabricate(
+ :private_message_topic,
+ topic_allowed_users: [sender, allowed_user, another_allowed_user],
+ )
+ end
+ fab!(:forbidden_pm) do
+ Fabricate(:private_message_topic, topic_allowed_users: [sender, another_allowed_user])
+ end
+ fab!(:allowed_pm_notification) do
+ Fabricate(:private_message_notification, user: user, topic: allowed_pm)
+ end
+ fab!(:forbidden_pm_notification) do
+ Fabricate(:private_message_notification, user: user, topic: forbidden_pm)
+ end
def expect_correct_notifications(response)
notification_ids = response.parsed_body["notifications"].map { |n| n["id"] }
@@ -429,7 +435,7 @@ RSpec.describe NotificationsController do
end
end
- it 'should succeed' do
+ it "should succeed" do
put "/notifications/mark-read.json"
expect(response.status).to eq(200)
end
@@ -458,27 +464,27 @@ RSpec.describe NotificationsController do
expect(user.reload.total_unread_notifications).to eq(0)
end
- describe '#create' do
+ describe "#create" do
it "can't create notification" do
create_notification(user.id, 403, :to)
end
end
- describe '#update' do
+ describe "#update" do
it "can't update notification" do
update_notification(Fabricate(:topic).id, 403, :to_not)
end
end
- describe '#destroy' do
+ describe "#destroy" do
it "can't delete notification" do
delete_notification(403, :to)
end
end
- describe '#mark_read' do
+ describe "#mark_read" do
context "when targeting a notification by id" do
- it 'can mark a notification as read' do
+ it "can mark a notification as read" do
expect {
put "/notifications/mark-read.json", params: { id: notification.id }
expect(response.status).to eq(200)
@@ -500,27 +506,28 @@ RSpec.describe NotificationsController do
it "can mark notifications as read" do
replied1 = notification
replied1.update!(notification_type: Notification.types[:replied])
- mentioned = Fabricate(
- :notification,
- user: user,
- notification_type: Notification.types[:mentioned],
- read: false
- )
- liked = Fabricate(
- :notification,
- user: user,
- notification_type: Notification.types[:liked],
- read: false
- )
- replied2 = Fabricate(
- :notification,
- user: user,
- notification_type: Notification.types[:replied],
- read: true
- )
- put "/notifications/mark-read.json", params: {
- dismiss_types: "replied,mentioned"
- }
+ mentioned =
+ Fabricate(
+ :notification,
+ user: user,
+ notification_type: Notification.types[:mentioned],
+ read: false,
+ )
+ liked =
+ Fabricate(
+ :notification,
+ user: user,
+ notification_type: Notification.types[:liked],
+ read: false,
+ )
+ replied2 =
+ Fabricate(
+ :notification,
+ user: user,
+ notification_type: Notification.types[:replied],
+ read: true,
+ )
+ put "/notifications/mark-read.json", params: { dismiss_types: "replied,mentioned" }
expect(response.status).to eq(200)
expect(replied1.reload.read).to eq(true)
expect(replied2.reload.read).to eq(true)
@@ -530,21 +537,21 @@ RSpec.describe NotificationsController do
end
it "doesn't mark notifications of another user as read" do
- mentioned1 = Fabricate(
- :notification,
- user: user,
- notification_type: Notification.types[:mentioned],
- read: false
- )
- mentioned2 = Fabricate(
- :notification,
- user: Fabricate(:user),
- notification_type: Notification.types[:mentioned],
- read: false
- )
- put "/notifications/mark-read.json", params: {
- dismiss_types: "mentioned"
- }
+ mentioned1 =
+ Fabricate(
+ :notification,
+ user: user,
+ notification_type: Notification.types[:mentioned],
+ read: false,
+ )
+ mentioned2 =
+ Fabricate(
+ :notification,
+ user: Fabricate(:user),
+ notification_type: Notification.types[:mentioned],
+ read: false,
+ )
+ put "/notifications/mark-read.json", params: { dismiss_types: "mentioned" }
expect(mentioned1.reload.read).to eq(true)
expect(mentioned2.reload.read).to eq(false)
end
@@ -552,24 +559,24 @@ RSpec.describe NotificationsController do
end
end
- context 'as admin' do
+ context "as admin" do
fab!(:admin) { sign_in(Fabricate(:admin)) }
- describe '#create' do
+ describe "#create" do
it "can create notification" do
create_notification(admin.id, 200, :to_not)
expect(response.parsed_body["id"]).to_not eq(nil)
end
end
- describe '#update' do
+ describe "#update" do
it "can update notification" do
update_notification(8, 200, :to)
expect(response.parsed_body["topic_id"]).to eq(8)
end
end
- describe '#destroy' do
+ describe "#destroy" do
it "can delete notification" do
delete_notification(200, :to_not)
end
@@ -577,29 +584,28 @@ RSpec.describe NotificationsController do
end
end
- context 'when not logged in' do
-
- describe '#index' do
- it 'should raise an error' do
+ context "when not logged in" do
+ describe "#index" do
+ it "should raise an error" do
get "/notifications.json", params: { recent: true }
expect(response.status).to eq(403)
end
end
- describe '#create' do
+ describe "#create" do
it "can't create notification" do
user = Fabricate(:user)
create_notification(user.id, 403, :to)
end
end
- describe '#update' do
+ describe "#update" do
it "can't update notification" do
update_notification(Fabricate(:topic).id, 403, :to_not)
end
end
- describe '#destroy' do
+ describe "#destroy" do
it "can't delete notification" do
delete_notification(403, :to)
end
diff --git a/spec/requests/omniauth_callbacks_controller_spec.rb b/spec/requests/omniauth_callbacks_controller_spec.rb
index 1bf1e9a9aae..c051ef6165c 100644
--- a/spec/requests/omniauth_callbacks_controller_spec.rb
+++ b/spec/requests/omniauth_callbacks_controller_spec.rb
@@ -1,13 +1,11 @@
# frozen_string_literal: true
-require 'discourse_connect_base'
+require "discourse_connect_base"
RSpec.describe Users::OmniauthCallbacksController do
fab!(:user) { Fabricate(:user) }
- before do
- OmniAuth.config.test_mode = true
- end
+ before { OmniAuth.config.test_mode = true }
after do
Rails.application.env_config["omniauth.auth"] = OmniAuth.config.mock_auth[:google_oauth2] = nil
@@ -19,9 +17,9 @@ RSpec.describe Users::OmniauthCallbacksController do
it "fails if a provider is disabled" do
SiteSetting.enable_twitter_logins = false
- expect do
- Users::OmniauthCallbacksController.find_authenticator("twitter")
- end.to raise_error(Discourse::InvalidAccess)
+ expect do Users::OmniauthCallbacksController.find_authenticator("twitter") end.to raise_error(
+ Discourse::InvalidAccess,
+ )
end
it "fails for unknown" do
@@ -33,56 +31,53 @@ RSpec.describe Users::OmniauthCallbacksController do
it "finds an authenticator when enabled" do
SiteSetting.enable_twitter_logins = true
- expect(Users::OmniauthCallbacksController.find_authenticator("twitter"))
- .not_to eq(nil)
+ expect(Users::OmniauthCallbacksController.find_authenticator("twitter")).not_to eq(nil)
end
context "with a plugin-contributed auth provider" do
-
let :provider do
provider = Auth::AuthProvider.new
- provider.authenticator = Class.new(Auth::Authenticator) do
- def name
- 'ubuntu'
- end
+ provider.authenticator =
+ Class
+ .new(Auth::Authenticator) do
+ def name
+ "ubuntu"
+ end
- def enabled?
- SiteSetting.ubuntu_login_enabled
- end
- end.new
+ def enabled?
+ SiteSetting.ubuntu_login_enabled
+ end
+ end
+ .new
provider.enabled_setting = "ubuntu_login_enabled"
provider
end
- before do
- DiscoursePluginRegistry.register_auth_provider(provider)
- end
+ before { DiscoursePluginRegistry.register_auth_provider(provider) }
- after do
- DiscoursePluginRegistry.reset!
- end
+ after { DiscoursePluginRegistry.reset! }
it "finds an authenticator when enabled" do
SiteSetting.stubs(:ubuntu_login_enabled).returns(true)
- expect(Users::OmniauthCallbacksController.find_authenticator("ubuntu"))
- .to be(provider.authenticator)
+ expect(Users::OmniauthCallbacksController.find_authenticator("ubuntu")).to be(
+ provider.authenticator,
+ )
end
it "fails if an authenticator is disabled" do
SiteSetting.stubs(:ubuntu_login_enabled).returns(false)
- expect { Users::OmniauthCallbacksController.find_authenticator("ubuntu") }
- .to raise_error(Discourse::InvalidAccess)
+ expect { Users::OmniauthCallbacksController.find_authenticator("ubuntu") }.to raise_error(
+ Discourse::InvalidAccess,
+ )
end
end
end
- describe 'Google Oauth2' do
- before do
- SiteSetting.enable_google_oauth2_logins = true
- end
+ describe "Google Oauth2" do
+ before { SiteSetting.enable_google_oauth2_logins = true }
it "should display the failure message if needed" do
get "/auth/failure"
@@ -107,14 +102,25 @@ RSpec.describe Users::OmniauthCallbacksController do
end
it "should handle common errors" do
- OmniAuth::Strategies::GoogleOauth2.any_instance.stubs(:mock_request_call).raises(
- OAuth::Unauthorized.new(mock().tap { |m| m.stubs(:code).returns(403); m.stubs(:message).returns("Message") })
- )
+ OmniAuth::Strategies::GoogleOauth2
+ .any_instance
+ .stubs(:mock_request_call)
+ .raises(
+ OAuth::Unauthorized.new(
+ mock().tap do |m|
+ m.stubs(:code).returns(403)
+ m.stubs(:message).returns("Message")
+ end,
+ ),
+ )
post "/auth/google_oauth2"
expect(response.status).to eq(302)
expect(response.location).to include("/auth/failure?message=request_error")
- OmniAuth::Strategies::GoogleOauth2.any_instance.stubs(:mock_request_call).raises(JWT::InvalidIatError.new)
+ OmniAuth::Strategies::GoogleOauth2
+ .any_instance
+ .stubs(:mock_request_call)
+ .raises(JWT::InvalidIatError.new)
post "/auth/google_oauth2"
expect(response.status).to eq(302)
expect(response.location).to include("/auth/failure?message=invalid_iat")
@@ -171,9 +177,7 @@ RSpec.describe Users::OmniauthCallbacksController do
context "when in staff writes only mode" do
use_redis_snapshotting
- before do
- Discourse.enable_readonly_mode(Discourse::STAFF_WRITES_ONLY_MODE_KEY)
- end
+ before { Discourse.enable_readonly_mode(Discourse::STAFF_WRITES_ONLY_MODE_KEY) }
it "returns a 503 for non-staff" do
mock_auth(user.email, user.username, user.name)
@@ -202,22 +206,25 @@ RSpec.describe Users::OmniauthCallbacksController do
end
end
- describe 'when user not found' do
+ describe "when user not found" do
let(:email) { "somename@gmail.com" }
let(:username) { "somename" }
let(:name) { "Some Name" }
- before do
- mock_auth(email, username, name)
- end
+ before { mock_auth(email, username, name) }
- it 'should return the right response' do
- destination_url = '/somepath'
+ it "should return the right response" do
+ destination_url = "/somepath"
Rails.application.env_config["omniauth.origin"] = destination_url
events = DiscourseEvent.track_events { get "/auth/google_oauth2/callback.json" }
expect(events.any? { |e| e[:event_name] == :before_auth }).to eq(true)
- expect(events.any? { |e| e[:event_name] === :after_auth && Auth::GoogleOAuth2Authenticator === e[:params][0] && !e[:params][1].failed? }).to eq(true)
+ expect(
+ events.any? do |e|
+ e[:event_name] === :after_auth && Auth::GoogleOAuth2Authenticator === e[:params][0] &&
+ !e[:params][1].failed?
+ end,
+ ).to eq(true)
expect(response.status).to eq(302)
@@ -232,15 +239,20 @@ RSpec.describe Users::OmniauthCallbacksController do
expect(data["destination_url"]).to eq(destination_url)
end
- it 'should return the right response for staged users' do
+ it "should return the right response for staged users" do
Fabricate(:user, username: username, email: email, staged: true)
- destination_url = '/somepath'
+ destination_url = "/somepath"
Rails.application.env_config["omniauth.origin"] = destination_url
events = DiscourseEvent.track_events { get "/auth/google_oauth2/callback.json" }
expect(events.any? { |e| e[:event_name] == :before_auth }).to eq(true)
- expect(events.any? { |e| e[:event_name] === :after_auth && Auth::GoogleOAuth2Authenticator === e[:params][0] && !e[:params][1].failed? }).to eq(true)
+ expect(
+ events.any? do |e|
+ e[:event_name] === :after_auth && Auth::GoogleOAuth2Authenticator === e[:params][0] &&
+ !e[:params][1].failed?
+ end,
+ ).to eq(true)
expect(response.status).to eq(302)
@@ -255,8 +267,8 @@ RSpec.describe Users::OmniauthCallbacksController do
expect(data["destination_url"]).to eq(destination_url)
end
- it 'should include destination url in response' do
- destination_url = '/cookiepath'
+ it "should include destination url in response" do
+ destination_url = "/cookiepath"
cookies[:destination_url] = destination_url
get "/auth/google_oauth2/callback.json"
@@ -265,12 +277,12 @@ RSpec.describe Users::OmniauthCallbacksController do
expect(data["destination_url"]).to eq(destination_url)
end
- it 'should return an associate url when multiple login methods are enabled' do
+ it "should return an associate url when multiple login methods are enabled" do
get "/auth/google_oauth2/callback.json"
expect(response.status).to eq(302)
data = JSON.parse(cookies[:authentication_data])
- expect(data["associate_url"]).to start_with('/associate/')
+ expect(data["associate_url"]).to start_with("/associate/")
SiteSetting.enable_local_logins = false
get "/auth/google_oauth2/callback.json"
@@ -278,7 +290,7 @@ RSpec.describe Users::OmniauthCallbacksController do
expect(data["associate_url"]).to eq(nil)
end
- it 'does not use email for username suggestions if disabled in settings' do
+ it "does not use email for username suggestions if disabled in settings" do
SiteSetting.use_email_for_username_and_name_suggestions = false
username = ""
name = ""
@@ -291,7 +303,7 @@ RSpec.describe Users::OmniauthCallbacksController do
expect(data["username"]).to eq("user1") # not "billmailbox" that can be extracted from email
end
- it 'uses email for username suggestions if enabled in settings' do
+ it "uses email for username suggestions if enabled in settings" do
SiteSetting.use_email_for_username_and_name_suggestions = true
username = ""
name = ""
@@ -304,7 +316,7 @@ RSpec.describe Users::OmniauthCallbacksController do
expect(data["username"]).to eq("billmailbox")
end
- it 'stops using name for username suggestions if disabled in settings' do
+ it "stops using name for username suggestions if disabled in settings" do
SiteSetting.use_name_for_username_suggestions = false
username = ""
name = "John Smith"
@@ -317,12 +329,10 @@ RSpec.describe Users::OmniauthCallbacksController do
expect(data["username"]).to eq("user1")
end
- describe 'when site is invite_only' do
- before do
- SiteSetting.invite_only = true
- end
+ describe "when site is invite_only" do
+ before { SiteSetting.invite_only = true }
- it 'should return the right response without any origin' do
+ it "should return the right response without any origin" do
get "/auth/google_oauth2/callback.json"
expect(response.status).to eq(302)
@@ -332,7 +342,7 @@ RSpec.describe Users::OmniauthCallbacksController do
expect(data["requires_invite"]).to eq(true)
end
- it 'returns the right response for an invalid origin' do
+ it "returns the right response for an invalid origin" do
Rails.application.env_config["omniauth.origin"] = "/invitesinvites"
get "/auth/google_oauth2/callback.json"
@@ -340,11 +350,12 @@ RSpec.describe Users::OmniauthCallbacksController do
expect(response.status).to eq(302)
end
- it 'should return the right response when origin is invites page' do
- origin = Rails.application.routes.url_helpers.invite_url(
- Fabricate(:invite).invite_key,
- host: Discourse.base_url
- )
+ it "should return the right response when origin is invites page" do
+ origin =
+ Rails.application.routes.url_helpers.invite_url(
+ Fabricate(:invite).invite_key,
+ host: Discourse.base_url,
+ )
Rails.application.env_config["omniauth.origin"] = origin
@@ -360,21 +371,20 @@ RSpec.describe Users::OmniauthCallbacksController do
end
end
- describe 'when user has been verified' do
- let(:uid) { 12345 }
+ describe "when user has been verified" do
+ let(:uid) { 12_345 }
- before do
- mock_auth(user.email, "Somenickname", "Some name", uid)
- end
+ before { mock_auth(user.email, "Somenickname", "Some name", uid) }
- it 'should return the right response' do
+ it "should return the right response" do
expect(user.email_confirmed?).to eq(false)
- events = DiscourseEvent.track_events do
- get "/auth/google_oauth2/callback.json"
- end
+ events = DiscourseEvent.track_events { get "/auth/google_oauth2/callback.json" }
- expect(events.map { |event| event[:event_name] }).to include(:user_logged_in, :user_first_logged_in)
+ expect(events.map { |event| event[:event_name] }).to include(
+ :user_logged_in,
+ :user_first_logged_in,
+ )
expect(response.status).to eq(302)
@@ -390,15 +400,18 @@ RSpec.describe Users::OmniauthCallbacksController do
expect(user.email_confirmed?).to eq(true)
end
- it 'should return the authenticated response with the correct path for subfolders' do
+ it "should return the authenticated response with the correct path for subfolders" do
set_subfolder "/forum"
- events = DiscourseEvent.track_events do
- get "/auth/google_oauth2/callback.json"
- end
+ events = DiscourseEvent.track_events { get "/auth/google_oauth2/callback.json" }
- expect(response.headers["Set-Cookie"].match(/^authentication_data=.*; path=\/forum/)).not_to eq(nil)
+ expect(
+ response.headers["Set-Cookie"].match(%r{^authentication_data=.*; path=/forum}),
+ ).not_to eq(nil)
- expect(events.map { |event| event[:event_name] }).to include(:user_logged_in, :user_first_logged_in)
+ expect(events.map { |event| event[:event_name] }).to include(
+ :user_logged_in,
+ :user_first_logged_in,
+ )
expect(response.status).to eq(302)
@@ -420,11 +433,12 @@ RSpec.describe Users::OmniauthCallbacksController do
user.reload
expect(user.email_confirmed?).to eq(false)
- events = DiscourseEvent.track_events do
- get "/auth/google_oauth2/callback.json"
- end
+ events = DiscourseEvent.track_events { get "/auth/google_oauth2/callback.json" }
- expect(events.map { |event| event[:event_name] }).to include(:user_logged_in, :user_first_logged_in)
+ expect(events.map { |event| event[:event_name] }).to include(
+ :user_logged_in,
+ :user_first_logged_in,
+ )
expect(response.status).to eq(302)
@@ -439,9 +453,7 @@ RSpec.describe Users::OmniauthCallbacksController do
expect(user.staged).to eq(true)
expect(user.registration_ip_address).to eq(nil)
- events = DiscourseEvent.track_events do
- get "/auth/google_oauth2/callback.json"
- end
+ events = DiscourseEvent.track_events { get "/auth/google_oauth2/callback.json" }
expect(events.map { |event| event[:event_name] }).to include(:before_auth, :after_auth)
@@ -457,11 +469,12 @@ RSpec.describe Users::OmniauthCallbacksController do
# Now register
UsersController.any_instance.stubs(:honeypot_value).returns(nil)
UsersController.any_instance.stubs(:challenge_value).returns(nil)
- post "/u.json", params: {
- name: "My new name",
- username: "mynewusername",
- email: user.email
- }
+ post "/u.json",
+ params: {
+ name: "My new name",
+ username: "mynewusername",
+ email: user.email,
+ }
expect(response.status).to eq(200)
@@ -507,18 +520,22 @@ RSpec.describe Users::OmniauthCallbacksController do
SiteSetting.auth_overrides_name = true
SiteSetting.auth_overrides_username = true
- UserAssociatedAccount.create!(provider_name: "google_oauth2", user_id: user.id, provider_uid: uid)
+ UserAssociatedAccount.create!(
+ provider_name: "google_oauth2",
+ user_id: user.id,
+ provider_uid: uid,
+ )
old_email = user.email
- user.update!(name: 'somename', username: 'somusername', email: 'email@example.com')
+ user.update!(name: "somename", username: "somusername", email: "email@example.com")
get "/auth/google_oauth2/callback.json"
expect(response.status).to eq(302)
user.reload
expect(user.email).to eq(old_email)
- expect(user.username).to eq('Somenickname')
- expect(user.name).to eq('Some name')
+ expect(user.username).to eq("Somenickname")
+ expect(user.name).to eq("Some name")
end
it "should preserve username when several users login with the same username" do
@@ -533,16 +550,20 @@ RSpec.describe Users::OmniauthCallbacksController do
# the number should be preserved during subsequent logins
# bill3 should remain bill3
- user.update!(username: 'bill3')
+ user.update!(username: "bill3")
uid = "12345"
- UserAssociatedAccount.create!(provider_name: "google_oauth2", user_id: user.id, provider_uid: uid)
+ UserAssociatedAccount.create!(
+ provider_name: "google_oauth2",
+ user_id: user.id,
+ provider_uid: uid,
+ )
mock_auth(user.email, "bill", uid)
get "/auth/google_oauth2/callback.json"
user.reload
- expect(user.username).to eq('bill3')
+ expect(user.username).to eq("bill3")
end
it "will not update email if not verified" do
@@ -551,26 +572,34 @@ RSpec.describe Users::OmniauthCallbacksController do
OmniAuth.config.mock_auth[:google_oauth2][:extra][:raw_info][:email_verified] = false
- UserAssociatedAccount.create!(provider_name: "google_oauth2", user_id: user.id, provider_uid: '123545')
+ UserAssociatedAccount.create!(
+ provider_name: "google_oauth2",
+ user_id: user.id,
+ provider_uid: "123545",
+ )
old_email = user.email
- user.update!(email: 'email@example.com')
+ user.update!(email: "email@example.com")
get "/auth/google_oauth2/callback.json"
expect(response.status).to eq(302)
user.reload
- expect(user.email).to eq('email@example.com')
+ expect(user.email).to eq("email@example.com")
end
it "shows error when auth_overrides_email causes a validation error" do
SiteSetting.email_editable = false
SiteSetting.auth_overrides_email = true
- UserAssociatedAccount.create!(provider_name: "google_oauth2", user_id: user.id, provider_uid: uid)
+ UserAssociatedAccount.create!(
+ provider_name: "google_oauth2",
+ user_id: user.id,
+ provider_uid: uid,
+ )
google_email = user.email
- user.update!(email: 'anotheremail@example.com')
+ user.update!(email: "anotheremail@example.com")
Fabricate(:user, email: google_email) # Another user has the google account email
get "/auth/google_oauth2/callback"
@@ -579,15 +608,13 @@ RSpec.describe Users::OmniauthCallbacksController do
expect(session[:current_user_id]).to eq(nil)
user.reload
- expect(user.email).to eq('anotheremail@example.com')
+ expect(user.email).to eq("anotheremail@example.com")
end
- context 'when user has TOTP enabled' do
- before do
- user.create_totp(enabled: true)
- end
+ context "when user has TOTP enabled" do
+ before { user.create_totp(enabled: true) }
- it 'should return the right response' do
+ it "should return the right response" do
get "/auth/google_oauth2/callback.json"
expect(response.status).to eq(302)
@@ -597,7 +624,7 @@ RSpec.describe Users::OmniauthCallbacksController do
expect(data["email"]).to eq(user.email)
expect(data["omniauth_disallow_totp"]).to eq(true)
- user.update!(email: 'different@user.email')
+ user.update!(email: "different@user.email")
get "/auth/google_oauth2/callback.json"
expect(response.status).to eq(302)
@@ -605,12 +632,10 @@ RSpec.describe Users::OmniauthCallbacksController do
end
end
- context 'when user has security key enabled' do
- before do
- Fabricate(:user_security_key_with_random_credential, user: user)
- end
+ context "when user has security key enabled" do
+ before { Fabricate(:user_security_key_with_random_credential, user: user) }
- it 'should return the right response' do
+ it "should return the right response" do
get "/auth/google_oauth2/callback.json"
expect(response.status).to eq(302)
@@ -620,7 +645,7 @@ RSpec.describe Users::OmniauthCallbacksController do
expect(data["email"]).to eq(user.email)
expect(data["omniauth_disallow_totp"]).to eq(true)
- user.update!(email: 'different@user.email')
+ user.update!(email: "different@user.email")
get "/auth/google_oauth2/callback.json"
expect(response.status).to eq(302)
@@ -628,7 +653,7 @@ RSpec.describe Users::OmniauthCallbacksController do
end
end
- context 'when sso_payload cookie exist' do
+ context "when sso_payload cookie exist" do
before do
SiteSetting.enable_discourse_connect_provider = true
SiteSetting.discourse_connect_secret = "topsecret"
@@ -639,34 +664,42 @@ RSpec.describe Users::OmniauthCallbacksController do
@sso.return_sso_url = "http://somewhere.over.rainbow/sso"
cookies[:sso_payload] = @sso.payload
- provider_uid = 12345
- UserAssociatedAccount.create!(provider_name: "google_oauth2", provider_uid: provider_uid, user: user)
+ provider_uid = 12_345
+ UserAssociatedAccount.create!(
+ provider_name: "google_oauth2",
+ provider_uid: provider_uid,
+ user: user,
+ )
mock_auth(user.email, nil, nil, provider_uid)
end
- it 'should return the right response' do
+ it "should return the right response" do
get "/auth/google_oauth2/callback.json"
expect(response.status).to eq(302)
data = JSON.parse(cookies[:authentication_data])
- expect(data["destination_url"]).to match(/\/session\/sso_provider\?sso\=.*\&sig\=.*/)
+ expect(data["destination_url"]).to match(%r{/session/sso_provider\?sso\=.*\&sig\=.*})
end
end
- context 'when user has not verified his email' do
+ context "when user has not verified his email" do
before do
provider_uid = "12345"
- UserAssociatedAccount.create!(provider_name: "google_oauth2", provider_uid: provider_uid, user: user)
+ UserAssociatedAccount.create!(
+ provider_name: "google_oauth2",
+ provider_uid: provider_uid,
+ user: user,
+ )
user.update!(active: false)
another_email = "another_email@test.com"
mock_auth(another_email, nil, nil, provider_uid)
end
- it 'should return the right response' do
+ it "should return the right response" do
get "/auth/google_oauth2/callback.json"
expect(response.status).to eq(302)
@@ -686,8 +719,8 @@ RSpec.describe Users::OmniauthCallbacksController do
expect(response.status).to eq 302
expect(response.location).to eq "http://test.localhost/"
- cookie_data = JSON.parse(response.cookies['authentication_data'])
- expect(cookie_data["destination_url"]).to eq('/')
+ cookie_data = JSON.parse(response.cookies["authentication_data"])
+ expect(cookie_data["destination_url"]).to eq("/")
end
it "redirects to internal origin" do
@@ -697,8 +730,8 @@ RSpec.describe Users::OmniauthCallbacksController do
expect(response.status).to eq 302
expect(response.location).to eq "http://test.localhost/t/123"
- cookie_data = JSON.parse(response.cookies['authentication_data'])
- expect(cookie_data["destination_url"]).to eq('/t/123')
+ cookie_data = JSON.parse(response.cookies["authentication_data"])
+ expect(cookie_data["destination_url"]).to eq("/t/123")
end
it "redirects to internal origin on subfolder" do
@@ -710,8 +743,8 @@ RSpec.describe Users::OmniauthCallbacksController do
expect(response.status).to eq 302
expect(response.location).to eq "http://test.localhost/subpath/t/123"
- cookie_data = JSON.parse(response.cookies['authentication_data'])
- expect(cookie_data["destination_url"]).to eq('/subpath/t/123')
+ cookie_data = JSON.parse(response.cookies["authentication_data"])
+ expect(cookie_data["destination_url"]).to eq("/subpath/t/123")
end
it "never redirects to /auth/ origin" do
@@ -721,8 +754,8 @@ RSpec.describe Users::OmniauthCallbacksController do
expect(response.status).to eq 302
expect(response.location).to eq "http://test.localhost/"
- cookie_data = JSON.parse(response.cookies['authentication_data'])
- expect(cookie_data["destination_url"]).to eq('/')
+ cookie_data = JSON.parse(response.cookies["authentication_data"])
+ expect(cookie_data["destination_url"]).to eq("/")
end
it "never redirects to /auth/ origin on subfolder" do
@@ -734,8 +767,8 @@ RSpec.describe Users::OmniauthCallbacksController do
expect(response.status).to eq 302
expect(response.location).to eq "http://test.localhost/subpath"
- cookie_data = JSON.parse(response.cookies['authentication_data'])
- expect(cookie_data["destination_url"]).to eq('/subpath')
+ cookie_data = JSON.parse(response.cookies["authentication_data"])
+ expect(cookie_data["destination_url"]).to eq("/subpath")
end
it "redirects to relative origin" do
@@ -745,8 +778,8 @@ RSpec.describe Users::OmniauthCallbacksController do
expect(response.status).to eq 302
expect(response.location).to eq "http://test.localhost/t/123"
- cookie_data = JSON.parse(response.cookies['authentication_data'])
- expect(cookie_data["destination_url"]).to eq('/t/123')
+ cookie_data = JSON.parse(response.cookies["authentication_data"])
+ expect(cookie_data["destination_url"]).to eq("/t/123")
end
it "redirects with query" do
@@ -756,8 +789,8 @@ RSpec.describe Users::OmniauthCallbacksController do
expect(response.status).to eq 302
expect(response.location).to eq "http://test.localhost/t/123?foo=bar"
- cookie_data = JSON.parse(response.cookies['authentication_data'])
- expect(cookie_data["destination_url"]).to eq('/t/123?foo=bar')
+ cookie_data = JSON.parse(response.cookies["authentication_data"])
+ expect(cookie_data["destination_url"]).to eq("/t/123?foo=bar")
end
it "removes authentication_data cookie on logout" do
@@ -766,11 +799,11 @@ RSpec.describe Users::OmniauthCallbacksController do
provider = log_in_user(Fabricate(:user))
- expect(cookies['authentication_data']).to be
+ expect(cookies["authentication_data"]).to be
log_out_user(provider)
- expect(cookies['authentication_data']).to be_nil
+ expect(cookies["authentication_data"]).to be_nil
end
it "removes disallowed characters from username" do
@@ -801,29 +834,34 @@ RSpec.describe Users::OmniauthCallbacksController do
SiteSetting.google_oauth2_hd_groups_service_account_admin_email = "admin@example.com"
SiteSetting.google_oauth2_hd_groups_service_account_json = {
"private_key" => private_key.to_s,
- "client_email": "discourse-group-sync@example.iam.gserviceaccount.com",
+ :"client_email" => "discourse-group-sync@example.iam.gserviceaccount.com",
}.to_json
SiteSetting.google_oauth2_hd_groups = true
stub_request(:post, "https://oauth2.googleapis.com/token").to_return do |request|
jwt = Rack::Utils.parse_query(request.body)["assertion"]
- decoded_token = JWT.decode(jwt, private_key.public_key, true, { algorithm: 'RS256' })
+ decoded_token = JWT.decode(jwt, private_key.public_key, true, { algorithm: "RS256" })
{
status: 200,
body: { "access_token" => token, "type" => "bearer" }.to_json,
- headers: { "Content-Type" => "application/json" }
+ headers: {
+ "Content-Type" => "application/json",
+ },
}
end
- stub_request(:get, "https://admin.googleapis.com/admin/directory/v1/groups?userKey=#{mock_auth.uid}").
- with(headers: { "Authorization" => "Bearer #{token}" }).
- to_return do
+ stub_request(
+ :get,
+ "https://admin.googleapis.com/admin/directory/v1/groups?userKey=#{mock_auth.uid}",
+ )
+ .with(headers: { "Authorization" => "Bearer #{token}" })
+ .to_return do
{
status: 200,
body: { groups: groups }.to_json,
headers: {
- "Content-Type" => "application/json"
- }
+ "Content-Type" => "application/json",
+ },
}
end
end
@@ -837,76 +875,84 @@ RSpec.describe Users::OmniauthCallbacksController do
it "updates associated groups" do
mock_omniauth_for_groups([group1, group2])
- get "/auth/google_oauth2/callback.json", params: {
- code: 'abcde',
- hd: domain
- }
+ get "/auth/google_oauth2/callback.json", params: { code: "abcde", hd: domain }
expect(response.status).to eq(302)
- associated_groups = AssociatedGroup.where(provider_name: 'google_oauth2')
+ associated_groups = AssociatedGroup.where(provider_name: "google_oauth2")
expect(associated_groups.length).to eq(2)
expect(associated_groups.exists?(name: group1[:name])).to eq(true)
expect(associated_groups.exists?(name: group2[:name])).to eq(true)
user_associated_groups = UserAssociatedGroup.where(user_id: user.id)
expect(user_associated_groups.length).to eq(2)
- expect(user_associated_groups.exists?(associated_group_id: associated_groups.first.id)).to eq(true)
- expect(user_associated_groups.exists?(associated_group_id: associated_groups.second.id)).to eq(true)
+ expect(
+ user_associated_groups.exists?(associated_group_id: associated_groups.first.id),
+ ).to eq(true)
+ expect(
+ user_associated_groups.exists?(associated_group_id: associated_groups.second.id),
+ ).to eq(true)
mock_omniauth_for_groups([group1])
- get "/auth/google_oauth2/callback.json", params: {
- code: 'abcde',
- hd: domain
- }
+ get "/auth/google_oauth2/callback.json", params: { code: "abcde", hd: domain }
expect(response.status).to eq(302)
user_associated_groups = UserAssociatedGroup.where(user_id: user.id)
expect(user_associated_groups.length).to eq(1)
- expect(user_associated_groups.exists?(associated_group_id: associated_groups.first.id)).to eq(true)
- expect(user_associated_groups.exists?(associated_group_id: associated_groups.second.id)).to eq(false)
+ expect(
+ user_associated_groups.exists?(associated_group_id: associated_groups.first.id),
+ ).to eq(true)
+ expect(
+ user_associated_groups.exists?(associated_group_id: associated_groups.second.id),
+ ).to eq(false)
mock_omniauth_for_groups([])
- get "/auth/google_oauth2/callback.json", params: {
- code: 'abcde',
- hd: domain
- }
+ get "/auth/google_oauth2/callback.json", params: { code: "abcde", hd: domain }
expect(response.status).to eq(302)
user_associated_groups = UserAssociatedGroup.where(user_id: user.id)
expect(user_associated_groups.length).to eq(0)
- expect(user_associated_groups.exists?(associated_group_id: associated_groups.first.id)).to eq(false)
- expect(user_associated_groups.exists?(associated_group_id: associated_groups.second.id)).to eq(false)
+ expect(
+ user_associated_groups.exists?(associated_group_id: associated_groups.first.id),
+ ).to eq(false)
+ expect(
+ user_associated_groups.exists?(associated_group_id: associated_groups.second.id),
+ ).to eq(false)
end
it "handles failure to retrieve groups" do
mock_omniauth_for_groups([])
- get "/auth/google_oauth2/callback.json", params: {
- code: 'abcde',
- hd: domain
- }
+ get "/auth/google_oauth2/callback.json", params: { code: "abcde", hd: domain }
expect(response.status).to eq(302)
- associated_groups = AssociatedGroup.where(provider_name: 'google_oauth2')
+ associated_groups = AssociatedGroup.where(provider_name: "google_oauth2")
expect(associated_groups.exists?).to eq(false)
end
end
end
- context 'when attempting reconnect' do
+ context "when attempting reconnect" do
fab!(:user2) { Fabricate(:user) }
let(:user1_provider_id) { "12345" }
let(:user2_provider_id) { "123456" }
before do
- UserAssociatedAccount.create!(provider_name: "google_oauth2", provider_uid: user1_provider_id, user: user)
- UserAssociatedAccount.create!(provider_name: "google_oauth2", provider_uid: user2_provider_id, user: user2)
+ UserAssociatedAccount.create!(
+ provider_name: "google_oauth2",
+ provider_uid: user1_provider_id,
+ user: user,
+ )
+ UserAssociatedAccount.create!(
+ provider_name: "google_oauth2",
+ provider_uid: user2_provider_id,
+ user: user2,
+ )
mock_auth("someother_email@test.com", nil, nil, user1_provider_id)
end
- it 'should not reconnect normally' do
+ it "should not reconnect normally" do
# Log in normally
post "/auth/google_oauth2"
expect(response.status).to eq(302)
@@ -928,7 +974,7 @@ RSpec.describe Users::OmniauthCallbacksController do
expect(UserAssociatedAccount.count).to eq(2)
end
- it 'should redirect to associate URL if parameter supplied' do
+ it "should redirect to associate URL if parameter supplied" do
# Log in normally
post "/auth/google_oauth2?reconnect=true"
expect(response.status).to eq(302)
@@ -970,7 +1016,7 @@ RSpec.describe Users::OmniauthCallbacksController do
end
end
- context 'after changing email' do
+ context "after changing email" do
def login(identity)
mock_auth(identity[:email], nil, nil, "123545#{identity[:username]}")
@@ -979,16 +1025,12 @@ RSpec.describe Users::OmniauthCallbacksController do
JSON.parse(cookies[:authentication_data])
end
- it 'activates the correct email' do
- old_email = 'old@email.com'
- old_identity = { name: 'Bob',
- username: 'bob',
- email: old_email }
+ it "activates the correct email" do
+ old_email = "old@email.com"
+ old_identity = { name: "Bob", username: "bob", email: old_email }
user = Fabricate(:user, email: old_email)
- new_email = 'new@email.com'
- new_identity = { name: 'Bob',
- username: 'boguslaw',
- email: new_email }
+ new_email = "new@email.com"
+ new_identity = { name: "Bob", username: "boguslaw", email: new_email }
updater = EmailUpdater.new(guardian: user.guardian, user: user)
updater.change_to(new_email)
@@ -997,7 +1039,7 @@ RSpec.describe Users::OmniauthCallbacksController do
expect(user.email).to eq(old_email)
response = login(old_identity)
- expect(response['authenticated']).to eq(true)
+ expect(response["authenticated"]).to eq(true)
user.reload
expect(user.email).to eq(old_email)
@@ -1005,19 +1047,15 @@ RSpec.describe Users::OmniauthCallbacksController do
delete "/session/#{user.username}" # log out
response = login(new_identity)
- expect(response['authenticated']).to eq(nil)
- expect(response['email']).to eq(new_email)
+ expect(response["authenticated"]).to eq(nil)
+ expect(response["email"]).to eq(new_email)
end
end
context "when user is staged" do
- fab!(:staged_user) { Fabricate(
- :user,
- username: "staged_user",
- email: "staged.user@gmail.com",
- staged: true
- )
- }
+ fab!(:staged_user) do
+ Fabricate(:user, username: "staged_user", email: "staged.user@gmail.com", staged: true)
+ end
it "should use username of the staged user if username is not present in payload" do
mock_auth(staged_user.email, nil)
@@ -1051,18 +1089,14 @@ RSpec.describe Users::OmniauthCallbacksController do
end
end
- def mock_auth(email, nickname = nil, name = nil, uid = '12345')
+ def mock_auth(email, nickname = nil, name = nil, uid = "12345")
OmniAuth.config.mock_auth[:google_oauth2] = OmniAuth::AuthHash.new(
- provider: 'google_oauth2',
+ provider: "google_oauth2",
uid: uid,
- info: OmniAuth::AuthHash::InfoHash.new(
- email: email,
- nickname: nickname,
- name: name
- ),
+ info: OmniAuth::AuthHash::InfoHash.new(email: email, nickname: nickname, name: name),
extra: {
- raw_info: OmniAuth::AuthHash.new(email_verified: true)
- }
+ raw_info: OmniAuth::AuthHash.new(email_verified: true),
+ },
)
Rails.application.env_config["omniauth.auth"] = OmniAuth.config.mock_auth[:google_oauth2]
diff --git a/spec/requests/onebox_controller_spec.rb b/spec/requests/onebox_controller_spec.rb
index cb531a54229..31634d86a2b 100644
--- a/spec/requests/onebox_controller_spec.rb
+++ b/spec/requests/onebox_controller_spec.rb
@@ -1,10 +1,7 @@
# frozen_string_literal: true
RSpec.describe OneboxController do
-
- before do
- Discourse.cache.delete(Oneboxer.onebox_failed_cache_key(url))
- end
+ before { Discourse.cache.delete(Oneboxer.onebox_failed_cache_key(url)) }
let(:url) { "http://google.com" }
@@ -49,11 +46,9 @@ RSpec.describe OneboxController do
Oneboxer.onebox_previewed!(user.id)
end
- before do
- sign_in(user)
- end
+ before { sign_in(user) }
- it 'invalidates the cache if refresh is passed' do
+ it "invalidates the cache if refresh is passed" do
stub_request(:head, url)
stub_request(:get, url).to_return(status: 200, body: html).then.to_raise
@@ -65,7 +60,7 @@ RSpec.describe OneboxController do
bypass_limiting
stub_request(:get, url).to_return(status: 200, body: html2).then.to_raise
- get "/onebox.json", params: { url: url, refresh: 'true' }
+ get "/onebox.json", params: { url: url, refresh: "true" }
expect(response.status).to eq(200)
expect(response.body).to include("Onebox2")
end
@@ -80,13 +75,13 @@ RSpec.describe OneboxController do
get "/onebox.json", params: { url: url, refresh: "true" }
expect(response.status).to eq(200)
- expect(response.body).to include('Onebox1')
- expect(response.body).to include('bodycontent')
+ expect(response.body).to include("Onebox1")
+ expect(response.body).to include("bodycontent")
get "/onebox.json", params: { url: url }
expect(response.status).to eq(200)
- expect(response.body).to include('Onebox1')
- expect(response.body).to include('bodycontent')
+ expect(response.body).to include("Onebox1")
+ expect(response.body).to include("bodycontent")
end
end
@@ -103,7 +98,7 @@ RSpec.describe OneboxController do
end
describe "found onebox" do
- it 'returns the onebox response in the body' do
+ it "returns the onebox response in the body" do
stub_request(:head, url)
stub_request(:get, url).to_return(body: html).then.to_raise
get "/onebox.json", params: { url: url, refresh: "true" }
@@ -122,91 +117,95 @@ RSpec.describe OneboxController do
it "returns preview-error if the onebox is nil" do
stub_request_to_onebox_url(nil)
get "/onebox.json", params: { url: url, refresh: "true" }
- expect(response.body).to include("Sorry, we were unable to generate a preview for this web page")
+ expect(response.body).to include(
+ "Sorry, we were unable to generate a preview for this web page",
+ )
end
it "returns preview-error if the onebox is an empty string" do
stub_request_to_onebox_url(" \t ")
get "/onebox.json", params: { url: url, refresh: "true" }
expect(response.response_code).to eq(200)
- expect(response.body).to include("Sorry, we were unable to generate a preview for this web page")
+ expect(response.body).to include(
+ "Sorry, we were unable to generate a preview for this web page",
+ )
end
end
describe "local onebox" do
- it 'does not cache local oneboxes' do
+ it "does not cache local oneboxes" do
post = create_post
url = Discourse.base_url + post.url
get "/onebox.json", params: { url: url, category_id: post.topic.category_id }
- expect(response.body).to include('blockquote')
+ expect(response.body).to include("blockquote")
post.trash!
get "/onebox.json", params: { url: url, category_id: post.topic.category_id }
- expect(response.body).not_to include('blockquote')
+ expect(response.body).not_to include("blockquote")
end
end
- it 'does not onebox when you have no permission on category' do
+ it "does not onebox when you have no permission on category" do
post = create_post
url = Discourse.base_url + post.url
get "/onebox.json", params: { url: url, category_id: post.topic.category_id }
- expect(response.body).to include('blockquote')
+ expect(response.body).to include("blockquote")
post.topic.category.set_permissions(staff: :full)
post.topic.category.save
get "/onebox.json", params: { url: url, category_id: post.topic.category_id }
- expect(response.body).not_to include('blockquote')
+ expect(response.body).not_to include("blockquote")
end
- it 'does not allow onebox of PMs' do
- post = create_post(archetype: 'private_message', target_usernames: [user.username])
+ it "does not allow onebox of PMs" do
+ post = create_post(archetype: "private_message", target_usernames: [user.username])
url = Discourse.base_url + post.url
get "/onebox.json", params: { url: url }
- expect(response.body).not_to include('blockquote')
+ expect(response.body).not_to include("blockquote")
end
- it 'does not allow whisper onebox' do
+ it "does not allow whisper onebox" do
post = create_post
whisper = create_post(topic_id: post.topic_id, post_type: Post.types[:whisper])
url = Discourse.base_url + whisper.url
get "/onebox.json", params: { url: url }
- expect(response.body).not_to include('blockquote')
+ expect(response.body).not_to include("blockquote")
end
- it 'allows onebox to public topics/posts in PM' do
+ it "allows onebox to public topics/posts in PM" do
post = create_post
url = Discourse.base_url + post.url
get "/onebox.json", params: { url: url }
- expect(response.body).to include('blockquote')
+ expect(response.body).to include("blockquote")
end
- context 'with local categories' do
+ context "with local categories" do
fab!(:category) { Fabricate(:category) }
- it 'oneboxes a public category' do
+ it "oneboxes a public category" do
get "/onebox.json", params: { url: category.url }
- expect(response.body).to include('aside')
+ expect(response.body).to include("aside")
end
- it 'includes subcategories' do
+ it "includes subcategories" do
subcategory = Fabricate(:category, name: "child", parent_category_id: category.id)
get "/onebox.json", params: { url: subcategory.url }
- expect(response.body).not_to include('subcategories')
+ expect(response.body).not_to include("subcategories")
end
- it 'does not onebox restricted categories' do
+ it "does not onebox restricted categories" do
staff_category = Fabricate(:private_category, group: Group[:staff])
get "/onebox.json", params: { url: staff_category.url }
- expect(response.body).not_to include('aside')
+ expect(response.body).not_to include("aside")
end
end
end
diff --git a/spec/requests/permalinks_controller_spec.rb b/spec/requests/permalinks_controller_spec.rb
index b2c8d813052..5e4e965572f 100644
--- a/spec/requests/permalinks_controller_spec.rb
+++ b/spec/requests/permalinks_controller_spec.rb
@@ -4,7 +4,7 @@ RSpec.describe PermalinksController do
fab!(:topic) { Fabricate(:topic) }
fab!(:permalink) { Fabricate(:permalink, url: "deadroute/topic/546") }
- describe 'show' do
+ describe "show" do
it "should redirect to a permalink's target_url with status 301" do
permalink.update!(topic_id: topic.id)
@@ -25,12 +25,12 @@ RSpec.describe PermalinksController do
end
it "should apply normalizations" do
- permalink.update!(external_url: '/topic/100')
+ permalink.update!(external_url: "/topic/100")
SiteSetting.permalink_normalizations = "/(.*)\\?.*/\\1"
get "/#{permalink.url}", params: { test: "hello" }
- expect(response).to redirect_to('/topic/100')
+ expect(response).to redirect_to("/topic/100")
expect(response.status).to eq(301)
SiteSetting.permalink_normalizations = "/(.*)\\?.*/\\1X"
@@ -40,8 +40,8 @@ RSpec.describe PermalinksController do
expect(response.status).to eq(404)
end
- it 'return 404 if permalink record does not exist' do
- get '/not/a/valid/url'
+ it "return 404 if permalink record does not exist" do
+ get "/not/a/valid/url"
expect(response.status).to eq(404)
end
end
diff --git a/spec/requests/post_action_users_controller_spec.rb b/spec/requests/post_action_users_controller_spec.rb
index 33988481c40..2de40facfb1 100644
--- a/spec/requests/post_action_users_controller_spec.rb
+++ b/spec/requests/post_action_users_controller_spec.rb
@@ -4,12 +4,22 @@ RSpec.describe PostActionUsersController do
fab!(:user) { Fabricate(:user) }
let(:post) { Fabricate(:post, user: sign_in(user)) }
- context 'with render' do
- it 'always allows you to see your own actions' do
+ context "with render" do
+ it "always allows you to see your own actions" do
notify_mod = PostActionType.types[:notify_moderators]
- PostActionCreator.new(post.user, post, notify_mod, message: 'well something is wrong here!').perform
- PostActionCreator.new(Fabricate(:user), post, notify_mod, message: 'well something is not wrong here!').perform
+ PostActionCreator.new(
+ post.user,
+ post,
+ notify_mod,
+ message: "well something is wrong here!",
+ ).perform
+ PostActionCreator.new(
+ Fabricate(:user),
+ post,
+ notify_mod,
+ message: "well something is not wrong here!",
+ ).perform
get "/post_action_users.json", params: { id: post.id, post_action_type_id: notify_mod }
expect(response.status).to eq(200)
@@ -21,56 +31,63 @@ RSpec.describe PostActionUsersController do
end
end
- it 'raises an error without an id' do
+ it "raises an error without an id" do
get "/post_action_users.json", params: { post_action_type_id: PostActionType.types[:like] }
expect(response.status).to eq(400)
end
- it 'raises an error without a post action type' do
+ it "raises an error without a post action type" do
get "/post_action_users.json", params: { id: post.id }
expect(response.status).to eq(400)
end
it "fails when the user doesn't have permission to see the post" do
post.trash!
- get "/post_action_users.json", params: {
- id: post.id, post_action_type_id: PostActionType.types[:like]
- }
+ get "/post_action_users.json",
+ params: {
+ id: post.id,
+ post_action_type_id: PostActionType.types[:like],
+ }
expect(response).to be_forbidden
end
- it 'raises an error when anon tries to look at an invalid action' do
- get "/post_action_users.json", params: {
- id: Fabricate(:post).id,
- post_action_type_id: PostActionType.types[:notify_moderators]
- }
+ it "raises an error when anon tries to look at an invalid action" do
+ get "/post_action_users.json",
+ params: {
+ id: Fabricate(:post).id,
+ post_action_type_id: PostActionType.types[:notify_moderators],
+ }
expect(response).to be_forbidden
end
- it 'succeeds' do
- get "/post_action_users.json", params: {
- id: post.id, post_action_type_id: PostActionType.types[:like]
- }
+ it "succeeds" do
+ get "/post_action_users.json",
+ params: {
+ id: post.id,
+ post_action_type_id: PostActionType.types[:like],
+ }
expect(response.status).to eq(200)
end
- it 'will return an unknown attribute for muted users' do
+ it "will return an unknown attribute for muted users" do
ignored_user = Fabricate(:user)
PostActionCreator.like(ignored_user, post)
regular_user = Fabricate(:user)
PostActionCreator.like(regular_user, post)
Fabricate(:ignored_user, user: user, ignored_user: ignored_user)
- get "/post_action_users.json", params: {
- id: post.id, post_action_type_id: PostActionType.types[:like]
- }
+ get "/post_action_users.json",
+ params: {
+ id: post.id,
+ post_action_type_id: PostActionType.types[:like],
+ }
expect(response.status).to eq(200)
- json_users = response.parsed_body['post_action_users']
- expect(json_users.find { |u| u['id'] == regular_user.id }['unknown']).to be_blank
- expect(json_users.find { |u| u['id'] == ignored_user.id }['unknown']).to eq(true)
+ json_users = response.parsed_body["post_action_users"]
+ expect(json_users.find { |u| u["id"] == regular_user.id }["unknown"]).to be_blank
+ expect(json_users.find { |u| u["id"] == ignored_user.id }["unknown"]).to eq(true)
end
it "paginates post actions" do
@@ -82,7 +99,12 @@ RSpec.describe PostActionUsersController do
end
get "/post_action_users.json",
- params: { id: post.id, post_action_type_id: PostActionType.types[:like], page: 1, limit: 2 }
+ params: {
+ id: post.id,
+ post_action_type_id: PostActionType.types[:like],
+ page: 1,
+ limit: 2,
+ }
users = response.parsed_body["post_action_users"]
total = response.parsed_body["total_rows_post_action_users"]
@@ -93,10 +115,12 @@ RSpec.describe PostActionUsersController do
expect(total).to eq(5)
end
- it 'returns no users when the action type id is invalid' do
- get "/post_action_users.json", params: {
- id: post.id, post_action_type_id: "invalid_action_type"
- }
+ it "returns no users when the action type id is invalid" do
+ get "/post_action_users.json",
+ params: {
+ id: post.id,
+ post_action_type_id: "invalid_action_type",
+ }
expect(response.status).to eq(200)
diff --git a/spec/requests/post_actions_controller_spec.rb b/spec/requests/post_actions_controller_spec.rb
index 8fca3ef9159..d1c9aba94b5 100644
--- a/spec/requests/post_actions_controller_spec.rb
+++ b/spec/requests/post_actions_controller_spec.rb
@@ -4,67 +4,73 @@ RSpec.describe PostActionsController do
fab!(:user) { Fabricate(:user) }
fab!(:coding_horror) { Fabricate(:coding_horror) }
- before do
- Group.refresh_automatic_groups!
- end
+ before { Group.refresh_automatic_groups! }
- describe '#destroy' do
+ describe "#destroy" do
fab!(:post) { Fabricate(:post, user: coding_horror) }
- it 'requires you to be logged in' do
+ it "requires you to be logged in" do
delete "/post_actions/#{post.id}.json"
expect(response.status).to eq(403)
end
- context 'when logged in' do
- before do
- sign_in(user)
- end
+ context "when logged in" do
+ before { sign_in(user) }
- it 'raises an error when the post_action_type_id is missing' do
+ it "raises an error when the post_action_type_id is missing" do
delete "/post_actions/#{post.id}.json"
expect(response.status).to eq(400)
end
it "returns 404 when the post action type doesn't exist for that user" do
- delete "/post_actions/#{post.id}.json", params: { post_action_type_id: PostActionType.types[:like] }
+ delete "/post_actions/#{post.id}.json",
+ params: {
+ post_action_type_id: PostActionType.types[:like],
+ }
expect(response.status).to eq(404)
end
- context 'with a post_action record ' do
+ context "with a post_action record " do
let!(:post_action) do
PostAction.create!(
user_id: user.id,
post_id: post.id,
- post_action_type_id: PostActionType.types[:like]
+ post_action_type_id: PostActionType.types[:like],
)
end
- it 'returns success' do
- delete "/post_actions/#{post.id}.json", params: { post_action_type_id: PostActionType.types[:like] }
+ it "returns success" do
+ delete "/post_actions/#{post.id}.json",
+ params: {
+ post_action_type_id: PostActionType.types[:like],
+ }
expect(response.status).to eq(200)
end
- it 'deletes the action' do
- delete "/post_actions/#{post.id}.json", params: {
- post_action_type_id: PostActionType.types[:like]
- }
+ it "deletes the action" do
+ delete "/post_actions/#{post.id}.json",
+ params: {
+ post_action_type_id: PostActionType.types[:like],
+ }
expect(response.status).to eq(200)
- expect(PostAction.exists?(
- user_id: user.id,
- post_id: post.id,
- post_action_type_id: PostActionType.types[:like],
- deleted_at: nil
- )).to eq(false)
+ expect(
+ PostAction.exists?(
+ user_id: user.id,
+ post_id: post.id,
+ post_action_type_id: PostActionType.types[:like],
+ deleted_at: nil,
+ ),
+ ).to eq(false)
end
it "isn't deleted when the user doesn't have permission" do
post_action.update!(created_at: 1.day.ago)
- delete "/post_actions/#{post.id}.json", params: {
- post_action_type_id: PostActionType.types[:like]
- }
+ delete "/post_actions/#{post.id}.json",
+ params: {
+ post_action_type_id: PostActionType.types[:like],
+ }
expect(response).to be_forbidden
end
@@ -72,69 +78,69 @@ RSpec.describe PostActionsController do
end
end
- describe '#create' do
- it 'requires you to be logged in' do
- post '/post_actions.json'
+ describe "#create" do
+ it "requires you to be logged in" do
+ post "/post_actions.json"
expect(response.status).to eq(403)
end
- it 'fails when the user does not have permission to see the post' do
+ it "fails when the user does not have permission to see the post" do
sign_in(user)
pm = Fabricate(:private_message_post, user: coding_horror)
- post "/post_actions.json", params: {
- id: pm.id,
- post_action_type_id: PostActionType.types[:like]
- }
+ post "/post_actions.json",
+ params: {
+ id: pm.id,
+ post_action_type_id: PostActionType.types[:like],
+ }
expect(response.status).to eq(403)
end
- it 'fails when the user tries to notify user that has disabled PM' do
+ it "fails when the user tries to notify user that has disabled PM" do
sign_in(user)
user2 = Fabricate(:user)
post = Fabricate(:post, user: user2)
user2.user_option.update!(allow_private_messages: false)
- post "/post_actions.json", params: {
- id: post.id,
- post_action_type_id: PostActionType.types[:notify_user],
- message: 'testing',
- flag_topic: false
- }
+ post "/post_actions.json",
+ params: {
+ id: post.id,
+ post_action_type_id: PostActionType.types[:notify_user],
+ message: "testing",
+ flag_topic: false,
+ }
expect(response.status).to eq(422)
- expect(response.parsed_body["errors"].first).to eq(I18n.t(
- :not_accepting_pms, username: user2.username
- ))
+ expect(response.parsed_body["errors"].first).to eq(
+ I18n.t(:not_accepting_pms, username: user2.username),
+ )
end
- describe 'as a moderator' do
+ describe "as a moderator" do
fab!(:user) { Fabricate(:moderator) }
fab!(:post_1) { Fabricate(:post, user: coding_horror) }
- before do
- sign_in(user)
- end
+ before { sign_in(user) }
- it 'raises an error when the id is missing' do
- post "/post_actions.json", params: {
- post_action_type_id: PostActionType.types[:like]
- }
+ it "raises an error when the id is missing" do
+ post "/post_actions.json", params: { post_action_type_id: PostActionType.types[:like] }
expect(response.status).to eq(400)
end
- it 'fails when the id is invalid' do
- post "/post_actions.json", params: {
- post_action_type_id: PostActionType.types[:like], id: -1
- }
+ it "fails when the id is invalid" do
+ post "/post_actions.json",
+ params: {
+ post_action_type_id: PostActionType.types[:like],
+ id: -1,
+ }
expect(response.status).to eq(404)
end
- it 'raises an error when the post_action_type_id index is missing' do
+ it "raises an error when the post_action_type_id index is missing" do
post "/post_actions.json", params: { id: post_1.id }
expect(response.status).to eq(400)
end
@@ -142,18 +148,22 @@ RSpec.describe PostActionsController do
it "fails when the user doesn't have permission to see the post" do
post_1 = Fabricate(:private_message_post, user: Fabricate(:user))
- post "/post_actions.json", params: {
- id: post_1.id, post_action_type_id: PostActionType.types[:like]
- }
+ post "/post_actions.json",
+ params: {
+ id: post_1.id,
+ post_action_type_id: PostActionType.types[:like],
+ }
expect(response).to be_forbidden
end
- it 'allows us to create an post action on a post' do
+ it "allows us to create an post action on a post" do
expect do
- post "/post_actions.json", params: {
- id: post_1.id, post_action_type_id: PostActionType.types[:like]
- }
+ post "/post_actions.json",
+ params: {
+ id: post_1.id,
+ post_action_type_id: PostActionType.types[:like],
+ }
end.to change { PostAction.count }.by(1)
post_action = PostAction.last
@@ -167,39 +177,43 @@ RSpec.describe PostActionsController do
PostAction.create!(
post_id: post_1.id,
user_id: user.id,
- post_action_type_id: PostActionType.types[:inappropriate]
+ post_action_type_id: PostActionType.types[:inappropriate],
)
- post "/post_actions.json", params: {
- id: post_1.id, post_action_type_id: PostActionType.types[:off_topic]
- }
+ post "/post_actions.json",
+ params: {
+ id: post_1.id,
+ post_action_type_id: PostActionType.types[:off_topic],
+ }
expect(response).to be_forbidden
end
- it 'passes the message through' do
- message = 'action message goes here'
+ it "passes the message through" do
+ message = "action message goes here"
- post "/post_actions.json", params: {
- id: post_1.id,
- post_action_type_id: PostActionType.types[:notify_user],
- message: message
- }
+ post "/post_actions.json",
+ params: {
+ id: post_1.id,
+ post_action_type_id: PostActionType.types[:notify_user],
+ message: message,
+ }
expect(response.status).to eq(200)
expect(PostAction.last.post_id).to eq(post_1.id)
expect(Post.last.raw).to include(message)
end
- it 'passes the message through as warning' do
- message = 'action message goes here'
+ it "passes the message through as warning" do
+ message = "action message goes here"
- post "/post_actions.json", params: {
- id: post_1.id,
- post_action_type_id: PostActionType.types[:notify_user],
- message: message,
- is_warning: true
- }
+ post "/post_actions.json",
+ params: {
+ id: post_1.id,
+ post_action_type_id: PostActionType.types[:notify_user],
+ message: message,
+ is_warning: true,
+ }
expect(response.status).to eq(200)
expect(PostAction.last.post_id).to eq(post_1.id)
@@ -213,22 +227,24 @@ RSpec.describe PostActionsController do
it "doesn't create message as a warning if the user isn't staff" do
sign_in(Fabricate(:user))
- post "/post_actions.json", params: {
- id: post_1.id,
- post_action_type_id: PostActionType.types[:notify_user],
- message: 'action message goes here',
- is_warning: true
- }
+ post "/post_actions.json",
+ params: {
+ id: post_1.id,
+ post_action_type_id: PostActionType.types[:notify_user],
+ message: "action message goes here",
+ is_warning: true,
+ }
expect(response.status).to eq(403)
end
- it 'passes take_action through' do
- post "/post_actions.json", params: {
- id: post_1.id,
- post_action_type_id: PostActionType.types[:spam],
- take_action: 'true'
- }
+ it "passes take_action through" do
+ post "/post_actions.json",
+ params: {
+ id: post_1.id,
+ post_action_type_id: PostActionType.types[:spam],
+ take_action: "true",
+ }
expect(response.status).to eq(200)
@@ -243,10 +259,11 @@ RSpec.describe PostActionsController do
it "doesn't pass take_action through if the user isn't staff" do
sign_in(Fabricate(:user))
- post "/post_actions.json", params: {
- id: post_1.id,
- post_action_type_id: PostActionType.types[:inappropriate]
- }
+ post "/post_actions.json",
+ params: {
+ id: post_1.id,
+ post_action_type_id: PostActionType.types[:inappropriate],
+ }
expect(response.status).to eq(200)
@@ -259,5 +276,4 @@ RSpec.describe PostActionsController do
end
end
end
-
end
diff --git a/spec/requests/post_readers_controller_spec.rb b/spec/requests/post_readers_controller_spec.rb
index f5c004cc3df..b9f0e2b6bfb 100644
--- a/spec/requests/post_readers_controller_spec.rb
+++ b/spec/requests/post_readers_controller_spec.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
RSpec.describe PostReadersController do
- describe '#index' do
+ describe "#index" do
fab!(:admin) { Fabricate(:admin) }
fab!(:reader) { Fabricate(:user) }
@@ -13,44 +13,44 @@ RSpec.describe PostReadersController do
@post = Fabricate(:post, topic: @group_message, post_number: 3)
end
- context 'when the user has access to readers data' do
+ context "when the user has access to readers data" do
before do
@group.update!(publish_read_state: true)
@group.add(admin)
@group.add(reader)
end
- it 'returns an empty list when nobody has read the topic' do
- get '/post_readers.json', params: { id: @post.id }
+ it "returns an empty list when nobody has read the topic" do
+ get "/post_readers.json", params: { id: @post.id }
- readers = response.parsed_body['post_readers']
+ readers = response.parsed_body["post_readers"]
expect(readers).to be_empty
end
- it 'returns an user who read until that post' do
+ it "returns an user who read until that post" do
TopicUser.create!(user: reader, topic: @group_message, last_read_post_number: 3)
- get '/post_readers.json', params: { id: @post.id }
- reader_data = response.parsed_body['post_readers'].first
+ get "/post_readers.json", params: { id: @post.id }
+ reader_data = response.parsed_body["post_readers"].first
assert_reader_is_correctly_serialized(reader_data, reader, @post)
end
- it 'returns an user who read pass that post' do
+ it "returns an user who read pass that post" do
TopicUser.create!(user: reader, topic: @group_message, last_read_post_number: 4)
- get '/post_readers.json', params: { id: @post.id }
- reader_data = response.parsed_body['post_readers'].first
+ get "/post_readers.json", params: { id: @post.id }
+ reader_data = response.parsed_body["post_readers"].first
assert_reader_is_correctly_serialized(reader_data, reader, @post)
end
- it 'return an empty list when nodobody read until that post' do
+ it "return an empty list when nodobody read until that post" do
TopicUser.create!(user: reader, topic: @group_message, last_read_post_number: 1)
- get '/post_readers.json', params: { id: @post.id }
- readers = response.parsed_body['post_readers']
+ get "/post_readers.json", params: { id: @post.id }
+ readers = response.parsed_body["post_readers"]
expect(readers).to be_empty
end
@@ -59,8 +59,8 @@ RSpec.describe PostReadersController do
@post.update(post_number: 1)
TopicUser.create!(user: reader, topic: @group_message, last_read_post_number: nil)
- get '/post_readers.json', params: { id: @post.id }
- readers = response.parsed_body['post_readers']
+ get "/post_readers.json", params: { id: @post.id }
+ readers = response.parsed_body["post_readers"]
expect(readers).to be_empty
end
@@ -69,8 +69,8 @@ RSpec.describe PostReadersController do
TopicUser.create!(user: reader, topic: @group_message, last_read_post_number: 4)
reader.update(staged: true)
- get '/post_readers.json', params: { id: @post.id }
- readers = response.parsed_body['post_readers']
+ get "/post_readers.json", params: { id: @post.id }
+ readers = response.parsed_body["post_readers"]
expect(readers).to be_empty
end
@@ -80,8 +80,8 @@ RSpec.describe PostReadersController do
non_staff_user = Fabricate(:user)
TopicUser.create!(user: non_staff_user, topic: @group_message, last_read_post_number: 4)
- get '/post_readers.json', params: { id: @post.id }
- readers = response.parsed_body['post_readers']
+ get "/post_readers.json", params: { id: @post.id }
+ readers = response.parsed_body["post_readers"]
expect(readers).to be_empty
end
@@ -91,38 +91,42 @@ RSpec.describe PostReadersController do
admin = Fabricate(:admin)
TopicUser.create!(user: admin, topic: @group_message, last_read_post_number: 4)
- get '/post_readers.json', params: { id: @post.id }
- reader_data = response.parsed_body['post_readers'].first
+ get "/post_readers.json", params: { id: @post.id }
+ reader_data = response.parsed_body["post_readers"].first
assert_reader_is_correctly_serialized(reader_data, admin, @post)
end
it "doesn't include bots" do
- TopicUser.create!(user: Discourse.system_user, topic: @group_message, last_read_post_number: 4)
+ TopicUser.create!(
+ user: Discourse.system_user,
+ topic: @group_message,
+ last_read_post_number: 4,
+ )
- get '/post_readers.json', params: { id: @post.id }
- readers = response.parsed_body['post_readers']
+ get "/post_readers.json", params: { id: @post.id }
+ readers = response.parsed_body["post_readers"]
expect(readers).to be_empty
end
end
def assert_reader_is_correctly_serialized(reader_data, reader, post)
- expect(reader_data['avatar_template']).to eq reader.avatar_template
- expect(reader_data['username']).to eq reader.username
- expect(reader_data['username_lower']).to eq reader.username_lower
+ expect(reader_data["avatar_template"]).to eq reader.avatar_template
+ expect(reader_data["username"]).to eq reader.username
+ expect(reader_data["username_lower"]).to eq reader.username_lower
end
- it 'returns forbidden if no group has publish_read_state enabled' do
- get '/post_readers.json', params: { id: @post.id }
+ it "returns forbidden if no group has publish_read_state enabled" do
+ get "/post_readers.json", params: { id: @post.id }
expect(response).to be_forbidden
end
- it 'returns forbidden if current_user is not a member of a group with publish_read_state enabled' do
+ it "returns forbidden if current_user is not a member of a group with publish_read_state enabled" do
@group.update!(publish_read_state: true)
- get '/post_readers.json', params: { id: @post.id }
+ get "/post_readers.json", params: { id: @post.id }
expect(response).to be_forbidden
end
diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb
index ca08564a986..a8e12fcf0b6 100644
--- a/spec/requests/posts_controller_spec.rb
+++ b/spec/requests/posts_controller_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.shared_examples 'finding and showing post' do
+RSpec.shared_examples "finding and showing post" do
let!(:post) { post_by_user }
it "ensures the user can't see the post" do
@@ -11,7 +11,7 @@ RSpec.shared_examples 'finding and showing post' do
expect(response).to be_forbidden
end
- it 'succeeds' do
+ it "succeeds" do
get url
expect(response.status).to eq(200)
end
@@ -23,9 +23,7 @@ RSpec.shared_examples 'finding and showing post' do
end
context "with deleted post" do
- before do
- post.trash!(user)
- end
+ before { post.trash!(user) }
it "can't find deleted posts as an anonymous user" do
get url
@@ -74,8 +72,8 @@ RSpec.shared_examples 'finding and showing post' do
end
end
-RSpec.shared_examples 'action requires login' do |method, url, params = {}|
- it 'raises an exception when not logged in' do
+RSpec.shared_examples "action requires login" do |method, url, params = {}|
+ it "raises an exception when not logged in" do
self.public_send(method, url, **params)
expect(response.status).to eq(403)
end
@@ -91,20 +89,18 @@ RSpec.describe PostsController do
fab!(:topic) { Fabricate(:topic) }
fab!(:post_by_user) { Fabricate(:post, user: user) }
let(:public_post) { Fabricate(:post, user: user, topic: topic) }
- let(:topicless_post) { Fabricate(:post, user: user, raw: '
Car 54, where are you?
') }
+ let(:topicless_post) { Fabricate(:post, user: user, raw: "Car 54, where are you?
") }
- let(:private_topic) do
- Fabricate(:topic, archetype: Archetype.private_message, category_id: nil)
- end
+ let(:private_topic) { Fabricate(:topic, archetype: Archetype.private_message, category_id: nil) }
let(:private_post) { Fabricate(:post, user: user, topic: private_topic) }
- describe '#show' do
- include_examples 'finding and showing post' do
+ describe "#show" do
+ include_examples "finding and showing post" do
let(:url) { "/posts/#{post.id}.json" }
end
- it 'gets all the expected fields' do
+ it "gets all the expected fields" do
# non fabricated test
new_post = create_post
@@ -118,18 +114,18 @@ RSpec.describe PostsController do
end
end
- describe '#by_number' do
- include_examples 'finding and showing post' do
+ describe "#by_number" do
+ include_examples "finding and showing post" do
let(:url) { "/posts/by_number/#{post.topic_id}/#{post.post_number}.json" }
end
end
- describe '#by_date' do
- include_examples 'finding and showing post' do
+ describe "#by_date" do
+ include_examples "finding and showing post" do
let(:url) { "/posts/by-date/#{post.topic_id}/#{post.created_at.strftime("%Y-%m-%d")}.json" }
end
- it 'returns the expected post' do
+ it "returns the expected post" do
first_post = Fabricate(:post, created_at: 10.days.ago)
second_post = Fabricate(:post, topic: first_post.topic, created_at: 4.days.ago)
_third_post = Fabricate(:post, topic: first_post.topic, created_at: 3.days.ago)
@@ -141,15 +137,15 @@ RSpec.describe PostsController do
expect(json["id"]).to eq(second_post.id)
end
- it 'returns no post if date is > at last created post' do
+ it "returns no post if date is > at last created post" do
get "/posts/by-date/#{post.topic_id}/2245-11-11.json"
_json = response.parsed_body
expect(response.status).to eq(404)
end
end
- describe '#reply_history' do
- include_examples 'finding and showing post' do
+ describe "#reply_history" do
+ include_examples "finding and showing post" do
let(:url) { "/posts/#{post.id}/reply-history.json" }
end
@@ -157,21 +153,21 @@ RSpec.describe PostsController do
parent = Fabricate(:post)
child = Fabricate(:post, topic: parent.topic, reply_to_post_number: parent.post_number)
- parent.user.upsert_custom_fields(hello: 'world', hidden: 'dontshow')
- SiteSetting.public_user_custom_fields = 'hello'
+ parent.user.upsert_custom_fields(hello: "world", hidden: "dontshow")
+ SiteSetting.public_user_custom_fields = "hello"
get "/posts/#{child.id}/reply-history.json"
expect(response.status).to eq(200)
json = response.parsed_body
- expect(json[0]['id']).to eq(parent.id)
- expect(json[0]['user_custom_fields']['hello']).to eq('world')
- expect(json[0]['user_custom_fields']['hidden']).to be_blank
+ expect(json[0]["id"]).to eq(parent.id)
+ expect(json[0]["user_custom_fields"]["hello"]).to eq("world")
+ expect(json[0]["user_custom_fields"]["hidden"]).to be_blank
end
end
- describe '#reply_ids' do
- include_examples 'finding and showing post' do
+ describe "#reply_ids" do
+ include_examples "finding and showing post" do
let(:url) { "/posts/#{post.id}/reply-ids.json" }
end
@@ -185,40 +181,39 @@ RSpec.describe PostsController do
get "/posts/#{post.id}/reply-ids.json"
expect(response.status).to eq(200)
- expect(response.parsed_body).to eq([
- { "id" => reply1.id, "level" => 1 },
- { "id" => reply2.id, "level" => 1 },
- ])
+ expect(response.parsed_body).to eq(
+ [{ "id" => reply1.id, "level" => 1 }, { "id" => reply2.id, "level" => 1 }],
+ )
end
end
- describe '#replies' do
- include_examples 'finding and showing post' do
+ describe "#replies" do
+ include_examples "finding and showing post" do
let(:url) { "/posts/#{post.id}/replies.json" }
end
- it 'asks post for replies' do
+ it "asks post for replies" do
parent = Fabricate(:post)
child = Fabricate(:post, topic: parent.topic, reply_to_post_number: parent.post_number)
PostReply.create!(post: parent, reply: child)
- child.user.upsert_custom_fields(hello: 'world', hidden: 'dontshow')
- SiteSetting.public_user_custom_fields = 'hello'
+ child.user.upsert_custom_fields(hello: "world", hidden: "dontshow")
+ SiteSetting.public_user_custom_fields = "hello"
get "/posts/#{parent.id}/replies.json"
expect(response.status).to eq(200)
json = response.parsed_body
- expect(json[0]['id']).to eq(child.id)
- expect(json[0]['user_custom_fields']['hello']).to eq('world')
- expect(json[0]['user_custom_fields']['hidden']).to be_blank
+ expect(json[0]["id"]).to eq(child.id)
+ expect(json[0]["user_custom_fields"]["hello"]).to eq("world")
+ expect(json[0]["user_custom_fields"]["hidden"]).to be_blank
end
end
- describe '#destroy' do
- include_examples 'action requires login', :delete, "/posts/123.json"
+ describe "#destroy" do
+ include_examples "action requires login", :delete, "/posts/123.json"
- describe 'when logged in' do
+ describe "when logged in" do
let(:topic) { Fabricate(:topic) }
it "raises an error when the user doesn't have permission to see the post" do
@@ -254,9 +249,7 @@ RSpec.describe PostsController do
context "with permanently destroy" do
let!(:post) { Fabricate(:post, topic_id: topic.id, post_number: 3) }
- before do
- SiteSetting.can_permanently_delete = true
- end
+ before { SiteSetting.can_permanently_delete = true }
it "does not work for a post that was not deleted yet" do
sign_in(admin)
@@ -312,13 +305,26 @@ RSpec.describe PostsController do
end
end
- describe '#destroy_many' do
- include_examples 'action requires login', :delete, "/posts/destroy_many.json", params: { post_ids: [123, 345] }
+ describe "#destroy_many" do
+ include_examples "action requires login",
+ :delete,
+ "/posts/destroy_many.json",
+ params: {
+ post_ids: [123, 345],
+ }
- describe 'when logged in' do
+ describe "when logged in" do
fab!(:poster) { Fabricate(:moderator) }
fab!(:post1) { Fabricate(:post, user: poster, post_number: 2) }
- fab!(:post2) { Fabricate(:post, topic: post1.topic, user: poster, post_number: 3, reply_to_post_number: post1.post_number) }
+ fab!(:post2) do
+ Fabricate(
+ :post,
+ topic: post1.topic,
+ user: poster,
+ post_number: 3,
+ reply_to_post_number: post1.post_number,
+ )
+ end
it "raises invalid parameters no post_ids" do
sign_in(poster)
@@ -329,7 +335,7 @@ RSpec.describe PostsController do
it "raises invalid parameters with missing ids" do
sign_in(poster)
- delete "/posts/destroy_many.json", params: { post_ids: [12345] }
+ delete "/posts/destroy_many.json", params: { post_ids: [12_345] }
expect(response.status).to eq(400)
end
@@ -353,14 +359,16 @@ RSpec.describe PostsController do
end
describe "can delete replies" do
- before do
- PostReply.create(post_id: post1.id, reply_post_id: post2.id)
- end
+ before { PostReply.create(post_id: post1.id, reply_post_id: post2.id) }
it "deletes the post and the reply to it" do
sign_in(poster)
PostDestroyer.any_instance.expects(:destroy).twice
- delete "/posts/destroy_many.json", params: { post_ids: [post1.id], reply_post_ids: [post1.id] }
+ delete "/posts/destroy_many.json",
+ params: {
+ post_ids: [post1.id],
+ reply_post_ids: [post1.id],
+ }
end
end
@@ -381,7 +389,11 @@ RSpec.describe PostsController do
it "can defer all posts based on `agree_with_first_reply_flag` param" do
expect(ReviewableFlaggedPost.pending.count).to eq(2)
- delete "/posts/destroy_many.json", params: { post_ids: [post1.id, post2.id], agree_with_first_reply_flag: false }
+ delete "/posts/destroy_many.json",
+ params: {
+ post_ids: [post1.id, post2.id],
+ agree_with_first_reply_flag: false,
+ }
PostActionCreator.off_topic(moderator, post1)
PostActionCreator.off_topic(moderator, post2)
Jobs::SendSystemMessage.clear
@@ -390,10 +402,10 @@ RSpec.describe PostsController do
end
end
- describe '#recover' do
- include_examples 'action requires login', :put, "/posts/123/recover.json"
+ describe "#recover" do
+ include_examples "action requires login", :put, "/posts/123/recover.json"
- describe 'when logged in' do
+ describe "when logged in" do
it "raises an error when the user doesn't have permission to see the post" do
post = Fabricate(:post, topic: Fabricate(:private_message_topic), post_number: 3)
sign_in(user)
@@ -424,23 +436,29 @@ RSpec.describe PostsController do
end
end
- describe '#update' do
- include_examples 'action requires login', :put, "/posts/2.json"
+ describe "#update" do
+ include_examples "action requires login", :put, "/posts/2.json"
let!(:post) { post_by_user }
let(:update_params) do
{
- post: { raw: 'edited body', edit_reason: 'typo' },
- image_sizes: { 'http://image.com/image.jpg' => { 'width' => 123, 'height' => 456 } },
+ post: {
+ raw: "edited body",
+ edit_reason: "typo",
+ },
+ image_sizes: {
+ "http://image.com/image.jpg" => {
+ "width" => 123,
+ "height" => 456,
+ },
+ },
}
end
- describe 'when logged in as a regular user' do
- before do
- sign_in(user)
- end
+ describe "when logged in as a regular user" do
+ before { sign_in(user) }
- it 'does not allow TL0 or TL1 to update when edit time limit expired' do
+ it "does not allow TL0 or TL1 to update when edit time limit expired" do
SiteSetting.post_edit_time_limit = 5
SiteSetting.tl2_post_edit_time_limit = 30
@@ -451,10 +469,10 @@ RSpec.describe PostsController do
put "/posts/#{post.id}.json", params: update_params
expect(response.status).to eq(422)
- expect(response.parsed_body['errors']).to include(I18n.t('too_late_to_edit'))
+ expect(response.parsed_body["errors"]).to include(I18n.t("too_late_to_edit"))
end
- it 'does not allow TL2 to update when edit time limit expired' do
+ it "does not allow TL2 to update when edit time limit expired" do
SiteSetting.post_edit_time_limit = 12
SiteSetting.tl2_post_edit_time_limit = 8
@@ -465,15 +483,15 @@ RSpec.describe PostsController do
put "/posts/#{post.id}.json", params: update_params
expect(response.status).to eq(422)
- expect(response.parsed_body['errors']).to include(I18n.t('too_late_to_edit'))
+ expect(response.parsed_body["errors"]).to include(I18n.t("too_late_to_edit"))
end
- it 'passes the image sizes through' do
+ it "passes the image sizes through" do
Post.any_instance.expects(:image_sizes=)
put "/posts/#{post.id}.json", params: update_params
end
- it 'passes the edit reason through' do
+ it "passes the edit reason through" do
put "/posts/#{post.id}.json", params: update_params
expect(response.status).to eq(200)
post.reload
@@ -481,8 +499,8 @@ RSpec.describe PostsController do
expect(post.raw).to eq("edited body")
end
- it 'checks for an edit conflict' do
- update_params[:post][:raw_old] = 'old body'
+ it "checks for an edit conflict" do
+ update_params[:post][:raw_old] = "old body"
put "/posts/#{post.id}.json", params: update_params
expect(response.status).to eq(409)
@@ -502,16 +520,16 @@ RSpec.describe PostsController do
end
it "updates post's raw attribute" do
- put "/posts/#{post.id}.json", params: { post: { raw: 'edited body ' } }
+ put "/posts/#{post.id}.json", params: { post: { raw: "edited body " } }
expect(response.status).to eq(200)
- expect(response.parsed_body['post']['raw']).to eq('edited body')
- expect(post.reload.raw).to eq('edited body')
+ expect(response.parsed_body["post"]["raw"]).to eq("edited body")
+ expect(post.reload.raw).to eq("edited body")
end
it "extracts links from the new body" do
param = update_params
- param[:post][:raw] = 'I just visited this https://google.com so many cool links'
+ param[:post][:raw] = "I just visited this https://google.com so many cool links"
put "/posts/#{post.id}.json", params: param
@@ -529,9 +547,7 @@ RSpec.describe PostsController do
end
describe "when logged in as staff" do
- before do
- sign_in(moderator)
- end
+ before { sign_in(moderator) }
it "supports updating posts in deleted topics" do
first_post = post.topic.ordered_posts.first
@@ -541,7 +557,7 @@ RSpec.describe PostsController do
expect(response.status).to eq(200)
post.reload
- expect(post.raw).to eq('edited body')
+ expect(post.raw).to eq("edited body")
end
it "won't update bump date if post is a whisper" do
@@ -574,7 +590,7 @@ RSpec.describe PostsController do
expect(response.status).to eq(200)
post.reload
- expect(post.raw).to eq('edited body')
+ expect(post.raw).to eq("edited body")
expect(UserHistory.where(action: UserHistory.actions[:post_edit]).count).to eq(1)
end
@@ -585,10 +601,9 @@ RSpec.describe PostsController do
put "/posts/#{post.id}.json", params: update_params
expect(response.status).to eq(403)
end
-
end
- it 'can not change category to a disallowed category' do
+ it "can not change category to a disallowed category" do
post = create_post
sign_in(post.user)
@@ -596,15 +611,19 @@ RSpec.describe PostsController do
category.set_permissions(staff: :full)
category.save!
- put "/posts/#{post.id}.json", params: {
- post: { category_id: category.id, raw: "this is a test edit to post" }
- }
+ put "/posts/#{post.id}.json",
+ params: {
+ post: {
+ category_id: category.id,
+ raw: "this is a test edit to post",
+ },
+ }
expect(response.status).not_to eq(200)
expect(post.topic.category_id).not_to eq(category.id)
end
- it 'can not move to a category that requires topic approval' do
+ it "can not move to a category that requires topic approval" do
post = create_post
sign_in(post.user)
@@ -612,7 +631,13 @@ RSpec.describe PostsController do
category.custom_fields[Category::REQUIRE_TOPIC_APPROVAL] = true
category.save!
- put "/posts/#{post.id}.json", params: { post: { category_id: category.id, raw: "this is a test edit to post" } }
+ put "/posts/#{post.id}.json",
+ params: {
+ post: {
+ category_id: category.id,
+ raw: "this is a test edit to post",
+ },
+ }
expect(response.status).to eq(403)
expect(post.topic.reload.category_id).not_to eq(category.id)
@@ -627,19 +652,18 @@ RSpec.describe PostsController do
end
end
- after do
- DiscoursePluginRegistry.reset!
- end
+ after { DiscoursePluginRegistry.reset! }
it "calls blocks passed into `add_permitted_post_update_param`" do
sign_in(post.user)
- put "/posts/#{post.id}.json", params: {
- post: {
- raw: "this is a random post",
- raw_old: post.raw,
- random_number: 244
- }
- }
+ put "/posts/#{post.id}.json",
+ params: {
+ post: {
+ raw: "this is a random post",
+ raw_old: post.raw,
+ random_number: 244,
+ },
+ }
expect(response.status).to eq(200)
expect(post.reload.custom_fields[:random_number]).to eq("244")
@@ -651,9 +675,7 @@ RSpec.describe PostsController do
fab!(:post) { Fabricate(:post) }
fab!(:bookmark) { Fabricate(:bookmark, user: user, bookmarkable: post) }
- before do
- sign_in(user)
- end
+ before { sign_in(user) }
it "deletes the bookmark" do
bookmark_id = bookmark.id
@@ -662,23 +684,19 @@ RSpec.describe PostsController do
end
context "when the user still has bookmarks in the topic" do
- before do
- Fabricate(:bookmark, user: user, bookmarkable: Fabricate(:post, topic: post.topic))
- end
+ before { Fabricate(:bookmark, user: user, bookmarkable: Fabricate(:post, topic: post.topic)) }
it "marks topic_bookmarked as true" do
delete "/posts/#{post.id}/bookmark.json"
- expect(response.parsed_body['topic_bookmarked']).to eq(true)
+ expect(response.parsed_body["topic_bookmarked"]).to eq(true)
end
end
end
- describe '#wiki' do
+ describe "#wiki" do
include_examples "action requires login", :put, "/posts/2/wiki.json"
describe "when logged in" do
- before do
- sign_in(user)
- end
+ before { sign_in(user) }
let!(:post) { post_by_user }
@@ -691,7 +709,7 @@ RSpec.describe PostsController do
end
it "raises an error if the user doesn't have permission to wiki the post" do
- put "/posts/#{post.id}/wiki.json", params: { wiki: 'true' }
+ put "/posts/#{post.id}/wiki.json", params: { wiki: "true" }
expect(response).to be_forbidden
end
@@ -701,23 +719,23 @@ RSpec.describe PostsController do
another_post = Fabricate(:post, user: another_user)
expect do
- put "/posts/#{another_post.id}/wiki.json", params: { wiki: 'true' }
+ put "/posts/#{another_post.id}/wiki.json", params: { wiki: "true" }
end.to change { another_post.reload.version }.by(1)
expect do
- put "/posts/#{another_post.id}/wiki.json", params: { wiki: 'false' }
+ put "/posts/#{another_post.id}/wiki.json", params: { wiki: "false" }
end.to change { another_post.reload.version }.by(-1)
sign_in(Fabricate(:admin))
expect do
- put "/posts/#{another_post.id}/wiki.json", params: { wiki: 'true' }
+ put "/posts/#{another_post.id}/wiki.json", params: { wiki: "true" }
end.to change { another_post.reload.version }.by(1)
end
it "can wiki a post" do
sign_in(admin)
- put "/posts/#{post.id}/wiki.json", params: { wiki: 'true' }
+ put "/posts/#{post.id}/wiki.json", params: { wiki: "true" }
post.reload
expect(post.wiki).to eq(true)
@@ -727,7 +745,7 @@ RSpec.describe PostsController do
wikied_post = Fabricate(:post, user: user, wiki: true)
sign_in(admin)
- put "/posts/#{wikied_post.id}/wiki.json", params: { wiki: 'false' }
+ put "/posts/#{wikied_post.id}/wiki.json", params: { wiki: "false" }
wikied_post.reload
expect(wikied_post.wiki).to eq(false)
@@ -735,13 +753,11 @@ RSpec.describe PostsController do
end
end
- describe '#post_type' do
+ describe "#post_type" do
include_examples "action requires login", :put, "/posts/2/post_type.json"
describe "when logged in" do
- before do
- sign_in(moderator)
- end
+ before { sign_in(moderator) }
let!(:post) { post_by_user }
@@ -773,7 +789,7 @@ RSpec.describe PostsController do
end
end
- describe '#rebake' do
+ describe "#rebake" do
include_examples "action requires login", :put, "/posts/2/rebake.json"
describe "when logged in" do
@@ -793,7 +809,11 @@ RSpec.describe PostsController do
it "will invalidate broken images cache" do
sign_in(moderator)
- PostHotlinkedMedia.create!(url: "https://example.com/image.jpg", post: post, status: 'download_failed')
+ PostHotlinkedMedia.create!(
+ url: "https://example.com/image.jpg",
+ post: post,
+ status: "download_failed",
+ )
put "/posts/#{post.id}/rebake.json"
post.reload
expect(post.post_hotlinked_media).to eq([])
@@ -801,125 +821,195 @@ RSpec.describe PostsController do
end
end
- describe '#create' do
- include_examples 'action requires login', :post, "/posts.json"
+ describe "#create" do
+ include_examples "action requires login", :post, "/posts.json"
before do
SiteSetting.min_first_post_typing_time = 0
SiteSetting.whispers_allowed_groups = "#{Group::AUTO_GROUPS[:staff]}"
end
- context 'with api' do
- it 'memoizes duplicate requests' do
+ context "with api" do
+ it "memoizes duplicate requests" do
raw = "this is a test post 123 #{SecureRandom.hash}"
title = "this is a title #{SecureRandom.hash}"
master_key = Fabricate(:api_key).key
post "/posts.json",
- params: { raw: raw, title: title, wpid: 1 },
- headers: { HTTP_API_USERNAME: user.username, HTTP_API_KEY: master_key }
+ params: {
+ raw: raw,
+ title: title,
+ wpid: 1,
+ },
+ headers: {
+ HTTP_API_USERNAME: user.username,
+ HTTP_API_KEY: master_key,
+ }
expect(response.status).to eq(200)
original = response.body
post "/posts.json",
- params: { raw: raw, title: title, wpid: 2 },
- headers: { HTTP_API_USERNAME: user.username_lower, HTTP_API_KEY: master_key }
+ params: {
+ raw: raw,
+ title: title,
+ wpid: 2,
+ },
+ headers: {
+ HTTP_API_USERNAME: user.username_lower,
+ HTTP_API_KEY: master_key,
+ }
expect(response.status).to eq(200)
expect(response.body).to eq(original)
end
- it 'allows to create posts in import_mode' do
+ it "allows to create posts in import_mode" do
Jobs.run_immediately!
NotificationEmailer.enable
post_1 = Fabricate(:post)
master_key = Fabricate(:api_key).key
post "/posts.json",
- params: { raw: 'this is test reply 1', topic_id: post_1.topic.id, reply_to_post_number: 1 },
- headers: { HTTP_API_USERNAME: user.username, HTTP_API_KEY: master_key }
+ params: {
+ raw: "this is test reply 1",
+ topic_id: post_1.topic.id,
+ reply_to_post_number: 1,
+ },
+ headers: {
+ HTTP_API_USERNAME: user.username,
+ HTTP_API_KEY: master_key,
+ }
expect(response.status).to eq(200)
expect(post_1.topic.user.notifications.count).to eq(1)
post_1.topic.user.notifications.destroy_all
post "/posts.json",
- params: { raw: 'this is test reply 2', topic_id: post_1.topic.id, reply_to_post_number: 1, import_mode: true },
- headers: { HTTP_API_USERNAME: user.username, HTTP_API_KEY: master_key }
+ params: {
+ raw: "this is test reply 2",
+ topic_id: post_1.topic.id,
+ reply_to_post_number: 1,
+ import_mode: true,
+ },
+ headers: {
+ HTTP_API_USERNAME: user.username,
+ HTTP_API_KEY: master_key,
+ }
expect(response.status).to eq(200)
expect(post_1.topic.user.notifications.count).to eq(0)
post "/posts.json",
- params: { raw: 'this is test reply 3', topic_id: post_1.topic.id, reply_to_post_number: 1, import_mode: false },
- headers: { HTTP_API_USERNAME: user.username, HTTP_API_KEY: master_key }
+ params: {
+ raw: "this is test reply 3",
+ topic_id: post_1.topic.id,
+ reply_to_post_number: 1,
+ import_mode: false,
+ },
+ headers: {
+ HTTP_API_USERNAME: user.username,
+ HTTP_API_KEY: master_key,
+ }
expect(response.status).to eq(200)
expect(post_1.topic.user.notifications.count).to eq(1)
end
- it 'allows a topic to be created with an external_id' do
+ it "allows a topic to be created with an external_id" do
master_key = Fabricate(:api_key).key
- post "/posts.json", params: {
- raw: 'this is the test content',
- title: "this is some post",
- external_id: 'external_id'
- }, headers: { HTTP_API_USERNAME: user.username, HTTP_API_KEY: master_key }
+ post "/posts.json",
+ params: {
+ raw: "this is the test content",
+ title: "this is some post",
+ external_id: "external_id",
+ },
+ headers: {
+ HTTP_API_USERNAME: user.username,
+ HTTP_API_KEY: master_key,
+ }
expect(response.status).to eq(200)
new_topic = Topic.last
- expect(new_topic.external_id).to eq('external_id')
+ expect(new_topic.external_id).to eq("external_id")
end
- it 'prevents whispers for regular users' do
+ it "prevents whispers for regular users" do
post_1 = Fabricate(:post)
user_key = ApiKey.create!(user: user).key
post "/posts.json",
- params: { raw: 'this is test whisper', topic_id: post_1.topic.id, reply_to_post_number: 1, whisper: true },
- headers: { HTTP_API_USERNAME: user.username, HTTP_API_KEY: user_key }
+ params: {
+ raw: "this is test whisper",
+ topic_id: post_1.topic.id,
+ reply_to_post_number: 1,
+ whisper: true,
+ },
+ headers: {
+ HTTP_API_USERNAME: user.username,
+ HTTP_API_KEY: user_key,
+ }
expect(response.status).to eq(403)
end
- it 'does not advance draft' do
+ it "does not advance draft" do
Draft.set(user, Draft::NEW_TOPIC, 0, "test")
user_key = ApiKey.create!(user: user).key
post "/posts.json",
- params: { title: 'this is a test topic', raw: 'this is test whisper' },
- headers: { HTTP_API_USERNAME: user.username, HTTP_API_KEY: user_key }
+ params: {
+ title: "this is a test topic",
+ raw: "this is test whisper",
+ },
+ headers: {
+ HTTP_API_USERNAME: user.username,
+ HTTP_API_KEY: user_key,
+ }
expect(response.status).to eq(200)
expect(Draft.get(user, Draft::NEW_TOPIC, 0)).to eq("test")
end
- it 'will raise an error if specified category cannot be found' do
+ it "will raise an error if specified category cannot be found" do
user = Fabricate(:admin)
master_key = Fabricate(:api_key).key
post "/posts.json",
- params: { title: 'this is a test title', raw: 'this is test body', category: 'invalid' },
- headers: { HTTP_API_USERNAME: user.username, HTTP_API_KEY: master_key }
+ params: {
+ title: "this is a test title",
+ raw: "this is test body",
+ category: "invalid",
+ },
+ headers: {
+ HTTP_API_USERNAME: user.username,
+ HTTP_API_KEY: master_key,
+ }
expect(response.status).to eq(400)
expect(response.parsed_body["errors"]).to include(
- I18n.t("invalid_params", message: "category")
+ I18n.t("invalid_params", message: "category"),
)
end
- it 'will raise an error if specified embed_url is invalid' do
+ it "will raise an error if specified embed_url is invalid" do
user = Fabricate(:admin)
master_key = Fabricate(:api_key).key
post "/posts.json",
- params: { title: 'this is a test title', raw: 'this is test body', embed_url: '/test.txt' },
- headers: { HTTP_API_USERNAME: user.username, HTTP_API_KEY: master_key }
+ params: {
+ title: "this is a test title",
+ raw: "this is test body",
+ embed_url: "/test.txt",
+ },
+ headers: {
+ HTTP_API_USERNAME: user.username,
+ HTTP_API_KEY: master_key,
+ }
expect(response.status).to eq(422)
end
@@ -929,8 +1019,15 @@ RSpec.describe PostsController do
expect do
post "/posts.json",
- params: { raw: "this is a test title", title: "this is test body", unlist_topic: true },
- headers: { HTTP_API_USERNAME: admin.username, HTTP_API_KEY: master_key }
+ params: {
+ raw: "this is a test title",
+ title: "this is test body",
+ unlist_topic: true,
+ },
+ headers: {
+ HTTP_API_USERNAME: admin.username,
+ HTTP_API_KEY: master_key,
+ }
end.to change { Topic.count }.by(1)
expect(response.status).to eq(200)
@@ -942,13 +1039,20 @@ RSpec.describe PostsController do
expect do
post "/posts.json",
- params: { raw: "this is a test title", title: "this is test body", unlist_topic: true },
- headers: { HTTP_API_USERNAME: user.username, HTTP_API_KEY: user_key }
+ params: {
+ raw: "this is a test title",
+ title: "this is test body",
+ unlist_topic: true,
+ },
+ headers: {
+ HTTP_API_USERNAME: user.username,
+ HTTP_API_KEY: user_key,
+ }
end.not_to change { Topic.count }
expect(response.status).to eq(422)
expect(response.parsed_body["errors"]).to include(
- I18n.t("activerecord.errors.models.topic.attributes.base.unable_to_unlist")
+ I18n.t("activerecord.errors.models.topic.attributes.base.unable_to_unlist"),
)
end
end
@@ -956,9 +1060,7 @@ RSpec.describe PostsController do
describe "when logged in" do
fab!(:user) { Fabricate(:user) }
- before do
- sign_in(user)
- end
+ before { sign_in(user) }
context "when fast typing" do
before do
@@ -966,14 +1068,15 @@ RSpec.describe PostsController do
SiteSetting.auto_silence_fast_typers_max_trust_level = 1
end
- it 'queues the post if min_first_post_typing_time is not met' do
- post "/posts.json", params: {
- raw: 'this is the test content',
- title: 'this is the test title for the topic',
- composer_open_duration_msecs: 204,
- typing_duration_msecs: 100,
- reply_to_post_number: 123
- }
+ it "queues the post if min_first_post_typing_time is not met" do
+ post "/posts.json",
+ params: {
+ raw: "this is the test content",
+ title: "this is the test title for the topic",
+ composer_open_duration_msecs: 204,
+ typing_duration_msecs: 100,
+ reply_to_post_number: 123,
+ }
expect(response.status).to eq(200)
parsed = response.parsed_body
@@ -984,14 +1087,14 @@ RSpec.describe PostsController do
expect(user).to be_silenced
rp = ReviewableQueuedPost.find_by(created_by: user)
- expect(rp.payload['typing_duration_msecs']).to eq(100)
- expect(rp.payload['composer_open_duration_msecs']).to eq(204)
- expect(rp.payload['reply_to_post_number']).to eq(123)
- expect(rp.reviewable_scores.first.reason).to eq('fast_typer')
+ expect(rp.payload["typing_duration_msecs"]).to eq(100)
+ expect(rp.payload["composer_open_duration_msecs"]).to eq(204)
+ expect(rp.payload["reply_to_post_number"]).to eq(123)
+ expect(rp.reviewable_scores.first.reason).to eq("fast_typer")
- expect(parsed['pending_post']).to be_present
- expect(parsed['pending_post']['id']).to eq(rp.id)
- expect(parsed['pending_post']['raw']).to eq("this is the test content")
+ expect(parsed["pending_post"]).to be_present
+ expect(parsed["pending_post"]["id"]).to eq(rp.id)
+ expect(parsed["pending_post"]["raw"]).to eq("this is the test content")
mod = moderator
rp.perform(mod, :approve_post)
@@ -1005,33 +1108,33 @@ RSpec.describe PostsController do
Draft.set(user, "should_clear", 0, "{'a' : 'b'}")
- post "/posts.json", params: {
- raw: 'this is the test content',
- title: 'this is the test title for the topic',
- composer_open_duration_msecs: 204,
- typing_duration_msecs: 100,
- topic_id: topic.id,
- draft_key: "should_clear"
- }
+ post "/posts.json",
+ params: {
+ raw: "this is the test content",
+ title: "this is the test title for the topic",
+ composer_open_duration_msecs: 204,
+ typing_duration_msecs: 100,
+ topic_id: topic.id,
+ draft_key: "should_clear",
+ }
expect(response.status).to eq(200)
parsed = response.parsed_body
expect(parsed["action"]).not_to be_present
- expect {
- Draft.get(user, "should_clear", 0)
- }.to raise_error(Draft::OutOfSequence)
+ expect { Draft.get(user, "should_clear", 0) }.to raise_error(Draft::OutOfSequence)
end
it "doesn't enqueue replies when the topic is closed" do
topic = Fabricate(:closed_topic)
- post "/posts.json", params: {
- raw: 'this is the test content',
- title: 'this is the test title for the topic',
- topic_id: topic.id
- }
+ post "/posts.json",
+ params: {
+ raw: "this is the test content",
+ title: "this is the test title for the topic",
+ topic_id: topic.id,
+ }
expect(response).not_to be_successful
parsed = response.parsed_body
@@ -1041,10 +1144,11 @@ RSpec.describe PostsController do
it "doesn't enqueue replies when the post is too long" do
SiteSetting.max_post_length = 10
- post "/posts.json", params: {
- raw: 'this is the test content',
- title: 'this is the test title for the topic'
- }
+ post "/posts.json",
+ params: {
+ raw: "this is the test content",
+ title: "this is the test title for the topic",
+ }
expect(response).not_to be_successful
parsed = response.parsed_body
@@ -1055,10 +1159,7 @@ RSpec.describe PostsController do
SiteSetting.max_post_length = 10
raw = "A post "
- post "/posts.json", params: {
- raw: raw,
- title: "this is the test title for the topic"
- }
+ post "/posts.json", params: { raw: raw, title: "this is the test title for the topic" }
expect(response).not_to be_successful
parsed = response.parsed_body
@@ -1066,13 +1167,14 @@ RSpec.describe PostsController do
end
end
- it 'silences correctly based on auto_silence_first_post_regex' do
+ it "silences correctly based on auto_silence_first_post_regex" do
SiteSetting.auto_silence_first_post_regex = "I love candy|i eat s[1-5]"
- post "/posts.json", params: {
- raw: 'this is the test content',
- title: 'when I eat s3 sometimes when not looking'
- }
+ post "/posts.json",
+ params: {
+ raw: "this is the test content",
+ title: "when I eat s3 sometimes when not looking",
+ }
expect(response.status).to eq(200)
parsed = response.parsed_body
@@ -1080,21 +1182,22 @@ RSpec.describe PostsController do
expect(parsed["action"]).to eq("enqueued")
reviewable = ReviewableQueuedPost.find_by(created_by: user)
score = reviewable.reviewable_scores.first
- expect(score.reason).to eq('auto_silence_regex')
+ expect(score.reason).to eq("auto_silence_regex")
user.reload
expect(user).to be_silenced
end
- it 'silences correctly based on silence watched words' do
+ it "silences correctly based on silence watched words" do
SiteSetting.watched_words_regular_expressions = true
- WatchedWord.create!(action: WatchedWord.actions[:silence], word: 'I love candy')
- WatchedWord.create!(action: WatchedWord.actions[:silence], word: 'i eat s[1-5]')
+ WatchedWord.create!(action: WatchedWord.actions[:silence], word: "I love candy")
+ WatchedWord.create!(action: WatchedWord.actions[:silence], word: "i eat s[1-5]")
- post "/posts.json", params: {
- raw: 'this is the test content',
- title: 'when I eat s3 sometimes when not looking'
- }
+ post "/posts.json",
+ params: {
+ raw: "this is the test content",
+ title: "when I eat s3 sometimes when not looking",
+ }
expect(response.status).to eq(200)
parsed = response.parsed_body
@@ -1102,7 +1205,7 @@ RSpec.describe PostsController do
expect(parsed["action"]).to eq("enqueued")
reviewable = ReviewableQueuedPost.find_by(created_by: user)
score = reviewable.reviewable_scores.first
- expect(score.reason).to eq('auto_silence_regex')
+ expect(score.reason).to eq("auto_silence_regex")
user.reload
expect(user).to be_silenced
@@ -1110,33 +1213,35 @@ RSpec.describe PostsController do
it "can send a message to a group" do
Group.refresh_automatic_groups!
- group = Group.create(name: 'test_group', messageable_level: Group::ALIAS_LEVELS[:nobody])
+ group = Group.create(name: "test_group", messageable_level: Group::ALIAS_LEVELS[:nobody])
user1 = user
group.add(user1)
- post "/posts.json", params: {
- raw: 'I can haz a test',
- title: 'I loves my test',
- target_recipients: group.name,
- archetype: Archetype.private_message
- }
+ post "/posts.json",
+ params: {
+ raw: "I can haz a test",
+ title: "I loves my test",
+ target_recipients: group.name,
+ archetype: Archetype.private_message,
+ }
expect(response).not_to be_successful
# allow pm to this group
group.update_columns(messageable_level: Group::ALIAS_LEVELS[:everyone])
- post "/posts.json", params: {
- raw: 'I can haz a test',
- title: 'I loves my test',
- target_recipients: "test_Group",
- archetype: Archetype.private_message
- }
+ post "/posts.json",
+ params: {
+ raw: "I can haz a test",
+ title: "I loves my test",
+ target_recipients: "test_Group",
+ archetype: Archetype.private_message,
+ }
expect(response.status).to eq(200)
parsed = response.parsed_body
- post = Post.find(parsed['id'])
+ post = Post.find(parsed["id"])
expect(post.topic.topic_allowed_users.length).to eq(1)
expect(post.topic.topic_allowed_groups.length).to eq(1)
@@ -1144,50 +1249,52 @@ RSpec.describe PostsController do
it "can send a message to a group with caps" do
Group.refresh_automatic_groups!
- group = Group.create(name: 'Test_group', messageable_level: Group::ALIAS_LEVELS[:nobody])
+ group = Group.create(name: "Test_group", messageable_level: Group::ALIAS_LEVELS[:nobody])
user1 = user
group.add(user1)
# allow pm to this group
group.update_columns(messageable_level: Group::ALIAS_LEVELS[:everyone])
- post "/posts.json", params: {
- raw: 'I can haz a test',
- title: 'I loves my test',
- target_recipients: "test_Group",
- archetype: Archetype.private_message
- }
+ post "/posts.json",
+ params: {
+ raw: "I can haz a test",
+ title: "I loves my test",
+ target_recipients: "test_Group",
+ archetype: Archetype.private_message,
+ }
expect(response.status).to eq(200)
parsed = response.parsed_body
- post = Post.find(parsed['id'])
+ post = Post.find(parsed["id"])
expect(post.topic.topic_allowed_users.length).to eq(1)
expect(post.topic.topic_allowed_groups.length).to eq(1)
end
it "returns the nested post with a param" do
- post "/posts.json", params: {
- raw: 'this is the test content ',
- title: 'this is the test title for the topic',
- nested_post: true
- }
+ post "/posts.json",
+ params: {
+ raw: "this is the test content ",
+ title: "this is the test title for the topic",
+ nested_post: true,
+ }
expect(response.status).to eq(200)
parsed = response.parsed_body
- expect(parsed['post']).to be_present
- expect(parsed['post']['raw']).to eq('this is the test content')
- expect(parsed['post']['cooked']).to be_present
+ expect(parsed["post"]).to be_present
+ expect(parsed["post"]["raw"]).to eq("this is the test content")
+ expect(parsed["post"]["cooked"]).to be_present
end
- it 'protects against dupes' do
+ it "protects against dupes" do
raw = "this is a test post 123 #{SecureRandom.hash}"
title = "this is a title #{SecureRandom.hash}"
- expect do
- post "/posts.json", params: { raw: raw, title: title, wpid: 1 }
- end.to change { Post.count }
+ expect do post "/posts.json", params: { raw: raw, title: title, wpid: 1 } end.to change {
+ Post.count
+ }
expect(response.status).to eq(200)
@@ -1198,89 +1305,99 @@ RSpec.describe PostsController do
expect(response.status).to eq(422)
end
- it 'cannot create a post in a disallowed category' do
+ it "cannot create a post in a disallowed category" do
category.set_permissions(staff: :full)
category.save!
- post "/posts.json", params: {
- raw: 'this is the test content',
- title: 'this is the test title for the topic',
- category: category.id,
- meta_data: { xyz: 'abc' }
- }
+ post "/posts.json",
+ params: {
+ raw: "this is the test content",
+ title: "this is the test title for the topic",
+ category: category.id,
+ meta_data: {
+ xyz: "abc",
+ },
+ }
expect(response.status).to eq(403)
end
- it 'cannot create a post with a tag that is restricted' do
+ it "cannot create a post with a tag that is restricted" do
SiteSetting.tagging_enabled = true
tag = Fabricate(:tag)
category.allowed_tags = [tag.name]
category.save!
- post "/posts.json", params: {
- raw: 'this is the test content',
- title: 'this is the test title for the topic',
- tags: [tag.name],
- }
+ post "/posts.json",
+ params: {
+ raw: "this is the test content",
+ title: "this is the test title for the topic",
+ tags: [tag.name],
+ }
expect(response.status).to eq(422)
json = response.parsed_body
- expect(json['errors']).to be_present
+ expect(json["errors"]).to be_present
end
- it 'cannot create a post with a tag when tagging is disabled' do
+ it "cannot create a post with a tag when tagging is disabled" do
SiteSetting.tagging_enabled = false
tag = Fabricate(:tag)
- post "/posts.json", params: {
- raw: 'this is the test content',
- title: 'this is the test title for the topic',
- tags: [tag.name],
- }
+ post "/posts.json",
+ params: {
+ raw: "this is the test content",
+ title: "this is the test title for the topic",
+ tags: [tag.name],
+ }
expect(response.status).to eq(422)
json = response.parsed_body
- expect(json['errors']).to be_present
+ expect(json["errors"]).to be_present
end
- it 'cannot create a post with a tag without tagging permission' do
+ it "cannot create a post with a tag without tagging permission" do
SiteSetting.tagging_enabled = true
SiteSetting.min_trust_level_to_tag_topics = 4
tag = Fabricate(:tag)
- post "/posts.json", params: {
- raw: 'this is the test content',
- title: 'this is the test title for the topic',
- tags: [tag.name],
- }
+ post "/posts.json",
+ params: {
+ raw: "this is the test content",
+ title: "this is the test title for the topic",
+ tags: [tag.name],
+ }
expect(response.status).to eq(422)
json = response.parsed_body
- expect(json['errors']).to be_present
+ expect(json["errors"]).to be_present
end
- it 'can create a post with a tag when tagging is enabled' do
+ it "can create a post with a tag when tagging is enabled" do
SiteSetting.tagging_enabled = true
tag = Fabricate(:tag)
- post "/posts.json", params: {
- raw: 'this is the test content',
- title: 'this is the test title for the topic',
- tags: [tag.name],
- }
+ post "/posts.json",
+ params: {
+ raw: "this is the test content",
+ title: "this is the test title for the topic",
+ tags: [tag.name],
+ }
expect(response.status).to eq(200)
expect(Post.last.topic.tags.count).to eq(1)
end
- it 'creates the post' do
- post "/posts.json", params: {
- raw: 'this is the test content',
- title: 'this is the test title for the topic',
- category: category.id,
- meta_data: { xyz: 'abc' }
- }
+ it "creates the post" do
+ post "/posts.json",
+ params: {
+ raw: "this is the test content",
+ title: "this is the test title for the topic",
+ category: category.id,
+ meta_data: {
+ xyz: "abc",
+ },
+ }
expect(response.status).to eq(200)
@@ -1288,22 +1405,23 @@ RSpec.describe PostsController do
topic = new_post.topic
expect(new_post.user).to eq(user)
- expect(new_post.raw).to eq('this is the test content')
- expect(topic.title).to eq('This is the test title for the topic')
+ expect(new_post.raw).to eq("this is the test content")
+ expect(topic.title).to eq("This is the test title for the topic")
expect(topic.category).to eq(category)
- expect(topic.meta_data).to eq("xyz" => 'abc')
+ expect(topic.meta_data).to eq("xyz" => "abc")
expect(topic.visible).to eq(true)
end
- it 'can create an uncategorized topic' do
- title = 'this is the test title for the topic'
+ it "can create an uncategorized topic" do
+ title = "this is the test title for the topic"
expect do
- post "/posts.json", params: {
- raw: 'this is the test content',
- title: title,
- category: ""
- }
+ post "/posts.json",
+ params: {
+ raw: "this is the test content",
+ title: title,
+ category: "",
+ }
expect(response.status).to eq(200)
end.to change { Topic.count }.by(1)
@@ -1314,16 +1432,20 @@ RSpec.describe PostsController do
expect(topic.category_id).to eq(SiteSetting.uncategorized_category_id)
end
- it 'can create a reply to a post' do
+ it "can create a reply to a post" do
topic = Fabricate(:private_message_post, user: user).topic
post_2 = Fabricate(:private_message_post, user: user, topic: topic)
- post "/posts.json", params: {
- raw: 'this is the test content',
- topic_id: topic.id,
- reply_to_post_number: post_2.post_number,
- image_sizes: { width: '100', height: '200' }
- }
+ post "/posts.json",
+ params: {
+ raw: "this is the test content",
+ topic_id: topic.id,
+ reply_to_post_number: post_2.post_number,
+ image_sizes: {
+ width: "100",
+ height: "200",
+ },
+ }
expect(response.status).to eq(200)
@@ -1331,15 +1453,15 @@ RSpec.describe PostsController do
topic = new_post.topic
expect(new_post.user).to eq(user)
- expect(new_post.raw).to eq('this is the test content')
+ expect(new_post.raw).to eq("this is the test content")
expect(new_post.reply_to_post_number).to eq(post_2.post_number)
job_args = Jobs::ProcessPost.jobs.first["args"].first
- expect(job_args["image_sizes"]).to eq("width" => '100', "height" => '200')
+ expect(job_args["image_sizes"]).to eq("width" => "100", "height" => "200")
end
- it 'creates a private post' do
+ it "creates a private post" do
user_2 = Fabricate(:user)
user_3 = Fabricate(:user, username: "foo_bar")
@@ -1350,12 +1472,13 @@ RSpec.describe PostsController do
user_4.update_attribute(:username_lower, "İyi_İyi".downcase)
Group.refresh_automatic_groups!
- post "/posts.json", params: {
- raw: 'this is the test content',
- archetype: 'private_message',
- title: "this is some post",
- target_recipients: "#{user_2.username},Foo_Bar,İyi_İyi"
- }
+ post "/posts.json",
+ params: {
+ raw: "this is the test content",
+ archetype: "private_message",
+ title: "this is some post",
+ target_recipients: "#{user_2.username},Foo_Bar,İyi_İyi",
+ }
expect(response.status).to eq(200)
@@ -1369,16 +1492,17 @@ RSpec.describe PostsController do
context "when target_recipients not provided" do
it "errors when creating a private post" do
- post "/posts.json", params: {
- raw: 'this is the test content',
- archetype: 'private_message',
- title: "this is some post",
- target_recipients: ""
- }
+ post "/posts.json",
+ params: {
+ raw: "this is the test content",
+ archetype: "private_message",
+ title: "this is some post",
+ target_recipients: "",
+ }
expect(response.status).to eq(422)
expect(response.parsed_body["errors"]).to include(
- I18n.t("activerecord.errors.models.topic.attributes.base.no_user_selected")
+ I18n.t("activerecord.errors.models.topic.attributes.base.no_user_selected"),
)
end
end
@@ -1389,24 +1513,23 @@ RSpec.describe PostsController do
it "errors when creating a private post" do
user_2 = Fabricate(:user)
- post "/posts.json", params: {
- raw: 'this is the test content',
- archetype: 'private_message',
- title: "this is some post",
- target_recipients: user_2.username,
- topic_id: topic.id
- }
+ post "/posts.json",
+ params: {
+ raw: "this is the test content",
+ archetype: "private_message",
+ title: "this is some post",
+ target_recipients: user_2.username,
+ topic_id: topic.id,
+ }
expect(response.status).to eq(422)
- expect(response.parsed_body["errors"]).to include(
- I18n.t("create_pm_on_existing_topic")
- )
+ expect(response.parsed_body["errors"]).to include(I18n.t("create_pm_on_existing_topic"))
end
end
context "with errors" do
it "does not succeed" do
- post "/posts.json", params: { raw: 'test' }
+ post "/posts.json", params: { raw: "test" }
expect(response).not_to be_successful
expect(response.status).to eq(422)
end
@@ -1415,38 +1538,40 @@ RSpec.describe PostsController do
SiteSetting.newuser_spam_host_threshold = 1
sign_in(Fabricate(:user, trust_level: 0))
- post "/posts.json", params: {
- raw: 'this is the test content http://fakespamwebsite.com http://fakespamwebsite.com/spam http://fakespamwebsite.com/spammy',
- title: 'this is the test title for the topic',
- meta_data: { xyz: 'abc' }
- }
+ post "/posts.json",
+ params: {
+ raw:
+ "this is the test content http://fakespamwebsite.com http://fakespamwebsite.com/spam http://fakespamwebsite.com/spammy",
+ title: "this is the test title for the topic",
+ meta_data: {
+ xyz: "abc",
+ },
+ }
expect(response.parsed_body["errors"]).to include(I18n.t(:spamming_host))
end
context "when allow_uncategorized_topics is false" do
- before do
- SiteSetting.allow_uncategorized_topics = false
- end
+ before { SiteSetting.allow_uncategorized_topics = false }
it "cant create an uncategorized post" do
- post "/posts.json", params: {
- raw: "a new post with no category",
- title: "a new post with no category"
- }
+ post "/posts.json",
+ params: {
+ raw: "a new post with no category",
+ title: "a new post with no category",
+ }
expect(response).not_to be_successful
end
context "as staff" do
- before do
- sign_in(admin)
- end
+ before { sign_in(admin) }
it "cant create an uncategorized post" do
- post "/posts.json", params: {
- raw: "a new post with no category",
- title: "a new post with no category"
- }
+ post "/posts.json",
+ params: {
+ raw: "a new post with no category",
+ title: "a new post with no category",
+ }
expect(response).not_to be_successful
end
end
@@ -1457,10 +1582,11 @@ RSpec.describe PostsController do
fab!(:user_to_mention) { Fabricate(:user) }
it "returns mentioned users" do
- post "/posts.json", params: {
- raw: "I am mentioning @#{user_to_mention.username}",
- topic_id: topic.id,
- }
+ post "/posts.json",
+ params: {
+ raw: "I am mentioning @#{user_to_mention.username}",
+ topic_id: topic.id,
+ }
expect(response.status).to eq(200)
json = response.parsed_body
@@ -1473,20 +1599,14 @@ RSpec.describe PostsController do
end
it "returns an empty list of mentioned users if nobody was mentioned" do
- post "/posts.json", params: {
- raw: "No mentions here",
- topic_id: topic.id,
- }
+ post "/posts.json", params: { raw: "No mentions here", topic_id: topic.id }
expect(response.status).to eq(200)
expect(response.parsed_body["mentioned_users"].length).to be(0)
end
it "returns an empty list of mentioned users if an nonexistent user was mentioned" do
- post "/posts.json", params: {
- raw: "Mentioning a @stranger",
- topic_id: topic.id,
- }
+ post "/posts.json", params: { raw: "Mentioning a @stranger", topic_id: topic.id }
expect(response.status).to eq(200)
expect(response.parsed_body["mentioned_users"].length).to be(0)
@@ -1495,10 +1615,11 @@ RSpec.describe PostsController do
it "doesn't return user status on mentions by default" do
user_to_mention.set_status!("off to dentist", "tooth")
- post "/posts.json", params: {
- raw: "I am mentioning @#{user_to_mention.username}",
- topic_id: topic.id,
- }
+ post "/posts.json",
+ params: {
+ raw: "I am mentioning @#{user_to_mention.username}",
+ topic_id: topic.id,
+ }
expect(response.status).to eq(200)
json = response.parsed_body
@@ -1512,10 +1633,11 @@ RSpec.describe PostsController do
SiteSetting.enable_user_status = true
user_to_mention.set_status!("off to dentist", "tooth")
- post "/posts.json", params: {
- raw: "I am mentioning @#{user_to_mention.username}",
- topic_id: topic.id,
- }
+ post "/posts.json",
+ params: {
+ raw: "I am mentioning @#{user_to_mention.username}",
+ topic_id: topic.id,
+ }
expect(response.status).to eq(200)
json = response.parsed_body
@@ -1531,17 +1653,16 @@ RSpec.describe PostsController do
context "with topic unlisting" do
context "when logged in as staff" do
- before do
- sign_in(admin)
- end
+ before { sign_in(admin) }
it "creates an unlisted topic" do
expect do
- post "/posts.json", params: {
- raw: "this is the test content",
- title: "this is the test title for the topic",
- unlist_topic: true
- }
+ post "/posts.json",
+ params: {
+ raw: "this is the test content",
+ title: "this is the test title for the topic",
+ unlist_topic: true,
+ }
end.to change { Topic.count }.by(1)
expect(response.status).to eq(200)
@@ -1550,71 +1671,69 @@ RSpec.describe PostsController do
end
context "when logged in as a non-staff user" do
- before do
- sign_in(user)
- end
+ before { sign_in(user) }
it "prevents creation of an unlisted topic" do
expect do
- post "/posts.json", params: {
- raw: "this is the test content",
- title: "this is the test title for the topic",
- unlist_topic: true
- }
+ post "/posts.json",
+ params: {
+ raw: "this is the test content",
+ title: "this is the test title for the topic",
+ unlist_topic: true,
+ }
end.not_to change { Topic.count }
expect(response.status).to eq(422)
expect(response.parsed_body["errors"]).to include(
- I18n.t("activerecord.errors.models.topic.attributes.base.unable_to_unlist")
+ I18n.t("activerecord.errors.models.topic.attributes.base.unable_to_unlist"),
)
end
end
end
- describe 'shared draft' do
+ describe "shared draft" do
fab!(:destination_category) { Fabricate(:category) }
it "will raise an error for regular users" do
- post "/posts.json", params: {
- raw: 'this is the shared draft content',
- title: "this is the shared draft title",
- category: destination_category.id,
- shared_draft: 'true'
- }
+ post "/posts.json",
+ params: {
+ raw: "this is the shared draft content",
+ title: "this is the shared draft title",
+ category: destination_category.id,
+ shared_draft: "true",
+ }
expect(response).not_to be_successful
end
describe "as a staff user" do
- before do
- sign_in(moderator)
- end
+ before { sign_in(moderator) }
it "will raise an error if there is no shared draft category" do
- post "/posts.json", params: {
- raw: 'this is the shared draft content',
- title: "this is the shared draft title",
- category: destination_category.id,
- shared_draft: 'true'
- }
+ post "/posts.json",
+ params: {
+ raw: "this is the shared draft content",
+ title: "this is the shared draft title",
+ category: destination_category.id,
+ shared_draft: "true",
+ }
expect(response).not_to be_successful
end
context "with a shared category" do
fab!(:shared_category) { Fabricate(:category) }
- before do
- SiteSetting.shared_drafts_category = shared_category.id
- end
+ before { SiteSetting.shared_drafts_category = shared_category.id }
it "will work if the shared draft category is present" do
- post "/posts.json", params: {
- raw: 'this is the shared draft content',
- title: "this is the shared draft title",
- category: destination_category.id,
- shared_draft: 'true'
- }
+ post "/posts.json",
+ params: {
+ raw: "this is the shared draft content",
+ title: "this is the shared draft title",
+ category: destination_category.id,
+ shared_draft: "true",
+ }
expect(response.status).to eq(200)
result = response.parsed_body
- topic = Topic.find(result['topic_id'])
+ topic = Topic.find(result["topic_id"])
expect(topic.category_id).to eq(shared_category.id)
expect(topic.shared_draft.category_id).to eq(destination_category.id)
end
@@ -1622,69 +1741,68 @@ RSpec.describe PostsController do
end
end
- describe 'warnings' do
+ describe "warnings" do
fab!(:user_2) { Fabricate(:user) }
- before do
- Group.refresh_automatic_groups!
- end
+ before { Group.refresh_automatic_groups! }
- context 'as a staff user' do
- before do
- sign_in(admin)
- end
+ context "as a staff user" do
+ before { sign_in(admin) }
- it 'should be able to mark a topic as warning' do
- post "/posts.json", params: {
- raw: 'this is the test content',
- archetype: 'private_message',
- title: "this is some post",
- target_recipients: user_2.username,
- is_warning: true
- }
+ it "should be able to mark a topic as warning" do
+ post "/posts.json",
+ params: {
+ raw: "this is the test content",
+ archetype: "private_message",
+ title: "this is some post",
+ target_recipients: user_2.username,
+ is_warning: true,
+ }
expect(response.status).to eq(200)
new_topic = Topic.last
- expect(new_topic.title).to eq('This is some post')
+ expect(new_topic.title).to eq("This is some post")
expect(new_topic.is_official_warning?).to eq(true)
end
- it 'should be able to mark a topic as not a warning' do
- post "/posts.json", params: {
- raw: 'this is the test content',
- archetype: 'private_message',
- title: "this is some post",
- target_recipients: user_2.username,
- is_warning: false
- }
+ it "should be able to mark a topic as not a warning" do
+ post "/posts.json",
+ params: {
+ raw: "this is the test content",
+ archetype: "private_message",
+ title: "this is some post",
+ target_recipients: user_2.username,
+ is_warning: false,
+ }
expect(response.status).to eq(200)
new_topic = Topic.last
- expect(new_topic.title).to eq('This is some post')
+ expect(new_topic.title).to eq("This is some post")
expect(new_topic.is_official_warning?).to eq(false)
end
end
- context 'as a normal user' do
- it 'should not be able to mark a topic as warning' do
+ context "as a normal user" do
+ it "should not be able to mark a topic as warning" do
sign_in(user)
- post "/posts.json", params: {
- raw: 'this is the test content',
- archetype: 'private_message',
- title: "this is some post",
- target_recipients: user_2.username,
- is_warning: true
- }
+ post "/posts.json",
+ params: {
+ raw: "this is the test content",
+ archetype: "private_message",
+ title: "this is some post",
+ target_recipients: user_2.username,
+ is_warning: true,
+ }
expect(response.status).to eq(200)
new_topic = Topic.last
- expect(new_topic.title).to eq('This is some post')
+ expect(new_topic.title).to eq("This is some post")
expect(new_topic.is_official_warning?).to eq(false)
end
end
@@ -1696,21 +1814,19 @@ RSpec.describe PostsController do
original_bumped_at = 1.day.ago
topic = Fabricate(:topic, bumped_at: original_bumped_at)
- post "/posts.json", params: {
- raw: 'this is the test content',
- topic_id: topic.id,
- no_bump: true
- }
+ post "/posts.json",
+ params: {
+ raw: "this is the test content",
+ topic_id: topic.id,
+ no_bump: true,
+ }
expect(response.status).to eq(200)
expect(topic.reload.bumped_at).to eq_time(original_bumped_at)
end
it "should be able to post with topic bumping" do
- post "/posts.json", params: {
- raw: 'this is the test content',
- topic_id: topic.id
- }
+ post "/posts.json", params: { raw: "this is the test content", topic_id: topic.id }
expect(response.status).to eq(200)
expect(topic.reload.bumped_at).to eq_time(topic.posts.last.created_at)
@@ -1718,17 +1834,13 @@ RSpec.describe PostsController do
end
context "with admins" do
- before do
- sign_in(admin)
- end
+ before { sign_in(admin) }
include_examples "it works"
end
context "with moderators" do
- before do
- sign_in(moderator)
- end
+ before { sign_in(moderator) }
include_examples "it works"
end
@@ -1736,9 +1848,7 @@ RSpec.describe PostsController do
context "with TL4 users" do
fab!(:trust_level_4) { Fabricate(:trust_level_4) }
- before do
- sign_in(trust_level_4)
- end
+ before { sign_in(trust_level_4) }
include_examples "it works"
end
@@ -1749,11 +1859,12 @@ RSpec.describe PostsController do
[:user].each do |user|
it "will raise an error for #{user}" do
sign_in(Fabricate(user))
- post "/posts.json", params: {
- raw: 'this is the test content',
- topic_id: topic.id,
- no_bump: true
- }
+ post "/posts.json",
+ params: {
+ raw: "this is the test content",
+ topic_id: topic.id,
+ no_bump: true,
+ }
expect(response.status).to eq(400)
end
end
@@ -1764,11 +1875,12 @@ RSpec.describe PostsController do
it "allows to create topics with featured links" do
sign_in(user_trust_level_1)
- post "/posts.json", params: {
- title: "this is the test title for the topic",
- raw: "this is the test content",
- featured_link: "https://discourse.org"
- }
+ post "/posts.json",
+ params: {
+ title: "this is the test title for the topic",
+ raw: "this is the test content",
+ featured_link: "https://discourse.org",
+ }
expect(response.status).to eq(200)
end
@@ -1776,11 +1888,12 @@ RSpec.describe PostsController do
it "doesn't allow TL0 users to create topics with featured links" do
sign_in(user_trust_level_0)
- post "/posts.json", params: {
- title: "this is the test title for the topic",
- raw: "this is the test content",
- featured_link: "https://discourse.org"
- }
+ post "/posts.json",
+ params: {
+ title: "this is the test title for the topic",
+ raw: "this is the test content",
+ featured_link: "https://discourse.org",
+ }
expect(response.status).to eq(422)
end
@@ -1789,11 +1902,12 @@ RSpec.describe PostsController do
SiteSetting.topic_featured_link_enabled = false
sign_in(user_trust_level_1)
- post "/posts.json", params: {
- title: "this is the test title for the topic",
- raw: "this is the test content",
- featured_link: "https://discourse.org"
- }
+ post "/posts.json",
+ params: {
+ title: "this is the test title for the topic",
+ raw: "this is the test content",
+ featured_link: "https://discourse.org",
+ }
expect(response.status).to eq(422)
end
@@ -1802,19 +1916,20 @@ RSpec.describe PostsController do
category = Fabricate(:category, topic_featured_link_allowed: false)
sign_in(user_trust_level_1)
- post "/posts.json", params: {
- title: "this is the test title for the topic",
- raw: "this is the test content",
- featured_link: "https://discourse.org",
- category: category.id
- }
+ post "/posts.json",
+ params: {
+ title: "this is the test title for the topic",
+ raw: "this is the test content",
+ featured_link: "https://discourse.org",
+ category: category.id,
+ }
expect(response.status).to eq(422)
end
end
end
- describe '#revisions' do
+ describe "#revisions" do
fab!(:post) { Fabricate(:post, version: 2) }
let(:post_revision) { Fabricate(:post_revision, post: post) }
@@ -1824,7 +1939,6 @@ RSpec.describe PostsController do
end
context "when edit history is not visible to the public" do
-
before { SiteSetting.edit_history_visible_to_public = false }
it "ensures anonymous cannot see the revisions" do
@@ -1863,10 +1977,10 @@ RSpec.describe PostsController do
end
context "when post is hidden" do
- before {
+ before do
post.hidden = true
post.save
- }
+ end
it "throws an exception for users" do
sign_in(user)
@@ -1882,7 +1996,6 @@ RSpec.describe PostsController do
end
context "when edit history is visible to everyone" do
-
before { SiteSetting.edit_history_visible_to_public = true }
it "ensures anyone can see the revisions" do
@@ -1936,18 +2049,51 @@ RSpec.describe PostsController do
end
end
- describe '#revert' do
- include_examples 'action requires login', :put, "/posts/123/revisions/2/revert.json"
+ describe "#revert" do
+ include_examples "action requires login", :put, "/posts/123/revisions/2/revert.json"
- fab!(:post) { Fabricate(:post, user: Fabricate(:user), raw: "Lorem ipsum dolor sit amet, cu nam libris tractatos, ancillae senserit ius ex") }
- let(:post_revision) { Fabricate(:post_revision, post: post, modifications: { "raw" => ["this is original post body.", "this is edited post body."] }) }
- let(:blank_post_revision) { Fabricate(:post_revision, post: post, modifications: { "edit_reason" => ["edit reason #1", "edit reason #2"] }) }
- let(:same_post_revision) { Fabricate(:post_revision, post: post, modifications: { "raw" => ["Lorem ipsum dolor sit amet, cu nam libris tractatos, ancillae senserit ius ex", "this is edited post body."] }) }
+ fab!(:post) do
+ Fabricate(
+ :post,
+ user: Fabricate(:user),
+ raw: "Lorem ipsum dolor sit amet, cu nam libris tractatos, ancillae senserit ius ex",
+ )
+ end
+ let(:post_revision) do
+ Fabricate(
+ :post_revision,
+ post: post,
+ modifications: {
+ "raw" => ["this is original post body.", "this is edited post body."],
+ },
+ )
+ end
+ let(:blank_post_revision) do
+ Fabricate(
+ :post_revision,
+ post: post,
+ modifications: {
+ "edit_reason" => ["edit reason #1", "edit reason #2"],
+ },
+ )
+ end
+ let(:same_post_revision) do
+ Fabricate(
+ :post_revision,
+ post: post,
+ modifications: {
+ "raw" => [
+ "Lorem ipsum dolor sit amet, cu nam libris tractatos, ancillae senserit ius ex",
+ "this is edited post body.",
+ ],
+ },
+ )
+ end
let(:post_id) { post.id }
let(:revision_id) { post_revision.number }
- describe 'when logged in as a regular user' do
+ describe "when logged in as a regular user" do
it "does not work" do
sign_in(user)
put "/posts/#{post_id}/revisions/#{revision_id}/revert.json"
@@ -1956,9 +2102,7 @@ RSpec.describe PostsController do
end
describe "when logged in as staff" do
- before do
- sign_in(moderator)
- end
+ before { sign_in(moderator) }
it "fails when revision is < 2" do
put "/posts/#{post_id}/revisions/1/revert.json"
@@ -1978,13 +2122,13 @@ RSpec.describe PostsController do
it "fails when revision is blank" do
put "/posts/#{post_id}/revisions/#{blank_post_revision.number}/revert.json"
expect(response.status).to eq(422)
- expect(response.parsed_body['errors']).to include(I18n.t('revert_version_same'))
+ expect(response.parsed_body["errors"]).to include(I18n.t("revert_version_same"))
end
it "fails when revised version is same as current version" do
put "/posts/#{post_id}/revisions/#{same_post_revision.number}/revert.json"
expect(response.status).to eq(422)
- expect(response.parsed_body['errors']).to include(I18n.t('revert_version_same'))
+ expect(response.parsed_body["errors"]).to include(I18n.t("revert_version_same"))
end
it "works!" do
@@ -2002,10 +2146,8 @@ RSpec.describe PostsController do
end
end
- describe '#expand_embed' do
- before do
- sign_in(user)
- end
+ describe "#expand_embed" do
+ before { sign_in(user) }
fab!(:post) { Fabricate(:post) }
@@ -2019,11 +2161,11 @@ RSpec.describe PostsController do
TopicEmbed.expects(:expanded_for).with(post).returns("full content")
get "/posts/#{post.id}/expand-embed.json"
expect(response.status).to eq(200)
- expect(response.parsed_body['cooked']).to eq("full content")
+ expect(response.parsed_body["cooked"]).to eq("full content")
end
end
- describe '#flagged_posts' do
+ describe "#flagged_posts" do
include_examples "action requires login", :get, "/posts/system/flagged.json"
describe "when logged in" do
@@ -2061,13 +2203,11 @@ RSpec.describe PostsController do
end
end
- describe '#deleted_posts' do
+ describe "#deleted_posts" do
include_examples "action requires login", :get, "/posts/system/deleted.json"
describe "when logged in" do
- before do
- Group.refresh_automatic_groups!
- end
+ before { Group.refresh_automatic_groups! }
it "raises an error if the user doesn't have permission to see the deleted posts" do
sign_in(user)
@@ -2112,7 +2252,8 @@ RSpec.describe PostsController do
it "doesn't return PMs for moderators" do
Fabricate(:moderator)
- pm_post = create_post(user: user, archetype: 'private_message', target_usernames: [admin.username])
+ pm_post =
+ create_post(user: user, archetype: "private_message", target_usernames: [admin.username])
PostDestroyer.new(admin, pm_post).destroy
sign_in(moderator)
@@ -2143,7 +2284,7 @@ RSpec.describe PostsController do
end
end
- describe '#markdown_id' do
+ describe "#markdown_id" do
it "can be viewed by anonymous" do
post = Fabricate(:post, raw: "123456789")
get "/posts/#{post.id}/raw.json"
@@ -2158,7 +2299,7 @@ RSpec.describe PostsController do
end
end
- describe '#markdown_num' do
+ describe "#markdown_num" do
it "can be viewed by anonymous" do
topic = Fabricate(:topic)
post = Fabricate(:post, topic: topic, post_number: 1, raw: "123456789")
@@ -2179,7 +2320,7 @@ RSpec.describe PostsController do
end
end
- describe '#short_link' do
+ describe "#short_link" do
fab!(:topic) { Fabricate(:topic) }
fab!(:post) { Fabricate(:post, topic: topic) }
@@ -2208,8 +2349,8 @@ RSpec.describe PostsController do
end
end
- describe '#user_posts_feed' do
- it 'returns public posts rss feed' do
+ describe "#user_posts_feed" do
+ it "returns public posts rss feed" do
public_post
private_post
@@ -2246,7 +2387,7 @@ RSpec.describe PostsController do
expect(body).not_to include(small_action.canonical_url)
end
- it 'returns public posts as JSON' do
+ it "returns public posts as JSON" do
public_post
private_post
@@ -2282,23 +2423,21 @@ RSpec.describe PostsController do
end
end
- describe '#latest' do
- context 'with private posts' do
- describe 'when not logged in' do
- it 'should return the right response' do
+ describe "#latest" do
+ context "with private posts" do
+ describe "when not logged in" do
+ it "should return the right response" do
Fabricate(:post)
get "/private-posts.rss"
expect(response.status).to eq(404)
- expect(response.body).to have_tag(
- "input", with: { value: "private_posts" }
- )
+ expect(response.body).to have_tag("input", with: { value: "private_posts" })
end
end
- it 'returns private posts rss feed' do
+ it "returns private posts rss feed" do
sign_in(admin)
public_post
@@ -2313,7 +2452,7 @@ RSpec.describe PostsController do
expect(body).to_not include(public_post.url)
end
- it 'returns private posts for json' do
+ it "returns private posts for json" do
sign_in(admin)
public_post
@@ -2322,15 +2461,15 @@ RSpec.describe PostsController do
expect(response.status).to eq(200)
json = response.parsed_body
- post_ids = json['private_posts'].map { |p| p['id'] }
+ post_ids = json["private_posts"].map { |p| p["id"] }
expect(post_ids).to include private_post.id
expect(post_ids).to_not include public_post.id
end
end
- context 'with public posts' do
- it 'returns public posts with topic rss feed' do
+ context "with public posts" do
+ it "returns public posts with topic rss feed" do
public_post
private_post
@@ -2374,7 +2513,7 @@ RSpec.describe PostsController do
expect(body).not_to include(small_action.canonical_url)
end
- it 'returns public posts with topic for json' do
+ it "returns public posts with topic for json" do
topicless_post.update topic_id: -100
public_post
@@ -2385,7 +2524,7 @@ RSpec.describe PostsController do
expect(response.status).to eq(200)
json = response.parsed_body
- post_ids = json['latest_posts'].map { |p| p['id'] }
+ post_ids = json["latest_posts"].map { |p| p["id"] }
expect(post_ids).to include public_post.id
expect(post_ids).to_not include private_post.id
@@ -2394,8 +2533,8 @@ RSpec.describe PostsController do
end
end
- describe '#cooked' do
- it 'returns the cooked content' do
+ describe "#cooked" do
+ it "returns the cooked content" do
post = Fabricate(:post, cooked: "WAt")
get "/posts/#{post.id}/cooked.json"
@@ -2403,17 +2542,24 @@ RSpec.describe PostsController do
json = response.parsed_body
expect(json).to be_present
- expect(json['cooked']).to eq('WAt')
+ expect(json["cooked"]).to eq("WAt")
end
end
- describe '#raw_email' do
+ describe "#raw_email" do
include_examples "action requires login", :get, "/posts/2/raw-email.json"
describe "when logged in" do
- let(:post) { Fabricate(:post, deleted_at: 2.hours.ago, user: Fabricate(:user), raw_email: 'email_content') }
+ let(:post) do
+ Fabricate(
+ :post,
+ deleted_at: 2.hours.ago,
+ user: Fabricate(:user),
+ raw_email: "email_content",
+ )
+ end
- it 'returns 403 when trying to view raw as user that created the post' do
+ it "returns 403 when trying to view raw as user that created the post" do
sign_in(post.user)
get "/posts/#{post.id}/raw-email.json"
@@ -2434,17 +2580,15 @@ RSpec.describe PostsController do
expect(response.status).to eq(200)
json = response.parsed_body
- expect(json['raw_email']).to eq('email_content')
+ expect(json["raw_email"]).to eq("email_content")
end
end
end
describe "#locked" do
- before do
- sign_in(moderator)
- end
+ before { sign_in(moderator) }
- it 'can lock and unlock the post' do
+ it "can lock and unlock the post" do
put "/posts/#{public_post.id}/locked.json", params: { locked: "true" }
expect(response.status).to eq(200)
public_post.reload
@@ -2458,24 +2602,30 @@ RSpec.describe PostsController do
end
describe "#notice" do
- it 'can create and remove notices as a moderator' do
+ it "can create and remove notices as a moderator" do
sign_in(moderator)
raw_notice = "Hello *world*!\n\nhttps://github.com/discourse/discourse"
put "/posts/#{public_post.id}/notice.json", params: { notice: raw_notice }
expect(response.status).to eq(200)
- expect(public_post.reload.custom_fields[Post::NOTICE]).to eq("type" => Post.notices[:custom], "raw" => raw_notice, "cooked" => PrettyText.cook(raw_notice, features: { onebox: false }))
+ expect(public_post.reload.custom_fields[Post::NOTICE]).to eq(
+ "type" => Post.notices[:custom],
+ "raw" => raw_notice,
+ "cooked" => PrettyText.cook(raw_notice, features: { onebox: false }),
+ )
expect(UserHistory.where(action: UserHistory.actions[:post_staff_note_create]).count).to eq(1)
put "/posts/#{public_post.id}/notice.json", params: { notice: nil }
expect(response.status).to eq(200)
expect(public_post.reload.custom_fields[Post::NOTICE]).to eq(nil)
- expect(UserHistory.where(action: UserHistory.actions[:post_staff_note_destroy]).count).to eq(1)
+ expect(UserHistory.where(action: UserHistory.actions[:post_staff_note_destroy]).count).to eq(
+ 1,
+ )
end
- describe 'group moderators' do
+ describe "group moderators" do
fab!(:group_user) { Fabricate(:group_user) }
let(:user) { group_user.user }
let(:group) { group_user.group }
@@ -2487,12 +2637,16 @@ RSpec.describe PostsController do
sign_in(user)
end
- it 'can create and remove notices as a group moderator' do
+ it "can create and remove notices as a group moderator" do
raw_notice = "Hello *world*!\n\nhttps://github.com/discourse/discourse"
put "/posts/#{public_post.id}/notice.json", params: { notice: raw_notice }
expect(response.status).to eq(200)
- expect(public_post.reload.custom_fields[Post::NOTICE]).to eq("type" => Post.notices[:custom], "raw" => raw_notice, "cooked" => PrettyText.cook(raw_notice, features: { onebox: false }))
+ expect(public_post.reload.custom_fields[Post::NOTICE]).to eq(
+ "type" => Post.notices[:custom],
+ "raw" => raw_notice,
+ "cooked" => PrettyText.cook(raw_notice, features: { onebox: false }),
+ )
put "/posts/#{public_post.id}/notice.json", params: { notice: nil }
@@ -2500,7 +2654,7 @@ RSpec.describe PostsController do
expect(public_post.reload.custom_fields[Post::NOTICE]).to eq(nil)
end
- it 'prevents a group moderator from altering notes outside of their category' do
+ it "prevents a group moderator from altering notes outside of their category" do
moderatable_group = Fabricate(:group)
topic.category.update!(reviewable_by_group_id: moderatable_group.id)
@@ -2509,7 +2663,7 @@ RSpec.describe PostsController do
expect(response.status).to eq(404)
end
- it 'prevents a normal user from altering notes' do
+ it "prevents a normal user from altering notes" do
group_user.destroy!
put "/posts/#{public_post.id}/notice.json", params: { notice: "Hello" }
@@ -2534,20 +2688,22 @@ RSpec.describe PostsController do
let(:current_user) { user }
context "when there are existing pending posts" do
- let!(:owner_pending_posts) { Fabricate.times(2, :reviewable_queued_post, created_by: user) }
+ let!(:owner_pending_posts) do
+ Fabricate.times(2, :reviewable_queued_post, created_by: user)
+ end
let!(:other_pending_post) { Fabricate(:reviewable_queued_post) }
let(:expected_keys) do
%w[
- avatar_template
- category_id
- created_at
- created_by_id
- name
- raw_text
- title
- topic_id
- topic_url
- username
+ avatar_template
+ category_id
+ created_at
+ created_by_id
+ name
+ raw_text
+ title
+ topic_id
+ topic_url
+ username
]
end
@@ -2570,20 +2726,22 @@ RSpec.describe PostsController do
let(:current_user) { moderator }
context "when there are existing pending posts" do
- let!(:owner_pending_posts) { Fabricate.times(2, :reviewable_queued_post, created_by: user) }
+ let!(:owner_pending_posts) do
+ Fabricate.times(2, :reviewable_queued_post, created_by: user)
+ end
let!(:other_pending_post) { Fabricate(:reviewable_queued_post) }
let(:expected_keys) do
%w[
- avatar_template
- category_id
- created_at
- created_by_id
- name
- raw_text
- title
- topic_id
- topic_url
- username
+ avatar_template
+ category_id
+ created_at
+ created_by_id
+ name
+ raw_text
+ title
+ topic_id
+ topic_url
+ username
]
end
@@ -2614,22 +2772,25 @@ RSpec.describe PostsController do
end
describe Plugin::Instance do
- describe '#add_permitted_post_create_param' do
+ describe "#add_permitted_post_create_param" do
fab!(:user) { Fabricate(:user) }
let(:instance) { Plugin::Instance.new }
let(:request) do
- Proc.new {
- post "/posts.json", params: {
- raw: 'this is the test content',
- title: 'this is the test title for the topic',
- composer_open_duration_msecs: 204,
- typing_duration_msecs: 100,
- reply_to_post_number: 123,
- string_arg: '123',
- hash_arg: { key1: 'val' },
- array_arg: ['1', '2', '3']
- }
- }
+ Proc.new do
+ post "/posts.json",
+ params: {
+ raw: "this is the test content",
+ title: "this is the test title for the topic",
+ composer_open_duration_msecs: 204,
+ typing_duration_msecs: 100,
+ reply_to_post_number: 123,
+ string_arg: "123",
+ hash_arg: {
+ key1: "val",
+ },
+ array_arg: %w[1 2 3],
+ }
+ end
end
before do
@@ -2637,35 +2798,34 @@ RSpec.describe PostsController do
SiteSetting.min_first_post_typing_time = 0
end
- it 'allows strings to be added' do
+ it "allows strings to be added" do
request.call
- expect(@controller.send(:create_params)).not_to include(string_arg: '123')
+ expect(@controller.send(:create_params)).not_to include(string_arg: "123")
instance.add_permitted_post_create_param(:string_arg)
request.call
- expect(@controller.send(:create_params)).to include(string_arg: '123')
+ expect(@controller.send(:create_params)).to include(string_arg: "123")
end
- it 'allows hashes to be added' do
+ it "allows hashes to be added" do
instance.add_permitted_post_create_param(:hash_arg)
request.call
- expect(@controller.send(:create_params)).not_to include(hash_arg: { key1: 'val' })
+ expect(@controller.send(:create_params)).not_to include(hash_arg: { key1: "val" })
instance.add_permitted_post_create_param(:hash_arg, :hash)
request.call
- expect(@controller.send(:create_params)).to include(hash_arg: { key1: 'val' })
+ expect(@controller.send(:create_params)).to include(hash_arg: { key1: "val" })
end
- it 'allows strings to be added' do
+ it "allows strings to be added" do
instance.add_permitted_post_create_param(:array_arg)
request.call
- expect(@controller.send(:create_params)).not_to include(array_arg: ['1', '2', '3'])
+ expect(@controller.send(:create_params)).not_to include(array_arg: %w[1 2 3])
instance.add_permitted_post_create_param(:array_arg, :array)
request.call
- expect(@controller.send(:create_params)).to include(array_arg: ['1', '2', '3'])
+ expect(@controller.send(:create_params)).to include(array_arg: %w[1 2 3])
end
-
end
end
end
diff --git a/spec/requests/presence_controller_spec.rb b/spec/requests/presence_controller_spec.rb
index 1031f9cea4a..089199b0c7f 100644
--- a/spec/requests/presence_controller_spec.rb
+++ b/spec/requests/presence_controller_spec.rb
@@ -4,14 +4,14 @@ RSpec.describe PresenceController do
fab!(:user) { Fabricate(:user) }
fab!(:group) { Fabricate(:group).tap { |g| g.add(user) } }
- let(:ch1) { PresenceChannel.new('/test/public1') }
- let(:ch2) { PresenceChannel.new('/test/public2') }
+ let(:ch1) { PresenceChannel.new("/test/public1") }
+ let(:ch2) { PresenceChannel.new("/test/public2") }
- let(:secure_user_channel) { PresenceChannel.new('/test/secureuser') }
- let(:secure_group_channel) { PresenceChannel.new('/test/securegroup') }
- let(:allowed_user_channel) { PresenceChannel.new('/test/alloweduser') }
- let(:allowed_group_channel) { PresenceChannel.new('/test/allowedgroup') }
- let(:count_only_channel) { PresenceChannel.new('/test/countonly') }
+ let(:secure_user_channel) { PresenceChannel.new("/test/secureuser") }
+ let(:secure_group_channel) { PresenceChannel.new("/test/securegroup") }
+ let(:allowed_user_channel) { PresenceChannel.new("/test/alloweduser") }
+ let(:allowed_group_channel) { PresenceChannel.new("/test/allowedgroup") }
+ let(:count_only_channel) { PresenceChannel.new("/test/countonly") }
before do
PresenceChannel.clear_all!
@@ -20,16 +20,16 @@ RSpec.describe PresenceController do
secure_group = Fabricate(:group)
PresenceChannel.register_prefix("test") do |channel|
case channel
- when /\A\/test\/public\d*\z/
+ when %r{\A/test/public\d*\z}
PresenceChannel::Config.new(public: true)
when "/test/secureuser"
- PresenceChannel::Config.new(allowed_user_ids: [ secure_user.id ])
+ PresenceChannel::Config.new(allowed_user_ids: [secure_user.id])
when "/test/securegroup"
- PresenceChannel::Config.new(allowed_group_ids: [ secure_group.id ])
+ PresenceChannel::Config.new(allowed_group_ids: [secure_group.id])
when "/test/alloweduser"
- PresenceChannel::Config.new(allowed_user_ids: [ user.id ])
+ PresenceChannel::Config.new(allowed_user_ids: [user.id])
when "/test/allowedgroup"
- PresenceChannel::Config.new(allowed_group_ids: [ group.id ])
+ PresenceChannel::Config.new(allowed_group_ids: [group.id])
when "/test/countonly"
PresenceChannel::Config.new(public: true, count_only: true)
else
@@ -51,28 +51,31 @@ RSpec.describe PresenceController do
expect(ch1.user_ids).to eq([])
expect(ch2.user_ids).to eq([])
- post "/presence/update.json", params: {
- client_id: client_id,
- present_channels: [ch1.name, ch2.name]
- }
+ post "/presence/update.json",
+ params: {
+ client_id: client_id,
+ present_channels: [ch1.name, ch2.name],
+ }
expect(response.status).to eq(200)
expect(ch1.user_ids).to eq([user.id])
expect(ch2.user_ids).to eq([user.id])
- post "/presence/update.json", params: {
- client_id: client_id,
- present_channels: [ch1.name],
- leave_channels: [ch2.name]
- }
+ post "/presence/update.json",
+ params: {
+ client_id: client_id,
+ present_channels: [ch1.name],
+ leave_channels: [ch2.name],
+ }
expect(response.status).to eq(200)
expect(ch1.user_ids).to eq([user.id])
expect(ch2.user_ids).to eq([])
- post "/presence/update.json", params: {
- client_id: client_id,
- present_channels: [],
- leave_channels: [ch1.name]
- }
+ post "/presence/update.json",
+ params: {
+ client_id: client_id,
+ present_channels: [],
+ leave_channels: [ch1.name],
+ }
expect(response.status).to eq(200)
expect(ch1.user_ids).to eq([])
expect(ch2.user_ids).to eq([])
@@ -86,26 +89,29 @@ RSpec.describe PresenceController do
expect(secure_user_channel.user_ids).to eq([])
expect(secure_group_channel.user_ids).to eq([])
- post "/presence/update.json", params: {
- client_id: client_id,
- present_channels: [
- ch1.name,
- secure_user_channel.name,
- secure_group_channel.name,
- allowed_user_channel.name,
- allowed_group_channel.name,
- "/test/nonexistent"
- ]
- }
+ post "/presence/update.json",
+ params: {
+ client_id: client_id,
+ present_channels: [
+ ch1.name,
+ secure_user_channel.name,
+ secure_group_channel.name,
+ allowed_user_channel.name,
+ allowed_group_channel.name,
+ "/test/nonexistent",
+ ],
+ }
expect(response.status).to eq(200)
- expect(response.parsed_body).to eq({
- ch1.name => true,
- secure_user_channel.name => false,
- secure_group_channel.name => false,
- allowed_user_channel.name => true,
- allowed_group_channel.name => true,
- "/test/nonexistent" => false,
- })
+ expect(response.parsed_body).to eq(
+ {
+ ch1.name => true,
+ secure_user_channel.name => false,
+ secure_group_channel.name => false,
+ allowed_user_channel.name => true,
+ allowed_group_channel.name => true,
+ "/test/nonexistent" => false,
+ },
+ )
expect(ch1.user_ids).to eq([user.id])
expect(secure_user_channel.user_ids).to eq([])
@@ -123,12 +129,7 @@ RSpec.describe PresenceController do
expect(response.cookies.keys).to include(session_cookie_name)
client_id = SecureRandom.hex
- post "/presence/update.json", params: {
- client_id: client_id,
- present_channels: [
- ch1.name,
- ]
- }
+ post "/presence/update.json", params: { client_id: client_id, present_channels: [ch1.name] }
expect(response.status).to eq(200)
expect(response.cookies.keys).not_to include(session_cookie_name)
end
@@ -145,8 +146,8 @@ RSpec.describe PresenceController do
ch1.name => {
"users" => [],
"count" => 0,
- "last_message_id" => MessageBus.last_id(ch1.message_bus_channel_name)
- }
+ "last_message_id" => MessageBus.last_id(ch1.message_bus_channel_name),
+ },
)
ch1.present(user_id: user.id, client_id: SecureRandom.hex)
@@ -165,16 +166,17 @@ RSpec.describe PresenceController do
it "respects the existence/security of the channel" do
sign_in user
- get "/presence/get", params: {
- channels: [
- ch1.name,
- allowed_user_channel.name,
- allowed_group_channel.name,
- secure_user_channel.name,
- secure_group_channel.name,
- "/test/nonexistent"
- ]
- }
+ get "/presence/get",
+ params: {
+ channels: [
+ ch1.name,
+ allowed_user_channel.name,
+ allowed_group_channel.name,
+ secure_user_channel.name,
+ secure_group_channel.name,
+ "/test/nonexistent",
+ ],
+ }
expect(response.status).to eq(200)
@@ -201,7 +203,5 @@ RSpec.describe PresenceController do
expect(response.status).to eq(200)
expect(response.parsed_body[count_only_channel.name]["count"]).to eq(1)
end
-
end
-
end
diff --git a/spec/requests/published_pages_controller_spec.rb b/spec/requests/published_pages_controller_spec.rb
index 4a35aac1833..3767912f8cf 100644
--- a/spec/requests/published_pages_controller_spec.rb
+++ b/spec/requests/published_pages_controller_spec.rb
@@ -7,9 +7,7 @@ RSpec.describe PublishedPagesController do
fab!(:user2) { Fabricate(:user) }
context "when enabled" do
- before do
- SiteSetting.enable_page_publishing = true
- end
+ before { SiteSetting.enable_page_publishing = true }
context "when checking slug availability" do
it "returns true for a new slug" do
@@ -40,12 +38,9 @@ RSpec.describe PublishedPagesController do
end
describe "#show" do
-
- it 'records a view' do
+ it "records a view" do
sign_in(user2)
- expect do
- get published_page.path
- end.to change(TopicViewItem, :count).by(1)
+ expect do get published_page.path end.to change(TopicViewItem, :count).by(1)
end
it "returns 404 for a missing article" do
@@ -57,9 +52,7 @@ RSpec.describe PublishedPagesController do
fab!(:group) { Fabricate(:group) }
fab!(:private_category) { Fabricate(:private_category, group: group) }
- before do
- published_page.topic.update!(category: private_category)
- end
+ before { published_page.topic.update!(category: private_category) }
it "returns 403 for a topic you can't see" do
get published_page.path
@@ -67,9 +60,9 @@ RSpec.describe PublishedPagesController do
end
context "when published page is public" do
- fab!(:public_published_page) {
+ fab!(:public_published_page) do
Fabricate(:published_page, public: true, slug: "a-public-page")
- }
+ end
it "returns 200 for a topic you can't see" do
get public_published_page.path
@@ -78,9 +71,7 @@ RSpec.describe PublishedPagesController do
end
context "as an admin" do
- before do
- sign_in(admin)
- end
+ before { sign_in(admin) }
it "returns 200" do
get published_page.path
@@ -120,7 +111,9 @@ RSpec.describe PublishedPagesController do
it "works even if image logos are not available" do
SiteSetting.logo_small = nil
get published_page.path
- expect(response.body).to include("awesome title"
+ expect(data["posts"][0]["id"]).to eq(awesome_post_3.id)
+ expect(data["posts"][0]["blurb"]).to eq(awesome_post_3.raw)
+ expect(data["posts"][0]["topic_title_headline"]).to eq(
+ "This is an awesome title",
)
- expect(data['topics'][0]['id']).to eq(awesome_post_3.topic_id)
+ expect(data["topics"][0]["id"]).to eq(awesome_post_3.topic_id)
- expect(data['posts'][1]['id']).to eq(awesome_post_2.id)
- expect(data['posts'][1]['blurb']).to eq(
- "#{Search::GroupedSearchResults::OMISSION}this is my really awesome post#{Search::GroupedSearchResults::OMISSION}"
+ expect(data["posts"][1]["id"]).to eq(awesome_post_2.id)
+ expect(data["posts"][1]["blurb"]).to eq(
+ "#{Search::GroupedSearchResults::OMISSION}this is my really awesome post#{Search::GroupedSearchResults::OMISSION}",
)
- expect(data['topics'][1]['id']).to eq(awesome_post_2.topic_id)
+ expect(data["topics"][1]["id"]).to eq(awesome_post_2.topic_id)
- expect(data['posts'][2]['id']).to eq(awesome_post.id)
- expect(data['posts'][2]['blurb']).to eq(
- "this is my really awesome post"
+ expect(data["posts"][2]["id"]).to eq(awesome_post.id)
+ expect(data["posts"][2]["blurb"]).to eq(
+ "this is my really awesome post",
)
- expect(data['topics'][2]['id']).to eq(awesome_post.topic_id)
+ expect(data["topics"][2]["id"]).to eq(awesome_post.topic_id)
end
it "can search correctly with advanced search filters" do
- awesome_post.update!(
- raw: "#{"a" * Search::GroupedSearchResults::BLURB_LENGTH} elephant"
- )
+ awesome_post.update!(raw: "#{"a" * Search::GroupedSearchResults::BLURB_LENGTH} elephant")
- get "/search/query.json", params: { term: 'order:views elephant' }
+ get "/search/query.json", params: { term: "order:views elephant" }
expect(response.status).to eq(200)
data = response.parsed_body
- expect(data.dig("grouped_search_result", "term")).to eq('order:views elephant')
- expect(data['posts'].length).to eq(1)
- expect(data['posts'][0]['id']).to eq(awesome_post.id)
- expect(data['posts'][0]['blurb']).to include('elephant')
- expect(data['topics'][0]['id']).to eq(awesome_post.topic_id)
+ expect(data.dig("grouped_search_result", "term")).to eq("order:views elephant")
+ expect(data["posts"].length).to eq(1)
+ expect(data["posts"][0]["id"]).to eq(awesome_post.id)
+ expect(data["posts"][0]["blurb"]).to include("elephant")
+ expect(data["topics"][0]["id"]).to eq(awesome_post.topic_id)
end
- it 'performs the query with a type filter' do
-
- get "/search/query.json", params: {
- term: user.username, type_filter: 'topic'
- }
+ it "performs the query with a type filter" do
+ get "/search/query.json", params: { term: user.username, type_filter: "topic" }
expect(response.status).to eq(200)
data = response.parsed_body
- expect(data['posts'][0]['id']).to eq(user_post.id)
- expect(data['users']).to be_blank
+ expect(data["posts"][0]["id"]).to eq(user_post.id)
+ expect(data["users"]).to be_blank
- get "/search/query.json", params: {
- term: user.username, type_filter: 'user'
- }
+ get "/search/query.json", params: { term: user.username, type_filter: "user" }
expect(response.status).to eq(200)
data = response.parsed_body
- expect(data['posts']).to be_blank
- expect(data['users'][0]['id']).to eq(user.id)
+ expect(data["posts"]).to be_blank
+ expect(data["users"][0]["id"]).to eq(user.id)
end
- context 'when searching by topic id' do
- it 'should not be restricted by minimum search term length' do
- SiteSetting.min_search_term_length = 20000
+ context "when searching by topic id" do
+ it "should not be restricted by minimum search term length" do
+ SiteSetting.min_search_term_length = 20_000
- get "/search/query.json", params: {
- term: awesome_post.topic_id,
- type_filter: 'topic',
- search_for_id: true
- }
+ get "/search/query.json",
+ params: {
+ term: awesome_post.topic_id,
+ type_filter: "topic",
+ search_for_id: true,
+ }
expect(response.status).to eq(200)
data = response.parsed_body
- expect(data['topics'][0]['id']).to eq(awesome_post.topic_id)
+ expect(data["topics"][0]["id"]).to eq(awesome_post.topic_id)
end
it "should return the right result" do
- get "/search/query.json", params: {
- term: user_post.topic_id,
- type_filter: 'topic',
- search_for_id: true
- }
+ get "/search/query.json",
+ params: {
+ term: user_post.topic_id,
+ type_filter: "topic",
+ search_for_id: true,
+ }
expect(response.status).to eq(200)
data = response.parsed_body
- expect(data['topics'][0]['id']).to eq(user_post.topic_id)
+ expect(data["topics"][0]["id"]).to eq(user_post.topic_id)
end
end
end
@@ -208,81 +190,78 @@ RSpec.describe SearchController do
describe "#query" do
it "logs the search term" do
SiteSetting.log_search_queries = true
- get "/search/query.json", params: { term: 'wookie' }
+ get "/search/query.json", params: { term: "wookie" }
expect(response.status).to eq(200)
- expect(SearchLog.where(term: 'wookie')).to be_present
+ expect(SearchLog.where(term: "wookie")).to be_present
json = response.parsed_body
- search_log_id = json['grouped_search_result']['search_log_id']
+ search_log_id = json["grouped_search_result"]["search_log_id"]
expect(search_log_id).to be_present
log = SearchLog.where(id: search_log_id).first
expect(log).to be_present
- expect(log.term).to eq('wookie')
+ expect(log.term).to eq("wookie")
end
it "doesn't log when disabled" do
SiteSetting.log_search_queries = false
- get "/search/query.json", params: { term: 'wookie' }
+ get "/search/query.json", params: { term: "wookie" }
expect(response.status).to eq(200)
- expect(SearchLog.where(term: 'wookie')).to be_blank
+ expect(SearchLog.where(term: "wookie")).to be_blank
end
it "doesn't log when filtering by exclude_topics" do
SiteSetting.log_search_queries = true
- get "/search/query.json", params: { term: 'boop', type_filter: 'exclude_topics' }
+ get "/search/query.json", params: { term: "boop", type_filter: "exclude_topics" }
expect(response.status).to eq(200)
- expect(SearchLog.where(term: 'boop')).to be_blank
+ expect(SearchLog.where(term: "boop")).to be_blank
end
it "does not raise 500 with an empty term" do
- get "/search/query.json", params: { term: "in:first", type_filter: "topic", search_for_id: true }
+ get "/search/query.json",
+ params: {
+ term: "in:first",
+ type_filter: "topic",
+ search_for_id: true,
+ }
expect(response.status).to eq(200)
end
- context 'when rate limited' do
- it 'rate limits anon searches per user' do
+ context "when rate limited" do
+ it "rate limits anon searches per user" do
SiteSetting.rate_limit_search_anon_user = 2
RateLimiter.enable
RateLimiter.clear_all!
2.times do
- get "/search/query.json", params: {
- term: 'wookie'
- }
+ get "/search/query.json", params: { term: "wookie" }
expect(response.status).to eq(200)
json = response.parsed_body
expect(json["grouped_search_result"]["error"]).to eq(nil)
end
- get "/search/query.json", params: {
- term: 'wookie'
- }
+ get "/search/query.json", params: { term: "wookie" }
expect(response.status).to eq(200)
json = response.parsed_body
expect(json["grouped_search_result"]["error"]).to eq(I18n.t("rate_limiter.slow_down"))
end
- it 'rate limits anon searches globally' do
+ it "rate limits anon searches globally" do
SiteSetting.rate_limit_search_anon_global = 2
RateLimiter.enable
RateLimiter.clear_all!
2.times do
- get "/search/query.json", params: {
- term: 'wookie'
- }
+ get "/search/query.json", params: { term: "wookie" }
expect(response.status).to eq(200)
json = response.parsed_body
expect(json["grouped_search_result"]["error"]).to eq(nil)
end
- get "/search/query.json", params: {
- term: 'wookie'
- }
+ get "/search/query.json", params: { term: "wookie" }
expect(response.status).to eq(200)
json = response.parsed_body
expect(json["grouped_search_result"]["error"]).to eq(I18n.t("rate_limiter.slow_down"))
@@ -291,24 +270,20 @@ RSpec.describe SearchController do
context "with a logged in user" do
before { sign_in(user) }
- it 'rate limits logged in searches' do
+ it "rate limits logged in searches" do
SiteSetting.rate_limit_search_user = 3
RateLimiter.enable
RateLimiter.clear_all!
3.times do
- get "/search/query.json", params: {
- term: 'wookie'
- }
+ get "/search/query.json", params: { term: "wookie" }
expect(response.status).to eq(200)
json = response.parsed_body
expect(json["grouped_search_result"]["error"]).to eq(nil)
end
- get "/search/query.json", params: {
- term: 'wookie'
- }
+ get "/search/query.json", params: { term: "wookie" }
expect(response.status).to eq(200)
json = response.parsed_body
expect(json["grouped_search_result"]["error"]).to eq(I18n.t("rate_limiter.slow_down"))
@@ -324,7 +299,7 @@ RSpec.describe SearchController do
end
it "raises an error when the search term length is less than required" do
- get "/search.json", params: { q: 'ba' }
+ get "/search.json", params: { q: "ba" }
expect(response.status).to eq(400)
end
@@ -341,12 +316,12 @@ RSpec.describe SearchController do
end
it "doesn't raise an error if the page is a string number" do
- get "/search.json", params: { q: 'kittens', page: '3' }
+ get "/search.json", params: { q: "kittens", page: "3" }
expect(response.status).to eq(200)
end
it "doesn't raise an error if the page is a integer number" do
- get "/search.json", params: { q: 'kittens', page: 3 }
+ get "/search.json", params: { q: "kittens", page: 3 }
expect(response.status).to eq(200)
end
@@ -356,94 +331,80 @@ RSpec.describe SearchController do
end
it "returns a 400 error if the page parameter is padded with spaces" do
- get "/search.json", params: { q: 'kittens', page: ' 3 ' }
+ get "/search.json", params: { q: "kittens", page: " 3 " }
expect(response.status).to eq(400)
end
it "logs the search term" do
SiteSetting.log_search_queries = true
- get "/search.json", params: { q: 'bantha' }
+ get "/search.json", params: { q: "bantha" }
expect(response.status).to eq(200)
- expect(SearchLog.where(term: 'bantha')).to be_present
+ expect(SearchLog.where(term: "bantha")).to be_present
end
it "doesn't log when disabled" do
SiteSetting.log_search_queries = false
- get "/search.json", params: { q: 'bantha' }
+ get "/search.json", params: { q: "bantha" }
expect(response.status).to eq(200)
- expect(SearchLog.where(term: 'bantha')).to be_blank
+ expect(SearchLog.where(term: "bantha")).to be_blank
end
- context 'when rate limited' do
- it 'rate limits anon searches per user' do
+ context "when rate limited" do
+ it "rate limits anon searches per user" do
SiteSetting.rate_limit_search_anon_user = 2
RateLimiter.enable
RateLimiter.clear_all!
2.times do
- get "/search.json", params: {
- q: 'bantha'
- }
+ get "/search.json", params: { q: "bantha" }
expect(response.status).to eq(200)
json = response.parsed_body
expect(json["grouped_search_result"]["error"]).to eq(nil)
end
- get "/search.json", params: {
- q: 'bantha'
- }
+ get "/search.json", params: { q: "bantha" }
expect(response.status).to eq(200)
json = response.parsed_body
expect(json["grouped_search_result"]["error"]).to eq(I18n.t("rate_limiter.slow_down"))
-
end
- it 'rate limits anon searches globally' do
+ it "rate limits anon searches globally" do
SiteSetting.rate_limit_search_anon_global = 2
RateLimiter.enable
RateLimiter.clear_all!
2.times do
- get "/search.json", params: {
- q: 'bantha'
- }
+ get "/search.json", params: { q: "bantha" }
expect(response.status).to eq(200)
json = response.parsed_body
expect(json["grouped_search_result"]["error"]).to eq(nil)
end
- get "/search.json", params: {
- q: 'bantha'
- }
+ get "/search.json", params: { q: "bantha" }
expect(response.status).to eq(200)
json = response.parsed_body
expect(json["grouped_search_result"]["error"]).to eq(I18n.t("rate_limiter.slow_down"))
-
end
context "with a logged in user" do
before { sign_in(user) }
- it 'rate limits searches' do
+ it "rate limits searches" do
SiteSetting.rate_limit_search_user = 3
RateLimiter.enable
RateLimiter.clear_all!
3.times do
- get "/search.json", params: {
- q: 'bantha'
- }
+ get "/search.json", params: { q: "bantha" }
expect(response.status).to eq(200)
json = response.parsed_body
expect(json["grouped_search_result"]["error"]).to eq(nil)
end
- get "/search.json", params: {
- q: 'bantha'
- }
+ get "/search.json", params: { q: "bantha" }
expect(response.status).to eq(200)
json = response.parsed_body
expect(json["grouped_search_result"]["error"]).to eq(I18n.t("rate_limiter.slow_down"))
@@ -454,31 +415,19 @@ RSpec.describe SearchController do
context "with search priority" do
fab!(:very_low_priority_category) do
- Fabricate(
- :category,
- search_priority: Searchable::PRIORITIES[:very_low]
- )
+ Fabricate(:category, search_priority: Searchable::PRIORITIES[:very_low])
end
fab!(:low_priority_category) do
- Fabricate(
- :category,
- search_priority: Searchable::PRIORITIES[:low]
- )
+ Fabricate(:category, search_priority: Searchable::PRIORITIES[:low])
end
fab!(:high_priority_category) do
- Fabricate(
- :category,
- search_priority: Searchable::PRIORITIES[:high]
- )
+ Fabricate(:category, search_priority: Searchable::PRIORITIES[:high])
end
fab!(:very_high_priority_category) do
- Fabricate(
- :category,
- search_priority: Searchable::PRIORITIES[:very_high]
- )
+ Fabricate(:category, search_priority: Searchable::PRIORITIES[:very_high])
end
fab!(:very_low_priority_topic) { Fabricate(:topic, category: very_low_priority_category) }
@@ -494,7 +443,8 @@ RSpec.describe SearchController do
fab!(:low_priority_post) do
SearchIndexer.enable
- Fabricate(:post,
+ Fabricate(
+ :post,
topic: low_priority_topic,
raw: "This is a Low Priority Post",
created_at: 1.day.ago,
@@ -509,7 +459,8 @@ RSpec.describe SearchController do
fab!(:very_high_priority_post) do
SearchIndexer.enable
- Fabricate(:post,
+ Fabricate(
+ :post,
topic: very_high_priority_topic,
raw: "This is a Old but Very High Priority Post",
created_at: 2.days.ago,
@@ -517,7 +468,7 @@ RSpec.describe SearchController do
end
it "sort posts with search priority when search term is empty" do
- get "/search.json", params: { q: 'status:open' }
+ get "/search.json", params: { q: "status:open" }
expect(response.status).to eq(200)
data = response.parsed_body
post1 = data["posts"].find { |e| e["id"] == very_high_priority_post.id }
@@ -527,10 +478,10 @@ RSpec.describe SearchController do
end
it "sort posts with search priority when no order query" do
- SiteSetting.category_search_priority_high_weight = 999999
+ SiteSetting.category_search_priority_high_weight = 999_999
SiteSetting.category_search_priority_low_weight = 0
- get "/search.json", params: { q: 'status:open Priority Post' }
+ get "/search.json", params: { q: "status:open Priority Post" }
expect(response.status).to eq(200)
data = response.parsed_body
expect(data["posts"][0]["id"]).to eq(very_high_priority_post.id)
@@ -540,7 +491,7 @@ RSpec.describe SearchController do
end
it "doesn't sort posts with search priority when query with order" do
- get "/search.json", params: { q: 'status:open order:latest Priority Post' }
+ get "/search.json", params: { q: "status:open order:latest Priority Post" }
expect(response.status).to eq(200)
data = response.parsed_body
expect(data["posts"][0]["id"]).to eq(high_priority_post.id)
@@ -552,31 +503,44 @@ RSpec.describe SearchController do
context "with search context" do
it "raises an error with an invalid context type" do
- get "/search/query.json", params: {
- term: 'test', search_context: { type: 'security', id: 'hole' }
- }
+ get "/search/query.json",
+ params: {
+ term: "test",
+ search_context: {
+ type: "security",
+ id: "hole",
+ },
+ }
expect(response.status).to eq(400)
end
it "raises an error with a missing id" do
- get "/search/query.json",
- params: { term: 'test', search_context: { type: 'user' } }
+ get "/search/query.json", params: { term: "test", search_context: { type: "user" } }
expect(response.status).to eq(400)
end
context "with a user" do
-
it "raises an error if the user can't see the context" do
- get "/search/query.json", params: {
- term: 'test', search_context: { type: 'private_messages', id: user.username }
- }
+ get "/search/query.json",
+ params: {
+ term: "test",
+ search_context: {
+ type: "private_messages",
+ id: user.username,
+ },
+ }
expect(response).to be_forbidden
end
- it 'performs the query with a search context' do
- get "/search/query.json", params: {
- term: 'test', search_context: { type: 'user', id: user.username }
- }
+ it "performs the query with a search context" do
+ get "/search/query.json",
+ params: {
+ term: "test",
+ search_context: {
+ type: "user",
+ id: user.username,
+ },
+ }
expect(response.status).to eq(200)
end
@@ -584,17 +548,29 @@ RSpec.describe SearchController do
context "with a tag" do
it "raises an error if the tag does not exist" do
- get "/search/query.json", params: {
- term: 'test', search_context: { type: 'tag', id: 'important-tag', name: 'important-tag' }
- }
+ get "/search/query.json",
+ params: {
+ term: "test",
+ search_context: {
+ type: "tag",
+ id: "important-tag",
+ name: "important-tag",
+ },
+ }
expect(response).to be_forbidden
end
- it 'performs the query with a search context' do
- Fabricate(:tag, name: 'important-tag')
- get "/search/query.json", params: {
- term: 'test', search_context: { type: 'tag', id: 'important-tag', name: 'important-tag' }
- }
+ it "performs the query with a search context" do
+ Fabricate(:tag, name: "important-tag")
+ get "/search/query.json",
+ params: {
+ term: "test",
+ search_context: {
+ type: "tag",
+ id: "important-tag",
+ name: "important-tag",
+ },
+ }
expect(response.status).to eq(200)
end
@@ -602,9 +578,7 @@ RSpec.describe SearchController do
end
describe "#click" do
- after do
- SearchLog.clear_debounce_cache!
- end
+ after { SearchLog.clear_debounce_cache! }
it "doesn't work without the necessary parameters" do
post "/search/click.json"
@@ -614,18 +588,20 @@ RSpec.describe SearchController do
it "doesn't record the click for a different user" do
sign_in(user)
- _, search_log_id = SearchLog.log(
- term: SecureRandom.hex,
- search_type: :header,
- user_id: -10,
- ip_address: '127.0.0.1'
- )
+ _, search_log_id =
+ SearchLog.log(
+ term: SecureRandom.hex,
+ search_type: :header,
+ user_id: -10,
+ ip_address: "127.0.0.1",
+ )
- post "/search/click.json", params: {
- search_log_id: search_log_id,
- search_result_id: 12345,
- search_result_type: 'topic'
- }
+ post "/search/click.json",
+ params: {
+ search_log_id: search_log_id,
+ search_result_id: 12_345,
+ search_result_type: "topic",
+ }
expect(response.status).to eq(200)
expect(response.parsed_body["success"]).to be_present
@@ -635,57 +611,59 @@ RSpec.describe SearchController do
it "records the click for a logged in user" do
sign_in(user)
- _, search_log_id = SearchLog.log(
- term: SecureRandom.hex,
- search_type: :header,
- user_id: user.id,
- ip_address: '127.0.0.1'
- )
+ _, search_log_id =
+ SearchLog.log(
+ term: SecureRandom.hex,
+ search_type: :header,
+ user_id: user.id,
+ ip_address: "127.0.0.1",
+ )
- post "/search/click.json", params: {
- search_log_id: search_log_id,
- search_result_id: 12345,
- search_result_type: 'user'
- }
+ post "/search/click.json",
+ params: {
+ search_log_id: search_log_id,
+ search_result_id: 12_345,
+ search_result_type: "user",
+ }
expect(response.status).to eq(200)
- expect(SearchLog.find(search_log_id).search_result_id).to eq(12345)
- expect(SearchLog.find(search_log_id).search_result_type).to eq(SearchLog.search_result_types[:user])
+ expect(SearchLog.find(search_log_id).search_result_id).to eq(12_345)
+ expect(SearchLog.find(search_log_id).search_result_type).to eq(
+ SearchLog.search_result_types[:user],
+ )
end
it "records the click for an anonymous user" do
get "/"
ip_address = request.remote_ip
- _, search_log_id = SearchLog.log(
- term: SecureRandom.hex,
- search_type: :header,
- ip_address: ip_address
- )
+ _, search_log_id =
+ SearchLog.log(term: SecureRandom.hex, search_type: :header, ip_address: ip_address)
- post "/search/click.json", params: {
- search_log_id: search_log_id,
- search_result_id: 22222,
- search_result_type: 'topic'
- }
+ post "/search/click.json",
+ params: {
+ search_log_id: search_log_id,
+ search_result_id: 22_222,
+ search_result_type: "topic",
+ }
expect(response.status).to eq(200)
- expect(SearchLog.find(search_log_id).search_result_id).to eq(22222)
- expect(SearchLog.find(search_log_id).search_result_type).to eq(SearchLog.search_result_types[:topic])
+ expect(SearchLog.find(search_log_id).search_result_id).to eq(22_222)
+ expect(SearchLog.find(search_log_id).search_result_type).to eq(
+ SearchLog.search_result_types[:topic],
+ )
end
it "doesn't record the click for a different IP" do
- _, search_log_id = SearchLog.log(
- term: SecureRandom.hex,
- search_type: :header,
- ip_address: '192.168.0.19'
- )
+ _, search_log_id =
+ SearchLog.log(term: SecureRandom.hex, search_type: :header, ip_address: "192.168.0.19")
- post "/search/click.json", params: {
- search_log_id: search_log_id,
- search_result_id: 22222,
- search_result_type: 'topic'
- }
+ post "/search/click.json",
+ params: {
+ search_log_id: search_log_id,
+ search_result_id: 22_222,
+ search_result_type: "topic",
+ }
expect(response.status).to eq(200)
expect(response.parsed_body["success"]).to be_present
@@ -696,43 +674,43 @@ RSpec.describe SearchController do
get "/"
ip_address = request.remote_ip
- _, search_log_id = SearchLog.log(
- term: SecureRandom.hex,
- search_type: :header,
- ip_address: ip_address
- )
+ _, search_log_id =
+ SearchLog.log(term: SecureRandom.hex, search_type: :header, ip_address: ip_address)
- post "/search/click.json", params: {
- search_log_id: search_log_id,
- search_result_id: 23456,
- search_result_type: 'category'
- }
+ post "/search/click.json",
+ params: {
+ search_log_id: search_log_id,
+ search_result_id: 23_456,
+ search_result_type: "category",
+ }
expect(response.status).to eq(200)
- expect(SearchLog.find(search_log_id).search_result_id).to eq(23456)
- expect(SearchLog.find(search_log_id).search_result_type).to eq(SearchLog.search_result_types[:category])
+ expect(SearchLog.find(search_log_id).search_result_id).to eq(23_456)
+ expect(SearchLog.find(search_log_id).search_result_type).to eq(
+ SearchLog.search_result_types[:category],
+ )
end
it "records the click for search result type tag" do
get "/"
ip_address = request.remote_ip
- tag = Fabricate(:tag, name: 'test')
+ tag = Fabricate(:tag, name: "test")
- _, search_log_id = SearchLog.log(
- term: SecureRandom.hex,
- search_type: :header,
- ip_address: ip_address
- )
+ _, search_log_id =
+ SearchLog.log(term: SecureRandom.hex, search_type: :header, ip_address: ip_address)
- post "/search/click.json", params: {
- search_log_id: search_log_id,
- search_result_id: tag.name,
- search_result_type: 'tag'
- }
+ post "/search/click.json",
+ params: {
+ search_log_id: search_log_id,
+ search_result_id: tag.name,
+ search_result_type: "tag",
+ }
expect(response.status).to eq(200)
expect(SearchLog.find(search_log_id).search_result_id).to eq(tag.id)
- expect(SearchLog.find(search_log_id).search_result_type).to eq(SearchLog.search_result_types[:tag])
+ expect(SearchLog.find(search_log_id).search_result_type).to eq(
+ SearchLog.search_result_types[:tag],
+ )
end
end
end
diff --git a/spec/requests/session_controller_spec.rb b/spec/requests/session_controller_spec.rb
index dab76d3f488..38eea176b17 100644
--- a/spec/requests/session_controller_spec.rb
+++ b/spec/requests/session_controller_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-require 'rotp'
+require "rotp"
RSpec.describe SessionController do
let(:user) { Fabricate(:user) }
@@ -9,20 +9,20 @@ RSpec.describe SessionController do
fab!(:admin) { Fabricate(:admin) }
let(:admin_email_token) { Fabricate(:email_token, user: admin) }
- shared_examples 'failed to continue local login' do
- it 'should return the right response' do
+ shared_examples "failed to continue local login" do
+ it "should return the right response" do
expect(response).not_to be_successful
expect(response.status).to eq(403)
end
end
- describe '#email_login_info' do
- let(:email_token) { Fabricate(:email_token, user: user, scope: EmailToken.scopes[:email_login]) }
-
- before do
- SiteSetting.enable_local_logins_via_email = true
+ describe "#email_login_info" do
+ let(:email_token) do
+ Fabricate(:email_token, user: user, scope: EmailToken.scopes[:email_login])
end
+ before { SiteSetting.enable_local_logins_via_email = true }
+
context "when local logins via email disabled" do
before { SiteSetting.enable_local_logins_via_email = false }
@@ -33,7 +33,7 @@ RSpec.describe SessionController do
user.update(admin: true)
get "/session/email-login/#{email_token.token}.json"
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).not_to be_present
+ expect(response.parsed_body["error"]).not_to be_present
end
end
@@ -50,19 +50,19 @@ RSpec.describe SessionController do
user.update(admin: true)
get "/session/email-login/#{email_token.token}.json"
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).not_to be_present
+ expect(response.parsed_body["error"]).not_to be_present
end
end
- context 'with missing token' do
- it 'returns the right response' do
+ context "with missing token" do
+ it "returns the right response" do
get "/session/email-login"
expect(response.status).to eq(404)
end
end
- context 'with valid token' do
- it 'returns information' do
+ context "with valid token" do
+ it "returns information" do
get "/session/email-login/#{email_token.token}.json"
expect(response.parsed_body["can_login"]).to eq(true)
@@ -72,7 +72,7 @@ RSpec.describe SessionController do
expect(session[:current_user_id]).to be_nil
end
- it 'fails when local logins via email is disabled' do
+ it "fails when local logins via email is disabled" do
SiteSetting.enable_local_logins_via_email = false
get "/session/email-login/#{email_token.token}.json"
@@ -80,7 +80,7 @@ RSpec.describe SessionController do
expect(response.status).to eq(403)
end
- it 'fails when local logins is disabled' do
+ it "fails when local logins is disabled" do
SiteSetting.enable_local_logins = false
get "/session/email-login/#{email_token.token}.json"
@@ -88,7 +88,7 @@ RSpec.describe SessionController do
expect(response.status).to eq(403)
end
- context 'when user has 2-factor logins' do
+ context "when user has 2-factor logins" do
let!(:user_second_factor) { Fabricate(:user_second_factor_totp, user: user) }
let!(:user_second_factor_backup) { Fabricate(:user_second_factor_backup, user: user) }
@@ -102,7 +102,7 @@ RSpec.describe SessionController do
end
end
- context 'when user has security key enabled' do
+ context "when user has security key enabled" do
let!(:user_security_key) { Fabricate(:user_security_key, user: user) }
it "includes that information in the response" do
@@ -113,7 +113,9 @@ RSpec.describe SessionController do
expect(response_body_parsed["security_key_required"]).to eq(true)
expect(response_body_parsed["second_factor_required"]).to eq(nil)
expect(response_body_parsed["backup_codes_enabled"]).to eq(nil)
- expect(response_body_parsed["allowed_credential_ids"]).to eq([user_security_key.credential_id])
+ expect(response_body_parsed["allowed_credential_ids"]).to eq(
+ [user_security_key.credential_id],
+ )
secure_session = SecureSession.new(session["secure_session_id"])
expect(response_body_parsed["challenge"]).to eq(Webauthn.challenge(user, secure_session))
expect(Webauthn.rp_id(user, secure_session)).to eq(Discourse.current_hostname)
@@ -122,19 +124,17 @@ RSpec.describe SessionController do
end
end
- describe '#email_login' do
- let(:email_token) { Fabricate(:email_token, user: user, scope: EmailToken.scopes[:email_login]) }
-
- before do
- SiteSetting.enable_local_logins_via_email = true
+ describe "#email_login" do
+ let(:email_token) do
+ Fabricate(:email_token, user: user, scope: EmailToken.scopes[:email_login])
end
+ before { SiteSetting.enable_local_logins_via_email = true }
+
context "when in staff writes only mode" do
use_redis_snapshotting
- before do
- Discourse.enable_readonly_mode(Discourse::STAFF_WRITES_ONLY_MODE_KEY)
- end
+ before { Discourse.enable_readonly_mode(Discourse::STAFF_WRITES_ONLY_MODE_KEY) }
it "allows admins to login" do
user.update!(admin: true)
@@ -160,30 +160,30 @@ RSpec.describe SessionController do
user.update(admin: true)
post "/session/email-login/#{email_token.token}.json"
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).not_to be_present
+ expect(response.parsed_body["error"]).not_to be_present
expect(session[:current_user_id]).to eq(user.id)
end
end
- context 'with missing token' do
- it 'returns the right response' do
+ context "with missing token" do
+ it "returns the right response" do
post "/session/email-login"
expect(response.status).to eq(404)
end
end
- context 'with invalid token' do
- it 'returns the right response' do
+ context "with invalid token" do
+ it "returns the right response" do
post "/session/email-login/adasdad.json"
expect(response.status).to eq(200)
expect(response.parsed_body["error"]).to eq(
- I18n.t('email_login.invalid_token', base_url: Discourse.base_url)
+ I18n.t("email_login.invalid_token", base_url: Discourse.base_url),
)
end
- context 'when token has expired' do
- it 'should return the right response' do
+ context "when token has expired" do
+ it "should return the right response" do
email_token.update!(created_at: 999.years.ago)
post "/session/email-login/#{email_token.token}.json"
@@ -191,21 +191,21 @@ RSpec.describe SessionController do
expect(response.status).to eq(200)
expect(response.parsed_body["error"]).to eq(
- I18n.t('email_login.invalid_token', base_url: Discourse.base_url)
+ I18n.t("email_login.invalid_token", base_url: Discourse.base_url),
)
end
end
end
- context 'with valid token' do
- it 'returns success' do
+ context "with valid token" do
+ it "returns success" do
post "/session/email-login/#{email_token.token}.json"
expect(response.parsed_body["success"]).to eq("OK")
expect(session[:current_user_id]).to eq(user.id)
end
- it 'fails when local logins via email is disabled' do
+ it "fails when local logins via email is disabled" do
SiteSetting.enable_local_logins_via_email = false
post "/session/email-login/#{email_token.token}.json"
@@ -214,7 +214,7 @@ RSpec.describe SessionController do
expect(session[:current_user_id]).to eq(nil)
end
- it 'fails when local logins is disabled' do
+ it "fails when local logins is disabled" do
SiteSetting.enable_local_logins = false
post "/session/email-login/#{email_token.token}.json"
@@ -235,38 +235,40 @@ RSpec.describe SessionController do
context "when admin IP address is not valid" do
before do
- Fabricate(:screened_ip_address,
+ Fabricate(
+ :screened_ip_address,
ip_address: "111.111.11.11",
- action_type: ScreenedIpAddress.actions[:allow_admin]
+ action_type: ScreenedIpAddress.actions[:allow_admin],
)
SiteSetting.use_admin_ip_allowlist = true
user.update!(admin: true)
end
- it 'returns the right response' do
+ it "returns the right response" do
post "/session/email-login/#{email_token.token}.json"
expect(response.status).to eq(200)
expect(response.parsed_body["error"]).to eq(
- I18n.t("login.admin_not_allowed_from_ip_address", username: user.username)
+ I18n.t("login.admin_not_allowed_from_ip_address", username: user.username),
)
expect(session[:current_user_id]).to eq(nil)
end
end
context "when IP address is blocked" do
- let(:permitted_ip_address) { '111.234.23.11' }
+ let(:permitted_ip_address) { "111.234.23.11" }
before do
- Fabricate(:screened_ip_address,
+ Fabricate(
+ :screened_ip_address,
ip_address: permitted_ip_address,
- action_type: ScreenedIpAddress.actions[:block]
+ action_type: ScreenedIpAddress.actions[:block],
)
end
- it 'returns the right response' do
+ it "returns the right response" do
ActionDispatch::Request.any_instance.stubs(:remote_ip).returns(permitted_ip_address)
post "/session/email-login/#{email_token.token}.json"
@@ -274,7 +276,7 @@ RSpec.describe SessionController do
expect(response.status).to eq(200)
expect(response.parsed_body["error"]).to eq(
- I18n.t("login.not_allowed_from_ip_address", username: user.username)
+ I18n.t("login.not_allowed_from_ip_address", username: user.username),
)
expect(session[:current_user_id]).to eq(nil)
end
@@ -282,83 +284,87 @@ RSpec.describe SessionController do
context "when timezone param is provided" do
it "sets the user_option timezone for the user" do
- post "/session/email-login/#{email_token.token}.json", params: { timezone: "Australia/Melbourne" }
+ post "/session/email-login/#{email_token.token}.json",
+ params: {
+ timezone: "Australia/Melbourne",
+ }
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).not_to be_present
+ expect(response.parsed_body["error"]).not_to be_present
expect(user.reload.user_option.timezone).to eq("Australia/Melbourne")
end
end
it "fails when user is suspended" do
- user.update!(
- suspended_till: 2.days.from_now,
- suspended_at: Time.zone.now
- )
+ user.update!(suspended_till: 2.days.from_now, suspended_at: Time.zone.now)
post "/session/email-login/#{email_token.token}.json"
expect(response.status).to eq(200)
expect(response.parsed_body["error"]).to eq(
- I18n.t("login.suspended", date: I18n.l(user.suspended_till, format: :date_only)
- ))
+ I18n.t("login.suspended", date: I18n.l(user.suspended_till, format: :date_only)),
+ )
expect(session[:current_user_id]).to eq(nil)
end
- context 'when user has 2-factor logins' do
+ context "when user has 2-factor logins" do
let!(:user_second_factor) { Fabricate(:user_second_factor_totp, user: user) }
let!(:user_second_factor_backup) { Fabricate(:user_second_factor_backup, user: user) }
- describe 'errors on incorrect 2-factor' do
- context 'when using totp method' do
- it 'does not log in with incorrect two factor' do
- post "/session/email-login/#{email_token.token}.json", params: {
- second_factor_token: "0000",
- second_factor_method: UserSecondFactor.methods[:totp]
- }
+ describe "errors on incorrect 2-factor" do
+ context "when using totp method" do
+ it "does not log in with incorrect two factor" do
+ post "/session/email-login/#{email_token.token}.json",
+ params: {
+ second_factor_token: "0000",
+ second_factor_method: UserSecondFactor.methods[:totp],
+ }
expect(response.status).to eq(200)
expect(response.parsed_body["error"]).to eq(
- I18n.t("login.invalid_second_factor_code")
+ I18n.t("login.invalid_second_factor_code"),
)
expect(session[:current_user_id]).to eq(nil)
end
end
- context 'when using backup code method' do
- it 'does not log in with incorrect backup code' do
- post "/session/email-login/#{email_token.token}.json", params: {
- second_factor_token: "0000",
- second_factor_method: UserSecondFactor.methods[:backup_codes]
- }
+ context "when using backup code method" do
+ it "does not log in with incorrect backup code" do
+ post "/session/email-login/#{email_token.token}.json",
+ params: {
+ second_factor_token: "0000",
+ second_factor_method: UserSecondFactor.methods[:backup_codes],
+ }
expect(response.status).to eq(200)
expect(response.parsed_body["error"]).to eq(
- I18n.t("login.invalid_second_factor_code")
+ I18n.t("login.invalid_second_factor_code"),
)
expect(session[:current_user_id]).to eq(nil)
end
end
end
- describe 'allows successful 2-factor' do
- context 'when using totp method' do
- it 'logs in correctly' do
- post "/session/email-login/#{email_token.token}.json", params: {
- second_factor_token: ROTP::TOTP.new(user_second_factor.data).now,
- second_factor_method: UserSecondFactor.methods[:totp]
- }
+ describe "allows successful 2-factor" do
+ context "when using totp method" do
+ it "logs in correctly" do
+ post "/session/email-login/#{email_token.token}.json",
+ params: {
+ second_factor_token: ROTP::TOTP.new(user_second_factor.data).now,
+ second_factor_method: UserSecondFactor.methods[:totp],
+ }
expect(response.parsed_body["success"]).to eq("OK")
expect(session[:current_user_id]).to eq(user.id)
end
end
- context 'when using backup code method' do
- it 'logs in correctly' do
- post "/session/email-login/#{email_token.token}.json", params: {
- second_factor_token: "iAmValidBackupCode",
- second_factor_method: UserSecondFactor.methods[:backup_codes]
- }
+ context "when using backup code method" do
+ it "logs in correctly" do
+ post "/session/email-login/#{email_token.token}.json",
+ params: {
+ second_factor_token: "iAmValidBackupCode",
+ second_factor_method: UserSecondFactor.methods[:backup_codes],
+ }
expect(response.parsed_body["success"]).to eq("OK")
expect(session[:current_user_id]).to eq(user.id)
@@ -368,16 +374,15 @@ RSpec.describe SessionController do
context "if the security_key_param is provided but only TOTP is enabled" do
it "does not log in the user" do
- post "/session/email-login/#{email_token.token}.json", params: {
- second_factor_token: 'foo',
- second_factor_method: UserSecondFactor.methods[:totp]
- }
+ post "/session/email-login/#{email_token.token}.json",
+ params: {
+ second_factor_token: "foo",
+ second_factor_method: UserSecondFactor.methods[:totp],
+ }
expect(response.status).to eq(200)
- expect(response.parsed_body["error"]).to eq(
- I18n.t("login.invalid_second_factor_code")
- )
+ expect(response.parsed_body["error"]).to eq(I18n.t("login.invalid_second_factor_code"))
expect(session[:current_user_id]).to eq(nil)
end
end
@@ -389,7 +394,7 @@ RSpec.describe SessionController do
:user_security_key,
user: user,
credential_id: valid_security_key_data[:credential_id],
- public_key: valid_security_key_data[:public_key]
+ public_key: valid_security_key_data[:public_key],
)
end
@@ -402,54 +407,50 @@ RSpec.describe SessionController do
context "when the security key params are blank and a random second factor token is provided" do
it "shows an error message and denies login" do
-
- post "/session/email-login/#{email_token.token}.json", params: {
- second_factor_token: "XXXXXXX",
- second_factor_method: UserSecondFactor.methods[:totp]
- }
+ post "/session/email-login/#{email_token.token}.json",
+ params: {
+ second_factor_token: "XXXXXXX",
+ second_factor_method: UserSecondFactor.methods[:totp],
+ }
expect(response.status).to eq(200)
expect(session[:current_user_id]).to eq(nil)
response_body = response.parsed_body
- expect(response_body['error']).to eq(I18n.t(
- 'login.not_enabled_second_factor_method'
- ))
+ expect(response_body["error"]).to eq(I18n.t("login.not_enabled_second_factor_method"))
end
end
context "when the security key params are invalid" do
it "shows an error message and denies login" do
-
- post "/session/email-login/#{email_token.token}.json", params: {
- second_factor_token: {
- signature: 'bad_sig',
- clientData: 'bad_clientData',
- credentialId: 'bad_credential_id',
- authenticatorData: 'bad_authenticator_data'
- },
- second_factor_method: UserSecondFactor.methods[:security_key]
- }
+ post "/session/email-login/#{email_token.token}.json",
+ params: {
+ second_factor_token: {
+ signature: "bad_sig",
+ clientData: "bad_clientData",
+ credentialId: "bad_credential_id",
+ authenticatorData: "bad_authenticator_data",
+ },
+ second_factor_method: UserSecondFactor.methods[:security_key],
+ }
expect(response.status).to eq(200)
expect(session[:current_user_id]).to eq(nil)
response_body = response.parsed_body
expect(response_body["failed"]).to eq("FAILED")
- expect(response_body['error']).to eq(I18n.t(
- 'webauthn.validation.not_found_error'
- ))
+ expect(response_body["error"]).to eq(I18n.t("webauthn.validation.not_found_error"))
end
end
context "when the security key params are valid" do
it "logs the user in" do
-
- post "/session/email-login/#{email_token.token}.json", params: {
- login: user.username,
- password: 'myawesomepassword',
- second_factor_token: valid_security_key_auth_post_data,
- second_factor_method: UserSecondFactor.methods[:security_key]
- }
+ post "/session/email-login/#{email_token.token}.json",
+ params: {
+ login: user.username,
+ password: "myawesomepassword",
+ second_factor_token: valid_security_key_auth_post_data,
+ second_factor_method: UserSecondFactor.methods[:security_key],
+ }
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).not_to be_present
+ expect(response.parsed_body["error"]).not_to be_present
user.reload
expect(session[:current_user_id]).to eq(user.id)
@@ -464,56 +465,54 @@ RSpec.describe SessionController do
:user_security_key,
user: user,
credential_id: valid_security_key_data[:credential_id],
- public_key: valid_security_key_data[:public_key]
+ public_key: valid_security_key_data[:public_key],
)
end
let!(:user_second_factor) { Fabricate(:user_second_factor_totp, user: user) }
it "doesnt allow logging in if the 2fa params are garbled" do
- post "/session/email-login/#{email_token.token}.json", params: {
- second_factor_method: UserSecondFactor.methods[:totp],
- second_factor_token: "blah"
- }
+ post "/session/email-login/#{email_token.token}.json",
+ params: {
+ second_factor_method: UserSecondFactor.methods[:totp],
+ second_factor_token: "blah",
+ }
expect(response.status).to eq(200)
expect(session[:current_user_id]).to eq(nil)
response_body = response.parsed_body
- expect(response_body['error']).to eq(I18n.t(
- 'login.invalid_second_factor_code'
- ))
+ expect(response_body["error"]).to eq(I18n.t("login.invalid_second_factor_code"))
end
it "doesnt allow login if both of the 2fa params are blank" do
- post "/session/email-login/#{email_token.token}.json", params: {
- second_factor_method: UserSecondFactor.methods[:totp],
- second_factor_token: ""
- }
+ post "/session/email-login/#{email_token.token}.json",
+ params: {
+ second_factor_method: UserSecondFactor.methods[:totp],
+ second_factor_token: "",
+ }
expect(response.status).to eq(200)
expect(session[:current_user_id]).to eq(nil)
response_body = response.parsed_body
- expect(response_body['error']).to eq(I18n.t(
- 'login.invalid_second_factor_code'
- ))
+ expect(response_body["error"]).to eq(I18n.t("login.invalid_second_factor_code"))
end
end
end
end
- describe 'logoff support' do
- it 'can log off users cleanly' do
+ describe "logoff support" do
+ it "can log off users cleanly" do
user = Fabricate(:user)
sign_in(user)
UserAuthToken.destroy_all
# we need a route that will call current user
- post '/drafts.json', params: {}
- expect(response.headers['Discourse-Logged-Out']).to eq("1")
+ post "/drafts.json", params: {}
+ expect(response.headers["Discourse-Logged-Out"]).to eq("1")
end
end
- describe '#become' do
+ describe "#become" do
let!(:user) { Fabricate(:user) }
it "does not work when in production mode" do
@@ -533,7 +532,7 @@ RSpec.describe SessionController do
end
end
- describe '#sso' do
+ describe "#sso" do
before do
SiteSetting.discourse_connect_url = "http://example.com/discourse_sso"
SiteSetting.enable_discourse_connect = true
@@ -547,7 +546,7 @@ RSpec.describe SessionController do
end
end
- describe '#sso_login' do
+ describe "#sso_login" do
before do
@sso_url = "http://example.com/discourse_sso"
@sso_secret = "shjkfdhsfkjh"
@@ -573,19 +572,17 @@ RSpec.describe SessionController do
sso
end
- context 'when in staff writes only mode' do
+ context "when in staff writes only mode" do
use_redis_snapshotting
- before do
- Discourse.enable_readonly_mode(Discourse::STAFF_WRITES_ONLY_MODE_KEY)
- end
+ before { Discourse.enable_readonly_mode(Discourse::STAFF_WRITES_ONLY_MODE_KEY) }
- it 'allows staff to login' do
- sso = get_sso('/a/')
- sso.external_id = '666'
- sso.email = 'bob@bob.com'
- sso.name = 'Bob Bobson'
- sso.username = 'bob'
+ it "allows staff to login" do
+ sso = get_sso("/a/")
+ sso.external_id = "666"
+ sso.email = "bob@bob.com"
+ sso.name = "Bob Bobson"
+ sso.username = "bob"
sso.admin = true
get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
@@ -595,11 +592,11 @@ RSpec.describe SessionController do
end
it 'doesn\'t allow non-staff to login' do
- sso = get_sso('/a/')
- sso.external_id = '666'
- sso.email = 'bob@bob.com'
- sso.name = 'Bob Bobson'
- sso.username = 'bob'
+ sso = get_sso("/a/")
+ sso.external_id = "666"
+ sso.email = "bob@bob.com"
+ sso.name = "Bob Bobson"
+ sso.username = "bob"
get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
@@ -608,103 +605,105 @@ RSpec.describe SessionController do
end
end
- it 'does not create superfluous auth tokens when already logged in' do
+ it "does not create superfluous auth tokens when already logged in" do
user = Fabricate(:user)
sign_in(user)
sso = get_sso("/")
sso.email = user.email
- sso.external_id = 'abc'
- sso.username = 'sam'
+ sso.external_id = "abc"
+ sso.username = "sam"
expect do
get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
logged_on_user = Discourse.current_user_provider.new(request.env).current_user
expect(logged_on_user.id).to eq(user.id)
end.not_to change { UserAuthToken.count }
-
end
- it 'will never redirect back to /session/sso path' do
+ it "will never redirect back to /session/sso path" do
sso = get_sso("/session/sso?bla=1")
sso.email = user.email
- sso.external_id = 'abc'
- sso.username = 'sam'
+ sso.external_id = "abc"
+ sso.username = "sam"
get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
- expect(response).to redirect_to('/')
+ expect(response).to redirect_to("/")
sso = get_sso("http://#{Discourse.current_hostname}/session/sso?bla=1")
sso.email = user.email
- sso.external_id = 'abc'
- sso.username = 'sam'
+ sso.external_id = "abc"
+ sso.username = "sam"
get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
- expect(response).to redirect_to('/')
-
+ expect(response).to redirect_to("/")
end
- it 'can handle invalid sso external ids due to blank' do
+ it "can handle invalid sso external ids due to blank" do
sso = get_sso("/")
sso.email = "test@test.com"
- sso.external_id = ' '
- sso.username = 'sam'
+ sso.external_id = " "
+ sso.username = "sam"
- logger = track_log_messages do
- get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
- end
+ logger =
+ track_log_messages do
+ get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
+ end
expect(logger.warnings.length).to eq(0)
expect(logger.errors.length).to eq(0)
expect(logger.fatals.length).to eq(0)
expect(response.status).to eq(500)
- expect(response.body).to include(I18n.t('discourse_connect.blank_id_error'))
+ expect(response.body).to include(I18n.t("discourse_connect.blank_id_error"))
end
- it 'can handle invalid sso email validation errors' do
+ it "can handle invalid sso email validation errors" do
SiteSetting.blocked_email_domains = "test.com"
sso = get_sso("/")
sso.email = "test@test.com"
- sso.external_id = '123'
- sso.username = 'sam'
+ sso.external_id = "123"
+ sso.username = "sam"
- logger = track_log_messages do
- get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
- end
+ logger =
+ track_log_messages do
+ get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
+ end
expect(logger.warnings.length).to eq(0)
expect(logger.errors.length).to eq(0)
expect(logger.fatals.length).to eq(0)
expect(response.status).to eq(500)
- expect(response.body).to include(I18n.t("discourse_connect.email_error", email: ERB::Util.html_escape("test@test.com")))
+ expect(response.body).to include(
+ I18n.t("discourse_connect.email_error", email: ERB::Util.html_escape("test@test.com")),
+ )
end
- it 'can handle invalid sso external ids due to banned word' do
+ it "can handle invalid sso external ids due to banned word" do
sso = get_sso("/")
sso.email = "test@test.com"
- sso.external_id = 'nil'
- sso.username = 'sam'
+ sso.external_id = "nil"
+ sso.username = "sam"
get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
expect(response.status).to eq(500)
end
- it 'can take over an account' do
- user = Fabricate(:user, email: 'bill@bill.com')
+ it "can take over an account" do
+ user = Fabricate(:user, email: "bill@bill.com")
sso = get_sso("/")
sso.email = user.email
- sso.external_id = 'abc'
- sso.username = 'sam'
+ sso.external_id = "abc"
+ sso.username = "sam"
get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
- expect(response).to redirect_to('/')
+ expect(response).to redirect_to("/")
logged_on_user = Discourse.current_user_provider.new(request.env).current_user
expect(logged_on_user.email).to eq(user.email)
expect(logged_on_user.single_sign_on_record.external_id).to eq("abc")
- expect(logged_on_user.single_sign_on_record.external_username).to eq('sam')
+ expect(logged_on_user.single_sign_on_record.external_username).to eq("sam")
# we are updating the email ... ensure auto group membership works
@@ -713,32 +712,37 @@ RSpec.describe SessionController do
SiteSetting.email_editable = false
SiteSetting.auth_overrides_email = true
- group = Fabricate(:group, name: :bob, automatic_membership_email_domains: 'jane.com')
+ group = Fabricate(:group, name: :bob, automatic_membership_email_domains: "jane.com")
sso = get_sso("/")
sso.email = "hello@jane.com"
- sso.external_id = 'abc'
+ sso.external_id = "abc"
get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
logged_on_user = Discourse.current_user_provider.new(request.env).current_user
- expect(logged_on_user.email).to eq('hello@jane.com')
+ expect(logged_on_user.email).to eq("hello@jane.com")
expect(group.users.count).to eq(1)
end
def sso_for_ip_specs
- sso = get_sso('/a/')
- sso.external_id = '666'
- sso.email = 'bob@bob.com'
- sso.name = 'Sam Saffron'
- sso.username = 'sam'
+ sso = get_sso("/a/")
+ sso.external_id = "666"
+ sso.email = "bob@bob.com"
+ sso.name = "Sam Saffron"
+ sso.username = "sam"
sso
end
- it 'respects IP restrictions on create' do
+ it "respects IP restrictions on create" do
ScreenedIpAddress.all.destroy_all
get "/"
- _screened_ip = Fabricate(:screened_ip_address, ip_address: request.remote_ip, action_type: ScreenedIpAddress.actions[:block])
+ _screened_ip =
+ Fabricate(
+ :screened_ip_address,
+ ip_address: request.remote_ip,
+ action_type: ScreenedIpAddress.actions[:block],
+ )
sso = sso_for_ip_specs
get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
@@ -747,40 +751,48 @@ RSpec.describe SessionController do
expect(logged_on_user).to eq(nil)
end
- it 'respects IP restrictions on login' do
+ it "respects IP restrictions on login" do
ScreenedIpAddress.all.destroy_all
get "/"
sso = sso_for_ip_specs
- DiscourseConnect.parse(sso.payload, secure_session: read_secure_session).lookup_or_create_user(request.remote_ip)
+ DiscourseConnect.parse(
+ sso.payload,
+ secure_session: read_secure_session,
+ ).lookup_or_create_user(request.remote_ip)
sso = sso_for_ip_specs
- _screened_ip = Fabricate(:screened_ip_address, ip_address: request.remote_ip, action_type: ScreenedIpAddress.actions[:block])
+ _screened_ip =
+ Fabricate(
+ :screened_ip_address,
+ ip_address: request.remote_ip,
+ action_type: ScreenedIpAddress.actions[:block],
+ )
get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
logged_on_user = Discourse.current_user_provider.new(request.env).current_user
expect(logged_on_user).to be_blank
end
- it 'respects email restrictions' do
- sso = get_sso('/a/')
- sso.external_id = '666'
- sso.email = 'bob@bob.com'
- sso.name = 'Sam Saffron'
- sso.username = 'sam'
+ it "respects email restrictions" do
+ sso = get_sso("/a/")
+ sso.external_id = "666"
+ sso.email = "bob@bob.com"
+ sso.name = "Sam Saffron"
+ sso.username = "sam"
- ScreenedEmail.block('bob@bob.com')
+ ScreenedEmail.block("bob@bob.com")
get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
logged_on_user = Discourse.current_user_provider.new(request.env).current_user
expect(logged_on_user).to eq(nil)
end
- it 'allows you to create an admin account' do
- sso = get_sso('/a/')
- sso.external_id = '666'
- sso.email = 'bob@bob.com'
- sso.name = 'Sam Saffron'
- sso.username = 'sam'
+ it "allows you to create an admin account" do
+ sso = get_sso("/a/")
+ sso.external_id = "666"
+ sso.email = "bob@bob.com"
+ sso.name = "Sam Saffron"
+ sso.username = "sam"
sso.custom_fields["shop_url"] = "http://my_shop.com"
sso.custom_fields["shop_name"] = "Sam"
sso.admin = true
@@ -791,80 +803,82 @@ RSpec.describe SessionController do
expect(logged_on_user.admin).to eq(true)
end
- it 'does not redirect offsite' do
+ it "does not redirect offsite" do
sso = get_sso("#{Discourse.base_url}//site.com/xyz")
- sso.external_id = '666'
- sso.email = 'bob@bob.com'
- sso.name = 'Sam Saffron'
- sso.username = 'sam'
+ sso.external_id = "666"
+ sso.email = "bob@bob.com"
+ sso.name = "Sam Saffron"
+ sso.username = "sam"
get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
expect(response).to redirect_to("#{Discourse.base_url}//site.com/xyz")
end
- it 'redirects to a non-relative url' do
+ it "redirects to a non-relative url" do
sso = get_sso("#{Discourse.base_url}/b/")
- sso.external_id = '666'
- sso.email = 'bob@bob.com'
- sso.name = 'Sam Saffron'
- sso.username = 'sam'
+ sso.external_id = "666"
+ sso.email = "bob@bob.com"
+ sso.name = "Sam Saffron"
+ sso.username = "sam"
get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
- expect(response).to redirect_to('/b/')
+ expect(response).to redirect_to("/b/")
end
- it 'redirects to random url if it is allowed' do
+ it "redirects to random url if it is allowed" do
SiteSetting.discourse_connect_allows_all_return_paths = true
- sso = get_sso('https://gusundtrout.com')
- sso.external_id = '666'
- sso.email = 'bob@bob.com'
- sso.name = 'Sam Saffron'
- sso.username = 'sam'
+ sso = get_sso("https://gusundtrout.com")
+ sso.external_id = "666"
+ sso.email = "bob@bob.com"
+ sso.name = "Sam Saffron"
+ sso.username = "sam"
get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
- expect(response).to redirect_to('https://gusundtrout.com')
+ expect(response).to redirect_to("https://gusundtrout.com")
end
- it 'redirects to root if the host of the return_path is different' do
- sso = get_sso('//eviltrout.com')
- sso.external_id = '666'
- sso.email = 'bob@bob.com'
- sso.name = 'Sam Saffron'
- sso.username = 'sam'
+ it "redirects to root if the host of the return_path is different" do
+ sso = get_sso("//eviltrout.com")
+ sso.external_id = "666"
+ sso.email = "bob@bob.com"
+ sso.name = "Sam Saffron"
+ sso.username = "sam"
get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
- expect(response).to redirect_to('/')
+ expect(response).to redirect_to("/")
end
- it 'redirects to root if the host of the return_path is different' do
- sso = get_sso('http://eviltrout.com')
- sso.external_id = '666'
- sso.email = 'bob@bob.com'
- sso.name = 'Sam Saffron'
- sso.username = 'sam'
+ it "redirects to root if the host of the return_path is different" do
+ sso = get_sso("http://eviltrout.com")
+ sso.external_id = "666"
+ sso.email = "bob@bob.com"
+ sso.name = "Sam Saffron"
+ sso.username = "sam"
get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
- expect(response).to redirect_to('/')
+ expect(response).to redirect_to("/")
end
- it 'creates a user but ignores auto_approve_email_domains site setting when must_approve_users site setting is not enabled' do
+ it "creates a user but ignores auto_approve_email_domains site setting when must_approve_users site setting is not enabled" do
SiteSetting.auto_approve_email_domains = "discourse.com"
- sso = get_sso('/a/')
- sso.external_id = '666'
- sso.email = 'sam@discourse.com'
- sso.name = 'Sam Saffron'
- sso.username = 'sam'
+ sso = get_sso("/a/")
+ sso.external_id = "666"
+ sso.email = "sam@discourse.com"
+ sso.name = "Sam Saffron"
+ sso.username = "sam"
- events = DiscourseEvent.track_events do
- get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
+ events =
+ DiscourseEvent.track_events do
+ get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
- expect(response).to redirect_to('/a/')
- end
+ expect(response).to redirect_to("/a/")
+ end
expect(events.map { |event| event[:event_name] }).to include(
- :user_logged_in, :user_first_logged_in
+ :user_logged_in,
+ :user_first_logged_in,
)
logged_on_user = Discourse.current_user_provider.new(request.env).current_user
@@ -873,29 +887,27 @@ RSpec.describe SessionController do
logged_on_user = User.find(logged_on_user.id)
expect(logged_on_user.admin).to eq(false)
- expect(logged_on_user.email).to eq('sam@discourse.com')
- expect(logged_on_user.name).to eq('Sam Saffron')
- expect(logged_on_user.username).to eq('sam')
+ expect(logged_on_user.email).to eq("sam@discourse.com")
+ expect(logged_on_user.name).to eq("Sam Saffron")
+ expect(logged_on_user.username).to eq("sam")
expect(logged_on_user.approved).to eq(false)
expect(logged_on_user.active).to eq(true)
expect(logged_on_user.single_sign_on_record.external_id).to eq("666")
- expect(logged_on_user.single_sign_on_record.external_username).to eq('sam')
+ expect(logged_on_user.single_sign_on_record.external_username).to eq("sam")
end
- context 'when must_approve_users site setting has been enabled' do
- before do
- SiteSetting.must_approve_users = true
- end
+ context "when must_approve_users site setting has been enabled" do
+ before { SiteSetting.must_approve_users = true }
it "creates a user but does not approve when user's email domain does not match a domain in auto_approve_email_domains site settings" do
SiteSetting.auto_approve_email_domains = "discourse.com"
- sso = get_sso('/a/')
- sso.external_id = '666'
- sso.email = 'sam@discourse.org'
- sso.name = 'Sam Saffron'
- sso.username = 'sam'
+ sso = get_sso("/a/")
+ sso.external_id = "666"
+ sso.email = "sam@discourse.org"
+ sso.name = "Sam Saffron"
+ sso.username = "sam"
expect do
get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
@@ -911,33 +923,35 @@ RSpec.describe SessionController do
user = User.last
expect(user.admin).to eq(false)
- expect(user.email).to eq('sam@discourse.org')
- expect(user.name).to eq('Sam Saffron')
- expect(user.username).to eq('sam')
+ expect(user.email).to eq("sam@discourse.org")
+ expect(user.name).to eq("Sam Saffron")
+ expect(user.username).to eq("sam")
expect(user.approved).to eq(false)
expect(user.active).to eq(true)
expect(user.single_sign_on_record.external_id).to eq("666")
- expect(user.single_sign_on_record.external_username).to eq('sam')
+ expect(user.single_sign_on_record.external_username).to eq("sam")
end
it "creates and approves a user when user's email domain matches a domain in auto_approve_email_domains site settings" do
SiteSetting.auto_approve_email_domains = "discourse.com"
- sso = get_sso('/a/')
- sso.external_id = '666'
- sso.email = 'sam@discourse.com'
- sso.name = 'Sam Saffron'
- sso.username = 'sam'
+ sso = get_sso("/a/")
+ sso.external_id = "666"
+ sso.email = "sam@discourse.com"
+ sso.name = "Sam Saffron"
+ sso.username = "sam"
- events = DiscourseEvent.track_events do
- get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
+ events =
+ DiscourseEvent.track_events do
+ get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
- expect(response).to redirect_to('/a/')
- end
+ expect(response).to redirect_to("/a/")
+ end
expect(events.map { |event| event[:event_name] }).to include(
- :user_logged_in, :user_first_logged_in
+ :user_logged_in,
+ :user_first_logged_in,
)
logged_on_user = Discourse.current_user_provider.new(request.env).current_user
@@ -946,38 +960,39 @@ RSpec.describe SessionController do
logged_on_user = User.find(logged_on_user.id)
expect(logged_on_user.admin).to eq(false)
- expect(logged_on_user.email).to eq('sam@discourse.com')
- expect(logged_on_user.name).to eq('Sam Saffron')
- expect(logged_on_user.username).to eq('sam')
+ expect(logged_on_user.email).to eq("sam@discourse.com")
+ expect(logged_on_user.name).to eq("Sam Saffron")
+ expect(logged_on_user.username).to eq("sam")
expect(logged_on_user.approved).to eq(true)
expect(logged_on_user.active).to eq(true)
expect(logged_on_user.single_sign_on_record.external_id).to eq("666")
- expect(logged_on_user.single_sign_on_record.external_username).to eq('sam')
+ expect(logged_on_user.single_sign_on_record.external_username).to eq("sam")
end
-
end
- it 'allows you to create an account' do
- group = Fabricate(:group, name: :bob, automatic_membership_email_domains: 'bob.com')
+ it "allows you to create an account" do
+ group = Fabricate(:group, name: :bob, automatic_membership_email_domains: "bob.com")
- sso = get_sso('/a/')
- sso.external_id = '666'
- sso.email = 'bob@bob.com'
- sso.name = 'Sam Saffron'
- sso.username = 'sam'
+ sso = get_sso("/a/")
+ sso.external_id = "666"
+ sso.email = "bob@bob.com"
+ sso.name = "Sam Saffron"
+ sso.username = "sam"
sso.custom_fields["shop_url"] = "http://my_shop.com"
sso.custom_fields["shop_name"] = "Sam"
- events = DiscourseEvent.track_events do
- get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
- end
+ events =
+ DiscourseEvent.track_events do
+ get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
+ end
expect(events.map { |event| event[:event_name] }).to include(
- :user_logged_in, :user_first_logged_in
+ :user_logged_in,
+ :user_first_logged_in,
)
- expect(response).to redirect_to('/a/')
+ expect(response).to redirect_to("/a/")
logged_on_user = Discourse.current_user_provider.new(request.env).current_user
@@ -987,12 +1002,12 @@ RSpec.describe SessionController do
logged_on_user = User.find(logged_on_user.id)
expect(logged_on_user.admin).to eq(false)
- expect(logged_on_user.email).to eq('bob@bob.com')
- expect(logged_on_user.name).to eq('Sam Saffron')
- expect(logged_on_user.username).to eq('sam')
+ expect(logged_on_user.email).to eq("bob@bob.com")
+ expect(logged_on_user.name).to eq("Sam Saffron")
+ expect(logged_on_user.username).to eq("sam")
expect(logged_on_user.single_sign_on_record.external_id).to eq("666")
- expect(logged_on_user.single_sign_on_record.external_username).to eq('sam')
+ expect(logged_on_user.single_sign_on_record.external_username).to eq("sam")
expect(logged_on_user.active).to eq(true)
expect(logged_on_user.custom_fields["shop_url"]).to eq("http://my_shop.com")
expect(logged_on_user.custom_fields["shop_name"]).to eq("Sam")
@@ -1035,7 +1050,13 @@ RSpec.describe SessionController do
invite.update!(max_redemptions_allowed: 1, redemption_count: 1)
login_with_sso_and_invite
expect(response.status).to eq(400)
- expect(response.body).to include(I18n.t("invite.not_found_template", site_name: SiteSetting.title, base_url: Discourse.base_url))
+ expect(response.body).to include(
+ I18n.t(
+ "invite.not_found_template",
+ site_name: SiteSetting.title,
+ base_url: Discourse.base_url,
+ ),
+ )
expect(invite.reload.redeemed?).to eq(true)
expect(User.find_by_email("bob@bob.com")).to eq(nil)
end
@@ -1044,7 +1065,9 @@ RSpec.describe SessionController do
invite.update!(email: "someotheremail@dave.com")
login_with_sso_and_invite
expect(response.status).to eq(400)
- expect(response.body).to include(I18n.t("invite.not_matching_email", base_url: Discourse.base_url))
+ expect(response.body).to include(
+ I18n.t("invite.not_matching_email", base_url: Discourse.base_url),
+ )
expect(invite.reload.redeemed?).to eq(false)
expect(User.find_by_email("bob@bob.com")).to eq(nil)
end
@@ -1095,14 +1118,14 @@ RSpec.describe SessionController do
end
end
- context 'when sso emails are not trusted' do
- context 'if you have not activated your account' do
- it 'does not log you in' do
- sso = get_sso('/a/')
- sso.external_id = '666'
- sso.email = 'bob@bob.com'
- sso.name = 'Sam Saffron'
- sso.username = 'sam'
+ context "when sso emails are not trusted" do
+ context "if you have not activated your account" do
+ it "does not log you in" do
+ sso = get_sso("/a/")
+ sso.external_id = "666"
+ sso.email = "bob@bob.com"
+ sso.name = "Sam Saffron"
+ sso.username = "sam"
sso.require_activation = true
get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
@@ -1111,12 +1134,12 @@ RSpec.describe SessionController do
expect(logged_on_user).to eq(nil)
end
- it 'sends an activation email' do
- sso = get_sso('/a/')
- sso.external_id = '666'
- sso.email = 'bob@bob.com'
- sso.name = 'Sam Saffron'
- sso.username = 'sam'
+ it "sends an activation email" do
+ sso = get_sso("/a/")
+ sso.external_id = "666"
+ sso.email = "bob@bob.com"
+ sso.name = "Sam Saffron"
+ sso.username = "sam"
sso.require_activation = true
get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
@@ -1124,15 +1147,15 @@ RSpec.describe SessionController do
end
end
- context 'if you have activated your account' do
- it 'allows you to log in' do
- sso = get_sso('/hello/world')
- sso.external_id = '997'
+ context "if you have activated your account" do
+ it "allows you to log in" do
+ sso = get_sso("/hello/world")
+ sso.external_id = "997"
sso.sso_url = "http://somewhere.over.com/sso_login"
sso.require_activation = true
user = Fabricate(:user)
- user.create_single_sign_on_record(external_id: '997', last_payload: '')
+ user.create_single_sign_on_record(external_id: "997", last_payload: "")
user.stubs(:active?).returns(true)
get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
@@ -1143,20 +1166,20 @@ RSpec.describe SessionController do
end
end
- it 'allows login to existing account with valid nonce' do
- sso = get_sso('/hello/world')
- sso.external_id = '997'
+ it "allows login to existing account with valid nonce" do
+ sso = get_sso("/hello/world")
+ sso.external_id = "997"
sso.sso_url = "http://somewhere.over.com/sso_login"
user = Fabricate(:user)
- user.create_single_sign_on_record(external_id: '997', last_payload: '')
+ user.create_single_sign_on_record(external_id: "997", last_payload: "")
get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
user.single_sign_on_record.reload
expect(user.single_sign_on_record.last_payload).to eq(sso.unsigned_payload)
- expect(response).to redirect_to('/hello/world')
+ expect(response).to redirect_to("/hello/world")
logged_on_user = Discourse.current_user_provider.new(request.env).current_user
expect(user.id).to eq(logged_on_user.id)
@@ -1166,13 +1189,13 @@ RSpec.describe SessionController do
expect(response.status).to eq(419)
end
- it 'associates the nonce with the current session' do
- sso = get_sso('/hello/world')
- sso.external_id = '997'
+ it "associates the nonce with the current session" do
+ sso = get_sso("/hello/world")
+ sso.external_id = "997"
sso.sso_url = "http://somewhere.over.com/sso_login"
user = Fabricate(:user)
- user.create_single_sign_on_record(external_id: '997', last_payload: '')
+ user.create_single_sign_on_record(external_id: "997", last_payload: "")
# Establish a fresh session
cookies.to_hash.keys.each { |k| cookies.delete(k) }
@@ -1184,56 +1207,60 @@ RSpec.describe SessionController do
context "when sso provider is enabled" do
before do
SiteSetting.enable_discourse_connect_provider = true
- SiteSetting.discourse_connect_provider_secrets = [
- "*|secret,forAll",
- "*.rainbow|wrongSecretForOverRainbow",
- "www.random.site|secretForRandomSite",
- "somewhere.over.rainbow|secretForOverRainbow",
+ SiteSetting.discourse_connect_provider_secrets = %w[
+ *|secret,forAll
+ *.rainbow|wrongSecretForOverRainbow
+ www.random.site|secretForRandomSite
+ somewhere.over.rainbow|secretForOverRainbow
].join("\n")
end
it "doesn't break" do
- sso = get_sso('/hello/world')
- sso.external_id = '997'
+ sso = get_sso("/hello/world")
+ sso.external_id = "997"
sso.sso_url = "http://somewhere.over.com/sso_login"
sso.return_sso_url = "http://someurl.com"
user = Fabricate(:user)
- user.create_single_sign_on_record(external_id: '997', last_payload: '')
+ user.create_single_sign_on_record(external_id: "997", last_payload: "")
get "/session/sso_login", params: Rack::Utils.parse_query(sso.payload), headers: headers
user.single_sign_on_record.reload
expect(user.single_sign_on_record.last_payload).to eq(sso.unsigned_payload)
- expect(response).to redirect_to('/hello/world')
+ expect(response).to redirect_to("/hello/world")
logged_on_user = Discourse.current_user_provider.new(request.env).current_user
expect(user.id).to eq(logged_on_user.id)
end
end
- it 'returns the correct error code for invalid signature' do
- sso = get_sso('/hello/world')
- sso.external_id = '997'
+ it "returns the correct error code for invalid signature" do
+ sso = get_sso("/hello/world")
+ sso.external_id = "997"
sso.sso_url = "http://somewhere.over.com/sso_login"
correct_params = Rack::Utils.parse_query(sso.payload)
- get "/session/sso_login", params: correct_params.merge("sig": "thisisnotthesigyouarelookingfor"), headers: headers
+ get "/session/sso_login",
+ params: correct_params.merge(sig: "thisisnotthesigyouarelookingfor"),
+ headers: headers
expect(response.status).to eq(422)
expect(response.body).not_to include(correct_params["sig"]) # Check we didn't send the real sig back to the client
logged_on_user = Discourse.current_user_provider.new(request.env).current_user
expect(logged_on_user).to eq(nil)
correct_params = Rack::Utils.parse_query(sso.payload)
- get "/session/sso_login", params: correct_params.merge("sig": "thisisasignaturewith@special!characters"), headers: headers
+ get "/session/sso_login",
+ params: correct_params.merge(sig: "thisisasignaturewith@special!characters"),
+ headers: headers
expect(response.status).to eq(422)
expect(response.body).not_to include(correct_params["sig"]) # Check we didn't send the real sig back to the client
logged_on_user = Discourse.current_user_provider.new(request.env).current_user
expect(logged_on_user).to eq(nil)
end
- describe 'local attribute override from SSO payload' do
+ describe "local attribute override from SSO payload" do
before do
SiteSetting.email_editable = false
SiteSetting.auth_overrides_email = true
@@ -1242,8 +1269,8 @@ RSpec.describe SessionController do
@user = Fabricate(:user)
- @sso = get_sso('/hello/world')
- @sso.external_id = '997'
+ @sso = get_sso("/hello/world")
+ @sso.external_id = "997"
@reversed_username = @user.username.reverse
@sso.username = @reversed_username
@@ -1253,10 +1280,10 @@ RSpec.describe SessionController do
@suggested_username = UserNameSuggester.suggest(@sso.username || @sso.name || @sso.email)
@suggested_name = User.suggest_name(@sso.name || @sso.username || @sso.email)
- @user.create_single_sign_on_record(external_id: '997', last_payload: '')
+ @user.create_single_sign_on_record(external_id: "997", last_payload: "")
end
- it 'stores the external attributes' do
+ it "stores the external attributes" do
get "/session/sso_login", params: Rack::Utils.parse_query(@sso.payload), headers: headers
@user.single_sign_on_record.reload
expect(@user.single_sign_on_record.external_username).to eq(@sso.username)
@@ -1264,7 +1291,7 @@ RSpec.describe SessionController do
expect(@user.single_sign_on_record.external_name).to eq(@sso.name)
end
- it 'overrides attributes' do
+ it "overrides attributes" do
get "/session/sso_login", params: Rack::Utils.parse_query(@sso.payload), headers: headers
logged_on_user = Discourse.current_user_provider.new(request.env).current_user
@@ -1273,7 +1300,7 @@ RSpec.describe SessionController do
expect(logged_on_user.name).to eq(@sso.name)
end
- it 'does not change matching attributes for an existing account' do
+ it "does not change matching attributes for an existing account" do
@sso.username = @user.username
@sso.name = @user.name
@sso.email = @user.email
@@ -1290,9 +1317,7 @@ RSpec.describe SessionController do
context "when in readonly mode" do
use_redis_snapshotting
- before do
- Discourse.enable_readonly_mode
- end
+ before { Discourse.enable_readonly_mode }
it "disallows requests" do
get "/session/sso_login"
@@ -1302,27 +1327,27 @@ RSpec.describe SessionController do
end
end
- describe '#sso_provider' do
+ describe "#sso_provider" do
let(:headers) { { host: Discourse.current_hostname } }
let(:logo_fixture) { "http://#{Discourse.current_hostname}/uploads/logo.png" }
fab!(:user) { Fabricate(:user, password: "myfrogs123ADMIN", active: true, admin: true) }
before do
- stub_request(:any, /#{Discourse.current_hostname}\/uploads/).to_return(
+ stub_request(:any, %r{#{Discourse.current_hostname}/uploads}).to_return(
status: 200,
- body: lambda { |request| file_from_fixtures("logo.png") }
+ body: lambda { |request| file_from_fixtures("logo.png") },
)
SiteSetting.enable_discourse_connect_provider = true
SiteSetting.enable_discourse_connect = false
SiteSetting.enable_local_logins = true
- SiteSetting.discourse_connect_provider_secrets = [
- "*|secret,forAll",
- "*.rainbow|wrongSecretForOverRainbow",
- "www.random.site|secretForRandomSite",
- "somewhere.over.rainbow|oldSecretForOverRainbow",
- "somewhere.over.rainbow|secretForOverRainbow",
- "somewhere.over.rainbow|newSecretForOverRainbow",
+ SiteSetting.discourse_connect_provider_secrets = %w[
+ *|secret,forAll
+ *.rainbow|wrongSecretForOverRainbow
+ www.random.site|secretForRandomSite
+ somewhere.over.rainbow|oldSecretForOverRainbow
+ somewhere.over.rainbow|secretForOverRainbow
+ somewhere.over.rainbow|newSecretForOverRainbow
].join("\n")
@sso = DiscourseConnectProvider.new
@@ -1344,18 +1369,24 @@ RSpec.describe SessionController do
EmailToken.update_all(confirmed: true)
end
- describe 'can act as an SSO provider' do
+ describe "can act as an SSO provider" do
it "successfully logs in and redirects user to return_sso_url when the user is not logged in" do
- get "/session/sso_provider", params: Rack::Utils.parse_query(@sso.payload("secretForOverRainbow"))
+ get "/session/sso_provider",
+ params: Rack::Utils.parse_query(@sso.payload("secretForOverRainbow"))
expect(response).to redirect_to("/login")
post "/session.json",
- params: { login: @user.username, password: "myfrogs123ADMIN" }, xhr: true, headers: headers
+ params: {
+ login: @user.username,
+ password: "myfrogs123ADMIN",
+ },
+ xhr: true,
+ headers: headers
location = response.cookies["sso_destination_url"]
# javascript code will handle redirection of user to return_sso_url
- expect(location).to match(/^http:\/\/somewhere.over.rainbow\/sso/)
+ expect(location).to match(%r{^http://somewhere.over.rainbow/sso})
payload = location.split("?")[1]
sso2 = DiscourseConnectProvider.parse(payload)
@@ -1382,25 +1413,30 @@ RSpec.describe SessionController do
it "correctly logs in for secondary domain secrets" do
sign_in @user
- get "/session/sso_provider", params: Rack::Utils.parse_query(@sso.payload("newSecretForOverRainbow"))
+ get "/session/sso_provider",
+ params: Rack::Utils.parse_query(@sso.payload("newSecretForOverRainbow"))
expect(response.status).to eq(302)
redirect_uri = URI.parse(response.location)
expect(redirect_uri.host).to eq("somewhere.over.rainbow")
redirect_query = CGI.parse(redirect_uri.query)
- expected_sig = DiscourseConnectBase.sign(redirect_query["sso"][0], "newSecretForOverRainbow")
+ expected_sig =
+ DiscourseConnectBase.sign(redirect_query["sso"][0], "newSecretForOverRainbow")
expect(redirect_query["sig"][0]).to eq(expected_sig)
- get "/session/sso_provider", params: Rack::Utils.parse_query(@sso.payload("oldSecretForOverRainbow"))
+ get "/session/sso_provider",
+ params: Rack::Utils.parse_query(@sso.payload("oldSecretForOverRainbow"))
expect(response.status).to eq(302)
redirect_uri = URI.parse(response.location)
expect(redirect_uri.host).to eq("somewhere.over.rainbow")
redirect_query = CGI.parse(redirect_uri.query)
- expected_sig = DiscourseConnectBase.sign(redirect_query["sso"][0], "oldSecretForOverRainbow")
+ expected_sig =
+ DiscourseConnectBase.sign(redirect_query["sso"][0], "oldSecretForOverRainbow")
expect(redirect_query["sig"][0]).to eq(expected_sig)
end
it "it fails to log in if secret is wrong" do
- get "/session/sso_provider", params: Rack::Utils.parse_query(@sso.payload("secretForRandomSite"))
+ get "/session/sso_provider",
+ params: Rack::Utils.parse_query(@sso.payload("secretForRandomSite"))
expect(response.status).to eq(422)
end
@@ -1423,10 +1459,11 @@ RSpec.describe SessionController do
it "successfully redirects user to return_sso_url when the user is logged in" do
sign_in(@user)
- get "/session/sso_provider", params: Rack::Utils.parse_query(@sso.payload("secretForOverRainbow"))
+ get "/session/sso_provider",
+ params: Rack::Utils.parse_query(@sso.payload("secretForOverRainbow"))
location = response.header["Location"]
- expect(location).to match(/^http:\/\/somewhere.over.rainbow\/sso/)
+ expect(location).to match(%r{^http://somewhere.over.rainbow/sso})
payload = location.split("?")[1]
sso2 = DiscourseConnectProvider.parse(payload)
@@ -1450,22 +1487,33 @@ RSpec.describe SessionController do
expect(sso2.no_2fa_methods).to eq(nil)
end
- it 'handles non local content correctly' do
+ it "handles non local content correctly" do
SiteSetting.avatar_sizes = "100|49"
setup_s3
SiteSetting.s3_cdn_url = "http://cdn.com"
- stub_request(:any, /s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/).to_return(status: 200, body: "", headers: { referer: "fgdfds" })
+ stub_request(:any, /s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/).to_return(
+ status: 200,
+ body: "",
+ headers: {
+ referer: "fgdfds",
+ },
+ )
@user.create_user_avatar!
- upload = Fabricate(:upload, url: "//s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/something")
+ upload =
+ Fabricate(
+ :upload,
+ url: "//s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/something",
+ )
- Fabricate(:optimized_image,
+ Fabricate(
+ :optimized_image,
sha1: SecureRandom.hex << "A" * 8,
upload: upload,
width: 98,
height: 98,
- url: "//s3-upload-bucket.s3.amazonaws.com/something/else"
+ url: "//s3-upload-bucket.s3.amazonaws.com/something/else",
)
@user.update_columns(uploaded_avatar_id: upload.id)
@@ -1475,7 +1523,7 @@ RSpec.describe SessionController do
@user.user_profile.update!(
profile_background_upload: upload1,
- card_background_upload: upload2
+ card_background_upload: upload2,
)
@user.reload
@@ -1485,14 +1533,15 @@ RSpec.describe SessionController do
sign_in(@user)
stub_request(:get, "http://cdn.com/something/else").to_return(
- body: lambda { |request| File.new(Rails.root + 'spec/fixtures/images/logo.png') }
+ body: lambda { |request| File.new(Rails.root + "spec/fixtures/images/logo.png") },
)
- get "/session/sso_provider", params: Rack::Utils.parse_query(@sso.payload("secretForOverRainbow"))
+ get "/session/sso_provider",
+ params: Rack::Utils.parse_query(@sso.payload("secretForOverRainbow"))
location = response.header["Location"]
# javascript code will handle redirection of user to return_sso_url
- expect(location).to match(/^http:\/\/somewhere.over.rainbow\/sso/)
+ expect(location).to match(%r{^http://somewhere.over.rainbow/sso})
payload = location.split("?")[1]
sso2 = DiscourseConnectProvider.parse(payload)
@@ -1512,10 +1561,11 @@ RSpec.describe SessionController do
sign_in(@user)
@sso.logout = true
- get "/session/sso_provider", params: Rack::Utils.parse_query(@sso.payload("secretForOverRainbow"))
+ get "/session/sso_provider",
+ params: Rack::Utils.parse_query(@sso.payload("secretForOverRainbow"))
location = response.header["Location"]
- expect(location).to match(/^http:\/\/somewhere.over.rainbow\/sso$/)
+ expect(location).to match(%r{^http://somewhere.over.rainbow/sso$})
expect(response.status).to eq(302)
expect(session[:current_user_id]).to be_blank
@@ -1524,10 +1574,11 @@ RSpec.describe SessionController do
it "successfully logs out and redirects user to return_sso_url when the user is not logged in" do
@sso.logout = true
- get "/session/sso_provider", params: Rack::Utils.parse_query(@sso.payload("secretForOverRainbow"))
+ get "/session/sso_provider",
+ params: Rack::Utils.parse_query(@sso.payload("secretForOverRainbow"))
location = response.header["Location"]
- expect(location).to match(/^http:\/\/somewhere.over.rainbow\/sso$/)
+ expect(location).to match(%r{^http://somewhere.over.rainbow/sso$})
expect(response.status).to eq(302)
expect(session[:current_user_id]).to be_blank
@@ -1535,13 +1586,14 @@ RSpec.describe SessionController do
end
end
- describe 'can act as a 2FA provider' do
+ describe "can act as a 2FA provider" do
fab!(:user_totp) { Fabricate(:user_second_factor_totp, user: user) }
before { @sso.require_2fa = true }
- it 'requires the user to confirm 2FA before they are redirected to the SSO return URL' do
+ it "requires the user to confirm 2FA before they are redirected to the SSO return URL" do
sign_in(user)
- get "/session/sso_provider", params: Rack::Utils.parse_query(@sso.payload("secretForOverRainbow"))
+ get "/session/sso_provider",
+ params: Rack::Utils.parse_query(@sso.payload("secretForOverRainbow"))
uri = URI(response.location)
expect(uri.hostname).to eq(Discourse.current_hostname)
expect(uri.path).to eq("/session/2fa")
@@ -1549,38 +1601,36 @@ RSpec.describe SessionController do
expect(nonce).to be_present
# attempt no. 1 to bypass 2fa
- get "/session/sso_provider", params: {
- second_factor_nonce: nonce
- }
+ get "/session/sso_provider", params: { second_factor_nonce: nonce }
expect(response.status).to eq(401)
expect(response.parsed_body["error"]).to eq(
- I18n.t("second_factor_auth.challenge_not_completed")
+ I18n.t("second_factor_auth.challenge_not_completed"),
)
# attempt no. 2 to bypass 2fa
- get "/session/sso_provider", params: {
- second_factor_nonce: nonce
- }.merge(Rack::Utils.parse_query(@sso.payload("secretForOverRainbow")))
+ get "/session/sso_provider",
+ params: { second_factor_nonce: nonce }.merge(
+ Rack::Utils.parse_query(@sso.payload("secretForOverRainbow")),
+ )
expect(response.status).to eq(401)
expect(response.parsed_body["error"]).to eq(
- I18n.t("second_factor_auth.challenge_not_completed")
+ I18n.t("second_factor_auth.challenge_not_completed"),
)
# confirm 2fa
- post "/session/2fa.json", params: {
- nonce: nonce,
- second_factor_token: ROTP::TOTP.new(user_totp.data).now,
- second_factor_method: UserSecondFactor.methods[:totp]
- }
+ post "/session/2fa.json",
+ params: {
+ nonce: nonce,
+ second_factor_token: ROTP::TOTP.new(user_totp.data).now,
+ second_factor_method: UserSecondFactor.methods[:totp],
+ }
expect(response.status).to eq(200)
expect(response.parsed_body["ok"]).to eq(true)
expect(response.parsed_body["callback_method"]).to eq("GET")
expect(response.parsed_body["callback_path"]).to eq("/session/sso_provider")
expect(response.parsed_body["redirect_url"]).to be_blank
- get "/session/sso_provider", params: {
- second_factor_nonce: nonce
- }
+ get "/session/sso_provider", params: { second_factor_nonce: nonce }
expect(response.status).to eq(200)
expect(response.parsed_body["success"]).to eq("OK")
redirect_url = response.parsed_body["redirect_url"]
@@ -1595,34 +1645,38 @@ RSpec.describe SessionController do
it "doesn't accept backup codes" do
backup_codes = user.generate_backup_codes
sign_in(user)
- get "/session/sso_provider", params: Rack::Utils.parse_query(@sso.payload("secretForOverRainbow"))
+ get "/session/sso_provider",
+ params: Rack::Utils.parse_query(@sso.payload("secretForOverRainbow"))
uri = URI(response.location)
expect(uri.hostname).to eq(Discourse.current_hostname)
expect(uri.path).to eq("/session/2fa")
nonce = uri.query.match(/\Anonce=([A-Za-z0-9]{32})\Z/)[1]
expect(nonce).to be_present
- post "/session/2fa.json", params: {
- nonce: nonce,
- second_factor_token: backup_codes.sample,
- second_factor_method: UserSecondFactor.methods[:backup_codes]
- }
+ post "/session/2fa.json",
+ params: {
+ nonce: nonce,
+ second_factor_token: backup_codes.sample,
+ second_factor_method: UserSecondFactor.methods[:backup_codes],
+ }
expect(response.status).to eq(403)
- get "/session/sso_provider", params: {
- second_factor_nonce: nonce
- }
+ get "/session/sso_provider", params: { second_factor_nonce: nonce }
expect(response.status).to eq(401)
expect(response.parsed_body["error"]).to eq(
- I18n.t("second_factor_auth.challenge_not_completed")
+ I18n.t("second_factor_auth.challenge_not_completed"),
)
end
- context 'when the user has no 2fa methods' do
- before { user_totp.destroy!; user.reload }
+ context "when the user has no 2fa methods" do
+ before do
+ user_totp.destroy!
+ user.reload
+ end
- it 'redirects the user back to the SSO return url and indicates in the payload that they do not have 2fa methods' do
+ it "redirects the user back to the SSO return url and indicates in the payload that they do not have 2fa methods" do
sign_in(user)
- get "/session/sso_provider", params: Rack::Utils.parse_query(@sso.payload("secretForOverRainbow"))
+ get "/session/sso_provider",
+ params: Rack::Utils.parse_query(@sso.payload("secretForOverRainbow"))
expect(response.status).to eq(302)
redirect_url = response.location
@@ -1635,22 +1689,27 @@ RSpec.describe SessionController do
end
end
- context 'when there is no logged in user' do
+ context "when there is no logged in user" do
it "redirects the user to login first" do
- get "/session/sso_provider", params: Rack::Utils.parse_query(@sso.payload("secretForOverRainbow"))
+ get "/session/sso_provider",
+ params: Rack::Utils.parse_query(@sso.payload("secretForOverRainbow"))
expect(response.status).to eq(302)
expect(response.location).to eq("http://#{Discourse.current_hostname}/login")
end
it "doesn't make the user confirm 2fa twice if they've just logged in and confirmed 2fa while doing so" do
- get "/session/sso_provider", params: Rack::Utils.parse_query(@sso.payload("secretForOverRainbow"))
+ get "/session/sso_provider",
+ params: Rack::Utils.parse_query(@sso.payload("secretForOverRainbow"))
- post "/session.json", params: {
- login: user.username,
- password: "myfrogs123ADMIN",
- second_factor_token: ROTP::TOTP.new(user_totp.data).now,
- second_factor_method: UserSecondFactor.methods[:totp]
- }, xhr: true, headers: headers
+ post "/session.json",
+ params: {
+ login: user.username,
+ password: "myfrogs123ADMIN",
+ second_factor_token: ROTP::TOTP.new(user_totp.data).now,
+ second_factor_method: UserSecondFactor.methods[:totp],
+ },
+ xhr: true,
+ headers: headers
expect(response.status).to eq(204)
# the frontend will take care of actually redirecting the user
redirect_url = response.cookies["sso_destination_url"]
@@ -1665,12 +1724,16 @@ RSpec.describe SessionController do
it "doesn't indicate the user has confirmed 2fa after they've logged in if they have no 2fa methods" do
user_totp.destroy!
user.reload
- get "/session/sso_provider", params: Rack::Utils.parse_query(@sso.payload("secretForOverRainbow"))
+ get "/session/sso_provider",
+ params: Rack::Utils.parse_query(@sso.payload("secretForOverRainbow"))
- post "/session.json", params: {
- login: user.username,
- password: "myfrogs123ADMIN",
- }, xhr: true, headers: headers
+ post "/session.json",
+ params: {
+ login: user.username,
+ password: "myfrogs123ADMIN",
+ },
+ xhr: true,
+ headers: headers
redirect_url = response.cookies["sso_destination_url"]
expect(redirect_url).to start_with("http://somewhere.over.rainbow/sso?sso=")
sso = DiscourseConnectProvider.parse(URI(redirect_url).query)
@@ -1683,8 +1746,8 @@ RSpec.describe SessionController do
end
end
- describe '#create' do
- context 'when read only mode' do
+ describe "#create" do
+ context "when read only mode" do
use_redis_snapshotting
before do
@@ -1693,22 +1756,18 @@ RSpec.describe SessionController do
EmailToken.confirm(admin_email_token.token)
end
- it 'prevents login by regular users' do
- post "/session.json", params: {
- login: user.username, password: 'myawesomepassword'
- }
+ it "prevents login by regular users" do
+ post "/session.json", params: { login: user.username, password: "myawesomepassword" }
expect(response.status).not_to eq(200)
end
- it 'prevents login by admins' do
- post "/session.json", params: {
- login: user.username, password: 'myawesomepassword'
- }
+ it "prevents login by admins" do
+ post "/session.json", params: { login: user.username, password: "myawesomepassword" }
expect(response.status).not_to eq(200)
end
end
- context 'when in staff writes only mode' do
+ context "when in staff writes only mode" do
use_redis_snapshotting
before do
@@ -1717,155 +1776,144 @@ RSpec.describe SessionController do
EmailToken.confirm(admin_email_token.token)
end
- it 'allows admin login' do
- post "/session.json", params: {
- login: admin.username, password: 'myawesomepassword'
- }
+ it "allows admin login" do
+ post "/session.json", params: { login: admin.username, password: "myawesomepassword" }
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).not_to be_present
+ expect(response.parsed_body["error"]).not_to be_present
end
- it 'prevents login by regular users' do
- post "/session.json", params: {
- login: user.username, password: 'myawesomepassword'
- }
+ it "prevents login by regular users" do
+ post "/session.json", params: { login: user.username, password: "myawesomepassword" }
expect(response.status).not_to eq(200)
end
end
- context 'when local login is disabled' do
+ context "when local login is disabled" do
before do
SiteSetting.enable_local_logins = false
- post "/session.json", params: {
- login: user.username, password: 'myawesomepassword'
- }
+ post "/session.json", params: { login: user.username, password: "myawesomepassword" }
end
it_behaves_like "failed to continue local login"
end
- context 'when SSO is enabled' do
+ context "when SSO is enabled" do
before do
SiteSetting.discourse_connect_url = "https://www.example.com/sso"
SiteSetting.enable_discourse_connect = true
- post "/session.json", params: {
- login: user.username, password: 'myawesomepassword'
- }
+ post "/session.json", params: { login: user.username, password: "myawesomepassword" }
end
it_behaves_like "failed to continue local login"
end
- context 'when local login via email is disabled' do
+ context "when local login via email is disabled" do
before do
SiteSetting.enable_local_logins_via_email = false
EmailToken.confirm(email_token.token)
end
- it 'doesnt matter, logs in correctly' do
- post "/session.json", params: {
- login: user.username, password: 'myawesomepassword'
- }
+ it "doesnt matter, logs in correctly" do
+ post "/session.json", params: { login: user.username, password: "myawesomepassword" }
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).not_to be_present
+ expect(response.parsed_body["error"]).not_to be_present
end
end
- context 'when email is confirmed' do
- before do
- EmailToken.confirm(email_token.token)
- end
+ context "when email is confirmed" do
+ before { EmailToken.confirm(email_token.token) }
it "raises an error when the login isn't present" do
post "/session.json"
expect(response.status).to eq(400)
end
- describe 'invalid password' do
+ describe "invalid password" do
it "should return an error with an invalid password" do
- post "/session.json", params: {
- login: user.username, password: 'sssss'
- }
+ post "/session.json", params: { login: user.username, password: "sssss" }
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).to eq(
- I18n.t("login.incorrect_username_email_or_password")
+ expect(response.parsed_body["error"]).to eq(
+ I18n.t("login.incorrect_username_email_or_password"),
)
end
end
- describe 'invalid password' do
+ describe "invalid password" do
it "should return an error with an invalid password if too long" do
User.any_instance.expects(:confirm_password?).never
- post "/session.json", params: {
- login: user.username, password: ('s' * (User.max_password_length + 1))
- }
+ post "/session.json",
+ params: {
+ login: user.username,
+ password: ("s" * (User.max_password_length + 1)),
+ }
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).to eq(
- I18n.t("login.incorrect_username_email_or_password")
+ expect(response.parsed_body["error"]).to eq(
+ I18n.t("login.incorrect_username_email_or_password"),
)
end
end
- describe 'suspended user' do
- it 'should return an error' do
+ describe "suspended user" do
+ it "should return an error" do
user.suspended_till = 2.days.from_now
user.suspended_at = Time.now
user.save!
StaffActionLogger.new(user).log_user_suspend(user, "banned ")
- post "/session.json", params: {
- login: user.username, password: 'myawesomepassword'
- }
+ post "/session.json", params: { login: user.username, password: "myawesomepassword" }
- expected_message = I18n.t('login.suspended_with_reason',
- date: I18n.l(user.suspended_till, format: :date_only),
- reason: Rack::Utils.escape_html(user.suspend_reason))
+ expected_message =
+ I18n.t(
+ "login.suspended_with_reason",
+ date: I18n.l(user.suspended_till, format: :date_only),
+ reason: Rack::Utils.escape_html(user.suspend_reason),
+ )
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).to eq(expected_message)
+ expect(response.parsed_body["error"]).to eq(expected_message)
end
- it 'when suspended forever should return an error without suspended till date' do
+ it "when suspended forever should return an error without suspended till date" do
user.suspended_till = 101.years.from_now
user.suspended_at = Time.now
user.save!
StaffActionLogger.new(user).log_user_suspend(user, "banned ")
- post "/session.json", params: {
- login: user.username, password: 'myawesomepassword'
- }
+ post "/session.json", params: { login: user.username, password: "myawesomepassword" }
- expected_message = I18n.t('login.suspended_with_reason_forever', reason: Rack::Utils.escape_html(user.suspend_reason))
- expect(response.parsed_body['error']).to eq(expected_message)
+ expected_message =
+ I18n.t(
+ "login.suspended_with_reason_forever",
+ reason: Rack::Utils.escape_html(user.suspend_reason),
+ )
+ expect(response.parsed_body["error"]).to eq(expected_message)
end
end
- describe 'deactivated user' do
- it 'should return an error' do
+ describe "deactivated user" do
+ it "should return an error" do
user.active = false
user.save!
- post "/session.json", params: {
- login: user.username, password: 'myawesomepassword'
- }
+ post "/session.json", params: { login: user.username, password: "myawesomepassword" }
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).to eq(I18n.t('login.not_activated'))
+ expect(response.parsed_body["error"]).to eq(I18n.t("login.not_activated"))
end
end
- describe 'success by username' do
- it 'logs in correctly' do
- events = DiscourseEvent.track_events do
- post "/session.json", params: {
- login: user.username, password: 'myawesomepassword'
- }
- end
+ describe "success by username" do
+ it "logs in correctly" do
+ events =
+ DiscourseEvent.track_events do
+ post "/session.json", params: { login: user.username, password: "myawesomepassword" }
+ end
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).not_to be_present
+ expect(response.parsed_body["error"]).not_to be_present
expect(events.map { |event| event[:event_name] }).to contain_exactly(
- :user_logged_in, :user_first_logged_in
+ :user_logged_in,
+ :user_first_logged_in,
)
user.reload
@@ -1873,16 +1921,21 @@ RSpec.describe SessionController do
expect(session[:current_user_id]).to eq(user.id)
expect(user.user_auth_tokens.count).to eq(1)
unhashed_token = decrypt_auth_cookie(cookies[:_t])[:token]
- expect(UserAuthToken.hash_token(unhashed_token)).to eq(user.user_auth_tokens.first.auth_token)
+ expect(UserAuthToken.hash_token(unhashed_token)).to eq(
+ user.user_auth_tokens.first.auth_token,
+ )
end
context "when timezone param is provided" do
it "sets the user_option timezone for the user" do
- post "/session.json", params: {
- login: user.username, password: 'myawesomepassword', timezone: "Australia/Melbourne"
- }
+ post "/session.json",
+ params: {
+ login: user.username,
+ password: "myawesomepassword",
+ timezone: "Australia/Melbourne",
+ }
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).not_to be_present
+ expect(response.parsed_body["error"]).not_to be_present
expect(user.reload.user_option.timezone).to eq("Australia/Melbourne")
end
end
@@ -1894,7 +1947,7 @@ RSpec.describe SessionController do
:user_security_key,
user: user,
credential_id: valid_security_key_data[:credential_id],
- public_key: valid_security_key_data[:public_key]
+ public_key: valid_security_key_data[:public_key],
)
end
@@ -1902,68 +1955,62 @@ RSpec.describe SessionController do
simulate_localhost_webauthn_challenge
# store challenge in secure session by failing login once
- post "/session.json", params: {
- login: user.username,
- password: 'myawesomepassword'
- }
+ post "/session.json", params: { login: user.username, password: "myawesomepassword" }
end
context "when the security key params are blank and a random second factor token is provided" do
it "shows an error message and denies login" do
-
- post "/session.json", params: {
- login: user.username,
- password: 'myawesomepassword',
- second_factor_token: '99999999',
- second_factor_method: UserSecondFactor.methods[:security_key]
- }
+ post "/session.json",
+ params: {
+ login: user.username,
+ password: "myawesomepassword",
+ second_factor_token: "99999999",
+ second_factor_method: UserSecondFactor.methods[:security_key],
+ }
expect(response.status).to eq(200)
expect(session[:current_user_id]).to eq(nil)
response_body = response.parsed_body
expect(response_body["failed"]).to eq("FAILED")
- expect(response_body['error']).to eq(I18n.t(
- 'login.invalid_security_key'
- ))
+ expect(response_body["error"]).to eq(I18n.t("login.invalid_security_key"))
end
end
context "when the security key params are invalid" do
it "shows an error message and denies login" do
-
- post "/session.json", params: {
- login: user.username,
- password: 'myawesomepassword',
- second_factor_token: {
- signature: 'bad_sig',
- clientData: 'bad_clientData',
- credentialId: 'bad_credential_id',
- authenticatorData: 'bad_authenticator_data'
- },
- second_factor_method: UserSecondFactor.methods[:security_key]
- }
+ post "/session.json",
+ params: {
+ login: user.username,
+ password: "myawesomepassword",
+ second_factor_token: {
+ signature: "bad_sig",
+ clientData: "bad_clientData",
+ credentialId: "bad_credential_id",
+ authenticatorData: "bad_authenticator_data",
+ },
+ second_factor_method: UserSecondFactor.methods[:security_key],
+ }
expect(response.status).to eq(200)
expect(session[:current_user_id]).to eq(nil)
response_body = response.parsed_body
expect(response_body["failed"]).to eq("FAILED")
- expect(response_body['error']).to eq(I18n.t(
- 'webauthn.validation.not_found_error'
- ))
+ expect(response_body["error"]).to eq(I18n.t("webauthn.validation.not_found_error"))
end
end
context "when the security key params are valid" do
it "logs the user in" do
- post "/session.json", params: {
- login: user.username,
- password: 'myawesomepassword',
- second_factor_token: valid_security_key_auth_post_data,
- second_factor_method: UserSecondFactor.methods[:security_key]
- }
+ post "/session.json",
+ params: {
+ login: user.username,
+ password: "myawesomepassword",
+ second_factor_token: valid_security_key_auth_post_data,
+ second_factor_method: UserSecondFactor.methods[:security_key],
+ }
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).not_to be_present
+ expect(response.parsed_body["error"]).not_to be_present
user.reload
expect(session[:current_user_id]).to eq(user.id)
@@ -1978,295 +2025,291 @@ RSpec.describe SessionController do
end
it "shows an error message and denies login" do
- post "/session.json", params: {
- login: user.username,
- password: 'myawesomepassword',
- second_factor_token: valid_security_key_auth_post_data,
- second_factor_method: UserSecondFactor.methods[:security_key]
- }
+ post "/session.json",
+ params: {
+ login: user.username,
+ password: "myawesomepassword",
+ second_factor_token: valid_security_key_auth_post_data,
+ second_factor_method: UserSecondFactor.methods[:security_key],
+ }
expect(response.status).to eq(200)
expect(session[:current_user_id]).to eq(nil)
response_body = response.parsed_body
expect(response_body["failed"]).to eq("FAILED")
- expect(response.parsed_body['error']).to eq(I18n.t(
- 'login.not_enabled_second_factor_method'
- ))
+ expect(response.parsed_body["error"]).to eq(
+ I18n.t("login.not_enabled_second_factor_method"),
+ )
end
end
end
- context 'when user has TOTP-only 2FA login' do
+ context "when user has TOTP-only 2FA login" do
let!(:user_second_factor) { Fabricate(:user_second_factor_totp, user: user) }
let!(:user_second_factor_backup) { Fabricate(:user_second_factor_backup, user: user) }
- describe 'when second factor token is missing' do
- it 'should return the right response' do
- post "/session.json", params: {
- login: user.username,
- password: 'myawesomepassword'
- }
+ describe "when second factor token is missing" do
+ it "should return the right response" do
+ post "/session.json", params: { login: user.username, password: "myawesomepassword" }
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).to eq(I18n.t(
- 'login.invalid_second_factor_method'
- ))
+ expect(response.parsed_body["error"]).to eq(
+ I18n.t("login.invalid_second_factor_method"),
+ )
end
end
- describe 'when second factor token is invalid' do
- context 'when using totp method' do
- it 'should return the right response' do
- post "/session.json", params: {
- login: user.username,
- password: 'myawesomepassword',
- second_factor_token: '00000000',
- second_factor_method: UserSecondFactor.methods[:totp]
- }
+ describe "when second factor token is invalid" do
+ context "when using totp method" do
+ it "should return the right response" do
+ post "/session.json",
+ params: {
+ login: user.username,
+ password: "myawesomepassword",
+ second_factor_token: "00000000",
+ second_factor_method: UserSecondFactor.methods[:totp],
+ }
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).to eq(I18n.t(
- 'login.invalid_second_factor_code'
- ))
+ expect(response.parsed_body["error"]).to eq(
+ I18n.t("login.invalid_second_factor_code"),
+ )
end
end
- context 'when using backup code method' do
- it 'should return the right response' do
- post "/session.json", params: {
- login: user.username,
- password: 'myawesomepassword',
- second_factor_token: '00000000',
- second_factor_method: UserSecondFactor.methods[:backup_codes]
- }
+ context "when using backup code method" do
+ it "should return the right response" do
+ post "/session.json",
+ params: {
+ login: user.username,
+ password: "myawesomepassword",
+ second_factor_token: "00000000",
+ second_factor_method: UserSecondFactor.methods[:backup_codes],
+ }
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).to eq(I18n.t(
- 'login.invalid_second_factor_code'
- ))
+ expect(response.parsed_body["error"]).to eq(
+ I18n.t("login.invalid_second_factor_code"),
+ )
end
end
end
- describe 'when second factor token is valid' do
- context 'when using totp method' do
- it 'should log the user in' do
- post "/session.json", params: {
- login: user.username,
- password: 'myawesomepassword',
- second_factor_token: ROTP::TOTP.new(user_second_factor.data).now,
- second_factor_method: UserSecondFactor.methods[:totp]
- }
+ describe "when second factor token is valid" do
+ context "when using totp method" do
+ it "should log the user in" do
+ post "/session.json",
+ params: {
+ login: user.username,
+ password: "myawesomepassword",
+ second_factor_token: ROTP::TOTP.new(user_second_factor.data).now,
+ second_factor_method: UserSecondFactor.methods[:totp],
+ }
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).not_to be_present
+ expect(response.parsed_body["error"]).not_to be_present
user.reload
expect(session[:current_user_id]).to eq(user.id)
expect(user.user_auth_tokens.count).to eq(1)
unhashed_token = decrypt_auth_cookie(cookies[:_t])[:token]
- expect(UserAuthToken.hash_token(unhashed_token))
- .to eq(user.user_auth_tokens.first.auth_token)
+ expect(UserAuthToken.hash_token(unhashed_token)).to eq(
+ user.user_auth_tokens.first.auth_token,
+ )
end
end
- context 'when using backup code method' do
- it 'should log the user in' do
- post "/session.json", params: {
- login: user.username,
- password: 'myawesomepassword',
- second_factor_token: 'iAmValidBackupCode',
- second_factor_method: UserSecondFactor.methods[:backup_codes]
- }
+ context "when using backup code method" do
+ it "should log the user in" do
+ post "/session.json",
+ params: {
+ login: user.username,
+ password: "myawesomepassword",
+ second_factor_token: "iAmValidBackupCode",
+ second_factor_method: UserSecondFactor.methods[:backup_codes],
+ }
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).not_to be_present
+ expect(response.parsed_body["error"]).not_to be_present
user.reload
expect(session[:current_user_id]).to eq(user.id)
expect(user.user_auth_tokens.count).to eq(1)
unhashed_token = decrypt_auth_cookie(cookies[:_t])[:token]
- expect(UserAuthToken.hash_token(unhashed_token))
- .to eq(user.user_auth_tokens.first.auth_token)
+ expect(UserAuthToken.hash_token(unhashed_token)).to eq(
+ user.user_auth_tokens.first.auth_token,
+ )
end
end
end
end
- describe 'with a blocked IP' do
+ describe "with a blocked IP" do
it "doesn't log in" do
ScreenedIpAddress.all.destroy_all
get "/"
_screened_ip = Fabricate(:screened_ip_address, ip_address: request.remote_ip)
- post "/session.json", params: {
- login: "@" + user.username, password: 'myawesomepassword'
- }
+ post "/session.json",
+ params: {
+ login: "@" + user.username,
+ password: "myawesomepassword",
+ }
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).to be_present
+ expect(response.parsed_body["error"]).to be_present
user.reload
expect(session[:current_user_id]).to be_nil
end
end
- describe 'strips leading @ symbol' do
- it 'sets a session id' do
- post "/session.json", params: {
- login: "@" + user.username, password: 'myawesomepassword'
- }
+ describe "strips leading @ symbol" do
+ it "sets a session id" do
+ post "/session.json",
+ params: {
+ login: "@" + user.username,
+ password: "myawesomepassword",
+ }
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).not_to be_present
+ expect(response.parsed_body["error"]).not_to be_present
user.reload
expect(session[:current_user_id]).to eq(user.id)
end
end
- describe 'also allow login by email' do
- it 'sets a session id' do
- post "/session.json", params: {
- login: user.email, password: 'myawesomepassword'
- }
+ describe "also allow login by email" do
+ it "sets a session id" do
+ post "/session.json", params: { login: user.email, password: "myawesomepassword" }
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).not_to be_present
+ expect(response.parsed_body["error"]).not_to be_present
expect(session[:current_user_id]).to eq(user.id)
end
end
- context 'when login has leading and trailing space' do
+ context "when login has leading and trailing space" do
let(:username) { " #{user.username} " }
let(:email) { " #{user.email} " }
it "strips spaces from the username" do
- post "/session.json", params: {
- login: username, password: 'myawesomepassword'
- }
+ post "/session.json", params: { login: username, password: "myawesomepassword" }
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).not_to be_present
+ expect(response.parsed_body["error"]).not_to be_present
end
it "strips spaces from the email" do
- post "/session.json", params: {
- login: email, password: 'myawesomepassword'
- }
+ post "/session.json", params: { login: email, password: "myawesomepassword" }
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).not_to be_present
+ expect(response.parsed_body["error"]).not_to be_present
end
end
describe "when the site requires approval of users" do
- before do
- SiteSetting.must_approve_users = true
- end
+ before { SiteSetting.must_approve_users = true }
- context 'with an unapproved user' do
+ context "with an unapproved user" do
before do
user.update_columns(approved: false)
- post "/session.json", params: {
- login: user.email, password: 'myawesomepassword'
- }
+ post "/session.json", params: { login: user.email, password: "myawesomepassword" }
end
it "doesn't log in the user" do
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).to be_present
+ expect(response.parsed_body["error"]).to be_present
expect(session[:current_user_id]).to be_blank
end
it "shows the 'not approved' error message" do
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).to eq(
- I18n.t('login.not_approved')
- )
+ expect(response.parsed_body["error"]).to eq(I18n.t("login.not_approved"))
end
end
context "with an unapproved user who is an admin" do
- it 'sets a session id' do
+ it "sets a session id" do
user.admin = true
user.save!
- post "/session.json", params: {
- login: user.email, password: 'myawesomepassword'
- }
+ post "/session.json", params: { login: user.email, password: "myawesomepassword" }
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).not_to be_present
+ expect(response.parsed_body["error"]).not_to be_present
expect(session[:current_user_id]).to eq(user.id)
end
end
end
- context 'when admins are restricted by ip address' do
+ context "when admins are restricted by ip address" do
before do
SiteSetting.use_admin_ip_allowlist = true
ScreenedIpAddress.all.destroy_all
end
- it 'is successful for admin at the ip address' do
+ it "is successful for admin at the ip address" do
get "/"
- Fabricate(:screened_ip_address, ip_address: request.remote_ip, action_type: ScreenedIpAddress.actions[:allow_admin])
+ Fabricate(
+ :screened_ip_address,
+ ip_address: request.remote_ip,
+ action_type: ScreenedIpAddress.actions[:allow_admin],
+ )
user.admin = true
user.save!
- post "/session.json", params: {
- login: user.username, password: 'myawesomepassword'
- }
+ post "/session.json", params: { login: user.username, password: "myawesomepassword" }
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).not_to be_present
+ expect(response.parsed_body["error"]).not_to be_present
expect(session[:current_user_id]).to eq(user.id)
end
- it 'returns an error for admin not at the ip address' do
- Fabricate(:screened_ip_address, ip_address: "111.234.23.11", action_type: ScreenedIpAddress.actions[:allow_admin])
+ it "returns an error for admin not at the ip address" do
+ Fabricate(
+ :screened_ip_address,
+ ip_address: "111.234.23.11",
+ action_type: ScreenedIpAddress.actions[:allow_admin],
+ )
user.admin = true
user.save!
- post "/session.json", params: {
- login: user.username, password: 'myawesomepassword'
- }
+ post "/session.json", params: { login: user.username, password: "myawesomepassword" }
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).to be_present
+ expect(response.parsed_body["error"]).to be_present
expect(session[:current_user_id]).not_to eq(user.id)
end
- it 'is successful for non-admin not at the ip address' do
- Fabricate(:screened_ip_address, ip_address: "111.234.23.11", action_type: ScreenedIpAddress.actions[:allow_admin])
+ it "is successful for non-admin not at the ip address" do
+ Fabricate(
+ :screened_ip_address,
+ ip_address: "111.234.23.11",
+ action_type: ScreenedIpAddress.actions[:allow_admin],
+ )
user.admin = false
user.save!
- post "/session.json", params: {
- login: user.username, password: 'myawesomepassword'
- }
+ post "/session.json", params: { login: user.username, password: "myawesomepassword" }
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).not_to be_present
+ expect(response.parsed_body["error"]).not_to be_present
expect(session[:current_user_id]).to eq(user.id)
end
end
end
- context 'when email has not been confirmed' do
+ context "when email has not been confirmed" do
def post_login
- post "/session.json", params: {
- login: user.email, password: 'myawesomepassword'
- }
+ post "/session.json", params: { login: user.email, password: "myawesomepassword" }
end
it "doesn't log in the user" do
post_login
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).to be_present
+ expect(response.parsed_body["error"]).to be_present
expect(session[:current_user_id]).to be_blank
end
it "shows the 'not activated' error message" do
post_login
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).to eq(
- I18n.t 'login.not_activated'
- )
+ expect(response.parsed_body["error"]).to eq(I18n.t "login.not_activated")
end
context "when the 'must approve users' site setting is enabled" do
@@ -2275,89 +2318,97 @@ RSpec.describe SessionController do
it "shows the 'not approved' error message" do
post_login
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).to eq(
- I18n.t 'login.not_approved'
- )
+ expect(response.parsed_body["error"]).to eq(I18n.t "login.not_approved")
end
end
end
- context 'when rate limited' do
- it 'rate limits login' do
+ context "when rate limited" do
+ it "rate limits login" do
SiteSetting.max_logins_per_ip_per_hour = 2
RateLimiter.enable
RateLimiter.clear_all!
EmailToken.confirm(email_token.token)
2.times do
- post "/session.json", params: {
- login: user.username, password: 'myawesomepassword'
- }
+ post "/session.json", params: { login: user.username, password: "myawesomepassword" }
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).not_to be_present
+ expect(response.parsed_body["error"]).not_to be_present
end
- post "/session.json", params: {
- login: user.username, password: 'myawesomepassword'
- }
+ post "/session.json", params: { login: user.username, password: "myawesomepassword" }
expect(response.status).to eq(429)
json = response.parsed_body
expect(json["error_type"]).to eq("rate_limit")
end
- it 'rate limits second factor attempts by IP' do
+ it "rate limits second factor attempts by IP" do
RateLimiter.enable
RateLimiter.clear_all!
6.times do |x|
- post "/session.json", params: {
- login: "#{user.username}#{x}",
- password: 'myawesomepassword',
- second_factor_token: '000000',
- second_factor_method: UserSecondFactor.methods[:totp]
- }
+ post "/session.json",
+ params: {
+ login: "#{user.username}#{x}",
+ password: "myawesomepassword",
+ second_factor_token: "000000",
+ second_factor_method: UserSecondFactor.methods[:totp],
+ }
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).to be_present
+ expect(response.parsed_body["error"]).to be_present
end
- post "/session.json", params: {
- login: user.username,
- password: 'myawesomepassword',
- second_factor_token: '000000',
- second_factor_method: UserSecondFactor.methods[:totp]
- }
+ post "/session.json",
+ params: {
+ login: user.username,
+ password: "myawesomepassword",
+ second_factor_token: "000000",
+ second_factor_method: UserSecondFactor.methods[:totp],
+ }
expect(response.status).to eq(429)
json = response.parsed_body
expect(json["error_type"]).to eq("rate_limit")
end
- it 'rate limits second factor attempts by login' do
+ it "rate limits second factor attempts by login" do
RateLimiter.enable
RateLimiter.clear_all!
EmailToken.confirm(email_token.token)
6.times do |x|
- post "/session.json", params: {
- login: user.username,
- password: 'myawesomepassword',
- second_factor_token: '000000',
- second_factor_method: UserSecondFactor.methods[:totp]
- }, env: { "REMOTE_ADDR": "1.2.3.#{x}" }
+ post "/session.json",
+ params: {
+ login: user.username,
+ password: "myawesomepassword",
+ second_factor_token: "000000",
+ second_factor_method: UserSecondFactor.methods[:totp],
+ },
+ env: {
+ REMOTE_ADDR: "1.2.3.#{x}",
+ }
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).not_to be_present
+ expect(response.parsed_body["error"]).not_to be_present
end
- [user.username + " ", user.username.capitalize, user.username].each_with_index do |username , x|
- post "/session.json", params: {
- login: username,
- password: 'myawesomepassword',
- second_factor_token: '000000',
- second_factor_method: UserSecondFactor.methods[:totp]
- }, env: { "REMOTE_ADDR": "1.2.4.#{x}" }
+ [
+ user.username + " ",
+ user.username.capitalize,
+ user.username,
+ ].each_with_index do |username, x|
+ post "/session.json",
+ params: {
+ login: username,
+ password: "myawesomepassword",
+ second_factor_token: "000000",
+ second_factor_method: UserSecondFactor.methods[:totp],
+ },
+ env: {
+ REMOTE_ADDR: "1.2.4.#{x}",
+ }
expect(response.status).to eq(429)
json = response.parsed_body
@@ -2367,8 +2418,8 @@ RSpec.describe SessionController do
end
end
- describe '#destroy' do
- it 'removes the session variable and the auth token cookies' do
+ describe "#destroy" do
+ it "removes the session variable and the auth token cookies" do
user = sign_in(Fabricate(:user))
delete "/session/#{user.username}.json"
@@ -2377,40 +2428,38 @@ RSpec.describe SessionController do
expect(response.cookies["_t"]).to be_blank
end
- it 'returns the redirect URL in the body for XHR requests' do
+ it "returns the redirect URL in the body for XHR requests" do
user = sign_in(Fabricate(:user))
delete "/session/#{user.username}.json", xhr: true
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).not_to be_present
+ expect(response.parsed_body["error"]).not_to be_present
expect(session[:current_user_id]).to be_blank
expect(response.cookies["_t"]).to be_blank
expect(response.parsed_body["redirect_url"]).to eq("/")
end
- it 'redirects to /login when SSO and login_required' do
+ it "redirects to /login when SSO and login_required" do
SiteSetting.discourse_connect_url = "https://example.com/sso"
SiteSetting.enable_discourse_connect = true
user = sign_in(Fabricate(:user))
delete "/session/#{user.username}.json", xhr: true
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).not_to be_present
+ expect(response.parsed_body["error"]).not_to be_present
expect(response.parsed_body["redirect_url"]).to eq("/")
SiteSetting.login_required = true
user = sign_in(Fabricate(:user))
delete "/session/#{user.username}.json", xhr: true
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).not_to be_present
+ expect(response.parsed_body["error"]).not_to be_present
expect(response.parsed_body["redirect_url"]).to eq("/login")
end
- it 'allows plugins to manipulate redirect URL' do
- callback = -> (data) do
- data[:redirect_url] = "/myredirect/#{data[:user].username}"
- end
+ it "allows plugins to manipulate redirect URL" do
+ callback = ->(data) { data[:redirect_url] = "/myredirect/#{data[:user].username}" }
DiscourseEvent.on(:before_session_destroy, &callback)
@@ -2418,39 +2467,42 @@ RSpec.describe SessionController do
delete "/session/#{user.username}.json", xhr: true
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).not_to be_present
+ expect(response.parsed_body["error"]).not_to be_present
expect(response.parsed_body["redirect_url"]).to eq("/myredirect/#{user.username}")
ensure
DiscourseEvent.off(:before_session_destroy, &callback)
end
- it 'includes ip and user agent in the before_session_destroy event params' do
+ it "includes ip and user agent in the before_session_destroy event params" do
callback_params = {}
- callback = -> (data) { callback_params = data }
+ callback = ->(data) { callback_params = data }
DiscourseEvent.on(:before_session_destroy, &callback)
user = sign_in(Fabricate(:user))
- delete "/session/#{user.username}.json", xhr: true, headers: { HTTP_USER_AGENT: 'AwesomeBrowser' }
+ delete "/session/#{user.username}.json",
+ xhr: true,
+ headers: {
+ HTTP_USER_AGENT: "AwesomeBrowser",
+ }
- expect(callback_params[:user_agent]).to eq('AwesomeBrowser')
- expect(callback_params[:client_ip]).to eq('127.0.0.1')
+ expect(callback_params[:user_agent]).to eq("AwesomeBrowser")
+ expect(callback_params[:client_ip]).to eq("127.0.0.1")
ensure
DiscourseEvent.off(:before_session_destroy, &callback)
end
-
end
- describe '#one_time_password' do
- context 'with missing token' do
- it 'returns the right response' do
+ describe "#one_time_password" do
+ context "with missing token" do
+ it "returns the right response" do
get "/session/otp"
expect(response.status).to eq(404)
end
end
- context 'with invalid token' do
- it 'returns the right response' do
+ context "with invalid token" do
+ it "returns the right response" do
get "/session/otp/asd1231dasd123"
expect(response.status).to eq(404)
@@ -2460,7 +2512,7 @@ RSpec.describe SessionController do
expect(response.status).to eq(404)
end
- context 'when token is valid' do
+ context "when token is valid" do
it "should display the form for GET" do
token = SecureRandom.hex
Discourse.redis.setex "otp_#{token}", 10.minutes, user.username
@@ -2468,9 +2520,9 @@ RSpec.describe SessionController do
get "/session/otp/#{token}"
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).not_to be_present
+ expect(response.parsed_body["error"]).not_to be_present
expect(response.body).to include(
- I18n.t("user_api_key.otp_confirmation.logging_in_as", username: user.username)
+ I18n.t("user_api_key.otp_confirmation.logging_in_as", username: user.username),
)
expect(Discourse.redis.get("otp_#{token}")).to eq(user.username)
@@ -2489,7 +2541,7 @@ RSpec.describe SessionController do
expect(session[:current_user_id]).to eq(user.id)
end
- it 'should authenticate user and delete token' do
+ it "should authenticate user and delete token" do
user = Fabricate(:user)
get "/session/current.json"
@@ -2506,71 +2558,67 @@ RSpec.describe SessionController do
get "/session/current.json"
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).not_to be_present
+ expect(response.parsed_body["error"]).not_to be_present
end
end
end
-
end
- describe '#forgot_password' do
+ describe "#forgot_password" do
+ context "when hide_email_address_taken is set" do
+ before { SiteSetting.hide_email_address_taken = true }
- context 'when hide_email_address_taken is set' do
- before do
- SiteSetting.hide_email_address_taken = true
- end
-
- it 'denies for username' do
- post "/session/forgot_password.json",
- params: { login: user.username }
+ it "denies for username" do
+ post "/session/forgot_password.json", params: { login: user.username }
expect(response.status).to eq(400)
expect(Jobs::CriticalUserEmail.jobs.size).to eq(0)
end
- it 'allows for username when staff' do
+ it "allows for username when staff" do
sign_in(Fabricate(:admin))
- post "/session/forgot_password.json",
- params: { login: user.username }
+ post "/session/forgot_password.json", params: { login: user.username }
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).not_to be_present
+ expect(response.parsed_body["error"]).not_to be_present
expect(Jobs::CriticalUserEmail.jobs.size).to eq(1)
end
- it 'allows for email' do
- post "/session/forgot_password.json",
- params: { login: user.email }
+ it "allows for email" do
+ post "/session/forgot_password.json", params: { login: user.email }
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).not_to be_present
+ expect(response.parsed_body["error"]).not_to be_present
expect(Jobs::CriticalUserEmail.jobs.size).to eq(1)
end
end
- it 'raises an error without a username parameter' do
+ it "raises an error without a username parameter" do
post "/session/forgot_password.json"
expect(response.status).to eq(400)
end
- it 'should correctly screen ips' do
+ it "should correctly screen ips" do
ScreenedIpAddress.create!(
- ip_address: '100.0.0.1',
- action_type: ScreenedIpAddress.actions[:block]
+ ip_address: "100.0.0.1",
+ action_type: ScreenedIpAddress.actions[:block],
)
post "/session/forgot_password.json",
- params: { login: 'made_up' },
- headers: { 'REMOTE_ADDR' => '100.0.0.1' }
-
- expect(response.parsed_body).to eq({
- "errors" => [I18n.t("login.reset_not_allowed_from_ip_address")]
- })
+ params: {
+ login: "made_up",
+ },
+ headers: {
+ "REMOTE_ADDR" => "100.0.0.1",
+ }
+ expect(response.parsed_body).to eq(
+ { "errors" => [I18n.t("login.reset_not_allowed_from_ip_address")] },
+ )
end
- it 'should correctly rate limits' do
+ it "should correctly rate limits" do
RateLimiter.enable
RateLimiter.clear_all!
@@ -2579,7 +2627,7 @@ RSpec.describe SessionController do
3.times do
post "/session/forgot_password.json", params: { login: user.username }
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).not_to be_present
+ expect(response.parsed_body["error"]).not_to be_present
end
post "/session/forgot_password.json", params: { login: user.username }
@@ -2587,35 +2635,42 @@ RSpec.describe SessionController do
3.times do
post "/session/forgot_password.json",
- params: { login: user.username },
- headers: { 'REMOTE_ADDR' => '10.1.1.1' }
+ params: {
+ login: user.username,
+ },
+ headers: {
+ "REMOTE_ADDR" => "10.1.1.1",
+ }
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).not_to be_present
+ expect(response.parsed_body["error"]).not_to be_present
end
post "/session/forgot_password.json",
- params: { login: user.username },
- headers: { 'REMOTE_ADDR' => '100.1.1.1' }
+ params: {
+ login: user.username,
+ },
+ headers: {
+ "REMOTE_ADDR" => "100.1.1.1",
+ }
# not allowed, max 6 a day
expect(response.status).to eq(422)
-
end
- context 'for a non existant username' do
+ context "for a non existant username" do
it "doesn't generate a new token for a made up username" do
expect do
- post "/session/forgot_password.json", params: { login: 'made_up' }
+ post "/session/forgot_password.json", params: { login: "made_up" }
end.not_to change(EmailToken, :count)
expect(Jobs::CriticalUserEmail.jobs.size).to eq(0)
end
end
- context 'for an existing username' do
+ context "for an existing username" do
fab!(:user) { Fabricate(:user) }
- context 'when local login is disabled' do
+ context "when local login is disabled" do
before do
SiteSetting.enable_local_logins = false
post "/session/forgot_password.json", params: { login: user.username }
@@ -2623,14 +2678,12 @@ RSpec.describe SessionController do
it_behaves_like "failed to continue local login"
end
- context 'when SSO is enabled' do
+ context "when SSO is enabled" do
before do
SiteSetting.discourse_connect_url = "https://www.example.com/sso"
SiteSetting.enable_discourse_connect = true
- post "/session.json", params: {
- login: user.username, password: 'myawesomepassword'
- }
+ post "/session.json", params: { login: user.username, password: "myawesomepassword" }
end
it_behaves_like "failed to continue local login"
end
@@ -2639,17 +2692,13 @@ RSpec.describe SessionController do
before do
SiteSetting.enable_local_logins = false
- post "/session.json", params: {
- login: user.username, password: 'myawesomepassword'
- }
+ post "/session.json", params: { login: user.username, password: "myawesomepassword" }
end
it_behaves_like "failed to continue local login"
end
context "when local logins via email are disabled" do
- before do
- SiteSetting.enable_local_logins_via_email = false
- end
+ before { SiteSetting.enable_local_logins_via_email = false }
it "does not matter, generates a new token for a made up username" do
expect do
post "/session/forgot_password.json", params: { login: user.username }
@@ -2669,38 +2718,38 @@ RSpec.describe SessionController do
end
end
- context 'when doing nothing to system username' do
+ context "when doing nothing to system username" do
let(:system) { Discourse.system_user }
- it 'generates no token for system username' do
+ it "generates no token for system username" do
expect do
post "/session/forgot_password.json", params: { login: system.username }
end.not_to change(EmailToken, :count)
end
- it 'enqueues no email' do
+ it "enqueues no email" do
post "/session/forgot_password.json", params: { login: system.username }
expect(Jobs::CriticalUserEmail.jobs.size).to eq(0)
end
end
- context 'for a staged account' do
+ context "for a staged account" do
let!(:staged) { Fabricate(:staged) }
- it 'generates no token for staged username' do
+ it "generates no token for staged username" do
expect do
post "/session/forgot_password.json", params: { login: staged.username }
end.not_to change(EmailToken, :count)
end
- it 'enqueues no email' do
+ it "enqueues no email" do
post "/session/forgot_password.json", params: { login: staged.username }
expect(Jobs::CriticalUserEmail.jobs.size).to eq(0)
end
end
end
- describe '#current' do
+ describe "#current" do
context "when not logged in" do
it "returns 404" do
get "/session/current.json"
@@ -2714,40 +2763,38 @@ RSpec.describe SessionController do
it "returns the JSON for the user" do
get "/session/current.json"
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).not_to be_present
+ expect(response.parsed_body["error"]).not_to be_present
json = response.parsed_body
- expect(json['current_user']).to be_present
- expect(json['current_user']['id']).to eq(user.id)
+ expect(json["current_user"]).to be_present
+ expect(json["current_user"]["id"]).to eq(user.id)
end
end
end
- describe '#second_factor_auth_show' do
+ describe "#second_factor_auth_show" do
let!(:user_second_factor) { Fabricate(:user_second_factor_totp, user: user) }
- before do
- sign_in(user)
- end
+ before { sign_in(user) }
- it 'returns 404 if there is no challenge for the given nonce' do
- get "/session/2fa.json", params: { nonce: 'asdasdsadsad' }
+ it "returns 404 if there is no challenge for the given nonce" do
+ get "/session/2fa.json", params: { nonce: "asdasdsadsad" }
expect(response.status).to eq(404)
expect(response.parsed_body["error"]).to eq(I18n.t("second_factor_auth.challenge_not_found"))
end
- it 'returns 404 if the nonce does not match the challenge nonce' do
+ it "returns 404 if the nonce does not match the challenge nonce" do
post "/session/2fa/test-action"
- get "/session/2fa.json", params: { nonce: 'wrongnonce' }
+ get "/session/2fa.json", params: { nonce: "wrongnonce" }
expect(response.status).to eq(404)
expect(response.parsed_body["error"]).to eq(I18n.t("second_factor_auth.challenge_not_found"))
end
- it 'returns 401 if the challenge nonce has expired' do
+ it "returns 401 if the challenge nonce has expired" do
post "/session/2fa/test-action", xhr: true
nonce = response.parsed_body["second_factor_challenge_nonce"]
get "/session/2fa.json", params: { nonce: nonce }
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).not_to be_present
+ expect(response.parsed_body["error"]).not_to be_present
freeze_time (SecondFactor::AuthManager::MAX_CHALLENGE_AGE + 1.minute).from_now
get "/session/2fa.json", params: { nonce: nonce }
@@ -2755,12 +2802,12 @@ RSpec.describe SessionController do
expect(response.parsed_body["error"]).to eq(I18n.t("second_factor_auth.challenge_expired"))
end
- it 'responds with challenge data' do
+ it "responds with challenge data" do
post "/session/2fa/test-action", xhr: true
nonce = response.parsed_body["second_factor_challenge_nonce"]
get "/session/2fa.json", params: { nonce: nonce }
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).not_to be_present
+ expect(response.parsed_body["error"]).not_to be_present
challenge_data = response.parsed_body
expect(challenge_data["totp_enabled"]).to eq(true)
expect(challenge_data["backup_enabled"]).to eq(false)
@@ -2774,15 +2821,15 @@ RSpec.describe SessionController do
Fabricate(
:user_security_key_with_random_credential,
user: user,
- name: 'Enabled YubiKey',
- enabled: true
+ name: "Enabled YubiKey",
+ enabled: true,
)
Fabricate(:user_second_factor_backup, user: user)
post "/session/2fa/test-action", params: { allow_backup_codes: true }, xhr: true
nonce = response.parsed_body["second_factor_challenge_nonce"]
get "/session/2fa.json", params: { nonce: nonce }
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).not_to be_present
+ expect(response.parsed_body["error"]).not_to be_present
challenge_data = response.parsed_body
expect(challenge_data["totp_enabled"]).to eq(true)
expect(challenge_data["backup_enabled"]).to eq(true)
@@ -2797,65 +2844,67 @@ RSpec.describe SessionController do
end
end
- describe '#second_factor_auth_perform' do
+ describe "#second_factor_auth_perform" do
let!(:user_second_factor) { Fabricate(:user_second_factor_totp, user: user) }
- before do
- sign_in(user)
- end
+ before { sign_in(user) }
- it 'returns 401 if the challenge nonce has expired' do
+ it "returns 401 if the challenge nonce has expired" do
post "/session/2fa/test-action", xhr: true
nonce = response.parsed_body["second_factor_challenge_nonce"]
freeze_time (SecondFactor::AuthManager::MAX_CHALLENGE_AGE + 1.minute).from_now
token = ROTP::TOTP.new(user_second_factor.data).now
- post "/session/2fa.json", params: {
- nonce: nonce,
- second_factor_method: UserSecondFactor.methods[:totp],
- second_factor_token: token
- }
+ post "/session/2fa.json",
+ params: {
+ nonce: nonce,
+ second_factor_method: UserSecondFactor.methods[:totp],
+ second_factor_token: token,
+ }
expect(response.status).to eq(401)
expect(response.parsed_body["error"]).to eq(I18n.t("second_factor_auth.challenge_expired"))
end
- it 'returns 403 if the 2FA method is not allowed' do
+ it "returns 403 if the 2FA method is not allowed" do
Fabricate(:user_second_factor_backup, user: user)
post "/session/2fa/test-action", xhr: true
nonce = response.parsed_body["second_factor_challenge_nonce"]
- post "/session/2fa.json", params: {
- nonce: nonce,
- second_factor_method: UserSecondFactor.methods[:backup_codes],
- second_factor_token: "iAmValidBackupCode"
- }
+ post "/session/2fa.json",
+ params: {
+ nonce: nonce,
+ second_factor_method: UserSecondFactor.methods[:backup_codes],
+ second_factor_token: "iAmValidBackupCode",
+ }
expect(response.status).to eq(403)
end
- it 'returns 403 if the user disables the 2FA method in the middle of the 2FA process' do
+ it "returns 403 if the user disables the 2FA method in the middle of the 2FA process" do
post "/session/2fa/test-action", xhr: true
nonce = response.parsed_body["second_factor_challenge_nonce"]
token = ROTP::TOTP.new(user_second_factor.data).now
user_second_factor.destroy!
- post "/session/2fa.json", params: {
- nonce: nonce,
- second_factor_method: UserSecondFactor.methods[:totp],
- second_factor_token: token
- }
+ post "/session/2fa.json",
+ params: {
+ nonce: nonce,
+ second_factor_method: UserSecondFactor.methods[:totp],
+ second_factor_token: token,
+ }
expect(response.status).to eq(403)
end
- it 'marks the challenge as successful if the 2fa succeeds' do
+ it "marks the challenge as successful if the 2fa succeeds" do
post "/session/2fa/test-action", params: { redirect_url: "/ggg" }, xhr: true
nonce = response.parsed_body["second_factor_challenge_nonce"]
token = ROTP::TOTP.new(user_second_factor.data).now
- post "/session/2fa.json", params: {
- nonce: nonce,
- second_factor_method: UserSecondFactor.methods[:totp],
- second_factor_token: token
- }
+ post "/session/2fa.json",
+ params: {
+ nonce: nonce,
+ second_factor_method: UserSecondFactor.methods[:totp],
+ second_factor_token: token,
+ }
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).not_to be_present
+ expect(response.parsed_body["error"]).not_to be_present
expect(response.parsed_body["ok"]).to eq(true)
expect(response.parsed_body["callback_method"]).to eq("POST")
expect(response.parsed_body["callback_path"]).to eq("/session/2fa/test-action")
@@ -2863,21 +2912,22 @@ RSpec.describe SessionController do
post "/session/2fa/test-action", params: { second_factor_nonce: nonce }
expect(response.status).to eq(200)
- expect(response.parsed_body['error']).not_to be_present
+ expect(response.parsed_body["error"]).not_to be_present
expect(response.parsed_body["result"]).to eq("second_factor_auth_completed")
end
- it 'does not mark the challenge as successful if the 2fa fails' do
+ it "does not mark the challenge as successful if the 2fa fails" do
post "/session/2fa/test-action", params: { redirect_url: "/ggg" }, xhr: true
nonce = response.parsed_body["second_factor_challenge_nonce"]
token = ROTP::TOTP.new(user_second_factor.data).now.to_i
- token += token == 999999 ? -1 : 1
- post "/session/2fa.json", params: {
- nonce: nonce,
- second_factor_method: UserSecondFactor.methods[:totp],
- second_factor_token: token.to_s
- }
+ token += token == 999_999 ? -1 : 1
+ post "/session/2fa.json",
+ params: {
+ nonce: nonce,
+ second_factor_method: UserSecondFactor.methods[:totp],
+ second_factor_token: token.to_s,
+ }
expect(response.status).to eq(400)
expect(response.parsed_body["ok"]).to eq(false)
expect(response.parsed_body["reason"]).to eq("invalid_second_factor")
@@ -2888,7 +2938,7 @@ RSpec.describe SessionController do
end
end
- describe '#scopes' do
+ describe "#scopes" do
context "when not a valid api request" do
it "returns 404" do
get "/session/scopes.json"
@@ -2898,21 +2948,24 @@ RSpec.describe SessionController do
context "when a valid api request" do
let(:admin) { Fabricate(:admin) }
- let(:scope) { ApiKeyScope.new(resource: 'topics', action: 'read', allowed_parameters: { topic_id: '3' }) }
+ let(:scope) do
+ ApiKeyScope.new(resource: "topics", action: "read", allowed_parameters: { topic_id: "3" })
+ end
let(:api_key) { Fabricate(:api_key, user: admin, api_key_scopes: [scope]) }
it "returns the scopes of the api key" do
- get "/session/scopes.json", headers: {
- "Api-Key": api_key.key,
- "Api-Username": admin.username
- }
+ get "/session/scopes.json",
+ headers: {
+ "Api-Key": api_key.key,
+ "Api-Username": admin.username,
+ }
expect(response.status).to eq(200)
json = response.parsed_body
- expect(json['scopes'].size).to eq(1)
- expect(json['scopes'].first["resource"]).to eq("topics")
- expect(json['scopes'].first["action"]).to eq("read")
- expect(json['scopes'].first["allowed_parameters"]).to eq({ "topic_id": "3" }.as_json)
+ expect(json["scopes"].size).to eq(1)
+ expect(json["scopes"].first["resource"]).to eq("topics")
+ expect(json["scopes"].first["action"]).to eq("read")
+ expect(json["scopes"].first["allowed_parameters"]).to eq({ topic_id: "3" }.as_json)
end
end
end
diff --git a/spec/requests/similar_topics_controller_spec.rb b/spec/requests/similar_topics_controller_spec.rb
index 26675738a24..b70b90c2742 100644
--- a/spec/requests/similar_topics_controller_spec.rb
+++ b/spec/requests/similar_topics_controller_spec.rb
@@ -1,16 +1,20 @@
# frozen_string_literal: true
RSpec.describe SimilarTopicsController do
- describe 'similar_to' do
- let(:title) { 'this title is long enough to search for' }
- let(:raw) { 'this body is long enough to search for' }
+ describe "similar_to" do
+ let(:title) { "this title is long enough to search for" }
+ let(:raw) { "this body is long enough to search for" }
let(:topic) { Fabricate(:topic, title: title) }
let(:post) { Fabricate(:post, topic: topic, raw: raw, post_number: 1) }
let(:private_post) { Fabricate(:post, raw: raw, topic: private_topic, post_number: 1) }
let(:private_topic) do
- Fabricate(:topic, title: "#{title} 02", category: Fabricate(:private_category, group: Group[:staff]))
+ Fabricate(
+ :topic,
+ title: "#{title} 02",
+ category: Fabricate(:private_category, group: Group[:staff]),
+ )
end
def reindex_posts
@@ -36,9 +40,7 @@ RSpec.describe SimilarTopicsController do
end
describe "minimum_topics_similar" do
- before do
- SiteSetting.minimum_topics_similar = 30
- end
+ before { SiteSetting.minimum_topics_similar = 30 }
context "with enough topics" do
it "deletes to Topic.similar_to if there are more topics than `minimum_topics_similar`" do
@@ -56,7 +58,8 @@ RSpec.describe SimilarTopicsController do
context "with a logged in user" do
before do
- private_post; post
+ private_post
+ post
reindex_posts
Topic.stubs(:count).returns(50)
sign_in(Fabricate(:moderator))
@@ -67,7 +70,8 @@ RSpec.describe SimilarTopicsController do
get "/topics/similar_to.json", params: { title: title, raw: raw }
expect(response.status).to eq(200)
- similar_topics = response.parsed_body["similar_topics"].map { |topic| topic["topic_id"] }
+ similar_topics =
+ response.parsed_body["similar_topics"].map { |topic| topic["topic_id"] }
expect(similar_topics.size).to eq(2)
expect(similar_topics).to include(topic.id)
expect(similar_topics).to include(private_topic.id)
diff --git a/spec/requests/site_controller_spec.rb b/spec/requests/site_controller_spec.rb
index 87f696ca55f..50b6ccd3942 100644
--- a/spec/requests/site_controller_spec.rb
+++ b/spec/requests/site_controller_spec.rb
@@ -1,8 +1,8 @@
# frozen_string_literal: true
RSpec.describe SiteController do
- describe '#basic_info' do
- it 'is visible always even for sites requiring login' do
+ describe "#basic_info" do
+ it "is visible always even for sites requiring login" do
upload = Fabricate(:upload)
SiteSetting.login_required = true
@@ -31,8 +31,8 @@ RSpec.describe SiteController do
end
end
- describe '#statistics' do
- it 'is visible for sites requiring login' do
+ describe "#statistics" do
+ it "is visible for sites requiring login" do
SiteSetting.login_required = true
SiteSetting.share_anonymized_statistics = true
@@ -56,11 +56,11 @@ RSpec.describe SiteController do
expect(json["likes_30_days"]).to be_present
end
- it 'is not visible if site setting share_anonymized_statistics is disabled' do
+ it "is not visible if site setting share_anonymized_statistics is disabled" do
SiteSetting.share_anonymized_statistics = false
get "/site/statistics.json"
- expect(response).to redirect_to '/'
+ expect(response).to redirect_to "/"
end
end
end
diff --git a/spec/requests/sitemap_controller_spec.rb b/spec/requests/sitemap_controller_spec.rb
index c508cebfa21..bdb108163d9 100644
--- a/spec/requests/sitemap_controller_spec.rb
+++ b/spec/requests/sitemap_controller_spec.rb
@@ -1,71 +1,71 @@
# frozen_string_literal: true
-require 'rails_helper'
+require "rails_helper"
RSpec.describe SitemapController do
- describe 'before_action :check_sitemap_enabled' do
- it 'returns a 404 if sitemap is disabled' do
+ describe "before_action :check_sitemap_enabled" do
+ it "returns a 404 if sitemap is disabled" do
Sitemap.touch(Sitemap::RECENT_SITEMAP_NAME)
SiteSetting.enable_sitemap = false
- get '/sitemap.xml'
+ get "/sitemap.xml"
expect(response.status).to eq(404)
end
it "returns a 404 if the request does't have a format" do
- get '/news'
+ get "/news"
expect(response.status).to eq(404)
end
end
- describe '#index' do
+ describe "#index" do
it "lists no sitemaps if we haven't generated them yet" do
- get '/sitemap.xml'
+ get "/sitemap.xml"
- sitemaps = Nokogiri::XML::Document.parse(response.body).css('loc')
+ sitemaps = Nokogiri::XML::Document.parse(response.body).css("loc")
expect(sitemaps).to be_empty
end
- it 'lists generated sitemaps' do
- Sitemap.create!(name: 'recent', enabled: true, last_posted_at: 1.minute.ago)
+ it "lists generated sitemaps" do
+ Sitemap.create!(name: "recent", enabled: true, last_posted_at: 1.minute.ago)
- get '/sitemap.xml'
- sitemaps = Nokogiri::XML::Document.parse(response.body).css('loc')
+ get "/sitemap.xml"
+ sitemaps = Nokogiri::XML::Document.parse(response.body).css("loc")
expect(sitemaps.length).to eq(1)
- expect(sitemaps.first.text).to include('recent')
+ expect(sitemaps.first.text).to include("recent")
end
it "doesn't list disabled sitemaps" do
- Sitemap.create!(name: 'recent', enabled: false, last_posted_at: 1.minute.ago)
+ Sitemap.create!(name: "recent", enabled: false, last_posted_at: 1.minute.ago)
- get '/sitemap.xml'
- sitemaps = Nokogiri::XML::Document.parse(response.body).css('loc')
+ get "/sitemap.xml"
+ sitemaps = Nokogiri::XML::Document.parse(response.body).css("loc")
expect(sitemaps).to be_empty
end
end
- describe '#page' do
+ describe "#page" do
before { Discourse.cache.delete("sitemap/#{1}/#{SiteSetting.sitemap_page_size}") }
it "returns a 404 if the sitemap doesn't exist" do
- get '/sitemap_999.xml'
+ get "/sitemap_999.xml"
expect(response.status).to eq(404)
end
- it 'includes the topics for that page' do
+ it "includes the topics for that page" do
topic = Fabricate(:topic)
- Sitemap.create!(name: '1', enabled: true, last_posted_at: 1.minute.ago)
+ Sitemap.create!(name: "1", enabled: true, last_posted_at: 1.minute.ago)
- get '/sitemap_1.xml'
- url = Nokogiri::XML::Document.parse(response.body).css('url').last
- loc = url.at_css('loc').text
- last_mod = url.at_css('lastmod').text
+ get "/sitemap_1.xml"
+ url = Nokogiri::XML::Document.parse(response.body).css("url").last
+ loc = url.at_css("loc").text
+ last_mod = url.at_css("lastmod").text
expect(response.status).to eq(200)
expect(loc).to eq("#{Discourse.base_url}/t/#{topic.slug}/#{topic.id}")
@@ -73,68 +73,68 @@ RSpec.describe SitemapController do
end
end
- describe '#recent' do
- let(:sitemap) { Sitemap.touch(Sitemap::RECENT_SITEMAP_NAME) }
+ describe "#recent" do
+ let(:sitemap) { Sitemap.touch(Sitemap::RECENT_SITEMAP_NAME) }
before { Discourse.cache.delete("sitemap/recent/#{sitemap.last_posted_at.to_i}") }
- it 'returns a sitemap with topics bumped in the last three days' do
+ it "returns a sitemap with topics bumped in the last three days" do
topic = Fabricate(:topic, bumped_at: 1.minute.ago)
old_topic = Fabricate(:topic, bumped_at: 6.days.ago)
- get '/sitemap_recent.xml'
- urls = Nokogiri::XML::Document.parse(response.body).css('url')
- loc = urls.first.at_css('loc').text
- last_mod = urls.first.at_css('lastmod').text
+ get "/sitemap_recent.xml"
+ urls = Nokogiri::XML::Document.parse(response.body).css("url")
+ loc = urls.first.at_css("loc").text
+ last_mod = urls.first.at_css("lastmod").text
expect(response.status).to eq(200)
expect(loc).to eq("#{Discourse.base_url}/t/#{topic.slug}/#{topic.id}")
expect(last_mod).to eq(topic.bumped_at.xmlschema)
- all_urls = urls.map { |u| u.at_css('loc').text }
+ all_urls = urls.map { |u| u.at_css("loc").text }
expect(all_urls).not_to include("#{Discourse.base_url}/t/#{old_topic.slug}/#{old_topic.id}")
end
- it 'generates correct page numbers based on the topic post count' do
+ it "generates correct page numbers based on the topic post count" do
topic = Fabricate(:topic, bumped_at: 1.minute.ago)
page_size = TopicView.chunk_size
incomplete_page_size = TopicView.chunk_size - 1
topic.update!(posts_count: incomplete_page_size, updated_at: 4.hour.ago)
- get '/sitemap_recent.xml'
- url = Nokogiri::XML::Document.parse(response.body).at_css('loc').text
- expect(url).not_to include('?page=2')
+ get "/sitemap_recent.xml"
+ url = Nokogiri::XML::Document.parse(response.body).at_css("loc").text
+ expect(url).not_to include("?page=2")
topic.update!(posts_count: page_size, updated_at: 3.hour.ago)
- get '/sitemap_recent.xml'
- url = Nokogiri::XML::Document.parse(response.body).at_css('loc').text
- expect(url).not_to include('?page=2')
+ get "/sitemap_recent.xml"
+ url = Nokogiri::XML::Document.parse(response.body).at_css("loc").text
+ expect(url).not_to include("?page=2")
two_page_size = page_size + 1
topic.update!(posts_count: two_page_size, updated_at: 2.hour.ago)
- get '/sitemap_recent.xml'
- url = Nokogiri::XML::Document.parse(response.body).at_css('loc').text
- expect(url).to include('?page=2')
+ get "/sitemap_recent.xml"
+ url = Nokogiri::XML::Document.parse(response.body).at_css("loc").text
+ expect(url).to include("?page=2")
end
end
- describe '#news' do
- let!(:sitemap) { Sitemap.touch(Sitemap::NEWS_SITEMAP_NAME) }
+ describe "#news" do
+ let!(:sitemap) { Sitemap.touch(Sitemap::NEWS_SITEMAP_NAME) }
before { Discourse.cache.delete("sitemap/news") }
- it 'returns a sitemap with topics bumped in the last 72 hours' do
+ it "returns a sitemap with topics bumped in the last 72 hours" do
topic = Fabricate(:topic, bumped_at: 71.hours.ago)
old_topic = Fabricate(:topic, bumped_at: 73.hours.ago)
- get '/news.xml'
- urls = Nokogiri::XML::Document.parse(response.body).css('url')
- loc = urls.first.at_css('loc').text
+ get "/news.xml"
+ urls = Nokogiri::XML::Document.parse(response.body).css("url")
+ loc = urls.first.at_css("loc").text
expect(response.status).to eq(200)
expect(loc).to eq("#{Discourse.base_url}/t/#{topic.slug}/#{topic.id}")
- all_urls = urls.map { |u| u.at_css('loc').text }
+ all_urls = urls.map { |u| u.at_css("loc").text }
expect(all_urls).not_to include("#{Discourse.base_url}/t/#{old_topic.slug}/#{old_topic.id}")
end
end
diff --git a/spec/requests/static_controller_spec.rb b/spec/requests/static_controller_spec.rb
index 9f068f447bb..0fc1f68f4aa 100644
--- a/spec/requests/static_controller_spec.rb
+++ b/spec/requests/static_controller_spec.rb
@@ -3,79 +3,70 @@
RSpec.describe StaticController do
fab!(:upload) { Fabricate(:upload) }
- describe '#favicon' do
- let(:filename) { 'smallest.png' }
+ describe "#favicon" do
+ let(:filename) { "smallest.png" }
let(:file) { file_from_fixtures(filename) }
- let(:upload) do
- UploadCreator.new(file, filename).create_for(Discourse.system_user.id)
- end
+ let(:upload) { UploadCreator.new(file, filename).create_for(Discourse.system_user.id) }
- after do
- Discourse.redis.scan_each(match: "memoize_*").each do |key|
- Discourse.redis.del(key)
- end
- end
+ after { Discourse.redis.scan_each(match: "memoize_*").each { |key| Discourse.redis.del(key) } }
- context 'with local store' do
- it 'returns the default favicon if favicon has not been configured' do
- get '/favicon/proxied'
+ context "with local store" do
+ it "returns the default favicon if favicon has not been configured" do
+ get "/favicon/proxied"
expect(response.status).to eq(200)
- expect(response.media_type).to eq('image/png')
+ expect(response.media_type).to eq("image/png")
expect(response.body.bytesize).to eq(SiteIconManager.favicon.filesize)
end
- it 'returns the configured favicon' do
+ it "returns the configured favicon" do
SiteSetting.favicon = upload
- get '/favicon/proxied'
+ get "/favicon/proxied"
expect(response.status).to eq(200)
- expect(response.media_type).to eq('image/png')
+ expect(response.media_type).to eq("image/png")
expect(response.body.bytesize).to eq(upload.filesize)
end
end
- context 'with external store' do
+ context "with external store" do
let(:upload) do
Upload.create!(
- url: '//s3-upload-bucket.s3-us-east-1.amazonaws.com/somewhere/a.png',
+ url: "//s3-upload-bucket.s3-us-east-1.amazonaws.com/somewhere/a.png",
original_filename: filename,
filesize: file.size,
- user_id: Discourse.system_user.id
+ user_id: Discourse.system_user.id,
)
end
- before do
- setup_s3
- end
+ before { setup_s3 }
- it 'can proxy a favicon correctly' do
+ it "can proxy a favicon correctly" do
SiteSetting.favicon = upload
- stub_request(:get, "https:/#{upload.url}")
- .to_return(status: 200, body: file)
+ stub_request(:get, "https:/#{upload.url}").to_return(status: 200, body: file)
- get '/favicon/proxied'
+ get "/favicon/proxied"
expect(response.status).to eq(200)
- expect(response.media_type).to eq('image/png')
+ expect(response.media_type).to eq("image/png")
expect(response.body.bytesize).to eq(upload.filesize)
end
end
end
- describe '#brotli_asset' do
- it 'returns a non brotli encoded 404 if asset is missing' do
+ describe "#brotli_asset" do
+ it "returns a non brotli encoded 404 if asset is missing" do
get "/brotli_asset/missing.js"
expect(response.status).to eq(404)
- expect(response.headers['Content-Encoding']).not_to eq('br')
- expect(response.headers['Cache-Control']).to match(/max-age=1/)
+ expect(response.headers["Content-Encoding"]).not_to eq("br")
+ expect(response.headers["Cache-Control"]).to match(/max-age=1/)
end
- it 'can handle fallback brotli assets' do
+ it "can handle fallback brotli assets" do
begin
assets_path = Rails.root.join("tmp/backup_assets")
@@ -84,7 +75,7 @@ RSpec.describe StaticController do
FileUtils.mkdir_p(assets_path)
file_path = assets_path.join("test.js.br")
- File.write(file_path, 'fake brotli file')
+ File.write(file_path, "fake brotli file")
get "/brotli_asset/test.js"
@@ -95,14 +86,14 @@ RSpec.describe StaticController do
end
end
- it 'has correct headers for brotli assets' do
+ it "has correct headers for brotli assets" do
begin
assets_path = Rails.root.join("public/assets")
FileUtils.mkdir_p(assets_path)
file_path = assets_path.join("test.js.br")
- File.write(file_path, 'fake brotli file')
+ File.write(file_path, "fake brotli file")
get "/brotli_asset/test.js"
@@ -113,14 +104,14 @@ RSpec.describe StaticController do
end
end
- it 'has correct cors headers for brotli assets' do
+ it "has correct cors headers for brotli assets" do
begin
assets_path = Rails.root.join("public/assets")
FileUtils.mkdir_p(assets_path)
file_path = assets_path.join("test.js.br")
- File.write(file_path, 'fake brotli file')
+ File.write(file_path, "fake brotli file")
GlobalSetting.stubs(:cdn_url).returns("https://www.example.com/")
get "/brotli_asset/test.js"
@@ -133,17 +124,19 @@ RSpec.describe StaticController do
end
end
- describe '#cdn_asset' do
- let (:site) { RailsMultisite::ConnectionManagement.current_db }
+ describe "#cdn_asset" do
+ let (:site) {
+ RailsMultisite::ConnectionManagement.current_db
+ }
- it 'can serve assets' do
+ it "can serve assets" do
begin
assets_path = Rails.root.join("public/assets")
FileUtils.mkdir_p(assets_path)
file_path = assets_path.join("test.js.br")
- File.write(file_path, 'fake brotli file')
+ File.write(file_path, "fake brotli file")
get "/cdn_asset/#{site}/test.js.br"
@@ -155,7 +148,7 @@ RSpec.describe StaticController do
end
end
- describe '#show' do
+ describe "#show" do
before do
post = create_post
SiteSetting.tos_topic_id = post.topic.id
@@ -168,16 +161,15 @@ RSpec.describe StaticController do
get "/faq"
expect(response.status).to eq(200)
- expect(response.body).to include(I18n.t('js.faq'))
+ expect(response.body).to include(I18n.t("js.faq"))
expect(response.body).to include("FAQ - Discourse ")
end
end
[
- ['tos', :tos_url, I18n.t('js.tos')],
- ['privacy', :privacy_policy_url, I18n.t('js.privacy')]
+ ["tos", :tos_url, I18n.t("js.tos")],
+ ["privacy", :privacy_policy_url, I18n.t("js.privacy")],
].each do |id, setting_name, text|
-
context "#{id}" do
context "when #{setting_name} site setting is NOT set" do
it "renders the #{id} page" do
@@ -189,14 +181,12 @@ RSpec.describe StaticController do
end
context "when #{setting_name} site setting is set" do
- before do
- SiteSetting.set(setting_name, 'http://example.com/page')
- end
+ before { SiteSetting.set(setting_name, "http://example.com/page") }
it "redirects to the #{setting_name}" do
get "/#{id}"
- expect(response).to redirect_to('http://example.com/page')
+ expect(response).to redirect_to("http://example.com/page")
end
end
end
@@ -221,10 +211,10 @@ RSpec.describe StaticController do
end
end
- it 'should redirect to / when logged in and path is /login' do
+ it "should redirect to / when logged in and path is /login" do
sign_in(Fabricate(:user))
get "/login"
- expect(response).to redirect_to('/')
+ expect(response).to redirect_to("/")
end
it "should display the login template when login is required" do
@@ -234,25 +224,23 @@ RSpec.describe StaticController do
expect(response.status).to eq(200)
- expect(response.body).to include(PrettyText.cook(I18n.t(
- 'login_required.welcome_message', title: SiteSetting.title
- )))
+ expect(response.body).to include(
+ PrettyText.cook(I18n.t("login_required.welcome_message", title: SiteSetting.title)),
+ )
end
context "when login_required is enabled" do
- before do
- SiteSetting.login_required = true
- end
+ before { SiteSetting.login_required = true }
- ['faq', 'guidelines', 'rules', 'conduct'].each do |page_name|
+ %w[faq guidelines rules conduct].each do |page_name|
it "#{page_name} page redirects to login page for anon" do
get "/#{page_name}"
- expect(response).to redirect_to '/login'
+ expect(response).to redirect_to "/login"
end
it "#{page_name} page redirects to login page for anon" do
get "/#{page_name}"
- expect(response).to redirect_to '/login'
+ expect(response).to redirect_to "/login"
end
it "#{page_name} page loads for logged in user" do
@@ -261,14 +249,14 @@ RSpec.describe StaticController do
get "/#{page_name}"
expect(response.status).to eq(200)
- expect(response.body).to include(I18n.t('js.guidelines'))
+ expect(response.body).to include(I18n.t("js.guidelines"))
end
end
end
context "with crawler view" do
it "should include correct title" do
- get '/faq', headers: { 'HTTP_USER_AGENT' => 'Googlebot' }
+ get "/faq", headers: { "HTTP_USER_AGENT" => "Googlebot" }
expect(response.status).to eq(200)
expect(response.body).to include("FAQ - Discourse ")
end
@@ -281,9 +269,7 @@ RSpec.describe StaticController do
end
it "adds new topic-backed pages" do
- routes = Proc.new do
- get "contact" => "static#show", id: "contact"
- end
+ routes = Proc.new { get "contact" => "static#show", :id => "contact" }
Discourse::Application.routes.send(:eval_block, routes)
topic_id = Fabricate(:post, cooked: "contact info").topic_id
@@ -303,9 +289,11 @@ RSpec.describe StaticController do
polish_topic_id = Fabricate(:post, cooked: "Polish FAQ").topic_id
SiteSetting.setting(:test_polish_faq_topic_id, polish_topic_id)
- Plugin::Instance.new.add_topic_static_page("faq") do
- current_user&.locale == "pl" ? "test_polish_faq_topic_id" : "test_faq_topic_id"
- end
+ Plugin::Instance
+ .new
+ .add_topic_static_page("faq") do
+ current_user&.locale == "pl" ? "test_polish_faq_topic_id" : "test_faq_topic_id"
+ end
get "/faq"
@@ -331,72 +319,70 @@ RSpec.describe StaticController do
end
end
- describe '#enter' do
- context 'without a redirect path' do
- it 'redirects to the root url' do
+ describe "#enter" do
+ context "without a redirect path" do
+ it "redirects to the root url" do
post "/login.json"
- expect(response).to redirect_to('/')
+ expect(response).to redirect_to("/")
end
end
- context 'with a redirect path' do
- it 'redirects to the redirect path' do
- post "/login.json", params: { redirect: '/foo' }
- expect(response).to redirect_to('/foo')
+ context "with a redirect path" do
+ it "redirects to the redirect path" do
+ post "/login.json", params: { redirect: "/foo" }
+ expect(response).to redirect_to("/foo")
end
end
- context 'with a full url' do
- it 'redirects to the correct path' do
+ context "with a full url" do
+ it "redirects to the correct path" do
post "/login.json", params: { redirect: "#{Discourse.base_url}/foo" }
- expect(response).to redirect_to('/foo')
+ expect(response).to redirect_to("/foo")
end
end
- context 'with a redirect path with query params' do
- it 'redirects to the redirect path and preserves query params' do
- post "/login.json", params: { redirect: '/foo?bar=1' }
- expect(response).to redirect_to('/foo?bar=1')
+ context "with a redirect path with query params" do
+ it "redirects to the redirect path and preserves query params" do
+ post "/login.json", params: { redirect: "/foo?bar=1" }
+ expect(response).to redirect_to("/foo?bar=1")
end
end
- context 'with a period to force a new host' do
- it 'redirects to the root path' do
+ context "with a period to force a new host" do
+ it "redirects to the root path" do
post "/login.json", params: { redirect: ".org/foo" }
- expect(response).to redirect_to('/')
+ expect(response).to redirect_to("/")
end
end
- context 'with a full url to someone else' do
- it 'redirects to the root path' do
+ context "with a full url to someone else" do
+ it "redirects to the root path" do
post "/login.json", params: { redirect: "http://eviltrout.com/foo" }
- expect(response).to redirect_to('/')
+ expect(response).to redirect_to("/")
end
end
- context 'with an invalid URL' do
+ context "with an invalid URL" do
it "redirects to the root" do
post "/login.json", params: { redirect: "javascript:alert('trout')" }
- expect(response).to redirect_to('/')
+ expect(response).to redirect_to("/")
end
end
- context 'with an array' do
+ context "with an array" do
it "redirects to the root" do
post "/login.json", params: { redirect: ["/foo"] }
expect(response.status).to eq(400)
json = response.parsed_body
expect(json["errors"]).to be_present
- expect(json["errors"]).to include(
- I18n.t("invalid_params", message: "redirect")
- )
+ expect(json["errors"]).to include(I18n.t("invalid_params", message: "redirect"))
end
end
- context 'when the redirect path is the login page' do
- it 'redirects to the root url' do
+ context "when the redirect path is the login page" do
+ it "redirects to the root url" do
post "/login.json", params: { redirect: login_path }
- expect(response).to redirect_to('/')
+ expect(response).to redirect_to("/")
end
end
end
@@ -410,23 +396,32 @@ RSpec.describe StaticController do
end
it "replaces sourcemap URL" do
- Rails.application.assets_manifest.stubs(:find_sources).with("service-worker.js").returns([
- <<~JS
+ Rails
+ .application
+ .assets_manifest
+ .stubs(:find_sources)
+ .with("service-worker.js")
+ .returns([<<~JS])
someFakeServiceWorkerSource();
//# sourceMappingURL=service-worker-abcde.js.map
JS
- ])
{
- '/assets/service-worker.js' => '/assets/service-worker-abcde.js.map',
- '/assets/service-worker.js.br' => '/assets/service-worker-abcde.js.map',
- '/assets/service-worker.br.js' => '/assets/service-worker-abcde.js.map',
- '/assets/service-worker.js.gz' => '/assets/service-worker-abcde.js.map',
- '/assets/service-worker.gz.js' => '/assets/service-worker-abcde.js.map',
- 'https://example.com/assets/service-worker.js' => 'https://example.com/assets/service-worker-abcde.js.map',
- 'https://example.com/subfolder/assets/service-worker.js' => 'https://example.com/subfolder/assets/service-worker-abcde.js.map',
+ "/assets/service-worker.js" => "/assets/service-worker-abcde.js.map",
+ "/assets/service-worker.js.br" => "/assets/service-worker-abcde.js.map",
+ "/assets/service-worker.br.js" => "/assets/service-worker-abcde.js.map",
+ "/assets/service-worker.js.gz" => "/assets/service-worker-abcde.js.map",
+ "/assets/service-worker.gz.js" => "/assets/service-worker-abcde.js.map",
+ "https://example.com/assets/service-worker.js" =>
+ "https://example.com/assets/service-worker-abcde.js.map",
+ "https://example.com/subfolder/assets/service-worker.js" =>
+ "https://example.com/subfolder/assets/service-worker-abcde.js.map",
}.each do |asset_path, expected_map_url|
- ActionController::Base.helpers.stubs(:asset_path).with("service-worker.js").returns(asset_path)
+ ActionController::Base
+ .helpers
+ .stubs(:asset_path)
+ .with("service-worker.js")
+ .returns(asset_path)
get "/service-worker.js"
expect(response.status).to eq(200)
diff --git a/spec/requests/steps_controller_spec.rb b/spec/requests/steps_controller_spec.rb
index ad5f1295b76..5defbd84fe5 100644
--- a/spec/requests/steps_controller_spec.rb
+++ b/spec/requests/steps_controller_spec.rb
@@ -1,52 +1,49 @@
# frozen_string_literal: true
RSpec.describe StepsController do
- before do
- SiteSetting.wizard_enabled = true
- end
+ before { SiteSetting.wizard_enabled = true }
- it 'needs you to be logged in' do
- put "/wizard/steps/made-up-id.json", params: {
- fields: { forum_title: "updated title" }
- }
+ it "needs you to be logged in" do
+ put "/wizard/steps/made-up-id.json", params: { fields: { forum_title: "updated title" } }
expect(response.status).to eq(403)
end
it "raises an error if you aren't an admin" do
sign_in(Fabricate(:moderator))
- put "/wizard/steps/made-up-id.json", params: {
- fields: { forum_title: "updated title" }
- }
+ put "/wizard/steps/made-up-id.json", params: { fields: { forum_title: "updated title" } }
expect(response).to be_forbidden
end
context "as an admin" do
- before do
- sign_in(Fabricate(:admin))
- end
+ before { sign_in(Fabricate(:admin)) }
it "raises an error if the wizard is disabled" do
SiteSetting.wizard_enabled = false
- put "/wizard/steps/introduction.json", params: {
- fields: { contact_email: "eviltrout@example.com" }
- }
+ put "/wizard/steps/introduction.json",
+ params: {
+ fields: {
+ contact_email: "eviltrout@example.com",
+ },
+ }
expect(response).to be_forbidden
end
it "updates properly if you are staff" do
- put "/wizard/steps/introduction.json", params: {
- fields: { title: "FooBar", default_locale: SiteSetting.default_locale }
- }
+ put "/wizard/steps/introduction.json",
+ params: {
+ fields: {
+ title: "FooBar",
+ default_locale: SiteSetting.default_locale,
+ },
+ }
expect(response.status).to eq(200)
end
it "returns errors if the field has them" do
- put "/wizard/steps/introduction.json", params: {
- fields: { title: "" }
- }
+ put "/wizard/steps/introduction.json", params: { fields: { title: "" } }
expect(response.status).to eq(422)
end
diff --git a/spec/requests/stylesheets_controller_spec.rb b/spec/requests/stylesheets_controller_spec.rb
index f5c0e3d0d61..4622d5e163b 100644
--- a/spec/requests/stylesheets_controller_spec.rb
+++ b/spec/requests/stylesheets_controller_spec.rb
@@ -1,10 +1,10 @@
# frozen_string_literal: true
RSpec.describe StylesheetsController do
- it 'can survive cache miss' do
+ it "can survive cache miss" do
StylesheetCache.destroy_all
manager = Stylesheet::Manager.new(theme_id: nil)
- builder = Stylesheet::Manager::Builder.new(target: 'desktop_rtl', manager: manager, theme: nil)
+ builder = Stylesheet::Manager::Builder.new(target: "desktop_rtl", manager: manager, theme: nil)
builder.compile
digest = StylesheetCache.first.digest
@@ -14,7 +14,7 @@ RSpec.describe StylesheetsController do
expect(response.status).to eq(200)
cached = StylesheetCache.first
- expect(cached.target).to eq 'desktop_rtl'
+ expect(cached.target).to eq "desktop_rtl"
expect(cached.digest).to eq digest
# tmp folder destruction and cached
@@ -26,7 +26,7 @@ RSpec.describe StylesheetsController do
# there is an edge case which is ... disk and db cache is nuked, very unlikely to happen
end
- it 'can lookup theme specific css' do
+ it "can lookup theme specific css" do
scheme = ColorScheme.create_from_base(name: "testing", colors: [])
theme = Fabricate(:theme, color_scheme_id: scheme.id)
@@ -45,7 +45,8 @@ RSpec.describe StylesheetsController do
expect(response.status).to eq(200)
- builder = Stylesheet::Manager::Builder.new(target: :desktop_theme, theme: theme, manager: manager)
+ builder =
+ Stylesheet::Manager::Builder.new(target: :desktop_theme, theme: theme, manager: manager)
builder.compile
`rm -rf #{Stylesheet::Manager.cache_fullpath}`
@@ -59,10 +60,10 @@ RSpec.describe StylesheetsController do
expect(response.status).to eq(200)
end
- it 'ignores Accept header and does not include Vary header' do
+ it "ignores Accept header and does not include Vary header" do
StylesheetCache.destroy_all
manager = Stylesheet::Manager.new(theme_id: nil)
- builder = Stylesheet::Manager::Builder.new(target: 'desktop', manager: manager, theme: nil)
+ builder = Stylesheet::Manager::Builder.new(target: "desktop", manager: manager, theme: nil)
builder.compile
digest = StylesheetCache.first.digest
@@ -84,7 +85,7 @@ RSpec.describe StylesheetsController do
end
describe "#color_scheme" do
- it 'works as expected' do
+ it "works as expected" do
scheme = ColorScheme.last
get "/color-scheme-stylesheet/#{scheme.id}.json"
@@ -93,7 +94,7 @@ RSpec.describe StylesheetsController do
expect(json["color_scheme_id"]).to eq(scheme.id)
end
- it 'works with a theme parameter' do
+ it "works with a theme parameter" do
scheme = ColorScheme.last
theme = Theme.last
get "/color-scheme-stylesheet/#{scheme.id}/#{theme.id}.json"
@@ -102,6 +103,5 @@ RSpec.describe StylesheetsController do
json = JSON.parse(response.body)
expect(json["color_scheme_id"]).to eq(scheme.id)
end
-
end
end
diff --git a/spec/requests/svg_sprite_controller_spec.rb b/spec/requests/svg_sprite_controller_spec.rb
index 56494671697..a61634f6e4a 100644
--- a/spec/requests/svg_sprite_controller_spec.rb
+++ b/spec/requests/svg_sprite_controller_spec.rb
@@ -1,10 +1,8 @@
# frozen_string_literal: true
RSpec.describe SvgSpriteController do
- describe '#show' do
- before do
- SvgSprite.expire_cache
- end
+ describe "#show" do
+ before { SvgSprite.expire_cache }
it "should return bundle when version is current" do
get "/svg-sprite/#{Discourse.current_hostname}/svg--#{SvgSprite.version}.js"
@@ -21,21 +19,19 @@ RSpec.describe SvgSpriteController do
random_hash = Digest::SHA1.hexdigest("somerandomstring")
get "/svg-sprite/#{Discourse.current_hostname}/svg--#{random_hash}.js"
- expect(response).to redirect_to(
- "/svg-sprite/test.localhost/svg--#{SvgSprite.version}.js"
- )
+ expect(response).to redirect_to("/svg-sprite/test.localhost/svg--#{SvgSprite.version}.js")
set_cdn_url "//some-cdn.com/site"
get "/svg-sprite/#{Discourse.current_hostname}/svg--#{random_hash}.js"
expect(response).to redirect_to(
- "https://some-cdn.com/site/svg-sprite/test.localhost/svg--#{SvgSprite.version}.js"
+ "https://some-cdn.com/site/svg-sprite/test.localhost/svg--#{SvgSprite.version}.js",
)
end
end
- describe '#search' do
+ describe "#search" do
it "should not work for anons" do
get "/svg-sprite/search/fa-bolt"
expect(response.status).to eq(404)
@@ -46,7 +42,7 @@ RSpec.describe SvgSpriteController do
get "/svg-sprite/search/fa-bolt"
expect(response.status).to eq(200)
- expect(response.body).to include('bolt')
+ expect(response.body).to include("bolt")
end
it "should return 404 when looking for non-existent FA icon" do
@@ -62,7 +58,12 @@ RSpec.describe SvgSpriteController do
upload = UploadCreator.new(file_from_fixtures(fname), fname, for_theme: true).create_for(-1)
- theme.set_field(target: :common, name: SvgSprite.theme_sprite_variable_name, upload_id: upload.id, type: :theme_upload_var)
+ theme.set_field(
+ target: :common,
+ name: SvgSprite.theme_sprite_variable_name,
+ upload_id: upload.id,
+ type: :theme_upload_var,
+ )
theme.save!
SiteSetting.default_theme_id = theme.id
@@ -71,14 +72,14 @@ RSpec.describe SvgSpriteController do
get "/svg-sprite/search/fa-my-custom-theme-icon"
expect(response.status).to eq(200)
- expect(response.body).to include('my-custom-theme-icon')
+ expect(response.body).to include("my-custom-theme-icon")
end
end
- describe '#icon_picker_search' do
- it 'should work with no filter and max out at 200 results' do
+ describe "#icon_picker_search" do
+ it "should work with no filter and max out at 200 results" do
user = sign_in(Fabricate(:user))
- get '/svg-sprite/picker-search'
+ get "/svg-sprite/picker-search"
expect(response.status).to eq(200)
@@ -87,10 +88,10 @@ RSpec.describe SvgSpriteController do
expect(data[0]["id"]).to eq("ad")
end
- it 'should filter' do
+ it "should filter" do
user = sign_in(Fabricate(:user))
- get '/svg-sprite/picker-search', params: { filter: '500px' }
+ get "/svg-sprite/picker-search", params: { filter: "500px" }
expect(response.status).to eq(200)
@@ -100,7 +101,7 @@ RSpec.describe SvgSpriteController do
end
end
- describe '#svg_icon' do
+ describe "#svg_icon" do
it "requires .svg extension" do
get "/svg-sprite/#{Discourse.current_hostname}/icon/bolt"
expect(response.status).to eq(404)
@@ -109,14 +110,14 @@ RSpec.describe SvgSpriteController do
it "returns SVG given an icon name" do
get "/svg-sprite/#{Discourse.current_hostname}/icon/bolt.svg"
expect(response.status).to eq(200)
- expect(response.body).to include('bolt')
+ expect(response.body).to include("bolt")
end
it "returns SVG given an icon name and a color" do
get "/svg-sprite/#{Discourse.current_hostname}/icon/CC0000/fab-github.svg"
expect(response.status).to eq(200)
- expect(response.body).to include('fab-github')
+ expect(response.body).to include("fab-github")
expect(response.body).to include('fill="#CC0000"')
expect(response.headers["Cache-Control"]).to eq("max-age=86400, public, immutable")
end
@@ -125,7 +126,7 @@ RSpec.describe SvgSpriteController do
get "/svg-sprite/#{Discourse.current_hostname}/icon/C00/fab-github.svg"
expect(response.status).to eq(200)
- expect(response.body).to include('fab-github')
+ expect(response.body).to include("fab-github")
expect(response.body).to include('fill="#CC0000"')
expect(response.headers["Cache-Control"]).to eq("max-age=86400, public, immutable")
end
@@ -134,6 +135,5 @@ RSpec.describe SvgSpriteController do
get "/svg-sprite/#{Discourse.current_hostname}/icon/orange/fab-github.svg"
expect(response.status).to eq(404)
end
-
end
end
diff --git a/spec/requests/tag_groups_controller_spec.rb b/spec/requests/tag_groups_controller_spec.rb
index a5222ba32fe..87b49faa37d 100644
--- a/spec/requests/tag_groups_controller_spec.rb
+++ b/spec/requests/tag_groups_controller_spec.rb
@@ -3,11 +3,11 @@
RSpec.describe TagGroupsController do
fab!(:user) { Fabricate(:user) }
- describe '#index' do
+ describe "#index" do
fab!(:tag_group) { Fabricate(:tag_group) }
- describe 'for a non staff user' do
- it 'should not be accessible' do
+ describe "for a non staff user" do
+ it "should not be accessible" do
get "/tag_groups.json"
expect(response.status).to eq(404)
@@ -19,12 +19,10 @@ RSpec.describe TagGroupsController do
end
end
- describe 'for a staff user' do
+ describe "for a staff user" do
fab!(:admin) { Fabricate(:admin) }
- before do
- sign_in(admin)
- end
+ before { sign_in(admin) }
it "should return the right response" do
tag_group
@@ -41,7 +39,7 @@ RSpec.describe TagGroupsController do
end
end
- describe '#search' do
+ describe "#search" do
fab!(:tag) { Fabricate(:tag) }
let(:everyone) { Group::AUTO_GROUPS[:everyone] }
@@ -50,26 +48,26 @@ RSpec.describe TagGroupsController do
let(:full) { TagGroupPermission.permission_types[:full] }
let(:readonly) { TagGroupPermission.permission_types[:readonly] }
- context 'for anons' do
- it 'returns the tag group with the associated tag names' do
+ context "for anons" do
+ it "returns the tag group with the associated tag names" do
tag_group = tag_group_with_permission(everyone, readonly)
tag_group2 = tag_group_with_permission(everyone, readonly)
- get '/tag_groups/filter/search.json'
+ get "/tag_groups/filter/search.json"
expect(response.status).to eq(200)
results = JSON.parse(response.body, symbolize_names: true).fetch(:results)
expect(results).to contain_exactly(
{ name: tag_group.name, tag_names: [tag.name] },
- { name: tag_group2.name, tag_names: [tag.name] }
+ { name: tag_group2.name, tag_names: [tag.name] },
)
end
- it 'returns an empty array if the tag group is private' do
+ it "returns an empty array if the tag group is private" do
tag_group_with_permission(staff, full)
- get '/tag_groups/filter/search.json'
+ get "/tag_groups/filter/search.json"
expect(response.status).to eq(200)
results = JSON.parse(response.body, symbolize_names: true).fetch(:results)
@@ -78,13 +76,13 @@ RSpec.describe TagGroupsController do
end
end
- context 'for regular users' do
+ context "for regular users" do
before { sign_in(user) }
- it 'returns the tag group with the associated tag names' do
+ it "returns the tag group with the associated tag names" do
tag_group = tag_group_with_permission(everyone, readonly)
- get '/tag_groups/filter/search.json'
+ get "/tag_groups/filter/search.json"
expect(response.status).to eq(200)
results = JSON.parse(response.body, symbolize_names: true).fetch(:results)
@@ -93,10 +91,10 @@ RSpec.describe TagGroupsController do
expect(results.first[:tag_names]).to contain_exactly(tag.name)
end
- it 'returns an empty array if the tag group is private' do
+ it "returns an empty array if the tag group is private" do
tag_group_with_permission(staff, full)
- get '/tag_groups/filter/search.json'
+ get "/tag_groups/filter/search.json"
expect(response.status).to eq(200)
results = JSON.parse(response.body, symbolize_names: true).fetch(:results)
@@ -104,11 +102,11 @@ RSpec.describe TagGroupsController do
expect(results).to be_empty
end
- it 'finds exact case-insensitive matches using the `names` param' do
+ it "finds exact case-insensitive matches using the `names` param" do
tag_group_with_permission(everyone, readonly, name: "Whee")
tag_group_with_permission(everyone, readonly, name: "Whee Two")
- get '/tag_groups/filter/search.json', params: { names: ["WHEE"] }
+ get "/tag_groups/filter/search.json", params: { names: ["WHEE"] }
expect(response.status).to eq(200)
results = JSON.parse(response.body, symbolize_names: true).fetch(:results)
@@ -117,12 +115,12 @@ RSpec.describe TagGroupsController do
expect(results.first[:name]).to eq("Whee")
end
- it 'finds partial matches using the `q` param' do
+ it "finds partial matches using the `q` param" do
tag_group_with_permission(everyone, readonly, name: "Whee")
tag_group_with_permission(everyone, readonly, name: "Woop")
tag_group_with_permission(everyone, readonly, name: "Hoop")
- get '/tag_groups/filter/search.json', params: { q: "oop" }
+ get "/tag_groups/filter/search.json", params: { q: "oop" }
expect(response.status).to eq(200)
results = JSON.parse(response.body, symbolize_names: true).fetch(:results)
@@ -131,7 +129,6 @@ RSpec.describe TagGroupsController do
expect(results.first[:name]).to eq("Hoop")
expect(results.last[:name]).to eq("Woop")
end
-
end
def tag_group_with_permission(auto_group, permission_type, name: nil)
diff --git a/spec/requests/tags_controller_spec.rb b/spec/requests/tags_controller_spec.rb
index bf19d91c0e0..ba044221206 100644
--- a/spec/requests/tags_controller_spec.rb
+++ b/spec/requests/tags_controller_spec.rb
@@ -5,17 +5,15 @@ RSpec.describe TagsController do
fab!(:admin) { Fabricate(:admin) }
fab!(:regular_user) { Fabricate(:trust_level_4) }
fab!(:moderator) { Fabricate(:moderator) }
- fab!(:category) { Fabricate(:category) }
+ fab!(:category) { Fabricate(:category) }
fab!(:subcategory) { Fabricate(:category, parent_category_id: category.id) }
- before do
- SiteSetting.tagging_enabled = true
- end
+ before { SiteSetting.tagging_enabled = true }
- describe '#index' do
- fab!(:test_tag) { Fabricate(:tag, name: 'test') }
- fab!(:topic_tag) { Fabricate(:tag, name: 'topic-test', topic_count: 1) }
- fab!(:synonym) { Fabricate(:tag, name: 'synonym', target_tag: topic_tag) }
+ describe "#index" do
+ fab!(:test_tag) { Fabricate(:tag, name: "test") }
+ fab!(:topic_tag) { Fabricate(:tag, name: "topic-test", topic_count: 1) }
+ fab!(:synonym) { Fabricate(:tag, name: "synonym", target_tag: topic_tag) }
shared_examples "successfully retrieve tags with topic_count > 0" do
it "should return the right response" do
@@ -25,7 +23,7 @@ RSpec.describe TagsController do
tags = response.parsed_body["tags"]
expect(tags.length).to eq(1)
- expect(tags[0]['text']).to eq("topic-test")
+ expect(tags[0]["text"]).to eq("topic-test")
end
end
@@ -36,9 +34,7 @@ RSpec.describe TagsController do
Fabricate(
:private_message_topic,
tags: [test_tag],
- topic_allowed_users: [
- Fabricate.build(:topic_allowed_user, user: admin)
- ]
+ topic_allowed_users: [Fabricate.build(:topic_allowed_user, user: admin)],
)
end
@@ -89,10 +85,10 @@ RSpec.describe TagsController do
tags = response.parsed_body["tags"]
expect(tags.length).to eq(0)
- group = response.parsed_body.dig('extras', 'tag_groups')&.first
+ group = response.parsed_body.dig("extras", "tag_groups")&.first
expect(group).to be_present
- expect(group['tags'].length).to eq(2)
- expect(group['tags'].map { |t| t['id'] }).to contain_exactly(test_tag.name, topic_tag.name)
+ expect(group["tags"].length).to eq(2)
+ expect(group["tags"].map { |t| t["id"] }).to contain_exactly(test_tag.name, topic_tag.name)
end
end
@@ -115,9 +111,7 @@ RSpec.describe TagsController do
end
context "with hidden tags" do
- before do
- create_hidden_tags(["staff1"])
- end
+ before { create_hidden_tags(["staff1"]) }
it "is returned to admins" do
sign_in(admin)
@@ -140,9 +134,7 @@ RSpec.describe TagsController do
end
context "when restricted to a category" do
- before do
- category.tags = [Tag.find_by_name("staff1")]
- end
+ before { category.tags = [Tag.find_by_name("staff1")] }
it "is returned to admins" do
sign_in(admin)
@@ -168,9 +160,7 @@ RSpec.describe TagsController do
end
context "when listed by group" do
- before do
- SiteSetting.tags_listed_by_group = true
- end
+ before { SiteSetting.tags_listed_by_group = true }
it "is returned to admins" do
sign_in(admin)
@@ -197,8 +187,8 @@ RSpec.describe TagsController do
end
end
- describe '#show' do
- fab!(:tag) { Fabricate(:tag, name: 'test') }
+ describe "#show" do
+ fab!(:tag) { Fabricate(:tag, name: "test") }
fab!(:topic_without_tags) { Fabricate(:topic) }
fab!(:topic_with_tags) { Fabricate(:topic, tags: [tag]) }
@@ -243,36 +233,20 @@ RSpec.describe TagsController do
sign_in(admin)
get "/tag/none.json"
- expect(response.parsed_body['topic_list']['topics'].length).to eq(1)
+ expect(response.parsed_body["topic_list"]["topics"].length).to eq(1)
end
context "with a category in the path" do
- fab!(:topic_in_category) {
- Fabricate(
- :topic,
- tags: [tag],
- category: category
- )
- }
+ fab!(:topic_in_category) { Fabricate(:topic, tags: [tag], category: category) }
- fab!(:topic_in_category_without_tag) {
- Fabricate(
- :topic,
- category: category
- )
- }
+ fab!(:topic_in_category_without_tag) { Fabricate(:topic, category: category) }
- fab!(:topic_out_of_category) {
- Fabricate(
- :topic,
- tags: [tag]
- )
- }
+ fab!(:topic_out_of_category) { Fabricate(:topic, tags: [tag]) }
it "should produce the topic inside the category and not the topic outside of it" do
get "/tags/c/#{category.slug}/#{tag.name}.json"
- topic_ids = response.parsed_body['topic_list']['topics'].map { |x| x['id'] }
+ topic_ids = response.parsed_body["topic_list"]["topics"].map { |x| x["id"] }
expect(topic_ids).to include(topic_in_category.id)
expect(topic_ids).to_not include(topic_out_of_category.id)
expect(topic_ids).to_not include(topic_in_category_without_tag.id)
@@ -281,8 +255,9 @@ RSpec.describe TagsController do
it "should produce the right next topic URL" do
get "/tags/c/#{category.slug_path.join("/")}/#{category.id}/#{tag.name}.json?per_page=1"
- expect(response.parsed_body['topic_list']['more_topics_url'])
- .to start_with("/tags/c/#{category.slug_path.join('/')}/#{category.id}/#{tag.name}")
+ expect(response.parsed_body["topic_list"]["more_topics_url"]).to start_with(
+ "/tags/c/#{category.slug_path.join("/")}/#{category.id}/#{tag.name}",
+ )
end
it "should 404 for invalid category path" do
@@ -300,32 +275,16 @@ RSpec.describe TagsController do
end
context "with a subcategory in the path" do
- fab!(:topic_in_subcategory) {
- Fabricate(
- :topic,
- tags: [tag],
- category: subcategory
- )
- }
+ fab!(:topic_in_subcategory) { Fabricate(:topic, tags: [tag], category: subcategory) }
- fab!(:topic_in_subcategory_without_tag) {
- Fabricate(
- :topic,
- category: subcategory
- )
- }
+ fab!(:topic_in_subcategory_without_tag) { Fabricate(:topic, category: subcategory) }
- fab!(:topic_out_of_subcategory) {
- Fabricate(
- :topic,
- tags: [tag]
- )
- }
+ fab!(:topic_out_of_subcategory) { Fabricate(:topic, tags: [tag]) }
it "should produce the topic inside the subcategory and not the topic outside of it" do
get "/tags/c/#{category.slug}/#{subcategory.slug}/#{tag.name}.json"
- topic_ids = response.parsed_body['topic_list']['topics'].map { |x| x['id'] }
+ topic_ids = response.parsed_body["topic_list"]["topics"].map { |x| x["id"] }
expect(topic_ids).to include(topic_in_subcategory.id)
expect(topic_ids).to_not include(topic_out_of_subcategory.id)
expect(topic_ids).to_not include(topic_in_subcategory_without_tag.id)
@@ -333,9 +292,9 @@ RSpec.describe TagsController do
end
end
- describe '#info' do
- fab!(:tag) { Fabricate(:tag, name: 'test') }
- let(:synonym) { Fabricate(:tag, name: 'synonym', target_tag: tag) }
+ describe "#info" do
+ fab!(:tag) { Fabricate(:tag, name: "test") }
+ let(:synonym) { Fabricate(:tag, name: "synonym", target_tag: tag) }
it "returns 404 if tag not found" do
get "/tag/nope/info.json"
@@ -345,26 +304,28 @@ RSpec.describe TagsController do
it "can handle tag with no synonyms" do
get "/tag/#{tag.name}/info.json"
expect(response.status).to eq(200)
- expect(response.parsed_body.dig('tag_info', 'name')).to eq(tag.name)
- expect(response.parsed_body.dig('tag_info', 'synonyms')).to be_empty
- expect(response.parsed_body.dig('tag_info', 'category_ids')).to be_empty
- expect(response.parsed_body.dig('tag_info', 'category_restricted')).to eq(false)
+ expect(response.parsed_body.dig("tag_info", "name")).to eq(tag.name)
+ expect(response.parsed_body.dig("tag_info", "synonyms")).to be_empty
+ expect(response.parsed_body.dig("tag_info", "category_ids")).to be_empty
+ expect(response.parsed_body.dig("tag_info", "category_restricted")).to eq(false)
end
it "can handle a synonym" do
get "/tag/#{synonym.name}/info.json"
expect(response.status).to eq(200)
- expect(response.parsed_body.dig('tag_info', 'name')).to eq(synonym.name)
- expect(response.parsed_body.dig('tag_info', 'synonyms')).to be_empty
- expect(response.parsed_body.dig('tag_info', 'category_ids')).to be_empty
- expect(response.parsed_body.dig('tag_info', 'category_restricted')).to eq(false)
+ expect(response.parsed_body.dig("tag_info", "name")).to eq(synonym.name)
+ expect(response.parsed_body.dig("tag_info", "synonyms")).to be_empty
+ expect(response.parsed_body.dig("tag_info", "category_ids")).to be_empty
+ expect(response.parsed_body.dig("tag_info", "category_restricted")).to eq(false)
end
it "can return a tag's synonyms" do
synonym
get "/tag/#{tag.name}/info.json"
expect(response.status).to eq(200)
- expect(response.parsed_body.dig('tag_info', 'synonyms').map { |t| t['text'] }).to eq([synonym.name])
+ expect(response.parsed_body.dig("tag_info", "synonyms").map { |t| t["text"] }).to eq(
+ [synonym.name],
+ )
end
it "returns 404 if tag is staff-only" do
@@ -387,56 +348,62 @@ RSpec.describe TagsController do
category2.update!(tag_groups: [tag_group])
staff_category = Fabricate(:private_category, group: Fabricate(:group), tags: [tag])
get "/tag/#{tag.name}/info.json"
- expect(response.parsed_body.dig('tag_info', 'category_ids')).to contain_exactly(category.id, category2.id)
- expect(response.parsed_body['categories']).to be_present
- expect(response.parsed_body.dig('tag_info', 'category_restricted')).to eq(true)
+ expect(response.parsed_body.dig("tag_info", "category_ids")).to contain_exactly(
+ category.id,
+ category2.id,
+ )
+ expect(response.parsed_body["categories"]).to be_present
+ expect(response.parsed_body.dig("tag_info", "category_restricted")).to eq(true)
end
- context 'when tag belongs to a tag group' do
+ context "when tag belongs to a tag group" do
fab!(:tag_group) { Fabricate(:tag_group, tags: [tag]) }
it "returns tag groups if tag groups are visible" do
SiteSetting.tags_listed_by_group = true
get "/tag/#{tag.name}/info.json"
- expect(response.parsed_body.dig('tag_info', 'tag_group_names')).to eq([tag_group.name])
+ expect(response.parsed_body.dig("tag_info", "tag_group_names")).to eq([tag_group.name])
end
it "doesn't return tag groups if tag groups aren't visible" do
SiteSetting.tags_listed_by_group = false
get "/tag/#{tag.name}/info.json"
- expect(response.parsed_body['tag_info'].has_key?('tag_group_names')).to eq(false)
+ expect(response.parsed_body["tag_info"].has_key?("tag_group_names")).to eq(false)
end
context "when restricted to a private category" do
let!(:private_category) do
- Fabricate(:private_category,
+ Fabricate(
+ :private_category,
group: Fabricate(:group),
tag_groups: [tag_group],
- allow_global_tags: true
+ allow_global_tags: true,
)
end
it "can return categories to users who can access them" do
sign_in(admin)
get "/tag/#{tag.name}/info.json"
- expect(response.parsed_body.dig('tag_info', 'category_ids')).to contain_exactly(private_category.id)
- expect(response.parsed_body['categories']).to be_present
- expect(response.parsed_body.dig('tag_info', 'category_restricted')).to eq(true)
+ expect(response.parsed_body.dig("tag_info", "category_ids")).to contain_exactly(
+ private_category.id,
+ )
+ expect(response.parsed_body["categories"]).to be_present
+ expect(response.parsed_body.dig("tag_info", "category_restricted")).to eq(true)
end
it "can indicate category restriction to users who can't access them" do
sign_in(user)
get "/tag/#{tag.name}/info.json"
- expect(response.parsed_body.dig('tag_info', 'category_ids')).to be_empty
- expect(response.parsed_body['categories']).to be_blank
- expect(response.parsed_body.dig('tag_info', 'category_restricted')).to eq(true)
+ expect(response.parsed_body.dig("tag_info", "category_ids")).to be_empty
+ expect(response.parsed_body["categories"]).to be_blank
+ expect(response.parsed_body.dig("tag_info", "category_restricted")).to eq(true)
end
it "can indicate category restriction to anon" do
get "/tag/#{tag.name}/info.json"
- expect(response.parsed_body.dig('tag_info', 'category_ids')).to be_empty
- expect(response.parsed_body['categories']).to be_blank
- expect(response.parsed_body.dig('tag_info', 'category_restricted')).to eq(true)
+ expect(response.parsed_body.dig("tag_info", "category_ids")).to be_empty
+ expect(response.parsed_body["categories"]).to be_blank
+ expect(response.parsed_body.dig("tag_info", "category_restricted")).to eq(true)
end
end
end
@@ -451,33 +418,32 @@ RSpec.describe TagsController do
end
it "triggers a extensibility event" do
- event = DiscourseEvent.track_events {
- put "/tag/#{tag.name}.json", params: {
- tag: {
- id: 'hello'
- }
- }
- }.last
+ event =
+ DiscourseEvent
+ .track_events { put "/tag/#{tag.name}.json", params: { tag: { id: "hello" } } }
+ .last
expect(event[:event_name]).to eq(:tag_updated)
expect(event[:params].first).to eq(tag)
end
end
- describe '#personal_messages' do
+ describe "#personal_messages" do
fab!(:personal_message) do
- Fabricate(:private_message_topic, user: regular_user, topic_allowed_users: [
- Fabricate.build(:topic_allowed_user, user: regular_user),
- Fabricate.build(:topic_allowed_user, user: moderator),
- Fabricate.build(:topic_allowed_user, user: admin)
- ])
+ Fabricate(
+ :private_message_topic,
+ user: regular_user,
+ topic_allowed_users: [
+ Fabricate.build(:topic_allowed_user, user: regular_user),
+ Fabricate.build(:topic_allowed_user, user: moderator),
+ Fabricate.build(:topic_allowed_user, user: admin),
+ ],
+ )
end
- fab!(:tag) { Fabricate(:tag, topics: [personal_message], name: 'test') }
+ fab!(:tag) { Fabricate(:tag, topics: [personal_message], name: "test") }
- before do
- SiteSetting.pm_tags_allowed_for_groups = "1|2|3"
- end
+ before { SiteSetting.pm_tags_allowed_for_groups = "1|2|3" }
context "as a regular user" do
it "can't see pm tags" do
@@ -488,9 +454,7 @@ RSpec.describe TagsController do
end
context "as an moderator" do
- before do
- sign_in(moderator)
- end
+ before { sign_in(moderator) }
it "can't see pm tags for regular user" do
get "/tags/personal_messages/#{regular_user.username}.json"
@@ -503,23 +467,21 @@ RSpec.describe TagsController do
expect(response.status).to eq(200)
- tag = response.parsed_body['tags']
- expect(tag[0]["id"]).to eq('test')
+ tag = response.parsed_body["tags"]
+ expect(tag[0]["id"]).to eq("test")
end
end
context "as an admin" do
- before do
- sign_in(admin)
- end
+ before { sign_in(admin) }
it "can see pm tags for regular user" do
get "/tags/personal_messages/#{regular_user.username}.json"
expect(response.status).to eq(200)
- tag = response.parsed_body['tags']
- expect(tag[0]["id"]).to eq('test')
+ tag = response.parsed_body["tags"]
+ expect(tag[0]["id"]).to eq("test")
end
it "can see their own pm tags" do
@@ -527,11 +489,11 @@ RSpec.describe TagsController do
expect(response.status).to eq(200)
- tag = response.parsed_body['tags']
- expect(tag[0]["id"]).to eq('test')
+ tag = response.parsed_body["tags"]
+ expect(tag[0]["id"]).to eq("test")
end
- it 'works with usernames with a period' do
+ it "works with usernames with a period" do
admin.update!(username: "test.test")
get "/tags/personal_messages/#{admin.username}.json"
@@ -541,16 +503,16 @@ RSpec.describe TagsController do
end
end
- describe '#show_latest' do
- fab!(:tag) { Fabricate(:tag) }
+ describe "#show_latest" do
+ fab!(:tag) { Fabricate(:tag) }
fab!(:other_tag) { Fabricate(:tag) }
fab!(:third_tag) { Fabricate(:tag) }
fab!(:single_tag_topic) { Fabricate(:topic, tags: [tag]) }
- fab!(:multi_tag_topic) { Fabricate(:topic, tags: [tag, other_tag]) }
- fab!(:all_tag_topic) { Fabricate(:topic, tags: [tag, other_tag, third_tag]) }
+ fab!(:multi_tag_topic) { Fabricate(:topic, tags: [tag, other_tag]) }
+ fab!(:all_tag_topic) { Fabricate(:topic, tags: [tag, other_tag, third_tag]) }
- context 'with tagging disabled' do
+ context "with tagging disabled" do
it "returns 404" do
SiteSetting.tagging_enabled = false
get "/tag/#{tag.name}/l/latest.json"
@@ -558,10 +520,9 @@ RSpec.describe TagsController do
end
end
- context 'with tagging enabled' do
+ context "with tagging enabled" do
def parse_topic_ids
- response.parsed_body["topic_list"]["topics"]
- .map { |topic| topic["id"] }
+ response.parsed_body["topic_list"]["topics"].map { |topic| topic["id"] }
end
it "can filter by tag" do
@@ -576,11 +537,11 @@ RSpec.describe TagsController do
end
it "can filter by two tags" do
- single_tag_topic; multi_tag_topic; all_tag_topic
+ single_tag_topic
+ multi_tag_topic
+ all_tag_topic
- get "/tag/#{tag.name}/l/latest.json", params: {
- additional_tag_ids: other_tag.name
- }
+ get "/tag/#{tag.name}/l/latest.json", params: { additional_tag_ids: other_tag.name }
expect(response.status).to eq(200)
@@ -591,11 +552,14 @@ RSpec.describe TagsController do
end
it "can filter by multiple tags" do
- single_tag_topic; multi_tag_topic; all_tag_topic
+ single_tag_topic
+ multi_tag_topic
+ all_tag_topic
- get "/tag/#{tag.name}/l/latest.json", params: {
- additional_tag_ids: "#{other_tag.name}/#{third_tag.name}"
- }
+ get "/tag/#{tag.name}/l/latest.json",
+ params: {
+ additional_tag_ids: "#{other_tag.name}/#{third_tag.name}",
+ }
expect(response.status).to eq(200)
@@ -608,9 +572,7 @@ RSpec.describe TagsController do
it "does not find any tags when a tag which doesn't exist is passed" do
single_tag_topic
- get "/tag/#{tag.name}/l/latest.json", params: {
- additional_tag_ids: "notatag"
- }
+ get "/tag/#{tag.name}/l/latest.json", params: { additional_tag_ids: "notatag" }
expect(response.status).to eq(200)
@@ -635,11 +597,13 @@ RSpec.describe TagsController do
it "can handle subcategories with the same name" do
category2 = Fabricate(:category)
- subcategory2 = Fabricate(:category,
- parent_category_id: category2.id,
- name: subcategory.name,
- slug: subcategory.slug
- )
+ subcategory2 =
+ Fabricate(
+ :category,
+ parent_category_id: category2.id,
+ name: subcategory.name,
+ slug: subcategory.slug,
+ )
t = Fabricate(:topic, category_id: subcategory2.id, tags: [other_tag])
get "/tags/c/#{category2.slug}/#{subcategory2.slug}/#{other_tag.name}/l/latest.json"
@@ -650,9 +614,7 @@ RSpec.describe TagsController do
end
context "when logged in" do
- before do
- sign_in(user)
- end
+ before { sign_in(user) }
it "can filter by bookmarked" do
get "/tag/#{tag.name}/l/bookmarks.json"
@@ -665,7 +627,7 @@ RSpec.describe TagsController do
TagUser.create!(
user_id: user.id,
tag_id: tag.id,
- notification_level: CategoryUser.notification_levels[:muted]
+ notification_level: CategoryUser.notification_levels[:muted],
)
end
@@ -694,16 +656,16 @@ RSpec.describe TagsController do
end
end
- describe '#show_top' do
- fab!(:tag) { Fabricate(:tag) }
+ describe "#show_top" do
+ fab!(:tag) { Fabricate(:tag) }
fab!(:category) { Fabricate(:category) }
fab!(:topic) { Fabricate(:topic, category: category) }
- fab!(:tag_topic) { Fabricate(:topic, category: category, tags: [tag]) }
- fab!(:tag_topic2) { Fabricate(:topic, category: category, tags: [tag]) }
+ fab!(:tag_topic) { Fabricate(:topic, category: category, tags: [tag]) }
+ fab!(:tag_topic2) { Fabricate(:topic, category: category, tags: [tag]) }
before do
- SiteSetting.top_page_default_timeframe = 'all'
+ SiteSetting.top_page_default_timeframe = "all"
TopTopic.create!(topic: topic, all_score: 1)
TopTopic.create!(topic: tag_topic, all_score: 1)
TopTopic.create!(topic: tag_topic2, daily_score: 1)
@@ -741,96 +703,109 @@ RSpec.describe TagsController do
end
end
- describe '#search' do
- context 'with tagging disabled' do
+ describe "#search" do
+ context "with tagging disabled" do
it "returns 404" do
SiteSetting.tagging_enabled = false
- get "/tags/filter/search.json", params: { q: 'stuff' }
+ get "/tags/filter/search.json", params: { q: "stuff" }
expect(response.status).to eq(404)
end
end
- context 'with tagging enabled' do
+ context "with tagging enabled" do
it "can return some tags" do
- tag_names = ['stuff', 'stinky', 'stumped']
+ tag_names = %w[stuff stinky stumped]
tag_names.each { |name| Fabricate(:tag, name: name) }
- get "/tags/filter/search.json", params: { q: 'stu' }
+ get "/tags/filter/search.json", params: { q: "stu" }
expect(response.status).to eq(200)
- expect(response.parsed_body["results"].map { |j| j["id"] }.sort).to eq(['stuff', 'stumped'])
+ expect(response.parsed_body["results"].map { |j| j["id"] }.sort).to eq(%w[stuff stumped])
end
it "returns tags ordered by topic_count, and prioritises exact matches" do
- Fabricate(:tag, name: 'tag1', topic_count: 10)
- Fabricate(:tag, name: 'tag2', topic_count: 100)
- Fabricate(:tag, name: 'tag', topic_count: 1)
+ Fabricate(:tag, name: "tag1", topic_count: 10)
+ Fabricate(:tag, name: "tag2", topic_count: 100)
+ Fabricate(:tag, name: "tag", topic_count: 1)
- get '/tags/filter/search.json', params: { q: 'tag', limit: 2 }
+ get "/tags/filter/search.json", params: { q: "tag", limit: 2 }
expect(response.status).to eq(200)
- expect(response.parsed_body['results'].map { |j| j['id'] }).to eq(['tag', 'tag2'])
+ expect(response.parsed_body["results"].map { |j| j["id"] }).to eq(%w[tag tag2])
end
- context 'with category restriction' do
- fab!(:yup) { Fabricate(:tag, name: 'yup') }
+ context "with category restriction" do
+ fab!(:yup) { Fabricate(:tag, name: "yup") }
fab!(:category) { Fabricate(:category, tags: [yup]) }
it "can say if given tag is not allowed" do
- nope = Fabricate(:tag, name: 'nope')
+ nope = Fabricate(:tag, name: "nope")
get "/tags/filter/search.json", params: { q: nope.name, categoryId: category.id }
expect(response.status).to eq(200)
expect(response.parsed_body["results"].map { |j| j["id"] }.sort).to eq([])
expect(response.parsed_body["forbidden"]).to be_present
- expect(response.parsed_body["forbidden_message"]).to eq(I18n.t("tags.forbidden.in_this_category", tag_name: nope.name))
+ expect(response.parsed_body["forbidden_message"]).to eq(
+ I18n.t("tags.forbidden.in_this_category", tag_name: nope.name),
+ )
end
it "can say if given tag is restricted to different category" do
category
- get "/tags/filter/search.json", params: { q: yup.name, categoryId: Fabricate(:category).id }
+ get "/tags/filter/search.json",
+ params: {
+ q: yup.name,
+ categoryId: Fabricate(:category).id,
+ }
expect(response.parsed_body["results"].map { |j| j["id"] }.sort).to eq([])
expect(response.parsed_body["forbidden"]).to be_present
- expect(response.parsed_body["forbidden_message"]).to eq(I18n.t(
- "tags.forbidden.restricted_to",
- count: 1,
- tag_name: yup.name,
- category_names: category.name
- ))
+ expect(response.parsed_body["forbidden_message"]).to eq(
+ I18n.t(
+ "tags.forbidden.restricted_to",
+ count: 1,
+ tag_name: yup.name,
+ category_names: category.name,
+ ),
+ )
end
it "can filter on category without q param" do
- nope = Fabricate(:tag, name: 'nope')
+ nope = Fabricate(:tag, name: "nope")
get "/tags/filter/search.json", params: { categoryId: category.id }
expect(response.status).to eq(200)
expect(response.parsed_body["results"].map { |j| j["id"] }.sort).to eq([yup.name])
end
end
- context 'with synonyms' do
- fab!(:tag) { Fabricate(:tag, name: 'plant') }
- fab!(:synonym) { Fabricate(:tag, name: 'plants', target_tag: tag) }
+ context "with synonyms" do
+ fab!(:tag) { Fabricate(:tag, name: "plant") }
+ fab!(:synonym) { Fabricate(:tag, name: "plants", target_tag: tag) }
it "can return synonyms" do
- get "/tags/filter/search.json", params: { q: 'plant' }
+ get "/tags/filter/search.json", params: { q: "plant" }
expect(response.status).to eq(200)
- expect(response.parsed_body['results'].map { |j| j['id'] }).to contain_exactly('plant', 'plants')
+ expect(response.parsed_body["results"].map { |j| j["id"] }).to contain_exactly(
+ "plant",
+ "plants",
+ )
end
it "can omit synonyms" do
- get "/tags/filter/search.json", params: { q: 'plant', excludeSynonyms: 'true' }
+ get "/tags/filter/search.json", params: { q: "plant", excludeSynonyms: "true" }
expect(response.status).to eq(200)
- expect(response.parsed_body['results'].map { |j| j['id'] }).to contain_exactly('plant')
+ expect(response.parsed_body["results"].map { |j| j["id"] }).to contain_exactly("plant")
end
it "can return a message about synonyms not being allowed" do
- get "/tags/filter/search.json", params: { q: 'plants', excludeSynonyms: 'true' }
+ get "/tags/filter/search.json", params: { q: "plants", excludeSynonyms: "true" }
expect(response.status).to eq(200)
expect(response.parsed_body["results"].map { |j| j["id"] }.sort).to eq([])
expect(response.parsed_body["forbidden"]).to be_present
- expect(response.parsed_body["forbidden_message"]).to eq(I18n.t("tags.forbidden.synonym", tag_name: tag.name))
+ expect(response.parsed_body["forbidden_message"]).to eq(
+ I18n.t("tags.forbidden.synonym", tag_name: tag.name),
+ )
end
end
it "matches tags after sanitizing input" do
- yup, nope = Fabricate(:tag, name: 'yup'), Fabricate(:tag, name: 'nope')
- get "/tags/filter/search.json", params: { q: 'N/ope' }
+ yup, nope = Fabricate(:tag, name: "yup"), Fabricate(:tag, name: "nope")
+ get "/tags/filter/search.json", params: { q: "N/ope" }
expect(response.status).to eq(200)
expect(response.parsed_body["results"].map { |j| j["id"] }.sort).to eq(["nope"])
end
@@ -840,59 +815,80 @@ RSpec.describe TagsController do
Fabricate(:topic, category: c, tags: [Fabricate(:tag, name: "cooltag")])
get "/tags/filter/search.json", params: { q: "cool" }
expect(response.status).to eq(200)
- expect(response.parsed_body["results"].map { |j| j["id"] }).to eq(['cooltag'])
+ expect(response.parsed_body["results"].map { |j| j["id"] }).to eq(["cooltag"])
end
it "supports Chinese and Russian" do
- tag_names = ['房地产', 'тема-в-разработке']
+ tag_names = %w[房地产 тема-в-разработке]
tag_names.each { |name| Fabricate(:tag, name: name) }
- get "/tags/filter/search.json", params: { q: '房' }
+ get "/tags/filter/search.json", params: { q: "房" }
expect(response.status).to eq(200)
- expect(response.parsed_body["results"].map { |j| j["id"] }).to eq(['房地产'])
+ expect(response.parsed_body["results"].map { |j| j["id"] }).to eq(["房地产"])
- get "/tags/filter/search.json", params: { q: 'тема' }
+ get "/tags/filter/search.json", params: { q: "тема" }
expect(response.status).to eq(200)
- expect(response.parsed_body["results"].map { |j| j["id"] }).to eq(['тема-в-разработке'])
+ expect(response.parsed_body["results"].map { |j| j["id"] }).to eq(["тема-в-разработке"])
end
it "can return all the results" do
- tag_group1 = Fabricate(:tag_group, tag_names: ['common1', 'common2', 'group1tag', 'group1tag2'])
- tag_group2 = Fabricate(:tag_group, tag_names: ['common1', 'common2'])
+ tag_group1 = Fabricate(:tag_group, tag_names: %w[common1 common2 group1tag group1tag2])
+ tag_group2 = Fabricate(:tag_group, tag_names: %w[common1 common2])
category = Fabricate(:category, tag_groups: [tag_group1])
- get "/tags/filter/search.json", params: { q: '', limit: 5, categoryId: category.id, filterForInput: 'true' }
+ get "/tags/filter/search.json",
+ params: {
+ q: "",
+ limit: 5,
+ categoryId: category.id,
+ filterForInput: "true",
+ }
expect(response.status).to eq(200)
expect_same_tag_names(
response.parsed_body["results"].map { |j| j["id"] },
- ['common1', 'common2', 'group1tag', 'group1tag2']
+ %w[common1 common2 group1tag group1tag2],
)
end
- it 'returns error 400 for negative limit' do
- get "/tags/filter/search.json", params: { q: '', limit: -1 }
+ it "returns error 400 for negative limit" do
+ get "/tags/filter/search.json", params: { q: "", limit: -1 }
expect(response.status).to eq(400)
- expect(response.parsed_body['errors'].first).to eq(I18n.t('invalid_params', message: 'limit'))
+ expect(response.parsed_body["errors"].first).to eq(
+ I18n.t("invalid_params", message: "limit"),
+ )
end
- it 'includes required tag group information' do
+ it "includes required tag group information" do
tag1 = Fabricate(:tag)
tag2 = Fabricate(:tag)
tag_group = Fabricate(:tag_group, tags: [tag1, tag2])
crtg = CategoryRequiredTagGroup.new(tag_group: tag_group, min_count: 1)
- category = Fabricate(:category, category_required_tag_groups: [ crtg ])
+ category = Fabricate(:category, category_required_tag_groups: [crtg])
- get "/tags/filter/search.json", params: { q: '', categoryId: category.id, filterForInput: true }
+ get "/tags/filter/search.json",
+ params: {
+ q: "",
+ categoryId: category.id,
+ filterForInput: true,
+ }
expect(response.status).to eq(200)
- expect(response.parsed_body["results"].map { |t| t["name"] }).to contain_exactly(tag1.name, tag2.name)
- expect(response.parsed_body["required_tag_group"]).to eq({
- "name" => tag_group.name,
- "min_count" => crtg.min_count
- })
+ expect(response.parsed_body["results"].map { |t| t["name"] }).to contain_exactly(
+ tag1.name,
+ tag2.name,
+ )
+ expect(response.parsed_body["required_tag_group"]).to eq(
+ { "name" => tag_group.name, "min_count" => crtg.min_count },
+ )
- get "/tags/filter/search.json", params: { q: '', categoryId: category.id, filterForInput: true, selected_tags: [tag1.name] }
+ get "/tags/filter/search.json",
+ params: {
+ q: "",
+ categoryId: category.id,
+ filterForInput: true,
+ selected_tags: [tag1.name],
+ }
expect(response.status).to eq(200)
expect(response.parsed_body["results"].map { |t| t["name"] }).to contain_exactly(tag2.name)
expect(response.parsed_body["required_tag_group"]).to eq(nil)
@@ -900,14 +896,12 @@ RSpec.describe TagsController do
end
end
- describe '#destroy' do
- context 'with tagging enabled' do
- before do
- sign_in(admin)
- end
+ describe "#destroy" do
+ context "with tagging enabled" do
+ before { sign_in(admin) }
- context 'with an existent tag name' do
- it 'deletes the tag' do
+ context "with an existent tag name" do
+ it "deletes the tag" do
tag = Fabricate(:tag)
delete "/tag/#{tag.name}.json"
expect(response.status).to eq(200)
@@ -915,17 +909,17 @@ RSpec.describe TagsController do
end
end
- context 'with a nonexistent tag name' do
- it 'returns a tag not found message' do
+ context "with a nonexistent tag name" do
+ it "returns a tag not found message" do
delete "/tag/doesntexists.json"
expect(response).not_to be_successful
- expect(response.parsed_body['error_type']).to eq('not_found')
+ expect(response.parsed_body["error_type"]).to eq("not_found")
end
end
end
end
- describe '#unused' do
+ describe "#unused" do
it "fails if you can't manage tags" do
sign_in(user)
get "/tags/unused.json"
@@ -934,54 +928,54 @@ RSpec.describe TagsController do
expect(response.status).to eq(403)
end
- context 'when logged in' do
- before do
- sign_in(admin)
- end
+ context "when logged in" do
+ before { sign_in(admin) }
- context 'with some tags' do
- let!(:tags) { [
- Fabricate(:tag, name: "used_publically", topic_count: 2, pm_topic_count: 0),
- Fabricate(:tag, name: "used_privately", topic_count: 0, pm_topic_count: 3),
- Fabricate(:tag, name: "used_everywhere", topic_count: 0, pm_topic_count: 3),
- Fabricate(:tag, name: "unused1", topic_count: 0, pm_topic_count: 0),
- Fabricate(:tag, name: "unused2", topic_count: 0, pm_topic_count: 0)
- ]}
+ context "with some tags" do
+ let!(:tags) do
+ [
+ Fabricate(:tag, name: "used_publically", topic_count: 2, pm_topic_count: 0),
+ Fabricate(:tag, name: "used_privately", topic_count: 0, pm_topic_count: 3),
+ Fabricate(:tag, name: "used_everywhere", topic_count: 0, pm_topic_count: 3),
+ Fabricate(:tag, name: "unused1", topic_count: 0, pm_topic_count: 0),
+ Fabricate(:tag, name: "unused2", topic_count: 0, pm_topic_count: 0),
+ ]
+ end
- it 'returns the correct unused tags' do
+ it "returns the correct unused tags" do
get "/tags/unused.json"
expect(response.status).to eq(200)
expect(response.parsed_body["tags"]).to contain_exactly("unused1", "unused2")
end
- it 'deletes the correct tags' do
- expect { delete "/tags/unused.json" }.to change { Tag.count }.by(-2) & change { UserHistory.count }.by(1)
- expect(Tag.pluck(:name)).to contain_exactly("used_publically", "used_privately", "used_everywhere")
+ it "deletes the correct tags" do
+ expect { delete "/tags/unused.json" }.to change { Tag.count }.by(-2) &
+ change { UserHistory.count }.by(1)
+ expect(Tag.pluck(:name)).to contain_exactly(
+ "used_publically",
+ "used_privately",
+ "used_everywhere",
+ )
end
end
-
end
end
- describe '#upload_csv' do
- it 'requires you to be logged in' do
+ describe "#upload_csv" do
+ it "requires you to be logged in" do
post "/tags/upload.json"
expect(response.status).to eq(403)
end
- context 'while logged in' do
+ context "while logged in" do
let(:csv_file) { File.new("#{Rails.root}/spec/fixtures/csv/tags.csv") }
let(:invalid_csv_file) { File.new("#{Rails.root}/spec/fixtures/csv/tags_invalid.csv") }
- let(:file) do
- Rack::Test::UploadedFile.new(File.open(csv_file))
- end
+ let(:file) { Rack::Test::UploadedFile.new(File.open(csv_file)) }
- let(:invalid_file) do
- Rack::Test::UploadedFile.new(File.open(invalid_csv_file))
- end
+ let(:invalid_file) { Rack::Test::UploadedFile.new(File.open(invalid_csv_file)) }
- let(:filename) { 'tags.csv' }
+ let(:filename) { "tags.csv" }
it "fails if you can't manage tags" do
sign_in(user)
@@ -993,7 +987,13 @@ RSpec.describe TagsController do
sign_in(moderator)
post "/tags/upload.json", params: { file: file, name: filename }
expect(response.status).to eq(200)
- expect(Tag.pluck(:name)).to contain_exactly("tag1", "capitaltag2", "spaced-tag", "tag3", "tag4")
+ expect(Tag.pluck(:name)).to contain_exactly(
+ "tag1",
+ "capitaltag2",
+ "spaced-tag",
+ "tag3",
+ "tag4",
+ )
expect(Tag.find_by_name("tag3").tag_groups.pluck(:name)).to contain_exactly("taggroup1")
expect(Tag.find_by_name("tag4").tag_groups.pluck(:name)).to contain_exactly("taggroup1")
end
@@ -1009,24 +1009,24 @@ RSpec.describe TagsController do
end
end
- describe '#create_synonyms' do
+ describe "#create_synonyms" do
fab!(:tag) { Fabricate(:tag) }
- it 'fails if not logged in' do
- post "/tag/#{tag.name}/synonyms.json", params: { synonyms: ['synonym1'] }
+ it "fails if not logged in" do
+ post "/tag/#{tag.name}/synonyms.json", params: { synonyms: ["synonym1"] }
expect(response.status).to eq(403)
end
- it 'fails if not staff user' do
+ it "fails if not staff user" do
sign_in(user)
- post "/tag/#{tag.name}/synonyms.json", params: { synonyms: ['synonym1'] }
+ post "/tag/#{tag.name}/synonyms.json", params: { synonyms: ["synonym1"] }
expect(response.status).to eq(403)
end
- context 'when signed in as admin' do
+ context "when signed in as admin" do
before { sign_in(admin) }
- it 'can make a tag a synonym of another tag' do
+ it "can make a tag a synonym of another tag" do
tag2 = Fabricate(:tag)
expect {
post "/tag/#{tag.name}/synonyms.json", params: { synonyms: [tag2.name] }
@@ -1035,46 +1035,46 @@ RSpec.describe TagsController do
expect(tag2.reload.target_tag).to eq(tag)
end
- it 'can create new tags at the same time' do
+ it "can create new tags at the same time" do
expect {
- post "/tag/#{tag.name}/synonyms.json", params: { synonyms: ['synonym'] }
+ post "/tag/#{tag.name}/synonyms.json", params: { synonyms: ["synonym"] }
}.to change { Tag.count }.by(1)
expect(response.status).to eq(200)
- expect(Tag.find_by_name('synonym')&.target_tag).to eq(tag)
+ expect(Tag.find_by_name("synonym")&.target_tag).to eq(tag)
end
- it 'can return errors' do
+ it "can return errors" do
tag2 = Fabricate(:tag, target_tag: tag)
tag3 = Fabricate(:tag)
post "/tag/#{tag3.name}/synonyms.json", params: { synonyms: [tag.name] }
expect(response.status).to eq(200)
- expect(response.parsed_body['failed']).to be_present
- expect(response.parsed_body.dig('failed_tags', tag.name)).to be_present
+ expect(response.parsed_body["failed"]).to be_present
+ expect(response.parsed_body.dig("failed_tags", tag.name)).to be_present
end
end
end
- describe '#destroy_synonym' do
+ describe "#destroy_synonym" do
fab!(:tag) { Fabricate(:tag) }
- fab!(:synonym) { Fabricate(:tag, target_tag: tag, name: 'synonym') }
+ fab!(:synonym) { Fabricate(:tag, target_tag: tag, name: "synonym") }
subject { delete("/tag/#{tag.name}/synonyms/#{synonym.name}.json") }
- it 'fails if not logged in' do
+ it "fails if not logged in" do
subject
expect(response.status).to eq(403)
end
- it 'fails if not staff user' do
+ it "fails if not staff user" do
sign_in(user)
subject
expect(response.status).to eq(403)
end
- context 'when signed in as admin' do
+ context "when signed in as admin" do
before { sign_in(admin) }
it "can remove a synonym from a tag" do
- synonym2 = Fabricate(:tag, target_tag: tag, name: 'synonym2')
+ synonym2 = Fabricate(:tag, target_tag: tag, name: "synonym2")
expect { subject }.to_not change { Tag.count }
expect_same_tag_names(tag.reload.synonyms, [synonym2])
expect(synonym.reload).to_not be_synonym
@@ -1094,27 +1094,26 @@ RSpec.describe TagsController do
end
end
- describe '#update_notifications' do
+ describe "#update_notifications" do
fab!(:tag) { Fabricate(:tag) }
- before do
- sign_in(user)
- end
+ before { sign_in(user) }
- it 'returns 404 when tag is not found' do
+ it "returns 404 when tag is not found" do
put "/tag/someinvalidtagname/notifications.json"
expect(response.status).to eq(404)
end
- it 'updates the notification level of a tag for a user' do
+ it "updates the notification level of a tag for a user" do
tag_user = TagUser.change(user.id, tag.id, NotificationLevels.all[:muted])
- put "/tag/#{tag.name}/notifications.json", params: {
- tag_notification: {
- notification_level: NotificationLevels.all[:tracking]
- }
- }
+ put "/tag/#{tag.name}/notifications.json",
+ params: {
+ tag_notification: {
+ notification_level: NotificationLevels.all[:tracking],
+ },
+ }
expect(response.status).to eq(200)
expect(response.parsed_body["watched_tags"]).to eq([])
@@ -1126,13 +1125,14 @@ RSpec.describe TagsController do
expect(tag_user.reload.notification_level).to eq(NotificationLevels.all[:tracking])
end
- it 'sets the notification level of a tag for a user' do
+ it "sets the notification level of a tag for a user" do
expect do
- put "/tag/#{tag.name}/notifications.json", params: {
- tag_notification: {
- notification_level: NotificationLevels.all[:muted]
- }
- }
+ put "/tag/#{tag.name}/notifications.json",
+ params: {
+ tag_notification: {
+ notification_level: NotificationLevels.all[:muted],
+ },
+ }
expect(response.status).to eq(200)
diff --git a/spec/requests/theme_javascripts_controller_spec.rb b/spec/requests/theme_javascripts_controller_spec.rb
index f01afc2cd4a..52600fbe01c 100644
--- a/spec/requests/theme_javascripts_controller_spec.rb
+++ b/spec/requests/theme_javascripts_controller_spec.rb
@@ -12,12 +12,16 @@ RSpec.describe ThemeJavascriptsController do
end
let!(:theme) { Fabricate(:theme) }
- let(:theme_field) { ThemeField.create!(theme: theme, target_id: 0, name: "header", value: "html ") }
- let(:javascript_cache) { JavascriptCache.create!(content: 'console.log("hello");', theme_field: theme_field) }
+ let(:theme_field) do
+ ThemeField.create!(theme: theme, target_id: 0, name: "header", value: "html ")
+ end
+ let(:javascript_cache) do
+ JavascriptCache.create!(content: 'console.log("hello");', theme_field: theme_field)
+ end
before { clear_disk_cache }
after { clear_disk_cache }
- describe '#show' do
+ describe "#show" do
def update_digest_and_get(digest)
# actually set digest to make sure 404 is raised by router
javascript_cache.update(digest: digest)
@@ -25,33 +29,33 @@ RSpec.describe ThemeJavascriptsController do
get "/theme-javascripts/#{digest}.js"
end
- it 'only accepts 40-char hexadecimal digest name' do
- update_digest_and_get('0123456789abcdefabcd0123456789abcdefabcd')
+ it "only accepts 40-char hexadecimal digest name" do
+ update_digest_and_get("0123456789abcdefabcd0123456789abcdefabcd")
expect(response.status).to eq(200)
- update_digest_and_get('0123456789abcdefabcd0123456789abcdefabc')
+ update_digest_and_get("0123456789abcdefabcd0123456789abcdefabc")
expect(response.status).to eq(404)
- update_digest_and_get('gggggggggggggggggggggggggggggggggggggggg')
+ update_digest_and_get("gggggggggggggggggggggggggggggggggggggggg")
expect(response.status).to eq(404)
- update_digest_and_get('0123456789abcdefabc_0123456789abcdefabcd')
+ update_digest_and_get("0123456789abcdefabc_0123456789abcdefabcd")
expect(response.status).to eq(404)
- update_digest_and_get('0123456789abcdefabc-0123456789abcdefabcd')
+ update_digest_and_get("0123456789abcdefabc-0123456789abcdefabcd")
expect(response.status).to eq(404)
- update_digest_and_get('../../Gemfile')
+ update_digest_and_get("../../Gemfile")
expect(response.status).to eq(404)
end
- it 'considers the database record as the source of truth' do
+ it "considers the database record as the source of truth" do
clear_disk_cache
get "/theme-javascripts/#{javascript_cache.digest}.js"
expect(response.status).to eq(200)
expect(response.body).to eq(javascript_cache.content)
- expect(response.headers['Content-Length']).to eq(javascript_cache.content.bytesize.to_s)
+ expect(response.headers["Content-Length"]).to eq(javascript_cache.content.bytesize.to_s)
javascript_cache.destroy!
@@ -67,7 +71,7 @@ RSpec.describe ThemeJavascriptsController do
expect(response.body).to eq('console.log("hello");')
digest = SecureRandom.hex(20)
- javascript_cache.update(digest: digest, source_map: '{fakeSourceMap: true}')
+ javascript_cache.update(digest: digest, source_map: "{fakeSourceMap: true}")
get "/theme-javascripts/#{digest}.js"
expect(response.status).to eq(200)
expect(response.body).to eq <<~JS
@@ -102,7 +106,7 @@ RSpec.describe ThemeJavascriptsController do
expect(response.status).to eq(404)
digest = SecureRandom.hex(20)
- javascript_cache.update(digest: digest, source_map: '{fakeSourceMap: true}')
+ javascript_cache.update(digest: digest, source_map: "{fakeSourceMap: true}")
get "/theme-javascripts/#{digest}.map"
expect(response.status).to eq(200)
expect(response.body).to eq("{fakeSourceMap: true}")
@@ -114,14 +118,15 @@ RSpec.describe ThemeJavascriptsController do
end
describe "#show_tests" do
- let(:component) { Fabricate(:theme, component: true, name: 'enabled-component') }
+ let(:component) { Fabricate(:theme, component: true, name: "enabled-component") }
let!(:tests_field) do
- field = component.set_field(
- target: :tests_js,
- type: :js,
- name: "acceptance/some-test.js",
- value: "assert.ok(true);"
- )
+ field =
+ component.set_field(
+ target: :tests_js,
+ type: :js,
+ name: "acceptance/some-test.js",
+ value: "assert.ok(true);",
+ )
component.save!
field
end
@@ -131,7 +136,7 @@ RSpec.describe ThemeJavascriptsController do
theme: component,
target_id: Theme.targets[:settings],
name: "yaml",
- value: "num_setting: 5"
+ value: "num_setting: 5",
)
component.save!
end
@@ -141,13 +146,15 @@ RSpec.describe ThemeJavascriptsController do
_, digest = component.baked_js_tests_with_digest
get "/theme-javascripts/tests/#{component.id}-#{digest}.js"
- expect(response.body).to include("require(\"discourse/lib/theme-settings-store\").registerSettings(#{component.id}, {\"num_setting\":5}, { force: true });")
+ expect(response.body).to include(
+ "require(\"discourse/lib/theme-settings-store\").registerSettings(#{component.id}, {\"num_setting\":5}, { force: true });",
+ )
expect(response.body).to include("assert.ok(true);")
end
it "includes theme uploads URLs in the settings object" do
SiteSetting.authorized_extensions = "*"
- js_file = Tempfile.new(["vendorlib", ".js"])
+ js_file = Tempfile.new(%w[vendorlib .js])
js_file.write("console.log(123);\n")
js_file.rewind
js_upload = UploadCreator.new(js_file, "vendorlib.js").create_for(Discourse::SYSTEM_USER_ID)
@@ -155,7 +162,7 @@ RSpec.describe ThemeJavascriptsController do
type: :theme_upload_var,
target: :common,
name: "vendorlib",
- upload_id: js_upload.id
+ upload_id: js_upload.id,
)
component.save!
_, digest = component.baked_js_tests_with_digest
@@ -163,9 +170,9 @@ RSpec.describe ThemeJavascriptsController do
get "/theme-javascripts/tests/#{component.id}-#{digest}.js"
expect(response.body).to include(
"require(\"discourse/lib/theme-settings-store\").registerSettings(" +
- "#{component.id}, {\"num_setting\":5,\"theme_uploads\":{\"vendorlib\":" +
- "\"/uploads/default/test_#{ENV['TEST_ENV_NUMBER'].presence || '0'}/original/1X/#{js_upload.sha1}.js\"},\"theme_uploads_local\":{\"vendorlib\":" +
- "\"/theme-javascripts/#{js_upload.sha1}.js?__ws=test.localhost\"}}, { force: true });"
+ "#{component.id}, {\"num_setting\":5,\"theme_uploads\":{\"vendorlib\":" +
+ "\"/uploads/default/test_#{ENV["TEST_ENV_NUMBER"].presence || "0"}/original/1X/#{js_upload.sha1}.js\"},\"theme_uploads_local\":{\"vendorlib\":" +
+ "\"/theme-javascripts/#{js_upload.sha1}.js?__ws=test.localhost\"}}, { force: true });",
)
expect(response.body).to include("assert.ok(true);")
ensure
@@ -174,7 +181,7 @@ RSpec.describe ThemeJavascriptsController do
end
it "responds with 404 if digest is not a 40 chars hex" do
- digest = Rack::Utils.escape('../../../../../../../../../../etc/passwd').gsub('.', '%2E')
+ digest = Rack::Utils.escape("../../../../../../../../../../etc/passwd").gsub(".", "%2E")
get "/theme-javascripts/tests/#{component.id}-#{digest}.js"
expect(response.status).to eq(404)
@@ -195,7 +202,9 @@ RSpec.describe ThemeJavascriptsController do
expect(response.headers["Content-Length"].to_i).to eq(content.size)
get "/theme-javascripts/tests/#{component.id}-#{digest}.js",
- headers: { "If-Modified-Since" => (last_modified + 10.seconds).rfc2822 }
+ headers: {
+ "If-Modified-Since" => (last_modified + 10.seconds).rfc2822,
+ }
expect(response.status).to eq(304)
end
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index 959354ce21f..ea369bef341 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -25,12 +25,12 @@ RSpec.describe TopicsController do
fab!(:category) { Fabricate(:category) }
fab!(:tracked_category) { Fabricate(:category) }
fab!(:shared_drafts_category) { Fabricate(:category) }
- fab!(:staff_category) {
- Fabricate(:category).tap { |staff_category|
+ fab!(:staff_category) do
+ Fabricate(:category).tap do |staff_category|
staff_category.set_permissions(staff: :full)
staff_category.save!
- }
- }
+ end
+ end
fab!(:group_user) { Fabricate(:group_user) }
@@ -48,16 +48,12 @@ RSpec.describe TopicsController do
post_author6,
trust_level_0,
trust_level_1,
- trust_level_4
- ].each do |u|
- Group.user_trust_level_change!(u.id, u.trust_level)
- end
+ trust_level_4,
+ ].each { |u| Group.user_trust_level_change!(u.id, u.trust_level) }
end
- describe '#wordpress' do
- before do
- sign_in(moderator)
- end
+ describe "#wordpress" do
+ before { sign_in(moderator) }
fab!(:p1) { Fabricate(:post, user: moderator) }
fab!(:p2) { Fabricate(:post, topic: p1.topic, user: moderator) }
@@ -71,154 +67,164 @@ RSpec.describe TopicsController do
json = response.parsed_body
# The JSON has the data the wordpress plugin needs
- expect(json['id']).to eq(p1.topic.id)
- expect(json['posts_count']).to eq(2)
- expect(json['filtered_posts_count']).to eq(2)
+ expect(json["id"]).to eq(p1.topic.id)
+ expect(json["posts_count"]).to eq(2)
+ expect(json["filtered_posts_count"]).to eq(2)
# Posts
- expect(json['posts'].size).to eq(1)
- post = json['posts'][0]
- expect(post['id']).to eq(p2.id)
- expect(post['username']).to eq(moderator.username)
- expect(post['avatar_template']).to eq("#{Discourse.base_url_no_prefix}#{moderator.avatar_template}")
- expect(post['name']).to eq(moderator.name)
- expect(post['created_at']).to be_present
- expect(post['cooked']).to eq(p2.cooked)
+ expect(json["posts"].size).to eq(1)
+ post = json["posts"][0]
+ expect(post["id"]).to eq(p2.id)
+ expect(post["username"]).to eq(moderator.username)
+ expect(post["avatar_template"]).to eq(
+ "#{Discourse.base_url_no_prefix}#{moderator.avatar_template}",
+ )
+ expect(post["name"]).to eq(moderator.name)
+ expect(post["created_at"]).to be_present
+ expect(post["cooked"]).to eq(p2.cooked)
# Participants
- expect(json['participants'].size).to eq(1)
- participant = json['participants'][0]
- expect(participant['id']).to eq(moderator.id)
- expect(participant['username']).to eq(moderator.username)
- expect(participant['avatar_template']).to eq("#{Discourse.base_url_no_prefix}#{moderator.avatar_template}")
+ expect(json["participants"].size).to eq(1)
+ participant = json["participants"][0]
+ expect(participant["id"]).to eq(moderator.id)
+ expect(participant["username"]).to eq(moderator.username)
+ expect(participant["avatar_template"]).to eq(
+ "#{Discourse.base_url_no_prefix}#{moderator.avatar_template}",
+ )
end
end
- describe '#move_posts' do
+ describe "#move_posts" do
before do
SiteSetting.min_topic_title_length = 2
SiteSetting.tagging_enabled = true
end
- it 'needs you to be logged in' do
- post "/t/111/move-posts.json", params: {
- title: 'blah',
- post_ids: [1, 2, 3]
- }
+ it "needs you to be logged in" do
+ post "/t/111/move-posts.json", params: { title: "blah", post_ids: [1, 2, 3] }
expect(response.status).to eq(403)
end
- describe 'moving to a new topic' do
+ describe "moving to a new topic" do
fab!(:p1) { Fabricate(:post, user: user, post_number: 1) }
let(:p2) { Fabricate(:post, user: user, post_number: 2, topic: p1.topic) }
let(:topic) { p1.topic }
it "raises an error without post_ids" do
sign_in(moderator)
- post "/t/#{topic.id}/move-posts.json", params: { title: 'blah' }
+ post "/t/#{topic.id}/move-posts.json", params: { title: "blah" }
expect(response.status).to eq(400)
end
it "raises an error when the user doesn't have permission to move the posts" do
sign_in(user)
- post "/t/#{topic.id}/move-posts.json", params: {
- title: 'blah', post_ids: [p1.post_number, p2.post_number]
- }
+ post "/t/#{topic.id}/move-posts.json",
+ params: {
+ title: "blah",
+ post_ids: [p1.post_number, p2.post_number],
+ }
expect(response).to be_forbidden
end
it "raises an error when the OP is not a regular post" do
sign_in(moderator)
- p2 = Fabricate(:post, user: post_author1, topic: topic, post_number: 2, post_type: Post.types[:whisper])
+ p2 =
+ Fabricate(
+ :post,
+ user: post_author1,
+ topic: topic,
+ post_number: 2,
+ post_type: Post.types[:whisper],
+ )
p3 = Fabricate(:post, user: post_author2, topic: topic, post_number: 3)
- post "/t/#{topic.id}/move-posts.json", params: {
- title: 'blah', post_ids: [p2.id, p3.id]
- }
+ post "/t/#{topic.id}/move-posts.json", params: { title: "blah", post_ids: [p2.id, p3.id] }
expect(response.status).to eq(422)
result = response.parsed_body
- expect(result['errors']).to be_present
+ expect(result["errors"]).to be_present
end
- context 'with success' do
+ context "with success" do
before { sign_in(admin) }
it "returns success" do
expect do
- post "/t/#{topic.id}/move-posts.json", params: {
- title: 'Logan is a good movie',
- post_ids: [p2.id],
- category_id: category.id,
- tags: ["foo", "bar"]
- }
+ post "/t/#{topic.id}/move-posts.json",
+ params: {
+ title: "Logan is a good movie",
+ post_ids: [p2.id],
+ category_id: category.id,
+ tags: %w[foo bar],
+ }
end.to change { Topic.count }.by(1).and change { Tag.count }.by(2)
expect(response.status).to eq(200)
result = response.parsed_body
- expect(result['success']).to eq(true)
+ expect(result["success"]).to eq(true)
new_topic = Topic.last
- expect(result['url']).to eq(new_topic.relative_url)
+ expect(result["url"]).to eq(new_topic.relative_url)
expect(new_topic.excerpt).to eq(p2.excerpt_for_topic)
expect(Tag.all.pluck(:name)).to include("foo", "bar")
end
- describe 'when topic has been deleted' do
- it 'should still be able to move posts' do
+ describe "when topic has been deleted" do
+ it "should still be able to move posts" do
PostDestroyer.new(admin, topic.first_post).destroy
expect(topic.reload.deleted_at).to_not be_nil
expect do
- post "/t/#{topic.id}/move-posts.json", params: {
- title: 'Logan is a good movie',
- post_ids: [p2.id],
- category_id: category.id
- }
+ post "/t/#{topic.id}/move-posts.json",
+ params: {
+ title: "Logan is a good movie",
+ post_ids: [p2.id],
+ category_id: category.id,
+ }
end.to change { Topic.count }.by(1)
expect(response.status).to eq(200)
result = response.parsed_body
- expect(result['success']).to eq(true)
- expect(result['url']).to eq(Topic.last.relative_url)
+ expect(result["success"]).to eq(true)
+ expect(result["url"]).to eq(Topic.last.relative_url)
end
end
end
- context 'with failure' do
+ context "with failure" do
it "returns JSON with a false success" do
sign_in(moderator)
- post "/t/#{topic.id}/move-posts.json", params: {
- post_ids: [p2.id]
- }
+ post "/t/#{topic.id}/move-posts.json", params: { post_ids: [p2.id] }
expect(response.status).to eq(200)
result = response.parsed_body
- expect(result['success']).to eq(false)
- expect(result['url']).to be_blank
+ expect(result["success"]).to eq(false)
+ expect(result["url"]).to be_blank
end
end
describe "moving replied posts" do
- context 'with success' do
+ context "with success" do
it "moves the child posts too" do
sign_in(moderator)
p1 = Fabricate(:post, topic: topic, user: moderator)
- p2 = Fabricate(:post, topic: topic, user: moderator, reply_to_post_number: p1.post_number)
+ p2 =
+ Fabricate(:post, topic: topic, user: moderator, reply_to_post_number: p1.post_number)
PostReply.create(post_id: p1.id, reply_post_id: p2.id)
- post "/t/#{topic.id}/move-posts.json", params: {
- title: 'new topic title',
- post_ids: [p1.id],
- reply_post_ids: [p1.id]
- }
+ post "/t/#{topic.id}/move-posts.json",
+ params: {
+ title: "new topic title",
+ post_ids: [p1.id],
+ reply_post_ids: [p1.id],
+ }
expect(response.status).to eq(200)
p1.reload
@@ -248,25 +254,27 @@ RSpec.describe TopicsController do
it "moves the posts" do
expect do
- post "/t/#{topic.id}/move-posts.json", params: {
- title: 'Logan is a good movie',
- post_ids: [p2.id],
- category_id: category.id
- }
+ post "/t/#{topic.id}/move-posts.json",
+ params: {
+ title: "Logan is a good movie",
+ post_ids: [p2.id],
+ category_id: category.id,
+ }
end.to change { Topic.count }.by(1)
expect(response.status).to eq(200)
result = response.parsed_body
- expect(result['success']).to eq(true)
- expect(result['url']).to eq(Topic.last.relative_url)
+ expect(result["success"]).to eq(true)
+ expect(result["url"]).to eq(Topic.last.relative_url)
end
it "does not allow posts to be moved to a private category" do
- post "/t/#{topic.id}/move-posts.json", params: {
- title: 'Logan is a good movie',
- post_ids: [p2.id],
- category_id: staff_category.id
- }
+ post "/t/#{topic.id}/move-posts.json",
+ params: {
+ title: "Logan is a good movie",
+ post_ids: [p2.id],
+ category_id: staff_category.id,
+ }
expect(response).to be_forbidden
end
@@ -274,52 +282,54 @@ RSpec.describe TopicsController do
it "does not allow posts outside of the category to be moved" do
topic.update!(category: nil)
- post "/t/#{topic.id}/move-posts.json", params: {
- title: 'blah', post_ids: [p1.post_number, p2.post_number]
- }
+ post "/t/#{topic.id}/move-posts.json",
+ params: {
+ title: "blah",
+ post_ids: [p1.post_number, p2.post_number],
+ }
expect(response).to be_forbidden
end
end
- describe 'moving to an existing topic' do
- before do
- sign_in(moderator)
- end
+ describe "moving to an existing topic" do
+ before { sign_in(moderator) }
fab!(:p1) { Fabricate(:post, user: moderator) }
fab!(:topic) { p1.topic }
fab!(:p2) { Fabricate(:post, user: moderator, topic: topic) }
- context 'with success' do
+ context "with success" do
it "returns success" do
- post "/t/#{topic.id}/move-posts.json", params: {
- post_ids: [p2.id],
- destination_topic_id: dest_topic.id
- }
+ post "/t/#{topic.id}/move-posts.json",
+ params: {
+ post_ids: [p2.id],
+ destination_topic_id: dest_topic.id,
+ }
expect(response.status).to eq(200)
result = response.parsed_body
- expect(result['success']).to eq(true)
- expect(result['url']).to be_present
+ expect(result["success"]).to eq(true)
+ expect(result["url"]).to be_present
end
it "triggers an event on merge" do
begin
called = false
- assert = -> (original_topic, destination_topic) do
+ assert = ->(original_topic, destination_topic) {
called = true
expect(original_topic).to eq(topic)
expect(destination_topic).to eq(dest_topic)
- end
+ }
DiscourseEvent.on(:topic_merged, &assert)
- post "/t/#{topic.id}/move-posts.json", params: {
- post_ids: [p2.id],
- destination_topic_id: dest_topic.id
- }
+ post "/t/#{topic.id}/move-posts.json",
+ params: {
+ post_ids: [p2.id],
+ destination_topic_id: dest_topic.id,
+ }
expect(called).to eq(true)
expect(response.status).to eq(200)
@@ -329,32 +339,35 @@ RSpec.describe TopicsController do
end
end
- context 'with failure' do
+ context "with failure" do
fab!(:p2) { Fabricate(:post, user: moderator) }
it "returns JSON with a false success" do
- post "/t/#{topic.id}/move-posts.json", params: {
- post_ids: [p2.id]
- }
+ post "/t/#{topic.id}/move-posts.json", params: { post_ids: [p2.id] }
expect(response.status).to eq(200)
result = response.parsed_body
- expect(result['success']).to eq(false)
- expect(result['url']).to be_blank
+ expect(result["success"]).to eq(false)
+ expect(result["url"]).to be_blank
end
- it 'returns plugin validation error' do
+ it "returns plugin validation error" do
# stub here is to simulate validation added by plugin which would be triggered when post is moved
PostCreator.any_instance.stubs(:skip_validations?).returns(false)
p1.update_columns(raw: "i", cooked: "")
- post "/t/#{topic.id}/move-posts.json", params: {
- post_ids: [p1.id],
- destination_topic_id: dest_topic.id
- }
+ post "/t/#{topic.id}/move-posts.json",
+ params: {
+ post_ids: [p1.id],
+ destination_topic_id: dest_topic.id,
+ }
expect(response.status).to eq(422)
result = response.parsed_body
- expect(result['errors']).to eq(["Body is too short (minimum is 5 characters) and Body seems unclear, is it a complete sentence?"])
+ expect(result["errors"]).to eq(
+ [
+ "Body is too short (minimum is 5 characters) and Body seems unclear, is it a complete sentence?",
+ ],
+ )
end
end
end
@@ -373,24 +386,26 @@ RSpec.describe TopicsController do
end
it "moves the posts" do
- post "/t/#{topic.id}/move-posts.json", params: {
- post_ids: [p2.id],
- destination_topic_id: dest_topic.id
- }
+ post "/t/#{topic.id}/move-posts.json",
+ params: {
+ post_ids: [p2.id],
+ destination_topic_id: dest_topic.id,
+ }
expect(response.status).to eq(200)
result = response.parsed_body
- expect(result['success']).to eq(true)
- expect(result['url']).to be_present
+ expect(result["success"]).to eq(true)
+ expect(result["url"]).to be_present
end
it "does not allow posts to be moved to a private category" do
dest_topic.update!(category: staff_category)
- post "/t/#{topic.id}/move-posts.json", params: {
- post_ids: [p2.id],
- destination_topic_id: dest_topic.id
- }
+ post "/t/#{topic.id}/move-posts.json",
+ params: {
+ post_ids: [p2.id],
+ destination_topic_id: dest_topic.id,
+ }
expect(response).to be_forbidden
end
@@ -398,156 +413,167 @@ RSpec.describe TopicsController do
it "does not allow posts outside of the category to be moved" do
topic.update!(category: nil)
- post "/t/#{topic.id}/move-posts.json", params: {
- post_ids: [p1.post_number, p2.post_number],
- destination_topic_id: dest_topic.id
- }
+ post "/t/#{topic.id}/move-posts.json",
+ params: {
+ post_ids: [p1.post_number, p2.post_number],
+ destination_topic_id: dest_topic.id,
+ }
expect(response).to be_forbidden
end
end
- describe 'moving to a new message' do
+ describe "moving to a new message" do
fab!(:message) { pm }
fab!(:p1) { Fabricate(:post, user: user, post_number: 1, topic: message) }
fab!(:p2) { Fabricate(:post, user: user, post_number: 2, topic: message) }
it "raises an error without post_ids" do
sign_in(moderator)
- post "/t/#{message.id}/move-posts.json", params: { title: 'blah', archetype: 'private_message' }
+ post "/t/#{message.id}/move-posts.json",
+ params: {
+ title: "blah",
+ archetype: "private_message",
+ }
expect(response.status).to eq(400)
end
it "raises an error when the user doesn't have permission to move the posts" do
sign_in(trust_level_4)
- post "/t/#{message.id}/move-posts.json", params: {
- title: 'blah', post_ids: [p1.post_number, p2.post_number], archetype: 'private_message'
- }
+ post "/t/#{message.id}/move-posts.json",
+ params: {
+ title: "blah",
+ post_ids: [p1.post_number, p2.post_number],
+ archetype: "private_message",
+ }
expect(response.status).to eq(403)
result = response.parsed_body
- expect(result['errors']).to be_present
+ expect(result["errors"]).to be_present
end
- context 'with success' do
+ context "with success" do
before { sign_in(admin) }
it "returns success" do
SiteSetting.pm_tags_allowed_for_groups = "1|2|3"
expect do
- post "/t/#{message.id}/move-posts.json", params: {
- title: 'Logan is a good movie',
- post_ids: [p2.id],
- archetype: 'private_message',
- tags: ["foo", "bar"]
- }
+ post "/t/#{message.id}/move-posts.json",
+ params: {
+ title: "Logan is a good movie",
+ post_ids: [p2.id],
+ archetype: "private_message",
+ tags: %w[foo bar],
+ }
end.to change { Topic.count }.by(1).and change { Tag.count }.by(2)
expect(response.status).to eq(200)
result = response.parsed_body
- expect(result['success']).to eq(true)
- expect(result['url']).to eq(Topic.last.relative_url)
+ expect(result["success"]).to eq(true)
+ expect(result["url"]).to eq(Topic.last.relative_url)
expect(Tag.all.pluck(:name)).to include("foo", "bar")
end
- describe 'when message has been deleted' do
- it 'should still be able to move posts' do
+ describe "when message has been deleted" do
+ it "should still be able to move posts" do
PostDestroyer.new(admin, message.first_post).destroy
expect(message.reload.deleted_at).to_not be_nil
expect do
- post "/t/#{message.id}/move-posts.json", params: {
- title: 'Logan is a good movie',
- post_ids: [p2.id],
- archetype: 'private_message'
- }
+ post "/t/#{message.id}/move-posts.json",
+ params: {
+ title: "Logan is a good movie",
+ post_ids: [p2.id],
+ archetype: "private_message",
+ }
end.to change { Topic.count }.by(1)
expect(response.status).to eq(200)
result = response.parsed_body
- expect(result['success']).to eq(true)
- expect(result['url']).to eq(Topic.last.relative_url)
+ expect(result["success"]).to eq(true)
+ expect(result["url"]).to eq(Topic.last.relative_url)
end
end
end
- context 'with failure' do
+ context "with failure" do
it "returns JSON with a false success" do
sign_in(moderator)
- post "/t/#{message.id}/move-posts.json", params: {
- post_ids: [p2.id],
- archetype: 'private_message'
- }
+ post "/t/#{message.id}/move-posts.json",
+ params: {
+ post_ids: [p2.id],
+ archetype: "private_message",
+ }
expect(response.status).to eq(200)
result = response.parsed_body
- expect(result['success']).to eq(false)
- expect(result['url']).to be_blank
+ expect(result["success"]).to eq(false)
+ expect(result["url"]).to be_blank
end
end
end
- describe 'moving to an existing message' do
- before do
- sign_in(admin)
- end
+ describe "moving to an existing message" do
+ before { sign_in(admin) }
fab!(:evil_trout) { Fabricate(:evil_trout) }
fab!(:message) { pm }
fab!(:p2) { Fabricate(:post, user: evil_trout, post_number: 2, topic: message) }
fab!(:dest_message) do
- Fabricate(:private_message_topic, user: trust_level_4, topic_allowed_users: [
- Fabricate.build(:topic_allowed_user, user: evil_trout)
- ])
+ Fabricate(
+ :private_message_topic,
+ user: trust_level_4,
+ topic_allowed_users: [Fabricate.build(:topic_allowed_user, user: evil_trout)],
+ )
end
- context 'with success' do
+ context "with success" do
it "returns success" do
- post "/t/#{message.id}/move-posts.json", params: {
- post_ids: [p2.id],
- destination_topic_id: dest_message.id,
- archetype: 'private_message'
- }
+ post "/t/#{message.id}/move-posts.json",
+ params: {
+ post_ids: [p2.id],
+ destination_topic_id: dest_message.id,
+ archetype: "private_message",
+ }
expect(response.status).to eq(200)
result = response.parsed_body
- expect(result['success']).to eq(true)
- expect(result['url']).to be_present
+ expect(result["success"]).to eq(true)
+ expect(result["url"]).to be_present
end
end
- context 'with failure' do
+ context "with failure" do
it "returns JSON with a false success" do
- post "/t/#{message.id}/move-posts.json", params: {
- post_ids: [p2.id],
- archetype: 'private_message'
- }
+ post "/t/#{message.id}/move-posts.json",
+ params: {
+ post_ids: [p2.id],
+ archetype: "private_message",
+ }
expect(response.status).to eq(200)
result = response.parsed_body
- expect(result['success']).to eq(false)
- expect(result['url']).to be_blank
+ expect(result["success"]).to eq(false)
+ expect(result["url"]).to be_blank
end
end
end
end
- describe '#merge_topic' do
- it 'needs you to be logged in' do
- post "/t/111/merge-topic.json", params: {
- destination_topic_id: 345
- }
+ describe "#merge_topic" do
+ it "needs you to be logged in" do
+ post "/t/111/merge-topic.json", params: { destination_topic_id: 345 }
expect(response.status).to eq(403)
end
- describe 'merging into another topic' do
+ describe "merging into another topic" do
fab!(:p1) { Fabricate(:post, user: user) }
fab!(:topic) { p1.topic }
@@ -563,17 +589,15 @@ RSpec.describe TopicsController do
expect(response).to be_forbidden
end
- context 'when moving all the posts to the destination topic' do
+ context "when moving all the posts to the destination topic" do
it "returns success" do
sign_in(moderator)
- post "/t/#{topic.id}/merge-topic.json", params: {
- destination_topic_id: dest_topic.id
- }
+ post "/t/#{topic.id}/merge-topic.json", params: { destination_topic_id: dest_topic.id }
expect(response.status).to eq(200)
result = response.parsed_body
- expect(result['success']).to eq(true)
- expect(result['url']).to be_present
+ expect(result["success"]).to eq(true)
+ expect(result["url"]).to be_present
end
end
end
@@ -590,22 +614,18 @@ RSpec.describe TopicsController do
end
it "moves the posts" do
- post "/t/#{topic.id}/merge-topic.json", params: {
- destination_topic_id: dest_topic.id
- }
+ post "/t/#{topic.id}/merge-topic.json", params: { destination_topic_id: dest_topic.id }
expect(response.status).to eq(200)
result = response.parsed_body
- expect(result['success']).to eq(true)
- expect(result['url']).to be_present
+ expect(result["success"]).to eq(true)
+ expect(result["url"]).to be_present
end
it "does not allow posts to be moved to a private category" do
dest_topic.update!(category: staff_category)
- post "/t/#{topic.id}/merge-topic.json", params: {
- destination_topic_id: dest_topic.id
- }
+ post "/t/#{topic.id}/merge-topic.json", params: { destination_topic_id: dest_topic.id }
expect(response).to be_forbidden
end
@@ -613,124 +633,127 @@ RSpec.describe TopicsController do
it "does not allow posts outside of the category to be moved" do
topic.update!(category: nil)
- post "/t/#{topic.id}/merge-topic.json", params: {
- destination_topic_id: dest_topic.id
- }
+ post "/t/#{topic.id}/merge-topic.json", params: { destination_topic_id: dest_topic.id }
expect(response).to be_forbidden
end
end
- describe 'merging into another message' do
+ describe "merging into another message" do
fab!(:message) { Fabricate(:private_message_topic, user: user) }
fab!(:p1) { Fabricate(:post, topic: message, user: trust_level_4) }
- fab!(:p2) { Fabricate(:post, topic: message, reply_to_post_number: p1.post_number, user: user) }
+ fab!(:p2) do
+ Fabricate(:post, topic: message, reply_to_post_number: p1.post_number, user: user)
+ end
fab!(:dest_message) do
- Fabricate(:private_message_topic, user: trust_level_4, topic_allowed_users: [
- Fabricate.build(:topic_allowed_user, user: moderator)
- ])
+ Fabricate(
+ :private_message_topic,
+ user: trust_level_4,
+ topic_allowed_users: [Fabricate.build(:topic_allowed_user, user: moderator)],
+ )
end
it "raises an error without destination_topic_id" do
sign_in(moderator)
- post "/t/#{message.id}/merge-topic.json", params: {
- archetype: 'private_message'
- }
+ post "/t/#{message.id}/merge-topic.json", params: { archetype: "private_message" }
expect(response.status).to eq(400)
end
it "raises an error when the user doesn't have permission to merge" do
sign_in(trust_level_4)
- post "/t/#{message.id}/merge-topic.json", params: {
- destination_topic_id: 345,
- archetype: 'private_message'
- }
+ post "/t/#{message.id}/merge-topic.json",
+ params: {
+ destination_topic_id: 345,
+ archetype: "private_message",
+ }
expect(response).to be_forbidden
end
- context 'when moving all the posts to the destination message' do
+ context "when moving all the posts to the destination message" do
it "returns success" do
sign_in(moderator)
- post "/t/#{message.id}/merge-topic.json", params: {
- destination_topic_id: dest_message.id,
- archetype: 'private_message'
- }
+ post "/t/#{message.id}/merge-topic.json",
+ params: {
+ destination_topic_id: dest_message.id,
+ archetype: "private_message",
+ }
expect(response.status).to eq(200)
result = response.parsed_body
- expect(result['success']).to eq(true)
- expect(result['url']).to be_present
+ expect(result["success"]).to eq(true)
+ expect(result["url"]).to be_present
end
end
end
end
- describe '#change_post_owners' do
- it 'needs you to be logged in' do
- post "/t/111/change-owner.json", params: {
- username: 'user_a',
- post_ids: [1, 2, 3]
- }
+ describe "#change_post_owners" do
+ it "needs you to be logged in" do
+ post "/t/111/change-owner.json", params: { username: "user_a", post_ids: [1, 2, 3] }
expect(response).to be_forbidden
end
- describe 'forbidden to trust_level_4s' do
- before do
- sign_in(trust_level_4)
- end
+ describe "forbidden to trust_level_4s" do
+ before { sign_in(trust_level_4) }
- it 'correctly denies' do
- post "/t/111/change-owner.json", params: {
- topic_id: 111, username: 'user_a', post_ids: [1, 2, 3]
- }
+ it "correctly denies" do
+ post "/t/111/change-owner.json",
+ params: {
+ topic_id: 111,
+ username: "user_a",
+ post_ids: [1, 2, 3],
+ }
expect(response).to be_forbidden
end
end
- describe 'changing ownership' do
+ describe "changing ownership" do
fab!(:user_a) { Fabricate(:user) }
fab!(:p1) { Fabricate(:post, user: post_author1, topic: topic) }
fab!(:p2) { Fabricate(:post, user: post_author2, topic: topic) }
- describe 'moderator signed in' do
+ describe "moderator signed in" do
let!(:editor) { sign_in(moderator) }
it "returns 200 when moderators_change_post_ownership is true" do
SiteSetting.moderators_change_post_ownership = true
- post "/t/#{topic.id}/change-owner.json", params: {
- username: user_a.username_lower, post_ids: [p1.id]
- }
+ post "/t/#{topic.id}/change-owner.json",
+ params: {
+ username: user_a.username_lower,
+ post_ids: [p1.id],
+ }
expect(response.status).to eq(200)
end
it "returns 403 when moderators_change_post_ownership is false" do
SiteSetting.moderators_change_post_ownership = false
- post "/t/#{topic.id}/change-owner.json", params: {
- username: user_a.username_lower, post_ids: [p1.id]
- }
+ post "/t/#{topic.id}/change-owner.json",
+ params: {
+ username: user_a.username_lower,
+ post_ids: [p1.id],
+ }
expect(response.status).to eq(403)
end
end
- describe 'admin signed in' do
+ describe "admin signed in" do
let!(:editor) { sign_in(admin) }
it "raises an error with a parameter missing" do
- [
- { post_ids: [1, 2, 3] },
- { username: 'user_a' }
- ].each do |params|
+ [{ post_ids: [1, 2, 3] }, { username: "user_a" }].each do |params|
post "/t/111/change-owner.json", params: params
expect(response.status).to eq(400)
end
end
it "changes the topic and posts ownership" do
- post "/t/#{topic.id}/change-owner.json", params: {
- username: user_a.username_lower, post_ids: [p1.id]
- }
+ post "/t/#{topic.id}/change-owner.json",
+ params: {
+ username: user_a.username_lower,
+ post_ids: [p1.id],
+ }
topic.reload
p1.reload
expect(response.status).to eq(200)
@@ -739,9 +762,11 @@ RSpec.describe TopicsController do
end
it "changes multiple posts" do
- post "/t/#{topic.id}/change-owner.json", params: {
- username: user_a.username_lower, post_ids: [p1.id, p2.id]
- }
+ post "/t/#{topic.id}/change-owner.json",
+ params: {
+ username: user_a.username_lower,
+ post_ids: [p1.id, p2.id],
+ }
expect(response.status).to eq(200)
@@ -757,11 +782,18 @@ RSpec.describe TopicsController do
t2 = Fabricate(:topic, user: deleted_user)
p3 = Fabricate(:post, topic: t2, user: deleted_user)
- UserDestroyer.new(editor).destroy(deleted_user, delete_posts: true, context: 'test', delete_as_spammer: true)
+ UserDestroyer.new(editor).destroy(
+ deleted_user,
+ delete_posts: true,
+ context: "test",
+ delete_as_spammer: true,
+ )
- post "/t/#{t2.id}/change-owner.json", params: {
- username: user_a.username_lower, post_ids: [p3.id]
- }
+ post "/t/#{t2.id}/change-owner.json",
+ params: {
+ username: user_a.username_lower,
+ post_ids: [p3.id],
+ }
expect(response.status).to eq(200)
t2.reload
@@ -776,9 +808,11 @@ RSpec.describe TopicsController do
PostActionCreator.like(user_a, p1)
p1.reload
freeze_time(now)
- post "/t/#{topic.id}/change-owner.json", params: {
- username: user_a.username_lower, post_ids: [p1.id]
- }
+ post "/t/#{topic.id}/change-owner.json",
+ params: {
+ username: user_a.username_lower,
+ post_ids: [p1.id],
+ }
topic.reload
p1.reload
expect(response.status).to eq(200)
@@ -790,26 +824,24 @@ RSpec.describe TopicsController do
end
end
- describe '#change_timestamps' do
+ describe "#change_timestamps" do
let!(:params) { { timestamp: Time.zone.now } }
- it 'needs you to be logged in' do
+ it "needs you to be logged in" do
put "/t/1/change-timestamp.json", params: params
expect(response.status).to eq(403)
end
describe "forbidden to trust_level_4" do
- before do
- sign_in(trust_level_4)
- end
+ before { sign_in(trust_level_4) }
- it 'correctly denies' do
+ it "correctly denies" do
put "/t/1/change-timestamp.json", params: params
expect(response).to be_forbidden
end
end
- describe 'changing timestamps' do
+ describe "changing timestamps" do
before do
freeze_time
sign_in(moderator)
@@ -819,16 +851,16 @@ RSpec.describe TopicsController do
let!(:new_timestamp) { old_timestamp - 1.day }
let!(:topic) { Fabricate(:topic, created_at: old_timestamp) }
let!(:p1) { Fabricate(:post, user: post_author1, topic: topic, created_at: old_timestamp) }
- let!(:p2) { Fabricate(:post, user: post_author2, topic: topic, created_at: old_timestamp + 1.day) }
+ let!(:p2) do
+ Fabricate(:post, user: post_author2, topic: topic, created_at: old_timestamp + 1.day)
+ end
- it 'should update the timestamps of selected posts' do
+ it "should update the timestamps of selected posts" do
# try to see if we fail with invalid first
put "/t/1/change-timestamp.json"
expect(response.status).to eq(400)
- put "/t/#{topic.id}/change-timestamp.json", params: {
- timestamp: new_timestamp.to_f
- }
+ put "/t/#{topic.id}/change-timestamp.json", params: { timestamp: new_timestamp.to_f }
expect(response.status).to eq(200)
expect(topic.reload.created_at).to eq_time(new_timestamp)
@@ -836,10 +868,8 @@ RSpec.describe TopicsController do
expect(p2.reload.created_at).to eq_time(old_timestamp)
end
- it 'should create a staff log entry' do
- put "/t/#{topic.id}/change-timestamp.json", params: {
- timestamp: new_timestamp.to_f
- }
+ it "should create a staff log entry" do
+ put "/t/#{topic.id}/change-timestamp.json", params: { timestamp: new_timestamp.to_f }
log = UserHistory.last
expect(log.acting_user_id).to eq(moderator.id)
@@ -850,78 +880,66 @@ RSpec.describe TopicsController do
end
end
- describe '#clear_pin' do
- it 'needs you to be logged in' do
+ describe "#clear_pin" do
+ it "needs you to be logged in" do
put "/t/1/clear-pin.json"
expect(response.status).to eq(403)
end
- context 'when logged in' do
- before do
- sign_in(user)
- end
+ context "when logged in" do
+ before { sign_in(user) }
it "fails when the user can't see the topic" do
put "/t/#{pm.id}/clear-pin.json"
expect(response).to be_forbidden
end
- describe 'when the user can see the topic' do
+ describe "when the user can see the topic" do
it "succeeds" do
- expect do
- put "/t/#{topic.id}/clear-pin.json"
- end.to change { TopicUser.where(topic_id: topic.id, user_id: user.id).count }.by(1)
+ expect do put "/t/#{topic.id}/clear-pin.json" end.to change {
+ TopicUser.where(topic_id: topic.id, user_id: user.id).count
+ }.by(1)
expect(response.status).to eq(200)
end
end
end
end
- describe '#status' do
- it 'needs you to be logged in' do
- put "/t/1/status.json", params: {
- status: 'visible', enabled: true
- }
+ describe "#status" do
+ it "needs you to be logged in" do
+ put "/t/1/status.json", params: { status: "visible", enabled: true }
expect(response.status).to eq(403)
end
- describe 'when logged in as a moderator' do
- before do
- sign_in(moderator)
- end
+ describe "when logged in as a moderator" do
+ before { sign_in(moderator) }
it "raises an exception if you can't change it" do
sign_in(user)
- put "/t/#{topic.id}/status.json", params: {
- status: 'visible', enabled: 'true'
- }
+ put "/t/#{topic.id}/status.json", params: { status: "visible", enabled: "true" }
expect(response).to be_forbidden
end
- it 'requires the status parameter' do
+ it "requires the status parameter" do
put "/t/#{topic.id}/status.json", params: { enabled: true }
expect(response.status).to eq(400)
end
- it 'requires the enabled parameter' do
- put "/t/#{topic.id}/status.json", params: { status: 'visible' }
+ it "requires the enabled parameter" do
+ put "/t/#{topic.id}/status.json", params: { status: "visible" }
expect(response.status).to eq(400)
end
- it 'raises an error with a status not in the allowlist' do
- put "/t/#{topic.id}/status.json", params: {
- status: 'title', enabled: 'true'
- }
+ it "raises an error with a status not in the allowlist" do
+ put "/t/#{topic.id}/status.json", params: { status: "title", enabled: "true" }
expect(response.status).to eq(400)
end
- it 'should update the status of the topic correctly' do
+ it "should update the status of the topic correctly" do
closed_user_topic = Fabricate(:topic, user: user, closed: true)
Fabricate(:topic_timer, topic: closed_user_topic, status_type: TopicTimer.types[:open])
- put "/t/#{closed_user_topic.id}/status.json", params: {
- status: 'closed', enabled: 'false'
- }
+ put "/t/#{closed_user_topic.id}/status.json", params: { status: "closed", enabled: "false" }
expect(response.status).to eq(200)
expect(closed_user_topic.reload.closed).to eq(false)
@@ -929,11 +947,11 @@ RSpec.describe TopicsController do
body = response.parsed_body
- expect(body['topic_status_update']).to eq(nil)
+ expect(body["topic_status_update"]).to eq(nil)
end
end
- describe 'when logged in as a group member with reviewable status' do
+ describe "when logged in as a group member with reviewable status" do
fab!(:category) { Fabricate(:category, reviewable_by_group: group_user.group) }
fab!(:topic) { Fabricate(:topic, category: category) }
@@ -942,110 +960,97 @@ RSpec.describe TopicsController do
SiteSetting.enable_category_group_moderation = true
end
- it 'should allow a group moderator to close a topic' do
- put "/t/#{topic.id}/status.json", params: {
- status: 'closed', enabled: 'true'
- }
+ it "should allow a group moderator to close a topic" do
+ put "/t/#{topic.id}/status.json", params: { status: "closed", enabled: "true" }
expect(response.status).to eq(200)
expect(topic.reload.closed).to eq(true)
- expect(topic.posts.last.action_code).to eq('closed.enabled')
+ expect(topic.posts.last.action_code).to eq("closed.enabled")
end
- it 'should allow a group moderator to open a closed topic' do
+ it "should allow a group moderator to open a closed topic" do
topic.update!(closed: true)
expect do
- put "/t/#{topic.id}/status.json", params: {
- status: 'closed', enabled: 'false'
- }
+ put "/t/#{topic.id}/status.json", params: { status: "closed", enabled: "false" }
end.to change { topic.reload.posts.count }.by(1)
expect(response.status).to eq(200)
expect(topic.reload.closed).to eq(false)
- expect(topic.posts.last.action_code).to eq('closed.disabled')
+ expect(topic.posts.last.action_code).to eq("closed.disabled")
end
- it 'should allow a group moderator to archive a topic' do
+ it "should allow a group moderator to archive a topic" do
expect do
- put "/t/#{topic.id}/status.json", params: {
- status: 'archived', enabled: 'true'
- }
+ put "/t/#{topic.id}/status.json", params: { status: "archived", enabled: "true" }
end.to change { topic.reload.posts.count }.by(1)
expect(response.status).to eq(200)
expect(topic.reload.archived).to eq(true)
- expect(topic.posts.last.action_code).to eq('archived.enabled')
+ expect(topic.posts.last.action_code).to eq("archived.enabled")
end
- it 'should allow a group moderator to unarchive an archived topic' do
+ it "should allow a group moderator to unarchive an archived topic" do
topic.update!(archived: true)
- put "/t/#{topic.id}/status.json", params: {
- status: 'archived', enabled: 'false'
- }
+ put "/t/#{topic.id}/status.json", params: { status: "archived", enabled: "false" }
expect(response.status).to eq(200)
expect(topic.reload.archived).to eq(false)
- expect(topic.posts.last.action_code).to eq('archived.disabled')
+ expect(topic.posts.last.action_code).to eq("archived.disabled")
end
- it 'should allow a group moderator to pin a topic' do
- put "/t/#{topic.id}/status.json", params: {
- status: 'pinned', enabled: 'true', until: 2.weeks.from_now
- }
+ it "should allow a group moderator to pin a topic" do
+ put "/t/#{topic.id}/status.json",
+ params: {
+ status: "pinned",
+ enabled: "true",
+ until: 2.weeks.from_now,
+ }
expect(response.status).to eq(200)
expect(topic.reload.pinned_at).to_not eq(nil)
end
- it 'should allow a group moderator to unpin a topic' do
- put "/t/#{topic.id}/status.json", params: {
- status: 'pinned', enabled: 'false'
- }
+ it "should allow a group moderator to unpin a topic" do
+ put "/t/#{topic.id}/status.json", params: { status: "pinned", enabled: "false" }
expect(response.status).to eq(200)
expect(topic.reload.pinned_at).to eq(nil)
end
- it 'should allow a group moderator to unlist a topic' do
- put "/t/#{topic.id}/status.json", params: {
- status: 'visible', enabled: 'false'
- }
+ it "should allow a group moderator to unlist a topic" do
+ put "/t/#{topic.id}/status.json", params: { status: "visible", enabled: "false" }
expect(response.status).to eq(200)
expect(topic.reload.visible).to eq(false)
- expect(topic.posts.last.action_code).to eq('visible.disabled')
+ expect(topic.posts.last.action_code).to eq("visible.disabled")
end
- it 'should allow a group moderator to list an unlisted topic' do
+ it "should allow a group moderator to list an unlisted topic" do
topic.update!(visible: false)
- put "/t/#{topic.id}/status.json", params: {
- status: 'visible', enabled: 'true'
- }
+ put "/t/#{topic.id}/status.json", params: { status: "visible", enabled: "true" }
expect(response.status).to eq(200)
expect(topic.reload.visible).to eq(true)
- expect(topic.posts.last.action_code).to eq('visible.enabled')
+ expect(topic.posts.last.action_code).to eq("visible.enabled")
end
end
end
- describe '#destroy_timings' do
- it 'needs you to be logged in' do
+ describe "#destroy_timings" do
+ it "needs you to be logged in" do
delete "/t/1/timings.json"
expect(response.status).to eq(403)
end
def topic_user_post_timings_count(user, topic)
- [TopicUser, PostTiming].map do |klass|
- klass.where(user: user, topic: topic).count
- end
+ [TopicUser, PostTiming].map { |klass| klass.where(user: user, topic: topic).count }
end
- context 'for last post only' do
- it 'should allow you to retain topic timing but remove last post only' do
+ context "for last post only" do
+ it "should allow you to retain topic timing but remove last post only" do
freeze_time
post1 = create_post
@@ -1059,29 +1064,26 @@ RSpec.describe TopicsController do
user.user_stat.update!(first_unread_at: Time.now + 1.week)
- topic_user = TopicUser.find_by(
- topic_id: topic.id,
- user_id: user.id,
- )
+ topic_user = TopicUser.find_by(topic_id: topic.id, user_id: user.id)
- topic_user.update!(
- last_read_post_number: 2,
- )
+ topic_user.update!(last_read_post_number: 2)
# ensure we have 2 notifications
# fake notification on topic but it is read
- first_notification = Notification.create!(
- user_id: user.id,
- topic_id: topic.id,
- data: "{}",
- read: true,
- notification_type: 1
- )
+ first_notification =
+ Notification.create!(
+ user_id: user.id,
+ topic_id: topic.id,
+ data: "{}",
+ read: true,
+ notification_type: 1,
+ )
freeze_time 1.minute.from_now
PostAlerter.post_created(post2)
- second_notification = user.notifications.where(topic_id: topic.id).order(created_at: :desc).first
+ second_notification =
+ user.notifications.where(topic_id: topic.id).order(created_at: :desc).first
second_notification.update!(read: true)
sign_in(user)
@@ -1091,7 +1093,9 @@ RSpec.describe TopicsController do
expect(PostTiming.where(topic: topic, user: user, post_number: 2).exists?).to eq(false)
expect(PostTiming.where(topic: topic, user: user, post_number: 1).exists?).to eq(true)
- expect(TopicUser.where(topic: topic, user: user, last_read_post_number: 1).exists?).to eq(true)
+ expect(TopicUser.where(topic: topic, user: user, last_read_post_number: 1).exists?).to eq(
+ true,
+ )
user.user_stat.reload
expect(user.user_stat.first_unread_at).to eq_time(topic.updated_at)
@@ -1106,11 +1110,13 @@ RSpec.describe TopicsController do
delete "/t/#{topic.id}/timings.json?last=1"
expect(PostTiming.where(topic: topic, user: user, post_number: 1).exists?).to eq(false)
- expect(TopicUser.where(topic: topic, user: user, last_read_post_number: nil).exists?).to eq(true)
+ expect(TopicUser.where(topic: topic, user: user, last_read_post_number: nil).exists?).to eq(
+ true,
+ )
end
end
- context 'when logged in' do
+ context "when logged in" do
fab!(:user_topic) { Fabricate(:topic, user: user) }
fab!(:user_post) { Fabricate(:post, user: user, topic: user_topic, post_number: 2) }
@@ -1120,37 +1126,46 @@ RSpec.describe TopicsController do
PostTiming.create!(topic: user_topic, user: user, post_number: 2, msecs: 1000)
end
- it 'deletes the forum topic user and post timings records' do
- expect do
- delete "/t/#{user_topic.id}/timings.json"
- end.to change { topic_user_post_timings_count(user, user_topic) }.from([1, 1]).to([0, 0])
+ it "deletes the forum topic user and post timings records" do
+ expect do delete "/t/#{user_topic.id}/timings.json" end.to change {
+ topic_user_post_timings_count(user, user_topic)
+ }.from([1, 1]).to([0, 0])
end
end
end
- describe '#mute/unmute' do
- it 'needs you to be logged in' do
+ describe "#mute/unmute" do
+ it "needs you to be logged in" do
put "/t/99/mute.json"
expect(response.status).to eq(403)
end
- it 'needs you to be logged in' do
+ it "needs you to be logged in" do
put "/t/99/unmute.json"
expect(response.status).to eq(403)
end
end
- describe '#recover' do
+ describe "#recover" do
it "won't allow us to recover a topic when we're not logged in" do
put "/t/1/recover.json"
expect(response.status).to eq(403)
end
- describe 'when logged in' do
+ describe "when logged in" do
let!(:topic) { Fabricate(:topic, user: user, deleted_at: Time.now, deleted_by: moderator) }
- let!(:post) { Fabricate(:post, user: user, topic: topic, post_number: 1, deleted_at: Time.now, deleted_by: moderator) }
+ let!(:post) do
+ Fabricate(
+ :post,
+ user: user,
+ topic: topic,
+ post_number: 1,
+ deleted_at: Time.now,
+ deleted_by: moderator,
+ )
+ end
- describe 'without access' do
+ describe "without access" do
it "raises an exception when the user doesn't have permission to delete the topic" do
sign_in(user)
put "/t/#{topic.id}/recover.json"
@@ -1158,12 +1173,10 @@ RSpec.describe TopicsController do
end
end
- context 'with permission' do
- before do
- sign_in(moderator)
- end
+ context "with permission" do
+ before { sign_in(moderator) }
- it 'succeeds' do
+ it "succeeds" do
put "/t/#{topic.id}/recover.json"
topic.reload
post.reload
@@ -1175,17 +1188,17 @@ RSpec.describe TopicsController do
end
end
- describe '#delete' do
+ describe "#delete" do
it "won't allow us to delete a topic when we're not logged in" do
delete "/t/1.json"
expect(response.status).to eq(403)
end
- describe 'when logged in' do
+ describe "when logged in" do
fab!(:topic) { Fabricate(:topic, user: user, created_at: 48.hours.ago) }
fab!(:post) { Fabricate(:post, topic: topic, user: user, post_number: 1) }
- describe 'without access' do
+ describe "without access" do
it "raises an exception when the user doesn't have permission to delete the topic" do
sign_in(user)
delete "/t/#{topic.id}.json"
@@ -1193,12 +1206,10 @@ RSpec.describe TopicsController do
end
end
- describe 'with permission' do
- before do
- sign_in(moderator)
- end
+ describe "with permission" do
+ before { sign_in(moderator) }
- it 'succeeds' do
+ it "succeeds" do
delete "/t/#{topic.id}.json"
expect(response.status).to eq(200)
topic.reload
@@ -1207,7 +1218,7 @@ RSpec.describe TopicsController do
end
end
- describe 'force destroy' do
+ describe "force destroy" do
fab!(:post) { Fabricate(:post, topic: topic, post_number: 1) }
before do
@@ -1216,7 +1227,7 @@ RSpec.describe TopicsController do
sign_in(admin)
end
- it 'force destroys all deleted small actions in topic too' do
+ it "force destroys all deleted small actions in topic too" do
small_action_post = Fabricate(:small_action, topic: topic)
PostDestroyer.new(Discourse.system_user, post).destroy
PostDestroyer.new(Discourse.system_user, small_action_post).destroy
@@ -1230,7 +1241,7 @@ RSpec.describe TopicsController do
expect(Post.find_by(id: small_action_post.id)).to eq(nil)
end
- it 'does not allow to destroy topic if not all posts were force destroyed' do
+ it "does not allow to destroy topic if not all posts were force destroyed" do
other_post = Fabricate(:post, topic: topic, post_number: 2)
PostDestroyer.new(Discourse.system_user, post).destroy
@@ -1239,7 +1250,7 @@ RSpec.describe TopicsController do
expect(response.status).to eq(403)
end
- it 'does not allow to destroy topic if not all small action posts were deleted' do
+ it "does not allow to destroy topic if not all small action posts were deleted" do
small_action_post = Fabricate(:small_action, topic: topic)
PostDestroyer.new(Discourse.system_user, small_action_post).destroy
@@ -1250,16 +1261,16 @@ RSpec.describe TopicsController do
end
end
- describe '#id_for_slug' do
+ describe "#id_for_slug" do
fab!(:topic) { Fabricate(:post, user: post_author1).topic }
it "returns JSON for the slug" do
get "/t/id_for/#{topic.slug}.json"
expect(response.status).to eq(200)
json = response.parsed_body
- expect(json['topic_id']).to eq(topic.id)
- expect(json['url']).to eq(topic.url)
- expect(json['slug']).to eq(topic.slug)
+ expect(json["topic_id"]).to eq(topic.id)
+ expect(json["url"]).to eq(topic.url)
+ expect(json["slug"]).to eq(topic.slug)
end
it "returns invalid access if the user can't see the topic" do
@@ -1268,25 +1279,23 @@ RSpec.describe TopicsController do
end
end
- describe '#update' do
+ describe "#update" do
it "won't allow us to update a topic when we're not logged in" do
- put "/t/1.json", params: { slug: 'xyz' }
+ put "/t/1.json", params: { slug: "xyz" }
expect(response.status).to eq(403)
end
- describe 'when logged in' do
+ describe "when logged in" do
fab!(:topic) { Fabricate(:topic, user: user) }
- before_all do
- Fabricate(:post, user: post_author1, topic: topic)
- end
+ before_all { Fabricate(:post, user: post_author1, topic: topic) }
before do
SiteSetting.editing_grace_period = 0
sign_in(user)
end
- it 'can not change category to a disallowed category' do
+ it "can not change category to a disallowed category" do
category.set_permissions(staff: :full)
category.save!
@@ -1296,7 +1305,7 @@ RSpec.describe TopicsController do
expect(topic.reload.category_id).not_to eq(category.id)
end
- it 'can not move to a category that requires topic approval' do
+ it "can not move to a category that requires topic approval" do
category.custom_fields[Category::REQUIRE_TOPIC_APPROVAL] = true
category.save!
@@ -1306,11 +1315,13 @@ RSpec.describe TopicsController do
expect(topic.reload.category_id).not_to eq(category.id)
end
- context 'when updating shared drafts' do
+ context "when updating shared drafts" do
fab!(:topic) { Fabricate(:topic, category: shared_drafts_category) }
- fab!(:shared_draft) { Fabricate(:shared_draft, topic: topic, category: Fabricate(:category)) }
+ fab!(:shared_draft) do
+ Fabricate(:shared_draft, topic: topic, category: Fabricate(:category))
+ end
- it 'changes destination category' do
+ it "changes destination category" do
put "/t/#{topic.id}.json", params: { category_id: category.id }
expect(response.status).to eq(403)
@@ -1318,7 +1329,7 @@ RSpec.describe TopicsController do
end
end
- describe 'without permission' do
+ describe "without permission" do
it "raises an exception when the user doesn't have permission to update the topic" do
topic.update!(archived: true)
put "/t/#{topic.slug}/#{topic.id}.json"
@@ -1327,15 +1338,15 @@ RSpec.describe TopicsController do
end
end
- describe 'with permission' do
+ describe "with permission" do
fab!(:post_hook) { Fabricate(:post_web_hook) }
fab!(:topic_hook) { Fabricate(:topic_web_hook) }
- it 'succeeds' do
+ it "succeeds" do
put "/t/#{topic.slug}/#{topic.id}.json"
expect(response.status).to eq(200)
- expect(response.parsed_body['basic_topic']).to be_present
+ expect(response.parsed_body["basic_topic"]).to be_present
end
it "throws an error if it could not be saved" do
@@ -1343,29 +1354,28 @@ RSpec.describe TopicsController do
put "/t/#{topic.slug}/#{topic.id}.json", params: { title: "brand new title" }
expect(response.status).to eq(422)
- expect(response.parsed_body['errors'].first).to eq(
- I18n.t("activerecord.errors.models.topic.attributes.base.unable_to_update")
+ expect(response.parsed_body["errors"].first).to eq(
+ I18n.t("activerecord.errors.models.topic.attributes.base.unable_to_update"),
)
end
it "can update a topic to an uncategorized topic" do
topic.update!(category: category)
- put "/t/#{topic.slug}/#{topic.id}.json", params: {
- category_id: ""
- }
+ put "/t/#{topic.slug}/#{topic.id}.json", params: { category_id: "" }
expect(response.status).to eq(200)
expect(topic.reload.category_id).to eq(SiteSetting.uncategorized_category_id)
end
- it 'allows a change of title' do
- put "/t/#{topic.slug}/#{topic.id}.json", params: {
- title: 'This is a new title for the topic'
- }
+ it "allows a change of title" do
+ put "/t/#{topic.slug}/#{topic.id}.json",
+ params: {
+ title: "This is a new title for the topic",
+ }
topic.reload
- expect(topic.title).to eq('This is a new title for the topic')
+ expect(topic.title).to eq("This is a new title for the topic")
# emits a topic_edited event but not a post_edited web hook event
expect(Jobs::EmitWebHookEvent.jobs.length).to eq(1)
@@ -1373,44 +1383,39 @@ RSpec.describe TopicsController do
expect(job_args["event_name"]).to eq("topic_edited")
payload = JSON.parse(job_args["payload"])
- expect(payload["title"]).to eq('This is a new title for the topic')
+ expect(payload["title"]).to eq("This is a new title for the topic")
end
- it 'allows update on short non-slug url' do
- put "/t/#{topic.id}.json", params: {
- title: 'This is a new title for the topic'
- }
+ it "allows update on short non-slug url" do
+ put "/t/#{topic.id}.json", params: { title: "This is a new title for the topic" }
topic.reload
- expect(topic.title).to eq('This is a new title for the topic')
+ expect(topic.title).to eq("This is a new title for the topic")
end
- it 'only allows update on digit ids' do
+ it "only allows update on digit ids" do
non_digit_id = "asdf"
original_title = topic.title
- put "/t/#{non_digit_id}.json", params: {
- title: 'This is a new title for the topic'
- }
+ put "/t/#{non_digit_id}.json", params: { title: "This is a new title for the topic" }
topic.reload
expect(topic.title).to eq(original_title)
expect(response.status).to eq(404)
end
- it 'allows a change of then updating the OP' do
+ it "allows a change of then updating the OP" do
topic.update(user: user)
topic.first_post.update(user: user)
- put "/t/#{topic.slug}/#{topic.id}.json", params: {
- title: 'This is a new title for the topic'
- }
+ put "/t/#{topic.slug}/#{topic.id}.json",
+ params: {
+ title: "This is a new title for the topic",
+ }
topic.reload
- expect(topic.title).to eq('This is a new title for the topic')
+ expect(topic.title).to eq("This is a new title for the topic")
- update_params = {
- post: { raw: 'edited body', edit_reason: 'typo' },
- }
+ update_params = { post: { raw: "edited body", edit_reason: "typo" } }
put "/posts/#{topic.first_post.id}.json", params: update_params
# emits a topic_edited event and a post_edited web hook event
@@ -1419,7 +1424,7 @@ RSpec.describe TopicsController do
expect(job_args["event_name"]).to eq("topic_edited")
payload = JSON.parse(job_args["payload"])
- expect(payload["title"]).to eq('This is a new title for the topic')
+ expect(payload["title"]).to eq("This is a new title for the topic")
job_args = Jobs::EmitWebHookEvent.jobs[1]["args"].first
@@ -1429,37 +1434,37 @@ RSpec.describe TopicsController do
end
it "returns errors with invalid titles" do
- put "/t/#{topic.slug}/#{topic.id}.json", params: {
- title: 'asdf'
- }
+ put "/t/#{topic.slug}/#{topic.id}.json", params: { title: "asdf" }
expect(response.status).to eq(422)
- expect(response.parsed_body['errors']).to match_array([/Title is too short/, /Title seems unclear/])
+ expect(response.parsed_body["errors"]).to match_array(
+ [/Title is too short/, /Title seems unclear/],
+ )
end
it "returns errors when the rate limit is exceeded" do
- EditRateLimiter.any_instance.expects(:performed!).raises(RateLimiter::LimitExceeded.new(60))
+ EditRateLimiter
+ .any_instance
+ .expects(:performed!)
+ .raises(RateLimiter::LimitExceeded.new(60))
- put "/t/#{topic.slug}/#{topic.id}.json", params: {
- title: 'This is a new title for the topic'
- }
+ put "/t/#{topic.slug}/#{topic.id}.json",
+ params: {
+ title: "This is a new title for the topic",
+ }
expect(response.status).to eq(429)
end
it "returns errors with invalid categories" do
- put "/t/#{topic.slug}/#{topic.id}.json", params: {
- category_id: -1
- }
+ put "/t/#{topic.slug}/#{topic.id}.json", params: { category_id: -1 }
expect(response.status).to eq(422)
end
it "doesn't call the PostRevisor when there is no changes" do
expect do
- put "/t/#{topic.slug}/#{topic.id}.json", params: {
- category_id: topic.category_id
- }
+ put "/t/#{topic.slug}/#{topic.id}.json", params: { category_id: topic.category_id }
end.not_to change(PostRevision.all, :count)
expect(response.status).to eq(200)
@@ -1529,9 +1534,7 @@ RSpec.describe TopicsController do
user.update!(trust_level: 3)
topic.first_post.update!(locked_by_id: admin.id)
- put "/t/#{topic.slug}/#{topic.id}.json", params: {
- title: topic.title + " hello"
- }
+ put "/t/#{topic.slug}/#{topic.id}.json", params: { title: topic.title + " hello" }
expect(response.status).to eq(403)
end
@@ -1540,23 +1543,17 @@ RSpec.describe TopicsController do
sign_in(Fabricate(:admin))
topic.first_post.update!(locked_by_id: admin.id)
- put "/t/#{topic.slug}/#{topic.id}.json", params: {
- title: topic.title + " hello"
- }
+ put "/t/#{topic.slug}/#{topic.id}.json", params: { title: topic.title + " hello" }
expect(response.status).to eq(200)
end
end
- context 'with tags' do
- before do
- SiteSetting.tagging_enabled = true
- end
+ context "with tags" do
+ before { SiteSetting.tagging_enabled = true }
it "can add a tag to topic" do
expect do
- put "/t/#{topic.slug}/#{topic.id}.json", params: {
- tags: [tag.name]
- }
+ put "/t/#{topic.slug}/#{topic.id}.json", params: { tags: [tag.name] }
end.to change { topic.reload.first_post.revisions.count }.by(1)
expect(response.status).to eq(200)
@@ -1566,9 +1563,7 @@ RSpec.describe TopicsController do
it "can create a tag" do
SiteSetting.min_trust_to_create_tag = 0
expect do
- put "/t/#{topic.slug}/#{topic.id}.json", params: {
- tags: ["newtag"]
- }
+ put "/t/#{topic.slug}/#{topic.id}.json", params: { tags: ["newtag"] }
end.to change { topic.reload.first_post.revisions.count }.by(1)
expect(response.status).to eq(200)
@@ -1578,10 +1573,11 @@ RSpec.describe TopicsController do
it "can change the category and create a new tag" do
SiteSetting.min_trust_to_create_tag = 0
expect do
- put "/t/#{topic.slug}/#{topic.id}.json", params: {
- tags: ["newtag"],
- category_id: category.id
- }
+ put "/t/#{topic.slug}/#{topic.id}.json",
+ params: {
+ tags: ["newtag"],
+ category_id: category.id,
+ }
end.to change { topic.reload.first_post.revisions.count }.by(1)
expect(response.status).to eq(200)
@@ -1594,75 +1590,65 @@ RSpec.describe TopicsController do
sign_in(user_2)
expect do
- put "/t/#{topic.id}/tags.json", params: {
- tags: [tag.name]
- }
+ put "/t/#{topic.id}/tags.json", params: { tags: [tag.name] }
end.not_to change { topic.reload.first_post.revisions.count }
expect(response.status).to eq(403)
user_2.update!(trust_level: 2)
- expect do
- put "/t/#{topic.id}/tags.json", params: {
- tags: [tag.name]
- }
- end.to change { topic.reload.first_post.revisions.count }.by(1)
+ expect do put "/t/#{topic.id}/tags.json", params: { tags: [tag.name] } end.to change {
+ topic.reload.first_post.revisions.count
+ }.by(1)
expect(response.status).to eq(200)
expect(topic.tags.pluck(:id)).to contain_exactly(tag.id)
end
- it 'does not remove tag if no params is given' do
+ it "does not remove tag if no params is given" do
topic.tags << tag
- expect do
- put "/t/#{topic.slug}/#{topic.id}.json"
- end.to_not change { topic.reload.tags.count }
+ expect do put "/t/#{topic.slug}/#{topic.id}.json" end.to_not change {
+ topic.reload.tags.count
+ }
expect(response.status).to eq(200)
end
- it 'can remove a tag' do
+ it "can remove a tag" do
topic.tags << tag
expect do
- put "/t/#{topic.slug}/#{topic.id}.json", params: {
- tags: [""]
- }
+ put "/t/#{topic.slug}/#{topic.id}.json", params: { tags: [""] }
end.to change { topic.reload.first_post.revisions.count }.by(1)
expect(response.status).to eq(200)
expect(topic.tags).to eq([])
end
- it 'does not cause a revision when tags have not changed' do
+ it "does not cause a revision when tags have not changed" do
topic.tags << tag
expect do
- put "/t/#{topic.slug}/#{topic.id}.json", params: {
- tags: [tag.name]
- }
+ put "/t/#{topic.slug}/#{topic.id}.json", params: { tags: [tag.name] }
end.not_to change { topic.reload.first_post.revisions.count }
expect(response.status).to eq(200)
end
end
- context 'when topic is private' do
+ context "when topic is private" do
before do
topic.update!(
archetype: Archetype.private_message,
category: nil,
- allowed_users: [topic.user]
+ allowed_users: [topic.user],
)
end
- context 'when there are no changes' do
- it 'does not call the PostRevisor' do
+ context "when there are no changes" do
+ it "does not call the PostRevisor" do
expect do
- put "/t/#{topic.slug}/#{topic.id}.json", params: {
- category_id: topic.category_id
- }
+ put "/t/#{topic.slug}/#{topic.id}.json", params: { category_id: topic.category_id }
end.not_to change(PostRevision.all, :count)
expect(response.status).to eq(200)
@@ -1670,7 +1656,7 @@ RSpec.describe TopicsController do
end
end
- context 'when updating to a category with restricted tags' do
+ context "when updating to a category with restricted tags" do
fab!(:restricted_category) { Fabricate(:category) }
fab!(:tag1) { Fabricate(:tag) }
fab!(:tag2) { Fabricate(:tag) }
@@ -1683,7 +1669,7 @@ RSpec.describe TopicsController do
topic.update!(tags: [tag1])
end
- it 'can’t change to a category disallowing this topic current tags' do
+ it "can’t change to a category disallowing this topic current tags" do
restricted_category.allowed_tags = [tag2.name]
put "/t/#{topic.slug}/#{topic.id}.json", params: { category_id: restricted_category.id }
@@ -1691,11 +1677,11 @@ RSpec.describe TopicsController do
result = response.parsed_body
expect(response.status).to eq(422)
- expect(result['errors']).to be_present
+ expect(result["errors"]).to be_present
expect(topic.reload.category_id).not_to eq(restricted_category.id)
end
- it 'can’t change to a category disallowing this topic current tag (through tag_group)' do
+ it "can’t change to a category disallowing this topic current tag (through tag_group)" do
tag_group_2.tags = [tag2]
restricted_category.allowed_tag_groups = [tag_group_2.name]
@@ -1704,11 +1690,11 @@ RSpec.describe TopicsController do
result = response.parsed_body
expect(response.status).to eq(422)
- expect(result['errors']).to be_present
+ expect(result["errors"]).to be_present
expect(topic.reload.category_id).not_to eq(restricted_category.id)
end
- it 'can change to a category allowing this topic current tags' do
+ it "can change to a category allowing this topic current tags" do
restricted_category.allowed_tags = [tag1.name]
put "/t/#{topic.slug}/#{topic.id}.json", params: { category_id: restricted_category.id }
@@ -1716,7 +1702,7 @@ RSpec.describe TopicsController do
expect(response.status).to eq(200)
end
- it 'can change to a category allowing this topic current tags (through tag_group)' do
+ it "can change to a category allowing this topic current tags (through tag_group)" do
tag_group_1.tags = [tag1]
restricted_category.allowed_tag_groups = [tag_group_1.name]
@@ -1725,73 +1711,79 @@ RSpec.describe TopicsController do
expect(response.status).to eq(200)
end
- it 'can change to a category allowing any tag' do
+ it "can change to a category allowing any tag" do
put "/t/#{topic.slug}/#{topic.id}.json", params: { category_id: category.id }
expect(response.status).to eq(200)
end
- it 'can’t add a category-only tags from another category to a category' do
+ it "can’t add a category-only tags from another category to a category" do
restricted_category.allowed_tags = [tag2.name]
- put "/t/#{topic.slug}/#{topic.id}.json", params: {
- tags: [tag2.name],
- category_id: category.id
- }
+ put "/t/#{topic.slug}/#{topic.id}.json",
+ params: {
+ tags: [tag2.name],
+ category_id: category.id,
+ }
result = response.parsed_body
expect(response.status).to eq(422)
- expect(result['errors']).to be_present
- expect(result['errors'][0]).to include(tag2.name)
+ expect(result["errors"]).to be_present
+ expect(result["errors"][0]).to include(tag2.name)
expect(topic.reload.category_id).not_to eq(restricted_category.id)
end
- it 'allows category change when topic has a hidden tag' do
+ it "allows category change when topic has a hidden tag" do
Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [tag1.name])
- put "/t/#{topic.slug}/#{topic.id}.json", params: {
- category_id: category.id
- }
+ put "/t/#{topic.slug}/#{topic.id}.json", params: { category_id: category.id }
result = response.parsed_body
expect(response.status).to eq(200)
expect(topic.reload.tags).to include(tag1)
end
- it 'allows category change when topic has a read-only tag' do
- Fabricate(:tag_group, permissions: { "staff" => 1, "everyone" => 3 }, tag_names: [tag3.name])
+ it "allows category change when topic has a read-only tag" do
+ Fabricate(
+ :tag_group,
+ permissions: {
+ "staff" => 1,
+ "everyone" => 3,
+ },
+ tag_names: [tag3.name],
+ )
topic.update!(tags: [tag3])
- put "/t/#{topic.slug}/#{topic.id}.json", params: {
- category_id: category.id
- }
+ put "/t/#{topic.slug}/#{topic.id}.json", params: { category_id: category.id }
result = response.parsed_body
expect(response.status).to eq(200)
expect(topic.reload.tags).to contain_exactly(tag3)
end
- it 'does not leak tag name when trying to use a staff tag' do
+ it "does not leak tag name when trying to use a staff tag" do
Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [tag3.name])
- put "/t/#{topic.slug}/#{topic.id}.json", params: {
- tags: [tag3.name],
- category_id: category.id
- }
+ put "/t/#{topic.slug}/#{topic.id}.json",
+ params: {
+ tags: [tag3.name],
+ category_id: category.id,
+ }
result = response.parsed_body
expect(response.status).to eq(422)
- expect(result['errors']).to be_present
- expect(result['errors'][0]).not_to include(tag3.name)
+ expect(result["errors"]).to be_present
+ expect(result["errors"][0]).not_to include(tag3.name)
end
- it 'will clean tag params' do
+ it "will clean tag params" do
restricted_category.allowed_tags = [tag2.name]
- put "/t/#{topic.slug}/#{topic.id}.json", params: {
- tags: [""],
- category_id: restricted_category.id
- }
+ put "/t/#{topic.slug}/#{topic.id}.json",
+ params: {
+ tags: [""],
+ category_id: restricted_category.id,
+ }
result = response.parsed_body
expect(response.status).to eq(200)
@@ -1799,14 +1791,10 @@ RSpec.describe TopicsController do
end
context "when allow_uncategorized_topics is false" do
- before do
- SiteSetting.allow_uncategorized_topics = false
- end
+ before { SiteSetting.allow_uncategorized_topics = false }
it "can add a category to an uncategorized topic" do
- put "/t/#{topic.slug}/#{topic.id}.json", params: {
- category_id: category.id
- }
+ put "/t/#{topic.slug}/#{topic.id}.json", params: { category_id: category.id }
expect(response.status).to eq(200)
expect(topic.reload.category).to eq(category)
@@ -1826,9 +1814,10 @@ RSpec.describe TopicsController do
sign_in(trust_level_1)
tl1_topic = fabricate_topic(trust_level_1)
- put "/t/#{tl1_topic.slug}/#{tl1_topic.id}.json", params: {
- featured_link: "https://discourse.org"
- }
+ put "/t/#{tl1_topic.slug}/#{tl1_topic.id}.json",
+ params: {
+ featured_link: "https://discourse.org",
+ }
expect(response.status).to eq(200)
end
@@ -1837,9 +1826,10 @@ RSpec.describe TopicsController do
sign_in(trust_level_0)
tl0_topic = fabricate_topic(trust_level_0)
- put "/t/#{tl0_topic.slug}/#{tl0_topic.id}.json", params: {
- featured_link: "https://discourse.org"
- }
+ put "/t/#{tl0_topic.slug}/#{tl0_topic.id}.json",
+ params: {
+ featured_link: "https://discourse.org",
+ }
expect(response.status).to eq(422)
end
@@ -1849,9 +1839,10 @@ RSpec.describe TopicsController do
SiteSetting.topic_featured_link_enabled = false
tl1_topic = fabricate_topic(trust_level_1)
- put "/t/#{tl1_topic.slug}/#{tl1_topic.id}.json", params: {
- featured_link: "https://discourse.org"
- }
+ put "/t/#{tl1_topic.slug}/#{tl1_topic.id}.json",
+ params: {
+ featured_link: "https://discourse.org",
+ }
expect(response.status).to eq(422)
end
@@ -1861,72 +1852,66 @@ RSpec.describe TopicsController do
category = Fabricate(:category, topic_featured_link_allowed: false)
tl1_topic_in_category = fabricate_topic(trust_level_1, category)
- put "/t/#{tl1_topic_in_category.slug}/#{tl1_topic_in_category.id}.json", params: {
- featured_link: "https://discourse.org"
- }
+ put "/t/#{tl1_topic_in_category.slug}/#{tl1_topic_in_category.id}.json",
+ params: {
+ featured_link: "https://discourse.org",
+ }
expect(response.status).to eq(422)
end
end
end
- describe '#show_by_external_id' do
- fab!(:private_topic) { Fabricate(:private_message_topic, external_id: 'private') }
- fab!(:topic) { Fabricate(:topic, external_id: 'asdf') }
+ describe "#show_by_external_id" do
+ fab!(:private_topic) { Fabricate(:private_message_topic, external_id: "private") }
+ fab!(:topic) { Fabricate(:topic, external_id: "asdf") }
- it 'returns 301 when found' do
+ it "returns 301 when found" do
get "/t/external_id/asdf.json"
expect(response.status).to eq(301)
expect(response).to redirect_to(topic.relative_url + ".json")
end
- it 'returns right response when not found' do
+ it "returns right response when not found" do
get "/t/external_id/fdsa.json"
expect(response.status).to eq(404)
end
- it 'preserves only select query params' do
- get "/t/external_id/asdf.json", params: {
- filter_top_level_replies: true
- }
+ it "preserves only select query params" do
+ get "/t/external_id/asdf.json", params: { filter_top_level_replies: true }
expect(response.status).to eq(301)
expect(response).to redirect_to(topic.relative_url + ".json?filter_top_level_replies=true")
- get "/t/external_id/asdf.json", params: {
- not_valid: true
- }
+ get "/t/external_id/asdf.json", params: { not_valid: true }
expect(response.status).to eq(301)
expect(response).to redirect_to(topic.relative_url + ".json")
- get "/t/external_id/asdf.json", params: {
- filter_top_level_replies: true,
- post_number: 9999
- }
+ get "/t/external_id/asdf.json", params: { filter_top_level_replies: true, post_number: 9999 }
expect(response.status).to eq(301)
- expect(response).to redirect_to(topic.relative_url + "/9999.json?filter_top_level_replies=true")
+ expect(response).to redirect_to(
+ topic.relative_url + "/9999.json?filter_top_level_replies=true",
+ )
- get "/t/external_id/asdf.json", params: {
- filter_top_level_replies: true,
- print: true
- }
+ get "/t/external_id/asdf.json", params: { filter_top_level_replies: true, print: true }
expect(response.status).to eq(301)
- expect(response).to redirect_to(topic.relative_url + ".json?print=true&filter_top_level_replies=true")
+ expect(response).to redirect_to(
+ topic.relative_url + ".json?print=true&filter_top_level_replies=true",
+ )
end
- describe 'when user does not have access to the topic' do
- it 'should return the right response' do
+ describe "when user does not have access to the topic" do
+ it "should return the right response" do
sign_in(user)
get "/t/external_id/private.json"
expect(response.status).to eq(403)
- expect(response.body).to include(I18n.t('invalid_access'))
+ expect(response.body).to include(I18n.t("invalid_access"))
end
end
-
end
- describe '#show' do
+ describe "#show" do
use_redis_snapshotting
fab!(:private_topic) { pm }
@@ -1935,19 +1920,19 @@ RSpec.describe TopicsController do
fab!(:p1) { Fabricate(:post, user: topic.user) }
fab!(:p2) { Fabricate(:post, user: topic.user) }
- describe 'when topic is not allowed' do
- it 'should return the right response' do
+ describe "when topic is not allowed" do
+ it "should return the right response" do
SiteSetting.detailed_404 = true
sign_in(user)
get "/t/#{private_topic.id}.json"
expect(response.status).to eq(403)
- expect(response.body).to include(I18n.t('invalid_access'))
+ expect(response.body).to include(I18n.t("invalid_access"))
end
end
- describe 'when topic is allowed to a group' do
+ describe "when topic is allowed to a group" do
fab!(:group) { Fabricate(:group, public_admission: true) }
fab!(:category) do
Fabricate(:category_with_definition).tap do |category|
@@ -1957,21 +1942,19 @@ RSpec.describe TopicsController do
end
fab!(:topic) { Fabricate(:topic, category: category) }
- before do
- SiteSetting.detailed_404 = true
- end
+ before { SiteSetting.detailed_404 = true }
- it 'shows a descriptive error message containing the group name' do
+ it "shows a descriptive error message containing the group name" do
get "/t/#{topic.id}.json"
html = CGI.unescapeHTML(response.parsed_body["extras"]["html"])
expect(response.status).to eq(403)
- expect(html).to include(I18n.t('not_in_group.title_topic', group: group.name))
- expect(html).to include(I18n.t('not_in_group.join_group'))
+ expect(html).to include(I18n.t("not_in_group.title_topic", group: group.name))
+ expect(html).to include(I18n.t("not_in_group.join_group"))
end
end
- it 'correctly renders canonicals' do
+ it "correctly renders canonicals" do
get "/t/#{topic.id}", params: { slug: topic.slug }
expect(response.status).to eq(200)
@@ -1979,7 +1962,7 @@ RSpec.describe TopicsController do
expect(response.headers["Cache-Control"]).to eq("no-cache, no-store")
end
- it 'returns 301 even if slug does not match URL' do
+ it "returns 301 even if slug does not match URL" do
# in the past we had special logic for unlisted topics
# we would require slug unless you made a json call
# this was not really providing any security
@@ -1999,22 +1982,22 @@ RSpec.describe TopicsController do
expect(response.status).to eq(301)
end
- it 'shows a topic correctly' do
+ it "shows a topic correctly" do
get "/t/#{topic.slug}/#{topic.id}.json"
expect(response.status).to eq(200)
end
- it 'return 404 for an invalid page' do
+ it "return 404 for an invalid page" do
get "/t/#{topic.slug}/#{topic.id}.json", params: { page: 2 }
expect(response.status).to eq(404)
end
- it 'can find a topic given a slug in the id param' do
+ it "can find a topic given a slug in the id param" do
get "/t/#{topic.slug}"
expect(response).to redirect_to(topic.relative_url)
end
- it 'can find a topic when a slug has a number in front' do
+ it "can find a topic when a slug has a number in front" do
another_topic = Fabricate(:post, user: post_author1).topic
topic.update_column(:slug, "#{another_topic.id}-reasons-discourse-is-awesome")
@@ -2023,39 +2006,35 @@ RSpec.describe TopicsController do
expect(response).to redirect_to(topic.relative_url)
end
- it 'keeps the post_number parameter around when redirecting' do
+ it "keeps the post_number parameter around when redirecting" do
get "/t/#{topic.slug}", params: { post_number: 42 }
expect(response).to redirect_to(topic.relative_url + "/42")
end
- it 'keeps the page around when redirecting' do
- get "/t/#{topic.slug}", params: {
- post_number: 42, page: 123
- }
+ it "keeps the page around when redirecting" do
+ get "/t/#{topic.slug}", params: { post_number: 42, page: 123 }
expect(response).to redirect_to(topic.relative_url + "/42?page=123")
end
- it 'does not accept page params as an array' do
- get "/t/#{topic.slug}", params: {
- post_number: 42, page: [2]
- }
+ it "does not accept page params as an array" do
+ get "/t/#{topic.slug}", params: { post_number: 42, page: [2] }
expect(response).to redirect_to("#{topic.relative_url}/42?page=1")
end
- it 'returns 404 when an invalid slug is given and no id' do
+ it "returns 404 when an invalid slug is given and no id" do
get "/t/nope-nope.json"
expect(response.status).to eq(404)
end
- it 'returns a 404 when slug and topic id do not match a topic' do
+ it "returns a 404 when slug and topic id do not match a topic" do
get "/t/made-up-topic-slug/123456.json"
expect(response.status).to eq(404)
end
- it 'returns a 404 for an ID that is larger than postgres limits' do
+ it "returns a 404 for an ID that is larger than postgres limits" do
get "/t/made-up-topic-slug/5014217323220164041.json"
expect(response.status).to eq(404)
@@ -2068,7 +2047,7 @@ RSpec.describe TopicsController do
expect(response.status).to eq(200)
end
- it 'does not result in N+1 queries problem when multiple topic participants have primary or flair group configured' do
+ it "does not result in N+1 queries problem when multiple topic participants have primary or flair group configured" do
user2 = Fabricate(:user)
user3 = Fabricate(:user)
post2 = Fabricate(:post, topic: topic, user: user2)
@@ -2081,17 +2060,16 @@ RSpec.describe TopicsController do
get "/t/#{topic.id}.json"
expect(response.status).to eq(200)
- first_request_queries = track_sql_queries do
- get "/t/#{topic.id}.json"
+ first_request_queries =
+ track_sql_queries do
+ get "/t/#{topic.id}.json"
- expect(response.status).to eq(200)
+ expect(response.status).to eq(200)
- expect(response.parsed_body["details"]["participants"].map { |u| u["id"] }).to contain_exactly(
- post_author1.id,
- user2.id,
- user3.id
- )
- end
+ expect(
+ response.parsed_body["details"]["participants"].map { |u| u["id"] },
+ ).to contain_exactly(post_author1.id, user2.id, user3.id)
+ end
group2 = Fabricate(:group)
user4 = Fabricate(:user, flair_group: group2)
@@ -2099,36 +2077,33 @@ RSpec.describe TopicsController do
post4 = Fabricate(:post, topic: topic, user: user4)
post5 = Fabricate(:post, topic: topic, user: user5)
- second_request_queries = track_sql_queries do
- get "/t/#{topic.id}.json"
+ second_request_queries =
+ track_sql_queries do
+ get "/t/#{topic.id}.json"
- expect(response.status).to eq(200)
+ expect(response.status).to eq(200)
- expect(response.parsed_body["details"]["participants"].map { |u| u["id"] }).to contain_exactly(
- post_author1.id,
- user2.id,
- user3.id,
- user4.id,
- user5.id
- )
- end
+ expect(
+ response.parsed_body["details"]["participants"].map { |u| u["id"] },
+ ).to contain_exactly(post_author1.id, user2.id, user3.id, user4.id, user5.id)
+ end
expect(second_request_queries.count).to eq(first_request_queries.count)
end
- context 'when a topic with nil slug exists' do
+ context "when a topic with nil slug exists" do
before do
nil_slug_topic = Fabricate(:topic)
Topic.connection.execute("update topics set slug=null where id = #{nil_slug_topic.id}") # can't find a way to set slug column to null using the model
end
- it 'returns a 404 when slug and topic id do not match a topic' do
+ it "returns a 404 when slug and topic id do not match a topic" do
get "/t/made-up-topic-slug/123123.json"
expect(response.status).to eq(404)
end
end
- context 'with permission errors' do
+ context "with permission errors" do
fab!(:allowed_user) { Fabricate(:user) }
fab!(:allowed_group) { Fabricate(:group) }
fab!(:accessible_group) { Fabricate(:group, public_admission: true) }
@@ -2154,13 +2129,14 @@ RSpec.describe TopicsController do
before_all do
@deleted_topic = Fabricate(:deleted_topic)
@deleted_secure_topic = Fabricate(:topic, category: secure_category, deleted_at: 1.day.ago)
- @deleted_private_topic = Fabricate(:private_message_topic, user: allowed_user, deleted_at: 1.day.ago)
+ @deleted_private_topic =
+ Fabricate(:private_message_topic, user: allowed_user, deleted_at: 1.day.ago)
end
let(:deleted_topic) { @deleted_topic }
let(:deleted_secure_topic) { @deleted_secure_topic }
let(:deleted_private_topic) { @deleted_private_topic }
- let!(:nonexistent_topic_id) { Topic.last.id + 10000 }
+ let!(:nonexistent_topic_id) { Topic.last.id + 10_000 }
fab!(:secure_accessible_topic) { Fabricate(:topic, category: accessible_category) }
shared_examples "various scenarios" do |expected, request_json:|
@@ -2182,12 +2158,10 @@ RSpec.describe TopicsController do
end
end
- context 'without detailed error pages' do
- before do
- SiteSetting.detailed_404 = false
- end
+ context "without detailed error pages" do
+ before { SiteSetting.detailed_404 = false }
- context 'when anonymous' do
+ context "when anonymous" do
expected = {
normal_topic: 200,
secure_topic: 404,
@@ -2196,15 +2170,13 @@ RSpec.describe TopicsController do
deleted_secure_topic: 404,
deleted_private_topic: 404,
nonexistent: 404,
- secure_accessible_topic: 404
+ secure_accessible_topic: 404,
}
include_examples "various scenarios", expected, request_json: false
end
- context 'when anonymous with login required' do
- before do
- SiteSetting.login_required = true
- end
+ context "when anonymous with login required" do
+ before { SiteSetting.login_required = true }
expected = {
normal_topic: 302,
secure_topic: 302,
@@ -2213,15 +2185,13 @@ RSpec.describe TopicsController do
deleted_secure_topic: 302,
deleted_private_topic: 302,
nonexistent: 302,
- secure_accessible_topic: 302
+ secure_accessible_topic: 302,
}
include_examples "various scenarios", expected, request_json: false
end
- context 'when anonymous with login required, requesting json' do
- before do
- SiteSetting.login_required = true
- end
+ context "when anonymous with login required, requesting json" do
+ before { SiteSetting.login_required = true }
expected = {
normal_topic: 403,
secure_topic: 403,
@@ -2230,15 +2200,13 @@ RSpec.describe TopicsController do
deleted_secure_topic: 403,
deleted_private_topic: 403,
nonexistent: 403,
- secure_accessible_topic: 403
+ secure_accessible_topic: 403,
}
include_examples "various scenarios", expected, request_json: true
end
- context 'when normal user' do
- before do
- sign_in(user)
- end
+ context "when normal user" do
+ before { sign_in(user) }
expected = {
normal_topic: 200,
@@ -2248,15 +2216,13 @@ RSpec.describe TopicsController do
deleted_secure_topic: 404,
deleted_private_topic: 404,
nonexistent: 404,
- secure_accessible_topic: 404
+ secure_accessible_topic: 404,
}
include_examples "various scenarios", expected, request_json: false
end
- context 'when allowed user' do
- before do
- sign_in(allowed_user)
- end
+ context "when allowed user" do
+ before { sign_in(allowed_user) }
expected = {
normal_topic: 200,
@@ -2266,15 +2232,13 @@ RSpec.describe TopicsController do
deleted_secure_topic: 404,
deleted_private_topic: 404,
nonexistent: 404,
- secure_accessible_topic: 404
+ secure_accessible_topic: 404,
}
include_examples "various scenarios", expected, request_json: false
end
- context 'when moderator' do
- before do
- sign_in(moderator)
- end
+ context "when moderator" do
+ before { sign_in(moderator) }
expected = {
normal_topic: 200,
@@ -2284,15 +2248,13 @@ RSpec.describe TopicsController do
deleted_secure_topic: 404,
deleted_private_topic: 404,
nonexistent: 404,
- secure_accessible_topic: 404
+ secure_accessible_topic: 404,
}
include_examples "various scenarios", expected, request_json: false
end
- context 'when admin' do
- before do
- sign_in(admin)
- end
+ context "when admin" do
+ before { sign_in(admin) }
expected = {
normal_topic: 200,
@@ -2302,18 +2264,16 @@ RSpec.describe TopicsController do
deleted_secure_topic: 200,
deleted_private_topic: 200,
nonexistent: 404,
- secure_accessible_topic: 200
+ secure_accessible_topic: 200,
}
include_examples "various scenarios", expected, request_json: false
end
end
- context 'with detailed error pages' do
- before do
- SiteSetting.detailed_404 = true
- end
+ context "with detailed error pages" do
+ before { SiteSetting.detailed_404 = true }
- context 'when anonymous' do
+ context "when anonymous" do
expected = {
normal_topic: 200,
secure_topic: 403,
@@ -2322,15 +2282,13 @@ RSpec.describe TopicsController do
deleted_secure_topic: 403,
deleted_private_topic: 403,
nonexistent: 404,
- secure_accessible_topic: 403
+ secure_accessible_topic: 403,
}
include_examples "various scenarios", expected, request_json: true
end
- context 'when anonymous with login required' do
- before do
- SiteSetting.login_required = true
- end
+ context "when anonymous with login required" do
+ before { SiteSetting.login_required = true }
expected = {
normal_topic: 302,
secure_topic: 302,
@@ -2339,15 +2297,13 @@ RSpec.describe TopicsController do
deleted_secure_topic: 302,
deleted_private_topic: 302,
nonexistent: 302,
- secure_accessible_topic: 302
+ secure_accessible_topic: 302,
}
include_examples "various scenarios", expected, request_json: false
end
- context 'when normal user' do
- before do
- sign_in(user)
- end
+ context "when normal user" do
+ before { sign_in(user) }
expected = {
normal_topic: 200,
@@ -2357,15 +2313,13 @@ RSpec.describe TopicsController do
deleted_secure_topic: 403,
deleted_private_topic: 403,
nonexistent: 404,
- secure_accessible_topic: 403
+ secure_accessible_topic: 403,
}
include_examples "various scenarios", expected, request_json: true
end
- context 'when allowed user' do
- before do
- sign_in(allowed_user)
- end
+ context "when allowed user" do
+ before { sign_in(allowed_user) }
expected = {
normal_topic: 200,
@@ -2375,15 +2329,13 @@ RSpec.describe TopicsController do
deleted_secure_topic: 410,
deleted_private_topic: 410,
nonexistent: 404,
- secure_accessible_topic: 403
+ secure_accessible_topic: 403,
}
include_examples "various scenarios", expected, request_json: false
end
- context 'when moderator' do
- before do
- sign_in(moderator)
- end
+ context "when moderator" do
+ before { sign_in(moderator) }
expected = {
normal_topic: 200,
@@ -2393,15 +2345,13 @@ RSpec.describe TopicsController do
deleted_secure_topic: 403,
deleted_private_topic: 403,
nonexistent: 404,
- secure_accessible_topic: 403
+ secure_accessible_topic: 403,
}
include_examples "various scenarios", expected, request_json: false
end
- context 'when admin' do
- before do
- sign_in(admin)
- end
+ context "when admin" do
+ before { sign_in(admin) }
expected = {
normal_topic: 200,
@@ -2411,38 +2361,31 @@ RSpec.describe TopicsController do
deleted_secure_topic: 200,
deleted_private_topic: 200,
nonexistent: 404,
- secure_accessible_topic: 200
+ secure_accessible_topic: 200,
}
include_examples "various scenarios", expected, request_json: false
end
end
end
- it 'records a view' do
- expect do
- get "/t/#{topic.slug}/#{topic.id}.json"
- end.to change(TopicViewItem, :count).by(1)
+ it "records a view" do
+ expect do get "/t/#{topic.slug}/#{topic.id}.json" end.to change(TopicViewItem, :count).by(1)
end
- it 'records a view to invalid post_number' do
+ it "records a view to invalid post_number" do
expect do
- get "/t/#{topic.slug}/#{topic.id}/#{256**4}", params: {
- u: user.username
- }
+ get "/t/#{topic.slug}/#{topic.id}/#{256**4}", params: { u: user.username }
expect(response.status).to eq(200)
end.to change { IncomingLink.count }.by(1)
-
end
- it 'records incoming links' do
- expect do
- get "/t/#{topic.slug}/#{topic.id}", params: {
- u: user.username
- }
- end.to change { IncomingLink.count }.by(1)
+ it "records incoming links" do
+ expect do get "/t/#{topic.slug}/#{topic.id}", params: { u: user.username } end.to change {
+ IncomingLink.count
+ }.by(1)
end
- context 'with print' do
+ context "with print" do
it "doesn't renders the print view when disabled" do
SiteSetting.max_prints_per_hour_per_user = 0
@@ -2451,15 +2394,15 @@ RSpec.describe TopicsController do
expect(response).to be_forbidden
end
- it 'renders the print view when enabled' do
+ it "renders the print view when enabled" do
SiteSetting.max_prints_per_hour_per_user = 10
get "/t/#{topic.slug}/#{topic.id}/print", headers: { HTTP_USER_AGENT: "Rails Testing" }
expect(response.status).to eq(200)
body = response.body
- expect(body).to have_tag(:body, class: 'crawler')
- expect(body).to_not have_tag(:meta, with: { name: 'fragment' })
+ expect(body).to have_tag(:body, class: "crawler")
+ expect(body).to_not have_tag(:meta, with: { name: "fragment" })
end
it "uses the application layout when there's no param" do
@@ -2469,26 +2412,26 @@ RSpec.describe TopicsController do
body = response.body
expect(body).to have_tag(:script, src: "/assets/discourse.js")
- expect(body).to have_tag(:meta, with: { name: 'fragment' })
+ expect(body).to have_tag(:meta, with: { name: "fragment" })
end
end
- it 'records redirects' do
+ it "records redirects" do
get "/t/#{topic.id}", headers: { HTTP_REFERER: "http://twitter.com" }
get "/t/#{topic.slug}/#{topic.id}", headers: { HTTP_REFERER: nil }
link = IncomingLink.first
- expect(link.referer).to eq('http://twitter.com')
+ expect(link.referer).to eq("http://twitter.com")
end
- it 'tracks a visit for all html requests' do
+ it "tracks a visit for all html requests" do
sign_in(user)
get "/t/#{topic.slug}/#{topic.id}"
topic_user = TopicUser.where(user: user, topic: topic).first
expect(topic_user.last_visited_at).to eq_time(topic_user.first_visited_at)
end
- context 'when considering for a promotion' do
+ context "when considering for a promotion" do
before do
SiteSetting.tl1_requires_topics_entered = 0
SiteSetting.tl1_requires_read_posts = 0
@@ -2505,7 +2448,7 @@ RSpec.describe TopicsController do
end
end
- context 'with filters' do
+ context "with filters" do
def extract_post_stream
json = response.parsed_body
json["post_stream"]["posts"].map { |post| post["id"] }
@@ -2514,12 +2457,10 @@ RSpec.describe TopicsController do
before do
TopicView.stubs(:chunk_size).returns(2)
@post_ids = topic.posts.pluck(:id)
- 3.times do
- @post_ids << Fabricate(:post, user: post_author1, topic: topic).id
- end
+ 3.times { @post_ids << Fabricate(:post, user: post_author1, topic: topic).id }
end
- it 'grabs the correct set of posts' do
+ it "grabs the correct set of posts" do
get "/t/#{topic.slug}/#{topic.id}.json"
expect(response.status).to eq(200)
expect(extract_post_stream).to eq(@post_ids[0..1])
@@ -2561,22 +2502,34 @@ RSpec.describe TopicsController do
end
end
- describe '#show filters' do
+ describe "#show filters" do
fab!(:post) { Fabricate(:post, user: post_author1) }
fab!(:topic) { post.topic }
fab!(:post2) { Fabricate(:post, user: post_author2, topic: topic) }
- describe 'filter by replies to a post' do
- fab!(:post3) { Fabricate(:post, user: post_author3, topic: topic, reply_to_post_number: post2.post_number) }
- fab!(:post4) { Fabricate(:post, user: post_author4, topic: topic, reply_to_post_number: post2.post_number) }
+ describe "filter by replies to a post" do
+ fab!(:post3) do
+ Fabricate(
+ :post,
+ user: post_author3,
+ topic: topic,
+ reply_to_post_number: post2.post_number,
+ )
+ end
+ fab!(:post4) do
+ Fabricate(
+ :post,
+ user: post_author4,
+ topic: topic,
+ reply_to_post_number: post2.post_number,
+ )
+ end
fab!(:post5) { Fabricate(:post, user: post_author5, topic: topic) }
fab!(:quote_reply) { Fabricate(:basic_reply, user: user, topic: topic) }
fab!(:post_reply) { PostReply.create(post_id: post2.id, reply_post_id: quote_reply.id) }
- it 'should return the right posts' do
- get "/t/#{topic.id}.json", params: {
- replies_to_post_number: post2.post_number
- }
+ it "should return the right posts" do
+ get "/t/#{topic.id}.json", params: { replies_to_post_number: post2.post_number }
expect(response.status).to eq(200)
@@ -2590,16 +2543,35 @@ RSpec.describe TopicsController do
end
end
- describe 'filter by top level replies' do
- fab!(:post3) { Fabricate(:post, user: post_author3, topic: topic, reply_to_post_number: post2.post_number) }
- fab!(:post4) { Fabricate(:post, user: post_author4, topic: topic, reply_to_post_number: post2.post_number) }
+ describe "filter by top level replies" do
+ fab!(:post3) do
+ Fabricate(
+ :post,
+ user: post_author3,
+ topic: topic,
+ reply_to_post_number: post2.post_number,
+ )
+ end
+ fab!(:post4) do
+ Fabricate(
+ :post,
+ user: post_author4,
+ topic: topic,
+ reply_to_post_number: post2.post_number,
+ )
+ end
fab!(:post5) { Fabricate(:post, user: post_author5, topic: topic) }
- fab!(:post6) { Fabricate(:post, user: post_author4, topic: topic, reply_to_post_number: post5.post_number) }
+ fab!(:post6) do
+ Fabricate(
+ :post,
+ user: post_author4,
+ topic: topic,
+ reply_to_post_number: post5.post_number,
+ )
+ end
- it 'should return the right posts' do
- get "/t/#{topic.id}.json", params: {
- filter_top_level_replies: true
- }
+ it "should return the right posts" do
+ get "/t/#{topic.id}.json", params: { filter_top_level_replies: true }
expect(response.status).to eq(200)
@@ -2613,16 +2585,28 @@ RSpec.describe TopicsController do
end
end
- describe 'filter upwards by post id' do
+ describe "filter upwards by post id" do
fab!(:post3) { Fabricate(:post, user: post_author3, topic: topic) }
- fab!(:post4) { Fabricate(:post, user: post_author4, topic: topic, reply_to_post_number: post3.post_number) }
- fab!(:post5) { Fabricate(:post, user: post_author5, topic: topic, reply_to_post_number: post4.post_number) }
+ fab!(:post4) do
+ Fabricate(
+ :post,
+ user: post_author4,
+ topic: topic,
+ reply_to_post_number: post3.post_number,
+ )
+ end
+ fab!(:post5) do
+ Fabricate(
+ :post,
+ user: post_author5,
+ topic: topic,
+ reply_to_post_number: post4.post_number,
+ )
+ end
fab!(:post6) { Fabricate(:post, user: post_author6, topic: topic) }
- it 'should return the right posts' do
- get "/t/#{topic.id}.json", params: {
- filter_upwards_post_id: post5.id
- }
+ it "should return the right posts" do
+ get "/t/#{topic.id}.json", params: { filter_upwards_post_id: post5.id }
expect(response.status).to eq(200)
@@ -2637,12 +2621,10 @@ RSpec.describe TopicsController do
expect(ids).to eq([post.id, post4.id, post5.id, post6.id])
end
- it 'should respect max_reply_history site setting' do
+ it "should respect max_reply_history site setting" do
SiteSetting.max_reply_history = 2
- get "/t/#{topic.id}.json", params: {
- filter_upwards_post_id: post5.id
- }
+ get "/t/#{topic.id}.json", params: { filter_upwards_post_id: post5.id }
expect(response.status).to eq(200)
@@ -2653,35 +2635,34 @@ RSpec.describe TopicsController do
expect(ids).to eq([post.id, post3.id, post4.id, post5.id, post6.id])
end
end
-
end
context "when 'login required' site setting has been enabled" do
before { SiteSetting.login_required = true }
- context 'when the user is logged in' do
+ context "when the user is logged in" do
before { sign_in(user) }
- it 'shows the topic' do
+ it "shows the topic" do
get "/t/#{topic.slug}/#{topic.id}.json"
expect(response.status).to eq(200)
end
end
- context 'when the user is not logged in' do
+ context "when the user is not logged in" do
let(:api_key) { Fabricate(:api_key, user: topic.user) }
- it 'redirects browsers to the login page' do
+ it "redirects browsers to the login page" do
get "/t/#{topic.slug}/#{topic.id}"
expect(response).to redirect_to login_path
end
- it 'raises a 403 for json requests' do
+ it "raises a 403 for json requests" do
get "/t/#{topic.slug}/#{topic.id}.json"
expect(response.status).to eq(403)
end
- it 'shows the topic if valid api key is provided' do
+ it "shows the topic if valid api key is provided" do
get "/t/#{topic.slug}/#{topic.id}.json", headers: { "HTTP_API_KEY" => api_key.key }
expect(response.status).to eq(200)
@@ -2689,8 +2670,8 @@ RSpec.describe TopicsController do
expect(topic.views).to eq(1)
end
- it 'returns 403 for an invalid key' do
- [:json, :html].each do |format|
+ it "returns 403 for an invalid key" do
+ %i[json html].each do |format|
get "/t/#{topic.slug}/#{topic.id}.#{format}", headers: { "HTTP_API_KEY" => "bad" }
expect(response.code.to_i).to eq(403)
@@ -2703,13 +2684,13 @@ RSpec.describe TopicsController do
it "is included for unlisted topics" do
get "/t/#{invisible_topic.slug}/#{invisible_topic.id}.json"
- expect(response.headers['X-Robots-Tag']).to eq('noindex')
+ expect(response.headers["X-Robots-Tag"]).to eq("noindex")
end
it "is not included for normal topics" do
get "/t/#{topic.slug}/#{topic.id}.json"
- expect(response.headers['X-Robots-Tag']).to eq(nil)
+ expect(response.headers["X-Robots-Tag"]).to eq(nil)
end
it "is included when allow_index_in_robots_txt is set to false" do
@@ -2717,30 +2698,30 @@ RSpec.describe TopicsController do
get "/t/#{topic.slug}/#{topic.id}.json"
- expect(response.headers['X-Robots-Tag']).to eq('noindex, nofollow')
+ expect(response.headers["X-Robots-Tag"]).to eq("noindex, nofollow")
end
it "doesn't store an incoming link when there's no referer" do
- expect {
- get "/t/#{topic.id}.json"
- }.not_to change(IncomingLink, :count)
+ expect { get "/t/#{topic.id}.json" }.not_to change(IncomingLink, :count)
expect(response.status).to eq(200)
end
it "doesn't raise an error on a very long link" do
- get "/t/#{topic.id}.json", headers: { HTTP_REFERER: "http://#{'a' * 2000}.com" }
+ get "/t/#{topic.id}.json", headers: { HTTP_REFERER: "http://#{"a" * 2000}.com" }
expect(response.status).to eq(200)
end
context "with mentions" do
fab!(:post) { Fabricate(:post, user: post_author1) }
fab!(:topic) { post.topic }
- fab!(:post2) { Fabricate(
- :post,
- user: post_author2,
- topic: topic,
- raw: "I am mentioning @#{post_author1.username}."
- ) }
+ fab!(:post2) do
+ Fabricate(
+ :post,
+ user: post_author2,
+ topic: topic,
+ raw: "I am mentioning @#{post_author1.username}.",
+ )
+ end
it "returns mentions" do
get "/t/#{topic.slug}/#{topic.id}.json"
@@ -2787,11 +2768,7 @@ RSpec.describe TopicsController do
end
it "returns an empty list of mentioned users if there is no mentions in a post" do
- Fabricate(
- :post,
- user: post_author2,
- topic: topic,
- raw: "Post without mentions.")
+ Fabricate(:post, user: post_author2, topic: topic, raw: "Post without mentions.")
get "/t/#{topic.slug}/#{topic.id}.json"
@@ -2802,11 +2779,7 @@ RSpec.describe TopicsController do
end
it "returns an empty list of mentioned users if an unexisting user was mentioned" do
- Fabricate(
- :post,
- user: post_author2,
- topic: topic,
- raw: "Mentioning an @unexisting_user.")
+ Fabricate(:post, user: post_author2, topic: topic, raw: "Mentioning an @unexisting_user.")
get "/t/#{topic.slug}/#{topic.id}.json"
@@ -2822,22 +2795,18 @@ RSpec.describe TopicsController do
it "uses the application layout even with an escaped fragment param" do
SiteSetting.enable_escaped_fragments = false
- get "/t/#{topic.slug}/#{topic.id}", params: {
- _escaped_fragment_: 'true'
- }
+ get "/t/#{topic.slug}/#{topic.id}", params: { _escaped_fragment_: "true" }
body = response.body
expect(response.status).to eq(200)
expect(body).to have_tag(:script, with: { src: "/assets/discourse.js" })
- expect(body).to_not have_tag(:meta, with: { name: 'fragment' })
+ expect(body).to_not have_tag(:meta, with: { name: "fragment" })
end
end
context "when the SiteSetting is enabled" do
- before do
- SiteSetting.enable_escaped_fragments = true
- end
+ before { SiteSetting.enable_escaped_fragments = true }
it "uses the application layout when there's no param" do
get "/t/#{topic.slug}/#{topic.id}"
@@ -2845,47 +2814,54 @@ RSpec.describe TopicsController do
body = response.body
expect(body).to have_tag(:script, with: { src: "/assets/discourse.js" })
- expect(body).to have_tag(:meta, with: { name: 'fragment' })
+ expect(body).to have_tag(:meta, with: { name: "fragment" })
end
it "uses the crawler layout when there's an _escaped_fragment_ param" do
- get "/t/#{topic.slug}/#{topic.id}", params: {
- _escaped_fragment_: true
- }, headers: { HTTP_USER_AGENT: "Rails Testing" }
+ get "/t/#{topic.slug}/#{topic.id}",
+ params: {
+ _escaped_fragment_: true,
+ },
+ headers: {
+ HTTP_USER_AGENT: "Rails Testing",
+ }
body = response.body
expect(response.status).to eq(200)
- expect(body).to have_tag(:body, with: { class: 'crawler' })
- expect(body).to_not have_tag(:meta, with: { name: 'fragment' })
+ expect(body).to have_tag(:body, with: { class: "crawler" })
+ expect(body).to_not have_tag(:meta, with: { name: "fragment" })
end
end
end
- describe 'clear_notifications' do
- it 'correctly clears notifications if specified via cookie' do
+ describe "clear_notifications" do
+ it "correctly clears notifications if specified via cookie" do
set_subfolder "/eviltrout"
notification = Fabricate(:notification)
sign_in(notification.user)
- cookies['cn'] = "2828,100,#{notification.id}"
+ cookies["cn"] = "2828,100,#{notification.id}"
get "/t/#{topic.id}.json"
expect(response.status).to eq(200)
- expect(response.cookies['cn']).to eq(nil)
- expect(response.headers['Set-Cookie']).to match(/^cn=;.*path=\/eviltrout/)
+ expect(response.cookies["cn"]).to eq(nil)
+ expect(response.headers["Set-Cookie"]).to match(%r{^cn=;.*path=/eviltrout})
notification.reload
expect(notification.read).to eq(true)
end
- it 'correctly clears notifications if specified via header' do
+ it "correctly clears notifications if specified via header" do
notification = Fabricate(:notification)
sign_in(notification.user)
- get "/t/#{topic.id}.json", headers: { "Discourse-Clear-Notifications" => "2828,100,#{notification.id}" }
+ get "/t/#{topic.id}.json",
+ headers: {
+ "Discourse-Clear-Notifications" => "2828,100,#{notification.id}",
+ }
expect(response.status).to eq(200)
notification.reload
@@ -2897,25 +2873,36 @@ RSpec.describe TopicsController do
it "returns no read only header by default" do
get "/t/#{topic.id}.json"
expect(response.status).to eq(200)
- expect(response.headers['Discourse-Readonly']).to eq(nil)
+ expect(response.headers["Discourse-Readonly"]).to eq(nil)
end
it "returns a readonly header if the site is read only" do
Discourse.received_postgres_readonly!
get "/t/#{topic.id}.json"
expect(response.status).to eq(200)
- expect(response.headers['Discourse-Readonly']).to eq('true')
+ expect(response.headers["Discourse-Readonly"]).to eq("true")
end
end
describe "image only topic" do
it "uses image alt tag for meta description" do
- post = Fabricate(:post, user: post_author1, raw: "")
+ post =
+ Fabricate(
+ :post,
+ user: post_author1,
+ raw: "",
+ )
get post.topic.url
body = response.body
- expect(body).to have_tag(:meta, with: { name: 'description', content: '[image_description]' })
+ expect(body).to have_tag(
+ :meta,
+ with: {
+ name: "description",
+ content: "[image_description]",
+ },
+ )
end
it "uses image cdn url for schema markup" do
@@ -2926,26 +2913,22 @@ RSpec.describe TopicsController do
get post.topic.url
body = response.body
- expect(body).to have_tag(:link, with: { itemprop: 'image', href: post.image_url })
+ expect(body).to have_tag(:link, with: { itemprop: "image", href: post.image_url })
end
end
end
- describe '#post_ids' do
+ describe "#post_ids" do
fab!(:post) { Fabricate(:post, user: post_author1) }
fab!(:topic) { post.topic }
- before do
- TopicView.stubs(:chunk_size).returns(1)
- end
+ before { TopicView.stubs(:chunk_size).returns(1) }
- it 'returns the right post ids' do
+ it "returns the right post ids" do
post2 = Fabricate(:post, user: post_author2, topic: topic)
post3 = Fabricate(:post, user: post_author3, topic: topic)
- get "/t/#{topic.id}/post_ids.json", params: {
- post_number: post.post_number
- }
+ get "/t/#{topic.id}/post_ids.json", params: { post_number: post.post_number }
expect(response.status).to eq(200)
@@ -2954,17 +2937,18 @@ RSpec.describe TopicsController do
expect(body["post_ids"]).to eq([post2.id, post3.id])
end
- describe 'filtering by post number with filters' do
- describe 'username filters' do
+ describe "filtering by post number with filters" do
+ describe "username filters" do
fab!(:post) { Fabricate(:post, user: user) }
fab!(:post2) { Fabricate(:post, topic: topic, user: user) }
fab!(:post3) { Fabricate(:post, user: post_author3, topic: topic) }
- it 'should return the right posts' do
- get "/t/#{topic.id}/post_ids.json", params: {
- post_number: post.post_number,
- username_filters: post2.user.username
- }
+ it "should return the right posts" do
+ get "/t/#{topic.id}/post_ids.json",
+ params: {
+ post_number: post.post_number,
+ username_filters: post2.user.username,
+ }
expect(response.status).to eq(200)
@@ -2974,15 +2958,16 @@ RSpec.describe TopicsController do
end
end
- describe 'summary filter' do
+ describe "summary filter" do
fab!(:post2) { Fabricate(:post, user: post_author2, topic: topic, percent_rank: 0.2) }
fab!(:post3) { Fabricate(:post, user: post_author3, topic: topic) }
- it 'should return the right posts' do
- get "/t/#{topic.id}/post_ids.json", params: {
- post_number: post.post_number,
- filter: 'summary'
- }
+ it "should return the right posts" do
+ get "/t/#{topic.id}/post_ids.json",
+ params: {
+ post_number: post.post_number,
+ filter: "summary",
+ }
expect(response.status).to eq(200)
@@ -2992,18 +2977,15 @@ RSpec.describe TopicsController do
end
end
- describe 'custom filters' do
+ describe "custom filters" do
fab!(:post2) { Fabricate(:post, user: post_author2, topic: topic, percent_rank: 0.2) }
fab!(:post3) { Fabricate(:post, user: post_author3, topic: topic, percent_rank: 0.5) }
- it 'should return the right posts' do
+ it "should return the right posts" do
TopicView.add_custom_filter("percent") do |posts, topic_view|
posts.where(percent_rank: 0.5)
end
- get "/t/#{topic.id}.json", params: {
- post_number: post.post_number,
- filter: 'percent'
- }
+ get "/t/#{topic.id}.json", params: { post_number: post.post_number, filter: "percent" }
expect(response.status).to eq(200)
@@ -3017,15 +2999,13 @@ RSpec.describe TopicsController do
end
end
- describe '#posts' do
+ describe "#posts" do
fab!(:post) { Fabricate(:post, user: post_author1) }
fab!(:topic) { post.topic }
- after do
- Discourse.redis.flushdb
- end
+ after { Discourse.redis.flushdb }
- it 'returns first post of the topic' do
+ it "returns first post of the topic" do
# we need one for suggested
create_post
@@ -3045,19 +3025,20 @@ RSpec.describe TopicsController do
expect(body["suggested_topics"]).not_to eq(nil)
end
- describe 'filtering by post number with filters' do
- describe 'username filters' do
+ describe "filtering by post number with filters" do
+ describe "username filters" do
fab!(:post2) { Fabricate(:post, user: post_author2, topic: topic) }
fab!(:post3) { Fabricate(:post, user: post_author3, topic: topic) }
- it 'should return the right posts' do
+ it "should return the right posts" do
TopicView.stubs(:chunk_size).returns(2)
- get "/t/#{topic.id}/posts.json", params: {
- post_number: post.post_number,
- username_filters: post2.user.username,
- asc: true
- }
+ get "/t/#{topic.id}/posts.json",
+ params: {
+ post_number: post.post_number,
+ username_filters: post2.user.username,
+ asc: true,
+ }
expect(response.status).to eq(200)
@@ -3067,18 +3048,19 @@ RSpec.describe TopicsController do
end
end
- describe 'summary filter' do
+ describe "summary filter" do
fab!(:post2) { Fabricate(:post, user: post_author2, topic: topic, percent_rank: 0.2) }
fab!(:post3) { Fabricate(:post, user: post_author3, topic: topic) }
- it 'should return the right posts' do
+ it "should return the right posts" do
TopicView.stubs(:chunk_size).returns(2)
- get "/t/#{topic.id}/posts.json", params: {
- post_number: post.post_number,
- filter: 'summary',
- asc: true
- }
+ get "/t/#{topic.id}/posts.json",
+ params: {
+ post_number: post.post_number,
+ filter: "summary",
+ asc: true,
+ }
expect(response.status).to eq(200)
@@ -3090,21 +3072,21 @@ RSpec.describe TopicsController do
end
end
- describe '#feed' do
+ describe "#feed" do
fab!(:topic) { Fabricate(:post, user: post_author1).topic }
- it 'renders rss of the topic' do
+ it "renders rss of the topic" do
get "/t/foo/#{topic.id}.rss"
expect(response.status).to eq(200)
- expect(response.media_type).to eq('application/rss+xml')
+ expect(response.media_type).to eq("application/rss+xml")
# our RSS feed is full of post 1/2/3/4/5 links, we do not want it included
# in the index, and do not want links followed
# this allows us to remove it while allowing via robots.txt
- expect(response.headers['X-Robots-Tag']).to eq('noindex, nofollow')
+ expect(response.headers["X-Robots-Tag"]).to eq("noindex, nofollow")
end
- it 'renders rss of the topic correctly with subfolder' do
+ it "renders rss of the topic correctly with subfolder" do
set_subfolder "/forum"
get "/t/foo/#{topic.id}.rss"
expect(response.status).to eq(200)
@@ -3112,20 +3094,20 @@ RSpec.describe TopicsController do
expect(response.body).to include("http://test.localhost/forum/t/#{topic.slug}")
end
- it 'returns 404 when posts are deleted' do
+ it "returns 404 when posts are deleted" do
topic.posts.each(&:trash!)
get "/t/foo/#{topic.id}.rss"
expect(response.status).to eq(404)
end
- it 'returns 404 when the topic is deleted' do
+ it "returns 404 when the topic is deleted" do
topic.trash!
get "/t/foo/#{topic.id}.rss"
expect(response.status).to eq(404)
end
end
- describe '#invite_group' do
+ describe "#invite_group" do
let!(:admins) { Group[:admins] }
before do
@@ -3135,31 +3117,27 @@ RSpec.describe TopicsController do
end
it "disallows inviting a group to a topic" do
- post "/t/#{topic.id}/invite-group.json", params: {
- group: 'admins'
- }
+ post "/t/#{topic.id}/invite-group.json", params: { group: "admins" }
expect(response.status).to eq(422)
end
it "allows inviting a group to a PM" do
- post "/t/#{pm.id}/invite-group.json", params: {
- group: 'admins'
- }
+ post "/t/#{pm.id}/invite-group.json", params: { group: "admins" }
expect(response.status).to eq(200)
expect(pm.allowed_groups.first.id).to eq(admins.id)
end
end
- describe '#make_banner' do
- it 'needs you to be a staff member' do
+ describe "#make_banner" do
+ it "needs you to be a staff member" do
tl4_topic = Fabricate(:topic, user: sign_in(trust_level_4))
put "/t/#{tl4_topic.id}/make-banner.json"
expect(response).to be_forbidden
end
- describe 'when logged in' do
+ describe "when logged in" do
it "changes the topic archetype to 'banner'" do
admin_topic = Fabricate(:topic, user: sign_in(admin))
@@ -3171,14 +3149,14 @@ RSpec.describe TopicsController do
end
end
- describe '#remove_banner' do
- it 'needs you to be a staff member' do
+ describe "#remove_banner" do
+ it "needs you to be a staff member" do
tl4_topic = Fabricate(:topic, user: sign_in(trust_level_4), archetype: Archetype.banner)
put "/t/#{tl4_topic.id}/remove-banner.json"
expect(response).to be_forbidden
end
- describe 'when logged in' do
+ describe "when logged in" do
it "resets the topic archetype" do
admin_topic = Fabricate(:topic, user: sign_in(admin), archetype: Archetype.banner)
@@ -3190,29 +3168,32 @@ RSpec.describe TopicsController do
end
end
- describe '#remove_allowed_user' do
- it 'admin can be removed from a pm' do
+ describe "#remove_allowed_user" do
+ it "admin can be removed from a pm" do
sign_in(admin)
- pm = create_post(user: user, archetype: 'private_message', target_usernames: [user.username, admin.username])
+ pm =
+ create_post(
+ user: user,
+ archetype: "private_message",
+ target_usernames: [user.username, admin.username],
+ )
- put "/t/#{pm.topic_id}/remove-allowed-user.json", params: {
- username: admin.username
- }
+ put "/t/#{pm.topic_id}/remove-allowed-user.json", params: { username: admin.username }
expect(response.status).to eq(200)
expect(TopicAllowedUser.where(topic_id: pm.topic_id, user_id: admin.id).first).to eq(nil)
end
end
- describe '#bulk' do
- it 'needs you to be logged in' do
+ describe "#bulk" do
+ it "needs you to be logged in" do
put "/topics/bulk.json"
expect(response.status).to eq(403)
end
describe "when logged in" do
before { sign_in(user) }
- let!(:operation) { { type: 'change_category', category_id: '1' } }
+ let!(:operation) { { type: "change_category", category_id: "1" } }
let!(:topic_ids) { [1, 2, 3] }
it "requires a list of topic_ids or filter" do
@@ -3238,40 +3219,41 @@ RSpec.describe TopicsController do
post1 = create_post(user: user, topic_id: topic.id)
create_post(topic_id: topic.id)
- put "/topics/bulk.json", params: {
- category_id: category.id,
- include_subcategories: true,
- filter: 'unread',
- operation: { type: 'dismiss_posts' }
- }
+ put "/topics/bulk.json",
+ params: {
+ category_id: category.id,
+ include_subcategories: true,
+ filter: "unread",
+ operation: {
+ type: "dismiss_posts",
+ },
+ }
expect(response.status).to eq(200)
expect(TopicUser.get(post1.topic, post1.user).last_read_post_number).to eq(2)
end
it "can mark tag topics unread" do
- TopicTag.create!(
- topic_id: topic.id,
- tag_id: tag.id
- )
+ TopicTag.create!(topic_id: topic.id, tag_id: tag.id)
post1 = create_post(user: user, topic_id: topic.id)
create_post(topic_id: topic.id)
- put "/topics/bulk.json", params: {
- tag_name: tag.name,
- filter: 'unread',
- operation: { type: 'dismiss_posts' }
- }
+ put "/topics/bulk.json",
+ params: {
+ tag_name: tag.name,
+ filter: "unread",
+ operation: {
+ type: "dismiss_posts",
+ },
+ }
expect(response.status).to eq(200)
expect(TopicUser.get(post1.topic, post1.user).last_read_post_number).to eq(2)
end
context "with private message" do
- before_all do
- Group.refresh_automatic_groups!
- end
+ before_all { Group.refresh_automatic_groups! }
fab!(:group) do
Fabricate(:group, messageable_level: Group::ALIAS_LEVELS[:everyone]).tap do |g|
@@ -3283,7 +3265,7 @@ RSpec.describe TopicsController do
create_post(
user: user,
target_group_names: [group.name],
- archetype: Archetype.private_message
+ archetype: Archetype.private_message,
).topic
end
@@ -3291,7 +3273,7 @@ RSpec.describe TopicsController do
create_post(
user: user,
target_usernames: [user_2.username],
- archetype: Archetype.private_message
+ archetype: Archetype.private_message,
).topic
end
@@ -3299,26 +3281,26 @@ RSpec.describe TopicsController do
create_post(
user: user,
target_usernames: [user_2.username],
- archetype: Archetype.private_message
+ archetype: Archetype.private_message,
).topic
end
fab!(:group_pm_topic_user) do
- TopicUser.find_by(user: user_2, topic: group_message).tap do |tu|
- tu.update!(last_read_post_number: 1)
- end
+ TopicUser
+ .find_by(user: user_2, topic: group_message)
+ .tap { |tu| tu.update!(last_read_post_number: 1) }
end
fab!(:regular_pm_topic_user) do
- TopicUser.find_by(user: user_2, topic: private_message).tap do |tu|
- tu.update!(last_read_post_number: 1)
- end
+ TopicUser
+ .find_by(user: user_2, topic: private_message)
+ .tap { |tu| tu.update!(last_read_post_number: 1) }
end
fab!(:regular_pm_topic_user_2) do
- TopicUser.find_by(user: user_2, topic: private_message_2).tap do |tu|
- tu.update!(last_read_post_number: 1)
- end
+ TopicUser
+ .find_by(user: user_2, topic: private_message_2)
+ .tap { |tu| tu.update!(last_read_post_number: 1) }
end
before_all do
@@ -3327,47 +3309,56 @@ RSpec.describe TopicsController do
create_post(user: user, topic: private_message_2)
end
- before do
- sign_in(user_2)
- end
+ before { sign_in(user_2) }
it "can dismiss all user and group private message topics" do
expect do
- put "/topics/bulk.json", params: {
- filter: "unread",
- operation: { type: 'dismiss_posts' },
- private_message_inbox: "all"
- }
+ put "/topics/bulk.json",
+ params: {
+ filter: "unread",
+ operation: {
+ type: "dismiss_posts",
+ },
+ private_message_inbox: "all",
+ }
expect(response.status).to eq(200)
- end.to change { group_pm_topic_user.reload.last_read_post_number }.from(1).to(2)
- .and change { regular_pm_topic_user.reload.last_read_post_number }.from(1).to(2)
+ end.to change { group_pm_topic_user.reload.last_read_post_number }.from(1).to(
+ 2,
+ ).and change { regular_pm_topic_user.reload.last_read_post_number }.from(1).to(2)
end
it "can dismiss all user unread private message topics" do
stub_const(TopicQuery, "DEFAULT_PER_PAGE_COUNT", 1) do
expect do
- put "/topics/bulk.json", params: {
- filter: "unread",
- operation: { type: 'dismiss_posts' },
- private_message_inbox: "user"
- }
+ put "/topics/bulk.json",
+ params: {
+ filter: "unread",
+ operation: {
+ type: "dismiss_posts",
+ },
+ private_message_inbox: "user",
+ }
expect(response.status).to eq(200)
- end.to change { regular_pm_topic_user.reload.last_read_post_number }.from(1).to(2)
- .and change { regular_pm_topic_user_2.reload.last_read_post_number }.from(1).to(2)
+ end.to change { regular_pm_topic_user.reload.last_read_post_number }.from(1).to(
+ 2,
+ ).and change { regular_pm_topic_user_2.reload.last_read_post_number }.from(1).to(2)
expect(group_pm_topic_user.reload.last_read_post_number).to eq(1)
end
end
it "returns the right response when trying to dismiss private messages of an invalid group" do
- put "/topics/bulk.json", params: {
- filter: "unread",
- operation: { type: 'dismiss_posts' },
- private_message_inbox: "group",
- group_name: 'randomgroup'
- }
+ put "/topics/bulk.json",
+ params: {
+ filter: "unread",
+ operation: {
+ type: "dismiss_posts",
+ },
+ private_message_inbox: "group",
+ group_name: "randomgroup",
+ }
expect(response.status).to eq(404)
end
@@ -3375,24 +3366,30 @@ RSpec.describe TopicsController do
it "returns the right response when trying to dismiss private messages of a restricted group" do
sign_in(user)
- put "/topics/bulk.json", params: {
- filter: "unread",
- operation: { type: 'dismiss_posts' },
- private_message_inbox: "group",
- group_name: group.name
- }
+ put "/topics/bulk.json",
+ params: {
+ filter: "unread",
+ operation: {
+ type: "dismiss_posts",
+ },
+ private_message_inbox: "group",
+ group_name: group.name,
+ }
expect(response.status).to eq(404)
end
it "can dismiss all group unread private message topics" do
expect do
- put "/topics/bulk.json", params: {
- filter: "unread",
- operation: { type: 'dismiss_posts' },
- private_message_inbox: "group",
- group_name: group.name
- }
+ put "/topics/bulk.json",
+ params: {
+ filter: "unread",
+ operation: {
+ type: "dismiss_posts",
+ },
+ private_message_inbox: "group",
+ group_name: group.name,
+ }
expect(response.status).to eq(200)
end.to change { group_pm_topic_user.reload.last_read_post_number }.from(1).to(2)
@@ -3403,65 +3400,78 @@ RSpec.describe TopicsController do
it "can find unread" do
# mark all unread muted
- put "/topics/bulk.json", params: {
- filter: 'unread', operation: { type: :change_notification_level, notification_level_id: 0 }
- }
+ put "/topics/bulk.json",
+ params: {
+ filter: "unread",
+ operation: {
+ type: :change_notification_level,
+ notification_level_id: 0,
+ },
+ }
expect(response.status).to eq(200)
end
it "delegates work to `TopicsBulkAction`" do
topics_bulk_action = mock
- TopicsBulkAction.expects(:new).with(user, topic_ids, operation, group: nil).returns(topics_bulk_action)
+ TopicsBulkAction
+ .expects(:new)
+ .with(user, topic_ids, operation, group: nil)
+ .returns(topics_bulk_action)
topics_bulk_action.expects(:perform!)
- put "/topics/bulk.json", params: {
- topic_ids: topic_ids, operation: operation
- }
+ put "/topics/bulk.json", params: { topic_ids: topic_ids, operation: operation }
end
it "raises an error if topic_ids is provided and it is not an array" do
- put "/topics/bulk.json", params: {
- topic_ids: "1", operation: operation
- }
- expect(response.parsed_body["errors"].first).to match(/Expecting topic_ids to contain a list/)
- put "/topics/bulk.json", params: {
- topic_ids: [1], operation: operation
- }
+ put "/topics/bulk.json", params: { topic_ids: "1", operation: operation }
+ expect(response.parsed_body["errors"].first).to match(
+ /Expecting topic_ids to contain a list/,
+ )
+ put "/topics/bulk.json", params: { topic_ids: [1], operation: operation }
expect(response.parsed_body["errors"]).to eq(nil)
end
it "respects the tracked parameter" do
# untracked topic
- CategoryUser.set_notification_level_for_category(user,
- NotificationLevels.all[:regular],
- category.id)
+ CategoryUser.set_notification_level_for_category(
+ user,
+ NotificationLevels.all[:regular],
+ category.id,
+ )
create_post(user: user, topic_id: topic.id)
topic.update!(category_id: category.id)
create_post(topic_id: topic.id)
# tracked topic
- CategoryUser.set_notification_level_for_category(user,
- NotificationLevels.all[:tracking],
- tracked_category.id)
+ CategoryUser.set_notification_level_for_category(
+ user,
+ NotificationLevels.all[:tracking],
+ tracked_category.id,
+ )
tracked_topic = create_post(user: user).topic
tracked_topic.update!(category_id: tracked_category.id)
create_post(topic_id: tracked_topic.id)
- put "/topics/bulk.json", params: {
- filter: 'unread',
- operation: { type: 'dismiss_posts' },
- tracked: true
- }
+ put "/topics/bulk.json",
+ params: {
+ filter: "unread",
+ operation: {
+ type: "dismiss_posts",
+ },
+ tracked: true,
+ }
expect(response.status).to eq(200)
expect(TopicUser.get(topic, user).last_read_post_number).to eq(topic.posts.count - 1)
- expect(TopicUser.get(tracked_topic, user).last_read_post_number).to eq(tracked_topic.posts.count)
+ expect(TopicUser.get(tracked_topic, user).last_read_post_number).to eq(
+ tracked_topic.posts.count,
+ )
end
end
end
- describe '#remove_bookmarks' do
+ describe "#remove_bookmarks" do
it "should remove bookmarks properly from non first post" do
sign_in(user)
@@ -3476,7 +3486,7 @@ RSpec.describe TopicsController do
it "should disallow bookmarks on posts you have no access to" do
sign_in(Fabricate(:user))
- pm = create_post(user: user, archetype: 'private_message', target_usernames: [user.username])
+ pm = create_post(user: user, archetype: "private_message", target_usernames: [user.username])
put "/t/#{pm.topic_id}/bookmark.json"
expect(response).to be_forbidden
@@ -3494,9 +3504,7 @@ RSpec.describe TopicsController do
end
describe "#bookmark" do
- before do
- sign_in(user)
- end
+ before { sign_in(user) }
it "should create a new bookmark for the topic" do
post = create_post
@@ -3515,9 +3523,9 @@ RSpec.describe TopicsController do
end
end
- describe '#reset_new' do
+ describe "#reset_new" do
context "when a user is not signed in" do
- it 'fails' do
+ it "fails" do
put "/topics/reset-new.json"
expect(response.status).to eq(403)
end
@@ -3537,9 +3545,7 @@ RSpec.describe TopicsController do
let!(:old_date) { @old_date }
- before do
- sign_in(user)
- end
+ before { sign_in(user) }
context "when tracked is unset" do
it "updates the `new_since` date" do
@@ -3564,9 +3570,7 @@ RSpec.describe TopicsController do
tracked_topic = create_post(category: tracked_category).topic
create_post # This is a new post, but is not tracked so a record will not be created for it
- expect do
- put "/topics/reset-new.json?tracked=true"
- end.to change {
+ expect do put "/topics/reset-new.json?tracked=true" end.to change {
DismissedTopicUser.where(user_id: user.id, topic_id: tracked_topic.id).count
}.by(1)
end
@@ -3594,7 +3598,10 @@ RSpec.describe TopicsController do
expect do
stub_const(TopicQuery, "DEFAULT_PER_PAGE_COUNT", 2) do
- put "/topics/reset-new.json?tracked=true", params: { topic_ids: dismissing_topic_ids }
+ put "/topics/reset-new.json?tracked=true",
+ params: {
+ topic_ids: dismissing_topic_ids,
+ }
end
end.to change {
DismissedTopicUser.where(user_id: user.id, topic_id: @tracked_topic_ids).count
@@ -3613,7 +3620,9 @@ RSpec.describe TopicsController do
old_new_since = user.user_stat.new_since
put "/topics/reset-new.json?tracked=false"
- expect(DismissedTopicUser.where(user_id: user.id, topic_id: @topic_ids).count).to eq(7)
+ expect(DismissedTopicUser.where(user_id: user.id, topic_id: @topic_ids).count).to eq(
+ 7,
+ )
expect(user.reload.user_stat.new_since > old_new_since).to eq(true)
end
@@ -3632,49 +3641,64 @@ RSpec.describe TopicsController do
end
end
- context 'with category' do
+ context "with category" do
fab!(:subcategory) { Fabricate(:category, parent_category_id: category.id) }
fab!(:category_topic) { Fabricate(:topic, category: category) }
fab!(:subcategory_topic) { Fabricate(:topic, category: subcategory) }
- it 'dismisses topics for main category' do
- TopicTrackingState.expects(:publish_dismiss_new).with(user.id, topic_ids: [category_topic.id])
+ it "dismisses topics for main category" do
+ TopicTrackingState.expects(:publish_dismiss_new).with(
+ user.id,
+ topic_ids: [category_topic.id],
+ )
put "/topics/reset-new.json?category_id=#{category.id}"
- expect(DismissedTopicUser.where(user_id: user.id).pluck(:topic_id)).to eq([category_topic.id])
+ expect(DismissedTopicUser.where(user_id: user.id).pluck(:topic_id)).to eq(
+ [category_topic.id],
+ )
end
- it 'dismisses topics for main category and subcategories' do
- TopicTrackingState.expects(:publish_dismiss_new).with(user.id, topic_ids: [category_topic.id, subcategory_topic.id])
+ it "dismisses topics for main category and subcategories" do
+ TopicTrackingState.expects(:publish_dismiss_new).with(
+ user.id,
+ topic_ids: [category_topic.id, subcategory_topic.id],
+ )
put "/topics/reset-new.json?category_id=#{category.id}&include_subcategories=true"
- expect(DismissedTopicUser.where(user_id: user.id).pluck(:topic_id).sort).to eq([category_topic.id, subcategory_topic.id].sort)
+ expect(DismissedTopicUser.where(user_id: user.id).pluck(:topic_id).sort).to eq(
+ [category_topic.id, subcategory_topic.id].sort,
+ )
end
end
- context 'with tag' do
+ context "with tag" do
fab!(:tag_topic) { Fabricate(:topic) }
fab!(:topic_tag) { Fabricate(:topic_tag, topic: tag_topic, tag: tag) }
- it 'dismisses topics for tag' do
+ it "dismisses topics for tag" do
TopicTrackingState.expects(:publish_dismiss_new).with(user.id, topic_ids: [tag_topic.id])
put "/topics/reset-new.json?tag_id=#{tag.name}"
expect(DismissedTopicUser.where(user_id: user.id).pluck(:topic_id)).to eq([tag_topic.id])
end
end
- context 'with tag and category' do
+ context "with tag and category" do
fab!(:tag_topic) { Fabricate(:topic) }
fab!(:topic_tag) { Fabricate(:topic_tag, topic: tag_topic, tag: tag) }
fab!(:tag_and_category_topic) { Fabricate(:topic, category: category) }
fab!(:topic_tag2) { Fabricate(:topic_tag, topic: tag_and_category_topic, tag: tag) }
- it 'dismisses topics for tag' do
- TopicTrackingState.expects(:publish_dismiss_new).with(user.id, topic_ids: [tag_and_category_topic.id])
+ it "dismisses topics for tag" do
+ TopicTrackingState.expects(:publish_dismiss_new).with(
+ user.id,
+ topic_ids: [tag_and_category_topic.id],
+ )
put "/topics/reset-new.json?tag_id=#{tag.name}&category_id=#{category.id}"
- expect(DismissedTopicUser.where(user_id: user.id).pluck(:topic_id)).to eq([tag_and_category_topic.id])
+ expect(DismissedTopicUser.where(user_id: user.id).pluck(:topic_id)).to eq(
+ [tag_and_category_topic.id],
+ )
end
end
@@ -3683,25 +3707,33 @@ RSpec.describe TopicsController do
fab!(:topic3) { Fabricate(:topic) }
it "updates the `new_since` date" do
- TopicTrackingState.expects(:publish_dismiss_new).with(user.id, topic_ids: [topic2.id, topic3.id]).at_least_once
+ TopicTrackingState
+ .expects(:publish_dismiss_new)
+ .with(user.id, topic_ids: [topic2.id, topic3.id])
+ .at_least_once
put "/topics/reset-new.json", **{ params: { topic_ids: [topic2.id, topic3.id] } }
expect(response.status).to eq(200)
user.reload
expect(user.user_stat.new_since.to_date).not_to eq(old_date.to_date)
- expect(DismissedTopicUser.where(user_id: user.id).pluck(:topic_id)).to match_array([topic2.id, topic3.id])
+ expect(DismissedTopicUser.where(user_id: user.id).pluck(:topic_id)).to match_array(
+ [topic2.id, topic3.id],
+ )
end
it "raises an error if topic_ids is provided and it is not an array" do
put "/topics/reset-new.json", params: { topic_ids: topic2.id }
- expect(response.parsed_body["errors"].first).to match(/Expecting topic_ids to contain a list/)
+ expect(response.parsed_body["errors"].first).to match(
+ /Expecting topic_ids to contain a list/,
+ )
put "/topics/reset-new.json", params: { topic_ids: [topic2.id] }
expect(response.parsed_body["errors"]).to eq(nil)
end
describe "when tracked param is true" do
it "does not update user_stat.new_since and does not dismiss untracked topics" do
- put "/topics/reset-new.json?tracked=true", **{ params: { topic_ids: [topic2.id, topic3.id] } }
+ put "/topics/reset-new.json?tracked=true",
+ **{ params: { topic_ids: [topic2.id, topic3.id] } }
expect(response.status).to eq(200)
user.reload
expect(user.user_stat.new_since.to_date).to eq(old_date.to_date)
@@ -3715,16 +3747,19 @@ RSpec.describe TopicsController do
create_post # This is a new post, but is not tracked so a record will not be created for it
expect do
- put "/topics/reset-new.json?tracked=true", **{ params: { topic_ids: [tracked_topic.id, topic2.id, topic3.id] } }
+ put "/topics/reset-new.json?tracked=true",
+ **{ params: { topic_ids: [tracked_topic.id, topic2.id, topic3.id] } }
end.to change { DismissedTopicUser.where(user_id: user.id).count }.by(2)
- expect(DismissedTopicUser.where(user_id: user.id).pluck(:topic_id)).to match_array([tracked_topic.id, topic2.id])
+ expect(DismissedTopicUser.where(user_id: user.id).pluck(:topic_id)).to match_array(
+ [tracked_topic.id, topic2.id],
+ )
end
end
end
end
end
- describe '#feature_stats' do
+ describe "#feature_stats" do
it "works" do
get "/topics/feature_stats.json", params: { category_id: 1 }
@@ -3744,23 +3779,29 @@ RSpec.describe TopicsController do
end
end
- describe '#excerpts' do
+ describe "#excerpts" do
it "can correctly get excerpts" do
- first_post = create_post(raw: 'This is the first post :)', title: 'This is a test title I am making yay')
- second_post = create_post(raw: 'This is second post', topic: first_post.topic)
+ first_post =
+ create_post(raw: "This is the first post :)", title: "This is a test title I am making yay")
+ second_post = create_post(raw: "This is second post", topic: first_post.topic)
third_post = first_post.topic.add_small_action(first_post.user, "autobumped")
random_post = Fabricate(:post, user: post_author1)
- get "/t/#{first_post.topic_id}/excerpts.json", params: {
- post_ids: [first_post.id, second_post.id, third_post.id, random_post.id]
- }
+ get "/t/#{first_post.topic_id}/excerpts.json",
+ params: {
+ post_ids: [first_post.id, second_post.id, third_post.id, random_post.id],
+ }
json = response.parsed_body
json.sort! { |a, b| a["post_id"] <=> b["post_id"] }
# no random post
- expect(json.map { |p| p["post_id"] }).to contain_exactly(first_post.id, second_post.id, third_post.id)
+ expect(json.map { |p| p["post_id"] }).to contain_exactly(
+ first_post.id,
+ second_post.id,
+ third_post.id,
+ )
# keep emoji images
expect(json[0]["excerpt"]).to match(/emoji/)
expect(json[0]["excerpt"]).to match(/first post/)
@@ -3774,19 +3815,17 @@ RSpec.describe TopicsController do
end
end
- describe '#convert_topic' do
- it 'needs you to be logged in' do
+ describe "#convert_topic" do
+ it "needs you to be logged in" do
put "/t/111/convert-topic/private.json"
expect(response.status).to eq(403)
end
- describe 'converting public topic to private message' do
+ describe "converting public topic to private message" do
fab!(:topic) { Fabricate(:topic, user: user) }
fab!(:post) { Fabricate(:post, user: user, topic: topic) }
- before do
- Group.refresh_automatic_groups!
- end
+ before { Group.refresh_automatic_groups! }
it "raises an error when the user doesn't have permission to convert topic" do
sign_in(user)
@@ -3804,19 +3843,17 @@ RSpec.describe TopicsController do
expect(response.status).to eq(200)
result = response.parsed_body
- expect(result['success']).to eq(true)
- expect(result['url']).to be_present
+ expect(result["success"]).to eq(true)
+ expect(result["url"]).to be_present
end
end
end
- describe 'converting private message to public topic' do
+ describe "converting private message to public topic" do
fab!(:topic) { Fabricate(:private_message_topic, user: user) }
fab!(:post) { Fabricate(:post, user: post_author1, topic: topic) }
- before do
- Group.refresh_automatic_groups!
- end
+ before { Group.refresh_automatic_groups! }
it "raises an error when the user doesn't have permission to convert topic" do
sign_in(user)
@@ -3835,24 +3872,27 @@ RSpec.describe TopicsController do
expect(response.status).to eq(200)
result = response.parsed_body
- expect(result['success']).to eq(true)
- expect(result['url']).to be_present
+ expect(result["success"]).to eq(true)
+ expect(result["url"]).to be_present
end
end
end
end
- describe '#timings' do
+ describe "#timings" do
fab!(:post_1) { Fabricate(:post, user: post_author1, topic: topic) }
- it 'should record the timing' do
+ it "should record the timing" do
sign_in(user)
- post "/topics/timings.json", params: {
- topic_id: topic.id,
- topic_time: 5,
- timings: { post_1.post_number => 2 }
- }
+ post "/topics/timings.json",
+ params: {
+ topic_id: topic.id,
+ topic_time: 5,
+ timings: {
+ post_1.post_number => 2,
+ },
+ }
expect(response.status).to eq(200)
@@ -3863,20 +3903,23 @@ RSpec.describe TopicsController do
expect(post_timing.msecs).to eq(2)
end
- it 'caps post read time at the max integer value (2^31 - 1)' do
+ it "caps post read time at the max integer value (2^31 - 1)" do
PostTiming.create!(
topic_id: post_1.topic.id,
post_number: post_1.post_number,
user_id: user.id,
- msecs: 2**31 - 10
+ msecs: 2**31 - 10,
)
sign_in(user)
- post "/topics/timings.json", params: {
- topic_id: topic.id,
- topic_time: 5,
- timings: { post_1.post_number => 100 }
- }
+ post "/topics/timings.json",
+ params: {
+ topic_id: topic.id,
+ topic_time: 5,
+ timings: {
+ post_1.post_number => 100,
+ },
+ }
expect(response.status).to eq(200)
post_timing = PostTiming.first
@@ -3887,55 +3930,47 @@ RSpec.describe TopicsController do
end
end
- describe '#timer' do
- context 'when a user is not logged in' do
- it 'should return the right response' do
- post "/t/#{topic.id}/timer.json", params: {
- time: '24',
- status_type: TopicTimer.types[1]
- }
+ describe "#timer" do
+ context "when a user is not logged in" do
+ it "should return the right response" do
+ post "/t/#{topic.id}/timer.json", params: { time: "24", status_type: TopicTimer.types[1] }
expect(response.status).to eq(403)
end
end
- context 'when does not have permission' do
- it 'should return the right response' do
+ context "when does not have permission" do
+ it "should return the right response" do
sign_in(user)
- post "/t/#{topic.id}/timer.json", params: {
- time: '24',
- status_type: TopicTimer.types[1]
- }
+ post "/t/#{topic.id}/timer.json", params: { time: "24", status_type: TopicTimer.types[1] }
expect(response.status).to eq(403)
- expect(response.parsed_body["error_type"]).to eq('invalid_access')
+ expect(response.parsed_body["error_type"]).to eq("invalid_access")
end
end
- context 'when time is in the past' do
- it 'returns an error' do
+ context "when time is in the past" do
+ it "returns an error" do
freeze_time
sign_in(admin)
- post "/t/#{topic.id}/timer.json", params: {
- time: Time.current - 1.day,
- status_type: TopicTimer.types[1]
- }
+ post "/t/#{topic.id}/timer.json",
+ params: {
+ time: Time.current - 1.day,
+ status_type: TopicTimer.types[1],
+ }
expect(response.status).to eq(400)
end
end
- context 'when logged in as an admin' do
+ context "when logged in as an admin" do
before do
freeze_time
sign_in(admin)
end
- it 'should be able to create a topic status update' do
- post "/t/#{topic.id}/timer.json", params: {
- time: 24,
- status_type: TopicTimer.types[1]
- }
+ it "should be able to create a topic status update" do
+ post "/t/#{topic.id}/timer.json", params: { time: 24, status_type: TopicTimer.types[1] }
expect(response.status).to eq(200)
@@ -3946,36 +3981,35 @@ RSpec.describe TopicsController do
json = response.parsed_body
- expect(DateTime.parse(json['execute_at']))
- .to eq_time(DateTime.parse(topic_status_update.execute_at.to_s))
+ expect(DateTime.parse(json["execute_at"])).to eq_time(
+ DateTime.parse(topic_status_update.execute_at.to_s),
+ )
- expect(json['duration_minutes']).to eq(topic_status_update.duration_minutes)
- expect(json['closed']).to eq(topic.reload.closed)
+ expect(json["duration_minutes"]).to eq(topic_status_update.duration_minutes)
+ expect(json["closed"]).to eq(topic.reload.closed)
end
- it 'should be able to delete a topic status update' do
+ it "should be able to delete a topic status update" do
Fabricate(:topic_timer, topic: topic)
- post "/t/#{topic.id}/timer.json", params: {
- time: nil,
- status_type: TopicTimer.types[1]
- }
+ post "/t/#{topic.id}/timer.json", params: { time: nil, status_type: TopicTimer.types[1] }
expect(response.status).to eq(200)
expect(topic.reload.public_topic_timer).to eq(nil)
json = response.parsed_body
- expect(json['execute_at']).to eq(nil)
- expect(json['duration_minutes']).to eq(nil)
- expect(json['closed']).to eq(topic.closed)
+ expect(json["execute_at"]).to eq(nil)
+ expect(json["duration_minutes"]).to eq(nil)
+ expect(json["closed"]).to eq(topic.closed)
end
- it 'should be able to create a topic status update with duration' do
- post "/t/#{topic.id}/timer.json", params: {
- duration_minutes: 7200,
- status_type: TopicTimer.types[7]
- }
+ it "should be able to create a topic status update with duration" do
+ post "/t/#{topic.id}/timer.json",
+ params: {
+ duration_minutes: 7200,
+ status_type: TopicTimer.types[7],
+ }
expect(response.status).to eq(200)
@@ -3987,37 +4021,36 @@ RSpec.describe TopicsController do
json = response.parsed_body
- expect(DateTime.parse(json['execute_at']))
- .to eq_time(DateTime.parse(topic_status_update.execute_at.to_s))
+ expect(DateTime.parse(json["execute_at"])).to eq_time(
+ DateTime.parse(topic_status_update.execute_at.to_s),
+ )
- expect(json['duration_minutes']).to eq(topic_status_update.duration_minutes)
+ expect(json["duration_minutes"]).to eq(topic_status_update.duration_minutes)
end
- it 'should be able to delete a topic status update for delete_replies type' do
+ it "should be able to delete a topic status update for delete_replies type" do
Fabricate(:topic_timer, topic: topic, status_type: TopicTimer.types[:delete_replies])
- post "/t/#{topic.id}/timer.json", params: {
- time: nil,
- status_type: TopicTimer.types[7]
- }
+ post "/t/#{topic.id}/timer.json", params: { time: nil, status_type: TopicTimer.types[7] }
expect(response.status).to eq(200)
expect(topic.reload.public_topic_timer).to eq(nil)
json = response.parsed_body
- expect(json['execute_at']).to eq(nil)
- expect(json['duration']).to eq(nil)
- expect(json['closed']).to eq(topic.closed)
+ expect(json["execute_at"]).to eq(nil)
+ expect(json["duration"]).to eq(nil)
+ expect(json["closed"]).to eq(topic.closed)
end
- describe 'publishing topic to category in the future' do
- it 'should be able to create the topic status update' do
- post "/t/#{topic.id}/timer.json", params: {
- time: 24,
- status_type: TopicTimer.types[3],
- category_id: topic.category_id
- }
+ describe "publishing topic to category in the future" do
+ it "should be able to create the topic status update" do
+ post "/t/#{topic.id}/timer.json",
+ params: {
+ time: 24,
+ status_type: TopicTimer.types[3],
+ category_id: topic.category_id,
+ }
expect(response.status).to eq(200)
@@ -4025,44 +4058,39 @@ RSpec.describe TopicsController do
expect(topic_status_update.topic).to eq(topic)
expect(topic_status_update.execute_at).to eq_time(24.hours.from_now)
- expect(topic_status_update.status_type)
- .to eq(TopicTimer.types[:publish_to_category])
+ expect(topic_status_update.status_type).to eq(TopicTimer.types[:publish_to_category])
json = response.parsed_body
- expect(json['category_id']).to eq(topic.category_id)
+ expect(json["category_id"]).to eq(topic.category_id)
end
end
- describe 'invalid status type' do
- it 'should raise the right error' do
- post "/t/#{topic.id}/timer.json", params: {
- time: 10,
- status_type: 'something'
- }
+ describe "invalid status type" do
+ it "should raise the right error" do
+ post "/t/#{topic.id}/timer.json", params: { time: 10, status_type: "something" }
expect(response.status).to eq(400)
- expect(response.body).to include('status_type')
+ expect(response.body).to include("status_type")
end
end
end
- context 'when logged in as a TL4 user' do
- before do
- SiteSetting.enable_category_group_moderation = true
- end
+ context "when logged in as a TL4 user" do
+ before { SiteSetting.enable_category_group_moderation = true }
it "raises an error if the user can't see the topic" do
user.update!(trust_level: TrustLevel[4])
sign_in(user)
pm_topic = Fabricate(:private_message_topic)
- post "/t/#{pm_topic.id}/timer.json", params: {
- time: '24',
- status_type: TopicTimer.types[1]
- }
+ post "/t/#{pm_topic.id}/timer.json",
+ params: {
+ time: "24",
+ status_type: TopicTimer.types[1],
+ }
expect(response.status).to eq(403)
- expect(response.parsed_body["error_type"]).to eq('invalid_access')
+ expect(response.parsed_body["error_type"]).to eq("invalid_access")
end
it "allows a category moderator to create a delete timer" do
@@ -4071,10 +4099,7 @@ RSpec.describe TopicsController do
sign_in(user)
- post "/t/#{topic.id}/timer.json", params: {
- time: 10,
- status_type: 'delete'
- }
+ post "/t/#{topic.id}/timer.json", params: { time: 10, status_type: "delete" }
expect(response.status).to eq(200)
end
@@ -4083,48 +4108,38 @@ RSpec.describe TopicsController do
user.update!(trust_level: TrustLevel[4])
sign_in(user)
- post "/t/#{topic.id}/timer.json", params: {
- time: 10,
- status_type: 'delete'
- }
+ post "/t/#{topic.id}/timer.json", params: { time: 10, status_type: "delete" }
expect(response.status).to eq(403)
- expect(response.parsed_body["error_type"]).to eq('invalid_access')
+ expect(response.parsed_body["error_type"]).to eq("invalid_access")
end
it "raises an error setting delete_replies timer" do
user.update!(trust_level: TrustLevel[4])
sign_in(user)
- post "/t/#{topic.id}/timer.json", params: {
- time: 10,
- status_type: 'delete_replies'
- }
+ post "/t/#{topic.id}/timer.json", params: { time: 10, status_type: "delete_replies" }
expect(response.status).to eq(403)
- expect(response.parsed_body["error_type"]).to eq('invalid_access')
+ expect(response.parsed_body["error_type"]).to eq("invalid_access")
end
end
end
- describe '#set_slow_mode' do
- context 'when not logged in' do
- it 'returns a forbidden response' do
- put "/t/#{topic.id}/slow_mode.json", params: {
- seconds: '3600'
- }
+ describe "#set_slow_mode" do
+ context "when not logged in" do
+ it "returns a forbidden response" do
+ put "/t/#{topic.id}/slow_mode.json", params: { seconds: "3600" }
expect(response.status).to eq(403)
end
end
- context 'when logged in as an admin' do
- it 'allows admins to set the slow mode interval' do
+ context "when logged in as an admin" do
+ it "allows admins to set the slow mode interval" do
sign_in(admin)
- put "/t/#{topic.id}/slow_mode.json", params: {
- seconds: '3600'
- }
+ put "/t/#{topic.id}/slow_mode.json", params: { seconds: "3600" }
topic.reload
expect(response.status).to eq(200)
@@ -4132,25 +4147,21 @@ RSpec.describe TopicsController do
end
end
- context 'when logged in as a regular user' do
- it 'does nothing if the user is not TL4' do
+ context "when logged in as a regular user" do
+ it "does nothing if the user is not TL4" do
user.update!(trust_level: TrustLevel[3])
sign_in(user)
- put "/t/#{topic.id}/slow_mode.json", params: {
- seconds: '3600'
- }
+ put "/t/#{topic.id}/slow_mode.json", params: { seconds: "3600" }
expect(response.status).to eq(403)
end
- it 'allows TL4 users to set the slow mode interval' do
+ it "allows TL4 users to set the slow mode interval" do
user.update!(trust_level: TrustLevel[4])
sign_in(user)
- put "/t/#{topic.id}/slow_mode.json", params: {
- seconds: '3600'
- }
+ put "/t/#{topic.id}/slow_mode.json", params: { seconds: "3600" }
topic.reload
expect(response.status).to eq(200)
@@ -4158,15 +4169,13 @@ RSpec.describe TopicsController do
end
end
- context 'with auto-disable slow mode' do
+ context "with auto-disable slow mode" do
before { sign_in(admin) }
let!(:timestamp) { 1.week.from_now.to_formatted_s(:iso8601) }
- it 'sets a topic timer to clear the slow mode automatically' do
- put "/t/#{topic.id}/slow_mode.json", params: {
- seconds: '3600', enabled_until: timestamp
- }
+ it "sets a topic timer to clear the slow mode automatically" do
+ put "/t/#{topic.id}/slow_mode.json", params: { seconds: "3600", enabled_until: timestamp }
created_timer = TopicTimer.find_by(topic: topic)
execute_at = created_timer.execute_at.to_formatted_s(:iso8601)
@@ -4174,30 +4183,26 @@ RSpec.describe TopicsController do
expect(execute_at).to eq(timestamp)
end
- it 'deletes the topic timer' do
- put "/t/#{topic.id}/slow_mode.json", params: {
- seconds: '3600', enabled_until: timestamp
- }
+ it "deletes the topic timer" do
+ put "/t/#{topic.id}/slow_mode.json", params: { seconds: "3600", enabled_until: timestamp }
- put "/t/#{topic.id}/slow_mode.json", params: {
- seconds: '0', enabled_until: timestamp
- }
+ put "/t/#{topic.id}/slow_mode.json", params: { seconds: "0", enabled_until: timestamp }
created_timer = TopicTimer.find_by(topic: topic)
expect(created_timer).to be_nil
end
- it 'updates the existing timer' do
- put "/t/#{topic.id}/slow_mode.json", params: {
- seconds: '3600', enabled_until: timestamp
- }
+ it "updates the existing timer" do
+ put "/t/#{topic.id}/slow_mode.json", params: { seconds: "3600", enabled_until: timestamp }
updated_timestamp = 1.hour.from_now.to_formatted_s(:iso8601)
- put "/t/#{topic.id}/slow_mode.json", params: {
- seconds: '3600', enabled_until: updated_timestamp
- }
+ put "/t/#{topic.id}/slow_mode.json",
+ params: {
+ seconds: "3600",
+ enabled_until: updated_timestamp,
+ }
created_timer = TopicTimer.find_by(topic: topic)
execute_at = created_timer.execute_at.to_formatted_s(:iso8601)
@@ -4207,49 +4212,41 @@ RSpec.describe TopicsController do
end
end
- describe '#invite' do
- context 'when not logged in' do
+ describe "#invite" do
+ context "when not logged in" do
it "should return the right response" do
- post "/t/#{topic.id}/invite.json", params: {
- email: 'jake@adventuretime.ooo'
- }
+ post "/t/#{topic.id}/invite.json", params: { email: "jake@adventuretime.ooo" }
expect(response.status).to eq(403)
end
end
- context 'when logged in' do
- before do
- sign_in(user)
- end
+ context "when logged in" do
+ before { sign_in(user) }
- context 'when topic id is not PM' do
+ context "when topic id is not PM" do
fab!(:user_topic) { Fabricate(:topic, user: user) }
- it 'should return the right response' do
+ it "should return the right response" do
user.update!(trust_level: SiteSetting.min_trust_level_to_allow_invite)
- post "/t/#{user_topic.id}/invite.json", params: {
- email: 'someguy@email.com'
- }
+ post "/t/#{user_topic.id}/invite.json", params: { email: "someguy@email.com" }
expect(response.status).to eq(422)
end
end
- context 'when topic id is invalid' do
- it 'should return the right response' do
+ context "when topic id is invalid" do
+ it "should return the right response" do
id = topic.id
topic.destroy!
- post "/t/#{id}/invite.json", params: {
- email: user.email
- }
+ post "/t/#{id}/invite.json", params: { email: user.email }
expect(response.status).to eq(404)
end
end
- it 'requires an email parameter' do
+ it "requires an email parameter" do
post "/t/#{topic.id}/invite.json"
expect(response.status).to eq(422)
end
@@ -4265,32 +4262,29 @@ RSpec.describe TopicsController do
end
it "doesn't allow normal users to invite" do
- post "/t/#{pm.id}/invite.json", params: {
- user: user_2.username
- }
+ post "/t/#{pm.id}/invite.json", params: { user: user_2.username }
expect(response.status).to eq(422)
expect(response.parsed_body["errors"]).to contain_exactly(
- I18n.t("pm_reached_recipients_limit", recipients_limit: SiteSetting.max_allowed_message_recipients)
+ I18n.t(
+ "pm_reached_recipients_limit",
+ recipients_limit: SiteSetting.max_allowed_message_recipients,
+ ),
)
end
it "allows staff to bypass limits" do
sign_in(moderator)
- post "/t/#{moderator_pm.id}/invite.json", params: {
- user: user_2.username
- }
+ post "/t/#{moderator_pm.id}/invite.json", params: { user: user_2.username }
expect(response.status).to eq(200)
expect(moderator_pm.reload.topic_allowed_users.count).to eq(3)
end
end
- context 'when user does not have permission to invite to the topic' do
+ context "when user does not have permission to invite to the topic" do
fab!(:topic) { pm }
it "should return the right response" do
- post "/t/#{topic.id}/invite.json", params: {
- user: user.username
- }
+ post "/t/#{topic.id}/invite.json", params: { user: user.username }
expect(response.status).to eq(403)
end
@@ -4298,7 +4292,7 @@ RSpec.describe TopicsController do
end
end
- describe 'invite_group' do
+ describe "invite_group" do
let!(:admins) { Group[:admins] }
def invite_group(topic, expected_status)
@@ -4306,41 +4300,35 @@ RSpec.describe TopicsController do
expect(response.status).to eq(expected_status)
end
- before do
- admins.update!(messageable_level: Group::ALIAS_LEVELS[:everyone])
- end
+ before { admins.update!(messageable_level: Group::ALIAS_LEVELS[:everyone]) }
- context 'as an anon user' do
- it 'should be forbidden' do
+ context "as an anon user" do
+ it "should be forbidden" do
invite_group(pm, 403)
end
end
- context 'as a normal user' do
+ context "as a normal user" do
before { sign_in(user) }
- context 'when user does not have permission to view the topic' do
- it 'should be forbidden' do
+ context "when user does not have permission to view the topic" do
+ it "should be forbidden" do
invite_group(pm, 403)
end
end
- context 'when user has permission to view the topic' do
- before do
- pm.allowed_users << user
- end
+ context "when user has permission to view the topic" do
+ before { pm.allowed_users << user }
- it 'should allow user to invite group to topic' do
+ it "should allow user to invite group to topic" do
invite_group(pm, 200)
expect(pm.allowed_groups.first.id).to eq(admins.id)
end
end
end
- context 'as an admin user' do
- before do
- sign_in(admin)
- end
+ context "as an admin user" do
+ before { sign_in(admin) }
it "disallows inviting a group to a topic" do
invite_group(topic, 422)
@@ -4358,35 +4346,32 @@ RSpec.describe TopicsController do
fab!(:moderator_pm) { Fabricate(:private_message_topic, user: moderator) }
- before do
- SiteSetting.max_allowed_message_recipients = 2
- end
+ before { SiteSetting.max_allowed_message_recipients = 2 }
it "doesn't allow normal users to invite" do
- post "/t/#{pm.id}/invite-group.json", params: {
- group: group.name
- }
+ post "/t/#{pm.id}/invite-group.json", params: { group: group.name }
expect(response.status).to eq(422)
expect(response.parsed_body["errors"]).to contain_exactly(
- I18n.t("pm_reached_recipients_limit", recipients_limit: SiteSetting.max_allowed_message_recipients)
+ I18n.t(
+ "pm_reached_recipients_limit",
+ recipients_limit: SiteSetting.max_allowed_message_recipients,
+ ),
)
end
it "allows staff to bypass limits" do
sign_in(moderator)
- post "/t/#{moderator_pm.id}/invite-group.json", params: {
- group: group.name
- }
+ post "/t/#{moderator_pm.id}/invite-group.json", params: { group: group.name }
expect(response.status).to eq(200)
- expect(moderator_pm.reload.topic_allowed_users.count + moderator_pm.topic_allowed_groups.count).to eq(3)
+ expect(
+ moderator_pm.reload.topic_allowed_users.count + moderator_pm.topic_allowed_groups.count,
+ ).to eq(3)
end
end
end
- describe 'shared drafts' do
- before do
- SiteSetting.shared_drafts_category = shared_drafts_category.id
- end
+ describe "shared drafts" do
+ before { SiteSetting.shared_drafts_category = shared_drafts_category.id }
describe "#update_shared_draft" do
fab!(:other_cat) { Fabricate(:category) }
@@ -4400,9 +4385,7 @@ RSpec.describe TopicsController do
end
context "as a moderator" do
- before do
- sign_in(moderator)
- end
+ before { sign_in(moderator) }
context "with a shared draft" do
fab!(:shared_draft) { Fabricate(:shared_draft, topic: topic, category: category) }
@@ -4441,22 +4424,23 @@ RSpec.describe TopicsController do
end
context "as staff" do
- before do
- sign_in(moderator)
- end
+ before { sign_in(moderator) }
it "will publish the topic" do
put "/t/#{topic.id}/publish.json", params: { destination_category_id: category.id }
expect(response.status).to eq(200)
- json = response.parsed_body['basic_topic']
+ json = response.parsed_body["basic_topic"]
- result = Topic.find(json['id'])
+ result = Topic.find(json["id"])
expect(result.category_id).to eq(category.id)
expect(result.visible).to eq(true)
end
- it 'fails if the destination category is the shared drafts category' do
- put "/t/#{topic.id}/publish.json", params: { destination_category_id: shared_drafts_category.id }
+ it "fails if the destination category is the shared drafts category" do
+ put "/t/#{topic.id}/publish.json",
+ params: {
+ destination_category_id: shared_drafts_category.id,
+ }
expect(response.status).to eq(400)
end
end
@@ -4471,7 +4455,7 @@ RSpec.describe TopicsController do
body = response.body
expect(body).to have_tag(:script, with: { src: "/assets/discourse.js" })
- expect(body).to have_tag(:meta, with: { name: 'fragment' })
+ expect(body).to have_tag(:meta, with: { name: "fragment" })
end
end
@@ -4503,19 +4487,19 @@ RSpec.describe TopicsController do
body = response.body
- expect(body).to have_tag(:body, with: { class: 'crawler' })
- expect(body).to_not have_tag(:meta, with: { name: 'fragment' })
+ expect(body).to have_tag(:body, with: { class: "crawler" })
+ expect(body).to_not have_tag(:meta, with: { name: "fragment" })
expect(body).to include('
@@ -883,33 +881,29 @@ RSpec.describe UploadsController do
XML
stub_request(
:post,
- "https://s3-upload-bucket.s3.us-west-1.amazonaws.com/uploads/default/#{test_bucket_prefix}/temp/28fccf8259bbe75b873a2bd2564b778c/test.png?uploads"
+ "https://s3-upload-bucket.s3.us-west-1.amazonaws.com/uploads/default/#{test_bucket_prefix}/temp/28fccf8259bbe75b873a2bd2564b778c/test.png?uploads",
).to_return({ status: 200, body: create_multipart_result })
end
it "creates a multipart upload and creates an external upload stub that is marked as multipart" do
stub_create_multipart_request
- post "/uploads/create-multipart.json", **{
- params: {
- file_name: "test.png",
- file_size: 1024,
- upload_type: "composer",
- }
- }
+ post "/uploads/create-multipart.json",
+ **{ params: { file_name: "test.png", file_size: 1024, upload_type: "composer" } }
expect(response.status).to eq(200)
result = response.parsed_body
- external_upload_stub = ExternalUploadStub.where(
- unique_identifier: result["unique_identifier"],
- original_filename: "test.png",
- created_by: user,
- upload_type: "composer",
- key: result["key"],
- external_upload_identifier: mock_multipart_upload_id,
- multipart: true,
- filesize: 1024
- )
+ external_upload_stub =
+ ExternalUploadStub.where(
+ unique_identifier: result["unique_identifier"],
+ original_filename: "test.png",
+ created_by: user,
+ upload_type: "composer",
+ key: result["key"],
+ external_upload_identifier: mock_multipart_upload_id,
+ multipart: true,
+ filesize: 1024,
+ )
expect(external_upload_stub.exists?).to eq(true)
expect(result["key"]).to include(FileStore::S3Store::TEMPORARY_UPLOAD_PREFIX)
expect(result["external_upload_identifier"]).to eq(mock_multipart_upload_id)
@@ -918,21 +912,24 @@ RSpec.describe UploadsController do
it "includes accepted metadata when calling the store to create_multipart, but only allowed keys" do
stub_create_multipart_request
- FileStore::S3Store.any_instance.expects(:create_multipart).with(
- "test.png", "image/png", metadata: { "sha1-checksum" => "testing" }
- ).returns({ key: "test" })
+ FileStore::S3Store
+ .any_instance
+ .expects(:create_multipart)
+ .with("test.png", "image/png", metadata: { "sha1-checksum" => "testing" })
+ .returns({ key: "test" })
- post "/uploads/create-multipart.json", **{
- params: {
- file_name: "test.png",
- file_size: 1024,
- upload_type: "composer",
- metadata: {
- "sha1-checksum" => "testing",
- "blah" => "wontbeincluded"
- }
- }
- }
+ post "/uploads/create-multipart.json",
+ **{
+ params: {
+ file_name: "test.png",
+ file_size: 1024,
+ upload_type: "composer",
+ metadata: {
+ "sha1-checksum" => "testing",
+ "blah" => "wontbeincluded",
+ },
+ },
+ }
expect(response.status).to eq(200)
end
@@ -943,43 +940,51 @@ RSpec.describe UploadsController do
stub_create_multipart_request
stub_const(ExternalUploadHelpers, "CREATE_MULTIPART_RATE_LIMIT_PER_MINUTE", 1) do
- post "/uploads/create-multipart.json", params: {
- file_name: "test.png",
- upload_type: "composer",
- file_size: 1024
- }
+ post "/uploads/create-multipart.json",
+ params: {
+ file_name: "test.png",
+ upload_type: "composer",
+ file_size: 1024,
+ }
expect(response.status).to eq(200)
- post "/uploads/create-multipart.json", params: {
- file_name: "test.png",
- upload_type: "composer",
- file_size: 1024
- }
+ post "/uploads/create-multipart.json",
+ params: {
+ file_name: "test.png",
+ upload_type: "composer",
+ file_size: 1024,
+ }
expect(response.status).to eq(429)
end
end
end
context "when the store is not external" do
- before do
- sign_in(user)
- end
+ before { sign_in(user) }
it "returns 404" do
- post "/uploads/create-multipart.json", params: {
- file_name: "test.png",
- upload_type: "composer",
- file_size: 1024
- }
+ post "/uploads/create-multipart.json",
+ params: {
+ file_name: "test.png",
+ upload_type: "composer",
+ file_size: 1024,
+ }
expect(response.status).to eq(404)
end
end
end
describe "#batch_presign_multipart_parts" do
- fab!(:mock_multipart_upload_id) { "ibZBv_75gd9r8lH_gqXatLdxMVpAlj6CFTR.OwyF3953YdwbcQnMA2BLGn8Lx12fQNICtMw5KyteFeHw.Sjng--" }
+ fab!(:mock_multipart_upload_id) do
+ "ibZBv_75gd9r8lH_gqXatLdxMVpAlj6CFTR.OwyF3953YdwbcQnMA2BLGn8Lx12fQNICtMw5KyteFeHw.Sjng--"
+ end
fab!(:external_upload_stub) do
- Fabricate(:image_external_upload_stub, created_by: user, multipart: true, external_upload_identifier: mock_multipart_upload_id)
+ Fabricate(
+ :image_external_upload_stub,
+ created_by: user,
+ multipart: true,
+ external_upload_identifier: mock_multipart_upload_id,
+ )
end
context "when the store is external" do
@@ -1017,7 +1022,10 @@ RSpec.describe UploadsController do
STANDARD
XML
- stub_request(:get, "https://s3-upload-bucket.s3.us-west-1.amazonaws.com/#{external_upload_stub.key}?max-parts=1&uploadId=#{mock_multipart_upload_id}").to_return({ status: 200, body: list_multipart_result })
+ stub_request(
+ :get,
+ "https://s3-upload-bucket.s3.us-west-1.amazonaws.com/#{external_upload_stub.key}?max-parts=1&uploadId=#{mock_multipart_upload_id}",
+ ).to_return({ status: 200, body: list_multipart_result })
end
it "errors if the correct params are not provided" do
@@ -1026,59 +1034,78 @@ RSpec.describe UploadsController do
end
it "errors if the part_numbers do not contain numbers between 1 and 10000" do
- post "/uploads/batch-presign-multipart-parts.json", params: {
- unique_identifier: external_upload_stub.unique_identifier,
- part_numbers: [-1, 0, 1, 2, 3, 4]
- }
+ post "/uploads/batch-presign-multipart-parts.json",
+ params: {
+ unique_identifier: external_upload_stub.unique_identifier,
+ part_numbers: [-1, 0, 1, 2, 3, 4],
+ }
expect(response.status).to eq(400)
- expect(response.body).to include("You supplied invalid parameters to the request: Each part number should be between 1 and 10000")
- post "/uploads/batch-presign-multipart-parts.json", params: {
- unique_identifier: external_upload_stub.unique_identifier,
- part_numbers: [3, 4, "blah"]
- }
+ expect(response.body).to include(
+ "You supplied invalid parameters to the request: Each part number should be between 1 and 10000",
+ )
+ post "/uploads/batch-presign-multipart-parts.json",
+ params: {
+ unique_identifier: external_upload_stub.unique_identifier,
+ part_numbers: [3, 4, "blah"],
+ }
expect(response.status).to eq(400)
- expect(response.body).to include("You supplied invalid parameters to the request: Each part number should be between 1 and 10000")
+ expect(response.body).to include(
+ "You supplied invalid parameters to the request: Each part number should be between 1 and 10000",
+ )
end
it "returns 404 when the upload stub does not exist" do
- post "/uploads/batch-presign-multipart-parts.json", params: {
- unique_identifier: "unknown",
- part_numbers: [1, 2, 3]
- }
+ post "/uploads/batch-presign-multipart-parts.json",
+ params: {
+ unique_identifier: "unknown",
+ part_numbers: [1, 2, 3],
+ }
expect(response.status).to eq(404)
end
it "returns 404 when the upload stub does not belong to the user" do
external_upload_stub.update!(created_by: Fabricate(:user))
- post "/uploads/batch-presign-multipart-parts.json", params: {
- unique_identifier: external_upload_stub.unique_identifier,
- part_numbers: [1, 2, 3]
- }
+ post "/uploads/batch-presign-multipart-parts.json",
+ params: {
+ unique_identifier: external_upload_stub.unique_identifier,
+ part_numbers: [1, 2, 3],
+ }
expect(response.status).to eq(404)
end
it "returns 404 when the multipart upload does not exist" do
- FileStore::S3Store.any_instance.stubs(:list_multipart_parts).raises(Aws::S3::Errors::NoSuchUpload.new("test", "test"))
- post "/uploads/batch-presign-multipart-parts.json", params: {
- unique_identifier: external_upload_stub.unique_identifier,
- part_numbers: [1, 2, 3]
- }
+ FileStore::S3Store
+ .any_instance
+ .stubs(:list_multipart_parts)
+ .raises(Aws::S3::Errors::NoSuchUpload.new("test", "test"))
+ post "/uploads/batch-presign-multipart-parts.json",
+ params: {
+ unique_identifier: external_upload_stub.unique_identifier,
+ part_numbers: [1, 2, 3],
+ }
expect(response.status).to eq(404)
end
it "returns an object with the presigned URLs with the part numbers as keys" do
stub_list_multipart_request
- post "/uploads/batch-presign-multipart-parts.json", params: {
- unique_identifier: external_upload_stub.unique_identifier,
- part_numbers: [2, 3, 4]
- }
+ post "/uploads/batch-presign-multipart-parts.json",
+ params: {
+ unique_identifier: external_upload_stub.unique_identifier,
+ part_numbers: [2, 3, 4],
+ }
expect(response.status).to eq(200)
result = response.parsed_body
- expect(result["presigned_urls"].keys).to eq(["2", "3", "4"])
- expect(result["presigned_urls"]["2"]).to include("?partNumber=2&uploadId=#{mock_multipart_upload_id}")
- expect(result["presigned_urls"]["3"]).to include("?partNumber=3&uploadId=#{mock_multipart_upload_id}")
- expect(result["presigned_urls"]["4"]).to include("?partNumber=4&uploadId=#{mock_multipart_upload_id}")
+ expect(result["presigned_urls"].keys).to eq(%w[2 3 4])
+ expect(result["presigned_urls"]["2"]).to include(
+ "?partNumber=2&uploadId=#{mock_multipart_upload_id}",
+ )
+ expect(result["presigned_urls"]["3"]).to include(
+ "?partNumber=3&uploadId=#{mock_multipart_upload_id}",
+ )
+ expect(result["presigned_urls"]["4"]).to include(
+ "?partNumber=4&uploadId=#{mock_multipart_upload_id}",
+ )
end
it "rate limits" do
@@ -1087,42 +1114,52 @@ RSpec.describe UploadsController do
SiteSetting.max_batch_presign_multipart_per_minute = 1
stub_list_multipart_request
- post "/uploads/batch-presign-multipart-parts.json", params: {
- unique_identifier: external_upload_stub.unique_identifier,
- part_numbers: [1, 2, 3]
- }
+ post "/uploads/batch-presign-multipart-parts.json",
+ params: {
+ unique_identifier: external_upload_stub.unique_identifier,
+ part_numbers: [1, 2, 3],
+ }
expect(response.status).to eq(200)
- post "/uploads/batch-presign-multipart-parts.json", params: {
- unique_identifier: external_upload_stub.unique_identifier,
- part_numbers: [1, 2, 3]
- }
+ post "/uploads/batch-presign-multipart-parts.json",
+ params: {
+ unique_identifier: external_upload_stub.unique_identifier,
+ part_numbers: [1, 2, 3],
+ }
expect(response.status).to eq(429)
end
end
context "when the store is not external" do
- before do
- sign_in(user)
- end
+ before { sign_in(user) }
it "returns 404" do
- post "/uploads/batch-presign-multipart-parts.json", params: {
- unique_identifier: external_upload_stub.unique_identifier,
- part_numbers: [1, 2, 3]
- }
+ post "/uploads/batch-presign-multipart-parts.json",
+ params: {
+ unique_identifier: external_upload_stub.unique_identifier,
+ part_numbers: [1, 2, 3],
+ }
expect(response.status).to eq(404)
end
end
end
describe "#complete_multipart" do
- let(:upload_base_url) { "https://#{SiteSetting.s3_upload_bucket}.s3.#{SiteSetting.s3_region}.amazonaws.com" }
- let(:mock_multipart_upload_id) { "ibZBv_75gd9r8lH_gqXatLdxMVpAlj6CFTR.OwyF3953YdwbcQnMA2BLGn8Lx12fQNICtMw5KyteFeHw.Sjng--" }
+ let(:upload_base_url) do
+ "https://#{SiteSetting.s3_upload_bucket}.s3.#{SiteSetting.s3_region}.amazonaws.com"
+ end
+ let(:mock_multipart_upload_id) do
+ "ibZBv_75gd9r8lH_gqXatLdxMVpAlj6CFTR.OwyF3953YdwbcQnMA2BLGn8Lx12fQNICtMw5KyteFeHw.Sjng--"
+ end
let!(:external_upload_stub) do
- Fabricate(:image_external_upload_stub, created_by: user, multipart: true, external_upload_identifier: mock_multipart_upload_id)
+ Fabricate(
+ :image_external_upload_stub,
+ created_by: user,
+ multipart: true,
+ external_upload_identifier: mock_multipart_upload_id,
+ )
end
context "when the store is external" do
@@ -1160,7 +1197,10 @@ RSpec.describe UploadsController do
STANDARD
XML
- stub_request(:get, "#{upload_base_url}/#{external_upload_stub.key}?max-parts=1&uploadId=#{mock_multipart_upload_id}").to_return({ status: 200, body: list_multipart_result })
+ stub_request(
+ :get,
+ "#{upload_base_url}/#{external_upload_stub.key}?max-parts=1&uploadId=#{mock_multipart_upload_id}",
+ ).to_return({ status: 200, body: list_multipart_result })
end
it "errors if the correct params are not provided" do
@@ -1170,69 +1210,89 @@ RSpec.describe UploadsController do
it "errors if the part_numbers do not contain numbers between 1 and 10000" do
stub_list_multipart_request
- post "/uploads/complete-multipart.json", params: {
- unique_identifier: external_upload_stub.unique_identifier,
- parts: [{ part_number: -1, etag: "test1" }]
- }
+ post "/uploads/complete-multipart.json",
+ params: {
+ unique_identifier: external_upload_stub.unique_identifier,
+ parts: [{ part_number: -1, etag: "test1" }],
+ }
expect(response.status).to eq(400)
- expect(response.body).to include("You supplied invalid parameters to the request: Each part number should be between 1 and 10000")
- post "/uploads/complete-multipart.json", params: {
- unique_identifier: external_upload_stub.unique_identifier,
- parts: [{ part_number: 20001, etag: "test1" }]
- }
+ expect(response.body).to include(
+ "You supplied invalid parameters to the request: Each part number should be between 1 and 10000",
+ )
+ post "/uploads/complete-multipart.json",
+ params: {
+ unique_identifier: external_upload_stub.unique_identifier,
+ parts: [{ part_number: 20_001, etag: "test1" }],
+ }
expect(response.status).to eq(400)
- expect(response.body).to include("You supplied invalid parameters to the request: Each part number should be between 1 and 10000")
- post "/uploads/complete-multipart.json", params: {
- unique_identifier: external_upload_stub.unique_identifier,
- parts: [{ part_number: "blah", etag: "test1" }]
- }
+ expect(response.body).to include(
+ "You supplied invalid parameters to the request: Each part number should be between 1 and 10000",
+ )
+ post "/uploads/complete-multipart.json",
+ params: {
+ unique_identifier: external_upload_stub.unique_identifier,
+ parts: [{ part_number: "blah", etag: "test1" }],
+ }
expect(response.status).to eq(400)
- expect(response.body).to include("You supplied invalid parameters to the request: Each part number should be between 1 and 10000")
+ expect(response.body).to include(
+ "You supplied invalid parameters to the request: Each part number should be between 1 and 10000",
+ )
end
it "errors if any of the parts objects have missing values" do
stub_list_multipart_request
- post "/uploads/complete-multipart.json", params: {
- unique_identifier: external_upload_stub.unique_identifier,
- parts: [{ part_number: 1 }]
- }
+ post "/uploads/complete-multipart.json",
+ params: {
+ unique_identifier: external_upload_stub.unique_identifier,
+ parts: [{ part_number: 1 }],
+ }
expect(response.status).to eq(400)
expect(response.body).to include("All parts must have an etag")
end
it "returns 404 when the upload stub does not exist" do
- post "/uploads/complete-multipart.json", params: {
- unique_identifier: "unknown",
- parts: [{ part_number: 1, etag: "test1" }]
- }
+ post "/uploads/complete-multipart.json",
+ params: {
+ unique_identifier: "unknown",
+ parts: [{ part_number: 1, etag: "test1" }],
+ }
expect(response.status).to eq(404)
end
it "returns 422 when the complete request errors" do
- FileStore::S3Store.any_instance.stubs(:complete_multipart).raises(Aws::S3::Errors::ServiceError.new({}, "test"))
+ FileStore::S3Store
+ .any_instance
+ .stubs(:complete_multipart)
+ .raises(Aws::S3::Errors::ServiceError.new({}, "test"))
stub_list_multipart_request
- post "/uploads/complete-multipart.json", params: {
- unique_identifier: external_upload_stub.unique_identifier,
- parts: [{ part_number: 1, etag: "test1" }]
- }
+ post "/uploads/complete-multipart.json",
+ params: {
+ unique_identifier: external_upload_stub.unique_identifier,
+ parts: [{ part_number: 1, etag: "test1" }],
+ }
expect(response.status).to eq(422)
end
it "returns 404 when the upload stub does not belong to the user" do
external_upload_stub.update!(created_by: Fabricate(:user))
- post "/uploads/complete-multipart.json", params: {
- unique_identifier: external_upload_stub.unique_identifier,
- parts: [{ part_number: 1, etag: "test1" }]
- }
+ post "/uploads/complete-multipart.json",
+ params: {
+ unique_identifier: external_upload_stub.unique_identifier,
+ parts: [{ part_number: 1, etag: "test1" }],
+ }
expect(response.status).to eq(404)
end
it "returns 404 when the multipart upload does not exist" do
- FileStore::S3Store.any_instance.stubs(:list_multipart_parts).raises(Aws::S3::Errors::NoSuchUpload.new("test", "test"))
- post "/uploads/complete-multipart.json", params: {
- unique_identifier: external_upload_stub.unique_identifier,
- parts: [{ part_number: 1, etag: "test1" }]
- }
+ FileStore::S3Store
+ .any_instance
+ .stubs(:list_multipart_parts)
+ .raises(Aws::S3::Errors::NoSuchUpload.new("test", "test"))
+ post "/uploads/complete-multipart.json",
+ params: {
+ unique_identifier: external_upload_stub.unique_identifier,
+ parts: [{ part_number: 1, etag: "test1" }],
+ }
expect(response.status).to eq(404)
end
@@ -1241,9 +1301,10 @@ RSpec.describe UploadsController do
stub_list_multipart_request
stub_request(
:post,
- "#{temp_location}?uploadId=#{external_upload_stub.external_upload_identifier}"
+ "#{temp_location}?uploadId=#{external_upload_stub.external_upload_identifier}",
).with(
- body: "test1 1 test2 2 test1 1 test2 2
@@ -1259,10 +1320,11 @@ RSpec.describe UploadsController do
upload = Fabricate(:upload)
ExternalUploadManager.any_instance.stubs(:transform!).returns(upload)
- post "/uploads/complete-multipart.json", params: {
- unique_identifier: external_upload_stub.unique_identifier,
- parts: [{ part_number: 1, etag: "test1" }, { part_number: 2, etag: "test2" }]
- }
+ post "/uploads/complete-multipart.json",
+ params: {
+ unique_identifier: external_upload_stub.unique_identifier,
+ parts: [{ part_number: 1, etag: "test1" }, { part_number: 2, etag: "test2" }],
+ }
expect(response.status).to eq(200)
result = response.parsed_body
@@ -1274,48 +1336,49 @@ RSpec.describe UploadsController do
RateLimiter.clear_all!
stub_const(ExternalUploadHelpers, "COMPLETE_MULTIPART_RATE_LIMIT_PER_MINUTE", 1) do
- post "/uploads/complete-multipart.json", params: {
- unique_identifier: "blah",
- parts: [{ part_number: 1, etag: "test1" }, { part_number: 2, etag: "test2" }]
- }
- post "/uploads/complete-multipart.json", params: {
- unique_identifier: "blah",
- parts: [{ part_number: 1, etag: "test1" }, { part_number: 2, etag: "test2" }]
- }
+ post "/uploads/complete-multipart.json",
+ params: {
+ unique_identifier: "blah",
+ parts: [{ part_number: 1, etag: "test1" }, { part_number: 2, etag: "test2" }],
+ }
+ post "/uploads/complete-multipart.json",
+ params: {
+ unique_identifier: "blah",
+ parts: [{ part_number: 1, etag: "test1" }, { part_number: 2, etag: "test2" }],
+ }
end
expect(response.status).to eq(429)
end
end
context "when the store is not external" do
- before do
- sign_in(user)
- end
+ before { sign_in(user) }
it "returns 404" do
- post "/uploads/complete-multipart.json", params: {
- unique_identifier: external_upload_stub.external_upload_identifier,
- parts: [
- {
- part_number: 1,
- etag: "test1"
- },
- {
- part_number: 2,
- etag: "test2"
- }
- ]
- }
+ post "/uploads/complete-multipart.json",
+ params: {
+ unique_identifier: external_upload_stub.external_upload_identifier,
+ parts: [{ part_number: 1, etag: "test1" }, { part_number: 2, etag: "test2" }],
+ }
expect(response.status).to eq(404)
end
end
end
describe "#abort_multipart" do
- let(:upload_base_url) { "https://#{SiteSetting.s3_upload_bucket}.s3.#{SiteSetting.s3_region}.amazonaws.com" }
- let(:mock_multipart_upload_id) { "ibZBv_75gd9r8lH_gqXatLdxMVpAlj6CFTR.OwyF3953YdwbcQnMA2BLGn8Lx12fQNICtMw5KyteFeHw.Sjng--" }
+ let(:upload_base_url) do
+ "https://#{SiteSetting.s3_upload_bucket}.s3.#{SiteSetting.s3_region}.amazonaws.com"
+ end
+ let(:mock_multipart_upload_id) do
+ "ibZBv_75gd9r8lH_gqXatLdxMVpAlj6CFTR.OwyF3953YdwbcQnMA2BLGn8Lx12fQNICtMw5KyteFeHw.Sjng--"
+ end
let!(:external_upload_stub) do
- Fabricate(:image_external_upload_stub, created_by: user, multipart: true, external_upload_identifier: mock_multipart_upload_id)
+ Fabricate(
+ :image_external_upload_stub,
+ created_by: user,
+ multipart: true,
+ external_upload_identifier: mock_multipart_upload_id,
+ )
end
context "when the store is external" do
@@ -1329,7 +1392,7 @@ RSpec.describe UploadsController do
temp_location = "#{upload_base_url}/#{external_upload_stub.key}"
stub_request(
:delete,
- "#{temp_location}?uploadId=#{external_upload_stub.external_upload_identifier}"
+ "#{temp_location}?uploadId=#{external_upload_stub.external_upload_identifier}",
).to_return(status: 200, body: "")
end
@@ -1340,68 +1403,60 @@ RSpec.describe UploadsController do
it "returns 200 when the stub does not exist, assumes it has already been deleted" do
FileStore::S3Store.any_instance.expects(:abort_multipart).never
- post "/uploads/abort-multipart.json", params: {
- external_upload_identifier: "unknown",
- }
+ post "/uploads/abort-multipart.json", params: { external_upload_identifier: "unknown" }
expect(response.status).to eq(200)
end
it "returns 404 when the upload stub does not belong to the user" do
external_upload_stub.update!(created_by: Fabricate(:user))
- post "/uploads/abort-multipart.json", params: {
- external_upload_identifier: external_upload_stub.external_upload_identifier
- }
+ post "/uploads/abort-multipart.json",
+ params: {
+ external_upload_identifier: external_upload_stub.external_upload_identifier,
+ }
expect(response.status).to eq(404)
end
it "aborts the multipart upload and deletes the stub" do
stub_abort_request
- post "/uploads/abort-multipart.json", params: {
- external_upload_identifier: external_upload_stub.external_upload_identifier
- }
+ post "/uploads/abort-multipart.json",
+ params: {
+ external_upload_identifier: external_upload_stub.external_upload_identifier,
+ }
expect(response.status).to eq(200)
expect(ExternalUploadStub.exists?(id: external_upload_stub.id)).to eq(false)
end
it "returns 422 when the abort request errors" do
- FileStore::S3Store.any_instance.stubs(:abort_multipart).raises(Aws::S3::Errors::ServiceError.new({}, "test"))
- post "/uploads/abort-multipart.json", params: {
- external_upload_identifier: external_upload_stub.external_upload_identifier
- }
+ FileStore::S3Store
+ .any_instance
+ .stubs(:abort_multipart)
+ .raises(Aws::S3::Errors::ServiceError.new({}, "test"))
+ post "/uploads/abort-multipart.json",
+ params: {
+ external_upload_identifier: external_upload_stub.external_upload_identifier,
+ }
expect(response.status).to eq(422)
end
end
context "when the store is not external" do
- before do
- sign_in(user)
- end
+ before { sign_in(user) }
it "returns 404" do
- post "/uploads/complete-multipart.json", params: {
- unique_identifier: external_upload_stub.external_upload_identifier,
- parts: [
- {
- part_number: 1,
- etag: "test1"
- },
- {
- part_number: 2,
- etag: "test2"
- }
- ]
- }
+ post "/uploads/complete-multipart.json",
+ params: {
+ unique_identifier: external_upload_stub.external_upload_identifier,
+ parts: [{ part_number: 1, etag: "test1" }, { part_number: 2, etag: "test2" }],
+ }
expect(response.status).to eq(404)
end
end
end
describe "#complete_external_upload" do
- before do
- sign_in(user)
- end
+ before { sign_in(user) }
context "when the store is external" do
fab!(:external_upload_stub) { Fabricate(:image_external_upload_stub, created_by: user) }
@@ -1420,45 +1475,81 @@ RSpec.describe UploadsController do
it "returns 404 when the upload stub does not belong to the user" do
external_upload_stub.update!(created_by: Fabricate(:user))
- post "/uploads/complete-external-upload.json", params: { unique_identifier: external_upload_stub.unique_identifier }
+ post "/uploads/complete-external-upload.json",
+ params: {
+ unique_identifier: external_upload_stub.unique_identifier,
+ }
expect(response.status).to eq(404)
end
it "handles ChecksumMismatchError" do
- ExternalUploadManager.any_instance.stubs(:transform!).raises(ExternalUploadManager::ChecksumMismatchError)
- post "/uploads/complete-external-upload.json", params: { unique_identifier: external_upload_stub.unique_identifier }
+ ExternalUploadManager
+ .any_instance
+ .stubs(:transform!)
+ .raises(ExternalUploadManager::ChecksumMismatchError)
+ post "/uploads/complete-external-upload.json",
+ params: {
+ unique_identifier: external_upload_stub.unique_identifier,
+ }
expect(response.status).to eq(422)
expect(response.parsed_body["errors"].first).to eq(I18n.t("upload.failed"))
end
it "handles SizeMismatchError" do
- ExternalUploadManager.any_instance.stubs(:transform!).raises(ExternalUploadManager::SizeMismatchError.new("expected: 10, actual: 1000"))
- post "/uploads/complete-external-upload.json", params: { unique_identifier: external_upload_stub.unique_identifier }
+ ExternalUploadManager
+ .any_instance
+ .stubs(:transform!)
+ .raises(ExternalUploadManager::SizeMismatchError.new("expected: 10, actual: 1000"))
+ post "/uploads/complete-external-upload.json",
+ params: {
+ unique_identifier: external_upload_stub.unique_identifier,
+ }
expect(response.status).to eq(422)
expect(response.parsed_body["errors"].first).to eq(I18n.t("upload.failed"))
end
it "handles CannotPromoteError" do
- ExternalUploadManager.any_instance.stubs(:transform!).raises(ExternalUploadManager::CannotPromoteError)
- post "/uploads/complete-external-upload.json", params: { unique_identifier: external_upload_stub.unique_identifier }
+ ExternalUploadManager
+ .any_instance
+ .stubs(:transform!)
+ .raises(ExternalUploadManager::CannotPromoteError)
+ post "/uploads/complete-external-upload.json",
+ params: {
+ unique_identifier: external_upload_stub.unique_identifier,
+ }
expect(response.status).to eq(422)
expect(response.parsed_body["errors"].first).to eq(I18n.t("upload.failed"))
end
it "handles DownloadFailedError and Aws::S3::Errors::NotFound" do
- ExternalUploadManager.any_instance.stubs(:transform!).raises(ExternalUploadManager::DownloadFailedError)
- post "/uploads/complete-external-upload.json", params: { unique_identifier: external_upload_stub.unique_identifier }
+ ExternalUploadManager
+ .any_instance
+ .stubs(:transform!)
+ .raises(ExternalUploadManager::DownloadFailedError)
+ post "/uploads/complete-external-upload.json",
+ params: {
+ unique_identifier: external_upload_stub.unique_identifier,
+ }
expect(response.status).to eq(422)
expect(response.parsed_body["errors"].first).to eq(I18n.t("upload.failed"))
- ExternalUploadManager.any_instance.stubs(:transform!).raises(Aws::S3::Errors::NotFound.new("error", "not found"))
- post "/uploads/complete-external-upload.json", params: { unique_identifier: external_upload_stub.unique_identifier }
+ ExternalUploadManager
+ .any_instance
+ .stubs(:transform!)
+ .raises(Aws::S3::Errors::NotFound.new("error", "not found"))
+ post "/uploads/complete-external-upload.json",
+ params: {
+ unique_identifier: external_upload_stub.unique_identifier,
+ }
expect(response.status).to eq(422)
expect(response.parsed_body["errors"].first).to eq(I18n.t("upload.failed"))
end
it "handles a generic upload failure" do
ExternalUploadManager.any_instance.stubs(:transform!).raises(StandardError)
- post "/uploads/complete-external-upload.json", params: { unique_identifier: external_upload_stub.unique_identifier }
+ post "/uploads/complete-external-upload.json",
+ params: {
+ unique_identifier: external_upload_stub.unique_identifier,
+ }
expect(response.status).to eq(422)
expect(response.parsed_body["errors"].first).to eq(I18n.t("upload.failed"))
end
@@ -1466,14 +1557,20 @@ RSpec.describe UploadsController do
it "handles validation errors on the upload" do
upload.errors.add(:base, "test error")
ExternalUploadManager.any_instance.stubs(:transform!).returns(upload)
- post "/uploads/complete-external-upload.json", params: { unique_identifier: external_upload_stub.unique_identifier }
+ post "/uploads/complete-external-upload.json",
+ params: {
+ unique_identifier: external_upload_stub.unique_identifier,
+ }
expect(response.status).to eq(422)
expect(response.parsed_body["errors"]).to eq(["test error"])
end
it "deletes the stub and returns the serialized upload when complete" do
ExternalUploadManager.any_instance.stubs(:transform!).returns(upload)
- post "/uploads/complete-external-upload.json", params: { unique_identifier: external_upload_stub.unique_identifier }
+ post "/uploads/complete-external-upload.json",
+ params: {
+ unique_identifier: external_upload_stub.unique_identifier,
+ }
expect(ExternalUploadStub.exists?(id: external_upload_stub.id)).to eq(false)
expect(response.status).to eq(200)
expect(response.parsed_body).to eq(UploadsController.serialize_upload(upload))
@@ -1482,7 +1579,11 @@ RSpec.describe UploadsController do
context "when the store is not external" do
it "returns 404" do
- post "/uploads/generate-presigned-put.json", params: { file_name: "test.png", type: "card_background" }
+ post "/uploads/generate-presigned-put.json",
+ params: {
+ file_name: "test.png",
+ type: "card_background",
+ }
expect(response.status).to eq(404)
end
end
diff --git a/spec/requests/user_actions_controller_spec.rb b/spec/requests/user_actions_controller_spec.rb
index e9d006df7c2..4750f5d0b62 100644
--- a/spec/requests/user_actions_controller_spec.rb
+++ b/spec/requests/user_actions_controller_spec.rb
@@ -19,15 +19,12 @@ RSpec.describe UserActionsController do
let(:actions) { response.parsed_body["user_actions"] }
let(:post) { create_post }
- before do
- UserActionManager.enable
- end
+ before { UserActionManager.enable }
it "renders list correctly" do
user_actions
expect(response).to have_http_status :ok
- expect(actions.first).to include "acting_name" => post.user.name,
- "post_number" => 1
+ expect(actions.first).to include "acting_name" => post.user.name, "post_number" => 1
expect(actions.first).not_to include "email"
end
@@ -50,14 +47,10 @@ RSpec.describe UserActionsController do
context "when user's profile is hidden" do
fab!(:post) { Fabricate(:post) }
- before do
- post.user.user_option.update_column(:hide_profile_and_presence, true)
- end
+ before { post.user.user_option.update_column(:hide_profile_and_presence, true) }
context "when `allow_users_to_hide_profile` is disabled" do
- before do
- SiteSetting.allow_users_to_hide_profile = false
- end
+ before { SiteSetting.allow_users_to_hide_profile = false }
it "succeeds" do
user_actions
@@ -88,9 +81,7 @@ RSpec.describe UserActionsController do
context "when user is logged in" do
fab!(:user) { Fabricate(:user) }
- before do
- sign_in(user)
- end
+ before { sign_in(user) }
UserAction.private_types.each do |action_type|
action_name = UserAction.types.key(action_type)
@@ -103,9 +94,7 @@ RSpec.describe UserActionsController do
context "when user is a moderator" do
fab!(:moderator) { Fabricate(:moderator) }
- before do
- sign_in(moderator)
- end
+ before { sign_in(moderator) }
UserAction.private_types.each do |action_type|
action_name = UserAction.types.key(action_type)
@@ -118,9 +107,7 @@ RSpec.describe UserActionsController do
context "when user is an admin" do
fab!(:admin) { Fabricate(:admin) }
- before do
- sign_in(admin)
- end
+ before { sign_in(admin) }
UserAction.private_types.each do |action_type|
action_name = UserAction.types.key(action_type)
@@ -131,10 +118,7 @@ RSpec.describe UserActionsController do
end
def list_and_check(action_type, expected_response)
- get "/user_actions.json", params: {
- filter: action_type,
- username: another_user.username
- }
+ get "/user_actions.json", params: { filter: action_type, username: another_user.username }
expect(response.status).to eq(expected_response)
end
@@ -143,14 +127,7 @@ RSpec.describe UserActionsController do
context "when bad data is provided" do
fab!(:user) { Fabricate(:user) }
- let(:params) do
- {
- filter: filter,
- username: username,
- offset: offset,
- limit: limit
- }
- end
+ let(:params) { { filter: filter, username: username, offset: offset, limit: limit } }
let(:filter) { "1,2" }
let(:username) { user.username }
let(:offset) { "0" }
diff --git a/spec/requests/user_api_keys_controller_spec.rb b/spec/requests/user_api_keys_controller_spec.rb
index c7f5824f745..39dc6942e8b 100644
--- a/spec/requests/user_api_keys_controller_spec.rb
+++ b/spec/requests/user_api_keys_controller_spec.rb
@@ -34,16 +34,16 @@ RSpec.describe UserApiKeysController do
let :args do
{
- scopes: 'read',
+ scopes: "read",
client_id: "x" * 32,
- auth_redirect: 'http://over.the/rainbow',
- application_name: 'foo',
+ auth_redirect: "http://over.the/rainbow",
+ application_name: "foo",
public_key: public_key,
- nonce: SecureRandom.hex
+ nonce: SecureRandom.hex,
}
end
- describe '#new' do
+ describe "#new" do
it "supports a head request cleanly" do
head "/user-api-key/new"
expect(response.status).to eq(200)
@@ -51,7 +51,7 @@ RSpec.describe UserApiKeysController do
end
end
- describe '#create' do
+ describe "#create" do
it "does not allow anon" do
post "/user-api-key.json", params: args
expect(response.status).to eq(403)
@@ -112,8 +112,12 @@ RSpec.describe UserApiKeysController do
key2 = Fabricate(:readonly_user_api_key)
post "/user-api-key/revoke.json",
- params: { id: key2.id },
- headers: { HTTP_USER_API_KEY: key1.key }
+ params: {
+ id: key2.id,
+ },
+ headers: {
+ HTTP_USER_API_KEY: key1.key,
+ }
expect(response.status).to eq(403)
end
@@ -121,8 +125,12 @@ RSpec.describe UserApiKeysController do
it "will allow readonly api keys to revoke self" do
key = Fabricate(:readonly_user_api_key)
post "/user-api-key/revoke.json",
- params: { id: key.id },
- headers: { HTTP_USER_API_KEY: key.key }
+ params: {
+ id: key.id,
+ },
+ headers: {
+ HTTP_USER_API_KEY: key.key,
+ }
expect(response.status).to eq(200)
key.reload
@@ -134,8 +142,7 @@ RSpec.describe UserApiKeysController do
acting_user = Fabricate(:user)
sign_in(acting_user)
- post "/user-api-key/revoke.json",
- params: { id: key.id }
+ post "/user-api-key/revoke.json", params: { id: key.id }
expect(response.status).to eq(403)
key.reload
@@ -204,7 +211,9 @@ RSpec.describe UserApiKeysController do
api_key = UserApiKey.with_key(parsed["key"]).first
expect(api_key.user_id).to eq(user.id)
- expect(api_key.scopes.map(&:name).sort).to eq(["push", "message_bus", "notifications", "session_info", "one_time_password"].sort)
+ expect(api_key.scopes.map(&:name).sort).to eq(
+ %w[push message_bus notifications session_info one_time_password].sort,
+ )
expect(api_key.push_url).to eq("https://push.it/here")
uri.query = ""
@@ -234,7 +243,7 @@ RSpec.describe UserApiKeysController do
SiteSetting.min_trust_level_for_user_api_key = 0
post "/user-api-key", params: args
expect(response.status).not_to eq(302)
- payload = Nokogiri::HTML5(response.body).at('code').content
+ payload = Nokogiri.HTML5(response.body).at("code").content
encrypted = Base64.decode64(payload)
key = OpenSSL::PKey::RSA.new(private_key)
parsed = JSON.parse(key.private_decrypt(encrypted))
@@ -257,12 +266,11 @@ RSpec.describe UserApiKeysController do
parsed = JSON.parse(key.private_decrypt(encrypted))
api_key = UserApiKey.with_key(parsed["key"]).first
expect(api_key.user_id).to eq(user.id)
-
end
it "will allow redirect to wildcard urls" do
- SiteSetting.allowed_user_api_auth_redirects = args[:auth_redirect] + '/*'
- args[:auth_redirect] = args[:auth_redirect] + '/bluebirds/fly'
+ SiteSetting.allowed_user_api_auth_redirects = args[:auth_redirect] + "/*"
+ args[:auth_redirect] = args[:auth_redirect] + "/bluebirds/fly"
sign_in(Fabricate(:user))
@@ -270,7 +278,7 @@ RSpec.describe UserApiKeysController do
expect(response.status).to eq(302)
end
- it 'will keep query_params added in auth_redirect' do
+ it "will keep query_params added in auth_redirect" do
SiteSetting.min_trust_level_for_user_api_key = 0
SiteSetting.allowed_user_api_auth_redirects = args[:auth_redirect] + "/*"
@@ -288,12 +296,12 @@ RSpec.describe UserApiKeysController do
end
end
- describe '#create-one-time-password' do
+ describe "#create-one-time-password" do
let :otp_args do
{
- auth_redirect: 'http://somewhere.over.the/rainbow',
- application_name: 'foo',
- public_key: public_key
+ auth_redirect: "http://somewhere.over.the/rainbow",
+ application_name: "foo",
+ public_key: public_key,
}
end
diff --git a/spec/requests/user_avatars_controller_spec.rb b/spec/requests/user_avatars_controller_spec.rb
index 04c4654dcb4..45e7851e405 100644
--- a/spec/requests/user_avatars_controller_spec.rb
+++ b/spec/requests/user_avatars_controller_spec.rb
@@ -1,32 +1,29 @@
# frozen_string_literal: true
RSpec.describe UserAvatarsController do
- describe '#show_proxy_letter' do
- it 'returns not found if external avatar is set somewhere else' do
+ describe "#show_proxy_letter" do
+ it "returns not found if external avatar is set somewhere else" do
SiteSetting.external_system_avatars_url = "https://somewhere.else.com/avatar.png"
get "/letter_avatar_proxy/v2/letter/a/aaaaaa/20.png"
expect(response.status).to eq(404)
end
- it 'returns an avatar if we are allowing the proxy' do
- stub_request(:get, "https://avatars.discourse-cdn.com/v3/letter/a/aaaaaa/360.png").to_return(body: 'image')
+ it "returns an avatar if we are allowing the proxy" do
+ stub_request(:get, "https://avatars.discourse-cdn.com/v3/letter/a/aaaaaa/360.png").to_return(
+ body: "image",
+ )
get "/letter_avatar_proxy/v3/letter/a/aaaaaa/360.png"
expect(response.status).to eq(200)
end
end
- describe '#show' do
- context 'when invalid' do
- after do
- FileUtils.rm(Discourse.store.path_for(upload))
- end
+ describe "#show" do
+ context "when invalid" do
+ after { FileUtils.rm(Discourse.store.path_for(upload)) }
let :upload do
File.open(file_from_fixtures("cropped.png")) do |f|
- UploadCreator.new(
- f,
- "test.png"
- ).create_for(-1)
+ UploadCreator.new(f, "test.png").create_for(-1)
end
end
@@ -37,13 +34,13 @@ RSpec.describe UserAvatarsController do
user
end
- it 'automatically corrects bad avatar extensions' do
+ it "automatically corrects bad avatar extensions" do
orig = Discourse.store.path_for(upload)
upload.update_columns(
- original_filename: 'bob.jpg',
- extension: 'jpg',
- url: upload.url + '.jpg'
+ original_filename: "bob.jpg",
+ extension: "jpg",
+ url: upload.url + ".jpg",
)
# at this point file is messed up
@@ -57,47 +54,58 @@ RSpec.describe UserAvatarsController do
expect(response.status).to eq(200)
upload.reload
- expect(upload.extension).to eq('png')
+ expect(upload.extension).to eq("png")
end
end
- it 'handles non local content correctly' do
+ it "handles non local content correctly" do
setup_s3
SiteSetting.avatar_sizes = "100|49"
SiteSetting.unicode_usernames = true
SiteSetting.s3_cdn_url = "http://cdn.com"
- stub_request(:get, "#{SiteSetting.s3_cdn_url}/something/else").to_return(body: 'image')
+ stub_request(:get, "#{SiteSetting.s3_cdn_url}/something/else").to_return(body: "image")
set_cdn_url("http://awesome.com/boom")
- upload = Fabricate(:upload, url: "//#{SiteSetting.s3_upload_bucket}.s3.dualstack.us-west-1.amazonaws.com/something")
+ upload =
+ Fabricate(
+ :upload,
+ url: "//#{SiteSetting.s3_upload_bucket}.s3.dualstack.us-west-1.amazonaws.com/something",
+ )
- optimized_image = Fabricate(:optimized_image,
- sha1: SecureRandom.hex << "A" * 8,
- upload: upload,
- width: 98,
- height: 98,
- url: "//#{SiteSetting.s3_upload_bucket}.s3.dualstack.us-west-1.amazonaws.com/something/else",
- version: OptimizedImage::VERSION
- )
+ optimized_image =
+ Fabricate(
+ :optimized_image,
+ sha1: SecureRandom.hex << "A" * 8,
+ upload: upload,
+ width: 98,
+ height: 98,
+ url:
+ "//#{SiteSetting.s3_upload_bucket}.s3.dualstack.us-west-1.amazonaws.com/something/else",
+ version: OptimizedImage::VERSION,
+ )
user = Fabricate(:user, uploaded_avatar_id: upload.id)
get "/user_avatar/default/#{user.username}/97/#{upload.id}.png"
# 98 is closest which is 49 * 2 for retina
- expect(response).to redirect_to("http://awesome.com/boom/user_avatar/default/#{user.username_lower}/98/#{upload.id}_#{OptimizedImage::VERSION}.png")
+ expect(response).to redirect_to(
+ "http://awesome.com/boom/user_avatar/default/#{user.username_lower}/98/#{upload.id}_#{OptimizedImage::VERSION}.png",
+ )
get "/user_avatar/default/#{user.username}/98/#{upload.id}.png"
expect(response.body).to eq("image")
- expect(response.headers["Cache-Control"]).to eq('max-age=31556952, public, immutable')
+ expect(response.headers["Cache-Control"]).to eq("max-age=31556952, public, immutable")
expect(response.headers["Last-Modified"]).to eq(optimized_image.upload.created_at.httpdate)
user.update!(username: "Löwe")
get "/user_avatar/default/#{user.encoded_username}/97/#{upload.id}.png"
- expect(response).to redirect_to("http://awesome.com/boom/user_avatar/default/#{user.encoded_username(lower: true)}/98/#{upload.id}_#{OptimizedImage::VERSION}.png")
+ expect(response).to redirect_to(
+ "http://awesome.com/boom/user_avatar/default/#{user.encoded_username(lower: true)}/98/#{upload.id}_#{OptimizedImage::VERSION}.png",
+ )
end
it "redirects to external store when enabled" do
@@ -107,16 +115,23 @@ RSpec.describe UserAvatarsController do
SiteSetting.s3_cdn_url = "https://s3-cdn.example.com"
set_cdn_url("https://app-cdn.example.com")
- upload = Fabricate(:upload, url: "//#{SiteSetting.s3_upload_bucket}.s3.dualstack.us-west-1.amazonaws.com/upload/path")
+ upload =
+ Fabricate(
+ :upload,
+ url: "//#{SiteSetting.s3_upload_bucket}.s3.dualstack.us-west-1.amazonaws.com/upload/path",
+ )
- optimized_image = Fabricate(:optimized_image,
- sha1: SecureRandom.hex << "A" * 8,
- upload: upload,
- width: 98,
- height: 98,
- url: "//#{SiteSetting.s3_upload_bucket}.s3.dualstack.us-west-1.amazonaws.com/optimized/path",
- version: OptimizedImage::VERSION
- )
+ optimized_image =
+ Fabricate(
+ :optimized_image,
+ sha1: SecureRandom.hex << "A" * 8,
+ upload: upload,
+ width: 98,
+ height: 98,
+ url:
+ "//#{SiteSetting.s3_upload_bucket}.s3.dualstack.us-west-1.amazonaws.com/optimized/path",
+ version: OptimizedImage::VERSION,
+ )
user = Fabricate(:user, uploaded_avatar_id: upload.id)
@@ -124,10 +139,10 @@ RSpec.describe UserAvatarsController do
expect(response.status).to eq(302)
expect(response.location).to eq("https://s3-cdn.example.com/optimized/path")
- expect(response.headers["Cache-Control"]).to eq('max-age=3600, public, immutable')
+ expect(response.headers["Cache-Control"]).to eq("max-age=3600, public, immutable")
end
- it 'serves new version for old urls' do
+ it "serves new version for old urls" do
user = Fabricate(:user)
SiteSetting.avatar_sizes = "45"
@@ -147,10 +162,9 @@ RSpec.describe UserAvatarsController do
# clean up images
upload.destroy
-
end
- it 'serves a correct last modified for render blank' do
+ it "serves a correct last modified for render blank" do
freeze_time
get "/user_avatar/default/xxx/51/777.png"
@@ -161,7 +175,7 @@ RSpec.describe UserAvatarsController do
expect(response.headers["Last-Modified"]).to eq(Time.new(1990, 01, 01).httpdate)
end
- it 'serves image even if size missing and its in local mode' do
+ it "serves image even if size missing and its in local mode" do
SiteSetting.avatar_sizes = "50"
upload = Fabricate(:upload)
@@ -181,12 +195,16 @@ RSpec.describe UserAvatarsController do
user = Fabricate(:user, uploaded_avatar_id: upload.id)
get "/user_avatar/default/#{user.username}/50/#{another_upload.id}.png"
- expect(response).to redirect_to("http://test.localhost/user_avatar/default/#{user.username_lower}/50/#{upload.id}_#{OptimizedImage::VERSION}.png")
+ expect(response).to redirect_to(
+ "http://test.localhost/user_avatar/default/#{user.username_lower}/50/#{upload.id}_#{OptimizedImage::VERSION}.png",
+ )
user.update!(username: "Löwe")
get "/user_avatar/default/#{user.encoded_username}/50/#{another_upload.id}.png"
- expect(response).to redirect_to("http://test.localhost/user_avatar/default/#{user.encoded_username(lower: true)}/50/#{upload.id}_#{OptimizedImage::VERSION}.png")
+ expect(response).to redirect_to(
+ "http://test.localhost/user_avatar/default/#{user.encoded_username(lower: true)}/50/#{upload.id}_#{OptimizedImage::VERSION}.png",
+ )
end
end
end
diff --git a/spec/requests/user_badges_controller_spec.rb b/spec/requests/user_badges_controller_spec.rb
index e4452d12081..67f585540f1 100644
--- a/spec/requests/user_badges_controller_spec.rb
+++ b/spec/requests/user_badges_controller_spec.rb
@@ -5,11 +5,17 @@ RSpec.describe UserBadgesController do
fab!(:admin) { Fabricate(:admin) }
fab!(:badge) { Fabricate(:badge) }
- describe '#index' do
+ describe "#index" do
fab!(:badge) { Fabricate(:badge, target_posts: true, show_posts: false) }
- it 'does not leak private info' do
+ it "does not leak private info" do
p = create_post
- UserBadge.create!(badge: badge, user: user, post_id: p.id, granted_by_id: -1, granted_at: Time.now)
+ UserBadge.create!(
+ badge: badge,
+ user: user,
+ post_id: p.id,
+ granted_by_id: -1,
+ granted_at: Time.now,
+ )
get "/user_badges.json", params: { badge_id: badge.id }
expect(response.status).to eq(200)
@@ -27,7 +33,7 @@ RSpec.describe UserBadgesController do
end
end
- describe '#index' do
+ describe "#index" do
fab!(:post) { Fabricate(:post) }
fab!(:private_message_post) { Fabricate(:private_message_post) }
let(:topic) { post.topic }
@@ -41,12 +47,12 @@ RSpec.describe UserBadgesController do
fab!(:user_badge_2) { Fabricate(:user_badge, badge: badge, post: private_message_post) }
fab!(:user_badge_3) { Fabricate(:user_badge, badge: badge, post: restricted_post) }
- it 'requires username or badge_id to be specified' do
+ it "requires username or badge_id to be specified" do
get "/user_badges.json"
expect(response.status).to eq(400)
end
- it 'returns user_badges for a user' do
+ it "returns user_badges for a user" do
get "/user-badges/#{user.username}.json"
expect(response.status).to eq(200)
@@ -54,7 +60,7 @@ RSpec.describe UserBadgesController do
expect(parsed["user_badges"].length).to eq(1)
end
- it 'returns user_badges for a user with period in username' do
+ it "returns user_badges for a user with period in username" do
user.update!(username: "myname.test")
get "/user-badges/#{user.username}", xhr: true
@@ -63,7 +69,7 @@ RSpec.describe UserBadgesController do
expect(parsed["user_badges"].length).to eq(1)
end
- it 'returns user_badges for a badge' do
+ it "returns user_badges for a badge" do
get "/user_badges.json", params: { badge_id: badge.id }
expect(response.status).to eq(200)
@@ -71,18 +77,16 @@ RSpec.describe UserBadgesController do
expect(parsed["user_badge_info"]["user_badges"].length).to eq(3)
end
- it 'includes counts when passed the aggregate argument' do
- get "/user-badges/#{user.username}.json", params: {
- grouped: true
- }
+ it "includes counts when passed the aggregate argument" do
+ get "/user-badges/#{user.username}.json", params: { grouped: true }
expect(response.status).to eq(200)
parsed = response.parsed_body
- expect(parsed["user_badges"].first.has_key?('count')).to eq(true)
+ expect(parsed["user_badges"].first.has_key?("count")).to eq(true)
end
- context 'for post and topic attributes associated with user badge' do
- it 'does not include the attributes for the private topic when user is anon' do
+ context "for post and topic attributes associated with user badge" do
+ it "does not include the attributes for the private topic when user is anon" do
get "/user_badges.json", params: { badge_id: badge.id }
expect(response.status).to eq(200)
@@ -94,10 +98,12 @@ RSpec.describe UserBadgesController do
parsed_user_badges = parsed["user_badge_info"]["user_badges"]
expect(parsed_user_badges.map { |ub| ub["post_id"] }.compact).to contain_exactly(post.id)
- expect(parsed_user_badges.map { |ub| ub["post_number"] }.compact).to contain_exactly(post.post_number)
+ expect(parsed_user_badges.map { |ub| ub["post_number"] }.compact).to contain_exactly(
+ post.post_number,
+ )
end
- it 'does not include the attributes for topics which the current user cannot see' do
+ it "does not include the attributes for topics which the current user cannot see" do
get "/user_badges.json", params: { badge_id: badge.id }
expect(response.status).to eq(200)
@@ -109,10 +115,12 @@ RSpec.describe UserBadgesController do
parsed_user_badges = parsed["user_badge_info"]["user_badges"]
expect(parsed_user_badges.map { |ub| ub["post_id"] }.compact).to contain_exactly(post.id)
- expect(parsed_user_badges.map { |ub| ub["post_number"] }.compact).to contain_exactly(post.post_number)
+ expect(parsed_user_badges.map { |ub| ub["post_number"] }.compact).to contain_exactly(
+ post.post_number,
+ )
end
- it 'includes the attributes for regular topic, private messages and restricted topics which the current user can see' do
+ it "includes the attributes for regular topic, private messages and restricted topics which the current user can see" do
group.add(user)
private_message_topic.allowed_users << user
@@ -127,7 +135,7 @@ RSpec.describe UserBadgesController do
expect(parsed["topics"].map { |t| t["id"] }).to contain_exactly(
post.topic_id,
private_message_post.topic_id,
- restricted_post.topic_id
+ restricted_post.topic_id,
)
parsed_user_badges = parsed["user_badge_info"]["user_badges"]
@@ -135,21 +143,19 @@ RSpec.describe UserBadgesController do
expect(parsed_user_badges.map { |ub| ub["post_id"] }.compact).to contain_exactly(
post.id,
private_message_post.id,
- restricted_post.id
+ restricted_post.id,
)
expect(parsed_user_badges.map { |ub| ub["post_number"] }.compact).to contain_exactly(
post.post_number,
private_message_post.post_number,
- restricted_post.post_number
+ restricted_post.post_number,
)
end
end
- context 'with hidden profiles' do
- before do
- user.user_option.update_columns(hide_profile_and_presence: true)
- end
+ context "with hidden profiles" do
+ before { user.user_option.update_columns(hide_profile_and_presence: true) }
it "returns 404 if `hide_profile_and_presence` user option is checked" do
get "/user-badges/#{user.username}.json"
@@ -165,32 +171,31 @@ RSpec.describe UserBadgesController do
end
end
- describe '#create' do
- it 'requires username to be specified' do
+ describe "#create" do
+ it "requires username to be specified" do
post "/user_badges.json", params: { badge_id: badge.id }
expect(response.status).to eq(400)
end
- it 'does not allow regular users to grant badges' do
+ it "does not allow regular users to grant badges" do
sign_in(Fabricate(:user))
- post "/user_badges.json", params: {
- badge_id: badge.id, username: user.username
- }
+ post "/user_badges.json", params: { badge_id: badge.id, username: user.username }
expect(response.status).to eq(403)
end
- it 'grants badges from staff' do
+ it "grants badges from staff" do
post_1 = create_post
sign_in(admin)
- post "/user_badges.json", params: {
- badge_id: badge.id,
- username: user.username,
- reason: Discourse.base_url + post_1.url
- }
+ post "/user_badges.json",
+ params: {
+ badge_id: badge.id,
+ username: user.username,
+ reason: Discourse.base_url + post_1.url,
+ }
expect(response.status).to eq(200)
@@ -202,122 +207,139 @@ RSpec.describe UserBadgesController do
expect(UserHistory.where(acting_user: admin, target_user: user).count).to eq(1)
end
- it 'does not grant badges from regular api calls' do
+ it "does not grant badges from regular api calls" do
api_key = Fabricate(:api_key, user: user)
- post "/user_badges.json", params: {
- badge_id: badge.id, username: user.username, api_key: api_key.key
- }
+ post "/user_badges.json",
+ params: {
+ badge_id: badge.id,
+ username: user.username,
+ api_key: api_key.key,
+ }
expect(response.status).to eq(403)
end
- it 'grants badges from master api calls' do
+ it "grants badges from master api calls" do
api_key = Fabricate(:api_key)
post "/user_badges.json",
- params: {
- badge_id: badge.id, username: user.username
- },
- headers: {
- HTTP_API_KEY: api_key.key, HTTP_API_USERNAME: "system"
- }
+ params: {
+ badge_id: badge.id,
+ username: user.username,
+ },
+ headers: {
+ HTTP_API_KEY: api_key.key,
+ HTTP_API_USERNAME: "system",
+ }
expect(response.status).to eq(200)
user_badge = UserBadge.find_by(user: user, badge: badge)
expect(user_badge).to be_present
expect(user_badge.granted_by).to eq(Discourse.system_user)
- expect(UserHistory.where(acting_user: Discourse.system_user, target_user: user).count).to eq(0)
+ expect(UserHistory.where(acting_user: Discourse.system_user, target_user: user).count).to eq(
+ 0,
+ )
end
- it 'will trigger :user_badge_granted' do
+ it "will trigger :user_badge_granted" do
sign_in(Fabricate(:admin))
- events = DiscourseEvent.track_events do
- post "/user_badges.json", params: {
- badge_id: badge.id, username: user.username
- }
- end.map { |event| event[:event_name] }
+ events =
+ DiscourseEvent
+ .track_events do
+ post "/user_badges.json", params: { badge_id: badge.id, username: user.username }
+ end
+ .map { |event| event[:event_name] }
expect(events).to include(:user_badge_granted)
end
- it 'does not grant badge when external link is used in reason' do
+ it "does not grant badge when external link is used in reason" do
post = create_post
sign_in(admin)
- post "/user_badges.json", params: {
- badge_id: badge.id,
- username: user.username,
- reason: "http://example.com/" + post.url
- }
+ post "/user_badges.json",
+ params: {
+ badge_id: badge.id,
+ username: user.username,
+ reason: "http://example.com/" + post.url,
+ }
expect(response.status).to eq(400)
end
- it 'does not grant badge if invalid discourse post/topic link is used in reason' do
+ it "does not grant badge if invalid discourse post/topic link is used in reason" do
post = create_post
sign_in(admin)
- post "/user_badges.json", params: {
- badge_id: badge.id,
- username: user.username,
- reason: Discourse.base_url + "/random_url/" + post.url
- }
+ post "/user_badges.json",
+ params: {
+ badge_id: badge.id,
+ username: user.username,
+ reason: Discourse.base_url + "/random_url/" + post.url,
+ }
expect(response.status).to eq(400)
end
- it 'grants badge when valid post/topic link is given in reason' do
+ it "grants badge when valid post/topic link is given in reason" do
post = create_post
sign_in(admin)
- post "/user_badges.json", params: {
- badge_id: badge.id,
- username: user.username,
- reason: Discourse.base_url + post.url
- }
+ post "/user_badges.json",
+ params: {
+ badge_id: badge.id,
+ username: user.username,
+ reason: Discourse.base_url + post.url,
+ }
expect(response.status).to eq(200)
end
- describe 'with relative_url_root' do
- it 'grants badge when valid post/topic link is given in reason' do
+ describe "with relative_url_root" do
+ it "grants badge when valid post/topic link is given in reason" do
set_subfolder "/discuss"
post = create_post
sign_in(admin)
- post "/user_badges.json", params: {
- badge_id: badge.id,
- username: user.username,
- reason: "#{Discourse.base_url}#{post.url}"
- }
+ post "/user_badges.json",
+ params: {
+ badge_id: badge.id,
+ username: user.username,
+ reason: "#{Discourse.base_url}#{post.url}",
+ }
expect(response.status).to eq(200)
- expect(UserBadge.exists?(
- badge_id: badge.id,
- post_id: post.id,
- granted_by: admin.id)
- ).to eq(true)
+ expect(UserBadge.exists?(badge_id: badge.id, post_id: post.id, granted_by: admin.id)).to eq(
+ true,
+ )
end
end
end
- describe '#destroy' do
- let!(:user_badge) { UserBadge.create(badge: badge, user: user, granted_by: Discourse.system_user, granted_at: Time.now) }
+ describe "#destroy" do
+ let!(:user_badge) do
+ UserBadge.create(
+ badge: badge,
+ user: user,
+ granted_by: Discourse.system_user,
+ granted_at: Time.now,
+ )
+ end
- it 'checks that the user is authorized to revoke a badge' do
+ it "checks that the user is authorized to revoke a badge" do
delete "/user_badges/#{user_badge.id}.json"
expect(response.status).to eq(403)
end
- it 'revokes the badge' do
+ it "revokes the badge" do
sign_in(admin)
delete "/user_badges/#{user_badge.id}.json"
@@ -326,19 +348,27 @@ RSpec.describe UserBadgesController do
expect(UserHistory.where(acting_user: admin, target_user: user).count).to eq(1)
end
- it 'will trigger :user_badge_removed' do
+ it "will trigger :user_badge_removed" do
sign_in(Fabricate(:admin))
- events = DiscourseEvent.track_events do
- delete "/user_badges/#{user_badge.id}.json"
- end.map { |event| event[:event_name] }
+ events =
+ DiscourseEvent
+ .track_events { delete "/user_badges/#{user_badge.id}.json" }
+ .map { |event| event[:event_name] }
expect(events).to include(:user_badge_removed)
end
end
describe "#favorite" do
- let!(:user_badge) { UserBadge.create(badge: badge, user: user, granted_by: Discourse.system_user, granted_at: Time.now) }
+ let!(:user_badge) do
+ UserBadge.create(
+ badge: badge,
+ user: user,
+ granted_by: Discourse.system_user,
+ granted_at: Time.now,
+ )
+ end
it "checks that the user is authorized to favorite the badge" do
sign_in(Fabricate(:admin))
@@ -348,8 +378,20 @@ RSpec.describe UserBadgesController do
it "checks that the user has less than max_favorites_badges favorited badges" do
sign_in(user)
- UserBadge.create(badge: Fabricate(:badge), user: user, granted_by: Discourse.system_user, granted_at: Time.now, is_favorite: true)
- UserBadge.create(badge: Fabricate(:badge), user: user, granted_by: Discourse.system_user, granted_at: Time.now, is_favorite: true)
+ UserBadge.create(
+ badge: Fabricate(:badge),
+ user: user,
+ granted_by: Discourse.system_user,
+ granted_at: Time.now,
+ is_favorite: true,
+ )
+ UserBadge.create(
+ badge: Fabricate(:badge),
+ user: user,
+ granted_by: Discourse.system_user,
+ granted_at: Time.now,
+ is_favorite: true,
+ )
put "/user_badges/#{user_badge.id}/toggle_favorite.json"
expect(response.status).to eq(400)
@@ -385,10 +427,32 @@ RSpec.describe UserBadgesController do
sign_in(user)
badge = Fabricate(:badge, multiple_grant: true)
- user_badge = UserBadge.create(badge: badge, user: user, granted_by: Discourse.system_user, granted_at: Time.now, seq: 0, is_favorite: true)
- user_badge2 = UserBadge.create(badge: badge, user: user, granted_by: Discourse.system_user, granted_at: Time.now, seq: 1, is_favorite: true)
+ user_badge =
+ UserBadge.create(
+ badge: badge,
+ user: user,
+ granted_by: Discourse.system_user,
+ granted_at: Time.now,
+ seq: 0,
+ is_favorite: true,
+ )
+ user_badge2 =
+ UserBadge.create(
+ badge: badge,
+ user: user,
+ granted_by: Discourse.system_user,
+ granted_at: Time.now,
+ seq: 1,
+ is_favorite: true,
+ )
other_badge = Fabricate(:badge)
- other_user_badge = UserBadge.create(badge: other_badge, user: user, granted_by: Discourse.system_user, granted_at: Time.now)
+ other_user_badge =
+ UserBadge.create(
+ badge: other_badge,
+ user: user,
+ granted_by: Discourse.system_user,
+ granted_at: Time.now,
+ )
put "/user_badges/#{user_badge.id}/toggle_favorite.json"
expect(response.status).to eq(204)
diff --git a/spec/requests/user_status_controller_spec.rb b/spec/requests/user_status_controller_spec.rb
index bac9878f810..3d77fd93a26 100644
--- a/spec/requests/user_status_controller_spec.rb
+++ b/spec/requests/user_status_controller_spec.rb
@@ -1,8 +1,8 @@
# frozen_string_literal: true
RSpec.describe UserStatusController do
- describe '#get' do
- it 'requires user to be logged in' do
+ describe "#get" do
+ it "requires user to be logged in" do
get "/user-status.json"
expect(response.status).to eq(403)
end
@@ -17,7 +17,7 @@ RSpec.describe UserStatusController do
expect(response.status).to eq(404)
end
- describe 'when feature is enabled and a user is logged in' do
+ describe "when feature is enabled and a user is logged in" do
fab!(:user) { Fabricate(:user) }
before do
@@ -41,8 +41,8 @@ RSpec.describe UserStatusController do
end
end
- describe '#set' do
- it 'requires user to be logged in' do
+ describe "#set" do
+ it "requires user to be logged in" do
put "/user-status.json", params: { description: "off to dentist" }
expect(response.status).to eq(403)
end
@@ -57,7 +57,7 @@ RSpec.describe UserStatusController do
expect(response.status).to eq(404)
end
- describe 'feature is enabled and user is logged in' do
+ describe "feature is enabled and user is logged in" do
fab!(:user) { Fabricate(:user) }
before do
@@ -65,12 +65,12 @@ RSpec.describe UserStatusController do
SiteSetting.enable_user_status = true
end
- it 'the description parameter is mandatory' do
+ it "the description parameter is mandatory" do
put "/user-status.json", params: { emoji: "tooth" }
expect(response.status).to eq(400)
end
- it 'the emoji parameter is mandatory' do
+ it "the emoji parameter is mandatory" do
put "/user-status.json", params: { description: "off to dentist" }
expect(response.status).to eq(400)
end
@@ -80,11 +80,12 @@ RSpec.describe UserStatusController do
status_emoji = "tooth"
ends_at = DateTime.parse("2100-01-01 18:00")
- put "/user-status.json", params: {
- description: status,
- emoji: status_emoji,
- ends_at: ends_at
- }
+ put "/user-status.json",
+ params: {
+ description: status,
+ emoji: status_emoji,
+ ends_at: ends_at,
+ }
expect(response.status).to eq(200)
expect(user.user_status.description).to eq(status)
@@ -96,11 +97,12 @@ RSpec.describe UserStatusController do
status = "off to dentist"
status_emoji = "tooth"
ends_at = DateTime.parse("2100-01-01 18:00")
- put "/user-status.json", params: {
- description: status,
- emoji: status_emoji,
- ends_at: ends_at
- }
+ put "/user-status.json",
+ params: {
+ description: status,
+ emoji: status_emoji,
+ ends_at: ends_at,
+ }
expect(response.status).to eq(200)
user.reload
@@ -111,11 +113,12 @@ RSpec.describe UserStatusController do
new_status = "surfing"
new_status_emoji = "surfing_man"
new_ends_at = DateTime.parse("2100-01-01 18:59")
- put "/user-status.json", params: {
- description: new_status,
- emoji: new_status_emoji,
- ends_at: new_ends_at
- }
+ put "/user-status.json",
+ params: {
+ description: new_status,
+ emoji: new_status_emoji,
+ ends_at: new_ends_at,
+ }
expect(response.status).to eq(200)
user.reload
@@ -129,13 +132,10 @@ RSpec.describe UserStatusController do
emoji = "tooth"
ends_at = "2100-01-01T18:00:00Z"
- messages = MessageBus.track_publish do
- put "/user-status.json", params: {
- description: status,
- emoji: emoji,
- ends_at: ends_at
- }
- end
+ messages =
+ MessageBus.track_publish do
+ put "/user-status.json", params: { description: status, emoji: emoji, ends_at: ends_at }
+ end
expect(messages.size).to eq(1)
expect(messages[0].channel).to eq("/user-status")
@@ -148,8 +148,8 @@ RSpec.describe UserStatusController do
end
end
- describe '#clear' do
- it 'requires you to be logged in' do
+ describe "#clear" do
+ it "requires you to be logged in" do
delete "/user-status.json"
expect(response.status).to eq(403)
end
@@ -164,7 +164,7 @@ RSpec.describe UserStatusController do
expect(response.status).to eq(404)
end
- describe 'feature is enabled and user is logged in' do
+ describe "feature is enabled and user is logged in" do
fab!(:user_status) { Fabricate(:user_status, description: "off to dentist") }
fab!(:user) { Fabricate(:user, user_status: user_status) }
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 3ee6bc1fe89..011e479eea0 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-require 'rotp'
+require "rotp"
RSpec.describe UsersController do
fab!(:user) { Fabricate(:user) }
@@ -13,9 +13,7 @@ RSpec.describe UsersController do
fab!(:moderator) { Fabricate(:moderator) }
fab!(:inactive_user) { Fabricate(:inactive_user) }
- before do
- Group.refresh_automatic_groups!
- end
+ before { Group.refresh_automatic_groups! }
# Unfortunately, there are tests that depend on the user being created too
# late for fab! to work.
@@ -23,19 +21,18 @@ RSpec.describe UsersController do
describe "#full account registration flow" do
it "will correctly handle honeypot and challenge" do
-
- get '/session/hp.json'
+ get "/session/hp.json"
expect(response.status).to eq(200)
json = response.parsed_body
params = {
- email: 'jane@jane.com',
- name: 'jane',
- username: 'jane',
- password_confirmation: json['value'],
- challenge: json['challenge'].reverse,
- password: SecureRandom.hex
+ email: "jane@jane.com",
+ name: "jane",
+ username: "jane",
+ password_confirmation: json["value"],
+ challenge: json["challenge"].reverse,
+ password: SecureRandom.hex,
}
secure_session = SecureSession.new(session["secure_session_id"])
@@ -43,43 +40,43 @@ RSpec.describe UsersController do
expect(secure_session[UsersController::HONEYPOT_KEY]).to eq(json["value"])
expect(secure_session[UsersController::CHALLENGE_KEY]).to eq(json["challenge"])
- post '/u.json', params: params
+ post "/u.json", params: params
expect(response.status).to eq(200)
- jane = User.find_by(username: 'jane')
+ jane = User.find_by(username: "jane")
- expect(jane.email).to eq('jane@jane.com')
+ expect(jane.email).to eq("jane@jane.com")
expect(secure_session[UsersController::HONEYPOT_KEY]).to eq(nil)
expect(secure_session[UsersController::CHALLENGE_KEY]).to eq(nil)
end
end
- describe '#perform_account_activation' do
+ describe "#perform_account_activation" do
let(:email_token) { Fabricate(:email_token, user: user_deferred) }
- before do
- UsersController.any_instance.stubs(:honeypot_or_challenge_fails?).returns(false)
- end
+ before { UsersController.any_instance.stubs(:honeypot_or_challenge_fails?).returns(false) }
- context 'with invalid token' do
- it 'return success' do
+ context "with invalid token" do
+ it "return success" do
put "/u/activate-account/invalid-tooken"
expect(response.status).to eq(200)
expect(flash[:error]).to be_present
end
end
- context 'with valid token' do
- context 'with welcome message' do
- it 'enqueues a welcome message if the user object indicates so' do
+ context "with valid token" do
+ context "with welcome message" do
+ it "enqueues a welcome message if the user object indicates so" do
SiteSetting.send_welcome_message = true
user_deferred.update(active: false)
put "/u/activate-account/#{email_token.token}"
expect(response.status).to eq(200)
expect(Jobs::SendSystemMessage.jobs.size).to eq(1)
- expect(Jobs::SendSystemMessage.jobs.first["args"].first["message_type"]).to eq("welcome_user")
+ expect(Jobs::SendSystemMessage.jobs.first["args"].first["message_type"]).to eq(
+ "welcome_user",
+ )
end
it "doesn't enqueue the welcome message if the object returns false" do
@@ -98,42 +95,38 @@ RSpec.describe UsersController do
end
end
- context 'with response' do
- it 'correctly logs on user' do
+ context "with response" do
+ it "correctly logs on user" do
email_token
- events = DiscourseEvent.track_events do
- put "/u/activate-account/#{email_token.token}"
- end
+ events = DiscourseEvent.track_events { put "/u/activate-account/#{email_token.token}" }
expect(events.map { |event| event[:event_name] }).to contain_exactly(
- :user_confirmed_email, :user_first_logged_in, :user_logged_in
+ :user_confirmed_email,
+ :user_first_logged_in,
+ :user_logged_in,
)
expect(response.status).to eq(200)
expect(flash[:error]).to be_blank
expect(session[:current_user_id]).to be_present
- expect(CGI.unescapeHTML(response.body))
- .to_not include(I18n.t('activation.approval_required'))
+ expect(CGI.unescapeHTML(response.body)).to_not include(
+ I18n.t("activation.approval_required"),
+ )
end
end
- context 'when user is not approved' do
- before do
- SiteSetting.must_approve_users = true
- end
+ context "when user is not approved" do
+ before { SiteSetting.must_approve_users = true }
- it 'should return the right response' do
+ it "should return the right response" do
put "/u/activate-account/#{email_token.token}"
expect(response.status).to eq(200)
- expect(CGI.unescapeHTML(response.body))
- .to include(I18n.t('activation.approval_required'))
+ expect(CGI.unescapeHTML(response.body)).to include(I18n.t("activation.approval_required"))
- expect(response.body).to_not have_tag(:script, with: {
- src: '/assets/application.js'
- })
+ expect(response.body).to_not have_tag(:script, with: { src: "/assets/application.js" })
expect(flash[:error]).to be_blank
expect(session[:current_user_id]).to be_blank
@@ -141,9 +134,9 @@ RSpec.describe UsersController do
end
end
- context 'when cookies contains a destination URL' do
- it 'should redirect to the URL' do
- destination_url = 'http://thisisasite.com/somepath'
+ context "when cookies contains a destination URL" do
+ it "should redirect to the URL" do
+ destination_url = "http://thisisasite.com/somepath"
cookies[:destination_url] = destination_url
put "/u/activate-account/#{email_token.token}"
@@ -152,7 +145,7 @@ RSpec.describe UsersController do
end
end
- context 'when cookies does not contain a destination URL but users was invited to topic' do
+ context "when cookies does not contain a destination URL but users was invited to topic" do
let(:invite) { Fabricate(:invite) }
let(:topic) { Fabricate(:topic) }
@@ -162,7 +155,7 @@ RSpec.describe UsersController do
invite.reload
end
- it 'should redirect to the topic' do
+ it "should redirect to the topic" do
put "/u/activate-account/#{email_token.token}"
expect(response).to redirect_to(topic.relative_url)
@@ -170,7 +163,7 @@ RSpec.describe UsersController do
end
end
- describe '#password_reset' do
+ describe "#password_reset" do
let(:token) { SecureRandom.hex }
context "when login is required" do
@@ -178,22 +171,23 @@ RSpec.describe UsersController do
SiteSetting.login_required = true
get "/u/password-reset/#{token}"
expect(response.status).to eq(200)
- expect(CGI.unescapeHTML(response.body)).to include(I18n.t('password_reset.no_token', base_url: Discourse.base_url))
+ expect(CGI.unescapeHTML(response.body)).to include(
+ I18n.t("password_reset.no_token", base_url: Discourse.base_url),
+ )
end
end
- context 'with missing token' do
- it 'disallows login' do
+ context "with missing token" do
+ it "disallows login" do
get "/u/password-reset/#{token}"
expect(response.status).to eq(200)
- expect(CGI.unescapeHTML(response.body))
- .to include(I18n.t('password_reset.no_token', base_url: Discourse.base_url))
+ expect(CGI.unescapeHTML(response.body)).to include(
+ I18n.t("password_reset.no_token", base_url: Discourse.base_url),
+ )
- expect(response.body).to_not have_tag(:script, with: {
- src: '/assets/application.js'
- })
+ expect(response.body).to_not have_tag(:script, with: { src: "/assets/application.js" })
expect(session[:current_user_id]).to be_blank
end
@@ -202,23 +196,24 @@ RSpec.describe UsersController do
get "/u/password-reset/#{token}.json"
expect(response.status).to eq(200)
- expect(response.parsed_body["message"]).to eq(I18n.t('password_reset.no_token', base_url: Discourse.base_url))
+ expect(response.parsed_body["message"]).to eq(
+ I18n.t("password_reset.no_token", base_url: Discourse.base_url),
+ )
expect(session[:current_user_id]).to be_blank
end
end
- context 'with invalid token' do
- it 'disallows login' do
+ context "with invalid token" do
+ it "disallows login" do
get "/u/password-reset/ev!l_trout@!"
expect(response.status).to eq(200)
- expect(CGI.unescapeHTML(response.body))
- .to include(I18n.t('password_reset.no_token', base_url: Discourse.base_url))
+ expect(CGI.unescapeHTML(response.body)).to include(
+ I18n.t("password_reset.no_token", base_url: Discourse.base_url),
+ )
- expect(response.body).to_not have_tag(:script, with: {
- src: '/assets/application.js'
- })
+ expect(response.body).to_not have_tag(:script, with: { src: "/assets/application.js" })
expect(session[:current_user_id]).to be_blank
end
@@ -227,46 +222,55 @@ RSpec.describe UsersController do
put "/u/password-reset/evil_trout!.json", params: { password: "awesomeSecretPassword" }
expect(response.status).to eq(200)
- expect(response.parsed_body["message"]).to eq(I18n.t('password_reset.no_token', base_url: Discourse.base_url))
+ expect(response.parsed_body["message"]).to eq(
+ I18n.t("password_reset.no_token", base_url: Discourse.base_url),
+ )
expect(session[:current_user_id]).to be_blank
end
end
- context 'with valid token' do
+ context "with valid token" do
let!(:user_auth_token) { UserAuthToken.generate!(user_id: user1.id) }
- let!(:email_token) { Fabricate(:email_token, user: user1, scope: EmailToken.scopes[:password_reset]) }
+ let!(:email_token) do
+ Fabricate(:email_token, user: user1, scope: EmailToken.scopes[:password_reset])
+ end
- context 'when rendered' do
- it 'renders referrer never on get requests' do
+ context "when rendered" do
+ it "renders referrer never on get requests" do
get "/u/password-reset/#{email_token.token}"
expect(response.status).to eq(200)
expect(response.body).to include('unformatted text '
- expect(convert(xml)).to eq('unformatted text')
+ xml = "unformatted text "
+ expect(convert(xml)).to eq("unformatted text")
end
it "converts nested formatting" do
- xml = '[i] this is italic[b] and bold[/b] [/i] [i] this is italic[b] and bold[/b] [/i] [b] this is bold text[/b] [b] this is bold text[/b] [b] [b] this is bold text[/b] [/b] [b] [b] this is bold text[/b] [/b] [i] this is italic text[/i] [i] this is italic text[/i] [i] [i] this is italic text[/i] [/i] [i] [i] this is italic text[/i] [/i] [u] this is underlined text[/u] [u] this is underlined text[/u] [u] [u] this is underlined text[/u] [/u] [u] [u] this is underlined text[/u] [/u] [code] one line of code[/code] [code] one line of code[/code] foo [code] some code[/code] '
+ xml = "foo [code] some code[/code] "
expect(convert(xml)).to eq(<<~MD.chomp)
foo
@@ -315,7 +316,7 @@ RSpec.describe ImportScripts::PhpBB3::BBCode::XmlToMarkdown do
[/img]
XML
- expect(convert(xml)).to eq('')
+ expect(convert(xml)).to eq("")
end
it "converts image with link" do
@@ -326,47 +327,53 @@ RSpec.describe ImportScripts::PhpBB3::BBCode::XmlToMarkdown do
[/img] [/url]
XML
- expect(convert(xml)).to eq('[](https://example.com/)')
+ expect(convert(xml)).to eq("[](https://example.com/)")
end
end
context "with links" do
it "converts links created without BBCode" do
- xml = 'https://en.wikipedia.org/wiki/Capybara https://en.wikipedia.org/wiki/Capybara [url] https://en.wikipedia.org/wiki/Capybara[/url] [url] https://en.wikipedia.org/wiki/Capybara[/url] [url=https://en.wikipedia.org/wiki/Capybara] Capybara[/url] [url=https://en.wikipedia.org/wiki/Capybara] Capybara[/url] http://forum.example.com/viewtopic.php?f=2&t=2 http://forum.example.com/viewtopic.php?f=2&t=2 foo.bar@example.com ')
+ expect(convert(xml)).to eq("")
end
it "converts email links created with BBCode" do
- xml = '[email] foo.bar@example.com[/email] ')
+ xml =
+ '[email] foo.bar@example.com[/email] ")
end
it "converts truncated, long links" do
@@ -377,7 +384,9 @@ RSpec.describe ImportScripts::PhpBB3::BBCode::XmlToMarkdown do
[/url]
XML
- expect(convert(xml)).to eq('http://answers.yahoo.com/question/index?qid=20070920134223AAkkPli')
+ expect(convert(xml)).to eq(
+ "http://answers.yahoo.com/question/index?qid=20070920134223AAkkPli",
+ )
end
it "converts BBCodes inside link text" do
@@ -387,7 +396,7 @@ RSpec.describe ImportScripts::PhpBB3::BBCode::XmlToMarkdown do
[/url]
XML
- expect(convert(xml)).to eq('[**Hello _world_!**](http://example.com)')
+ expect(convert(xml)).to eq("[**Hello _world_!**](http://example.com)")
end
end
@@ -449,7 +458,8 @@ RSpec.describe ImportScripts::PhpBB3::BBCode::XmlToMarkdown do
end
it "converts quote with author attribute" do
- xml = '[quote="Mr. Blobby"] Lorem ipsum[/quote]
[quote="Mr. Blobby"] Lorem ipsum[/quote]
[quote="Mr. Blobby" user_id=48] Lorem ipsum[/quote]
[quote="Mr. Blobby" user_id=48] Lorem ipsum[/quote]
[quote="Mr. Blobby" user_id=48] Lorem ipsum[/quote]
[quote="Mr. Blobby" user_id=48] Lorem ipsum[/quote]
[quote=user_id=48] Lorem ipsum[/quote]
[quote=user_id=48] Lorem ipsum[/quote]
:D :eek: :D :eek: foo [b] bold[/b] [i] italic[/i] [u] underlined[/u] "
+ xml =
+ "foo [b] bold[/b] [i] italic[/i] [u] underlined[/u] "
expect(convert(xml)).to eq("foo **bold** _italic_ [u]underlined[/u] bar")
end
end
context "with unknown element" do
it "converts an unknown element right below the root element" do
- xml = '[unknown] foo[/unknown] [unknown] foo[/unknown] [b] [unknown] bar[/unknown] [/b] [b] [unknown] bar[/unknown] [/b] this was bold and green: this was bold and green:
-this starts with spaces but IS NOT a quote'''
+ it "parses invalid html, removes font tags and leading spaces" do
+ complex_html =
+ "" \
+ "this was bold and green: this was bold and green:
+this starts with spaces but IS NOT a quote" \
+ ""
end
- it 'replaces pre tags with code backticks' do
+ it "replaces pre tags with code backticks" do
complex_html = 'foobar '
- parsed = VanillaBodyParser.new({ 'Format' => 'Html', 'Body' => complex_html }, user_id).parse
+ parsed = VanillaBodyParser.new({ "Format" => "Html", "Body" => complex_html }, user_id).parse
expect(parsed).to eq "\n```\nfoobar\n```\n"
end
- it 'strips code tags' do
- complex_html = 'foobar'
- parsed = VanillaBodyParser.new({ 'Format' => 'Html', 'Body' => complex_html }, user_id).parse
+ it "strips code tags" do
+ complex_html = "foobar"
+ parsed = VanillaBodyParser.new({ "Format" => "Html", "Body" => complex_html }, user_id).parse
expect(parsed).to eq "foobar"
end
- it 'replaces div with quote class to bbcode quotes' do
+ it "replaces div with quote class to bbcode quotes" do
complex_html = 'foobar
'
- parsed = VanillaBodyParser.new({ 'Format' => 'Html', 'Body' => complex_html }, user_id).parse
+ parsed = VanillaBodyParser.new({ "Format" => "Html", "Body" => complex_html }, user_id).parse
expect(parsed).to eq "\n\n[quote]\n\nfoobar\n\n[/quote]\n\n"
end
- describe 'rich format' do
- let(:rich_bodies) { JSON.parse(File.read('spec/fixtures/json/vanilla-rich-posts.json')).deep_symbolize_keys }
+ describe "rich format" do
+ let(:rich_bodies) do
+ JSON.parse(File.read("spec/fixtures/json/vanilla-rich-posts.json")).deep_symbolize_keys
+ end
- it 'extracts text-only bodies' do
- parsed = VanillaBodyParser.new({ 'Format' => 'Rich', 'Body' => rich_bodies[:text].to_json }, user_id).parse
+ it "extracts text-only bodies" do
+ parsed =
+ VanillaBodyParser.new(
+ { "Format" => "Rich", "Body" => rich_bodies[:text].to_json },
+ user_id,
+ ).parse
expect(parsed).to eq "This is a message.\n\nAnd a second line."
end
- it 'supports mentions of non-imported users' do
- parsed = VanillaBodyParser.new({ 'Format' => 'Rich', 'Body' => rich_bodies[:mention].to_json }, user_id).parse
+ it "supports mentions of non-imported users" do
+ parsed =
+ VanillaBodyParser.new(
+ { "Format" => "Rich", "Body" => rich_bodies[:mention].to_json },
+ user_id,
+ ).parse
expect(parsed).to eq "@Gandalf The Grey, what do you think?"
end
- it 'supports mentions imported users' do
- mentioned = Fabricate(:user, email: 'gandalf@maiar.com', name: 'Gandalf The Grey', username: 'gandalf_the_grey')
+ it "supports mentions imported users" do
+ mentioned =
+ Fabricate(
+ :user,
+ email: "gandalf@maiar.com",
+ name: "Gandalf The Grey",
+ username: "gandalf_the_grey",
+ )
lookup.add_user(mentioned.id.to_s, mentioned)
body = rich_bodies[:mention].to_json.gsub("666", mentioned.id.to_s)
- parsed = VanillaBodyParser.new({ 'Format' => 'Rich', 'Body' => body }, user_id).parse
+ parsed = VanillaBodyParser.new({ "Format" => "Rich", "Body" => body }, user_id).parse
expect(parsed).to eq "@gandalf_the_grey, what do you think?"
end
- it 'supports links' do
- parsed = VanillaBodyParser.new({ 'Format' => 'Rich', 'Body' => rich_bodies[:links].to_json }, user_id).parse
- expect(parsed).to eq "We can link to the Discourse home page and it works."
+ it "supports links" do
+ parsed =
+ VanillaBodyParser.new(
+ { "Format" => "Rich", "Body" => rich_bodies[:links].to_json },
+ user_id,
+ ).parse
+ expect(
+ parsed,
+ ).to eq "We can link to the Discourse home page and it works."
end
- it 'supports quotes without topic info when it cannot be found' do
- parsed = VanillaBodyParser.new({ 'Format' => 'Rich', 'Body' => rich_bodies[:quote].to_json }, user_id).parse
- expect(parsed).to eq "[quote]\n\nThis is the fulloriginal_name_of_file.pdf "
+ it "keeps uploaded files as links" do
+ parsed =
+ VanillaBodyParser.new(
+ { "Format" => "Rich", "Body" => rich_bodies[:upload_file].to_json },
+ user_id,
+ ).parse
+ expect(
+ parsed,
+ ).to eq "This is a PDF I've uploaded:\n\noriginal_name_of_file.pdf "
end
- it 'supports complex formatting' do
- parsed = VanillaBodyParser.new({ 'Format' => 'Rich', 'Body' => rich_bodies[:complex_formatting].to_json }, user_id).parse
- expect(parsed).to eq "Name : Jon Snow\n\n* not their real name \n\nfirst item \n\nsecond \n\nthird and last \n\n \n\nThat's all folks!"
+ it "supports complex formatting" do
+ parsed =
+ VanillaBodyParser.new(
+ { "Format" => "Rich", "Body" => rich_bodies[:complex_formatting].to_json },
+ user_id,
+ ).parse
+ expect(
+ parsed,
+ ).to eq "Name : Jon Snow\n\n* not their real name \n\nfirst item \n\nsecond \n\nthird and last \n\n \n\nThat's all folks!"
end
- it 'support code blocks' do
- parsed = VanillaBodyParser.new({ 'Format' => 'Rich', 'Body' => rich_bodies[:code_block].to_json }, user_id).parse
- expect(parsed).to eq "Here's a monospaced block:\n\n```\nthis line should be monospaced\nthis one too, with extra spaces#{' ' * 4}\n```\n\nbut not this one"
+ it "support code blocks" do
+ parsed =
+ VanillaBodyParser.new(
+ { "Format" => "Rich", "Body" => rich_bodies[:code_block].to_json },
+ user_id,
+ ).parse
+ expect(
+ parsed,
+ ).to eq "Here's a monospaced block:\n\n```\nthis line should be monospaced\nthis one too, with extra spaces#{" " * 4}\n```\n\nbut not this one"
end
end
end
diff --git a/spec/serializers/admin_plugin_serializer_spec.rb b/spec/serializers/admin_plugin_serializer_spec.rb
index 595f7e22c37..0ca42794713 100644
--- a/spec/serializers/admin_plugin_serializer_spec.rb
+++ b/spec/serializers/admin_plugin_serializer_spec.rb
@@ -5,10 +5,10 @@ RSpec.describe AdminPluginSerializer do
subject { described_class.new(instance) }
- describe 'enabled_setting' do
- it 'should return the right value' do
- instance.enabled_site_setting('test')
- expect(subject.enabled_setting).to eq('test')
+ describe "enabled_setting" do
+ it "should return the right value" do
+ instance.enabled_site_setting("test")
+ expect(subject.enabled_setting).to eq("test")
end
end
end
diff --git a/spec/serializers/admin_user_list_serializer_spec.rb b/spec/serializers/admin_user_list_serializer_spec.rb
index 955e726719e..9db13399e37 100644
--- a/spec/serializers/admin_user_list_serializer_spec.rb
+++ b/spec/serializers/admin_user_list_serializer_spec.rb
@@ -5,14 +5,10 @@ RSpec.describe AdminUserListSerializer do
fab!(:admin) { Fabricate(:admin) }
let(:guardian) { Guardian.new(admin) }
- let(:serializer) do
- AdminUserListSerializer.new(user, scope: guardian, root: false)
- end
+ let(:serializer) { AdminUserListSerializer.new(user, scope: guardian, root: false) }
context "when totp enabled" do
- before do
- Fabricate(:user_second_factor_totp, user: user)
- end
+ before { Fabricate(:user_second_factor_totp, user: user) }
it "returns the right values" do
json = serializer.as_json
@@ -21,9 +17,7 @@ RSpec.describe AdminUserListSerializer do
end
context "when security keys enabled" do
- before do
- Fabricate(:user_security_key, user: user)
- end
+ before { Fabricate(:user_security_key, user: user) }
it "returns the right values" do
json = serializer.as_json
@@ -41,7 +35,7 @@ RSpec.describe AdminUserListSerializer do
user,
scope: Guardian.new(viewed_by),
root: false,
- emails_desired: opts && opts[:emails_desired]
+ emails_desired: opts && opts[:emails_desired],
).as_json
end
diff --git a/spec/serializers/basic_group_serializer_spec.rb b/spec/serializers/basic_group_serializer_spec.rb
index 1d3d98dfdce..7758fda3ce7 100644
--- a/spec/serializers/basic_group_serializer_spec.rb
+++ b/spec/serializers/basic_group_serializer_spec.rb
@@ -5,97 +5,91 @@ RSpec.describe BasicGroupSerializer do
fab!(:group) { Fabricate(:group) }
subject { described_class.new(group, scope: guardian, root: false) }
- describe '#display_name' do
- describe 'automatic group' do
+ describe "#display_name" do
+ describe "automatic group" do
let(:group) { Group.find(1) }
- it 'should include the display name' do
- expect(subject.display_name).to eq(I18n.t('groups.default_names.admins'))
+ it "should include the display name" do
+ expect(subject.display_name).to eq(I18n.t("groups.default_names.admins"))
end
end
- describe 'normal group' do
+ describe "normal group" do
fab!(:group) { Fabricate(:group) }
- it 'should not include the display name' do
+ it "should not include the display name" do
expect(subject.display_name).to eq(nil)
end
end
end
- describe '#bio_raw' do
- fab!(:group) { Fabricate(:group, bio_raw: 'testing :slightly_smiling_face:') }
+ describe "#bio_raw" do
+ fab!(:group) { Fabricate(:group, bio_raw: "testing :slightly_smiling_face:") }
subject do
described_class.new(group, scope: guardian, root: false, owner_group_ids: [group.id])
end
- describe 'group owner' do
- it 'should include bio_raw' do
- expect(subject.as_json[:bio_raw]).to eq('testing :slightly_smiling_face:')
- expect(subject.as_json[:bio_excerpt]).to start_with('testing " }
+ payload: {
+ raw: "new post 123",
+ title: "unsafe title ",
+ },
)
end
diff --git a/spec/serializers/basic_reviewable_user_serializer_spec.rb b/spec/serializers/basic_reviewable_user_serializer_spec.rb
index dcd5456fbe9..abf8f6f9106 100644
--- a/spec/serializers/basic_reviewable_user_serializer_spec.rb
+++ b/spec/serializers/basic_reviewable_user_serializer_spec.rb
@@ -12,8 +12,8 @@ describe BasicReviewableUserSerializer do
name: user.name,
email: user.email,
bio: "blah whatever",
- website: "ff.website.com"
- }
+ website: "ff.website.com",
+ },
)
end
diff --git a/spec/serializers/basic_user_serializer_spec.rb b/spec/serializers/basic_user_serializer_spec.rb
index 1328dac1adf..5c76ebe458f 100644
--- a/spec/serializers/basic_user_serializer_spec.rb
+++ b/spec/serializers/basic_user_serializer_spec.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
RSpec.describe BasicUserSerializer do
- describe '#as_json' do
+ describe "#as_json" do
let(:user) { Fabricate.build(:user) }
let(:serializer) { BasicUserSerializer.new(user, scope: Guardian.new(user), root: false) }
let(:json) { serializer.as_json }
@@ -12,9 +12,11 @@ RSpec.describe BasicUserSerializer do
expect(json[:avatar_template]).to eq(user.avatar_template)
end
- describe 'extended serializers' do
+ describe "extended serializers" do
let(:post_action) { Fabricate(:post_action, user: user) }
- let(:serializer) { PostActionUserSerializer.new(post_action, scope: Guardian.new(user), root: false) }
+ let(:serializer) do
+ PostActionUserSerializer.new(post_action, scope: Guardian.new(user), root: false)
+ end
it "returns the user correctly" do
expect(serializer.user.username).to eq(user.username)
end
diff --git a/spec/serializers/category_detailed_serializer_spec.rb b/spec/serializers/category_detailed_serializer_spec.rb
index b1033def1ba..5251b6e4bfc 100644
--- a/spec/serializers/category_detailed_serializer_spec.rb
+++ b/spec/serializers/category_detailed_serializer_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
RSpec.describe CategoryDetailedSerializer do
-
describe "counts" do
it "works for categories with no subcategories" do
no_subcats = Fabricate(:category, topics_year: 10, topics_month: 5, topics_day: 2)
@@ -13,12 +12,18 @@ RSpec.describe CategoryDetailedSerializer do
it "includes counts from subcategories" do
parent = Fabricate(:category, topics_year: 10, topics_month: 5, topics_day: 2)
- subcategory = Fabricate(:category, parent_category_id: parent.id, topics_year: 1, topics_month: 1, topics_day: 1)
+ subcategory =
+ Fabricate(
+ :category,
+ parent_category_id: parent.id,
+ topics_year: 1,
+ topics_month: 1,
+ topics_day: 1,
+ )
json = CategoryDetailedSerializer.new(parent, scope: Guardian.new, root: false).as_json
expect(json[:topics_year]).to eq(11)
expect(json[:topics_month]).to eq(6)
expect(json[:topics_day]).to eq(3)
end
end
-
end
diff --git a/spec/serializers/category_serializer_spec.rb b/spec/serializers/category_serializer_spec.rb
index a3be76c4a80..c77fa9a9238 100644
--- a/spec/serializers/category_serializer_spec.rb
+++ b/spec/serializers/category_serializer_spec.rb
@@ -36,23 +36,29 @@ RSpec.describe CategorySerializer do
describe "user notification level" do
it "includes the user's notification level" do
- CategoryUser.set_notification_level_for_category(user, NotificationLevels.all[:watching], category.id)
+ CategoryUser.set_notification_level_for_category(
+ user,
+ NotificationLevels.all[:watching],
+ category.id,
+ )
json = described_class.new(category, scope: Guardian.new(user), root: false).as_json
expect(json[:notification_level]).to eq(NotificationLevels.all[:watching])
end
end
- describe '#group_permissions' do
- fab!(:private_group) { Fabricate(:group, visibility_level: Group.visibility_levels[:staff], name: 'bbb') }
+ describe "#group_permissions" do
+ fab!(:private_group) do
+ Fabricate(:group, visibility_level: Group.visibility_levels[:staff], name: "bbb")
+ end
fab!(:user_group) do
- Fabricate(:group, visibility_level: Group.visibility_levels[:members], name: 'ccc').tap do |g|
+ Fabricate(:group, visibility_level: Group.visibility_levels[:members], name: "ccc").tap do |g|
g.add(user)
end
end
before do
- group.update!(name: 'aaa')
+ group.update!(name: "aaa")
category.set_permissions(
:everyone => :readonly,
@@ -82,12 +88,17 @@ RSpec.describe CategorySerializer do
json = described_class.new(category, scope: Guardian.new(user), root: false).as_json
- expect(json[:group_permissions]).to eq([
- { permission_type: CategoryGroup.permission_types[:readonly], group_name: group.name },
- { permission_type: CategoryGroup.permission_types[:full], group_name: private_group.name },
- { permission_type: CategoryGroup.permission_types[:full], group_name: user_group.name },
- { permission_type: CategoryGroup.permission_types[:readonly], group_name: 'everyone' },
- ])
+ expect(json[:group_permissions]).to eq(
+ [
+ { permission_type: CategoryGroup.permission_types[:readonly], group_name: group.name },
+ {
+ permission_type: CategoryGroup.permission_types[:full],
+ group_name: private_group.name,
+ },
+ { permission_type: CategoryGroup.permission_types[:full], group_name: user_group.name },
+ { permission_type: CategoryGroup.permission_types[:readonly], group_name: "everyone" },
+ ],
+ )
end
end
@@ -99,7 +110,7 @@ RSpec.describe CategorySerializer do
it "included for an admin" do
json = described_class.new(category, scope: Guardian.new(admin), root: false).as_json
- expect(json[:available_groups]).to eq(Group.order(:name).pluck(:name) - ['everyone'])
+ expect(json[:available_groups]).to eq(Group.order(:name).pluck(:name) - ["everyone"])
end
end
end
diff --git a/spec/serializers/category_upload_serializer_spec.rb b/spec/serializers/category_upload_serializer_spec.rb
index 36a53fa366a..c46b2ad501c 100644
--- a/spec/serializers/category_upload_serializer_spec.rb
+++ b/spec/serializers/category_upload_serializer_spec.rb
@@ -1,13 +1,11 @@
# frozen_string_literal: true
RSpec.describe CategoryUploadSerializer do
-
fab!(:upload) { Fabricate(:upload) }
let(:subject) { described_class.new(upload, root: false) }
- it 'should include width and height' do
+ it "should include width and height" do
expect(subject.width).to eq(upload.width)
expect(subject.height).to eq(upload.height)
end
-
end
diff --git a/spec/serializers/current_user_serializer_spec.rb b/spec/serializers/current_user_serializer_spec.rb
index 9e2308739c7..bb66e5783b7 100644
--- a/spec/serializers/current_user_serializer_spec.rb
+++ b/spec/serializers/current_user_serializer_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe CurrentUserSerializer do
context "when SSO is enabled" do
let :user do
user = Fabricate(:user)
- SingleSignOnRecord.create!(user_id: user.id, external_id: '12345', last_payload: '')
+ SingleSignOnRecord.create!(user_id: user.id, external_id: "12345", last_payload: "")
user
end
@@ -41,17 +41,23 @@ RSpec.describe CurrentUserSerializer do
it "should include correct id in top_category_ids array" do
_category = Category.first
- CategoryUser.create!(user_id: user.id,
- category_id: category1.id,
- notification_level: CategoryUser.notification_levels[:tracking])
+ CategoryUser.create!(
+ user_id: user.id,
+ category_id: category1.id,
+ notification_level: CategoryUser.notification_levels[:tracking],
+ )
- CategoryUser.create!(user_id: user.id,
- category_id: category2.id,
- notification_level: CategoryUser.notification_levels[:watching])
+ CategoryUser.create!(
+ user_id: user.id,
+ category_id: category2.id,
+ notification_level: CategoryUser.notification_levels[:watching],
+ )
- CategoryUser.create!(user_id: user.id,
- category_id: category3.id,
- notification_level: CategoryUser.notification_levels[:regular])
+ CategoryUser.create!(
+ user_id: user.id,
+ category_id: category3.id,
+ notification_level: CategoryUser.notification_levels[:regular],
+ )
payload = serializer.as_json
expect(payload[:top_category_ids]).to eq([category2.id, category1.id])
@@ -65,11 +71,11 @@ RSpec.describe CurrentUserSerializer do
TagUser.create!(
user_id: user.id,
notification_level: TagUser.notification_levels[:muted],
- tag_id: tag.id
+ tag_id: tag.id,
)
end
- it 'includes muted tag names' do
+ it "includes muted tag names" do
payload = serializer.as_json
expect(payload[:muted_tags]).to eq([tag.name])
end
@@ -84,9 +90,7 @@ RSpec.describe CurrentUserSerializer do
end
context "when totp enabled" do
- before do
- User.any_instance.stubs(:totp_enabled?).returns(true)
- end
+ before { User.any_instance.stubs(:totp_enabled?).returns(true) }
it "is true" do
expect(json[:second_factor_enabled]).to eq(true)
@@ -94,9 +98,7 @@ RSpec.describe CurrentUserSerializer do
end
context "when security_keys enabled" do
- before do
- User.any_instance.stubs(:security_keys_enabled?).returns(true)
- end
+ before { User.any_instance.stubs(:security_keys_enabled?).returns(true) }
it "is true" do
expect(json[:second_factor_enabled]).to eq(true)
@@ -108,7 +110,12 @@ RSpec.describe CurrentUserSerializer do
it "should only show visible groups" do
Fabricate.build(:group, visibility_level: Group.visibility_levels[:public])
hidden_group = Fabricate.build(:group, visibility_level: Group.visibility_levels[:owners])
- public_group = Fabricate.build(:group, visibility_level: Group.visibility_levels[:public], name: "UppercaseGroupName")
+ public_group =
+ Fabricate.build(
+ :group,
+ visibility_level: Group.visibility_levels[:public],
+ name: "UppercaseGroupName",
+ )
hidden_group.add(user)
hidden_group.save!
public_group.add(user)
@@ -116,7 +123,7 @@ RSpec.describe CurrentUserSerializer do
payload = serializer.as_json
expect(payload[:groups]).to contain_exactly(
- { id: public_group.id, name: public_group.name, has_messages: false }
+ { id: public_group.id, name: public_group.name, has_messages: false },
)
end
end
@@ -141,7 +148,6 @@ RSpec.describe CurrentUserSerializer do
payload = serializer.as_json
expect(payload).not_to have_key(:has_topic_draft)
end
-
end
describe "#can_review" do
@@ -222,21 +228,30 @@ RSpec.describe CurrentUserSerializer do
describe "#likes_notifications_disabled" do
it "is true if the user disables likes notifications" do
- user.user_option.update!(like_notification_frequency: UserOption.like_notification_frequency_type[:never])
+ user.user_option.update!(
+ like_notification_frequency: UserOption.like_notification_frequency_type[:never],
+ )
expect(serializer.as_json[:user_option][:likes_notifications_disabled]).to eq(true)
end
it "is false if the user doesn't disable likes notifications" do
- user.user_option.update!(like_notification_frequency: UserOption.like_notification_frequency_type[:always])
+ user.user_option.update!(
+ like_notification_frequency: UserOption.like_notification_frequency_type[:always],
+ )
expect(serializer.as_json[:user_option][:likes_notifications_disabled]).to eq(false)
- user.user_option.update!(like_notification_frequency: UserOption.like_notification_frequency_type[:first_time_and_daily])
+ user.user_option.update!(
+ like_notification_frequency:
+ UserOption.like_notification_frequency_type[:first_time_and_daily],
+ )
expect(serializer.as_json[:user_option][:likes_notifications_disabled]).to eq(false)
- user.user_option.update!(like_notification_frequency: UserOption.like_notification_frequency_type[:first_time])
+ user.user_option.update!(
+ like_notification_frequency: UserOption.like_notification_frequency_type[:first_time],
+ )
expect(serializer.as_json[:user_option][:likes_notifications_disabled]).to eq(false)
end
end
- describe '#redesigned_user_page_nav_enabled' do
+ describe "#redesigned_user_page_nav_enabled" do
fab!(:group) { Fabricate(:group) }
fab!(:group2) { Fabricate(:group) }
@@ -244,13 +259,13 @@ RSpec.describe CurrentUserSerializer do
expect(serializer.as_json[:redesigned_user_page_nav_enabled]).to eq(false)
end
- it 'is false if user does not belong to any of the configured groups in the enable_new_user_profile_nav_groups site setting' do
+ it "is false if user does not belong to any of the configured groups in the enable_new_user_profile_nav_groups site setting" do
SiteSetting.enable_new_user_profile_nav_groups = "#{group.id}|#{group2.id}"
expect(serializer.as_json[:redesigned_user_page_nav_enabled]).to eq(false)
end
- it 'is true if user belongs one of the configured groups in the enable_new_user_profile_nav_groups site setting' do
+ it "is true if user belongs one of the configured groups in the enable_new_user_profile_nav_groups site setting" do
SiteSetting.enable_new_user_profile_nav_groups = "#{group.id}|#{group2.id}"
group.add(user)
@@ -258,23 +273,37 @@ RSpec.describe CurrentUserSerializer do
end
end
- describe '#associated_account_ids' do
+ describe "#associated_account_ids" do
before do
- UserAssociatedAccount.create(user_id: user.id, provider_name: "twitter", provider_uid: "1", info: { nickname: "sam" })
+ UserAssociatedAccount.create(
+ user_id: user.id,
+ provider_name: "twitter",
+ provider_uid: "1",
+ info: {
+ nickname: "sam",
+ },
+ )
end
- it 'should not include associated account ids by default' do
+ it "should not include associated account ids by default" do
expect(serializer.as_json[:associated_account_ids]).to be_nil
end
- it 'should include associated account ids when site setting enabled' do
+ it "should include associated account ids when site setting enabled" do
SiteSetting.include_associated_account_ids = true
expect(serializer.as_json[:associated_account_ids]).to eq({ "twitter" => "1" })
end
end
describe "#new_personal_messages_notifications_count" do
- fab!(:notification) { Fabricate(:notification, user: user, read: false, notification_type: Notification.types[:private_message]) }
+ fab!(:notification) do
+ Fabricate(
+ :notification,
+ user: user,
+ read: false,
+ notification_type: Notification.types[:private_message],
+ )
+ end
it "isn't included when navigation menu is legacy" do
SiteSetting.navigation_menu = "legacy"
diff --git a/spec/serializers/detailed_user_badge_serializer_spec.rb b/spec/serializers/detailed_user_badge_serializer_spec.rb
index 6c4a713f10b..e1cbd9de51e 100644
--- a/spec/serializers/detailed_user_badge_serializer_spec.rb
+++ b/spec/serializers/detailed_user_badge_serializer_spec.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
RSpec.describe DetailedUserBadgeSerializer do
- describe '#topic_id and #topic_title attributes' do
+ describe "#topic_id and #topic_title attributes" do
fab!(:user) { Fabricate(:user) }
fab!(:admin) { Fabricate(:admin) }
fab!(:post) { Fabricate(:post) }
@@ -9,78 +9,88 @@ RSpec.describe DetailedUserBadgeSerializer do
fab!(:user_badge) { Fabricate(:user_badge, badge: badge, post_id: post.id) }
let(:guardian) { Guardian.new(user_badge.user) }
- it 'does not include attributes in serialized object when badge has not been configured to show posts' do
+ it "does not include attributes in serialized object when badge has not been configured to show posts" do
badge.update!(show_posts: false)
guardian = Guardian.new
- serialized = described_class.new(user_badge,
- scope: guardian,
- allowed_user_badge_topic_ids: guardian.can_see_topic_ids(topic_ids: [post.topic_id]),
- root: false,
- ).as_json
+ serialized =
+ described_class.new(
+ user_badge,
+ scope: guardian,
+ allowed_user_badge_topic_ids: guardian.can_see_topic_ids(topic_ids: [post.topic_id]),
+ root: false,
+ ).as_json
expect(serialized[:topic_id]).to eq(nil)
expect(serialized[:topic_title]).to eq(nil)
end
- it 'does not include attributes in serialized object when user badge is not associated with a post' do
+ it "does not include attributes in serialized object when user badge is not associated with a post" do
user_badge.update!(post_id: nil)
- serialized = described_class.new(user_badge,
- scope: guardian,
- allowed_user_badge_topic_ids: guardian.can_see_topic_ids(topic_ids: [post.topic_id]),
- root: false
- ).as_json
+ serialized =
+ described_class.new(
+ user_badge,
+ scope: guardian,
+ allowed_user_badge_topic_ids: guardian.can_see_topic_ids(topic_ids: [post.topic_id]),
+ root: false,
+ ).as_json
expect(serialized[:topic_id]).to eq(nil)
expect(serialized[:topic_title]).to eq(nil)
end
- it 'does not include attributes in serialized object when user badge is not associated with a topic' do
+ it "does not include attributes in serialized object when user badge is not associated with a topic" do
post.topic.destroy!
- serialized = described_class.new(user_badge,
- scope: guardian,
- allowed_user_badge_topic_ids: guardian.can_see_topic_ids(topic_ids: [post.topic_id]),
- root: false
- ).as_json
+ serialized =
+ described_class.new(
+ user_badge,
+ scope: guardian,
+ allowed_user_badge_topic_ids: guardian.can_see_topic_ids(topic_ids: [post.topic_id]),
+ root: false,
+ ).as_json
expect(serialized[:topic_id]).to eq(nil)
expect(serialized[:topic_title]).to eq(nil)
end
- it 'does not include attributes in serialized object when allowed_user_badge_topic_ids option is not provided' do
+ it "does not include attributes in serialized object when allowed_user_badge_topic_ids option is not provided" do
serialized = described_class.new(user_badge, scope: guardian, root: false).as_json
expect(serialized[:topic_id]).to eq(nil)
expect(serialized[:topic_title]).to eq(nil)
end
- it 'does not included attributes in serialized object when topic id is not present in allowed_user_badge_topic_ids option' do
- serialized = described_class.new(user_badge,
- scope: guardian,
- allowed_user_badge_topic_ids: guardian.can_see_topic_ids(topic_ids: [post.topic_id + 1]),
- root: false
- ).as_json
+ it "does not included attributes in serialized object when topic id is not present in allowed_user_badge_topic_ids option" do
+ serialized =
+ described_class.new(
+ user_badge,
+ scope: guardian,
+ allowed_user_badge_topic_ids: guardian.can_see_topic_ids(topic_ids: [post.topic_id + 1]),
+ root: false,
+ ).as_json
expect(serialized[:topic_id]).to eq(nil)
expect(serialized[:topic_title]).to eq(nil)
end
- it 'includes attributes in serialized object for admin scope even if allowed_user_badge_topic_ids option is not provided' do
+ it "includes attributes in serialized object for admin scope even if allowed_user_badge_topic_ids option is not provided" do
serialized = described_class.new(user_badge, scope: Guardian.new(admin), root: false).as_json
expect(serialized[:topic_id]).to eq(post.topic_id)
expect(serialized[:topic_title]).to eq(post.topic.title)
end
- it 'includes attributes in serialized object when topic id is present in allowed_user_badge_topic_ids option' do
- serialized = described_class.new(user_badge,
- scope: guardian,
- allowed_user_badge_topic_ids: guardian.can_see_topic_ids(topic_ids: [post.topic_id]),
- root: false
- ).as_json
+ it "includes attributes in serialized object when topic id is present in allowed_user_badge_topic_ids option" do
+ serialized =
+ described_class.new(
+ user_badge,
+ scope: guardian,
+ allowed_user_badge_topic_ids: guardian.can_see_topic_ids(topic_ids: [post.topic_id]),
+ root: false,
+ ).as_json
expect(serialized[:topic_id]).to eq(post.topic_id)
expect(serialized[:topic_title]).to eq(post.topic.title)
diff --git a/spec/serializers/directory_item_serializer_spec.rb b/spec/serializers/directory_item_serializer_spec.rb
index 84a1004ce79..f774a543383 100644
--- a/spec/serializers/directory_item_serializer_spec.rb
+++ b/spec/serializers/directory_item_serializer_spec.rb
@@ -3,12 +3,11 @@
RSpec.describe DirectoryItemSerializer do
fab!(:user) { Fabricate(:user) }
- before do
- DirectoryItem.refresh!
- end
+ before { DirectoryItem.refresh! }
let :serializer do
- directory_item = DirectoryItem.find_by(user: user, period_type: DirectoryItem.period_types[:all])
+ directory_item =
+ DirectoryItem.find_by(user: user, period_type: DirectoryItem.period_types[:all])
DirectoryItemSerializer.new(directory_item, { attributes: DirectoryColumn.active_column_names })
end
diff --git a/spec/serializers/emoji_serializer_spec.rb b/spec/serializers/emoji_serializer_spec.rb
index 6c70de3fe15..732e78da1b1 100644
--- a/spec/serializers/emoji_serializer_spec.rb
+++ b/spec/serializers/emoji_serializer_spec.rb
@@ -1,34 +1,28 @@
# frozen_string_literal: true
RSpec.describe EmojiSerializer do
- fab!(:custom_emoji) do
- CustomEmoji.create!(name: 'trout', upload: Fabricate(:upload))
- end
+ fab!(:custom_emoji) { CustomEmoji.create!(name: "trout", upload: Fabricate(:upload)) }
- describe '#url' do
- fab!(:emoji) do
- Emoji.load_custom.first
- end
+ describe "#url" do
+ fab!(:emoji) { Emoji.load_custom.first }
subject { described_class.new(emoji, root: false) }
- it 'returns a valid URL' do
- expect(subject.url).to start_with('/uploads/')
+ it "returns a valid URL" do
+ expect(subject.url).to start_with("/uploads/")
end
- it 'works with a CDN' do
- set_cdn_url('https://cdn.com')
- expect(subject.url).to start_with('https://cdn.com')
+ it "works with a CDN" do
+ set_cdn_url("https://cdn.com")
+ expect(subject.url).to start_with("https://cdn.com")
end
end
describe "missing uploads" do
- before do
- custom_emoji.upload.destroy!
- end
+ before { custom_emoji.upload.destroy! }
it "doesn't raise an error with a missing upload and a CDN" do
emoji = Emoji.load_custom.first
- set_cdn_url('https://cdn.com')
+ set_cdn_url("https://cdn.com")
result = described_class.new(Emoji.load_custom.first, root: false).as_json
expect(result[:url]).to be_blank
end
diff --git a/spec/serializers/found_user_serializer_spec.rb b/spec/serializers/found_user_serializer_spec.rb
index ed76d371b59..43db8092196 100644
--- a/spec/serializers/found_user_serializer_spec.rb
+++ b/spec/serializers/found_user_serializer_spec.rb
@@ -4,7 +4,7 @@ RSpec.describe FoundUserSerializer do
fab!(:user) { Fabricate(:user) }
let(:serializer) { described_class.new(user, root: false) }
- describe '#name' do
+ describe "#name" do
it "returns name if enabled in site settings" do
SiteSetting.enable_names = true
json = serializer.as_json
diff --git a/spec/serializers/group_show_serializer_spec.rb b/spec/serializers/group_show_serializer_spec.rb
index 76cb00f6342..b69d37ef5a4 100644
--- a/spec/serializers/group_show_serializer_spec.rb
+++ b/spec/serializers/group_show_serializer_spec.rb
@@ -4,11 +4,11 @@ RSpec.describe GroupShowSerializer do
fab!(:user) { Fabricate(:user) }
fab!(:group) { Fabricate(:group) }
- context 'with an admin user' do
+ context "with an admin user" do
fab!(:user) { Fabricate(:admin) }
fab!(:group) { Fabricate(:group, users: [user]) }
- it 'should return the right attributes' do
+ it "should return the right attributes" do
json = GroupShowSerializer.new(group, scope: Guardian.new(user)).as_json
expect(json[:group_show][:is_group_owner]).to eq(nil)
@@ -16,12 +16,10 @@ RSpec.describe GroupShowSerializer do
end
end
- context 'with a group owner' do
- before do
- group.add_owner(user)
- end
+ context "with a group owner" do
+ before { group.add_owner(user) }
- it 'should return the right attributes' do
+ it "should return the right attributes" do
json = GroupShowSerializer.new(group, scope: Guardian.new(user)).as_json
expect(json[:group_show][:is_group_owner]).to eq(true)
@@ -29,10 +27,10 @@ RSpec.describe GroupShowSerializer do
end
end
- describe '#mentionable' do
+ describe "#mentionable" do
fab!(:group) { Fabricate(:group, mentionable_level: Group::ALIAS_LEVELS[:everyone]) }
- it 'should return the right value' do
+ it "should return the right value" do
json = GroupShowSerializer.new(group, scope: Guardian.new).as_json
expect(json[:group_show][:mentionable]).to eq(nil)
@@ -43,40 +41,42 @@ RSpec.describe GroupShowSerializer do
end
end
- describe '#automatic_membership_email_domains' do
- fab!(:group) { Fabricate(:group, automatic_membership_email_domains: 'ilovediscourse.com') }
+ describe "#automatic_membership_email_domains" do
+ fab!(:group) { Fabricate(:group, automatic_membership_email_domains: "ilovediscourse.com") }
let(:admin_guardian) { Guardian.new(Fabricate(:admin)) }
- it 'should include email domains for admin' do
- subject = described_class.new(group, scope: admin_guardian, root: false, owner_group_ids: [group.id])
- expect(subject.as_json[:automatic_membership_email_domains]).to eq('ilovediscourse.com')
+ it "should include email domains for admin" do
+ subject =
+ described_class.new(group, scope: admin_guardian, root: false, owner_group_ids: [group.id])
+ expect(subject.as_json[:automatic_membership_email_domains]).to eq("ilovediscourse.com")
end
- it 'should not include email domains for other users' do
- subject = described_class.new(group, scope: Guardian.new, root: false, owner_group_ids: [group.id])
+ it "should not include email domains for other users" do
+ subject =
+ described_class.new(group, scope: Guardian.new, root: false, owner_group_ids: [group.id])
expect(subject.as_json[:automatic_membership_email_domains]).to eq(nil)
end
end
- describe 'admin only fields' do
- fab!(:group) { Fabricate(:group, email_username: 'foo@bar.com', email_password: 'pa$$w0rd') }
+ describe "admin only fields" do
+ fab!(:group) { Fabricate(:group, email_username: "foo@bar.com", email_password: "pa$$w0rd") }
subject { described_class.new(group, scope: guardian, root: false) }
- context 'for a user' do
+ context "for a user" do
let(:guardian) { Guardian.new(Fabricate(:user)) }
- it 'are not visible' do
+ it "are not visible" do
expect(subject.as_json[:email_username]).to be_nil
expect(subject.as_json[:email_password]).to be_nil
end
end
- context 'for an admin' do
+ context "for an admin" do
let(:guardian) { Guardian.new(Fabricate(:admin)) }
- it 'are visible' do
- expect(subject.as_json[:email_username]).to eq('foo@bar.com')
- expect(subject.as_json[:email_password]).to eq('pa$$w0rd')
+ it "are visible" do
+ expect(subject.as_json[:email_username]).to eq("foo@bar.com")
+ expect(subject.as_json[:email_password]).to eq("pa$$w0rd")
expect(subject.as_json[:message_count]).to eq(0)
end
end
@@ -95,22 +95,22 @@ RSpec.describe GroupShowSerializer do
GroupCategoryNotificationDefault.create!(
group: group,
category: category1,
- notification_level: GroupCategoryNotificationDefault.notification_levels[:watching]
+ notification_level: GroupCategoryNotificationDefault.notification_levels[:watching],
)
GroupCategoryNotificationDefault.create!(
group: group,
category: category2,
- notification_level: GroupCategoryNotificationDefault.notification_levels[:tracking]
+ notification_level: GroupCategoryNotificationDefault.notification_levels[:tracking],
)
GroupTagNotificationDefault.create!(
group: group,
tag: tag1,
- notification_level: GroupTagNotificationDefault.notification_levels[:watching]
+ notification_level: GroupTagNotificationDefault.notification_levels[:watching],
)
GroupTagNotificationDefault.create!(
group: group,
tag: tag2,
- notification_level: GroupTagNotificationDefault.notification_levels[:tracking]
+ notification_level: GroupTagNotificationDefault.notification_levels[:tracking],
)
end
@@ -142,7 +142,9 @@ RSpec.describe GroupShowSerializer do
it "doesn't include tag fields if tags are disabled" do
SiteSetting.tagging_enabled = false
- expect(subject.as_json.keys.select { |k| k.to_s.ends_with?("_category_ids") }.length).to eq(5)
+ expect(subject.as_json.keys.select { |k| k.to_s.ends_with?("_category_ids") }.length).to eq(
+ 5,
+ )
expect(subject.as_json.keys.select { |k| k.to_s.ends_with?("_tags") }).to be_empty
end
end
diff --git a/spec/serializers/group_user_serializer_spec.rb b/spec/serializers/group_user_serializer_spec.rb
index e9e19c090e0..6e5dd39ddc2 100644
--- a/spec/serializers/group_user_serializer_spec.rb
+++ b/spec/serializers/group_user_serializer_spec.rb
@@ -3,7 +3,7 @@
RSpec.describe GroupUserSerializer do
let(:serializer) { described_class.new(user, scope: Guardian.new(user), root: false) }
- describe '#status' do
+ describe "#status" do
fab!(:user_status) { Fabricate(:user_status) }
fab!(:user) { Fabricate(:user, user_status: user_status) }
diff --git a/spec/serializers/listable_topic_serializer_spec.rb b/spec/serializers/listable_topic_serializer_spec.rb
index ec6394c21c3..9b468d475a1 100644
--- a/spec/serializers/listable_topic_serializer_spec.rb
+++ b/spec/serializers/listable_topic_serializer_spec.rb
@@ -2,36 +2,25 @@
RSpec.describe ListableTopicSerializer do
fab!(:topic) { Fabricate(:topic) }
- describe '#excerpt' do
- it 'can be extended by theme modifiers' do
- payload = TopicListItemSerializer.new(topic,
- scope: Guardian.new,
- root: false
- ).as_json
+ describe "#excerpt" do
+ it "can be extended by theme modifiers" do
+ payload = TopicListItemSerializer.new(topic, scope: Guardian.new, root: false).as_json
expect(payload[:excerpt]).to eq(nil)
theme = Fabricate(:theme)
- child_theme = Fabricate(:theme, component: true).tap do |t|
- theme.add_relative_theme!(:child, t)
- end
+ child_theme =
+ Fabricate(:theme, component: true).tap { |t| theme.add_relative_theme!(:child, t) }
child_theme.theme_modifier_set.serialize_topic_excerpts = true
child_theme.save!
- request = ActionController::TestRequest.new(
- { resolved_theme_id: theme.id },
- nil,
- nil
- )
+ request = ActionController::TestRequest.new({ resolved_theme_id: theme.id }, nil, nil)
guardian = Guardian.new(nil, request)
- payload = TopicListItemSerializer.new(topic,
- scope: guardian,
- root: false
- ).as_json
+ payload = TopicListItemSerializer.new(topic, scope: guardian, root: false).as_json
expect(payload[:excerpt]).to eq(topic.excerpt)
end
diff --git a/spec/serializers/new_post_result_serializer_spec.rb b/spec/serializers/new_post_result_serializer_spec.rb
index c7ecfa56559..97ffd5b24ab 100644
--- a/spec/serializers/new_post_result_serializer_spec.rb
+++ b/spec/serializers/new_post_result_serializer_spec.rb
@@ -1,15 +1,14 @@
# frozen_string_literal: true
RSpec.describe NewPostResultSerializer do
-
it "includes the message and route_to if present" do
result = NewPostResult.new(:custom, true)
- result.message = 'hello :)'
+ result.message = "hello :)"
result.route_to = "/cool-route"
serializer = described_class.new(result)
expect(serializer.success).to eq(true)
- expect(serializer.message).to eq('hello :)')
- expect(serializer.route_to).to eq('/cool-route')
+ expect(serializer.message).to eq("hello :)")
+ expect(serializer.route_to).to eq("/cool-route")
end
end
diff --git a/spec/serializers/notification_serializer_spec.rb b/spec/serializers/notification_serializer_spec.rb
index 24a9c25566a..9357646b9f6 100644
--- a/spec/serializers/notification_serializer_spec.rb
+++ b/spec/serializers/notification_serializer_spec.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
RSpec.describe NotificationSerializer do
- describe '#as_json' do
+ describe "#as_json" do
fab!(:user) { Fabricate(:user) }
let(:notification) { Fabricate(:notification, user: user) }
let(:serializer) { NotificationSerializer.new(notification) }
@@ -16,10 +16,10 @@ RSpec.describe NotificationSerializer do
end
end
- describe '#sso_enabled' do
+ describe "#sso_enabled" do
let :user do
user = Fabricate(:user)
- SingleSignOnRecord.create!(user_id: user.id, external_id: '12345', last_payload: '')
+ SingleSignOnRecord.create!(user_id: user.id, external_id: "12345", last_payload: "")
user
end
let(:notification) { Fabricate(:notification, user: user) }
diff --git a/spec/serializers/pending_post_serializer_spec.rb b/spec/serializers/pending_post_serializer_spec.rb
index 096f6f8b97d..03a2f9421bc 100644
--- a/spec/serializers/pending_post_serializer_spec.rb
+++ b/spec/serializers/pending_post_serializer_spec.rb
@@ -22,7 +22,7 @@ RSpec.describe PendingPostSerializer do
title: post.payload["title"],
topic_id: nil,
topic_url: nil,
- username: author.username
+ username: author.username,
}
end
@@ -46,7 +46,7 @@ RSpec.describe PendingPostSerializer do
title: topic.title,
topic_id: topic.id,
topic_url: topic.url,
- username: author.username
+ username: author.username,
}
end
diff --git a/spec/serializers/post_revision_serializer_spec.rb b/spec/serializers/post_revision_serializer_spec.rb
index 37e13340171..f1444b46ac1 100644
--- a/spec/serializers/post_revision_serializer_spec.rb
+++ b/spec/serializers/post_revision_serializer_spec.rb
@@ -3,25 +3,39 @@
RSpec.describe PostRevisionSerializer do
fab!(:post) { Fabricate(:post, version: 2) }
- context 'with hidden tags' do
- fab!(:public_tag) { Fabricate(:tag, name: 'public') }
- fab!(:public_tag2) { Fabricate(:tag, name: 'visible') }
- fab!(:hidden_tag) { Fabricate(:tag, name: 'hidden') }
- fab!(:hidden_tag2) { Fabricate(:tag, name: 'secret') }
+ context "with hidden tags" do
+ fab!(:public_tag) { Fabricate(:tag, name: "public") }
+ fab!(:public_tag2) { Fabricate(:tag, name: "visible") }
+ fab!(:hidden_tag) { Fabricate(:tag, name: "hidden") }
+ fab!(:hidden_tag2) { Fabricate(:tag, name: "secret") }
- let(:staff_tag_group) { Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name, hidden_tag2.name]) }
+ let(:staff_tag_group) do
+ Fabricate(
+ :tag_group,
+ permissions: {
+ "staff" => 1,
+ },
+ tag_names: [hidden_tag.name, hidden_tag2.name],
+ )
+ end
let(:post_revision) do
- Fabricate(:post_revision,
+ Fabricate(
+ :post_revision,
post: post,
- modifications: { 'tags' => [['public', 'hidden'], ['visible', 'hidden']] }
+ modifications: {
+ "tags" => [%w[public hidden], %w[visible hidden]],
+ },
)
end
let(:post_revision2) do
- Fabricate(:post_revision,
+ Fabricate(
+ :post_revision,
post: post,
- modifications: { 'tags' => [['visible', 'hidden', 'secret'], ['visible', 'hidden']] }
+ modifications: {
+ "tags" => [%w[visible hidden secret], %w[visible hidden]],
+ },
)
end
@@ -31,22 +45,37 @@ RSpec.describe PostRevisionSerializer do
post.topic.tags = [public_tag2, hidden_tag]
end
- it 'returns all tag changes to staff' do
- json = PostRevisionSerializer.new(post_revision, scope: Guardian.new(Fabricate(:admin)), root: false).as_json
+ it "returns all tag changes to staff" do
+ json =
+ PostRevisionSerializer.new(
+ post_revision,
+ scope: Guardian.new(Fabricate(:admin)),
+ root: false,
+ ).as_json
expect(json[:tags_changes][:previous]).to include(public_tag.name)
expect(json[:tags_changes][:previous]).to include(hidden_tag.name)
expect(json[:tags_changes][:current]).to include(public_tag2.name)
expect(json[:tags_changes][:current]).to include(hidden_tag.name)
end
- it 'does not return hidden tags to non-staff' do
- json = PostRevisionSerializer.new(post_revision, scope: Guardian.new(Fabricate(:user)), root: false).as_json
+ it "does not return hidden tags to non-staff" do
+ json =
+ PostRevisionSerializer.new(
+ post_revision,
+ scope: Guardian.new(Fabricate(:user)),
+ root: false,
+ ).as_json
expect(json[:tags_changes][:previous]).to eq([public_tag.name])
expect(json[:tags_changes][:current]).to eq([public_tag2.name])
end
- it 'does not show tag modifications if changes are not visible to the user' do
- json = PostRevisionSerializer.new(post_revision2, scope: Guardian.new(Fabricate(:user)), root: false).as_json
+ it "does not show tag modifications if changes are not visible to the user" do
+ json =
+ PostRevisionSerializer.new(
+ post_revision2,
+ scope: Guardian.new(Fabricate(:user)),
+ root: false,
+ ).as_json
expect(json[:tags_changes]).to_not be_present
end
end
diff --git a/spec/serializers/post_serializer_spec.rb b/spec/serializers/post_serializer_spec.rb
index 55ac7c961c0..b4eaa9ad34f 100644
--- a/spec/serializers/post_serializer_spec.rb
+++ b/spec/serializers/post_serializer_spec.rb
@@ -3,59 +3,53 @@
RSpec.describe PostSerializer do
fab!(:post) { Fabricate(:post) }
- before do
- Group.refresh_automatic_groups!
- end
+ before { Group.refresh_automatic_groups! }
context "with a post with lots of actions" do
fab!(:actor) { Fabricate(:user) }
fab!(:admin) { Fabricate(:admin) }
- let(:acted_ids) {
- PostActionType.public_types.values
- .concat([:notify_user, :spam].map { |k| PostActionType.types[k] })
- }
+ let(:acted_ids) do
+ PostActionType.public_types.values.concat(
+ %i[notify_user spam].map { |k| PostActionType.types[k] },
+ )
+ end
def visible_actions_for(user)
serializer = PostSerializer.new(post, scope: Guardian.new(user), root: false)
# NOTE this is messy, we should extract all this logic elsewhere
- serializer.post_actions = PostAction.counts_for([post], actor)[post.id] if user.try(:id) == actor.id
+ serializer.post_actions = PostAction.counts_for([post], actor)[post.id] if user.try(:id) ==
+ actor.id
actions = serializer.as_json[:actions_summary]
lookup = PostActionType.types.invert
actions.keep_if { |a| (a[:count] || 0) > 0 }.map { |a| lookup[a[:id]] }
end
before do
- acted_ids.each do |id|
- PostActionCreator.new(actor, post, id).perform
- end
+ acted_ids.each { |id| PostActionCreator.new(actor, post, id).perform }
post.reload
end
it "displays the correct info" do
- expect(visible_actions_for(actor).sort).to eq([:like, :notify_user, :spam])
+ expect(visible_actions_for(actor).sort).to eq(%i[like notify_user spam])
expect(visible_actions_for(post.user).sort).to eq([:like])
expect(visible_actions_for(nil).sort).to eq([:like])
- expect(visible_actions_for(admin).sort).to eq([:like, :notify_user, :spam])
+ expect(visible_actions_for(admin).sort).to eq(%i[like notify_user spam])
end
it "can't flag your own post to notify yourself" do
serializer = PostSerializer.new(post, scope: Guardian.new(post.user), root: false)
- notify_user_action = serializer.actions_summary.find { |a| a[:id] == PostActionType.types[:notify_user] }
+ notify_user_action =
+ serializer.actions_summary.find { |a| a[:id] == PostActionType.types[:notify_user] }
expect(notify_user_action).to be_blank
end
it "should not allow user to flag post and notify non human user" do
post.update!(user: Discourse.system_user)
- serializer = PostSerializer.new(
- post,
- scope: Guardian.new(actor),
- root: false
- )
+ serializer = PostSerializer.new(post, scope: Guardian.new(actor), root: false)
- notify_user_action = serializer.actions_summary.find do |a|
- a[:id] == PostActionType.types[:notify_user]
- end
+ notify_user_action =
+ serializer.actions_summary.find { |a| a[:id] == PostActionType.types[:notify_user] }
expect(notify_user_action).to eq(nil)
end
@@ -65,7 +59,8 @@ RSpec.describe PostSerializer do
let!(:reviewable) { PostActionCreator.spam(Fabricate(:user), post).reviewable }
it "includes the reviewable data" do
- json = PostSerializer.new(post, scope: Guardian.new(Fabricate(:moderator)), root: false).as_json
+ json =
+ PostSerializer.new(post, scope: Guardian.new(Fabricate(:moderator)), root: false).as_json
expect(json[:reviewable_id]).to eq(reviewable.id)
expect(json[:reviewable_score_count]).to eq(1)
expect(json[:reviewable_score_pending_count]).to eq(1)
@@ -73,22 +68,17 @@ RSpec.describe PostSerializer do
end
context "with a post by a nuked user" do
- before do
- post.update!(
- user_id: nil,
- deleted_at: Time.zone.now
- )
+ before { post.update!(user_id: nil, deleted_at: Time.zone.now) }
+
+ subject do
+ PostSerializer.new(post, scope: Guardian.new(Fabricate(:admin)), root: false).as_json
end
- subject { PostSerializer.new(post, scope: Guardian.new(Fabricate(:admin)), root: false).as_json }
-
it "serializes correctly" do
- [:name, :username, :display_username, :avatar_template, :user_title, :trust_level].each do |attr|
+ %i[name username display_username avatar_template user_title trust_level].each do |attr|
expect(subject[attr]).to be_nil
end
- [:moderator, :staff, :yours].each do |attr|
- expect(subject[attr]).to eq(false)
- end
+ %i[moderator staff yours].each { |attr| expect(subject[attr]).to eq(false) }
end
end
@@ -100,9 +90,7 @@ RSpec.describe PostSerializer do
it "serializes correctly" do
expect(subject[:user_suspended]).to be_nil
- post.user.update!(
- suspended_till: 1.month.from_now,
- )
+ post.user.update!(suspended_till: 1.month.from_now)
expect(subject[:user_suspended]).to eq(true)
@@ -130,7 +118,7 @@ RSpec.describe PostSerializer do
context "with a hidden post with add_raw enabled" do
let(:user) { Fabricate(:user) }
- let(:raw) { "Raw contents of the post." }
+ let(:raw) { "Raw contents of the post." }
context "with a public post" do
let(:post) { Fabricate(:post, raw: raw, user: user) }
@@ -143,7 +131,15 @@ RSpec.describe PostSerializer do
end
context "with a hidden post" do
- let(:post) { Fabricate(:post, raw: raw, user: user, hidden: true, hidden_reason_id: Post.hidden_reasons[:flag_threshold_reached]) }
+ let(:post) do
+ Fabricate(
+ :post,
+ raw: raw,
+ user: user,
+ hidden: true,
+ hidden_reason_id: Post.hidden_reasons[:flag_threshold_reached],
+ )
+ end
it "shows the raw post only if authorized to see it" do
expect(serialized_post_for_user(nil)[:raw]).to eq(nil)
@@ -165,13 +161,13 @@ RSpec.describe PostSerializer do
end
context "with a hidden revised post" do
- fab!(:post) { Fabricate(:post, raw: 'Hello world!', hidden: true) }
+ fab!(:post) { Fabricate(:post, raw: "Hello world!", hidden: true) }
before do
SiteSetting.editing_grace_period_max_diff = 1
revisor = PostRevisor.new(post)
- revisor.revise!(post.user, raw: 'Hello, everyone!')
+ revisor.revise!(post.user, raw: "Hello, everyone!")
end
it "will not leak version to users" do
@@ -196,15 +192,16 @@ RSpec.describe PostSerializer do
end
context "with a hidden wiki post" do
- let(:post) {
+ let(:post) do
Fabricate(
:post,
raw: raw,
user: user,
wiki: true,
hidden: true,
- hidden_reason_id: Post.hidden_reasons[:flag_threshold_reached])
- }
+ hidden_reason_id: Post.hidden_reasons[:flag_threshold_reached],
+ )
+ end
it "can view edit history only if authorized" do
expect(serialized_post_for_user(nil)[:can_view_edit_history]).to eq(false)
@@ -214,7 +211,6 @@ RSpec.describe PostSerializer do
expect(serialized_post_for_user(Fabricate(:admin))[:can_view_edit_history]).to eq(true)
end
end
-
end
context "with a post with notices" do
@@ -222,12 +218,15 @@ RSpec.describe PostSerializer do
fab!(:user_tl1) { Fabricate(:user, trust_level: 1) }
fab!(:user_tl2) { Fabricate(:user, trust_level: 2) }
- let(:post) {
+ let(:post) do
post = Fabricate(:post, user: user)
- post.custom_fields[Post::NOTICE] = { type: Post.notices[:returning_user], last_posted_at: 1.day.ago }
+ post.custom_fields[Post::NOTICE] = {
+ type: Post.notices[:returning_user],
+ last_posted_at: 1.day.ago,
+ }
post.save_custom_fields
post
- }
+ end
def json_for_user(user)
PostSerializer.new(post, scope: Guardian.new(user), root: false).as_json
@@ -258,7 +257,9 @@ RSpec.describe PostSerializer do
end
context "when a Bookmark record exists for the user on the post" do
- let!(:bookmark) { Fabricate(:bookmark_next_business_day_reminder, user: current_user, bookmarkable: post) }
+ let!(:bookmark) do
+ Fabricate(:bookmark_next_business_day_reminder, user: current_user, bookmarkable: post)
+ end
context "with bookmarks with reminders" do
it "returns true" do
@@ -290,7 +291,6 @@ RSpec.describe PostSerializer do
post.update!(user: group_user.user)
expect(serialized_post_for_user(nil)[:group_moderator]).to eq(true)
end
-
end
context "with a post with small action" do
diff --git a/spec/serializers/reviewable_flagged_post_serializer_spec.rb b/spec/serializers/reviewable_flagged_post_serializer_spec.rb
index 2ed49935acb..e7c185e0bf5 100644
--- a/spec/serializers/reviewable_flagged_post_serializer_spec.rb
+++ b/spec/serializers/reviewable_flagged_post_serializer_spec.rb
@@ -1,13 +1,13 @@
# frozen_string_literal: true
RSpec.describe ReviewableFlaggedPostSerializer do
-
fab!(:admin) { Fabricate(:admin) }
it "includes the user fields for review" do
p0 = Fabricate(:post)
reviewable = PostActionCreator.spam(Fabricate(:user), p0).reviewable
- json = ReviewableFlaggedPostSerializer.new(reviewable, scope: Guardian.new(admin), root: nil).as_json
+ json =
+ ReviewableFlaggedPostSerializer.new(reviewable, scope: Guardian.new(admin), root: nil).as_json
expect(json[:cooked]).to eq(p0.cooked)
expect(json[:raw]).to eq(p0.raw)
expect(json[:target_url]).to eq(Discourse.base_url + p0.url)
@@ -18,8 +18,8 @@ RSpec.describe ReviewableFlaggedPostSerializer do
reviewable.topic.update(deleted_at: Time.now)
reviewable.reload
- json = ReviewableQueuedPostSerializer.new(reviewable, scope: Guardian.new(admin), root: nil).as_json
+ json =
+ ReviewableQueuedPostSerializer.new(reviewable, scope: Guardian.new(admin), root: nil).as_json
expect(json[:id]).to be_present
end
-
end
diff --git a/spec/serializers/reviewable_queued_post_serializer_spec.rb b/spec/serializers/reviewable_queued_post_serializer_spec.rb
index 09734a18852..0f1fe023088 100644
--- a/spec/serializers/reviewable_queued_post_serializer_spec.rb
+++ b/spec/serializers/reviewable_queued_post_serializer_spec.rb
@@ -7,31 +7,36 @@ RSpec.describe ReviewableQueuedPostSerializer do
fab!(:reviewable) { Fabricate(:reviewable_queued_post_topic) }
it "allows us to edit category / title" do
- json = ReviewableQueuedPostSerializer.new(reviewable, scope: Guardian.new(admin), root: nil).as_json
+ json =
+ ReviewableQueuedPostSerializer.new(
+ reviewable,
+ scope: Guardian.new(admin),
+ root: nil,
+ ).as_json
payload = json[:payload]
- expect(payload['raw']).to eq('hello world post contents.')
- expect(payload['title']).to eq('queued post title')
- expect(payload['tags']).to eq(['cool', 'neat'])
+ expect(payload["raw"]).to eq("hello world post contents.")
+ expect(payload["title"]).to eq("queued post title")
+ expect(payload["tags"]).to eq(%w[cool neat])
expect(json[:topic_id]).to be_blank
expect(json[:can_edit]).to eq(true)
fields = json[:editable_fields]
expect(fields).to be_present
- category_field = fields.find { |f| f[:id] == 'category_id' }
+ category_field = fields.find { |f| f[:id] == "category_id" }
expect(category_field).to be_present
expect(category_field[:type]).to eq(:category)
- title_field = fields.find { |f| f[:id] == 'payload.title' }
+ title_field = fields.find { |f| f[:id] == "payload.title" }
expect(title_field).to be_present
expect(title_field[:type]).to eq(:text)
- raw_field = fields.find { |f| f[:id] == 'payload.raw' }
+ raw_field = fields.find { |f| f[:id] == "payload.raw" }
expect(raw_field).to be_present
expect(raw_field[:type]).to eq(:editor)
- tags_field = fields.find { |f| f[:id] == 'payload.tags' }
+ tags_field = fields.find { |f| f[:id] == "payload.tags" }
expect(tags_field).to be_present
expect(tags_field[:type]).to eq(:tags)
end
@@ -41,14 +46,19 @@ RSpec.describe ReviewableQueuedPostSerializer do
fab!(:reviewable) { Fabricate(:reviewable_queued_post) }
it "includes correct user fields" do
- json = ReviewableQueuedPostSerializer.new(reviewable, scope: Guardian.new(admin), root: nil).as_json
+ json =
+ ReviewableQueuedPostSerializer.new(
+ reviewable,
+ scope: Guardian.new(admin),
+ root: nil,
+ ).as_json
payload = json[:payload]
- expect(payload['raw']).to eq('hello world post contents.')
- expect(payload['title']).to be_blank
- expect(payload['via_email']).to eq(true)
- expect(payload['raw_email']).to eq('store_me')
+ expect(payload["raw"]).to eq("hello world post contents.")
+ expect(payload["title"]).to be_blank
+ expect(payload["via_email"]).to eq(true)
+ expect(payload["raw_email"]).to eq("store_me")
expect(json[:topic_id]).to eq(reviewable.topic_id)
expect(json[:topic_url]).to eq(reviewable.topic.url)
expect(json[:can_edit]).to eq(true)
@@ -56,10 +66,10 @@ RSpec.describe ReviewableQueuedPostSerializer do
fields = json[:editable_fields]
expect(fields).to be_present
- expect(fields.any? { |f| f[:id] == 'payload.title' }).to eq(false)
- expect(fields.any? { |f| f[:id] == 'category_id' }).to eq(false)
+ expect(fields.any? { |f| f[:id] == "payload.title" }).to eq(false)
+ expect(fields.any? { |f| f[:id] == "category_id" }).to eq(false)
- raw_field = fields.find { |f| f[:id] == 'payload.raw' }
+ raw_field = fields.find { |f| f[:id] == "payload.raw" }
expect(raw_field).to be_present
expect(raw_field[:type]).to eq(:editor)
end
diff --git a/spec/serializers/reviewable_score_serializer_spec.rb b/spec/serializers/reviewable_score_serializer_spec.rb
index 2894db4e87b..3840ca79da4 100644
--- a/spec/serializers/reviewable_score_serializer_spec.rb
+++ b/spec/serializers/reviewable_score_serializer_spec.rb
@@ -4,39 +4,51 @@ RSpec.describe ReviewableScoreSerializer do
fab!(:reviewable) { Fabricate(:reviewable_flagged_post) }
fab!(:admin) { Fabricate(:admin) }
- describe '#reason' do
- context 'with regular links' do
- it 'adds a link for watched words' do
- serialized = serialized_score('watched_word')
+ describe "#reason" do
+ context "with regular links" do
+ it "adds a link for watched words" do
+ serialized = serialized_score("watched_word")
link_url = "#{Discourse.base_url}/admin/customize/watched_words"
- watched_words_link = " #{I18n.t('reviewables.reasons.links.watched_word')} "
+ watched_words_link =
+ "#{I18n.t("reviewables.reasons.links.watched_word")} "
expect(serialized.reason).to include(watched_words_link)
end
- it 'adds a link for category settings' do
- category = Fabricate(:category, name: 'Reviewable Category', slug: 'reviewable-category')
+ it "adds a link for category settings" do
+ category = Fabricate(:category, name: "Reviewable Category", slug: "reviewable-category")
reviewable.category = category
- serialized = serialized_score('category')
+ serialized = serialized_score("category")
link_url = "#{Discourse.base_url}/c/#{category.slug}/edit/settings"
- category_link = "#{I18n.t('reviewables.reasons.links.category')} "
+ category_link =
+ "#{I18n.t("reviewables.reasons.links.category")} "
expect(serialized.reason).to include(category_link)
end
end
- context 'with site setting links' do
+ context "with site setting links" do
reasons = %w[
- post_count trust_level new_topics_unless_trust_level fast_typer auto_silence_regex
- staged must_approve_users invite_only email_spam suspect_user contains_media
+ post_count
+ trust_level
+ new_topics_unless_trust_level
+ fast_typer
+ auto_silence_regex
+ staged
+ must_approve_users
+ invite_only
+ email_spam
+ suspect_user
+ contains_media
]
reasons.each do |r|
it "addd a link to a site setting for the #{r} reason" do
serialized = serialized_score(r)
setting_name = described_class::REASONS_AND_SETTINGS[r.to_sym]
- link_url = "#{Discourse.base_url}/admin/site_settings/category/all_results?filter=#{setting_name}"
- link = "#{setting_name.gsub('_', ' ')} "
+ link_url =
+ "#{Discourse.base_url}/admin/site_settings/category/all_results?filter=#{setting_name}"
+ link = "#{setting_name.gsub("_", " ")} "
expect(serialized.reason).to include(link)
end
@@ -44,16 +56,16 @@ RSpec.describe ReviewableScoreSerializer do
end
end
- describe '#setting_name_for_reason' do
+ describe "#setting_name_for_reason" do
after { DiscoursePluginRegistry.reset_register!(:reviewable_score_links) }
- describe 'when a plugin adds a setting name to linkify' do
- it 'gets the setting name from the registry' do
+ describe "when a plugin adds a setting name to linkify" do
+ it "gets the setting name from the registry" do
reason = :plugin_reason
- setting_name = 'max_username_length'
+ setting_name = "max_username_length"
DiscoursePluginRegistry.register_reviewable_score_link(
{ reason: reason, setting: setting_name },
- Plugin::Instance.new
+ Plugin::Instance.new,
)
score = serialized_score(reason)
@@ -64,10 +76,7 @@ RSpec.describe ReviewableScoreSerializer do
end
def serialized_score(reason)
- score = ReviewableScore.new(
- reviewable: reviewable,
- reason: reason
- )
+ score = ReviewableScore.new(reviewable: reviewable, reason: reason)
described_class.new(score, scope: Guardian.new(admin), root: nil)
end
diff --git a/spec/serializers/reviewable_serializer_spec.rb b/spec/serializers/reviewable_serializer_spec.rb
index b3a90c90464..e76859c95ce 100644
--- a/spec/serializers/reviewable_serializer_spec.rb
+++ b/spec/serializers/reviewable_serializer_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
RSpec.describe ReviewableSerializer do
-
fab!(:reviewable) { Fabricate(:reviewable_queued_post) }
fab!(:admin) { Fabricate(:admin) }
@@ -18,7 +17,7 @@ RSpec.describe ReviewableSerializer do
expect(json[:removed_topic_id]).to be_nil
end
- it 'Includes the removed topic id when the topis was deleted' do
+ it "Includes the removed topic id when the topis was deleted" do
reviewable.topic.trash!(admin)
json = described_class.new(reviewable.reload, scope: Guardian.new(admin), root: nil).as_json
expect(json[:removed_topic_id]).to eq reviewable.topic_id
@@ -26,12 +25,12 @@ RSpec.describe ReviewableSerializer do
it "will not throw an error when the payload is `nil`" do
reviewable.payload = nil
- json = ReviewableQueuedPostSerializer.new(reviewable, scope: Guardian.new(admin), root: nil).as_json
- expect(json['payload']).to be_blank
+ json =
+ ReviewableQueuedPostSerializer.new(reviewable, scope: Guardian.new(admin), root: nil).as_json
+ expect(json["payload"]).to be_blank
end
describe "urls" do
-
it "links to the flagged post" do
fp = Fabricate(:reviewable_flagged_post)
json = described_class.new(fp, scope: Guardian.new(admin), root: nil).as_json
diff --git a/spec/serializers/reviewable_user_serializer_spec.rb b/spec/serializers/reviewable_user_serializer_spec.rb
index 68f4f58d3c8..bb7e4ad3efc 100644
--- a/spec/serializers/reviewable_user_serializer_spec.rb
+++ b/spec/serializers/reviewable_user_serializer_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
RSpec.describe ReviewableUserSerializer do
-
let(:user) { Fabricate(:user) }
let(:admin) { Fabricate(:admin) }
@@ -12,10 +11,9 @@ RSpec.describe ReviewableUserSerializer do
json = ReviewableUserSerializer.new(reviewable, scope: Guardian.new(admin), root: nil).as_json
expect(json[:user_id]).to eq(reviewable.target_id)
- expect(json[:payload]['username']).to eq(user.username)
- expect(json[:payload]['email']).to eq(user.email)
- expect(json[:payload]['name']).to eq(user.name)
+ expect(json[:payload]["username"]).to eq(user.username)
+ expect(json[:payload]["email"]).to eq(user.email)
+ expect(json[:payload]["name"]).to eq(user.name)
expect(json[:topic_url]).to be_blank
end
-
end
diff --git a/spec/serializers/single_sign_on_record_serializer_spec.rb b/spec/serializers/single_sign_on_record_serializer_spec.rb
index be9f842ac14..1f794474272 100644
--- a/spec/serializers/single_sign_on_record_serializer_spec.rb
+++ b/spec/serializers/single_sign_on_record_serializer_spec.rb
@@ -3,7 +3,12 @@
RSpec.describe SingleSignOnRecordSerializer do
fab!(:user) { Fabricate(:user) }
let :sso do
- SingleSignOnRecord.create!(user_id: user.id, external_id: '12345', external_email: user.email, last_payload: 'foobar')
+ SingleSignOnRecord.create!(
+ user_id: user.id,
+ external_id: "12345",
+ external_email: user.email,
+ last_payload: "foobar",
+ )
end
context "with an admin" do
@@ -15,7 +20,7 @@ RSpec.describe SingleSignOnRecordSerializer do
it "should include user sso info" do
payload = serializer.as_json
expect(payload[:user_id]).to eq(user.id)
- expect(payload[:external_id]).to eq('12345')
+ expect(payload[:external_id]).to eq("12345")
expect(payload[:external_email]).to be_nil
end
end
@@ -29,7 +34,7 @@ RSpec.describe SingleSignOnRecordSerializer do
it "should not include user sso payload" do
payload = serializer.as_json
expect(payload[:user_id]).to eq(user.id)
- expect(payload[:external_id]).to eq('12345')
+ expect(payload[:external_id]).to eq("12345")
expect(payload[:last_payload]).to be_nil
end
end
diff --git a/spec/serializers/site_serializer_spec.rb b/spec/serializers/site_serializer_spec.rb
index cd197e2a5fc..0fb21110d35 100644
--- a/spec/serializers/site_serializer_spec.rb
+++ b/spec/serializers/site_serializer_spec.rb
@@ -4,19 +4,17 @@ RSpec.describe SiteSerializer do
let(:guardian) { Guardian.new }
let(:category) { Fabricate(:category) }
- after do
- Site.clear_cache
- end
+ after { Site.clear_cache }
- describe '#user_tips' do
- it 'is included if enable_user_tips' do
+ describe "#user_tips" do
+ it "is included if enable_user_tips" do
SiteSetting.enable_user_tips = true
serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
expect(serialized[:user_tips]).to eq(User.user_tips)
end
- it 'is not included if enable_user_tips is disabled' do
+ it "is not included if enable_user_tips is disabled" do
serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
expect(serialized[:user_tips]).to eq(nil)
end
@@ -49,7 +47,11 @@ RSpec.describe SiteSerializer do
category.tags << tag
category.tag_groups << tag_group
- category.update!(category_required_tag_groups: [CategoryRequiredTagGroup.new(tag_group: tag_group_2, min_count: 1)])
+ category.update!(
+ category_required_tag_groups: [
+ CategoryRequiredTagGroup.new(tag_group: tag_group_2, min_count: 1),
+ ],
+ )
serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
c1 = serialized[:categories].find { |c| c[:id] == category.id }
@@ -63,7 +65,7 @@ RSpec.describe SiteSerializer do
tag = Fabricate(:tag)
tag_group = Fabricate(:tag_group)
crtg = CategoryRequiredTagGroup.new(tag_group: tag_group, min_count: 1)
- category.update!(category_required_tag_groups: [ crtg ])
+ category.update!(category_required_tag_groups: [crtg])
tag_group.delete # Bypassing hooks like this should never happen in the app
@@ -109,25 +111,25 @@ RSpec.describe SiteSerializer do
scheme = ColorScheme.last
SiteSetting.default_dark_mode_color_scheme_id = scheme.id
serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
- default_dark_scheme =
- expect(serialized[:default_dark_color_scheme]["name"]).to eq(scheme.name)
+ default_dark_scheme = expect(serialized[:default_dark_color_scheme]["name"]).to eq(scheme.name)
SiteSetting.default_dark_mode_color_scheme_id = -1
serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
expect(serialized[:default_dark_color_scheme]).to eq(nil)
end
- it 'does not include shared_drafts_category_id if the category is Uncategorized' do
+ it "does not include shared_drafts_category_id if the category is Uncategorized" do
admin = Fabricate(:admin)
admin_guardian = Guardian.new(admin)
SiteSetting.shared_drafts_category = SiteSetting.uncategorized_category_id
- serialized = described_class.new(Site.new(admin_guardian), scope: admin_guardian, root: false).as_json
+ serialized =
+ described_class.new(Site.new(admin_guardian), scope: admin_guardian, root: false).as_json
expect(serialized[:shared_drafts_category_id]).to eq(nil)
end
- it 'includes show_welcome_topic_banner' do
+ it "includes show_welcome_topic_banner" do
admin = Fabricate(:admin)
admin_guardian = Guardian.new(admin)
UserAuthToken.generate!(user_id: admin.id)
@@ -135,16 +137,19 @@ RSpec.describe SiteSerializer do
first_post = Fabricate(:post, created_at: 25.days.ago)
SiteSetting.welcome_topic_id = first_post.topic.id
- serialized = described_class.new(Site.new(admin_guardian), scope: admin_guardian, root: false).as_json
+ serialized =
+ described_class.new(Site.new(admin_guardian), scope: admin_guardian, root: false).as_json
expect(serialized[:show_welcome_topic_banner]).to eq(true)
end
- describe '#anonymous_default_sidebar_tags' do
+ describe "#anonymous_default_sidebar_tags" do
fab!(:user) { Fabricate(:user) }
- fab!(:tag) { Fabricate(:tag, name: 'dev') }
- fab!(:tag2) { Fabricate(:tag, name: 'random') }
+ fab!(:tag) { Fabricate(:tag, name: "dev") }
+ fab!(:tag2) { Fabricate(:tag, name: "random") }
fab!(:hidden_tag) { Fabricate(:tag, name: "secret") }
- fab!(:staff_tag_group) { Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name]) }
+ fab!(:staff_tag_group) do
+ Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name])
+ end
before do
SiteSetting.navigation_menu = "sidebar"
@@ -152,7 +157,7 @@ RSpec.describe SiteSerializer do
SiteSetting.default_sidebar_tags = "#{tag.name}|#{tag2.name}|#{hidden_tag.name}"
end
- it 'is not included in the serialised object when tagging is not enabled' do
+ it "is not included in the serialised object when tagging is not enabled" do
SiteSetting.tagging_enabled = false
guardian = Guardian.new(user)
@@ -160,57 +165,53 @@ RSpec.describe SiteSerializer do
expect(serialized[:anonymous_default_sidebar_tags]).to eq(nil)
end
- it 'is not included in the serialised object when navigation menu is legacy' do
+ it "is not included in the serialised object when navigation menu is legacy" do
SiteSetting.navigation_menu = "legacy"
serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
expect(serialized[:anonymous_default_sidebar_tags]).to eq(nil)
end
- it 'is not included in the serialised object when user is not anonymous' do
+ it "is not included in the serialised object when user is not anonymous" do
guardian = Guardian.new(user)
serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
expect(serialized[:anonymous_default_sidebar_tags]).to eq(nil)
end
- it 'is not included in the serialisd object when default sidebar tags have not been configured' do
+ it "is not included in the serialisd object when default sidebar tags have not been configured" do
SiteSetting.default_sidebar_tags = ""
serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
expect(serialized[:anonymous_default_sidebar_tags]).to eq(nil)
end
- it 'includes only tags user can see in the serialised object when user is anonymous' do
+ it "includes only tags user can see in the serialised object when user is anonymous" do
serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
- expect(serialized[:anonymous_default_sidebar_tags]).to eq(["dev", "random"])
+ expect(serialized[:anonymous_default_sidebar_tags]).to eq(%w[dev random])
end
end
- describe '#top_tags' do
+ describe "#top_tags" do
fab!(:tag) { Fabricate(:tag) }
- describe 'when tagging is not enabled' do
- before do
- SiteSetting.tagging_enabled = false
- end
+ describe "when tagging is not enabled" do
+ before { SiteSetting.tagging_enabled = false }
- it 'is not included in the serialised object' do
+ it "is not included in the serialised object" do
serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
expect(serialized[:top_tags]).to eq(nil)
end
end
- describe 'when tagging is enabled' do
+ describe "when tagging is enabled" do
fab!(:tag2) { Fabricate(:tag) }
fab!(:tag3) { Fabricate(:tag) }
- before do
- SiteSetting.tagging_enabled = true
- end
+ before { SiteSetting.tagging_enabled = true }
- it 'is not included in the serialised object when there are no tags' do
+ it "is not included in the serialised object when there are no tags" do
tag.destroy!
serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
@@ -218,15 +219,27 @@ RSpec.describe SiteSerializer do
expect(serialized[:top_tags]).to eq([])
end
- it 'is included in the serialised object containing the top tags' do
+ it "is included in the serialised object containing the top tags" do
tag2 = Fabricate(:tag)
tag2 = Fabricate(:tag)
SiteSetting.max_tags_in_filter_list = 1
- CategoryTagStat.create!(category_id: SiteSetting.uncategorized_category_id, tag_id: tag2.id, topic_count: 2)
- CategoryTagStat.create!(category_id: SiteSetting.uncategorized_category_id, tag_id: tag.id, topic_count: 1)
- CategoryTagStat.create!(category_id: SiteSetting.uncategorized_category_id, tag_id: tag3.id, topic_count: 5)
+ CategoryTagStat.create!(
+ category_id: SiteSetting.uncategorized_category_id,
+ tag_id: tag2.id,
+ topic_count: 2,
+ )
+ CategoryTagStat.create!(
+ category_id: SiteSetting.uncategorized_category_id,
+ tag_id: tag.id,
+ topic_count: 1,
+ )
+ CategoryTagStat.create!(
+ category_id: SiteSetting.uncategorized_category_id,
+ tag_id: tag3.id,
+ topic_count: 5,
+ )
serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
@@ -235,42 +248,57 @@ RSpec.describe SiteSerializer do
end
end
- describe '#whispers_allowed_groups_names' do
+ describe "#whispers_allowed_groups_names" do
fab!(:admin) { Fabricate(:admin) }
fab!(:allowed_user) { Fabricate(:user) }
fab!(:not_allowed_user) { Fabricate(:user) }
- fab!(:group1) { Fabricate(:group, name: 'whisperers1', users: [allowed_user]) }
- fab!(:group2) { Fabricate(:group, name: 'whisperers2', users: [allowed_user]) }
+ fab!(:group1) { Fabricate(:group, name: "whisperers1", users: [allowed_user]) }
+ fab!(:group2) { Fabricate(:group, name: "whisperers2", users: [allowed_user]) }
it "returns correct group names for created groups" do
admin_guardian = Guardian.new(admin)
SiteSetting.whispers_allowed_groups = "#{group1.id}|#{group2.id}"
- serialized = described_class.new(Site.new(admin_guardian), scope: admin_guardian, root: false).as_json
- expect(serialized[:whispers_allowed_groups_names]).to contain_exactly("whisperers1", "whisperers2")
+ serialized =
+ described_class.new(Site.new(admin_guardian), scope: admin_guardian, root: false).as_json
+ expect(serialized[:whispers_allowed_groups_names]).to contain_exactly(
+ "whisperers1",
+ "whisperers2",
+ )
end
it "returns correct group names for automatic groups" do
admin_guardian = Guardian.new(admin)
- SiteSetting.whispers_allowed_groups = "#{Group::AUTO_GROUPS[:staff]}|#{Group::AUTO_GROUPS[:trust_level_4]}"
+ SiteSetting.whispers_allowed_groups =
+ "#{Group::AUTO_GROUPS[:staff]}|#{Group::AUTO_GROUPS[:trust_level_4]}"
- serialized = described_class.new(Site.new(admin_guardian), scope: admin_guardian, root: false).as_json
- expect(serialized[:whispers_allowed_groups_names]).to contain_exactly("trust_level_4", "staff")
+ serialized =
+ described_class.new(Site.new(admin_guardian), scope: admin_guardian, root: false).as_json
+ expect(serialized[:whispers_allowed_groups_names]).to contain_exactly(
+ "trust_level_4",
+ "staff",
+ )
end
it "returns group names when user is allowed to whisper" do
user_guardian = Guardian.new(allowed_user)
SiteSetting.whispers_allowed_groups = "#{group1.id}|#{group2.id}"
- serialized = described_class.new(Site.new(user_guardian), scope: user_guardian, root: false).as_json
- expect(serialized[:whispers_allowed_groups_names]).to contain_exactly("whisperers1", "whisperers2")
+ serialized =
+ described_class.new(Site.new(user_guardian), scope: user_guardian, root: false).as_json
+ expect(serialized[:whispers_allowed_groups_names]).to contain_exactly(
+ "whisperers1",
+ "whisperers2",
+ )
end
it "returns nil when user is not allowed to whisper" do
user_guardian = Guardian.new(not_allowed_user)
- SiteSetting.whispers_allowed_groups = "#{Group::AUTO_GROUPS[:staff]}|#{Group::AUTO_GROUPS[:trust_level_4]}"
+ SiteSetting.whispers_allowed_groups =
+ "#{Group::AUTO_GROUPS[:staff]}|#{Group::AUTO_GROUPS[:trust_level_4]}"
- serialized = described_class.new(Site.new(user_guardian), scope: user_guardian, root: false).as_json
+ serialized =
+ described_class.new(Site.new(user_guardian), scope: user_guardian, root: false).as_json
expect(serialized[:whispers_allowed_groups_names]).to eq(nil)
end
end
diff --git a/spec/serializers/suggested_topic_serializer_spec.rb b/spec/serializers/suggested_topic_serializer_spec.rb
index f749dcf0a79..4627f95c6b0 100644
--- a/spec/serializers/suggested_topic_serializer_spec.rb
+++ b/spec/serializers/suggested_topic_serializer_spec.rb
@@ -4,40 +4,48 @@ RSpec.describe SuggestedTopicSerializer do
let(:user) { Fabricate(:user) }
let(:admin) { Fabricate(:admin) }
- describe '#featured_link and #featured_link_root_domain' do
- let(:featured_link) { 'http://meta.discourse.org' }
- let(:topic) { Fabricate(:topic, featured_link: featured_link, category: Fabricate(:category, topic_featured_link_allowed: true)) }
- subject(:json) { SuggestedTopicSerializer.new(topic, scope: Guardian.new(user), root: false).as_json }
+ describe "#featured_link and #featured_link_root_domain" do
+ let(:featured_link) { "http://meta.discourse.org" }
+ let(:topic) do
+ Fabricate(
+ :topic,
+ featured_link: featured_link,
+ category: Fabricate(:category, topic_featured_link_allowed: true),
+ )
+ end
+ subject(:json) do
+ SuggestedTopicSerializer.new(topic, scope: Guardian.new(user), root: false).as_json
+ end
- context 'when topic featured link is disable' do
+ context "when topic featured link is disable" do
before do
SiteSetting.topic_featured_link_enabled = true
topic
SiteSetting.topic_featured_link_enabled = false
end
- it 'should not return featured link attrs' do
+ it "should not return featured link attrs" do
expect(json[:featured_link]).to eq(nil)
expect(json[:featured_link_root_domain]).to eq(nil)
end
end
- context 'when topic featured link is enabled' do
- before do
- SiteSetting.topic_featured_link_enabled = true
- end
+ context "when topic featured link is enabled" do
+ before { SiteSetting.topic_featured_link_enabled = true }
- it 'should return featured link attrs' do
+ it "should return featured link attrs" do
expect(json[:featured_link]).to eq(featured_link)
- expect(json[:featured_link_root_domain]).to eq('discourse.org')
+ expect(json[:featured_link_root_domain]).to eq("discourse.org")
end
end
end
- describe 'hidden tags' do
+ describe "hidden tags" do
let(:topic) { Fabricate(:topic) }
- let(:hidden_tag) { Fabricate(:tag, name: 'hidden') }
- let(:staff_tag_group) { Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name]) }
+ let(:hidden_tag) { Fabricate(:tag, name: "hidden") }
+ let(:staff_tag_group) do
+ Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name])
+ end
before do
SiteSetting.tagging_enabled = true
@@ -45,12 +53,12 @@ RSpec.describe SuggestedTopicSerializer do
topic.tags << hidden_tag
end
- it 'returns hidden tag to staff' do
+ it "returns hidden tag to staff" do
json = SuggestedTopicSerializer.new(topic, scope: Guardian.new(admin), root: false).as_json
expect(json[:tags]).to eq([hidden_tag.name])
end
- it 'does not return hidden tag to non-staff' do
+ it "does not return hidden tag to non-staff" do
json = SuggestedTopicSerializer.new(topic, scope: Guardian.new(user), root: false).as_json
expect(json[:tags]).to eq([])
end
diff --git a/spec/serializers/tag_group_serializer_spec.rb b/spec/serializers/tag_group_serializer_spec.rb
index c1defaa3022..56949522250 100644
--- a/spec/serializers/tag_group_serializer_spec.rb
+++ b/spec/serializers/tag_group_serializer_spec.rb
@@ -1,16 +1,14 @@
# frozen_string_literal: true
RSpec.describe TagGroupSerializer do
-
it "doesn't translate automatic group names in permissions" do
staff_group = Group.find(Group::AUTO_GROUPS[:staff])
staff_group.update_columns(name: "custom")
tag_group = Fabricate(:tag_group)
- tag_group.permissions = [[
- Group::AUTO_GROUPS[:staff],
- TagGroupPermission.permission_types[:full]
- ]]
+ tag_group.permissions = [
+ [Group::AUTO_GROUPS[:staff], TagGroupPermission.permission_types[:full]],
+ ]
tag_group.save!
serialized = TagGroupSerializer.new(tag_group, root: false).as_json
@@ -25,5 +23,4 @@ RSpec.describe TagGroupSerializer do
serialized = TagGroupSerializer.new(tag_group, root: false).as_json
expect(serialized[:tag_names]).to eq([tag.name])
end
-
end
diff --git a/spec/serializers/theme_serializer_spec.rb b/spec/serializers/theme_serializer_spec.rb
index c28a65406a0..5da8479d913 100644
--- a/spec/serializers/theme_serializer_spec.rb
+++ b/spec/serializers/theme_serializer_spec.rb
@@ -2,16 +2,19 @@
RSpec.describe ThemeSerializer do
describe "load theme settings" do
- it 'should add error message when settings format is invalid' do
+ it "should add error message when settings format is invalid" do
theme = Fabricate(:theme)
- Theme.any_instance.stubs(:settings).raises(ThemeSettingsParser::InvalidYaml, I18n.t("themes.settings_errors.invalid_yaml"))
+ Theme
+ .any_instance
+ .stubs(:settings)
+ .raises(ThemeSettingsParser::InvalidYaml, I18n.t("themes.settings_errors.invalid_yaml"))
serialized = ThemeSerializer.new(theme).as_json[:theme]
expect(serialized[:settings]).to be_nil
expect(serialized[:errors].count).to eq(1)
expect(serialized[:errors][0]).to eq(I18n.t("themes.settings_errors.invalid_yaml"))
end
- it 'should add errors messages from theme fields' do
+ it "should add errors messages from theme fields" do
error = "error when compiling theme field"
theme = Fabricate(:theme)
theme_field = Fabricate(:theme_field, error: error, theme: theme)
diff --git a/spec/serializers/topic_link_serializer_spec.rb b/spec/serializers/topic_link_serializer_spec.rb
index adf1534103d..3e893ef4510 100644
--- a/spec/serializers/topic_link_serializer_spec.rb
+++ b/spec/serializers/topic_link_serializer_spec.rb
@@ -1,9 +1,8 @@
# frozen_string_literal: true
RSpec.describe TopicLinkSerializer do
-
it "correctly serializes the topic link" do
- post = Fabricate(:post, raw: 'https://meta.discourse.org/')
+ post = Fabricate(:post, raw: "https://meta.discourse.org/")
TopicLink.extract_from(post)
serialized = described_class.new(post.topic_links.first, root: false).as_json
diff --git a/spec/serializers/topic_list_item_serializer_spec.rb b/spec/serializers/topic_list_item_serializer_spec.rb
index 0ca886f1696..f349a39089f 100644
--- a/spec/serializers/topic_list_item_serializer_spec.rb
+++ b/spec/serializers/topic_list_item_serializer_spec.rb
@@ -4,10 +4,11 @@ RSpec.describe TopicListItemSerializer do
let(:topic) do
date = Time.zone.now
- Fabricate(:topic,
- title: 'This is a test topic title',
+ Fabricate(
+ :topic,
+ title: "This is a test topic title",
created_at: date - 2.minutes,
- bumped_at: date
+ bumped_at: date,
)
end
@@ -20,21 +21,19 @@ RSpec.describe TopicListItemSerializer do
expect(serialized[:featured_link]).to eq(nil)
expect(serialized[:featured_link_root_domain]).to eq(nil)
- featured_link = 'http://meta.discourse.org'
+ featured_link = "http://meta.discourse.org"
topic.featured_link = featured_link
serialized = TopicListItemSerializer.new(topic, scope: Guardian.new, root: false).as_json
expect(serialized[:featured_link]).to eq(featured_link)
- expect(serialized[:featured_link_root_domain]).to eq('discourse.org')
+ expect(serialized[:featured_link_root_domain]).to eq("discourse.org")
end
- describe 'when topic featured link is disable' do
- before do
- SiteSetting.topic_featured_link_enabled = false
- end
+ describe "when topic featured link is disable" do
+ before { SiteSetting.topic_featured_link_enabled = false }
it "should not include the topic's featured link" do
- topic.featured_link = 'http://meta.discourse.org'
+ topic.featured_link = "http://meta.discourse.org"
serialized = TopicListItemSerializer.new(topic, scope: Guardian.new, root: false).as_json
expect(serialized[:featured_link]).to eq(nil)
@@ -42,11 +41,13 @@ RSpec.describe TopicListItemSerializer do
end
end
- describe 'hidden tags' do
+ describe "hidden tags" do
let(:admin) { Fabricate(:admin) }
let(:user) { Fabricate(:user) }
- let(:hidden_tag) { Fabricate(:tag, name: 'hidden') }
- let(:staff_tag_group) { Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name]) }
+ let(:hidden_tag) { Fabricate(:tag, name: "hidden") }
+ let(:staff_tag_group) do
+ Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name])
+ end
before do
SiteSetting.tagging_enabled = true
@@ -54,40 +55,38 @@ RSpec.describe TopicListItemSerializer do
topic.tags << hidden_tag
end
- it 'returns hidden tag to staff' do
- json = TopicListItemSerializer.new(topic,
- scope: Guardian.new(admin),
- root: false
- ).as_json
+ it "returns hidden tag to staff" do
+ json = TopicListItemSerializer.new(topic, scope: Guardian.new(admin), root: false).as_json
expect(json[:tags]).to eq([hidden_tag.name])
end
- it 'does not return hidden tag to non-staff' do
- json = TopicListItemSerializer.new(topic,
- scope: Guardian.new(user),
- root: false
- ).as_json
+ it "does not return hidden tag to non-staff" do
+ json = TopicListItemSerializer.new(topic, scope: Guardian.new(user), root: false).as_json
expect(json[:tags]).to eq([])
end
- it 'accepts an option to remove hidden tags' do
- json = TopicListItemSerializer.new(topic,
- scope: Guardian.new(user),
- hidden_tag_names: [hidden_tag.name],
- root: false
- ).as_json
+ it "accepts an option to remove hidden tags" do
+ json =
+ TopicListItemSerializer.new(
+ topic,
+ scope: Guardian.new(user),
+ hidden_tag_names: [hidden_tag.name],
+ root: false,
+ ).as_json
expect(json[:tags]).to eq([])
end
- it 'return posters' do
- json = TopicListItemSerializer.new(topic,
- scope: Guardian.new(user),
- hidden_tag_names: [hidden_tag.name],
- root: false
- ).as_json
+ it "return posters" do
+ json =
+ TopicListItemSerializer.new(
+ topic,
+ scope: Guardian.new(user),
+ hidden_tag_names: [hidden_tag.name],
+ root: false,
+ ).as_json
expect(json[:posters].length).to eq(1)
end
diff --git a/spec/serializers/topic_list_serializer_spec.rb b/spec/serializers/topic_list_serializer_spec.rb
index ef27b2f4ecd..3811067b264 100644
--- a/spec/serializers/topic_list_serializer_spec.rb
+++ b/spec/serializers/topic_list_serializer_spec.rb
@@ -3,18 +3,12 @@
RSpec.describe TopicListSerializer do
fab!(:user) { Fabricate(:user) }
- let(:topic) do
- Fabricate(:topic).tap do |t|
- t.allowed_user_ids = [t.user_id]
- end
- end
+ let(:topic) { Fabricate(:topic).tap { |t| t.allowed_user_ids = [t.user_id] } }
- it 'should return the right payload' do
+ it "should return the right payload" do
topic_list = TopicList.new(nil, user, [topic])
- serialized = described_class.new(topic_list,
- scope: Guardian.new(user)
- ).as_json
+ serialized = described_class.new(topic_list, scope: Guardian.new(user)).as_json
expect(serialized[:users].first[:id]).to eq(topic.user_id)
expect(serialized[:primary_groups]).to eq([])
diff --git a/spec/serializers/topic_tracking_state_serializer_spec.rb b/spec/serializers/topic_tracking_state_serializer_spec.rb
index 91b679d1bd5..cbe093e63f0 100644
--- a/spec/serializers/topic_tracking_state_serializer_spec.rb
+++ b/spec/serializers/topic_tracking_state_serializer_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe TopicTrackingStateSerializer do
SiteSetting.chat_enabled = false if defined?(::Chat)
end
- it 'serializes topic tracking state reports' do
+ it "serializes topic tracking state reports" do
report = TopicTrackingState.report(user)
serialized = described_class.new(report[0], scope: Guardian.new(user), root: false).as_json
@@ -31,7 +31,7 @@ RSpec.describe TopicTrackingStateSerializer do
DiscourseTagging.tag_topic_by_names(
post.topic,
Guardian.new(Discourse.system_user),
- ['bananas', 'apples']
+ %w[bananas apples],
)
report = TopicTrackingState.report(user)
diff --git a/spec/serializers/topic_view_details_serializer_spec.rb b/spec/serializers/topic_view_details_serializer_spec.rb
index 4369d1b8cfe..e9a9c4bcbf8 100644
--- a/spec/serializers/topic_view_details_serializer_spec.rb
+++ b/spec/serializers/topic_view_details_serializer_spec.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
RSpec.describe TopicViewDetailsSerializer do
- describe '#allowed_users' do
+ describe "#allowed_users" do
it "add the current user to the allowed user's list even if they are an allowed group member" do
participant = Fabricate(:user)
another_participant = Fabricate(:user)
@@ -10,15 +10,18 @@ RSpec.describe TopicViewDetailsSerializer do
participant_group.add(participant)
participant_group.add(another_participant)
- pm = Fabricate(:private_message_topic,
- topic_allowed_users: [
- Fabricate.build(:topic_allowed_user, user: participant),
- Fabricate.build(:topic_allowed_user, user: another_participant)
- ],
- topic_allowed_groups: [Fabricate.build(:topic_allowed_group, group: participant_group)]
- )
+ pm =
+ Fabricate(
+ :private_message_topic,
+ topic_allowed_users: [
+ Fabricate.build(:topic_allowed_user, user: participant),
+ Fabricate.build(:topic_allowed_user, user: another_participant),
+ ],
+ topic_allowed_groups: [Fabricate.build(:topic_allowed_group, group: participant_group)],
+ )
- serializer = described_class.new(TopicView.new(pm, participant), scope: Guardian.new(participant))
+ serializer =
+ described_class.new(TopicView.new(pm, participant), scope: Guardian.new(participant))
allowed_users = serializer.as_json.dig(:topic_view_details, :allowed_users).map { |u| u[:id] }
expect(allowed_users).to contain_exactly(participant.id)
@@ -27,14 +30,10 @@ RSpec.describe TopicViewDetailsSerializer do
describe "#can_permanently_delete" do
let(:post) do
- Fabricate(:post).tap do |post|
- PostDestroyer.new(Discourse.system_user, post).destroy
- end
+ Fabricate(:post).tap { |post| PostDestroyer.new(Discourse.system_user, post).destroy }
end
- before do
- SiteSetting.can_permanently_delete = true
- end
+ before { SiteSetting.can_permanently_delete = true }
it "is true for admins" do
admin = Fabricate(:admin)
@@ -46,7 +45,8 @@ RSpec.describe TopicViewDetailsSerializer do
it "is not present for moderators" do
moderator = Fabricate(:moderator)
- serializer = described_class.new(TopicView.new(post.topic, moderator), scope: Guardian.new(moderator))
+ serializer =
+ described_class.new(TopicView.new(post.topic, moderator), scope: Guardian.new(moderator))
expect(serializer.as_json.dig(:topic_view_details, :can_permanently_delete)).to eq(nil)
end
end
diff --git a/spec/serializers/topic_view_posts_serializer_spec.rb b/spec/serializers/topic_view_posts_serializer_spec.rb
index ae70bb3be42..e0aa849c017 100644
--- a/spec/serializers/topic_view_posts_serializer_spec.rb
+++ b/spec/serializers/topic_view_posts_serializer_spec.rb
@@ -1,28 +1,35 @@
# frozen_string_literal: true
RSpec.describe TopicViewPostsSerializer do
-
let(:user) { Fabricate(:user) }
let(:post) { Fabricate(:post) }
let(:topic) { post.topic }
- let!(:reviewable) { Fabricate(:reviewable_flagged_post,
- created_by: user,
- target: post,
- topic: topic,
- reviewable_scores: [
- Fabricate(:reviewable_score, reviewable_score_type: 0, status: ReviewableScore.statuses[:pending]),
- Fabricate(:reviewable_score, reviewable_score_type: 0, status: ReviewableScore.statuses[:ignored])
- ]
- )}
+ let!(:reviewable) do
+ Fabricate(
+ :reviewable_flagged_post,
+ created_by: user,
+ target: post,
+ topic: topic,
+ reviewable_scores: [
+ Fabricate(
+ :reviewable_score,
+ reviewable_score_type: 0,
+ status: ReviewableScore.statuses[:pending],
+ ),
+ Fabricate(
+ :reviewable_score,
+ reviewable_score_type: 0,
+ status: ReviewableScore.statuses[:ignored],
+ ),
+ ],
+ )
+ end
- it 'should return the right attributes' do
+ it "should return the right attributes" do
topic_view = TopicView.new(topic, user, post_ids: [post.id])
- serializer = TopicViewPostsSerializer.new(
- topic_view,
- scope: Guardian.new(Fabricate(:admin)),
- root: false
- )
+ serializer =
+ TopicViewPostsSerializer.new(topic_view, scope: Guardian.new(Fabricate(:admin)), root: false)
body = JSON.parse(serializer.to_json)
@@ -37,6 +44,5 @@ RSpec.describe TopicViewPostsSerializer do
expect(body["post_stream"]["stream"]).to eq(nil)
expect(body["post_stream"]["timeline_lookup"]).to eq(nil)
expect(body["post_stream"]["gaps"]).to eq(nil)
-
end
end
diff --git a/spec/serializers/topic_view_serializer_spec.rb b/spec/serializers/topic_view_serializer_spec.rb
index d63674c3bc9..1d064811c80 100644
--- a/spec/serializers/topic_view_serializer_spec.rb
+++ b/spec/serializers/topic_view_serializer_spec.rb
@@ -3,7 +3,8 @@
RSpec.describe TopicViewSerializer do
def serialize_topic(topic, user_arg)
topic_view = TopicView.new(topic.id, user_arg)
- serializer = TopicViewSerializer.new(topic_view, scope: Guardian.new(user_arg), root: false).as_json
+ serializer =
+ TopicViewSerializer.new(topic_view, scope: Guardian.new(user_arg), root: false).as_json
JSON.parse(MultiJson.dump(serializer)).deep_symbolize_keys!
end
@@ -17,11 +18,11 @@ RSpec.describe TopicViewSerializer do
fab!(:user_2) { Fabricate(:user) }
fab!(:admin) { Fabricate(:admin) }
- describe '#featured_link and #featured_link_root_domain' do
- fab!(:featured_link) { 'http://meta.discourse.org' }
+ describe "#featured_link and #featured_link_root_domain" do
+ fab!(:featured_link) { "http://meta.discourse.org" }
- describe 'when topic featured link is disable' do
- it 'should return the right attributes' do
+ describe "when topic featured link is disable" do
+ it "should return the right attributes" do
topic.update!(featured_link: featured_link)
SiteSetting.topic_featured_link_enabled = false
@@ -32,62 +33,61 @@ RSpec.describe TopicViewSerializer do
end
end
- describe 'when topic featured link is enabled' do
- it 'should return the right attributes' do
+ describe "when topic featured link is enabled" do
+ it "should return the right attributes" do
topic.update!(featured_link: featured_link)
json = serialize_topic(topic, user)
expect(json[:featured_link]).to eq(featured_link)
- expect(json[:featured_link_root_domain]).to eq('discourse.org')
+ expect(json[:featured_link_root_domain]).to eq("discourse.org")
end
end
end
- describe '#external_id' do
- describe 'when a topic has an external_id' do
- before { topic.update!(external_id: '42-asdf') }
+ describe "#external_id" do
+ describe "when a topic has an external_id" do
+ before { topic.update!(external_id: "42-asdf") }
- it 'should return the external_id' do
+ it "should return the external_id" do
json = serialize_topic(topic, user)
- expect(json[:external_id]).to eq('42-asdf')
+ expect(json[:external_id]).to eq("42-asdf")
end
end
end
- describe '#image_url' do
+ describe "#image_url" do
fab!(:image_upload) { Fabricate(:image_upload, width: 5000, height: 5000) }
- describe 'when a topic has an image' do
+ describe "when a topic has an image" do
before { topic.update!(image_upload_id: image_upload.id) }
- it 'should return the image url' do
+ it "should return the image url" do
json = serialize_topic(topic, user)
expect(json[:image_url]).to end_with(image_upload.url)
end
- it 'should have thumbnail jobs enqueued' do
+ it "should have thumbnail jobs enqueued" do
SiteSetting.create_thumbnails = true
Discourse.redis.del(topic.thumbnail_job_redis_key([]))
json = nil
- expect do
- json = serialize_topic(topic, user)
- end.to change { Jobs::GenerateTopicThumbnails.jobs.size }.by(1)
+ expect do json = serialize_topic(topic, user) end.to change {
+ Jobs::GenerateTopicThumbnails.jobs.size
+ }.by(1)
topic.generate_thumbnails!
- expect do
- json = serialize_topic(topic, user)
- end.not_to change { Jobs::GenerateTopicThumbnails.jobs.size }
+ expect do json = serialize_topic(topic, user) end.not_to change {
+ Jobs::GenerateTopicThumbnails.jobs.size
+ }
end
end
- describe 'when a topic does not contain an image' do
- it 'should return a nil image url' do
-
+ describe "when a topic does not contain an image" do
+ it "should return a nil image url" do
json = serialize_topic(topic, user)
expect(json.has_key? :image_url).to eq(true)
@@ -96,30 +96,26 @@ RSpec.describe TopicViewSerializer do
end
end
- describe '#suggested_topics' do
- before do
- Group.refresh_automatic_groups!
- end
+ describe "#suggested_topics" do
+ before { Group.refresh_automatic_groups! }
fab!(:topic2) { Fabricate(:topic) }
- before do
- TopicUser.update_last_read(user, topic2.id, 0, 0, 0)
- end
+ before { TopicUser.update_last_read(user, topic2.id, 0, 0, 0) }
- describe 'when loading last chunk' do
- it 'should include suggested topics' do
+ describe "when loading last chunk" do
+ it "should include suggested topics" do
json = serialize_topic(topic, user)
expect(json[:suggested_topics].first[:id]).to eq(topic2.id)
end
end
- describe 'when not loading last chunk' do
+ describe "when not loading last chunk" do
fab!(:post) { Fabricate(:post, topic: topic) }
fab!(:post2) { Fabricate(:post, topic: topic) }
- it 'should not include suggested topics' do
+ it "should not include suggested topics" do
post
post2
topic_view = TopicView.new(topic.id, user, post_ids: [post.id])
@@ -130,37 +126,37 @@ RSpec.describe TopicViewSerializer do
end
end
- describe 'with private messages' do
- before do
- Group.refresh_automatic_groups!
- end
+ describe "with private messages" do
+ before { Group.refresh_automatic_groups! }
fab!(:topic) do
- Fabricate(:private_message_topic,
+ Fabricate(
+ :private_message_topic,
highest_post_number: 1,
- topic_allowed_users: [
- Fabricate.build(:topic_allowed_user, user: user)
- ]
+ topic_allowed_users: [Fabricate.build(:topic_allowed_user, user: user)],
)
end
fab!(:topic2) do
- Fabricate(:private_message_topic,
+ Fabricate(
+ :private_message_topic,
highest_post_number: 1,
- topic_allowed_users: [
- Fabricate.build(:topic_allowed_user, user: user)
- ]
+ topic_allowed_users: [Fabricate.build(:topic_allowed_user, user: user)],
)
end
- it 'includes suggested topics' do
- TopicUser.change(user, topic2.id, notification_level: TopicUser.notification_levels[:tracking])
+ it "includes suggested topics" do
+ TopicUser.change(
+ user,
+ topic2.id,
+ notification_level: TopicUser.notification_levels[:tracking],
+ )
json = serialize_topic(topic, user)
expect(json[:suggested_topics].map { |t| t[:id] }).to contain_exactly(topic2.id)
end
- it 'does not include suggested topics if all PMs are read' do
+ it "does not include suggested topics if all PMs are read" do
TopicUser.update_last_read(user, topic2.id, 1, 1, 0)
json = serialize_topic(topic, user)
@@ -169,21 +165,19 @@ RSpec.describe TopicViewSerializer do
end
end
- describe '#suggested_group_name' do
+ describe "#suggested_group_name" do
fab!(:pm) { Fabricate(:private_message_post).topic }
fab!(:group) { Fabricate(:group) }
- before do
- Group.refresh_automatic_groups!
- end
+ before { Group.refresh_automatic_groups! }
- it 'is nil for a regular topic' do
+ it "is nil for a regular topic" do
json = serialize_topic(topic, user)
expect(json[:suggested_group_name]).to eq(nil)
end
- it 'is nil if user is an allowed user of the private message' do
+ it "is nil if user is an allowed user of the private message" do
pm.allowed_users << user
json = serialize_topic(pm, user)
@@ -191,7 +185,7 @@ RSpec.describe TopicViewSerializer do
expect(json[:suggested_group_name]).to eq(nil)
end
- it 'returns the right group name if user is part of allowed group in the private message' do
+ it "returns the right group name if user is part of allowed group in the private message" do
pm.allowed_groups << group
group.add(user)
@@ -201,22 +195,30 @@ RSpec.describe TopicViewSerializer do
end
end
- describe 'when tags added to private message topics' do
+ describe "when tags added to private message topics" do
fab!(:moderator) { Fabricate(:moderator) }
fab!(:tag) { Fabricate(:tag) }
fab!(:pm) do
- Fabricate(:private_message_topic, tags: [tag], topic_allowed_users: [
- Fabricate.build(:topic_allowed_user, user: moderator),
- Fabricate.build(:topic_allowed_user, user: user)
- ])
+ Fabricate(
+ :private_message_topic,
+ tags: [tag],
+ topic_allowed_users: [
+ Fabricate.build(:topic_allowed_user, user: moderator),
+ Fabricate.build(:topic_allowed_user, user: user),
+ ],
+ )
end
fab!(:group) { Fabricate(:group) }
fab!(:pm_between_reg_users) do
- Fabricate(:private_message_topic, tags: [tag], topic_allowed_users: [
- Fabricate.build(:topic_allowed_user, user: user),
- Fabricate.build(:topic_allowed_user, user: user_2)
- ])
+ Fabricate(
+ :private_message_topic,
+ tags: [tag],
+ topic_allowed_users: [
+ Fabricate.build(:topic_allowed_user, user: user),
+ Fabricate.build(:topic_allowed_user, user: user_2),
+ ],
+ )
end
before do
@@ -257,29 +259,29 @@ RSpec.describe TopicViewSerializer do
end
end
- describe 'with hidden tags' do
- fab!(:hidden_tag) { Fabricate(:tag, name: 'hidden') }
- fab!(:staff_tag_group) { Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name]) }
-
- before do
- topic.tags << hidden_tag
+ describe "with hidden tags" do
+ fab!(:hidden_tag) { Fabricate(:tag, name: "hidden") }
+ fab!(:staff_tag_group) do
+ Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name])
end
- it 'returns hidden tag to staff' do
+ before { topic.tags << hidden_tag }
+
+ it "returns hidden tag to staff" do
json = serialize_topic(topic, admin)
expect(json[:tags]).to eq([hidden_tag.name])
end
- it 'does not return hidden tag to non-staff' do
+ it "does not return hidden tag to non-staff" do
json = serialize_topic(topic, user)
expect(json[:tags]).to eq([])
end
end
- describe 'tags order' do
- fab!(:tag1) { Fabricate(:tag, name: 'ctag', description: "c description", topic_count: 5) }
- fab!(:tag2) { Fabricate(:tag, name: 'btag', description: "b description", topic_count: 9) }
- fab!(:tag3) { Fabricate(:tag, name: 'atag', description: "a description", topic_count: 3) }
+ describe "tags order" do
+ fab!(:tag1) { Fabricate(:tag, name: "ctag", description: "c description", topic_count: 5) }
+ fab!(:tag2) { Fabricate(:tag, name: "btag", description: "b description", topic_count: 9) }
+ fab!(:tag3) { Fabricate(:tag, name: "atag", description: "a description", topic_count: 3) }
before do
topic.tags << tag1
@@ -287,16 +289,18 @@ RSpec.describe TopicViewSerializer do
topic.tags << tag3
end
- it 'tags are automatically sorted by tag popularity' do
+ it "tags are automatically sorted by tag popularity" do
json = serialize_topic(topic, user)
- expect(json[:tags]).to eq(%w(btag ctag atag))
- expect(json[:tags_descriptions]).to eq({ btag: "b description", ctag: "c description", atag: "a description" })
+ expect(json[:tags]).to eq(%w[btag ctag atag])
+ expect(json[:tags_descriptions]).to eq(
+ { btag: "b description", ctag: "c description", atag: "a description" },
+ )
end
- it 'tags can be sorted alphabetically' do
+ it "tags can be sorted alphabetically" do
SiteSetting.tags_sort_alphabetically = true
json = serialize_topic(topic, user)
- expect(json[:tags]).to eq(%w(atag btag ctag))
+ expect(json[:tags]).to eq(%w[atag btag ctag])
end
end
@@ -323,15 +327,15 @@ RSpec.describe TopicViewSerializer do
describe "pending posts" do
context "when the queue is enabled" do
- before do
- SiteSetting.approve_post_count = 1
- end
+ before { SiteSetting.approve_post_count = 1 }
fab!(:queued_post) do
ReviewableQueuedPost.needs_review!(
topic: topic,
- payload: { raw: "hello my raw contents" },
- created_by: user
+ payload: {
+ raw: "hello my raw contents",
+ },
+ created_by: user,
)
end
@@ -362,7 +366,12 @@ RSpec.describe TopicViewSerializer do
context "with details" do
it "returns the details object" do
PostCreator.create!(user, topic_id: topic.id, raw: "this is my post content")
- topic.topic_links.create!(user: user, url: 'https://discourse.org', domain: 'discourse.org', clicks: 100)
+ topic.topic_links.create!(
+ user: user,
+ url: "https://discourse.org",
+ domain: "discourse.org",
+ clicks: 100,
+ )
json = serialize_topic(topic, admin)
details = json[:details]
@@ -388,7 +397,7 @@ RSpec.describe TopicViewSerializer do
GroupUser.create(group: group2, user: user)
pm = Fabricate(:private_message_topic)
- pm.update(archetype: 'private_message')
+ pm.update(archetype: "private_message")
pm.topic_allowed_groups.create!(group: group)
pm.topic_allowed_groups.create!(group: group2)
@@ -436,11 +445,9 @@ RSpec.describe TopicViewSerializer do
fab!(:topic) { Fabricate(:topic, category: category) }
let(:user) { group_user.user }
- before do
- SiteSetting.enable_category_group_moderation = true
- end
+ before { SiteSetting.enable_category_group_moderation = true }
- it 'explicitly returns can_edit' do
+ it "explicitly returns can_edit" do
json = serialize_topic(topic, user)
expect(json[:details][:can_edit]).to eq(true)
@@ -456,9 +463,7 @@ RSpec.describe TopicViewSerializer do
fab!(:published_page) { Fabricate(:published_page, topic: topic) }
context "when page publishing is disabled" do
- before do
- SiteSetting.enable_page_publishing = false
- end
+ before { SiteSetting.enable_page_publishing = false }
it "doesn't return the published page if not enabled" do
json = serialize_topic(topic, admin)
@@ -467,9 +472,7 @@ RSpec.describe TopicViewSerializer do
end
context "when page publishing is enabled" do
- before do
- SiteSetting.enable_page_publishing = true
- end
+ before { SiteSetting.enable_page_publishing = true }
context "when not staff" do
it "doesn't return the published page" do
@@ -502,16 +505,17 @@ RSpec.describe TopicViewSerializer do
context "when viewing private messages when enable_category_group_moderation is enabled" do
fab!(:pm_topic) do
- Fabricate(:private_message_topic, topic_allowed_users: [
- Fabricate.build(:topic_allowed_user, user: user),
- Fabricate.build(:topic_allowed_user, user: admin)
- ])
+ Fabricate(
+ :private_message_topic,
+ topic_allowed_users: [
+ Fabricate.build(:topic_allowed_user, user: user),
+ Fabricate.build(:topic_allowed_user, user: admin),
+ ],
+ )
end
fab!(:post) { Fabricate(:post, topic: pm_topic) }
- before do
- SiteSetting.enable_category_group_moderation = true
- end
+ before { SiteSetting.enable_category_group_moderation = true }
# Ensure having enable_category_group_moderation turned on doesn't break private messages
it "should return posts" do
@@ -520,9 +524,9 @@ RSpec.describe TopicViewSerializer do
end
end
- describe '#user_last_posted_at' do
- context 'when the slow mode is disabled' do
- it 'returns nil' do
+ describe "#user_last_posted_at" do
+ context "when the slow mode is disabled" do
+ it "returns nil" do
Fabricate(:topic_user, user: user, topic: topic, last_posted_at: 6.hours.ago)
json = serialize_topic(topic, user)
@@ -531,10 +535,10 @@ RSpec.describe TopicViewSerializer do
end
end
- context 'when the slow mode is enabled' do
+ context "when the slow mode is enabled" do
before { topic.update!(slow_mode_seconds: 1000) }
- it 'returns nil if no user is given' do
+ it "returns nil if no user is given" do
json = serialize_topic(topic, nil)
expect(json[:user_last_posted_at]).to be_nil
@@ -546,7 +550,7 @@ RSpec.describe TopicViewSerializer do
expect(json[:user_last_posted_at]).to be_nil
end
- it 'returns the last time the user posted' do
+ it "returns the last time the user posted" do
Fabricate(:topic_user, user: user, topic: topic, last_posted_at: 6.hours.ago)
json = serialize_topic(topic, user)
@@ -555,11 +559,11 @@ RSpec.describe TopicViewSerializer do
end
end
- describe '#requested_group_name' do
+ describe "#requested_group_name" do
fab!(:pm) { Fabricate(:private_message_post).topic }
fab!(:group) { Fabricate(:group) }
- it 'should return the right group name when PM is a group membership request' do
+ it "should return the right group name when PM is a group membership request" do
pm.custom_fields[:requested_group_id] = group.id
pm.save!
@@ -570,40 +574,41 @@ RSpec.describe TopicViewSerializer do
expect(json[:requested_group_name]).to eq(group.name)
end
- it 'should not include the attribute for a non group membership request PM' do
+ it "should not include the attribute for a non group membership request PM" do
json = serialize_topic(pm, pm.first_post.user)
expect(json[:requested_group_name]).to eq(nil)
end
end
- describe '#topic_timer' do
- it 'does not include the attribute when topic does not have a topic timer' do
+ describe "#topic_timer" do
+ it "does not include the attribute when topic does not have a topic timer" do
json = serialize_topic(topic, user)
expect(json[:topic_timer]).to eq(nil)
end
- it 'includes the attribute when topic has a public topic timer' do
- topic_timer = Fabricate(:topic_timer, topic: topic, execute_at: Time.utc(2022, 4, 6, 16, 23, 56))
+ it "includes the attribute when topic has a public topic timer" do
+ topic_timer =
+ Fabricate(:topic_timer, topic: topic, execute_at: Time.utc(2022, 4, 6, 16, 23, 56))
json = serialize_topic(topic, user)
expect(json[:topic_timer][:id]).to eq(topic_timer.id)
expect(json[:topic_timer][:based_on_last_post]).to eq(false)
expect(json[:topic_timer][:category_id]).to eq(nil)
expect(json[:topic_timer][:duration_minutes]).to eq(nil)
- expect(json[:topic_timer][:execute_at]).to eq('2022-04-06T16:23:56.000Z')
+ expect(json[:topic_timer][:execute_at]).to eq("2022-04-06T16:23:56.000Z")
expect(json[:topic_timer][:status_type]).to eq("close")
end
- it 'does not include the attribute for category topic timer where category is restricted to user' do
+ it "does not include the attribute for category topic timer where category is restricted to user" do
category = Fabricate(:category, read_restricted: true)
- Fabricate(:topic_timer,
+ Fabricate(
+ :topic_timer,
topic: topic,
category_id: category.id,
- status_type:
- TopicTimer.types[:publish_to_category]
+ status_type: TopicTimer.types[:publish_to_category],
)
json = serialize_topic(topic, user)
@@ -611,15 +616,16 @@ RSpec.describe TopicViewSerializer do
expect(json[:topic_timer]).to eq(nil)
end
- it 'includes the attribute for category topic timer where category is not restricted to user' do
+ it "includes the attribute for category topic timer where category is not restricted to user" do
category = Fabricate(:category, read_restricted: false)
- topic_timer = Fabricate(:topic_timer,
- topic: topic,
- category_id: category.id,
- status_type:
- TopicTimer.types[:publish_to_category]
- )
+ topic_timer =
+ Fabricate(
+ :topic_timer,
+ topic: topic,
+ category_id: category.id,
+ status_type: TopicTimer.types[:publish_to_category],
+ )
json = serialize_topic(topic, user)
diff --git a/spec/serializers/upload_serializer_spec.rb b/spec/serializers/upload_serializer_spec.rb
index 70ec9d32274..b2734c38822 100644
--- a/spec/serializers/upload_serializer_spec.rb
+++ b/spec/serializers/upload_serializer_spec.rb
@@ -4,15 +4,15 @@ RSpec.describe UploadSerializer do
fab!(:upload) { Fabricate(:upload) }
let(:subject) { UploadSerializer.new(upload, root: false) }
- it 'should render without errors' do
+ it "should render without errors" do
json_data = JSON.parse(subject.to_json)
- expect(json_data['id']).to eql upload.id
- expect(json_data['width']).to eql upload.width
- expect(json_data['height']).to eql upload.height
- expect(json_data['thumbnail_width']).to eql upload.thumbnail_width
- expect(json_data['thumbnail_height']).to eql upload.thumbnail_height
- expect(json_data['short_path']).to eql upload.short_path
+ expect(json_data["id"]).to eql upload.id
+ expect(json_data["width"]).to eql upload.width
+ expect(json_data["height"]).to eql upload.height
+ expect(json_data["thumbnail_width"]).to eql upload.thumbnail_width
+ expect(json_data["thumbnail_height"]).to eql upload.thumbnail_height
+ expect(json_data["short_path"]).to eql upload.short_path
end
context "when the upload is secure" do
diff --git a/spec/serializers/user_auth_token_serializer_spec.rb b/spec/serializers/user_auth_token_serializer_spec.rb
index b33cfa291ea..f90bf21eb0b 100644
--- a/spec/serializers/user_auth_token_serializer_spec.rb
+++ b/spec/serializers/user_auth_token_serializer_spec.rb
@@ -1,23 +1,20 @@
# frozen_string_literal: true
RSpec.describe UserAuthTokenSerializer do
-
fab!(:user) { Fabricate(:moderator) }
- let(:token) { UserAuthToken.generate!(user_id: user.id, client_ip: '2a02:ea00::', staff: true) }
+ let(:token) { UserAuthToken.generate!(user_id: user.id, client_ip: "2a02:ea00::", staff: true) }
- before(:each) do
- DiscourseIpInfo.open_db(File.join(Rails.root, 'spec', 'fixtures', 'mmdb'))
+ before(:each) { DiscourseIpInfo.open_db(File.join(Rails.root, "spec", "fixtures", "mmdb")) }
+
+ it "serializes user auth tokens with respect to user locale" do
+ I18n.locale = "de"
+ json = UserAuthTokenSerializer.new(token, scope: Guardian.new(user), root: false).as_json
+ expect(json[:location]).to include("Schweiz")
end
- it 'serializes user auth tokens with respect to user locale' do
- I18n.locale = 'de'
+ it "correctly translates Discourse locale to MaxMindDb locale" do
+ I18n.locale = "zh_CN"
json = UserAuthTokenSerializer.new(token, scope: Guardian.new(user), root: false).as_json
- expect(json[:location]).to include('Schweiz')
- end
-
- it 'correctly translates Discourse locale to MaxMindDb locale' do
- I18n.locale = 'zh_CN'
- json = UserAuthTokenSerializer.new(token, scope: Guardian.new(user), root: false).as_json
- expect(json[:location]).to include('瑞士')
+ expect(json[:location]).to include("瑞士")
end
end
diff --git a/spec/serializers/user_badge_serializer_spec.rb b/spec/serializers/user_badge_serializer_spec.rb
index 941c3445ef4..f4782e63f7c 100644
--- a/spec/serializers/user_badge_serializer_spec.rb
+++ b/spec/serializers/user_badge_serializer_spec.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
RSpec.describe UserBadgeSerializer do
- describe '#topic' do
+ describe "#topic" do
fab!(:user) { Fabricate(:user) }
fab!(:admin) { Fabricate(:admin) }
fab!(:post) { Fabricate(:post) }
@@ -9,57 +9,65 @@ RSpec.describe UserBadgeSerializer do
fab!(:user_badge) { Fabricate(:user_badge, badge: badge, post_id: post.id) }
let(:guardian) { Guardian.new(user_badge.user) }
- it 'is not included in serialized object when badge has not been configured to show posts' do
+ it "is not included in serialized object when badge has not been configured to show posts" do
badge.update!(show_posts: false)
guardian = Guardian.new
- serialized = described_class.new(user_badge,
- scope: guardian,
- allowed_user_badge_topic_ids: guardian.can_see_topic_ids(topic_ids: [post.topic_id])
- ).as_json
+ serialized =
+ described_class.new(
+ user_badge,
+ scope: guardian,
+ allowed_user_badge_topic_ids: guardian.can_see_topic_ids(topic_ids: [post.topic_id]),
+ ).as_json
expect(serialized[:topics]).to eq(nil)
end
- it 'is not included in serialized object when user badge is not associated with a post' do
+ it "is not included in serialized object when user badge is not associated with a post" do
user_badge.update!(post_id: nil)
- serialized = described_class.new(user_badge,
- scope: guardian,
- allowed_user_badge_topic_ids: guardian.can_see_topic_ids(topic_ids: [post.topic_id])
- ).as_json
+ serialized =
+ described_class.new(
+ user_badge,
+ scope: guardian,
+ allowed_user_badge_topic_ids: guardian.can_see_topic_ids(topic_ids: [post.topic_id]),
+ ).as_json
expect(serialized[:topics]).to eq(nil)
end
- it 'is not included in serialized object when user badge is not associated with a topic' do
+ it "is not included in serialized object when user badge is not associated with a topic" do
post.topic.destroy!
- serialized = described_class.new(user_badge,
- scope: guardian,
- allowed_user_badge_topic_ids: guardian.can_see_topic_ids(topic_ids: [post.topic_id])
- ).as_json
+ serialized =
+ described_class.new(
+ user_badge,
+ scope: guardian,
+ allowed_user_badge_topic_ids: guardian.can_see_topic_ids(topic_ids: [post.topic_id]),
+ ).as_json
expect(serialized[:topics]).to eq(nil)
end
- it 'is not included in serialized object when allowed_user_badge_topic_ids option is not provided' do
+ it "is not included in serialized object when allowed_user_badge_topic_ids option is not provided" do
serialized = described_class.new(user_badge, scope: guardian).as_json
expect(serialized[:topics]).to eq(nil)
end
- it 'is not included in serialized object when topic id is not present in allowed_user_badge_topic_ids option' do
- serialized = described_class.new(user_badge,
- scope: guardian,
- allowed_user_badge_topic_ids: guardian.can_see_topic_ids(topic_ids: [post.topic_id + 1])
- ).as_json
+ it "is not included in serialized object when topic id is not present in allowed_user_badge_topic_ids option" do
+ serialized =
+ described_class.new(
+ user_badge,
+ scope: guardian,
+ allowed_user_badge_topic_ids: guardian.can_see_topic_ids(topic_ids: [post.topic_id + 1]),
+ ).as_json
expect(serialized[:topics]).to eq(nil)
end
- it 'is included in serialized object for admin scope even if allowed_user_badge_topic_ids option is not provided' do
+ it "is included in serialized object for admin scope even if allowed_user_badge_topic_ids option is not provided" do
serialized = described_class.new(user_badge, scope: Guardian.new(admin)).as_json
serialized_topic = serialized[:topics][0]
@@ -71,11 +79,13 @@ RSpec.describe UserBadgeSerializer do
expect(serialized_topic[:posts_count]).to eq(post.topic.reload.posts_count)
end
- it 'is included in serialized object when topic id is present in allowed_user_badge_topic_ids option' do
- serialized = described_class.new(user_badge,
- scope: guardian,
- allowed_user_badge_topic_ids: guardian.can_see_topic_ids(topic_ids: [post.topic_id])
- ).as_json
+ it "is included in serialized object when topic id is present in allowed_user_badge_topic_ids option" do
+ serialized =
+ described_class.new(
+ user_badge,
+ scope: guardian,
+ allowed_user_badge_topic_ids: guardian.can_see_topic_ids(topic_ids: [post.topic_id]),
+ ).as_json
serialized_topic = serialized[:topics][0]
diff --git a/spec/serializers/user_bookmark_list_serializer_spec.rb b/spec/serializers/user_bookmark_list_serializer_spec.rb
index df14e2f6c30..9c90ef0f47a 100644
--- a/spec/serializers/user_bookmark_list_serializer_spec.rb
+++ b/spec/serializers/user_bookmark_list_serializer_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
RSpec.describe UserBookmarkListSerializer do
-
fab!(:user) { Fabricate(:user) }
context "for polymorphic bookmarks" do
@@ -24,7 +23,9 @@ RSpec.describe UserBookmarkListSerializer do
it "chooses the correct class of serializer for all the bookmarkable types" do
serializer = run_serializer
- expect(serializer.bookmarks.map(&:class).map(&:to_s)).to match_array(["UserTestBookmarkSerializer", "UserTopicBookmarkSerializer", "UserPostBookmarkSerializer"])
+ expect(serializer.bookmarks.map(&:class).map(&:to_s)).to match_array(
+ %w[UserTestBookmarkSerializer UserTopicBookmarkSerializer UserPostBookmarkSerializer],
+ )
end
end
end
diff --git a/spec/serializers/user_card_serializer_spec.rb b/spec/serializers/user_card_serializer_spec.rb
index 94c6efe2330..0edecd7f237 100644
--- a/spec/serializers/user_card_serializer_spec.rb
+++ b/spec/serializers/user_card_serializer_spec.rb
@@ -66,7 +66,6 @@ RSpec.describe UserCardSerializer do
expect(json[:pending_posts_count]).to eq 0
end
end
-
end
describe "#status" do
diff --git a/spec/serializers/user_post_bookmark_serializer_spec.rb b/spec/serializers/user_post_bookmark_serializer_spec.rb
index 676ebae13fe..d2c08bebd27 100644
--- a/spec/serializers/user_post_bookmark_serializer_spec.rb
+++ b/spec/serializers/user_post_bookmark_serializer_spec.rb
@@ -4,14 +4,12 @@ RSpec.describe UserPostBookmarkSerializer do
let(:user) { Fabricate(:user) }
let(:topic) { Fabricate(:topic) }
let(:post) { Fabricate(:post, user: user, topic: topic) }
- let!(:bookmark) { Fabricate(:bookmark, name: 'Test', user: user, bookmarkable: post) }
+ let!(:bookmark) { Fabricate(:bookmark, name: "Test", user: user, bookmarkable: post) }
describe "#highest_post_number" do
let(:whisperers_group) { Fabricate(:group) }
- before do
- SiteSetting.whispers_allowed_groups = "#{whisperers_group.id}"
- end
+ before { SiteSetting.whispers_allowed_groups = "#{whisperers_group.id}" }
it "uses the correct highest_post_number column based on whether the user is whisperer" do
Fabricate(:post, topic: topic)
diff --git a/spec/serializers/user_serializer_spec.rb b/spec/serializers/user_serializer_spec.rb
index 08fcb10aa41..f33b71431bb 100644
--- a/spec/serializers/user_serializer_spec.rb
+++ b/spec/serializers/user_serializer_spec.rb
@@ -6,7 +6,18 @@ RSpec.describe UserSerializer do
context "with a TL0 user seen as anonymous" do
let(:serializer) { UserSerializer.new(user, scope: Guardian.new, root: false) }
let(:json) { serializer.as_json }
- let(:untrusted_attributes) { %i{bio_raw bio_cooked bio_excerpt location website website_name profile_background card_background} }
+ let(:untrusted_attributes) do
+ %i[
+ bio_raw
+ bio_cooked
+ bio_excerpt
+ location
+ website
+ website_name
+ profile_background
+ card_background
+ ]
+ end
it "doesn't serialize untrusted attributes" do
untrusted_attributes.each { |attr| expect(json).not_to have_key(attr) }
@@ -20,11 +31,8 @@ RSpec.describe UserSerializer do
context "as moderator" do
it "serializes correctly" do
- json = UserSerializer.new(
- user,
- scope: Guardian.new(Fabricate(:moderator)),
- root: false
- ).as_json
+ json =
+ UserSerializer.new(user, scope: Guardian.new(Fabricate(:moderator)), root: false).as_json
expect(json[:group_users]).to eq(nil)
expect(json[:second_factor_enabled]).to eq(nil)
@@ -70,14 +78,46 @@ RSpec.describe UserSerializer do
category2 = Fabricate(:category)
category3 = Fabricate(:category)
category4 = Fabricate(:category)
- CategoryUser.create(category: category1, user: user, notification_level: CategoryUser.notification_levels[:muted])
- CategoryUser.create(category: Fabricate(:category), user: admin_user, notification_level: CategoryUser.notification_levels[:muted])
- CategoryUser.create(category: category2, user: user, notification_level: CategoryUser.notification_levels[:tracking])
- CategoryUser.create(category: Fabricate(:category), user: admin_user, notification_level: CategoryUser.notification_levels[:tracking])
- CategoryUser.create(category: category3, user: user, notification_level: CategoryUser.notification_levels[:watching])
- CategoryUser.create(category: Fabricate(:category), user: admin_user, notification_level: CategoryUser.notification_levels[:watching])
- CategoryUser.create(category: category4, user: user, notification_level: CategoryUser.notification_levels[:regular])
- CategoryUser.create(category: Fabricate(:category), user: admin_user, notification_level: CategoryUser.notification_levels[:regular])
+ CategoryUser.create(
+ category: category1,
+ user: user,
+ notification_level: CategoryUser.notification_levels[:muted],
+ )
+ CategoryUser.create(
+ category: Fabricate(:category),
+ user: admin_user,
+ notification_level: CategoryUser.notification_levels[:muted],
+ )
+ CategoryUser.create(
+ category: category2,
+ user: user,
+ notification_level: CategoryUser.notification_levels[:tracking],
+ )
+ CategoryUser.create(
+ category: Fabricate(:category),
+ user: admin_user,
+ notification_level: CategoryUser.notification_levels[:tracking],
+ )
+ CategoryUser.create(
+ category: category3,
+ user: user,
+ notification_level: CategoryUser.notification_levels[:watching],
+ )
+ CategoryUser.create(
+ category: Fabricate(:category),
+ user: admin_user,
+ notification_level: CategoryUser.notification_levels[:watching],
+ )
+ CategoryUser.create(
+ category: category4,
+ user: user,
+ notification_level: CategoryUser.notification_levels[:regular],
+ )
+ CategoryUser.create(
+ category: Fabricate(:category),
+ user: admin_user,
+ notification_level: CategoryUser.notification_levels[:regular],
+ )
expect(json[:muted_category_ids]).to eq([category1.id])
expect(json[:tracked_category_ids]).to eq([category2.id])
@@ -90,14 +130,46 @@ RSpec.describe UserSerializer do
tag2 = Fabricate(:tag)
tag3 = Fabricate(:tag)
tag4 = Fabricate(:tag)
- TagUser.create(tag: tag1, user: user, notification_level: TagUser.notification_levels[:muted])
- TagUser.create(tag: Fabricate(:tag), user: admin_user, notification_level: TagUser.notification_levels[:muted])
- TagUser.create(tag: tag2, user: user, notification_level: TagUser.notification_levels[:tracking])
- TagUser.create(tag: Fabricate(:tag), user: admin_user, notification_level: TagUser.notification_levels[:tracking])
- TagUser.create(tag: tag3, user: user, notification_level: TagUser.notification_levels[:watching])
- TagUser.create(tag: Fabricate(:tag), user: admin_user, notification_level: TagUser.notification_levels[:watching])
- TagUser.create(tag: tag4, user: user, notification_level: TagUser.notification_levels[:watching_first_post])
- TagUser.create(tag: Fabricate(:tag), user: admin_user, notification_level: TagUser.notification_levels[:watching_first_post])
+ TagUser.create(
+ tag: tag1,
+ user: user,
+ notification_level: TagUser.notification_levels[:muted],
+ )
+ TagUser.create(
+ tag: Fabricate(:tag),
+ user: admin_user,
+ notification_level: TagUser.notification_levels[:muted],
+ )
+ TagUser.create(
+ tag: tag2,
+ user: user,
+ notification_level: TagUser.notification_levels[:tracking],
+ )
+ TagUser.create(
+ tag: Fabricate(:tag),
+ user: admin_user,
+ notification_level: TagUser.notification_levels[:tracking],
+ )
+ TagUser.create(
+ tag: tag3,
+ user: user,
+ notification_level: TagUser.notification_levels[:watching],
+ )
+ TagUser.create(
+ tag: Fabricate(:tag),
+ user: admin_user,
+ notification_level: TagUser.notification_levels[:watching],
+ )
+ TagUser.create(
+ tag: tag4,
+ user: user,
+ notification_level: TagUser.notification_levels[:watching_first_post],
+ )
+ TagUser.create(
+ tag: Fabricate(:tag),
+ user: admin_user,
+ notification_level: TagUser.notification_levels[:watching_first_post],
+ )
expect(json[:muted_tags]).to eq([tag1.name])
expect(json[:tracked_tags]).to eq([tag2.name])
@@ -107,9 +179,7 @@ RSpec.describe UserSerializer do
end
context "with `enable_names` true" do
- before do
- SiteSetting.enable_names = true
- end
+ before { SiteSetting.enable_names = true }
it "has a name" do
expect(json[:name]).to be_present
@@ -117,9 +187,7 @@ RSpec.describe UserSerializer do
end
context "with `enable_names` false" do
- before do
- SiteSetting.enable_names = false
- end
+ before { SiteSetting.enable_names = false }
it "has a name" do
expect(json[:name]).to be_blank
@@ -140,68 +208,58 @@ RSpec.describe UserSerializer do
context "with filled out website" do
context "when website has a path" do
- before do
- user.user_profile.website = 'http://example.com/user'
- end
+ before { user.user_profile.website = "http://example.com/user" }
it "has a website with a path" do
- expect(json[:website]).to eq 'http://example.com/user'
+ expect(json[:website]).to eq "http://example.com/user"
end
it "returns complete website name with path" do
- expect(json[:website_name]).to eq 'example.com/user'
+ expect(json[:website_name]).to eq "example.com/user"
end
end
context "when website has a subdomain" do
- before do
- user.user_profile.website = 'http://subdomain.example.com/user'
- end
+ before { user.user_profile.website = "http://subdomain.example.com/user" }
it "has a website with a subdomain" do
- expect(json[:website]).to eq 'http://subdomain.example.com/user'
+ expect(json[:website]).to eq "http://subdomain.example.com/user"
end
it "returns website name with the subdomain" do
- expect(json[:website_name]).to eq 'subdomain.example.com/user'
+ expect(json[:website_name]).to eq "subdomain.example.com/user"
end
end
context "when website has www" do
- before do
- user.user_profile.website = 'http://www.example.com/user'
- end
+ before { user.user_profile.website = "http://www.example.com/user" }
it "has a website with the www" do
- expect(json[:website]).to eq 'http://www.example.com/user'
+ expect(json[:website]).to eq "http://www.example.com/user"
end
it "returns website name without the www" do
- expect(json[:website_name]).to eq 'example.com/user'
+ expect(json[:website_name]).to eq "example.com/user"
end
end
context "when website includes query parameters" do
- before do
- user.user_profile.website = 'http://example.com/user?ref=payme'
- end
+ before { user.user_profile.website = "http://example.com/user?ref=payme" }
it "has a website with query params" do
- expect(json[:website]).to eq 'http://example.com/user?ref=payme'
+ expect(json[:website]).to eq "http://example.com/user?ref=payme"
end
it "has a website name without query params" do
- expect(json[:website_name]).to eq 'example.com/user'
+ expect(json[:website_name]).to eq "example.com/user"
end
end
context "when website is not a valid url" do
- before do
- user.user_profile.website = 'invalid-url'
- end
+ before { user.user_profile.website = "invalid-url" }
it "has a website with the invalid url" do
- expect(json[:website]).to eq 'invalid-url'
+ expect(json[:website]).to eq "invalid-url"
end
it "has a nil website name" do
@@ -212,16 +270,16 @@ RSpec.describe UserSerializer do
context "with filled out bio" do
before do
- user.user_profile.bio_raw = 'my raw bio'
- user.user_profile.bio_cooked = 'my cooked bio'
+ user.user_profile.bio_raw = "my raw bio"
+ user.user_profile.bio_cooked = "my cooked bio"
end
it "has a bio" do
- expect(json[:bio_raw]).to eq 'my raw bio'
+ expect(json[:bio_raw]).to eq "my raw bio"
end
it "has a cooked bio" do
- expect(json[:bio_cooked]).to eq 'my cooked bio'
+ expect(json[:bio_cooked]).to eq "my cooked bio"
end
end
@@ -232,9 +290,7 @@ RSpec.describe UserSerializer do
end
context "when totp enabled" do
- before do
- User.any_instance.stubs(:totp_enabled?).returns(true)
- end
+ before { User.any_instance.stubs(:totp_enabled?).returns(true) }
it "is true" do
expect(json[:second_factor_enabled]).to eq(true)
@@ -242,9 +298,7 @@ RSpec.describe UserSerializer do
end
context "when security_keys enabled" do
- before do
- User.any_instance.stubs(:security_keys_enabled?).returns(true)
- end
+ before { User.any_instance.stubs(:security_keys_enabled?).returns(true) }
it "is true" do
expect(json[:second_factor_enabled]).to eq(true)
@@ -256,35 +310,34 @@ RSpec.describe UserSerializer do
fab!(:viewing_user) { Fabricate(:user) }
let(:scope) { Guardian.new(viewing_user) }
- it 'returns false values for muted and ignored' do
+ it "returns false values for muted and ignored" do
expect(json[:ignored]).to eq(false)
expect(json[:muted]).to eq(false)
end
- context 'when ignored' do
+ context "when ignored" do
before do
Fabricate(:ignored_user, user: viewing_user, ignored_user: user)
viewing_user.reload
end
- it 'returns true for ignored' do
+ it "returns true for ignored" do
expect(json[:ignored]).to eq(true)
expect(json[:muted]).to eq(false)
end
end
- context 'when muted' do
+ context "when muted" do
before do
Fabricate(:muted_user, user: viewing_user, muted_user: user)
viewing_user.reload
end
- it 'returns true for muted' do
+ it "returns true for muted" do
expect(json[:muted]).to eq(true)
expect(json[:ignored]).to eq(false)
end
end
-
end
end
@@ -293,8 +346,8 @@ RSpec.describe UserSerializer do
let(:json) { UserSerializer.new(user, scope: Guardian.new, root: false).as_json }
before do
- user.custom_fields['secret_field'] = 'Only for me to know'
- user.custom_fields['public_field'] = 'Everyone look here'
+ user.custom_fields["secret_field"] = "Only for me to know"
+ user.custom_fields["public_field"] = "Everyone look here"
user.save
end
@@ -304,9 +357,9 @@ RSpec.describe UserSerializer do
end
it "serializes the fields listed in public_user_custom_fields site setting" do
- SiteSetting.public_user_custom_fields = 'public_field'
- expect(json[:custom_fields]['public_field']).to eq(user.custom_fields['public_field'])
- expect(json[:custom_fields]['secret_field']).to eq(nil)
+ SiteSetting.public_user_custom_fields = "public_field"
+ expect(json[:custom_fields]["public_field"]).to eq(user.custom_fields["public_field"])
+ expect(json[:custom_fields]["secret_field"]).to eq(nil)
end
context "with user custom field" do
@@ -315,13 +368,11 @@ RSpec.describe UserSerializer do
plugin.allow_public_user_custom_field :public_field
end
- after do
- DiscoursePluginRegistry.reset!
- end
+ after { DiscoursePluginRegistry.reset! }
it "serializes the fields listed in public_user_custom_fields" do
- expect(json[:custom_fields]['public_field']).to eq(user.custom_fields['public_field'])
- expect(json[:custom_fields]['secret_field']).to eq(nil)
+ expect(json[:custom_fields]["public_field"]).to eq(user.custom_fields["public_field"])
+ expect(json[:custom_fields]["secret_field"]).to eq(nil)
end
end
end
@@ -335,20 +386,25 @@ RSpec.describe UserSerializer do
Fabricate(:user_field),
Fabricate(:user_field, show_on_profile: true),
Fabricate(:user_field, show_on_user_card: true),
- Fabricate(:user_field, show_on_user_card: true, show_on_profile: true)
+ Fabricate(:user_field, show_on_user_card: true, show_on_profile: true),
]
end
- let(:other_user_json) { UserSerializer.new(user, scope: Guardian.new(Fabricate(:user)), root: false).as_json }
+ let(:other_user_json) do
+ UserSerializer.new(user, scope: Guardian.new(Fabricate(:user)), root: false).as_json
+ end
let(:self_json) { UserSerializer.new(user, scope: Guardian.new(user), root: false).as_json }
- let(:admin_json) { UserSerializer.new(user, scope: Guardian.new(Fabricate(:admin)), root: false).as_json }
+ let(:admin_json) do
+ UserSerializer.new(user, scope: Guardian.new(Fabricate(:admin)), root: false).as_json
+ end
it "includes the correct fields for each audience" do
expect(admin_json[:user_fields].keys).to contain_exactly(*fields.map { |f| f.id.to_s })
- expect(other_user_json[:user_fields].keys).to contain_exactly(*fields[2..5].map { |f| f.id.to_s })
+ expect(other_user_json[:user_fields].keys).to contain_exactly(
+ *fields[2..5].map { |f| f.id.to_s },
+ )
expect(self_json[:user_fields].keys).to contain_exactly(*fields.map { |f| f.id.to_s })
end
-
end
context "with user_api_keys" do
@@ -357,10 +413,22 @@ RSpec.describe UserSerializer do
it "sorts keys by last used time" do
freeze_time
- user_api_key_0 = Fabricate(:readonly_user_api_key, user: user, last_used_at: 2.days.ago, revoked_at: Time.zone.now)
+ user_api_key_0 =
+ Fabricate(
+ :readonly_user_api_key,
+ user: user,
+ last_used_at: 2.days.ago,
+ revoked_at: Time.zone.now,
+ )
user_api_key_1 = Fabricate(:readonly_user_api_key, user: user, last_used_at: 7.days.ago)
user_api_key_2 = Fabricate(:readonly_user_api_key, user: user, last_used_at: 1.days.ago)
- user_api_key_3 = Fabricate(:readonly_user_api_key, user: user, last_used_at: 4.days.ago, revoked_at: Time.zone.now)
+ user_api_key_3 =
+ Fabricate(
+ :readonly_user_api_key,
+ user: user,
+ last_used_at: 4.days.ago,
+ revoked_at: Time.zone.now,
+ )
user_api_key_4 = Fabricate(:readonly_user_api_key, user: user, last_used_at: 3.days.ago)
json = UserSerializer.new(user, scope: Guardian.new(user), root: false).as_json
@@ -372,7 +440,7 @@ RSpec.describe UserSerializer do
end
end
- context 'for user sidebar attributes' do
+ context "for user sidebar attributes" do
include_examples "User Sidebar Serializer Attributes", described_class
it "does not include attributes when scoped to user that cannot edit user" do
diff --git a/spec/serializers/user_summary_serializer_spec.rb b/spec/serializers/user_summary_serializer_spec.rb
index 2907517d0d5..d085bab50cb 100644
--- a/spec/serializers/user_summary_serializer_spec.rb
+++ b/spec/serializers/user_summary_serializer_spec.rb
@@ -32,11 +32,14 @@ RSpec.describe UserSummarySerializer do
topic = Fabricate(:topic)
post = Fabricate(:post_with_external_links, user: topic.user, topic: topic)
TopicLink.extract_from(post)
- TopicLink.where(topic_id: topic.id).order(domain: :asc, url: :asc).each_with_index do |link, index|
- index.times do |i|
- TopicLinkClick.create(topic_link: link, ip_address: "192.168.1.#{i + 1}")
+ TopicLink
+ .where(topic_id: topic.id)
+ .order(domain: :asc, url: :asc)
+ .each_with_index do |link, index|
+ index.times do |i|
+ TopicLinkClick.create(topic_link: link, ip_address: "192.168.1.#{i + 1}")
+ end
end
- end
guardian = Guardian.new
summary = UserSummary.new(topic.user, guardian)
diff --git a/spec/serializers/web_hook_post_serializer_spec.rb b/spec/serializers/web_hook_post_serializer_spec.rb
index bbddb160e72..5e2774451ce 100644
--- a/spec/serializers/web_hook_post_serializer_spec.rb
+++ b/spec/serializers/web_hook_post_serializer_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe WebHookPostSerializer do
WebHookPostSerializer.new(post, scope: Guardian.new(u), root: false).as_json
end
- it 'should only include the required keys' do
+ it "should only include the required keys" do
expect(serialized_for_user(admin).keys).to contain_exactly(
:id,
:name,
@@ -52,7 +52,7 @@ RSpec.describe WebHookPostSerializer do
:topic_posts_count,
:topic_filtered_posts_count,
:topic_archetype,
- :category_slug
+ :category_slug,
)
end
@@ -60,7 +60,7 @@ RSpec.describe WebHookPostSerializer do
expect(serialized_for_user(admin)[:category_id]).to eq(post.topic.category_id)
end
- it 'should only include deleted topic title for staffs' do
+ it "should only include deleted topic title for staffs" do
topic = post.topic
PostDestroyer.new(Discourse.system_user, post).destroy
post.reload
diff --git a/spec/serializers/web_hook_topic_view_serializer_spec.rb b/spec/serializers/web_hook_topic_view_serializer_spec.rb
index 521e9d812f7..a720ddad652 100644
--- a/spec/serializers/web_hook_topic_view_serializer_spec.rb
+++ b/spec/serializers/web_hook_topic_view_serializer_spec.rb
@@ -5,18 +5,13 @@ RSpec.describe WebHookTopicViewSerializer do
fab!(:topic) { Fabricate(:topic) }
let(:serializer) do
- WebHookTopicViewSerializer.new(TopicView.new(topic),
- scope: Guardian.new(admin),
- root: false
- )
+ WebHookTopicViewSerializer.new(TopicView.new(topic), scope: Guardian.new(admin), root: false)
end
- before do
- SiteSetting.tagging_enabled = true
- end
+ before { SiteSetting.tagging_enabled = true }
- it 'should only include the keys that are sent out in the webhook' do
- expected_keys = %i{
+ it "should only include the keys that are sent out in the webhook" do
+ expected_keys = %i[
id
title
fancy_title
@@ -50,13 +45,13 @@ RSpec.describe WebHookTopicViewSerializer do
tags
tags_descriptions
thumbnails
- }
+ ]
keys = serializer.as_json.keys
expect(serializer.as_json.keys).to contain_exactly(*expected_keys)
- topic.external_id = 'external_id'
+ topic.external_id = "external_id"
expected_keys << :external_id
expect(serializer.as_json.keys).to contain_exactly(*expected_keys)
end
diff --git a/spec/serializers/web_hook_user_serializer_spec.rb b/spec/serializers/web_hook_user_serializer_spec.rb
index f671c172a8e..9b94a3f0e85 100644
--- a/spec/serializers/web_hook_user_serializer_spec.rb
+++ b/spec/serializers/web_hook_user_serializer_spec.rb
@@ -3,7 +3,7 @@
RSpec.describe WebHookUserSerializer do
let(:user) do
user = Fabricate(:user)
- SingleSignOnRecord.create!(user_id: user.id, external_id: '12345', last_payload: '')
+ SingleSignOnRecord.create!(user_id: user.id, external_id: "12345", last_payload: "")
user
end
@@ -21,10 +21,10 @@ RSpec.describe WebHookUserSerializer do
it "should include relevant user info" do
payload = serializer.as_json
expect(payload[:email]).to eq(user.email)
- expect(payload[:external_id]).to eq('12345')
+ expect(payload[:external_id]).to eq("12345")
end
- it 'should only include the required keys' do
+ it "should only include the required keys" do
expect(serializer.as_json.keys).to contain_exactly(
:id,
:username,
@@ -78,7 +78,7 @@ RSpec.describe WebHookUserSerializer do
:featured_user_badge_ids,
:invited_by,
:groups,
- :user_option
+ :user_option,
)
end
end
diff --git a/spec/serializers/wizard_serializer_spec.rb b/spec/serializers/wizard_serializer_spec.rb
index 329b6a6c507..d135a7a23c2 100644
--- a/spec/serializers/wizard_serializer_spec.rb
+++ b/spec/serializers/wizard_serializer_spec.rb
@@ -3,9 +3,7 @@
RSpec.describe WizardSerializer do
let(:admin) { Fabricate(:admin) }
- after do
- ColorScheme.hex_cache.clear
- end
+ after { ColorScheme.hex_cache.clear }
describe "color scheme" do
it "works with base colors" do
@@ -15,12 +13,19 @@ RSpec.describe WizardSerializer do
serializer = WizardSerializer.new(wizard, scope: Guardian.new(admin))
json = MultiJson.load(MultiJson.dump(serializer.as_json))
- expect(json['wizard']['current_color_scheme'][0]['name']).to eq('primary')
- expect(json['wizard']['current_color_scheme'][0]['hex']).to eq('222222')
+ expect(json["wizard"]["current_color_scheme"][0]["name"]).to eq("primary")
+ expect(json["wizard"]["current_color_scheme"][0]["hex"]).to eq("222222")
end
it "should provide custom colors correctly" do
- colors = ColorScheme.create_from_base(name: 'Customized', colors: { header_background: '00FF00', header_primary: '20CCFF' })
+ colors =
+ ColorScheme.create_from_base(
+ name: "Customized",
+ colors: {
+ header_background: "00FF00",
+ header_primary: "20CCFF",
+ },
+ )
theme = Fabricate(:theme, color_scheme_id: colors.id)
SiteSetting.default_theme_id = theme.id
@@ -31,7 +36,9 @@ RSpec.describe WizardSerializer do
# serializer.as_json leaves in Ruby objects, force to true json
json = MultiJson.load(MultiJson.dump(serializer.as_json))
- expect(json['wizard']['current_color_scheme'].to_s).to include('{"name"=>"header_background", "hex"=>"00FF00"}')
+ expect(json["wizard"]["current_color_scheme"].to_s).to include(
+ '{"name"=>"header_background", "hex"=>"00FF00"}',
+ )
end
end
@@ -45,22 +52,22 @@ RSpec.describe WizardSerializer do
SiteSetting.must_approve_users = true
json = MultiJson.load(MultiJson.dump(serializer.as_json))
- steps = json['wizard']['steps']
+ steps = json["wizard"]["steps"]
- expect(steps.first['id']).to eq('introduction')
- expect(steps.last['id']).to eq('corporate')
+ expect(steps.first["id"]).to eq("introduction")
+ expect(steps.last["id"]).to eq("corporate")
- privacy_step = steps.find { |s| s['id'] == 'privacy' }
+ privacy_step = steps.find { |s| s["id"] == "privacy" }
expect(privacy_step).to_not be_nil
- login_required_field = privacy_step['fields'].find { |f| f['id'] == 'login_required' }
- expect(login_required_field['value']).to eq(true)
+ login_required_field = privacy_step["fields"].find { |f| f["id"] == "login_required" }
+ expect(login_required_field["value"]).to eq(true)
- invite_only_field = privacy_step['fields'].find { |f| f['id'] == 'invite_only' }
- expect(invite_only_field['value']).to eq(true)
+ invite_only_field = privacy_step["fields"].find { |f| f["id"] == "invite_only" }
+ expect(invite_only_field["value"]).to eq(true)
- must_approve_users_field = privacy_step['fields'].find { |f| f['id'] == 'must_approve_users' }
- expect(must_approve_users_field['value']).to eq(true)
+ must_approve_users_field = privacy_step["fields"].find { |f| f["id"] == "must_approve_users" }
+ expect(must_approve_users_field["value"]).to eq(true)
end
end
end
diff --git a/spec/services/anonymous_shadow_creator_spec.rb b/spec/services/anonymous_shadow_creator_spec.rb
index 29b23e0924d..1ebab5aaec9 100644
--- a/spec/services/anonymous_shadow_creator_spec.rb
+++ b/spec/services/anonymous_shadow_creator_spec.rb
@@ -40,7 +40,6 @@ RSpec.describe AnonymousShadowCreator do
expect(shadow3.user_option.email_messages_level).to eq(UserOption.email_level_types[:never])
expect(shadow2.id).not_to eq(shadow3.id)
-
end
it "returns a shadow for a legit user" do
diff --git a/spec/services/auto_silence_spec.rb b/spec/services/auto_silence_spec.rb
index 0c138266162..cfdac5eb0d8 100644
--- a/spec/services/auto_silence_spec.rb
+++ b/spec/services/auto_silence_spec.rb
@@ -8,17 +8,17 @@ RSpec.describe SpamRule::AutoSilence do
SiteSetting.num_users_to_silence_new_user = 2
end
- describe 'perform' do
+ describe "perform" do
let(:user) { Fabricate.build(:newuser) }
let(:post) { Fabricate(:post, user: user) }
subject { described_class.new(post.user) }
- it 'takes no action if user should not be silenced' do
+ it "takes no action if user should not be silenced" do
subject.perform
expect(post.user.reload).not_to be_silenced
end
- it 'delivers punishment when user should be silenced' do
+ it "delivers punishment when user should be silenced" do
Reviewable.set_priorities(high: 2.0)
SiteSetting.silence_new_user_sensitivity = Reviewable.sensitivities[:low]
SiteSetting.num_users_to_silence_new_user = 1
@@ -28,60 +28,60 @@ RSpec.describe SpamRule::AutoSilence do
end
end
- describe 'total_spam_score' do
+ describe "total_spam_score" do
let(:post) { Fabricate(:post) }
let(:enforcer) { described_class.new(post.user) }
let(:flagger) { Fabricate(:user) }
subject { enforcer.user_spam_stats.total_spam_score }
- it 'returns 0 when there are no flags' do
+ it "returns 0 when there are no flags" do
expect(subject).to eq(0)
end
- it 'returns 0 when there is one flag that has a reason other than spam' do
+ it "returns 0 when there is one flag that has a reason other than spam" do
PostActionCreator.off_topic(flagger, post)
expect(subject).to eq(0)
end
- it 'returns the score when there are two flags with spam as the reason' do
+ it "returns the score when there are two flags with spam as the reason" do
PostActionCreator.spam(Fabricate(:user), post)
PostActionCreator.spam(Fabricate(:user), post)
expect(subject).to eq(4.0)
end
- it 'returns the score when there are two spam flags, each on a different post' do
+ it "returns the score when there are two spam flags, each on a different post" do
PostActionCreator.spam(Fabricate(:user), post)
PostActionCreator.spam(Fabricate(:user), Fabricate(:post, user: post.user))
expect(subject).to eq(4.0)
end
end
- describe 'spam_user_count' do
- let(:post) { Fabricate(:post) }
+ describe "spam_user_count" do
+ let(:post) { Fabricate(:post) }
let(:enforcer) { described_class.new(post.user) }
- subject { enforcer.user_spam_stats.spam_user_count }
+ subject { enforcer.user_spam_stats.spam_user_count }
- it 'returns 0 when there are no flags' do
+ it "returns 0 when there are no flags" do
expect(subject).to eq(0)
end
- it 'returns 0 when there is one flag that has a reason other than spam' do
+ it "returns 0 when there is one flag that has a reason other than spam" do
Fabricate(:flag, post: post, post_action_type_id: PostActionType.types[:off_topic])
expect(subject).to eq(0)
end
- it 'returns 1 when there is one spam flag' do
+ it "returns 1 when there is one spam flag" do
PostActionCreator.spam(Fabricate(:user), post)
expect(subject).to eq(1)
end
- it 'returns 2 when there are two spam flags from 2 users' do
+ it "returns 2 when there are two spam flags from 2 users" do
PostActionCreator.spam(Fabricate(:user), post)
PostActionCreator.spam(Fabricate(:user), post)
expect(subject).to eq(2)
end
- it 'returns 1 when there are two spam flags on two different posts from 1 user' do
+ it "returns 1 when there are two spam flags on two different posts from 1 user" do
flagger = Fabricate(:user)
PostActionCreator.spam(flagger, post)
PostActionCreator.spam(flagger, Fabricate(:post, user: post.user))
@@ -89,14 +89,14 @@ RSpec.describe SpamRule::AutoSilence do
end
end
- describe '#silence_user' do
- let!(:admin) { Fabricate(:admin) } # needed for SystemMessage
- let(:user) { Fabricate(:user) }
- let!(:post) { Fabricate(:post, user: user) }
- subject { described_class.new(user) }
+ describe "#silence_user" do
+ let!(:admin) { Fabricate(:admin) } # needed for SystemMessage
+ let(:user) { Fabricate(:user) }
+ let!(:post) { Fabricate(:post, user: user) }
+ subject { described_class.new(user) }
- context 'when user is not silenced' do
- it 'prevents the user from making new posts' do
+ context "when user is not silenced" do
+ it "prevents the user from making new posts" do
subject.silence_user
expect(user).to be_silenced
expect(Guardian.new(user).can_create_post?(nil)).to be_falsey
@@ -105,7 +105,7 @@ RSpec.describe SpamRule::AutoSilence do
context "with a moderator" do
let!(:moderator) { Fabricate(:moderator) }
- it 'sends private message to moderators' do
+ it "sends private message to moderators" do
SiteSetting.notify_mods_when_user_silenced = true
subject.silence_user
expect(subject.group_message).to be_present
@@ -119,10 +119,8 @@ RSpec.describe SpamRule::AutoSilence do
end
end
- context 'when user is already silenced' do
- before do
- UserSilencer.silence(user)
- end
+ context "when user is already silenced" do
+ before { UserSilencer.silence(user) }
it "doesn't send a pm to moderators if the user is already silenced" do
subject.silence_user
@@ -131,7 +129,7 @@ RSpec.describe SpamRule::AutoSilence do
end
end
- describe 'autosilenced?' do
+ describe "autosilenced?" do
let(:user) { Fabricate(:newuser) }
let(:flagger) { Fabricate(:user) }
let(:flagger2) { Fabricate(:user) }
@@ -168,24 +166,24 @@ RSpec.describe SpamRule::AutoSilence do
end
end
- context 'with new user' do
+ context "with new user" do
subject { described_class.new(user) }
let(:stats) { subject.user_spam_stats }
- it 'returns false if there are no spam flags' do
+ it "returns false if there are no spam flags" do
expect(stats.total_spam_score).to eq(0)
expect(stats.spam_user_count).to eq(0)
expect(subject.should_autosilence?).to eq(false)
end
- it 'returns false if there are not received enough flags' do
+ it "returns false if there are not received enough flags" do
PostActionCreator.spam(flagger, post)
expect(stats.total_spam_score).to eq(2.0)
expect(stats.spam_user_count).to eq(1)
expect(subject.should_autosilence?).to eq(false)
end
- it 'returns false if there have not been enough users' do
+ it "returns false if there have not been enough users" do
PostActionCreator.spam(flagger, post)
PostActionCreator.spam(flagger, post2)
expect(stats.total_spam_score).to eq(4.0)
@@ -193,21 +191,21 @@ RSpec.describe SpamRule::AutoSilence do
expect(subject.should_autosilence?).to eq(false)
end
- it 'returns false if silence_new_user_sensitivity is disabled' do
+ it "returns false if silence_new_user_sensitivity is disabled" do
SiteSetting.silence_new_user_sensitivity = Reviewable.sensitivities[:disabled]
PostActionCreator.spam(flagger, post)
PostActionCreator.spam(flagger2, post)
expect(subject.should_autosilence?).to eq(false)
end
- it 'returns false if num_users_to_silence_new_user is 0' do
+ it "returns false if num_users_to_silence_new_user is 0" do
SiteSetting.num_users_to_silence_new_user = 0
PostActionCreator.spam(flagger, post)
PostActionCreator.spam(flagger2, post)
expect(subject.should_autosilence?).to eq(false)
end
- it 'returns true when there are enough flags from enough users' do
+ it "returns true when there are enough flags from enough users" do
PostActionCreator.spam(flagger, post)
PostActionCreator.spam(flagger2, post)
expect(stats.total_spam_score).to eq(4.0)
@@ -217,10 +215,10 @@ RSpec.describe SpamRule::AutoSilence do
end
context "when silenced, but has higher trust level now" do
- let(:user) { Fabricate(:user, silenced_till: 1.year.from_now, trust_level: TrustLevel[1]) }
- subject { described_class.new(user) }
+ let(:user) { Fabricate(:user, silenced_till: 1.year.from_now, trust_level: TrustLevel[1]) }
+ subject { described_class.new(user) }
- it 'returns false' do
+ it "returns false" do
expect(subject.should_autosilence?).to eq(false)
end
end
diff --git a/spec/services/badge_granter_spec.rb b/spec/services/badge_granter_spec.rb
index ca23c204272..308b2b83163 100644
--- a/spec/services/badge_granter_spec.rb
+++ b/spec/services/badge_granter_spec.rb
@@ -4,20 +4,18 @@ RSpec.describe BadgeGranter do
fab!(:badge) { Fabricate(:badge) }
fab!(:user) { Fabricate(:user) }
- before do
- BadgeGranter.enable_queue
- end
+ before { BadgeGranter.enable_queue }
after do
BadgeGranter.disable_queue
BadgeGranter.clear_queue!
end
- describe 'revoke_titles' do
+ describe "revoke_titles" do
let(:user) { Fabricate(:user) }
let(:badge) { Fabricate(:badge, allow_title: true) }
- it 'revokes title when badge is not allowed as title' do
+ it "revokes title when badge is not allowed as title" do
BadgeGranter.grant(badge, user)
user.update!(title: badge.name)
@@ -35,7 +33,7 @@ RSpec.describe BadgeGranter do
expect(user.user_profile.granted_title_badge_id).to be_nil
end
- it 'revokes title when badge is disabled' do
+ it "revokes title when badge is disabled" do
BadgeGranter.grant(badge, user)
user.update!(title: badge.name)
@@ -53,7 +51,7 @@ RSpec.describe BadgeGranter do
expect(user.user_profile.granted_title_badge_id).to be_nil
end
- it 'revokes title when user badge is revoked' do
+ it "revokes title when user badge is revoked" do
BadgeGranter.grant(badge, user)
user.update!(title: badge.name)
@@ -71,7 +69,7 @@ RSpec.describe BadgeGranter do
expect(user.user_profile.granted_title_badge_id).to be_nil
end
- it 'does not revoke custom title' do
+ it "does not revoke custom title" do
user.title = "CEO"
user.save!
@@ -81,7 +79,7 @@ RSpec.describe BadgeGranter do
expect(user.title).to eq("CEO")
end
- it 'does not revoke localized title' do
+ it "does not revoke localized title" do
badge = Badge.find(Badge::Regular)
badge_name = nil
BadgeGranter.grant(badge, user)
@@ -104,32 +102,33 @@ RSpec.describe BadgeGranter do
end
end
- describe 'preview' do
- it 'can correctly preview' do
- Fabricate(:user, email: 'sam@gmail.com')
- result = BadgeGranter.preview('select u.id user_id, null post_id, u.created_at granted_at from users u
+ describe "preview" do
+ it "can correctly preview" do
+ Fabricate(:user, email: "sam@gmail.com")
+ result =
+ BadgeGranter.preview(
+ 'select u.id user_id, null post_id, u.created_at granted_at from users u
join user_emails ue on ue.user_id = u.id AND ue.primary
- where ue.email like \'%gmail.com\'', explain: true)
+ where ue.email like \'%gmail.com\'',
+ explain: true,
+ )
expect(result[:grant_count]).to eq(1)
expect(result[:query_plan]).to be_present
end
- it 'with badges containing trailing comments do not break generated SQL' do
+ it "with badges containing trailing comments do not break generated SQL" do
query = Badge.find(1).query + "\n-- a comment"
expect(BadgeGranter.preview(query)[:errors]).to be_nil
end
end
- describe 'backfill' do
-
- it 'has no broken badge queries' do
- Badge.all.each do |b|
- BadgeGranter.backfill(b)
- end
+ describe "backfill" do
+ it "has no broken badge queries" do
+ Badge.all.each { |b| BadgeGranter.backfill(b) }
end
- it 'can backfill the welcome badge' do
+ it "can backfill the welcome badge" do
post = Fabricate(:post)
user2 = Fabricate(:user)
PostActionCreator.like(user2, post)
@@ -147,19 +146,22 @@ RSpec.describe BadgeGranter do
b.badge_id = Badge::FirstLike
end
- it 'should grant missing badges' do
+ it "should grant missing badges" do
nice_topic = Badge.find(Badge::NiceTopic)
good_topic = Badge.find(Badge::GoodTopic)
post = Fabricate(:post, like_count: 30)
- 2.times {
+ 2.times do
BadgeGranter.backfill(nice_topic, post_ids: [post.id])
BadgeGranter.backfill(good_topic)
- }
+ end
# TODO add welcome
- expect(post.user.user_badges.pluck(:badge_id)).to contain_exactly(nice_topic.id, good_topic.id)
+ expect(post.user.user_badges.pluck(:badge_id)).to contain_exactly(
+ nice_topic.id,
+ good_topic.id,
+ )
expect(post.user.notifications.count).to eq(2)
data = post.user.notifications.last.data_hash
@@ -171,23 +173,23 @@ RSpec.describe BadgeGranter do
expect(good_topic.grant_count).to eq(1)
end
- it 'should grant badges in the user locale' do
+ it "should grant badges in the user locale" do
SiteSetting.allow_user_locale = true
nice_topic = Badge.find(Badge::NiceTopic)
name_english = nice_topic.name
- user = Fabricate(:user, locale: 'fr')
+ user = Fabricate(:user, locale: "fr")
post = Fabricate(:post, like_count: 10, user: user)
BadgeGranter.backfill(nice_topic)
- notification_badge_name = JSON.parse(post.user.notifications.first.data)['badge_name']
+ notification_badge_name = JSON.parse(post.user.notifications.first.data)["badge_name"]
expect(notification_badge_name).not_to eq(name_english)
end
- it 'with badges containing trailing comments do not break generated SQL' do
+ it "with badges containing trailing comments do not break generated SQL" do
badge = Fabricate(:badge)
badge.query = Badge.find(1).query + "\n-- a comment"
expect { BadgeGranter.backfill(badge) }.not_to raise_error
@@ -198,12 +200,12 @@ RSpec.describe BadgeGranter do
post = Fabricate(:post)
PostActionCreator.like(user, post)
- expect {
- BadgeGranter.backfill(Badge.find(Badge::FirstLike))
- }.to_not change { Notification.where(user_id: user.id).count }
+ expect { BadgeGranter.backfill(Badge.find(Badge::FirstLike)) }.to_not change {
+ Notification.where(user_id: user.id).count
+ }
end
- it 'does not grant sharing badges to deleted users' do
+ it "does not grant sharing badges to deleted users" do
post = Fabricate(:post)
incoming_links = Fabricate.times(25, :incoming_link, post: post, user: user)
user_id = user.id
@@ -219,11 +221,10 @@ RSpec.describe BadgeGranter do
end
end
- describe 'grant' do
-
- it 'allows overriding of granted_at does not notify old bronze' do
+ describe "grant" do
+ it "allows overriding of granted_at does not notify old bronze" do
freeze_time
- badge = Badge.create!(name: 'a badge', badge_type_id: BadgeType::Bronze)
+ badge = Badge.create!(name: "a badge", badge_type_id: BadgeType::Bronze)
user_badge = BadgeGranter.grant(badge, user, created_at: 1.year.ago)
expect(user_badge.granted_at).to eq_time(1.year.ago)
@@ -250,9 +251,9 @@ RSpec.describe BadgeGranter do
user.user_option.update!(skip_new_user_tips: true)
badge = Fabricate(:badge, badge_grouping_id: BadgeGrouping::GettingStarted)
- expect {
- BadgeGranter.grant(badge, user)
- }.to_not change { Notification.where(user_id: user.id).count }
+ expect { BadgeGranter.grant(badge, user) }.to_not change {
+ Notification.where(user_id: user.id).count
+ }
end
it "notifies about the New User of the Month badge when user skipped new user tips" do
@@ -260,12 +261,12 @@ RSpec.describe BadgeGranter do
user.user_option.update!(skip_new_user_tips: true)
badge = Badge.find(Badge::NewUserOfTheMonth)
- expect {
- BadgeGranter.grant(badge, user)
- }.to change { Notification.where(user_id: user.id).count }
+ expect { BadgeGranter.grant(badge, user) }.to change {
+ Notification.where(user_id: user.id).count
+ }
end
- it 'grants multiple badges' do
+ it "grants multiple badges" do
badge = Fabricate(:badge, multiple_grant: true)
user_badge = BadgeGranter.grant(badge, user)
user_badge = BadgeGranter.grant(badge, user)
@@ -274,99 +275,108 @@ RSpec.describe BadgeGranter do
expect(UserBadge.where(user_id: user.id).count).to eq(2)
end
- it 'sets granted_at' do
+ it "sets granted_at" do
day_ago = freeze_time 1.day.ago
user_badge = BadgeGranter.grant(badge, user)
expect(user_badge.granted_at).to eq_time(day_ago)
end
- it 'sets granted_by if the option is present' do
+ it "sets granted_by if the option is present" do
admin = Fabricate(:admin)
StaffActionLogger.any_instance.expects(:log_badge_grant).once
user_badge = BadgeGranter.grant(badge, user, granted_by: admin)
expect(user_badge.granted_by).to eq(admin)
end
- it 'defaults granted_by to the system user' do
+ it "defaults granted_by to the system user" do
StaffActionLogger.any_instance.expects(:log_badge_grant).never
user_badge = BadgeGranter.grant(badge, user)
expect(user_badge.granted_by_id).to eq(Discourse.system_user.id)
end
- it 'does not allow a regular user to grant badges' do
+ it "does not allow a regular user to grant badges" do
user_badge = BadgeGranter.grant(badge, user, granted_by: Fabricate(:user))
expect(user_badge).not_to be_present
end
- it 'increments grant_count on the badge and creates a notification' do
+ it "increments grant_count on the badge and creates a notification" do
BadgeGranter.grant(badge, user)
expect(badge.reload.grant_count).to eq(1)
- expect(user.notifications.find_by(notification_type: Notification.types[:granted_badge]).data_hash["badge_id"]).to eq(badge.id)
+ expect(
+ user.notifications.find_by(notification_type: Notification.types[:granted_badge]).data_hash[
+ "badge_id"
+ ],
+ ).to eq(badge.id)
end
- it 'does not fail when user is missing' do
+ it "does not fail when user is missing" do
BadgeGranter.grant(badge, nil)
expect(badge.reload.grant_count).to eq(0)
end
-
end
- describe 'revoke' do
-
+ describe "revoke" do
fab!(:admin) { Fabricate(:admin) }
let!(:user_badge) { BadgeGranter.grant(badge, user) }
- it 'revokes the badge and does necessary cleanup' do
- user.title = badge.name; user.save!
+ it "revokes the badge and does necessary cleanup" do
+ user.title = badge.name
+ user.save!
expect(badge.reload.grant_count).to eq(1)
StaffActionLogger.any_instance.expects(:log_badge_revoke).with(user_badge)
BadgeGranter.revoke(user_badge, revoked_by: admin)
expect(UserBadge.find_by(user: user, badge: badge)).not_to be_present
expect(badge.reload.grant_count).to eq(0)
- expect(user.notifications.where(notification_type: Notification.types[:granted_badge])).to be_empty
+ expect(
+ user.notifications.where(notification_type: Notification.types[:granted_badge]),
+ ).to be_empty
expect(user.reload.title).to eq(nil)
end
- context 'when the badge name is customized, and the customized name is the same as the user title' do
- let(:customized_badge_name) { 'Merit Badge' }
+ context "when the badge name is customized, and the customized name is the same as the user title" do
+ let(:customized_badge_name) { "Merit Badge" }
before do
TranslationOverride.upsert!(I18n.locale, Badge.i18n_key(badge.name), customized_badge_name)
end
- it 'revokes the badge and title and does necessary cleanup' do
- user.title = customized_badge_name; user.save!
+ it "revokes the badge and title and does necessary cleanup" do
+ user.title = customized_badge_name
+ user.save!
expect(badge.reload.grant_count).to eq(1)
StaffActionLogger.any_instance.expects(:log_badge_revoke).with(user_badge)
- StaffActionLogger.any_instance.expects(:log_title_revoke).with(
- user,
- revoke_reason: 'user title was same as revoked badge name or custom badge name',
- previous_value: user_badge.user.title
- )
+ StaffActionLogger
+ .any_instance
+ .expects(:log_title_revoke)
+ .with(
+ user,
+ revoke_reason: "user title was same as revoked badge name or custom badge name",
+ previous_value: user_badge.user.title,
+ )
BadgeGranter.revoke(user_badge, revoked_by: admin)
expect(UserBadge.find_by(user: user, badge: badge)).not_to be_present
expect(badge.reload.grant_count).to eq(0)
- expect(user.notifications.where(notification_type: Notification.types[:granted_badge])).to be_empty
+ expect(
+ user.notifications.where(notification_type: Notification.types[:granted_badge]),
+ ).to be_empty
expect(user.reload.title).to eq(nil)
end
- after do
- TranslationOverride.revert!(I18n.locale, Badge.i18n_key(badge.name))
- end
+ after { TranslationOverride.revert!(I18n.locale, Badge.i18n_key(badge.name)) }
end
end
- describe 'revoke_all' do
- it 'deletes every user_badge record associated with that badge' do
+ describe "revoke_all" do
+ it "deletes every user_badge record associated with that badge" do
described_class.grant(badge, user)
described_class.revoke_all(badge)
expect(UserBadge.exists?(badge: badge, user: user)).to eq(false)
end
- it 'removes titles' do
- another_title = 'another title'
+ it "removes titles" do
+ another_title = "another title"
described_class.grant(badge, user)
user.update!(title: badge.name)
user2 = Fabricate(:user, title: another_title)
@@ -377,9 +387,13 @@ RSpec.describe BadgeGranter do
expect(user2.reload.title).to eq(another_title)
end
- it 'removes custom badge titles' do
- custom_badge_title = 'this is a badge title'
- TranslationOverride.create!(translation_key: badge.translation_key, value: custom_badge_title, locale: 'en')
+ it "removes custom badge titles" do
+ custom_badge_title = "this is a badge title"
+ TranslationOverride.create!(
+ translation_key: badge.translation_key,
+ value: custom_badge_title,
+ locale: "en",
+ )
described_class.grant(badge, user)
user.update!(title: custom_badge_title)
@@ -435,7 +449,9 @@ RSpec.describe BadgeGranter do
it "grants and revokes trust level badges" do
user.change_trust_level!(TrustLevel[4])
BadgeGranter.process_queue!
- expect(UserBadge.where(user_id: user.id, badge_id: Badge.trust_level_badge_ids).count).to eq(4)
+ expect(UserBadge.where(user_id: user.id, badge_id: Badge.trust_level_badge_ids).count).to eq(
+ 4,
+ )
user.change_trust_level!(TrustLevel[1])
BadgeGranter.backfill(Badge.find(1))
@@ -485,9 +501,7 @@ RSpec.describe BadgeGranter do
post = create_post(user: user)
action = PostActionCreator.like(liker, post).post_action
- events = DiscourseEvent.track_events(:user_badge_granted) do
- BadgeGranter.process_queue!
- end
+ events = DiscourseEvent.track_events(:user_badge_granted) { BadgeGranter.process_queue! }
expect(events.length).to eq(2)
expect(events[0][:params]).to eq([Badge::FirstLike, liker.id])
@@ -495,31 +509,32 @@ RSpec.describe BadgeGranter do
end
end
- describe 'notification locales' do
- it 'is using default locales when user locales are not set' do
+ describe "notification locales" do
+ it "is using default locales when user locales are not set" do
SiteSetting.allow_user_locale = true
- expect(BadgeGranter.notification_locale('')).to eq(SiteSetting.default_locale)
+ expect(BadgeGranter.notification_locale("")).to eq(SiteSetting.default_locale)
end
- it 'is using default locales when user locales are set but is not allowed' do
+ it "is using default locales when user locales are set but is not allowed" do
SiteSetting.allow_user_locale = false
- expect(BadgeGranter.notification_locale('pl_PL')).to eq(SiteSetting.default_locale)
+ expect(BadgeGranter.notification_locale("pl_PL")).to eq(SiteSetting.default_locale)
end
- it 'is using user locales when set and allowed' do
+ it "is using user locales when set and allowed" do
SiteSetting.allow_user_locale = true
- expect(BadgeGranter.notification_locale('pl_PL')).to eq('pl_PL')
+ expect(BadgeGranter.notification_locale("pl_PL")).to eq("pl_PL")
end
end
- describe '.mass_grant' do
- it 'raises an error if the count argument is less than 1' do
- expect do
- BadgeGranter.mass_grant(badge, user, count: 0)
- end.to raise_error(ArgumentError, "count can't be less than 1")
+ describe ".mass_grant" do
+ it "raises an error if the count argument is less than 1" do
+ expect do BadgeGranter.mass_grant(badge, user, count: 0) end.to raise_error(
+ ArgumentError,
+ "count can't be less than 1",
+ )
end
- it 'grants the badge to the user as many times as the count argument' do
+ it "grants the badge to the user as many times as the count argument" do
BadgeGranter.mass_grant(badge, user, count: 10)
sequence = UserBadge.where(badge: badge, user: user).pluck(:seq).sort
expect(sequence).to eq((0...10).to_a)
@@ -530,39 +545,41 @@ RSpec.describe BadgeGranter do
end
end
- describe '.enqueue_mass_grant_for_users' do
+ describe ".enqueue_mass_grant_for_users" do
before { Jobs.run_immediately! }
- it 'returns a list of the entries that could not be matched to any users' do
- results = BadgeGranter.enqueue_mass_grant_for_users(
- badge,
- emails: ['fakeemail@discourse.invalid', user.email],
- usernames: [user.username, 'fakeusername'],
- )
+ it "returns a list of the entries that could not be matched to any users" do
+ results =
+ BadgeGranter.enqueue_mass_grant_for_users(
+ badge,
+ emails: ["fakeemail@discourse.invalid", user.email],
+ usernames: [user.username, "fakeusername"],
+ )
expect(results[:unmatched_entries]).to contain_exactly(
- 'fakeemail@discourse.invalid',
- 'fakeusername'
+ "fakeemail@discourse.invalid",
+ "fakeusername",
)
expect(results[:matched_users_count]).to eq(1)
expect(results[:unmatched_entries_count]).to eq(2)
end
- context 'when ensure_users_have_badge_once is true' do
- it 'ensures each user has the badge at least once and does not grant the badge multiple times to one user' do
+ context "when ensure_users_have_badge_once is true" do
+ it "ensures each user has the badge at least once and does not grant the badge multiple times to one user" do
BadgeGranter.grant(badge, user)
user_without_badge = Fabricate(:user)
Notification.destroy_all
- results = BadgeGranter.enqueue_mass_grant_for_users(
- badge,
- usernames: [
- user.username,
- user.username,
- user_without_badge.username,
- user_without_badge.username
- ],
- ensure_users_have_badge_once: true
- )
+ results =
+ BadgeGranter.enqueue_mass_grant_for_users(
+ badge,
+ usernames: [
+ user.username,
+ user.username,
+ user_without_badge.username,
+ user_without_badge.username,
+ ],
+ ensure_users_have_badge_once: true,
+ )
expect(results[:unmatched_entries]).to eq([])
expect(results[:matched_users_count]).to eq(2)
expect(results[:unmatched_entries_count]).to eq(0)
@@ -582,8 +599,8 @@ RSpec.describe BadgeGranter do
end
end
- context 'when ensure_users_have_badge_once is false' do
- it 'grants the badge to the users as many times as they appear in the emails and usernames arguments' do
+ context "when ensure_users_have_badge_once is false" do
+ it "grants the badge to the users as many times as they appear in the emails and usernames arguments" do
badge.update!(multiple_grant: true)
user_without_badge = Fabricate(:user)
user_with_badge = Fabricate(:user).tap { |u| BadgeGranter.grant(badge, u) }
@@ -592,12 +609,13 @@ RSpec.describe BadgeGranter do
emails = [user_with_badge.email.titlecase, user_without_badge.email.titlecase] * 20
usernames = [user_with_badge.username.titlecase, user_without_badge.username.titlecase] * 20
- results = BadgeGranter.enqueue_mass_grant_for_users(
- badge,
- emails: emails,
- usernames: usernames,
- ensure_users_have_badge_once: false
- )
+ results =
+ BadgeGranter.enqueue_mass_grant_for_users(
+ badge,
+ emails: emails,
+ usernames: usernames,
+ ensure_users_have_badge_once: false,
+ )
expect(results[:unmatched_entries]).to eq([])
expect(results[:matched_users_count]).to eq(2)
expect(results[:unmatched_entries_count]).to eq(0)
@@ -614,7 +632,9 @@ RSpec.describe BadgeGranter do
[user_without_badge, user_with_badge].each do |u|
notifications = u.reload.notifications
expect(notifications.size).to eq(1)
- expect(notifications.map(&:notification_type).uniq).to contain_exactly(Notification.types[:granted_badge])
+ expect(notifications.map(&:notification_type).uniq).to contain_exactly(
+ Notification.types[:granted_badge],
+ )
end
end
end
diff --git a/spec/services/base_bookmarkable_spec.rb b/spec/services/base_bookmarkable_spec.rb
index 6b62225d8ea..06c886bddc1 100644
--- a/spec/services/base_bookmarkable_spec.rb
+++ b/spec/services/base_bookmarkable_spec.rb
@@ -5,9 +5,18 @@ RSpec.describe BaseBookmarkable do
describe "#send_reminder_notification" do
it "raises an error if the data, data.bookmarkable_url, or data.title values are missing from notification_data" do
- expect { BaseBookmarkable.send_reminder_notification(bookmark, {}) }.to raise_error(Discourse::InvalidParameters)
- expect { BaseBookmarkable.send_reminder_notification(bookmark, { data: {} }) }.to raise_error(Discourse::InvalidParameters)
- expect { BaseBookmarkable.send_reminder_notification(bookmark, { data: { title: "test", bookmarkable_url: "test" } }) }.not_to raise_error
+ expect { BaseBookmarkable.send_reminder_notification(bookmark, {}) }.to raise_error(
+ Discourse::InvalidParameters,
+ )
+ expect { BaseBookmarkable.send_reminder_notification(bookmark, { data: {} }) }.to raise_error(
+ Discourse::InvalidParameters,
+ )
+ expect {
+ BaseBookmarkable.send_reminder_notification(
+ bookmark,
+ { data: { title: "test", bookmarkable_url: "test" } },
+ )
+ }.not_to raise_error
end
it "creates a Notification with the required data from the bookmark" do
@@ -18,9 +27,9 @@ RSpec.describe BaseBookmarkable do
post_number: bookmark.bookmarkable.post_number,
data: {
title: bookmark.bookmarkable.topic.title,
- bookmarkable_url: bookmark.bookmarkable.url
- }
- }
+ bookmarkable_url: bookmark.bookmarkable.url,
+ },
+ },
)
notif = bookmark.user.notifications.last
expect(notif.notification_type).to eq(Notification.types[:bookmark_reminder])
@@ -32,8 +41,8 @@ RSpec.describe BaseBookmarkable do
bookmarkable_url: bookmark.bookmarkable.url,
display_username: bookmark.user.username,
bookmark_name: bookmark.name,
- bookmark_id: bookmark.id
- }.to_json
+ bookmark_id: bookmark.id,
+ }.to_json,
)
end
@@ -48,16 +57,16 @@ RSpec.describe BaseBookmarkable do
bookmarkable_url: bookmark.bookmarkable.url,
display_username: "bad username",
bookmark_name: "bad name",
- bookmark_id: -89854
- }
- }
+ bookmark_id: -89_854,
+ },
+ },
)
notif = bookmark.user.notifications.last
data = JSON.parse(notif[:data])
expect(data[:display_username]).not_to eq("bad username")
expect(data[:name]).not_to eq("bad name")
- expect(data[:bookmark_id]).not_to eq(-89854)
+ expect(data[:bookmark_id]).not_to eq(-89_854)
end
end
end
diff --git a/spec/services/category_hashtag_data_source_spec.rb b/spec/services/category_hashtag_data_source_spec.rb
index 4235923afff..26098e69f8d 100644
--- a/spec/services/category_hashtag_data_source_spec.rb
+++ b/spec/services/category_hashtag_data_source_spec.rb
@@ -105,7 +105,10 @@ RSpec.describe CategoryHashtagDataSource do
describe "#search_sort" do
it "orders by exact slug match then text" do
results_to_sort = [
- HashtagAutocompleteService::HashtagItem.new(text: "System Tests", slug: "system-test-development"),
+ HashtagAutocompleteService::HashtagItem.new(
+ text: "System Tests",
+ slug: "system-test-development",
+ ),
HashtagAutocompleteService::HashtagItem.new(text: "Ruby Dev", slug: "ruby-dev"),
HashtagAutocompleteService::HashtagItem.new(text: "Dev", slug: "dev"),
HashtagAutocompleteService::HashtagItem.new(text: "Dev Tools", slug: "dev-tools"),
diff --git a/spec/services/color_scheme_revisor_spec.rb b/spec/services/color_scheme_revisor_spec.rb
index 84b989e2dcb..b8cf8e23d8e 100644
--- a/spec/services/color_scheme_revisor_spec.rb
+++ b/spec/services/color_scheme_revisor_spec.rb
@@ -1,9 +1,15 @@
# frozen_string_literal: true
RSpec.describe ColorSchemeRevisor do
-
- let(:color) { Fabricate.build(:color_scheme_color, hex: 'FFFFFF', color_scheme: nil) }
- let(:color_scheme) { Fabricate(:color_scheme, created_at: 1.day.ago, updated_at: 1.day.ago, color_scheme_colors: [color]) }
+ let(:color) { Fabricate.build(:color_scheme_color, hex: "FFFFFF", color_scheme: nil) }
+ let(:color_scheme) do
+ Fabricate(
+ :color_scheme,
+ created_at: 1.day.ago,
+ updated_at: 1.day.ago,
+ color_scheme_colors: [color],
+ )
+ end
let(:valid_params) { { name: color_scheme.name, colors: nil } }
describe "revise" do
@@ -19,28 +25,32 @@ RSpec.describe ColorSchemeRevisor do
end
it "can update the base_scheme_id" do
- ColorSchemeRevisor.revise(color_scheme, valid_params.merge(base_scheme_id: 'test'))
- expect(color_scheme.reload.base_scheme_id).to eq('test')
+ ColorSchemeRevisor.revise(color_scheme, valid_params.merge(base_scheme_id: "test"))
+ expect(color_scheme.reload.base_scheme_id).to eq("test")
end
- it 'can change colors' do
- ColorSchemeRevisor.revise(color_scheme, valid_params.merge(colors: [
- { name: color.name, hex: 'BEEF99' },
- { name: 'bob', hex: 'AAAAAA' }
- ]))
+ it "can change colors" do
+ ColorSchemeRevisor.revise(
+ color_scheme,
+ valid_params.merge(
+ colors: [{ name: color.name, hex: "BEEF99" }, { name: "bob", hex: "AAAAAA" }],
+ ),
+ )
color_scheme.reload
expect(color_scheme.version).to eq(2)
expect(color_scheme.colors.size).to eq(2)
- expect(color_scheme.colors.find_by(name: color.name).hex).to eq('BEEF99')
- expect(color_scheme.colors.find_by(name: 'bob').hex).to eq('AAAAAA')
+ expect(color_scheme.colors.find_by(name: color.name).hex).to eq("BEEF99")
+ expect(color_scheme.colors.find_by(name: "bob").hex).to eq("AAAAAA")
end
it "doesn't make changes when a color is invalid" do
expect {
- cs = ColorSchemeRevisor.revise(color_scheme, valid_params.merge(colors: [
- { name: color.name, hex: 'OOPS' }
- ]))
+ cs =
+ ColorSchemeRevisor.revise(
+ color_scheme,
+ valid_params.merge(colors: [{ name: color.name, hex: "OOPS" }]),
+ )
expect(cs).not_to be_valid
expect(cs.errors).to be_present
}.to_not change { color_scheme.reload.version }
@@ -53,7 +63,5 @@ RSpec.describe ColorSchemeRevisor do
ColorSchemeRevisor.revise(color_scheme, { user_selectable: true })
expect(color_scheme.reload.user_selectable).to eq(true)
end
-
end
-
end
diff --git a/spec/services/destroy_task_spec.rb b/spec/services/destroy_task_spec.rb
index 68653e445f7..4bf4d11e89f 100644
--- a/spec/services/destroy_task_spec.rb
+++ b/spec/services/destroy_task_spec.rb
@@ -1,8 +1,7 @@
# frozen_string_literal: true
RSpec.describe DestroyTask do
-
- describe 'destroy topics' do
+ describe "destroy topics" do
fab!(:c) { Fabricate(:category_with_definition) }
fab!(:t) { Fabricate(:topic, category: c) }
let!(:p) { Fabricate(:post, topic: t) }
@@ -13,16 +12,18 @@ RSpec.describe DestroyTask do
fab!(:t3) { Fabricate(:topic, category: sc) }
let!(:p3) { Fabricate(:post, topic: t3) }
- it 'destroys all topics in a category' do
+ it "destroys all topics in a category" do
destroy_task = DestroyTask.new(StringIO.new)
- expect { destroy_task.destroy_topics(c.slug) }
- .to change { Topic.where(category_id: c.id).count }.by (-1)
+ expect { destroy_task.destroy_topics(c.slug) }.to change {
+ Topic.where(category_id: c.id).count
+ }.by (-1)
end
- it 'destroys all topics in a sub category' do
+ it "destroys all topics in a sub category" do
destroy_task = DestroyTask.new(StringIO.new)
- expect { destroy_task.destroy_topics(sc.slug, c2.slug) }
- .to change { Topic.where(category_id: sc.id).count }.by(-1)
+ expect { destroy_task.destroy_topics(sc.slug, c2.slug) }.to change {
+ Topic.where(category_id: sc.id).count
+ }.by(-1)
end
it "doesn't destroy system topics" do
@@ -31,14 +32,14 @@ RSpec.describe DestroyTask do
expect(Topic.where(category_id: c2.id).count).to eq 1
end
- it 'destroys topics in all categories' do
+ it "destroys topics in all categories" do
destroy_task = DestroyTask.new(StringIO.new)
destroy_task.destroy_topics_all_categories
expect(Post.where(topic_id: [t.id, t2.id, t3.id]).count).to eq 0
end
end
- describe 'destroy categories' do
+ describe "destroy categories" do
fab!(:c) { Fabricate(:category_with_definition) }
fab!(:t) { Fabricate(:topic, category: c) }
let!(:p) { Fabricate(:post, topic: t) }
@@ -49,37 +50,39 @@ RSpec.describe DestroyTask do
fab!(:t3) { Fabricate(:topic, category: sc) }
let!(:p3) { Fabricate(:post, topic: t3) }
- it 'destroys specified category' do
+ it "destroys specified category" do
destroy_task = DestroyTask.new(StringIO.new)
- expect { destroy_task.destroy_category(c.id) }
- .to change { Category.where(id: c.id).count }.by (-1)
+ expect { destroy_task.destroy_category(c.id) }.to change {
+ Category.where(id: c.id).count
+ }.by (-1)
end
- it 'destroys sub-categories when destroying parent category' do
+ it "destroys sub-categories when destroying parent category" do
destroy_task = DestroyTask.new(StringIO.new)
- expect { destroy_task.destroy_category(c2.id) }
- .to change { Category.where(id: sc.id).count }.by (-1)
+ expect { destroy_task.destroy_category(c2.id) }.to change {
+ Category.where(id: sc.id).count
+ }.by (-1)
end
end
- describe 'private messages' do
+ describe "private messages" do
let!(:pm) { Fabricate(:private_message_post) }
let!(:pm2) { Fabricate(:private_message_post) }
- it 'destroys all private messages' do
+ it "destroys all private messages" do
destroy_task = DestroyTask.new(StringIO.new)
destroy_task.destroy_private_messages
expect(Topic.where(archetype: "private_message").count).to eq 0
end
end
- describe 'groups' do
+ describe "groups" do
let!(:g) { Fabricate(:group) }
let!(:g2) { Fabricate(:group) }
- it 'destroys all groups' do
+ it "destroys all groups" do
destroy_task = DestroyTask.new(StringIO.new)
destroy_task.destroy_groups
expect(Group.where(automatic: false).count).to eq 0
@@ -93,8 +96,8 @@ RSpec.describe DestroyTask do
end
end
- describe 'users' do
- it 'destroys all non-admin users' do
+ describe "users" do
+ it "destroys all non-admin users" do
before_count = User.count
Fabricate(:user)
@@ -109,8 +112,8 @@ RSpec.describe DestroyTask do
end
end
- describe 'stats' do
- it 'destroys all site stats' do
+ describe "stats" do
+ it "destroys all site stats" do
destroy_task = DestroyTask.new(StringIO.new)
destroy_task.destroy_stats
end
diff --git a/spec/services/email_settings_exception_handler_spec.rb b/spec/services/email_settings_exception_handler_spec.rb
index 0d525d0a8a5..e70614dd608 100644
--- a/spec/services/email_settings_exception_handler_spec.rb
+++ b/spec/services/email_settings_exception_handler_spec.rb
@@ -5,93 +5,97 @@ RSpec.describe EmailSettingsExceptionHandler do
it "formats a Net::POPAuthenticationError" do
exception = Net::POPAuthenticationError.new("invalid credentials")
expect(subject.class.friendly_exception_message(exception, "pop.test.com")).to eq(
- I18n.t("email_settings.pop3_authentication_error")
+ I18n.t("email_settings.pop3_authentication_error"),
)
end
it "formats a Net::IMAP::NoResponseError for invalid credentials" do
exception = Net::IMAP::NoResponseError.new(stub(data: stub(text: "Invalid credentials")))
expect(subject.class.friendly_exception_message(exception, "imap.test.com")).to eq(
- I18n.t("email_settings.imap_authentication_error")
+ I18n.t("email_settings.imap_authentication_error"),
)
end
it "formats a general Net::IMAP::NoResponseError" do
exception = Net::IMAP::NoResponseError.new(stub(data: stub(text: "NO bad problem (Failure)")))
expect(subject.class.friendly_exception_message(exception, "imap.test.com")).to eq(
- I18n.t("email_settings.imap_no_response_error", message: "NO bad problem")
+ I18n.t("email_settings.imap_no_response_error", message: "NO bad problem"),
)
end
it "formats a general Net::IMAP::NoResponseError with application-specific password Gmail error" do
- exception = Net::IMAP::NoResponseError.new(stub(data: stub(text: "NO Application-specific password required")))
+ exception =
+ Net::IMAP::NoResponseError.new(
+ stub(data: stub(text: "NO Application-specific password required")),
+ )
expect(subject.class.friendly_exception_message(exception, "imap.gmail.com")).to eq(
- I18n.t("email_settings.authentication_error_gmail_app_password")
+ I18n.t("email_settings.authentication_error_gmail_app_password"),
)
end
it "formats a Net::SMTPAuthenticationError" do
exception = Net::SMTPAuthenticationError.new("invalid credentials")
expect(subject.class.friendly_exception_message(exception, "smtp.test.com")).to eq(
- I18n.t("email_settings.smtp_authentication_error")
+ I18n.t("email_settings.smtp_authentication_error"),
)
end
it "formats a Net::SMTPAuthenticationError with application-specific password Gmail error" do
- exception = Net::SMTPAuthenticationError.new(nil, message: "Application-specific password required")
+ exception =
+ Net::SMTPAuthenticationError.new(nil, message: "Application-specific password required")
expect(subject.class.friendly_exception_message(exception, "smtp.gmail.com")).to eq(
- I18n.t("email_settings.authentication_error_gmail_app_password")
+ I18n.t("email_settings.authentication_error_gmail_app_password"),
)
end
it "formats a Net::SMTPServerBusy" do
exception = Net::SMTPServerBusy.new("call me maybe later")
expect(subject.class.friendly_exception_message(exception, "smtp.test.com")).to eq(
- I18n.t("email_settings.smtp_server_busy_error")
+ I18n.t("email_settings.smtp_server_busy_error"),
)
end
it "formats a Net::SMTPSyntaxError, Net::SMTPFatalError, and Net::SMTPUnknownError" do
exception = Net::SMTPSyntaxError.new(nil, message: "bad syntax")
expect(subject.class.friendly_exception_message(exception, "smtp.test.com")).to eq(
- I18n.t("email_settings.smtp_unhandled_error", message: exception.message)
+ I18n.t("email_settings.smtp_unhandled_error", message: exception.message),
)
exception = Net::SMTPFatalError.new(nil, message: "fatal")
expect(subject.class.friendly_exception_message(exception, "smtp.test.com")).to eq(
- I18n.t("email_settings.smtp_unhandled_error", message: exception.message)
+ I18n.t("email_settings.smtp_unhandled_error", message: exception.message),
)
exception = Net::SMTPUnknownError.new(nil, message: "unknown")
expect(subject.class.friendly_exception_message(exception, "smtp.test.com")).to eq(
- I18n.t("email_settings.smtp_unhandled_error", message: exception.message)
+ I18n.t("email_settings.smtp_unhandled_error", message: exception.message),
)
end
it "formats a SocketError and Errno::ECONNREFUSED" do
exception = SocketError.new("bad socket")
expect(subject.class.friendly_exception_message(exception, "smtp.test.com")).to eq(
- I18n.t("email_settings.connection_error")
+ I18n.t("email_settings.connection_error"),
)
exception = Errno::ECONNREFUSED.new("no thanks")
expect(subject.class.friendly_exception_message(exception, "smtp.test.com")).to eq(
- I18n.t("email_settings.connection_error")
+ I18n.t("email_settings.connection_error"),
)
end
it "formats a Net::OpenTimeout and Net::ReadTimeout error" do
exception = Net::OpenTimeout.new("timed out")
expect(subject.class.friendly_exception_message(exception, "smtp.test.com")).to eq(
- I18n.t("email_settings.timeout_error")
+ I18n.t("email_settings.timeout_error"),
)
exception = Net::ReadTimeout.new("timed out")
expect(subject.class.friendly_exception_message(exception, "smtp.test.com")).to eq(
- I18n.t("email_settings.timeout_error")
+ I18n.t("email_settings.timeout_error"),
)
end
it "formats unhandled errors" do
exception = StandardError.new("unknown")
expect(subject.class.friendly_exception_message(exception, "smtp.test.com")).to eq(
- I18n.t("email_settings.unhandled_error", message: exception.message)
+ I18n.t("email_settings.unhandled_error", message: exception.message),
)
end
end
diff --git a/spec/services/email_settings_validator_spec.rb b/spec/services/email_settings_validator_spec.rb
index 8abde6d3662..9ba5fb7e6e0 100644
--- a/spec/services/email_settings_validator_spec.rb
+++ b/spec/services/email_settings_validator_spec.rb
@@ -14,25 +14,51 @@ RSpec.describe EmailSettingsValidator do
obj
end
- before do
- Net::IMAP.stubs(:new).returns(net_imap_stub)
- end
+ before { Net::IMAP.stubs(:new).returns(net_imap_stub) }
it "is valid if no error is raised" do
net_imap_stub.stubs(:logout).returns(true)
net_imap_stub.stubs(:disconnect).returns(true)
- expect { subject.class.validate_imap(host: host, port: port, username: username, password: password) }.not_to raise_error
+ expect {
+ subject.class.validate_imap(host: host, port: port, username: username, password: password)
+ }.not_to raise_error
end
it "is invalid if an error is raised" do
- net_imap_stub.stubs(:login).raises(Net::IMAP::NoResponseError, stub(data: stub(text: "no response")))
- expect { subject.class.validate_imap(host: host, port: port, username: username, password: password, debug: true) }.to raise_error(Net::IMAP::NoResponseError)
+ net_imap_stub.stubs(:login).raises(
+ Net::IMAP::NoResponseError,
+ stub(data: stub(text: "no response")),
+ )
+ expect {
+ subject.class.validate_imap(
+ host: host,
+ port: port,
+ username: username,
+ password: password,
+ debug: true,
+ )
+ }.to raise_error(Net::IMAP::NoResponseError)
end
it "logs a warning if debug: true passed in and still raises the error" do
- net_imap_stub.stubs(:login).raises(Net::IMAP::NoResponseError, stub(data: stub(text: "no response")))
- Rails.logger.expects(:warn).with(regexp_matches(/\[EmailSettingsValidator\] Error encountered/)).at_least_once
- expect { subject.class.validate_imap(host: host, port: port, username: username, password: password, debug: true) }.to raise_error(Net::IMAP::NoResponseError)
+ net_imap_stub.stubs(:login).raises(
+ Net::IMAP::NoResponseError,
+ stub(data: stub(text: "no response")),
+ )
+ Rails
+ .logger
+ .expects(:warn)
+ .with(regexp_matches(/\[EmailSettingsValidator\] Error encountered/))
+ .at_least_once
+ expect {
+ subject.class.validate_imap(
+ host: host,
+ port: port,
+ username: username,
+ password: password,
+ debug: true,
+ )
+ }.to raise_error(Net::IMAP::NoResponseError)
end
end
@@ -47,37 +73,61 @@ RSpec.describe EmailSettingsValidator do
obj
end
- before do
- Net::POP3.stubs(:new).returns(net_pop3_stub)
- end
+ before { Net::POP3.stubs(:new).returns(net_pop3_stub) }
it "is valid if no error is raised" do
- expect { subject.class.validate_pop3(host: host, port: port, username: username, password: password) }.not_to raise_error
+ expect {
+ subject.class.validate_pop3(host: host, port: port, username: username, password: password)
+ }.not_to raise_error
end
it "is invalid if an error is raised" do
net_pop3_stub.stubs(:auth_only).raises(Net::POPAuthenticationError, "invalid credentials")
- expect { subject.class.validate_pop3(host: host, port: port, username: username, password: password, debug: true) }.to raise_error(Net::POPAuthenticationError)
+ expect {
+ subject.class.validate_pop3(
+ host: host,
+ port: port,
+ username: username,
+ password: password,
+ debug: true,
+ )
+ }.to raise_error(Net::POPAuthenticationError)
end
it "logs a warning if debug: true passed in and still raises the error" do
- Rails.logger.expects(:warn).with(regexp_matches(/\[EmailSettingsValidator\] Error encountered/)).at_least_once
+ Rails
+ .logger
+ .expects(:warn)
+ .with(regexp_matches(/\[EmailSettingsValidator\] Error encountered/))
+ .at_least_once
net_pop3_stub.stubs(:auth_only).raises(Net::POPAuthenticationError, "invalid credentials")
- expect { subject.class.validate_pop3(host: host, port: port, username: username, password: password, debug: true) }.to raise_error(Net::POPAuthenticationError)
+ expect {
+ subject.class.validate_pop3(
+ host: host,
+ port: port,
+ username: username,
+ password: password,
+ debug: true,
+ )
+ }.to raise_error(Net::POPAuthenticationError)
end
it "uses the correct ssl verify params if those settings are enabled" do
SiteSetting.pop3_polling_ssl = true
SiteSetting.pop3_polling_openssl_verify = true
net_pop3_stub.expects(:enable_ssl).with(max_version: OpenSSL::SSL::TLS1_2_VERSION)
- expect { subject.class.validate_pop3(host: host, port: port, username: username, password: password) }.not_to raise_error
+ expect {
+ subject.class.validate_pop3(host: host, port: port, username: username, password: password)
+ }.not_to raise_error
end
it "uses the correct ssl verify params if openssl_verify is not enabled" do
SiteSetting.pop3_polling_ssl = true
SiteSetting.pop3_polling_openssl_verify = false
net_pop3_stub.expects(:enable_ssl).with(OpenSSL::SSL::VERIFY_NONE)
- expect { subject.class.validate_pop3(host: host, port: port, username: username, password: password) }.not_to raise_error
+ expect {
+ subject.class.validate_pop3(host: host, port: port, username: username, password: password)
+ }.not_to raise_error
end
end
@@ -97,54 +147,139 @@ RSpec.describe EmailSettingsValidator do
obj
end
- before do
- Net::SMTP.stubs(:new).returns(net_smtp_stub)
- end
+ before { Net::SMTP.stubs(:new).returns(net_smtp_stub) }
it "is valid if no error is raised" do
- expect { subject.class.validate_smtp(host: host, port: port, username: username, password: password, domain: domain) }.not_to raise_error
+ expect {
+ subject.class.validate_smtp(
+ host: host,
+ port: port,
+ username: username,
+ password: password,
+ domain: domain,
+ )
+ }.not_to raise_error
end
it "is invalid if an error is raised" do
net_smtp_stub.stubs(:start).raises(Net::SMTPAuthenticationError, "invalid credentials")
- expect { subject.class.validate_smtp(host: host, port: port, username: username, password: password, domain: domain) }.to raise_error(Net::SMTPAuthenticationError)
+ expect {
+ subject.class.validate_smtp(
+ host: host,
+ port: port,
+ username: username,
+ password: password,
+ domain: domain,
+ )
+ }.to raise_error(Net::SMTPAuthenticationError)
end
it "logs a warning if debug: true passed in and still raises the error" do
- Rails.logger.expects(:warn).with(regexp_matches(/\[EmailSettingsValidator\] Error encountered/)).at_least_once
- net_smtp_stub.stubs(:start).raises(Net::SMTPAuthenticationError, stub(message: "invalid credentials"))
- expect { subject.class.validate_smtp(host: host, port: port, username: username, password: password, debug: true, domain: domain) }.to raise_error(Net::SMTPAuthenticationError)
+ Rails
+ .logger
+ .expects(:warn)
+ .with(regexp_matches(/\[EmailSettingsValidator\] Error encountered/))
+ .at_least_once
+ net_smtp_stub.stubs(:start).raises(
+ Net::SMTPAuthenticationError,
+ stub(message: "invalid credentials"),
+ )
+ expect {
+ subject.class.validate_smtp(
+ host: host,
+ port: port,
+ username: username,
+ password: password,
+ debug: true,
+ domain: domain,
+ )
+ }.to raise_error(Net::SMTPAuthenticationError)
end
it "uses the correct ssl verify params for enable_tls if those settings are enabled" do
net_smtp_stub.expects(:enable_tls)
- expect { subject.class.validate_smtp(host: host, port: 465, username: username, password: password, domain: domain, openssl_verify_mode: "peer", enable_tls: true, enable_starttls_auto: false) }.not_to raise_error
+ expect {
+ subject.class.validate_smtp(
+ host: host,
+ port: 465,
+ username: username,
+ password: password,
+ domain: domain,
+ openssl_verify_mode: "peer",
+ enable_tls: true,
+ enable_starttls_auto: false,
+ )
+ }.not_to raise_error
end
it "uses the correct ssl verify params for enable_starttls_auto if those settings are enabled" do
net_smtp_stub.expects(:enable_starttls_auto)
- expect { subject.class.validate_smtp(host: host, port: 587, username: username, password: password, domain: domain, openssl_verify_mode: "peer", enable_tls: false, enable_starttls_auto: true) }.not_to raise_error
+ expect {
+ subject.class.validate_smtp(
+ host: host,
+ port: 587,
+ username: username,
+ password: password,
+ domain: domain,
+ openssl_verify_mode: "peer",
+ enable_tls: false,
+ enable_starttls_auto: true,
+ )
+ }.not_to raise_error
end
it "raises an ArgumentError if both enable_tls is true and enable_starttls_auto is true" do
- expect { subject.class.validate_smtp(host: host, port: port, username: username, password: password, domain: domain, enable_ssl: true, enable_starttls_auto: true) }.to raise_error(ArgumentError)
+ expect {
+ subject.class.validate_smtp(
+ host: host,
+ port: port,
+ username: username,
+ password: password,
+ domain: domain,
+ enable_ssl: true,
+ enable_starttls_auto: true,
+ )
+ }.to raise_error(ArgumentError)
end
it "raises an ArgumentError if a bad authentication method is used" do
- expect { subject.class.validate_smtp(host: host, port: port, username: username, password: password, domain: domain, authentication: :rubber_stamp) }.to raise_error(ArgumentError)
+ expect {
+ subject.class.validate_smtp(
+ host: host,
+ port: port,
+ username: username,
+ password: password,
+ domain: domain,
+ authentication: :rubber_stamp,
+ )
+ }.to raise_error(ArgumentError)
end
context "when the domain is not provided" do
let(:domain) { nil }
it "gets the domain from the host" do
net_smtp_stub.expects(:start).with("gmail.com", username, password, :plain)
- subject.class.validate_smtp(host: host, port: port, username: username, password: password, enable_tls: true, enable_starttls_auto: false)
+ subject.class.validate_smtp(
+ host: host,
+ port: port,
+ username: username,
+ password: password,
+ enable_tls: true,
+ enable_starttls_auto: false,
+ )
end
it "uses localhost when in development mode" do
Rails.env.stubs(:development?).returns(true)
net_smtp_stub.expects(:start).with("localhost", username, password, :plain)
- subject.class.validate_smtp(host: host, port: port, username: username, password: password, enable_tls: true, enable_starttls_auto: false)
+ subject.class.validate_smtp(
+ host: host,
+ port: port,
+ username: username,
+ password: password,
+ enable_tls: true,
+ enable_starttls_auto: false,
+ )
end
end
end
diff --git a/spec/services/email_style_updater_spec.rb b/spec/services/email_style_updater_spec.rb
index 68e6ef14f7f..77742457b6c 100644
--- a/spec/services/email_style_updater_spec.rb
+++ b/spec/services/email_style_updater_spec.rb
@@ -11,47 +11,43 @@ RSpec.describe EmailStyleUpdater do
expect(SiteSetting.email_custom_css_compiled).to_not be_present
end
- describe 'update' do
- it 'can change the settings' do
- expect(
- updater.update(
- html: 'For you: %{email_content}',
- css: 'h1 { color: blue; }'
- )
- ).to eq(true)
- expect(SiteSetting.email_custom_template).to eq('For you: %{email_content}')
- expect(SiteSetting.email_custom_css).to eq('h1 { color: blue; }')
- expect(SiteSetting.email_custom_css_compiled.strip).to eq('h1{color:blue}')
+ describe "update" do
+ it "can change the settings" do
+ expect(updater.update(html: "For you: %{email_content}", css: "h1 { color: blue; }")).to eq(
+ true,
+ )
+ expect(SiteSetting.email_custom_template).to eq("For you: %{email_content}")
+ expect(SiteSetting.email_custom_css).to eq("h1 { color: blue; }")
+ expect(SiteSetting.email_custom_css_compiled.strip).to eq("h1{color:blue}")
end
- it 'will not store defaults' do
- updater.update(html: default_html, css: '')
+ it "will not store defaults" do
+ updater.update(html: default_html, css: "")
expect_settings_to_be_unset
end
- it 'can clear settings if defaults given' do
- SiteSetting.email_custom_template = 'For you: %{email_content}'
- SiteSetting.email_custom_css = 'h1 { color: blue; }'
- SiteSetting.email_custom_css_compiled = 'h1{color:blue}'
- updater.update(html: default_html, css: '')
+ it "can clear settings if defaults given" do
+ SiteSetting.email_custom_template = "For you: %{email_content}"
+ SiteSetting.email_custom_css = "h1 { color: blue; }"
+ SiteSetting.email_custom_css_compiled = "h1{color:blue}"
+ updater.update(html: default_html, css: "")
expect_settings_to_be_unset
end
- it 'fails if html is missing email_content' do
- expect(updater.update(html: 'No email content', css: '')).to eq(false)
+ it "fails if html is missing email_content" do
+ expect(updater.update(html: "No email content", css: "")).to eq(false)
expect(updater.errors).to include(
- I18n.t(
- 'email_style.html_missing_placeholder',
- placeholder: '%{email_content}'
- )
+ I18n.t("email_style.html_missing_placeholder", placeholder: "%{email_content}"),
)
expect_settings_to_be_unset
end
- it 'fails if css is not valid scss' do
- expect(updater.update(html: 'For you: %{email_content}', css: 'h1 { color: blue;')).to eq(false)
+ it "fails if css is not valid scss" do
+ expect(updater.update(html: "For you: %{email_content}", css: "h1 { color: blue;")).to eq(
+ false,
+ )
expect(updater.errors).to_not be_empty
- expect(updater.errors.first).to include('Invalid CSS after')
+ expect(updater.errors.first).to include("Invalid CSS after")
expect_settings_to_be_unset
end
end
diff --git a/spec/services/external_upload_manager_spec.rb b/spec/services/external_upload_manager_spec.rb
index 6a0332ea183..6c4a71a6b91 100644
--- a/spec/services/external_upload_manager_spec.rb
+++ b/spec/services/external_upload_manager_spec.rb
@@ -13,9 +13,7 @@ RSpec.describe ExternalUploadManager do
let!(:external_upload_stub) { Fabricate(:image_external_upload_stub, created_by: user) }
let(:s3_bucket_name) { SiteSetting.s3_upload_bucket }
- subject do
- ExternalUploadManager.new(external_upload_stub)
- end
+ subject { ExternalUploadManager.new(external_upload_stub) }
before do
SiteSetting.authorized_extensions += "|pdf"
@@ -48,14 +46,14 @@ RSpec.describe ExternalUploadManager do
describe "#transform!" do
context "when stubbed upload is < DOWNLOAD_LIMIT (small enough to download + generate sha)" do
- let!(:external_upload_stub) { Fabricate(:image_external_upload_stub, created_by: user, filesize: object_size) }
+ let!(:external_upload_stub) do
+ Fabricate(:image_external_upload_stub, created_by: user, filesize: object_size)
+ end
let(:object_size) { 1.megabyte }
let(:object_file) { logo_file }
context "when the download of the s3 file fails" do
- before do
- FileHelper.stubs(:download).returns(nil)
- end
+ before { FileHelper.stubs(:download).returns(nil) }
it "raises an error" do
expect { subject.transform! }.to raise_error(ExternalUploadManager::DownloadFailedError)
@@ -63,9 +61,7 @@ RSpec.describe ExternalUploadManager do
end
context "when the upload is not in the created status" do
- before do
- external_upload_stub.update!(status: ExternalUploadStub.statuses[:uploaded])
- end
+ before { external_upload_stub.update!(status: ExternalUploadStub.statuses[:uploaded]) }
it "raises an error" do
expect { subject.transform! }.to raise_error(ExternalUploadManager::CannotPromoteError)
@@ -86,7 +82,14 @@ RSpec.describe ExternalUploadManager do
SiteSetting.max_image_size_kb = 1
upload = subject.transform!
expect(upload.errors.full_messages).to include(
- "Filesize " + I18n.t("upload.images.too_large_humanized", max_size: ActiveSupport::NumberHelper.number_to_human_size(SiteSetting.max_image_size_kb.kilobytes))
+ "Filesize " +
+ I18n.t(
+ "upload.images.too_large_humanized",
+ max_size:
+ ActiveSupport::NumberHelper.number_to_human_size(
+ SiteSetting.max_image_size_kb.kilobytes,
+ ),
+ ),
)
end
@@ -94,7 +97,7 @@ RSpec.describe ExternalUploadManager do
SiteSetting.authorized_extensions = ""
upload = subject.transform!
expect(upload.errors.full_messages).to include(
- "Original filename " + I18n.t("upload.unauthorized", authorized_extensions: "")
+ "Original filename " + I18n.t("upload.unauthorized", authorized_extensions: ""),
)
end
end
@@ -102,7 +105,13 @@ RSpec.describe ExternalUploadManager do
context "when the upload does get changed by the UploadCreator" do
let(:object_file) { file_from_fixtures("should_be_jpeg.heic", "images") }
let(:object_size) { 1.megabyte }
- let(:external_upload_stub) { Fabricate(:image_external_upload_stub, original_filename: "should_be_jpeg.heic", filesize: object_size) }
+ let(:external_upload_stub) do
+ Fabricate(
+ :image_external_upload_stub,
+ original_filename: "should_be_jpeg.heic",
+ filesize: object_size,
+ )
+ end
it "creates a new upload in s3 (not copy) and deletes the original stubbed upload" do
upload = subject.transform!
@@ -121,7 +130,9 @@ RSpec.describe ExternalUploadManager do
let(:client_sha1) { "blahblah" }
it "raises an error, deletes the stub" do
- expect { subject.transform! }.to raise_error(ExternalUploadManager::ChecksumMismatchError)
+ expect { subject.transform! }.to raise_error(
+ ExternalUploadManager::ChecksumMismatchError,
+ )
expect(ExternalUploadStub.exists?(id: external_upload_stub.id)).to eq(false)
bucket = @fake_s3.bucket(SiteSetting.s3_upload_bucket)
@@ -130,7 +141,9 @@ RSpec.describe ExternalUploadManager do
it "does not delete the stub if enable_upload_debug_mode" do
SiteSetting.enable_upload_debug_mode = true
- expect { subject.transform! }.to raise_error(ExternalUploadManager::ChecksumMismatchError)
+ expect { subject.transform! }.to raise_error(
+ ExternalUploadManager::ChecksumMismatchError,
+ )
external_stub = ExternalUploadStub.find(external_upload_stub.id)
expect(external_stub.status).to eq(ExternalUploadStub.statuses[:failed])
@@ -141,16 +154,18 @@ RSpec.describe ExternalUploadManager do
end
context "when the downloaded file size does not match the expected file size for the upload stub" do
- before do
- external_upload_stub.update!(filesize: 10)
- end
+ before { external_upload_stub.update!(filesize: 10) }
after { Discourse.redis.flushdb }
it "raises an error, deletes the file immediately, and prevents the user from uploading external files for a few minutes" do
expect { subject.transform! }.to raise_error(ExternalUploadManager::SizeMismatchError)
expect(ExternalUploadStub.exists?(id: external_upload_stub.id)).to eq(false)
- expect(Discourse.redis.get("#{ExternalUploadManager::BAN_USER_REDIS_PREFIX}#{external_upload_stub.created_by_id}")).to eq("1")
+ expect(
+ Discourse.redis.get(
+ "#{ExternalUploadManager::BAN_USER_REDIS_PREFIX}#{external_upload_stub.created_by_id}",
+ ),
+ ).to eq("1")
bucket = @fake_s3.bucket(SiteSetting.s3_upload_bucket)
expect(bucket.find_object(external_upload_stub.key)).to be_nil
@@ -171,10 +186,15 @@ RSpec.describe ExternalUploadManager do
context "when stubbed upload is > DOWNLOAD_LIMIT (too big to download, generate a fake sha)" do
let(:object_size) { 200.megabytes }
let(:object_file) { pdf_file }
- let!(:external_upload_stub) { Fabricate(:attachment_external_upload_stub, created_by: user, filesize: object_size) }
+ let!(:external_upload_stub) do
+ Fabricate(:attachment_external_upload_stub, created_by: user, filesize: object_size)
+ end
before do
- UploadCreator.any_instance.stubs(:generate_fake_sha1_hash).returns("testbc60eb18e8f974cbfae8bb0f069c3a311024")
+ UploadCreator
+ .any_instance
+ .stubs(:generate_fake_sha1_hash)
+ .returns("testbc60eb18e8f974cbfae8bb0f069c3a311024")
end
it "does not try and download the file" do
@@ -213,7 +233,7 @@ RSpec.describe ExternalUploadManager do
filesize: object_size,
upload_type: "backup",
original_filename: "backup_since_v1.6.tar.gz",
- folder_prefix: RailsMultisite::ConnectionManagement.current_db
+ folder_prefix: RailsMultisite::ConnectionManagement.current_db,
)
end
let(:s3_bucket_name) { SiteSetting.s3_backup_bucket }
@@ -243,7 +263,11 @@ RSpec.describe ExternalUploadManager do
subject.transform!
- expect(bucket.find_object("#{RailsMultisite::ConnectionManagement.current_db}/backup_since_v1.6.tar.gz")).to be_present
+ expect(
+ bucket.find_object(
+ "#{RailsMultisite::ConnectionManagement.current_db}/backup_since_v1.6.tar.gz",
+ ),
+ ).to be_present
expect(bucket.find_object(external_upload_stub.key)).to be_nil
end
end
@@ -255,7 +279,7 @@ RSpec.describe ExternalUploadManager do
signed_url = uri.to_s.gsub(uri.query, "")
stub_request(:get, signed_url).with(query: hash_including({})).to_return(
status: 200,
- body: object_file.read
+ body: object_file.read,
)
end
@@ -266,7 +290,7 @@ RSpec.describe ExternalUploadManager do
key: external_upload_stub.key,
size: object_size,
last_modified: Time.zone.now,
- metadata: external_upload_stub_metadata
+ metadata: external_upload_stub_metadata,
)
end
end
diff --git a/spec/services/flag_sockpuppets_spec.rb b/spec/services/flag_sockpuppets_spec.rb
index edfb9de9933..8e921a72b4c 100644
--- a/spec/services/flag_sockpuppets_spec.rb
+++ b/spec/services/flag_sockpuppets_spec.rb
@@ -1,24 +1,24 @@
# frozen_string_literal: true
RSpec.describe SpamRule::FlagSockpuppets do
- fab!(:user1) { Fabricate(:user, ip_address: '182.189.119.174') }
+ fab!(:user1) { Fabricate(:user, ip_address: "182.189.119.174") }
fab!(:post1) { Fabricate(:post, user: user1, topic: Fabricate(:topic, user: user1)) }
- describe '#perform' do
- let(:rule) { described_class.new(post1) }
+ describe "#perform" do
+ let(:rule) { described_class.new(post1) }
subject(:perform) { rule.perform }
- it 'does nothing if flag_sockpuppets is disabled' do
+ it "does nothing if flag_sockpuppets is disabled" do
SiteSetting.flag_sockpuppets = false
rule.expects(:reply_is_from_sockpuppet?).never
rule.expects(:flag_sockpuppet_users).never
expect(perform).to eq(false)
end
- context 'when flag_sockpuppets is enabled' do
+ context "when flag_sockpuppets is enabled" do
before { SiteSetting.flag_sockpuppets = true }
- it 'flags posts when it should' do
+ it "flags posts when it should" do
rule.expects(:reply_is_from_sockpuppet?).returns(:true)
rule.expects(:flag_sockpuppet_users).once
expect(perform).to eq(true)
@@ -32,111 +32,197 @@ RSpec.describe SpamRule::FlagSockpuppets do
end
end
- describe '#reply_is_from_sockpuppet?' do
- it 'is false for the first post in a topic' do
+ describe "#reply_is_from_sockpuppet?" do
+ it "is false for the first post in a topic" do
expect(described_class.new(post1).reply_is_from_sockpuppet?).to eq(false)
end
- it 'is false if users have different IP addresses' do
- post2 = Fabricate(:post, user: Fabricate(:user, ip_address: '182.189.199.199'), topic: post1.topic)
+ it "is false if users have different IP addresses" do
+ post2 =
+ Fabricate(:post, user: Fabricate(:user, ip_address: "182.189.199.199"), topic: post1.topic)
expect(described_class.new(post2).reply_is_from_sockpuppet?).to eq(false)
end
- it 'is true if users have the same IP address and are new' do
- post2 = Fabricate(:post, user: Fabricate(:user, ip_address: user1.ip_address), topic: post1.topic)
+ it "is true if users have the same IP address and are new" do
+ post2 =
+ Fabricate(:post, user: Fabricate(:user, ip_address: user1.ip_address), topic: post1.topic)
expect(described_class.new(post2).reply_is_from_sockpuppet?).to eq(true)
end
- it 'is false if the ip address is allowlisted' do
+ it "is false if the ip address is allowlisted" do
ScreenedIpAddress.stubs(:is_allowed?).with(user1.ip_address).returns(true)
- post2 = Fabricate(:post, user: Fabricate(:user, ip_address: user1.ip_address), topic: post1.topic)
+ post2 =
+ Fabricate(:post, user: Fabricate(:user, ip_address: user1.ip_address), topic: post1.topic)
expect(described_class.new(post2).reply_is_from_sockpuppet?).to eq(false)
end
- it 'is false if reply and first post are from the same user' do
+ it "is false if reply and first post are from the same user" do
post2 = Fabricate(:post, user: user1, topic: post1.topic)
expect(described_class.new(post2).reply_is_from_sockpuppet?).to eq(false)
end
- it 'is false if first post user is staff' do
- staff1 = Fabricate(:admin, ip_address: '182.189.119.174')
+ it "is false if first post user is staff" do
+ staff1 = Fabricate(:admin, ip_address: "182.189.119.174")
staff_post1 = Fabricate(:post, user: staff1, topic: Fabricate(:topic, user: staff1))
- post2 = Fabricate(:post, user: Fabricate(:user, ip_address: staff1.ip_address), topic: staff_post1.topic)
+ post2 =
+ Fabricate(
+ :post,
+ user: Fabricate(:user, ip_address: staff1.ip_address),
+ topic: staff_post1.topic,
+ )
expect(described_class.new(post2).reply_is_from_sockpuppet?).to eq(false)
end
- it 'is false if second post user is staff' do
- post2 = Fabricate(:post, user: Fabricate(:moderator, ip_address: user1.ip_address), topic: post1.topic)
+ it "is false if second post user is staff" do
+ post2 =
+ Fabricate(
+ :post,
+ user: Fabricate(:moderator, ip_address: user1.ip_address),
+ topic: post1.topic,
+ )
expect(described_class.new(post2).reply_is_from_sockpuppet?).to eq(false)
end
- it 'is false if both users are staff' do
- staff1 = Fabricate(:moderator, ip_address: '182.189.119.174')
+ it "is false if both users are staff" do
+ staff1 = Fabricate(:moderator, ip_address: "182.189.119.174")
staff_post1 = Fabricate(:post, user: staff1, topic: Fabricate(:topic, user: staff1))
- post2 = Fabricate(:post, user: Fabricate(:admin, ip_address: staff1.ip_address), topic: staff_post1.topic)
+ post2 =
+ Fabricate(
+ :post,
+ user: Fabricate(:admin, ip_address: staff1.ip_address),
+ topic: staff_post1.topic,
+ )
expect(described_class.new(post2).reply_is_from_sockpuppet?).to eq(false)
end
- it 'is true if first post user was created over 24 hours ago and has trust level higher than 0' do
- old_user = Fabricate(:user, ip_address: '182.189.119.174', created_at: 25.hours.ago, trust_level: TrustLevel[1])
+ it "is true if first post user was created over 24 hours ago and has trust level higher than 0" do
+ old_user =
+ Fabricate(
+ :user,
+ ip_address: "182.189.119.174",
+ created_at: 25.hours.ago,
+ trust_level: TrustLevel[1],
+ )
first_post = Fabricate(:post, user: old_user, topic: Fabricate(:topic, user: old_user))
- post2 = Fabricate(:post, user: Fabricate(:user, ip_address: old_user.ip_address), topic: first_post.topic)
+ post2 =
+ Fabricate(
+ :post,
+ user: Fabricate(:user, ip_address: old_user.ip_address),
+ topic: first_post.topic,
+ )
expect(described_class.new(post2).reply_is_from_sockpuppet?).to eq(true)
end
- it 'is false if second post user was created over 24 hours ago and has trust level higher than 0' do
- post2 = Fabricate(:post, user: Fabricate(:user, ip_address: user1.ip_address, created_at: 25.hours.ago, trust_level: TrustLevel[1]), topic: post1.topic)
+ it "is false if second post user was created over 24 hours ago and has trust level higher than 0" do
+ post2 =
+ Fabricate(
+ :post,
+ user:
+ Fabricate(
+ :user,
+ ip_address: user1.ip_address,
+ created_at: 25.hours.ago,
+ trust_level: TrustLevel[1],
+ ),
+ topic: post1.topic,
+ )
expect(described_class.new(post2).reply_is_from_sockpuppet?).to eq(false)
end
- it 'is true if first post user was created less that 24 hours ago and has trust level higher than 0' do
- new_user = Fabricate(:user, ip_address: '182.189.119.174', created_at: 1.hour.ago, trust_level: TrustLevel[1])
+ it "is true if first post user was created less that 24 hours ago and has trust level higher than 0" do
+ new_user =
+ Fabricate(
+ :user,
+ ip_address: "182.189.119.174",
+ created_at: 1.hour.ago,
+ trust_level: TrustLevel[1],
+ )
first_post = Fabricate(:post, user: new_user, topic: Fabricate(:topic, user: new_user))
- post2 = Fabricate(:post, user: Fabricate(:user, ip_address: new_user.ip_address), topic: first_post.topic)
+ post2 =
+ Fabricate(
+ :post,
+ user: Fabricate(:user, ip_address: new_user.ip_address),
+ topic: first_post.topic,
+ )
expect(described_class.new(post2).reply_is_from_sockpuppet?).to eq(true)
end
- it 'is true if second user was created less that 24 hours ago and has trust level higher than 0' do
- post2 = Fabricate(:post, user: Fabricate(:user, ip_address: user1.ip_address, created_at: 23.hours.ago, trust_level: TrustLevel[1]), topic: post1.topic)
+ it "is true if second user was created less that 24 hours ago and has trust level higher than 0" do
+ post2 =
+ Fabricate(
+ :post,
+ user:
+ Fabricate(
+ :user,
+ ip_address: user1.ip_address,
+ created_at: 23.hours.ago,
+ trust_level: TrustLevel[1],
+ ),
+ topic: post1.topic,
+ )
expect(described_class.new(post2).reply_is_from_sockpuppet?).to eq(true)
end
# A weird case
- it 'is false when user is nil on first post' do
- post1.user = nil; post1.save!
+ it "is false when user is nil on first post" do
+ post1.user = nil
+ post1.save!
post2 = Fabricate(:post, user: Fabricate(:user), topic: post1.topic)
expect(described_class.new(post2).reply_is_from_sockpuppet?).to eq(false)
end
end
- describe '#flag_sockpuppet_users' do
- fab!(:post2) { Fabricate(:post, user: Fabricate(:user, ip_address: user1.ip_address), topic: post1.topic) }
+ describe "#flag_sockpuppet_users" do
+ fab!(:post2) do
+ Fabricate(:post, user: Fabricate(:user, ip_address: user1.ip_address), topic: post1.topic)
+ end
let(:system) { Discourse.system_user }
let(:spam) { PostActionType.types[:spam] }
- it 'flags post and first post if both users are new' do
+ it "flags post and first post if both users are new" do
described_class.new(post2).flag_sockpuppet_users
- expect(PostAction.where(user: system, post: post1, post_action_type_id: spam).exists?).to eq(true)
- expect(PostAction.where(user: system, post: post2, post_action_type_id: spam).exists?).to eq(true)
+ expect(PostAction.where(user: system, post: post1, post_action_type_id: spam).exists?).to eq(
+ true,
+ )
+ expect(PostAction.where(user: system, post: post2, post_action_type_id: spam).exists?).to eq(
+ true,
+ )
end
it "doesn't flag the first post more than once" do
described_class.new(post2).flag_sockpuppet_users
- expect(PostAction.where(user: system, post: post2, post_action_type_id: spam).exists?).to eq(true)
+ expect(PostAction.where(user: system, post: post2, post_action_type_id: spam).exists?).to eq(
+ true,
+ )
expect(PostAction.where(post: post2, post_action_type_id: spam).count).to eq(1)
end
it "doesn't flag the first post if the user is not new" do
- old_user = Fabricate(:user, ip_address: '182.189.119.174', created_at: 25.hours.ago, trust_level: TrustLevel[1])
+ old_user =
+ Fabricate(
+ :user,
+ ip_address: "182.189.119.174",
+ created_at: 25.hours.ago,
+ trust_level: TrustLevel[1],
+ )
first_post = Fabricate(:post, user: old_user, topic: Fabricate(:topic, user: old_user))
- post2 = Fabricate(:post, user: Fabricate(:user, ip_address: old_user.ip_address), topic: first_post.topic)
+ post2 =
+ Fabricate(
+ :post,
+ user: Fabricate(:user, ip_address: old_user.ip_address),
+ topic: first_post.topic,
+ )
described_class.new(post2).flag_sockpuppet_users
- expect(PostAction.where(user: system, post: post2, post_action_type_id: spam).exists?).to eq(true)
- expect(PostAction.where(user: system, post: first_post, post_action_type_id: spam).exists?).to eq(false)
+ expect(PostAction.where(user: system, post: post2, post_action_type_id: spam).exists?).to eq(
+ true,
+ )
+ expect(
+ PostAction.where(user: system, post: first_post, post_action_type_id: spam).exists?,
+ ).to eq(false)
end
it "doesn't create a flag if user is nil on first post" do
@@ -144,15 +230,22 @@ RSpec.describe SpamRule::FlagSockpuppets do
post1.save
described_class.new(post2).flag_sockpuppet_users
- expect(PostAction.where(user: system, post: post2, post_action_type_id: spam).exists?).to eq(true)
- expect(PostAction.where(user: system, post: post1, post_action_type_id: spam).exists?).to eq(false)
+ expect(PostAction.where(user: system, post: post2, post_action_type_id: spam).exists?).to eq(
+ true,
+ )
+ expect(PostAction.where(user: system, post: post1, post_action_type_id: spam).exists?).to eq(
+ false,
+ )
end
it "doesn't flag the first post if it was already rejected by staff before" do
- flagged_post = Fabricate(
- :reviewable_flagged_post,
- target: post1, status: Reviewable.statuses[:rejected], target_created_by: post1.user
- )
+ flagged_post =
+ Fabricate(
+ :reviewable_flagged_post,
+ target: post1,
+ status: Reviewable.statuses[:rejected],
+ target_created_by: post1.user,
+ )
described_class.new(post2).perform
@@ -161,10 +254,13 @@ RSpec.describe SpamRule::FlagSockpuppets do
it "doesn't flag the post if another post of the same user was rejected by staff before" do
another_post = Fabricate(:post, user: user1)
- flagged_post = Fabricate(
- :reviewable_flagged_post,
- target: another_post, status: Reviewable.statuses[:rejected], target_created_by: another_post.user
- )
+ flagged_post =
+ Fabricate(
+ :reviewable_flagged_post,
+ target: another_post,
+ status: Reviewable.statuses[:rejected],
+ target_created_by: another_post.user,
+ )
described_class.new(post2).perform
diff --git a/spec/services/group_action_logger_spec.rb b/spec/services/group_action_logger_spec.rb
index 2a49e253ef5..28eb7865759 100644
--- a/spec/services/group_action_logger_spec.rb
+++ b/spec/services/group_action_logger_spec.rb
@@ -7,12 +7,10 @@ RSpec.describe GroupActionLogger do
subject { described_class.new(group_owner, group) }
- before do
- group.add_owner(group_owner)
- end
+ before { group.add_owner(group_owner) }
- describe '#log_make_user_group_owner' do
- it 'should create the right record' do
+ describe "#log_make_user_group_owner" do
+ it "should create the right record" do
subject.log_make_user_group_owner(user)
group_history = GroupHistory.last
@@ -23,8 +21,8 @@ RSpec.describe GroupActionLogger do
end
end
- describe '#log_remove_user_as_group_owner' do
- it 'should create the right record' do
+ describe "#log_remove_user_as_group_owner" do
+ it "should create the right record" do
subject.log_remove_user_as_group_owner(user)
group_history = GroupHistory.last
@@ -35,9 +33,9 @@ RSpec.describe GroupActionLogger do
end
end
- describe '#log_add_user_to_group' do
- context 'as a group owner' do
- it 'should create the right record' do
+ describe "#log_add_user_to_group" do
+ context "as a group owner" do
+ it "should create the right record" do
subject.log_add_user_to_group(user)
group_history = GroupHistory.last
@@ -48,14 +46,12 @@ RSpec.describe GroupActionLogger do
end
end
- context 'as a normal user' do
+ context "as a normal user" do
subject { described_class.new(user, group) }
- before do
- group.update!(public_admission: true)
- end
+ before { group.update!(public_admission: true) }
- it 'should create the right record' do
+ it "should create the right record" do
subject.log_add_user_to_group(user)
group_history = GroupHistory.last
@@ -67,9 +63,9 @@ RSpec.describe GroupActionLogger do
end
end
- describe '#log_remove_user_from_group' do
- context 'as group owner' do
- it 'should create the right record' do
+ describe "#log_remove_user_from_group" do
+ context "as group owner" do
+ it "should create the right record" do
subject.log_remove_user_from_group(user)
group_history = GroupHistory.last
@@ -80,14 +76,12 @@ RSpec.describe GroupActionLogger do
end
end
- context 'as a normal user' do
+ context "as a normal user" do
subject { described_class.new(user, group) }
- before do
- group.update!(public_exit: true)
- end
+ before { group.update!(public_exit: true) }
- it 'should create the right record' do
+ it "should create the right record" do
subject.log_remove_user_from_group(user)
group_history = GroupHistory.last
@@ -99,8 +93,8 @@ RSpec.describe GroupActionLogger do
end
end
- describe '#log_change_group_settings' do
- it 'should create the right record' do
+ describe "#log_change_group_settings" do
+ it "should create the right record" do
group.update!(public_admission: true, created_at: Time.zone.now)
expect { subject.log_change_group_settings }.to change { GroupHistory.count }.by(1)
@@ -109,9 +103,9 @@ RSpec.describe GroupActionLogger do
expect(group_history.action).to eq(GroupHistory.actions[:change_group_setting])
expect(group_history.acting_user).to eq(group_owner)
- expect(group_history.subject).to eq('public_admission')
- expect(group_history.prev_value).to eq('f')
- expect(group_history.new_value).to eq('t')
+ expect(group_history.subject).to eq("public_admission")
+ expect(group_history.prev_value).to eq("f")
+ expect(group_history.new_value).to eq("t")
end
end
end
diff --git a/spec/services/group_mentions_updater_spec.rb b/spec/services/group_mentions_updater_spec.rb
index c56e9de20ba..07324e670bd 100644
--- a/spec/services/group_mentions_updater_spec.rb
+++ b/spec/services/group_mentions_updater_spec.rb
@@ -3,24 +3,20 @@
RSpec.describe GroupMentionsUpdater do
fab!(:post) { Fabricate(:post) }
- before do
- Jobs.run_immediately!
- end
+ before { Jobs.run_immediately! }
- describe '.update' do
- it 'should update valid group mentions' do
- new_group_name = 'awesome_team'
- old_group_name = 'team'
+ describe ".update" do
+ it "should update valid group mentions" do
+ new_group_name = "awesome_team"
+ old_group_name = "team"
[
["@#{old_group_name} is awesome!", "@#{new_group_name} is awesome!"],
["This @#{old_group_name} is awesome!", "This @#{new_group_name} is awesome!"],
["Mention us @ @#{old_group_name}", "Mention us @ @#{new_group_name}"],
].each do |raw, expected_raw|
- group = Fabricate(:group,
- name: old_group_name,
- mentionable_level: Group::ALIAS_LEVELS[:everyone]
- )
+ group =
+ Fabricate(:group, name: old_group_name, mentionable_level: Group::ALIAS_LEVELS[:everyone])
post.update!(raw: raw)
group.update!(name: new_group_name)
@@ -33,17 +29,14 @@ RSpec.describe GroupMentionsUpdater do
end
end
- it 'should not update invalid group mentions' do
- group = Fabricate(:group,
- name: 'team',
- mentionable_level: Group::ALIAS_LEVELS[:everyone]
- )
+ it "should not update invalid group mentions" do
+ group = Fabricate(:group, name: "team", mentionable_level: Group::ALIAS_LEVELS[:everyone])
- post.update!(raw: 'This is not valid@team.com')
+ post.update!(raw: "This is not valid@team.com")
expect(post.reload.raw_mentions).to eq([])
- group.update!(name: 'new_team_name')
+ group.update!(name: "new_team_name")
expect(post.reload.raw_mentions).to eq([])
end
@@ -51,21 +44,17 @@ RSpec.describe GroupMentionsUpdater do
it "should ignore validations" do
everyone_mention_level = Group::ALIAS_LEVELS[:everyone]
- %w{
- awesome_team
- pro_team
- }.each do |name|
+ %w[awesome_team pro_team].each do |name|
Fabricate(:group, name: name, mentionable_level: everyone_mention_level)
end
post.update!(raw: "@awesome_team is cool and so is @pro_team")
SiteSetting.max_mentions_per_post = 1
- GroupMentionsUpdater.update('cool_team', 'awesome_team')
+ GroupMentionsUpdater.update("cool_team", "awesome_team")
post.reload
- expect(post.raw_mentions).to match_array(['cool_team', 'pro_team'])
+ expect(post.raw_mentions).to match_array(%w[cool_team pro_team])
end
-
end
end
diff --git a/spec/services/group_message_spec.rb b/spec/services/group_message_spec.rb
index b650c5b8de9..6ff2e5911d5 100644
--- a/spec/services/group_message_spec.rb
+++ b/spec/services/group_message_spec.rb
@@ -3,30 +3,32 @@
RSpec.describe GroupMessage do
let(:moderators_group) { Group[:moderators].name }
- let!(:admin) { Fabricate.build(:admin, id: 999) }
- let!(:user) { Fabricate.build(:user, id: 111) }
+ let!(:admin) { Fabricate.build(:admin, id: 999) }
+ let!(:user) { Fabricate.build(:user, id: 111) }
- before do
- Discourse.stubs(:system_user).returns(admin)
+ before { Discourse.stubs(:system_user).returns(admin) }
+
+ subject(:send_group_message) do
+ GroupMessage.create(moderators_group, :user_automatically_silenced, user: user)
end
- subject(:send_group_message) { GroupMessage.create(moderators_group, :user_automatically_silenced, user: user) }
-
- describe 'not sent recently' do
+ describe "not sent recently" do
before { GroupMessage.any_instance.stubs(:sent_recently?).returns(false) }
- it 'should send a private message to the given group' do
- PostCreator.expects(:create).with do |from_user, opts|
- from_user.id == (admin.id) &&
- opts[:target_group_names] && opts[:target_group_names].include?(Group[:moderators].name) &&
- opts[:archetype] == (Archetype.private_message) &&
- opts[:title].present? &&
- opts[:raw].present?
- end.returns(stub_everything)
+ it "should send a private message to the given group" do
+ PostCreator
+ .expects(:create)
+ .with do |from_user, opts|
+ from_user.id == (admin.id) && opts[:target_group_names] &&
+ opts[:target_group_names].include?(Group[:moderators].name) &&
+ opts[:archetype] == (Archetype.private_message) && opts[:title].present? &&
+ opts[:raw].present?
+ end
+ .returns(stub_everything)
send_group_message
end
- it 'returns whatever PostCreator returns' do
+ it "returns whatever PostCreator returns" do
the_output = stub_everything
PostCreator.stubs(:create).returns(the_output)
expect(send_group_message).to eq(the_output)
@@ -39,79 +41,103 @@ RSpec.describe GroupMessage do
end
end
- describe 'sent recently' do
- before { GroupMessage.any_instance.stubs(:sent_recently?).returns(true) }
+ describe "sent recently" do
+ before { GroupMessage.any_instance.stubs(:sent_recently?).returns(true) }
subject { GroupMessage.create(moderators_group, :user_automatically_silenced, user: user) }
it { is_expected.to eq(false) }
- it 'should not send the same notification again' do
+ it "should not send the same notification again" do
PostCreator.expects(:create).never
subject
end
end
- describe 'message_params' do
- let(:user) { Fabricate.build(:user, id: 123123) }
- shared_examples 'common message params for group messages' do
- it 'returns the correct params' do
+ describe "message_params" do
+ let(:user) { Fabricate.build(:user, id: 123_123) }
+ shared_examples "common message params for group messages" do
+ it "returns the correct params" do
expect(subject[:username]).to eq(user.username)
expect(subject[:user_url]).to be_present
end
end
- context 'with user_automatically_silenced' do
- subject { GroupMessage.new(moderators_group, :user_automatically_silenced, user: user).message_params }
- include_examples 'common message params for group messages'
+ context "with user_automatically_silenced" do
+ subject do
+ GroupMessage.new(moderators_group, :user_automatically_silenced, user: user).message_params
+ end
+ include_examples "common message params for group messages"
end
- context 'with spam_post_blocked' do
+ context "with spam_post_blocked" do
subject { GroupMessage.new(moderators_group, :spam_post_blocked, user: user).message_params }
- include_examples 'common message params for group messages'
+ include_examples "common message params for group messages"
end
end
- describe 'methods that use redis' do
- let(:user) { Fabricate.build(:user, id: 123123) }
- subject(:group_message) { GroupMessage.new(moderators_group, :user_automatically_silenced, user: user) }
+ describe "methods that use redis" do
+ let(:user) { Fabricate.build(:user, id: 123_123) }
+ subject(:group_message) do
+ GroupMessage.new(moderators_group, :user_automatically_silenced, user: user)
+ end
before do
PostCreator.stubs(:create).returns(stub_everything)
- group_message.stubs(:sent_recently_key).returns('the_key')
+ group_message.stubs(:sent_recently_key).returns("the_key")
end
- describe 'sent_recently?' do
- it 'returns true if redis says so' do
- Discourse.redis.stubs(:get).with(group_message.sent_recently_key).returns('1')
+ describe "sent_recently?" do
+ it "returns true if redis says so" do
+ Discourse.redis.stubs(:get).with(group_message.sent_recently_key).returns("1")
expect(group_message.sent_recently?).to be_truthy
end
- it 'returns false if redis returns nil' do
+ it "returns false if redis returns nil" do
Discourse.redis.stubs(:get).with(group_message.sent_recently_key).returns(nil)
expect(group_message.sent_recently?).to be_falsey
end
- it 'always returns false if limit_once_per is false' do
- gm = GroupMessage.new(moderators_group, :user_automatically_silenced, user: user, limit_once_per: false)
- gm.stubs(:sent_recently_key).returns('the_key')
- Discourse.redis.stubs(:get).with(gm.sent_recently_key).returns('1')
+ it "always returns false if limit_once_per is false" do
+ gm =
+ GroupMessage.new(
+ moderators_group,
+ :user_automatically_silenced,
+ user: user,
+ limit_once_per: false,
+ )
+ gm.stubs(:sent_recently_key).returns("the_key")
+ Discourse.redis.stubs(:get).with(gm.sent_recently_key).returns("1")
expect(gm.sent_recently?).to be_falsey
end
end
- describe 'remember_message_sent' do
- it 'stores a key in redis that expires after 24 hours' do
- Discourse.redis.expects(:setex).with(group_message.sent_recently_key, 24 * 60 * 60, anything).returns('OK')
+ describe "remember_message_sent" do
+ it "stores a key in redis that expires after 24 hours" do
+ Discourse
+ .redis
+ .expects(:setex)
+ .with(group_message.sent_recently_key, 24 * 60 * 60, anything)
+ .returns("OK")
group_message.remember_message_sent
end
- it 'can use a given expiry time' do
- Discourse.redis.expects(:setex).with(anything, 30 * 60, anything).returns('OK')
- GroupMessage.new(moderators_group, :user_automatically_silenced, user: user, limit_once_per: 30.minutes).remember_message_sent
+ it "can use a given expiry time" do
+ Discourse.redis.expects(:setex).with(anything, 30 * 60, anything).returns("OK")
+ GroupMessage.new(
+ moderators_group,
+ :user_automatically_silenced,
+ user: user,
+ limit_once_per: 30.minutes,
+ ).remember_message_sent
end
- it 'can be disabled' do
+ it "can be disabled" do
Discourse.redis.expects(:setex).never
- GroupMessage.new(moderators_group, :user_automatically_silenced, user: user, limit_once_per: false).remember_message_sent
+ GroupMessage.new(
+ moderators_group,
+ :user_automatically_silenced,
+ user: user,
+ limit_once_per: false,
+ ).remember_message_sent
end
end
end
diff --git a/spec/services/hashtag_autocomplete_service_spec.rb b/spec/services/hashtag_autocomplete_service_spec.rb
index 70841bc019c..f37eb5810c9 100644
--- a/spec/services/hashtag_autocomplete_service_spec.rb
+++ b/spec/services/hashtag_autocomplete_service_spec.rb
@@ -50,9 +50,7 @@ RSpec.describe HashtagAutocompleteService do
end
it "respects the limit param" do
- expect(subject.search("book", %w[tag category], limit: 1).map(&:text)).to eq(
- ["great-books"],
- )
+ expect(subject.search("book", %w[tag category], limit: 1).map(&:text)).to eq(["great-books"])
end
it "does not allow more than SEARCH_MAX_LIMIT results to be specified by the limit param" do
diff --git a/spec/services/heat_settings_updater_spec.rb b/spec/services/heat_settings_updater_spec.rb
index 0a26d2335a6..7a1822e2317 100644
--- a/spec/services/heat_settings_updater_spec.rb
+++ b/spec/services/heat_settings_updater_spec.rb
@@ -1,26 +1,24 @@
# frozen_string_literal: true
RSpec.describe HeatSettingsUpdater do
- describe '.update' do
+ describe ".update" do
subject(:update_settings) { described_class.update }
def expect_default_values
- [:topic_views_heat, :topic_post_like_heat].each do |prefix|
- [:low, :medium, :high].each do |level|
+ %i[topic_views_heat topic_post_like_heat].each do |prefix|
+ %i[low medium high].each do |level|
setting_name = "#{prefix}_#{level}"
expect(SiteSetting.get(setting_name)).to eq(SiteSetting.defaults[setting_name])
end
end
end
- it 'changes nothing on fresh install' do
- expect {
- update_settings
- }.to_not change { UserHistory.count }
+ it "changes nothing on fresh install" do
+ expect { update_settings }.to_not change { UserHistory.count }
expect_default_values
end
- context 'with low activity' do
+ context "with low activity" do
let!(:hottest_topic1) { Fabricate(:topic, views: 3000, posts_count: 10, like_count: 2) }
let!(:hottest_topic2) { Fabricate(:topic, views: 3000, posts_count: 10, like_count: 2) }
let!(:warm_topic1) { Fabricate(:topic, views: 1500, posts_count: 10, like_count: 1) }
@@ -33,25 +31,21 @@ RSpec.describe HeatSettingsUpdater do
let!(:cold_topic) { Fabricate(:topic, views: 100, posts_count: 10, like_count: 0) }
it "doesn't make settings lower than defaults" do
- expect {
- update_settings
- }.to_not change { UserHistory.count }
+ expect { update_settings }.to_not change { UserHistory.count }
expect_default_values
end
- it 'can set back down to minimum defaults' do
- [:low, :medium, :high].each do |level|
+ it "can set back down to minimum defaults" do
+ %i[low medium high].each do |level|
SiteSetting.set("topic_views_heat_#{level}", 20_000)
SiteSetting.set("topic_post_like_heat_#{level}", 5.0)
end
- expect {
- update_settings
- }.to change { UserHistory.count }.by(6)
+ expect { update_settings }.to change { UserHistory.count }.by(6)
expect_default_values
end
end
- context 'with similar activity' do
+ context "with similar activity" do
let!(:hottest_topic1) { Fabricate(:topic, views: 3530, posts_count: 100, like_count: 201) }
let!(:hottest_topic2) { Fabricate(:topic, views: 3530, posts_count: 100, like_count: 201) }
let!(:warm_topic1) { Fabricate(:topic, views: 2020, posts_count: 100, like_count: 99) }
@@ -64,14 +58,12 @@ RSpec.describe HeatSettingsUpdater do
let!(:cold_topic) { Fabricate(:topic, views: 100, posts_count: 100, like_count: 1) }
it "doesn't make small changes" do
- expect {
- update_settings
- }.to_not change { UserHistory.count }
+ expect { update_settings }.to_not change { UserHistory.count }
expect_default_values
end
end
- context 'with increased activity' do
+ context "with increased activity" do
let!(:hottest_topic1) { Fabricate(:topic, views: 10_100, posts_count: 100, like_count: 230) }
let!(:hottest_topic2) { Fabricate(:topic, views: 10_012, posts_count: 100, like_count: 220) }
let!(:warm_topic1) { Fabricate(:topic, views: 4020, posts_count: 99, like_count: 126) }
@@ -83,10 +75,8 @@ RSpec.describe HeatSettingsUpdater do
let!(:lukewarm_topic4) { Fabricate(:topic, views: 2002, posts_count: 99, like_count: 54) }
let!(:cold_topic) { Fabricate(:topic, views: 100, posts_count: 100, like_count: 1) }
- it 'changes settings when difference is significant' do
- expect {
- update_settings
- }.to change { UserHistory.count }.by(6)
+ it "changes settings when difference is significant" do
+ expect { update_settings }.to change { UserHistory.count }.by(6)
expect(SiteSetting.topic_views_heat_high).to eq(10_000)
expect(SiteSetting.topic_views_heat_medium).to eq(4000)
expect(SiteSetting.topic_views_heat_low).to eq(2000)
@@ -97,9 +87,7 @@ RSpec.describe HeatSettingsUpdater do
it "doesn't change settings when automatic_topic_heat_values is false" do
SiteSetting.automatic_topic_heat_values = false
- expect {
- update_settings
- }.to_not change { UserHistory.count }
+ expect { update_settings }.to_not change { UserHistory.count }
expect_default_values
end
end
diff --git a/spec/services/inline_uploads_multisite_spec.rb b/spec/services/inline_uploads_multisite_spec.rb
index 042479e583a..dc7f9ecc30d 100644
--- a/spec/services/inline_uploads_multisite_spec.rb
+++ b/spec/services/inline_uploads_multisite_spec.rb
@@ -1,9 +1,7 @@
# frozen_string_literal: true
RSpec.describe InlineUploads, type: :multisite do
- before do
- set_cdn_url "https://awesome.com"
- end
+ before { set_cdn_url "https://awesome.com" }
describe ".process" do
describe "s3 uploads" do
diff --git a/spec/services/inline_uploads_spec.rb b/spec/services/inline_uploads_spec.rb
index b758ce66749..3b564b0a95b 100644
--- a/spec/services/inline_uploads_spec.rb
+++ b/spec/services/inline_uploads_spec.rb
@@ -1,11 +1,9 @@
# frozen_string_literal: true
RSpec.describe InlineUploads do
- before do
- set_cdn_url "https://awesome.com"
- end
+ before { set_cdn_url "https://awesome.com" }
- describe '.process' do
- context 'with local uploads' do
+ describe ".process" do
+ context "with local uploads" do
fab!(:upload) { Fabricate(:upload) }
fab!(:upload2) { Fabricate(:upload) }
fab!(:upload3) { Fabricate(:upload) }
@@ -250,9 +248,7 @@ RSpec.describe InlineUploads do
end
context "with subfolder" do
- before do
- set_subfolder "/community"
- end
+ before { set_subfolder "/community" }
it "should correct subfolder images" do
md = <<~MD
@@ -390,7 +386,7 @@ RSpec.describe InlineUploads do
end
it "should not be affected by an emoji" do
- CustomEmoji.create!(name: 'test', upload: upload3)
+ CustomEmoji.create!(name: "test", upload: upload3)
Emoji.clear_cache
md = <<~MD
@@ -429,9 +425,12 @@ RSpec.describe InlineUploads do
MD
- md = "\r\n "
+ md =
+ "\r\n "
- expect(InlineUploads.process(md)).to eq("\r\n ")
+ expect(InlineUploads.process(md)).to eq(
+ "\r\n ",
+ )
end
it "should correctly update image sources within anchor or paragraph tags" do
@@ -592,7 +591,7 @@ RSpec.describe InlineUploads do
MD
end
- it 'should correct full upload url to the shorter version' do
+ it "should correct full upload url to the shorter version" do
md = <<~MD
Some random text
@@ -634,7 +633,7 @@ RSpec.describe InlineUploads do
MD
end
- it 'accepts a block that yields when link does not match an upload in the db' do
+ it "accepts a block that yields when link does not match an upload in the db" do
url = "#{Discourse.base_url}#{upload.url}"
md = <<~MD
@@ -644,9 +643,7 @@ RSpec.describe InlineUploads do
upload.destroy!
- InlineUploads.process(md, on_missing: lambda { |link|
- expect(link).to eq(url)
- })
+ InlineUploads.process(md, on_missing: lambda { |link| expect(link).to eq(url) })
end
end
diff --git a/spec/services/notification_emailer_spec.rb b/spec/services/notification_emailer_spec.rb
index af15c4f19f9..e889bead882 100644
--- a/spec/services/notification_emailer_spec.rb
+++ b/spec/services/notification_emailer_spec.rb
@@ -12,23 +12,22 @@ RSpec.describe NotificationEmailer do
# something is off with fabricator
def create_notification(type, user = nil)
user ||= Fabricate(:user)
- Notification.create(data: "{\"a\": 1}",
- user: user,
- notification_type: Notification.types[type],
- topic: topic,
- post_number: post.post_number)
+ Notification.create(
+ data: "{\"a\": 1}",
+ user: user,
+ notification_type: Notification.types[type],
+ topic: topic,
+ post_number: post.post_number,
+ )
end
shared_examples "enqueue" do
-
it "enqueues a job for the email" do
expect_enqueued_with(
job: :user_email,
args: NotificationEmailer::EmailUser.notification_params(notification, type),
- at: no_delay ? Time.zone.now : Time.zone.now + delay
- ) do
- NotificationEmailer.process_notification(notification, no_delay: no_delay)
- end
+ at: no_delay ? Time.zone.now : Time.zone.now + delay,
+ ) { NotificationEmailer.process_notification(notification, no_delay: no_delay) }
end
context "with an inactive user" do
@@ -44,20 +43,15 @@ RSpec.describe NotificationEmailer do
notification.user.staged = true
if type == :user_linked || type == :user_quoted
- expect_not_enqueued_with(
- job: :user_email,
- args: { type: type }
- ) do
+ expect_not_enqueued_with(job: :user_email, args: { type: type }) do
NotificationEmailer.process_notification(notification, no_delay: no_delay)
end
else
expect_enqueued_with(
job: :user_email,
args: NotificationEmailer::EmailUser.notification_params(notification, type),
- at: no_delay ? Time.zone.now : Time.zone.now + delay
- ) do
- NotificationEmailer.process_notification(notification, no_delay: no_delay)
- end
+ at: no_delay ? Time.zone.now : Time.zone.now + delay,
+ ) { NotificationEmailer.process_notification(notification, no_delay: no_delay) }
end
end
@@ -66,20 +60,15 @@ RSpec.describe NotificationEmailer do
SiteSetting.must_approve_users = true
if type == :user_linked || type == :user_quoted
- expect_not_enqueued_with(
- job: :user_email,
- args: { type: type }
- ) do
+ expect_not_enqueued_with(job: :user_email, args: { type: type }) do
NotificationEmailer.process_notification(notification, no_delay: no_delay)
end
else
expect_enqueued_with(
job: :user_email,
args: NotificationEmailer::EmailUser.notification_params(notification, type),
- at: no_delay ? Time.zone.now : Time.zone.now + delay
- ) do
- NotificationEmailer.process_notification(notification, no_delay: no_delay)
- end
+ at: no_delay ? Time.zone.now : Time.zone.now + delay,
+ ) { NotificationEmailer.process_notification(notification, no_delay: no_delay) }
end
end
end
@@ -99,7 +88,6 @@ RSpec.describe NotificationEmailer do
end
context "with a small action" do
-
it "doesn't enqueue a job" do
Post.any_instance.expects(:post_type).returns(Post.types[:small_action])
@@ -107,16 +95,16 @@ RSpec.describe NotificationEmailer do
NotificationEmailer.process_notification(notification, no_delay: no_delay)
end
end
-
end
-
end
shared_examples "enqueue_public" do
include_examples "enqueue"
it "doesn't enqueue a job if the user has mention emails disabled" do
- notification.user.user_option.update_columns(email_level: UserOption.email_level_types[:never])
+ notification.user.user_option.update_columns(
+ email_level: UserOption.email_level_types[:never],
+ )
expect_not_enqueued_with(job: :user_email, args: { type: type }) do
NotificationEmailer.process_notification(notification, no_delay: no_delay)
@@ -128,18 +116,18 @@ RSpec.describe NotificationEmailer do
include_examples "enqueue"
it "doesn't enqueue a job if the user has private message emails disabled" do
- notification.user.user_option.update_columns(email_messages_level: UserOption.email_level_types[:never])
+ notification.user.user_option.update_columns(
+ email_messages_level: UserOption.email_level_types[:never],
+ )
expect_not_enqueued_with(job: :user_email, args: { type: type }) do
NotificationEmailer.process_notification(notification)
end
end
-
end
[true, false].each do |no_delay|
-
- context 'with user_mentioned' do
+ context "with user_mentioned" do
let(:no_delay) { no_delay }
let(:type) { :user_mentioned }
let(:delay) { SiteSetting.email_time_window_mins.minutes }
@@ -153,15 +141,12 @@ RSpec.describe NotificationEmailer do
expect_enqueued_with(
job: :user_email,
args: NotificationEmailer::EmailUser.notification_params(notification, type),
- at: Time.zone.now + delay
- ) do
- NotificationEmailer.process_notification(notification)
- end
+ at: Time.zone.now + delay,
+ ) { NotificationEmailer.process_notification(notification) }
end
-
end
- context 'with user_replied' do
+ context "with user_replied" do
let(:no_delay) { no_delay }
let(:type) { :user_replied }
let(:delay) { SiteSetting.email_time_window_mins.minutes }
@@ -170,7 +155,7 @@ RSpec.describe NotificationEmailer do
include_examples "enqueue_public"
end
- context 'with user_quoted' do
+ context "with user_quoted" do
let(:no_delay) { no_delay }
let(:type) { :user_quoted }
let(:delay) { SiteSetting.email_time_window_mins.minutes }
@@ -179,7 +164,7 @@ RSpec.describe NotificationEmailer do
include_examples "enqueue_public"
end
- context 'with user_linked' do
+ context "with user_linked" do
let(:no_delay) { no_delay }
let(:type) { :user_linked }
let(:delay) { SiteSetting.email_time_window_mins.minutes }
@@ -188,7 +173,7 @@ RSpec.describe NotificationEmailer do
include_examples "enqueue_public"
end
- context 'with user_posted' do
+ context "with user_posted" do
let(:no_delay) { no_delay }
let(:type) { :user_posted }
let(:delay) { SiteSetting.email_time_window_mins.minutes }
@@ -197,7 +182,7 @@ RSpec.describe NotificationEmailer do
include_examples "enqueue_public"
end
- context 'with user_watching_category_or_tag' do
+ context "with user_watching_category_or_tag" do
let(:no_delay) { no_delay }
let(:type) { :user_posted }
let(:delay) { SiteSetting.email_time_window_mins.minutes }
@@ -206,7 +191,7 @@ RSpec.describe NotificationEmailer do
include_examples "enqueue_public"
end
- context 'with user_private_message' do
+ context "with user_private_message" do
let(:no_delay) { no_delay }
let(:type) { :user_private_message }
let(:delay) { SiteSetting.personal_email_time_window_seconds }
@@ -221,10 +206,9 @@ RSpec.describe NotificationEmailer do
NotificationEmailer.process_notification(notification)
end
end
-
end
- context 'with user_invited_to_private_message' do
+ context "with user_invited_to_private_message" do
let(:no_delay) { no_delay }
let(:type) { :user_invited_to_private_message }
let(:delay) { SiteSetting.personal_email_time_window_seconds }
@@ -233,7 +217,7 @@ RSpec.describe NotificationEmailer do
include_examples "enqueue_public"
end
- context 'with user_invited_to_topic' do
+ context "with user_invited_to_topic" do
let(:no_delay) { no_delay }
let(:type) { :user_invited_to_topic }
let(:delay) { SiteSetting.personal_email_time_window_seconds }
@@ -242,7 +226,7 @@ RSpec.describe NotificationEmailer do
include_examples "enqueue_public"
end
- context 'when watching the first post' do
+ context "when watching the first post" do
let(:no_delay) { no_delay }
let(:type) { :user_watching_first_post }
let(:delay) { SiteSetting.email_time_window_mins.minutes }
@@ -251,7 +235,7 @@ RSpec.describe NotificationEmailer do
include_examples "enqueue_public"
end
- context 'with post_approved' do
+ context "with post_approved" do
let(:no_delay) { no_delay }
let(:type) { :post_approved }
let(:delay) { SiteSetting.email_time_window_mins.minutes }
@@ -263,18 +247,18 @@ RSpec.describe NotificationEmailer do
it "has translations for each sendable notification type" do
notification = create_notification(:mentioned)
- email_user = NotificationEmailer::EmailUser.new(notification, no_delay: true)
- subkeys = ["title", "subject_template", "text_body_template"]
+ email_user = NotificationEmailer::EmailUser.new(notification, no_delay: true)
+ subkeys = %w[title subject_template text_body_template]
# some notification types need special handling
replace_keys = {
"post_approved" => ["post_approved"],
"private_message" => ["user_posted"],
- "invited_to_private_message" => [
- "user_invited_to_private_message_pm",
- "user_invited_to_private_message_pm_group",
- "user_invited_to_private_message_pm_staged"
- ]
+ "invited_to_private_message" => %w[
+ user_invited_to_private_message_pm
+ user_invited_to_private_message_pm_group
+ user_invited_to_private_message_pm_staged
+ ],
}
Notification.types.keys.each do |notification_type|
diff --git a/spec/services/notifications/consolidate_notifications_spec.rb b/spec/services/notifications/consolidate_notifications_spec.rb
index 7ae44779b69..d02e1afb83b 100644
--- a/spec/services/notifications/consolidate_notifications_spec.rb
+++ b/spec/services/notifications/consolidate_notifications_spec.rb
@@ -1,25 +1,23 @@
# frozen_string_literal: true
RSpec.describe Notifications::ConsolidateNotifications do
- describe '#before_consolidation_callbacks' do
+ describe "#before_consolidation_callbacks" do
fab!(:user) { Fabricate(:user) }
let(:rule) do
described_class.new(
from: Notification.types[:liked],
to: Notification.types[:liked],
consolidation_window: 10.minutes,
- consolidated_query_blk: Proc.new do |notifications|
- notifications.where("(data::json ->> 'consolidated')::bool")
- end,
- threshold: 1
+ consolidated_query_blk:
+ Proc.new { |notifications| notifications.where("(data::json ->> 'consolidated')::bool") },
+ threshold: 1,
).set_mutations(set_data_blk: Proc.new { |n| n.data_hash.merge(consolidated: true) })
end
- it 'applies a callback when consolidating a notification' do
+ it "applies a callback when consolidating a notification" do
rule.before_consolidation_callbacks(
- before_consolidation_blk: Proc.new do |_, data|
- data[:consolidation_callback_called] = true
- end
+ before_consolidation_blk:
+ Proc.new { |_, data| data[:consolidation_callback_called] = true },
)
rule.consolidate_or_save!(build_like_notification)
@@ -30,11 +28,9 @@ RSpec.describe Notifications::ConsolidateNotifications do
expect(consolidated_notification.data_hash[:consolidation_callback_called]).to eq(true)
end
- it 'applies a callback when updating a consolidated notification' do
+ it "applies a callback when updating a consolidated notification" do
rule.before_consolidation_callbacks(
- before_update_blk: Proc.new do |_, data|
- data[:update_callback_called] = true
- end
+ before_update_blk: Proc.new { |_, data| data[:update_callback_called] = true },
)
rule.consolidate_or_save!(build_like_notification)
@@ -52,7 +48,12 @@ RSpec.describe Notifications::ConsolidateNotifications do
end
def build_like_notification
- Fabricate.build(:notification, user: user, notification_type: Notification.types[:liked], data: {}.to_json)
+ Fabricate.build(
+ :notification,
+ user: user,
+ notification_type: Notification.types[:liked],
+ data: {}.to_json,
+ )
end
end
end
diff --git a/spec/services/notifications/consolidation_planner_spec.rb b/spec/services/notifications/consolidation_planner_spec.rb
index c73d1ba84d0..707d719e4a0 100644
--- a/spec/services/notifications/consolidation_planner_spec.rb
+++ b/spec/services/notifications/consolidation_planner_spec.rb
@@ -1,10 +1,10 @@
# frozen_string_literal: true
RSpec.describe Notifications::ConsolidationPlanner do
- describe '#consolidate_or_save!' do
+ describe "#consolidate_or_save!" do
let(:threshold) { 1 }
fab!(:user) { Fabricate(:user) }
- let(:like_user) { 'user1' }
+ let(:like_user) { "user1" }
before { SiteSetting.notification_consolidation_threshold = threshold }
@@ -17,8 +17,14 @@ RSpec.describe Notifications::ConsolidationPlanner do
expect(saved_like.notification_type).to eq(Notification.types[:liked])
end
- it 'consolidates multiple notifications into a new one' do
- first_notification = Fabricate(:notification, user: user, notification_type: Notification.types[:liked], data: { display_username: like_user }.to_json)
+ it "consolidates multiple notifications into a new one" do
+ first_notification =
+ Fabricate(
+ :notification,
+ user: user,
+ notification_type: Notification.types[:liked],
+ data: { display_username: like_user }.to_json,
+ )
notification = build_notification(:liked, { display_username: like_user })
consolidated_like = subject.consolidate_or_save!(notification)
@@ -26,14 +32,16 @@ RSpec.describe Notifications::ConsolidationPlanner do
expect(consolidated_like.id).not_to eq(first_notification.id)
expect(consolidated_like.notification_type).to eq(Notification.types[:liked_consolidated])
data = JSON.parse(consolidated_like.data)
- expect(data['count']).to eq(threshold + 1)
+ expect(data["count"]).to eq(threshold + 1)
end
- it 'updates the notification if we already consolidated it' do
+ it "updates the notification if we already consolidated it" do
count = 5
- Fabricate(:notification,
- user: user, notification_type: Notification.types[:liked_consolidated],
- data: { count: count, display_username: like_user }.to_json
+ Fabricate(
+ :notification,
+ user: user,
+ notification_type: Notification.types[:liked_consolidated],
+ data: { count: count, display_username: like_user }.to_json,
)
notification = build_notification(:liked, { display_username: like_user })
@@ -41,12 +49,17 @@ RSpec.describe Notifications::ConsolidationPlanner do
expect { notification.reload }.to raise_error(ActiveRecord::RecordNotFound)
data = JSON.parse(updated.data)
- expect(data['count']).to eq(count + 1)
+ expect(data["count"]).to eq(count + 1)
end
end
def build_notification(type_sym, data)
- Fabricate.build(:notification, user: user, notification_type: Notification.types[type_sym], data: data.to_json)
+ Fabricate.build(
+ :notification,
+ user: user,
+ notification_type: Notification.types[type_sym],
+ data: data.to_json,
+ )
end
def plan_for(notification)
diff --git a/spec/services/post_action_notifier_spec.rb b/spec/services/post_action_notifier_spec.rb
index eb8d625fbfc..8ac91ea5a68 100644
--- a/spec/services/post_action_notifier_spec.rb
+++ b/spec/services/post_action_notifier_spec.rb
@@ -9,14 +9,14 @@ RSpec.describe PostActionNotifier do
fab!(:evil_trout) { Fabricate(:evil_trout) }
fab!(:post) { Fabricate(:post) }
- context 'when editing a post' do
- it 'notifies a user of the revision' do
- expect {
- post.revise(evil_trout, raw: "world is the new body of the message")
- }.to change { post.reload.user.notifications.count }.by(1)
+ context "when editing a post" do
+ it "notifies a user of the revision" do
+ expect { post.revise(evil_trout, raw: "world is the new body of the message") }.to change {
+ post.reload.user.notifications.count
+ }.by(1)
end
- it 'notifies watching users of revision when post is wiki-ed and first post in topic' do
+ it "notifies watching users of revision when post is wiki-ed and first post in topic" do
SiteSetting.editing_grace_period_max_diff = 1
post.update!(wiki: true)
@@ -24,12 +24,16 @@ RSpec.describe PostActionNotifier do
user2 = Fabricate(:user)
user3 = Fabricate(:user)
- TopicUser.change(user2.id, post.topic,
- notification_level: TopicUser.notification_levels[:watching]
+ TopicUser.change(
+ user2.id,
+ post.topic,
+ notification_level: TopicUser.notification_levels[:watching],
)
- TopicUser.change(user3.id, post.topic,
- notification_level: TopicUser.notification_levels[:tracking]
+ TopicUser.change(
+ user3.id,
+ post.topic,
+ notification_level: TopicUser.notification_levels[:tracking],
)
expect do
@@ -38,53 +42,51 @@ RSpec.describe PostActionNotifier do
edited_notification_type = Notification.types[:edited]
- expect(Notification.exists?(
- user: owner,
- notification_type: edited_notification_type
- )).to eq(true)
+ expect(Notification.exists?(user: owner, notification_type: edited_notification_type)).to eq(
+ true,
+ )
- expect(Notification.exists?(
- user: user2,
- notification_type: edited_notification_type
- )).to eq(true)
+ expect(Notification.exists?(user: user2, notification_type: edited_notification_type)).to eq(
+ true,
+ )
- expect do
- post.revise(owner, raw: "I made some changes to the wiki again!")
- end.to change {
+ expect do post.revise(owner, raw: "I made some changes to the wiki again!") end.to change {
Notification.where(notification_type: edited_notification_type).count
}.by(1)
- expect(Notification.where(
- user: user2,
- notification_type: edited_notification_type
- ).count).to eq(2)
+ expect(
+ Notification.where(user: user2, notification_type: edited_notification_type).count,
+ ).to eq(2)
- expect do
- post.revise(user2, raw: "I changed the wiki totally")
- end.to change {
+ expect do post.revise(user2, raw: "I changed the wiki totally") end.to change {
Notification.where(notification_type: edited_notification_type).count
}.by(1)
- expect(Notification.where(
- user: owner,
- notification_type: edited_notification_type
- ).count).to eq(2)
+ expect(
+ Notification.where(user: owner, notification_type: edited_notification_type).count,
+ ).to eq(2)
end
- it 'notifies watching users of revision when topic category allow_unlimited_owner_edits_on_first_post and first post in topic is edited' do
+ it "notifies watching users of revision when topic category allow_unlimited_owner_edits_on_first_post and first post in topic is edited" do
SiteSetting.editing_grace_period_max_diff = 1
- post.topic.update(category: Fabricate(:category, allow_unlimited_owner_edits_on_first_post: true))
+ post.topic.update(
+ category: Fabricate(:category, allow_unlimited_owner_edits_on_first_post: true),
+ )
owner = post.user
user2 = Fabricate(:user)
user3 = Fabricate(:user)
- TopicUser.change(user2.id, post.topic,
- notification_level: TopicUser.notification_levels[:watching]
+ TopicUser.change(
+ user2.id,
+ post.topic,
+ notification_level: TopicUser.notification_levels[:watching],
)
- TopicUser.change(user3.id, post.topic,
- notification_level: TopicUser.notification_levels[:tracking]
+ TopicUser.change(
+ user3.id,
+ post.topic,
+ notification_level: TopicUser.notification_levels[:tracking],
)
expect do
@@ -93,55 +95,48 @@ RSpec.describe PostActionNotifier do
edited_notification_type = Notification.types[:edited]
- expect(Notification.exists?(
- user: owner,
- notification_type: edited_notification_type
- )).to eq(true)
+ expect(Notification.exists?(user: owner, notification_type: edited_notification_type)).to eq(
+ true,
+ )
- expect(Notification.exists?(
- user: user2,
- notification_type: edited_notification_type
- )).to eq(true)
+ expect(Notification.exists?(user: user2, notification_type: edited_notification_type)).to eq(
+ true,
+ )
expect do
post.revise(owner, raw: "I made some changes to the first post again!")
- end.to change {
+ end.to change { Notification.where(notification_type: edited_notification_type).count }.by(1)
+
+ expect(
+ Notification.where(user: user2, notification_type: edited_notification_type).count,
+ ).to eq(2)
+
+ expect do post.revise(user2, raw: "I changed the first post totally") end.to change {
Notification.where(notification_type: edited_notification_type).count
}.by(1)
- expect(Notification.where(
- user: user2,
- notification_type: edited_notification_type
- ).count).to eq(2)
-
- expect do
- post.revise(user2, raw: "I changed the first post totally")
- end.to change {
- Notification.where(notification_type: edited_notification_type).count
- }.by(1)
-
- expect(Notification.where(
- user: owner,
- notification_type: edited_notification_type
- ).count).to eq(2)
+ expect(
+ Notification.where(user: owner, notification_type: edited_notification_type).count,
+ ).to eq(2)
end
- it 'stores the revision number with the notification' do
+ it "stores the revision number with the notification" do
post.revise(evil_trout, raw: "world is the new body of the message")
notification_data = JSON.parse post.user.notifications.last.data
- expect(notification_data['revision_number']).to eq post.post_revisions.last.number
+ expect(notification_data["revision_number"]).to eq post.post_revisions.last.number
end
context "when edit notifications are disabled" do
before { SiteSetting.disable_system_edit_notifications = true }
- it 'notifies a user of the revision made by another user' do
- expect {
- post.revise(evil_trout, raw: "world is the new body of the message")
- }.to change(post.user.notifications, :count).by(1)
+ it "notifies a user of the revision made by another user" do
+ expect { post.revise(evil_trout, raw: "world is the new body of the message") }.to change(
+ post.user.notifications,
+ :count,
+ ).by(1)
end
- it 'does not notify a user of the revision made by the system user' do
+ it "does not notify a user of the revision made by the system user" do
expect {
post.revise(Discourse.system_user, raw: "world is the new body of the message")
}.not_to change(post.user.notifications, :count)
@@ -149,68 +144,66 @@ RSpec.describe PostActionNotifier do
end
context "when category edit notifications are disabled" do
- it 'notifies a user of the revision made by another user' do
+ it "notifies a user of the revision made by another user" do
SiteSetting.disable_category_edit_notifications = false
- expect {
- post.revise(evil_trout, category_id: Fabricate(:category).id)
- }.to change(post.user.notifications, :count).by(1)
+ expect { post.revise(evil_trout, category_id: Fabricate(:category).id) }.to change(
+ post.user.notifications,
+ :count,
+ ).by(1)
end
- it 'does not notify a user of the revision made by the system user' do
+ it "does not notify a user of the revision made by the system user" do
SiteSetting.disable_category_edit_notifications = true
- expect {
- post.revise(evil_trout, category_id: Fabricate(:category).id)
- }.not_to change(post.user.notifications, :count)
+ expect { post.revise(evil_trout, category_id: Fabricate(:category).id) }.not_to change(
+ post.user.notifications,
+ :count,
+ )
end
end
context "when tags edit notifications are disabled" do
- it 'notifies a user of the revision made by another user' do
+ it "notifies a user of the revision made by another user" do
SiteSetting.disable_tags_edit_notifications = false
- expect {
- post.revise(evil_trout, tags: [Fabricate(:tag).name])
- }.to change(post.user.notifications, :count).by(1)
+ expect { post.revise(evil_trout, tags: [Fabricate(:tag).name]) }.to change(
+ post.user.notifications,
+ :count,
+ ).by(1)
end
- it 'does not notify a user of the revision made by the system user' do
+ it "does not notify a user of the revision made by the system user" do
SiteSetting.disable_tags_edit_notifications = true
- expect {
- post.revise(evil_trout, tags: [Fabricate(:tag).name])
- }.not_to change(post.user.notifications, :count)
+ expect { post.revise(evil_trout, tags: [Fabricate(:tag).name]) }.not_to change(
+ post.user.notifications,
+ :count,
+ )
end
end
- context 'when using plugin API to add custom recipients' do
+ context "when using plugin API to add custom recipients" do
let(:lurker) { Fabricate(:user) }
before do
plugin = Plugin::Instance.new
- plugin.add_post_revision_notifier_recipients do |post_revision|
- [lurker.id]
- end
+ plugin.add_post_revision_notifier_recipients { |post_revision| [lurker.id] }
end
- after do
- PostActionNotifier.reset!
- end
+ after { PostActionNotifier.reset! }
- it 'notifies the specified user of the revision' do
- expect {
- post.revise(evil_trout, raw: "world is the new body of the message")
- }.to change {
+ it "notifies the specified user of the revision" do
+ expect { post.revise(evil_trout, raw: "world is the new body of the message") }.to change {
lurker.notifications.count
}.by(1)
end
end
end
- context 'with private message' do
+ context "with private message" do
fab!(:user) { Fabricate(:user) }
- fab!(:mention_post) { Fabricate(:post, user: user, raw: 'Hello @eviltrout') }
+ fab!(:mention_post) { Fabricate(:post, user: user, raw: "Hello @eviltrout") }
let(:topic) do
topic = mention_post.topic
topic.update_columns archetype: Archetype.private_message, category_id: nil
@@ -225,23 +218,29 @@ RSpec.describe PostActionNotifier do
}.not_to change(evil_trout.notifications, :count)
end
- it 'creates like notifications' do
+ it "creates like notifications" do
other_user = Fabricate(:user)
topic.allowed_users << user << other_user
- expect {
- PostActionCreator.like(other_user, mention_post)
- }.to change(user.notifications, :count)
+ expect { PostActionCreator.like(other_user, mention_post) }.to change(
+ user.notifications,
+ :count,
+ )
end
end
- context 'with moderator action post' do
+ context "with moderator action post" do
fab!(:user) { Fabricate(:user) }
- fab!(:first_post) { Fabricate(:post, user: user, raw: 'A useless post for you.') }
+ fab!(:first_post) { Fabricate(:post, user: user, raw: "A useless post for you.") }
let(:topic) { first_post.topic }
- it 'should not notify anyone' do
+ it "should not notify anyone" do
expect {
- Fabricate(:post, topic: topic, raw: 'This topic is CLOSED', post_type: Post.types[:moderator_action])
+ Fabricate(
+ :post,
+ topic: topic,
+ raw: "This topic is CLOSED",
+ post_type: Post.types[:moderator_action],
+ )
}.to_not change { Notification.count }
end
end
diff --git a/spec/services/post_alerter_spec.rb b/spec/services/post_alerter_spec.rb
index 0369f0a3dae..43d63b46d6d 100644
--- a/spec/services/post_alerter_spec.rb
+++ b/spec/services/post_alerter_spec.rb
@@ -7,15 +7,18 @@ RSpec::Matchers.define :add_notification do |user, notification_type|
actual.call
- expect(notifications.count).to eq(before + 1), "expected 1 new notification, got #{notifications.count - before}"
+ expect(notifications.count).to eq(before + 1),
+ "expected 1 new notification, got #{notifications.count - before}"
last_notification_type = notifications.last.notification_type
expect(last_notification_type).to eq(Notification.types[notification_type]),
- "expected notification type to be '#{notification_type}', got '#{Notification.types.key(last_notification_type)}'"
+ "expected notification type to be '#{notification_type}', got '#{Notification.types.key(last_notification_type)}'"
end
match_when_negated do |actual|
- expect { actual.call }.to_not change { user.notifications.where(notification_type: Notification.types[notification_type]).count }
+ expect { actual.call }.to_not change {
+ user.notifications.where(notification_type: Notification.types[notification_type]).count
+ }
end
supports_block_expectations
@@ -49,7 +52,7 @@ RSpec.describe PostAlerter do
context "with private message" do
it "notifies for pms correctly" do
- pm = Fabricate(:topic, archetype: 'private_message', category_id: nil)
+ pm = Fabricate(:topic, archetype: "private_message", category_id: nil)
op = Fabricate(:post, user: pm.user)
pm.allowed_users << pm.user
PostAlerter.post_created(op)
@@ -61,9 +64,15 @@ RSpec.describe PostAlerter do
PostAlerter.post_created(reply2)
# we get a green notification for a reply
- expect(Notification.where(user_id: pm.user_id).pluck_first(:notification_type)).to eq(Notification.types[:private_message])
+ expect(Notification.where(user_id: pm.user_id).pluck_first(:notification_type)).to eq(
+ Notification.types[:private_message],
+ )
- TopicUser.change(pm.user_id, pm.id, notification_level: TopicUser.notification_levels[:tracking])
+ TopicUser.change(
+ pm.user_id,
+ pm.id,
+ notification_level: TopicUser.notification_levels[:tracking],
+ )
Notification.destroy_all
@@ -80,47 +89,66 @@ RSpec.describe PostAlerter do
# yes notification cause we were replied to
expect(Notification.where(user_id: pm.user_id).count).to eq(1)
-
end
it "notifies about private message even if direct mention" do
- pm = Fabricate(:topic, archetype: 'private_message', category_id: nil)
- op = Fabricate(:post, topic: pm, user: pm.user, raw: "Hello @#{user.username}, nice to meet you")
+ pm = Fabricate(:topic, archetype: "private_message", category_id: nil)
+ op =
+ Fabricate(:post, topic: pm, user: pm.user, raw: "Hello @#{user.username}, nice to meet you")
pm.allowed_users << pm.user
pm.allowed_users << user
- TopicUser.create!(user_id: user.id, topic_id: pm.id, notification_level: TopicUser.notification_levels[:watching])
+ TopicUser.create!(
+ user_id: user.id,
+ topic_id: pm.id,
+ notification_level: TopicUser.notification_levels[:watching],
+ )
PostAlerter.post_created(op)
- expect(Notification.where(user_id: user.id).pluck_first(:notification_type)).to eq(Notification.types[:private_message])
+ expect(Notification.where(user_id: user.id).pluck_first(:notification_type)).to eq(
+ Notification.types[:private_message],
+ )
end
context "with group inboxes" do
fab!(:user1) { Fabricate(:user) }
fab!(:user2) { Fabricate(:user) }
- fab!(:group) { Fabricate(:group, users: [user2], name: "TestGroup", default_notification_level: 2) }
- fab!(:pm) { Fabricate(:topic, archetype: 'private_message', category_id: nil, allowed_groups: [group]) }
+ fab!(:group) do
+ Fabricate(:group, users: [user2], name: "TestGroup", default_notification_level: 2)
+ end
+ fab!(:pm) do
+ Fabricate(:topic, archetype: "private_message", category_id: nil, allowed_groups: [group])
+ end
fab!(:op) { Fabricate(:post, user: pm.user, topic: pm) }
it "triggers :before_create_notifications_for_users" do
pm.allowed_users << user1
- events = DiscourseEvent.track_events do
- PostAlerter.post_created(op)
- end
-
- expect(events).to include(event_name: :before_create_notifications_for_users, params: [[user1], op])
- expect(events).to include(event_name: :before_create_notifications_for_users, params: [[user2], op])
+ events = DiscourseEvent.track_events { PostAlerter.post_created(op) }
+ expect(events).to include(
+ event_name: :before_create_notifications_for_users,
+ params: [[user1], op],
+ )
+ expect(events).to include(
+ event_name: :before_create_notifications_for_users,
+ params: [[user2], op],
+ )
end
it "triggers group summary notification" do
Jobs.run_immediately!
- TopicUser.change(user2.id, pm.id, notification_level: TopicUser.notification_levels[:tracking])
+ TopicUser.change(
+ user2.id,
+ pm.id,
+ notification_level: TopicUser.notification_levels[:tracking],
+ )
PostAlerter.post_created(op)
group_summary_notification = Notification.where(user_id: user2.id)
expect(group_summary_notification.count).to eq(1)
- expect(group_summary_notification.first.notification_type).to eq(Notification.types[:group_message_summary])
+ expect(group_summary_notification.first.notification_type).to eq(
+ Notification.types[:group_message_summary],
+ )
notification_payload = JSON.parse(group_summary_notification.first.data)
expect(notification_payload["group_name"]).to eq(group.name)
@@ -133,16 +161,23 @@ RSpec.describe PostAlerter do
# moving to inbox the only PM restores the group summary notification
GroupArchivedMessage.move_to_inbox!(group.id, pm)
group_summary_notification = Notification.where(user_id: user2.id)
- expect(group_summary_notification.first.notification_type).to eq(Notification.types[:group_message_summary])
+ expect(group_summary_notification.first.notification_type).to eq(
+ Notification.types[:group_message_summary],
+ )
updated_payload = JSON.parse(group_summary_notification.first.data)
expect(updated_payload["group_name"]).to eq(group.name)
expect(updated_payload["inbox_count"]).to eq(1)
# adding a second PM updates the count
- pm2 = Fabricate(:topic, archetype: 'private_message', category_id: nil, allowed_groups: [group])
+ pm2 =
+ Fabricate(:topic, archetype: "private_message", category_id: nil, allowed_groups: [group])
op2 = Fabricate(:post, user: pm2.user, topic: pm2)
- TopicUser.change(user2.id, pm2.id, notification_level: TopicUser.notification_levels[:tracking])
+ TopicUser.change(
+ user2.id,
+ pm2.id,
+ notification_level: TopicUser.notification_levels[:tracking],
+ )
PostAlerter.post_created(op2)
group_summary_notification = Notification.where(user_id: user2.id)
@@ -169,87 +204,124 @@ RSpec.describe PostAlerter do
expect(updated_payload["inbox_count"]).to eq(2)
end
- it 'updates the consolidated group summary inbox count and bumps the notification' do
+ it "updates the consolidated group summary inbox count and bumps the notification" do
user2.update!(last_seen_at: 5.minutes.ago)
- TopicUser.change(user2.id, pm.id, notification_level: TopicUser.notification_levels[:tracking])
+ TopicUser.change(
+ user2.id,
+ pm.id,
+ notification_level: TopicUser.notification_levels[:tracking],
+ )
PostAlerter.post_created(op)
- starting_count = Notification.where(
- user_id: user2.id,
- notification_type: Notification.types[:group_message_summary]
- ).pluck("data::json ->> 'inbox_count'").last.to_i
+ starting_count =
+ Notification
+ .where(user_id: user2.id, notification_type: Notification.types[:group_message_summary])
+ .pluck("data::json ->> 'inbox_count'")
+ .last
+ .to_i
- another_pm = Fabricate(:topic, archetype: 'private_message', category_id: nil, allowed_groups: [group])
+ another_pm =
+ Fabricate(:topic, archetype: "private_message", category_id: nil, allowed_groups: [group])
another_post = Fabricate(:post, user: another_pm.user, topic: another_pm)
- TopicUser.change(user2.id, another_pm.id, notification_level: TopicUser.notification_levels[:tracking])
+ TopicUser.change(
+ user2.id,
+ another_pm.id,
+ notification_level: TopicUser.notification_levels[:tracking],
+ )
- message_data = MessageBus.track_publish("/notification/#{user2.id}") do
- PostAlerter.post_created(another_post)
- end.first.data
+ message_data =
+ MessageBus
+ .track_publish("/notification/#{user2.id}") { PostAlerter.post_created(another_post) }
+ .first
+ .data
expect(Notification.where(user: user2).count).to eq(1)
- expect(message_data.dig(:last_notification, :notification, :data, :inbox_count)).to eq(starting_count + 1)
+ expect(message_data.dig(:last_notification, :notification, :data, :inbox_count)).to eq(
+ starting_count + 1,
+ )
expect(message_data[:unread_notifications]).to eq(1)
end
- it 'sends a PM notification when replying to a member tracking the topic' do
+ it "sends a PM notification when replying to a member tracking the topic" do
group.add(user1)
post = Fabricate(:post, topic: pm, user: user1)
- TopicUser.change(user1.id, pm.id, notification_level: TopicUser.notification_levels[:tracking])
+ TopicUser.change(
+ user1.id,
+ pm.id,
+ notification_level: TopicUser.notification_levels[:tracking],
+ )
expect {
create_post_with_alerts(
- raw: 'this is a reply to your post...', topic: pm, user: user2,
- reply_to_post_number: post.post_number
+ raw: "this is a reply to your post...",
+ topic: pm,
+ user: user2,
+ reply_to_post_number: post.post_number,
)
}.to change(
user1.notifications.where(notification_type: Notification.types[:private_message]),
- :count
+ :count,
).by(1)
end
- it 'notifies a group member if someone replies to their post' do
+ it "notifies a group member if someone replies to their post" do
group.add(user1)
post = Fabricate(:post, topic: pm, user: user1)
- TopicUser.change(user1.id, pm.id, notification_level: TopicUser.notification_levels[:regular])
+ TopicUser.change(
+ user1.id,
+ pm.id,
+ notification_level: TopicUser.notification_levels[:regular],
+ )
expect {
create_post_with_alerts(
- raw: 'this is a reply to your post...', topic: pm, user: user2,
- reply_to_post_number: post.post_number
+ raw: "this is a reply to your post...",
+ topic: pm,
+ user: user2,
+ reply_to_post_number: post.post_number,
)
}.to change(user1.notifications, :count).by(1)
end
- it 'notifies a group member if someone quotes their post' do
+ it "notifies a group member if someone quotes their post" do
group.add(user1)
post = Fabricate(:post, topic: pm, user: user1)
- TopicUser.change(user1.id, pm.id, notification_level: TopicUser.notification_levels[:regular])
+ TopicUser.change(
+ user1.id,
+ pm.id,
+ notification_level: TopicUser.notification_levels[:regular],
+ )
quote_raw = <<~MD
[quote="#{user1.username}, post:1, topic:#{pm.id}"]#{post.raw}[/quote]
MD
- expect {
- create_post_with_alerts(
- raw: quote_raw, topic: pm, user: user2,
- )
- }.to change(user1.notifications, :count).by(1)
+ expect { create_post_with_alerts(raw: quote_raw, topic: pm, user: user2) }.to change(
+ user1.notifications,
+ :count,
+ ).by(1)
end
it "Doesn't notify non-admin users when their post is quoted inside a whisper" do
group.add(admin)
- TopicUser.change(user2.id, pm.id, notification_level: TopicUser.notification_levels[:regular])
+ TopicUser.change(
+ user2.id,
+ pm.id,
+ notification_level: TopicUser.notification_levels[:regular],
+ )
quote_raw = <<~MD
[quote="#{user2.username}, post:1, topic:#{pm.id}"]#{op.raw}[/quote]
MD
expect {
create_post_with_alerts(
- raw: quote_raw, topic: pm, user: admin, post_type: Post.types[:whisper]
+ raw: quote_raw,
+ topic: pm,
+ user: admin,
+ post_type: Post.types[:whisper],
)
}.not_to change(user2.notifications, :count)
end
@@ -258,63 +330,67 @@ RSpec.describe PostAlerter do
context "with unread" do
it "does not return whispers as unread posts" do
- _whisper = Fabricate(:post, raw: 'this is a whisper post',
- user: admin,
- topic: post.topic,
- reply_to_post_number: post.post_number,
- post_type: Post.types[:whisper])
+ _whisper =
+ Fabricate(
+ :post,
+ raw: "this is a whisper post",
+ user: admin,
+ topic: post.topic,
+ reply_to_post_number: post.post_number,
+ post_type: Post.types[:whisper],
+ )
expect(PostAlerter.new.first_unread_post(post.user, post.topic)).to be_blank
end
end
- context 'with edits' do
- it 'notifies correctly on edits' do
+ context "with edits" do
+ it "notifies correctly on edits" do
Jobs.run_immediately!
PostActionNotifier.enable
- post = Fabricate(:post, raw: 'I love waffles')
+ post = Fabricate(:post, raw: "I love waffles")
- expect do
- post.revise(admin, raw: 'I made a revision')
- end.to add_notification(post.user, :edited)
+ expect do post.revise(admin, raw: "I made a revision") end.to add_notification(
+ post.user,
+ :edited,
+ )
# lets also like this post which should trigger a notification
expect do
- PostActionCreator.new(
- admin,
- post,
- PostActionType.types[:like]
- ).perform
+ PostActionCreator.new(admin, post, PostActionType.types[:like]).perform
end.to add_notification(post.user, :liked)
# skip this notification cause we already notified on an edit by the same user
# in the previous edit
freeze_time 2.hours.from_now
- expect do
- post.revise(admin, raw: 'I made another revision')
- end.to_not change { Notification.count }
+ expect do post.revise(admin, raw: "I made another revision") end.to_not change {
+ Notification.count
+ }
# this we do not skip cause 1 day has passed
freeze_time 23.hours.from_now
- expect do
- post.revise(admin, raw: 'I made another revision xyz')
- end.to add_notification(post.user, :edited)
+ expect do post.revise(admin, raw: "I made another revision xyz") end.to add_notification(
+ post.user,
+ :edited,
+ )
- expect do
- post.revise(Fabricate(:admin), raw: 'I made a revision')
- end.to add_notification(post.user, :edited)
+ expect do post.revise(Fabricate(:admin), raw: "I made a revision") end.to add_notification(
+ post.user,
+ :edited,
+ )
freeze_time 2.hours.from_now
- expect do
- post.revise(admin, raw: 'I made another revision')
- end.to add_notification(post.user, :edited)
+ expect do post.revise(admin, raw: "I made another revision") end.to add_notification(
+ post.user,
+ :edited,
+ )
end
- it 'notifies flaggers when flagged post gets unhidden by edit' do
+ it "notifies flaggers when flagged post gets unhidden by edit" do
post = create_post
PostActionNotifier.enable
@@ -327,10 +403,10 @@ RSpec.describe PostAlerter do
post.reload
expect(post.hidden).to eq(true)
- expect {
- post.revise(post.user, raw: post.raw + " ha I edited it ")
- }.to add_notification(evil_trout, :edited)
- .and add_notification(walterwhite, :edited)
+ expect { post.revise(post.user, raw: post.raw + " ha I edited it ") }.to add_notification(
+ evil_trout,
+ :edited,
+ ).and add_notification(walterwhite, :edited)
post.reload
expect(post.hidden).to eq(false)
@@ -348,60 +424,52 @@ RSpec.describe PostAlerter do
expect {
post.revise(post.user, raw: post.raw + " ha I edited it again ")
- }.to not_add_notification(evil_trout, :edited)
- .and not_add_notification(coding_horror, :edited)
- .and not_add_notification(walterwhite, :edited)
+ }.to not_add_notification(evil_trout, :edited).and not_add_notification(
+ coding_horror,
+ :edited,
+ ).and not_add_notification(walterwhite, :edited)
end
end
- context 'with quotes' do
+ context "with quotes" do
fab!(:category) { Fabricate(:category) }
fab!(:topic) { Fabricate(:topic, category: category) }
- it 'does not notify for muted users' do
+ it "does not notify for muted users" do
post = Fabricate(:post, raw: '[quote="Eviltrout, post:1"]whatup[/quote]', topic: topic)
MutedUser.create!(user_id: evil_trout.id, muted_user_id: post.user_id)
- expect {
- PostAlerter.post_created(post)
- }.not_to change(evil_trout.notifications, :count)
+ expect { PostAlerter.post_created(post) }.not_to change(evil_trout.notifications, :count)
end
- it 'does not notify for ignored users' do
+ it "does not notify for ignored users" do
post = Fabricate(:post, raw: '[quote="EvilTrout, post:1"]whatup[/quote]', topic: topic)
Fabricate(:ignored_user, user: evil_trout, ignored_user: post.user)
- expect {
- PostAlerter.post_created(post)
- }.not_to change(evil_trout.notifications, :count)
+ expect { PostAlerter.post_created(post) }.not_to change(evil_trout.notifications, :count)
end
- it 'does not notify for users with new reply notification' do
+ it "does not notify for users with new reply notification" do
post = Fabricate(:post, raw: '[quote="eviltRout, post:1"]whatup[/quote]', topic: topic)
- notification = Notification.create!(topic: post.topic,
- post_number: post.post_number,
- read: false,
- notification_type: Notification.types[:replied],
- user: evil_trout,
- data: { topic_title: "test topic" }.to_json
- )
- expect {
- PostAlerter.post_edited(post)
- }.not_to change(evil_trout.notifications, :count)
+ notification =
+ Notification.create!(
+ topic: post.topic,
+ post_number: post.post_number,
+ read: false,
+ notification_type: Notification.types[:replied],
+ user: evil_trout,
+ data: { topic_title: "test topic" }.to_json,
+ )
+ expect { PostAlerter.post_edited(post) }.not_to change(evil_trout.notifications, :count)
notification.destroy
- expect {
- PostAlerter.post_edited(post)
- }.to change(evil_trout.notifications, :count).by(1)
+ expect { PostAlerter.post_edited(post) }.to change(evil_trout.notifications, :count).by(1)
end
- it 'does not collapse quote notifications' do
+ it "does not collapse quote notifications" do
expect {
2.times do
- create_post_with_alerts(
- raw: '[quote="eviltrout, post:1"]whatup[/quote]',
- topic: topic
- )
+ create_post_with_alerts(raw: '[quote="eviltrout, post:1"]whatup[/quote]', topic: topic)
end
}.to change(evil_trout.notifications, :count).by(2)
end
@@ -416,16 +484,22 @@ RSpec.describe PostAlerter do
it "doesn't notify the poster" do
topic = create_post_with_alerts.topic
expect {
- Fabricate(:post, topic: topic, user: topic.user, raw: '[quote="Bruce Wayne, post:1"]whatup[/quote]')
+ Fabricate(
+ :post,
+ topic: topic,
+ user: topic.user,
+ raw: '[quote="Bruce Wayne, post:1"]whatup[/quote]',
+ )
}.not_to change(topic.user.notifications, :count)
end
it "triggers :before_create_notifications_for_users" do
post = Fabricate(:post, raw: '[quote="eviltrout, post:1"]whatup[/quote]')
- events = DiscourseEvent.track_events do
- PostAlerter.post_created(post)
- end
- expect(events).to include(event_name: :before_create_notifications_for_users, params: [[evil_trout], post])
+ events = DiscourseEvent.track_events { PostAlerter.post_created(post) }
+ expect(events).to include(
+ event_name: :before_create_notifications_for_users,
+ params: [[evil_trout], post],
+ )
end
context "with notifications when prioritizing full names" do
@@ -434,47 +508,41 @@ RSpec.describe PostAlerter do
SiteSetting.display_name_on_posts = true
end
- it 'sends to correct user' do
+ it "sends to correct user" do
quote = <<~MD
[quote="#{evil_trout.name}, post:1, username:#{evil_trout.username}"]whatup[/quote]
MD
- expect {
- create_post_with_alerts(
- raw: quote,
- topic: topic
- )
- }.to change(evil_trout.notifications, :count).by(1)
+ expect { create_post_with_alerts(raw: quote, topic: topic) }.to change(
+ evil_trout.notifications,
+ :count,
+ ).by(1)
end
- it 'sends to correct users when nested quotes with multiple users' do
+ it "sends to correct users when nested quotes with multiple users" do
quote = <<~MD
[quote="#{evil_trout.name}, post:1, username:#{evil_trout.username}"]this [quote="#{walterwhite.name}, post:2, username:#{walterwhite.username}"]whatup[/quote][/quote]
MD
- expect {
- create_post_with_alerts(
- raw: quote,
- topic: topic
- )
- }.to change(evil_trout.notifications, :count).by(1)
- .and change(walterwhite.notifications, :count).by(1)
+ expect { create_post_with_alerts(raw: quote, topic: topic) }.to change(
+ evil_trout.notifications,
+ :count,
+ ).by(1).and change(walterwhite.notifications, :count).by(1)
end
- it 'sends to correct users when multiple quotes' do
+ it "sends to correct users when multiple quotes" do
user = Fabricate(:user)
quote = <<~MD
[quote="#{evil_trout.name}, post:1, username:#{evil_trout.username}"]"username:#{user.username}" [/quote]/n [quote="#{walterwhite.name}, post:2, username:#{walterwhite.username}"]whatup[/quote]
MD
- expect {
- create_post_with_alerts(
- raw: quote,
- topic: topic
- )
- }.to change(evil_trout.notifications, :count).by(1)
- .and change(walterwhite.notifications, :count).by(1)
- .and not_change(user.notifications, :count)
+ expect { create_post_with_alerts(raw: quote, topic: topic) }.to change(
+ evil_trout.notifications,
+ :count,
+ ).by(1).and change(walterwhite.notifications, :count).by(1).and not_change(
+ user.notifications,
+ :count,
+ )
end
it "sends to correct user when user has a full name that matches another user's username" do
@@ -483,25 +551,20 @@ RSpec.describe PostAlerter do
[quote="#{user_with_matching_full_name.name}, post:1, username:#{user_with_matching_full_name.username}"]this [/quote]
MD
- expect {
- create_post_with_alerts(
- raw: quote,
- topic: topic
- )
- }.to change(user_with_matching_full_name.notifications, :count).by(1)
- .and not_change(evil_trout.notifications, :count)
+ expect { create_post_with_alerts(raw: quote, topic: topic) }.to change(
+ user_with_matching_full_name.notifications,
+ :count,
+ ).by(1).and not_change(evil_trout.notifications, :count)
end
end
end
- context 'with linked' do
+ context "with linked" do
let(:post1) { create_post }
let(:user) { post1.user }
let(:linking_post) { create_post(raw: "my magic topic\n##{Discourse.base_url}#{post1.url}") }
- before do
- Jobs.run_immediately!
- end
+ before { Jobs.run_immediately! }
it "will notify correctly on linking" do
linking_post
@@ -509,12 +572,22 @@ RSpec.describe PostAlerter do
expect(user.notifications.count).to eq(1)
watcher = Fabricate(:user)
- TopicUser.create!(user_id: watcher.id, topic_id: topic.id, notification_level: TopicUser.notification_levels[:watching])
+ TopicUser.create!(
+ user_id: watcher.id,
+ topic_id: topic.id,
+ notification_level: TopicUser.notification_levels[:watching],
+ )
- create_post(topic_id: topic.id, user: user, raw: "my magic topic\n##{Discourse.base_url}#{post1.url}")
+ create_post(
+ topic_id: topic.id,
+ user: user,
+ raw: "my magic topic\n##{Discourse.base_url}#{post1.url}",
+ )
user.reload
- expect(user.notifications.where(notification_type: Notification.types[:linked]).count).to eq(1)
+ expect(user.notifications.where(notification_type: Notification.types[:linked]).count).to eq(
+ 1,
+ )
expect(watcher.notifications.count).to eq(1)
@@ -524,10 +597,11 @@ RSpec.describe PostAlerter do
end
it "triggers :before_create_notifications_for_users" do
- events = DiscourseEvent.track_events do
- linking_post
- end
- expect(events).to include(event_name: :before_create_notifications_for_users, params: [[user], linking_post])
+ events = DiscourseEvent.track_events { linking_post }
+ expect(events).to include(
+ event_name: :before_create_notifications_for_users,
+ params: [[user], linking_post],
+ )
end
it "doesn't notify the linked user if the user is staged and the category is restricted and allows strangers" do
@@ -535,83 +609,89 @@ RSpec.describe PostAlerter do
group_member = Fabricate(:user)
group.add(group_member)
- private_category = Fabricate(
- :private_category, group: group,
- email_in: 'test@test.com', email_in_allow_strangers: true
- )
+ private_category =
+ Fabricate(
+ :private_category,
+ group: group,
+ email_in: "test@test.com",
+ email_in_allow_strangers: true,
+ )
staged_user_post = create_post(user: staged_user, category: private_category)
- linking = create_post(
- user: group_member,
- category: private_category,
- raw: "my magic topic\n##{Discourse.base_url}#{staged_user_post.url}")
+ linking =
+ create_post(
+ user: group_member,
+ category: private_category,
+ raw: "my magic topic\n##{Discourse.base_url}#{staged_user_post.url}",
+ )
staged_user.reload
- expect(staged_user.notifications.where(notification_type: Notification.types[:linked]).count).to eq(0)
+ expect(
+ staged_user.notifications.where(notification_type: Notification.types[:linked]).count,
+ ).to eq(0)
end
end
- context 'with @here' do
- let(:post) { create_post_with_alerts(raw: "Hello @here how are you?", user: tl2_user, topic: topic) }
+ context "with @here" do
+ let(:post) do
+ create_post_with_alerts(raw: "Hello @here how are you?", user: tl2_user, topic: topic)
+ end
fab!(:other_post) { Fabricate(:post, topic: topic) }
- before do
- Jobs.run_immediately!
- end
+ before { Jobs.run_immediately! }
- it 'does not notify unrelated users' do
+ it "does not notify unrelated users" do
expect { post }.not_to change(evil_trout.notifications, :count)
end
- it 'does not work if user here exists' do
+ it "does not work if user here exists" do
Fabricate(:user, username: SiteSetting.here_mention)
expect { post }.not_to change(other_post.user.notifications, :count)
end
- it 'notifies users who replied' do
+ it "notifies users who replied" do
post2 = Fabricate(:post, topic: topic, post_type: Post.types[:whisper])
post3 = Fabricate(:post, topic: topic)
- expect { post }
- .to change(other_post.user.notifications, :count).by(1)
- .and not_change(post2.user.notifications, :count)
- .and change(post3.user.notifications, :count).by(1)
+ expect { post }.to change(other_post.user.notifications, :count).by(1).and not_change(
+ post2.user.notifications,
+ :count,
+ ).and change(post3.user.notifications, :count).by(1)
end
- it 'notifies users who whispered' do
+ it "notifies users who whispered" do
post2 = Fabricate(:post, topic: topic, post_type: Post.types[:whisper])
post3 = Fabricate(:post, topic: topic)
tl2_user.grant_admin!
- expect { post }
- .to change(other_post.user.notifications, :count).by(1)
- .and change(post2.user.notifications, :count).by(1)
- .and change(post3.user.notifications, :count).by(1)
+ expect { post }.to change(other_post.user.notifications, :count).by(1).and change(
+ post2.user.notifications,
+ :count,
+ ).by(1).and change(post3.user.notifications, :count).by(1)
end
- it 'notifies only last max_here_mentioned users' do
+ it "notifies only last max_here_mentioned users" do
SiteSetting.max_here_mentioned = 2
3.times { Fabricate(:post, topic: topic) }
expect { post }.to change { Notification.count }.by(2)
end
end
- context 'with @group mentions' do
-
- fab!(:group) { Fabricate(:group, name: 'group', mentionable_level: Group::ALIAS_LEVELS[:everyone]) }
+ context "with @group mentions" do
+ fab!(:group) do
+ Fabricate(:group, name: "group", mentionable_level: Group::ALIAS_LEVELS[:everyone])
+ end
let(:post) { create_post_with_alerts(raw: "Hello @group how are you?") }
before { group.add(evil_trout) }
- it 'notifies users correctly' do
- expect {
- post
- }.to change(evil_trout.notifications, :count).by(1)
+ it "notifies users correctly" do
+ expect { post }.to change(evil_trout.notifications, :count).by(1)
expect(GroupMention.count).to eq(1)
- Fabricate(:group, name: 'group-alt', mentionable_level: Group::ALIAS_LEVELS[:everyone])
+ Fabricate(:group, name: "group-alt", mentionable_level: Group::ALIAS_LEVELS[:everyone])
expect {
create_post_with_alerts(raw: "Hello, @group-alt should not trigger a notification?")
@@ -620,9 +700,10 @@ RSpec.describe PostAlerter do
expect(GroupMention.count).to eq(2)
group.update_columns(mentionable_level: Group::ALIAS_LEVELS[:members_mods_and_admins])
- expect {
- create_post_with_alerts(raw: "Hello @group you are not mentionable")
- }.not_to change(evil_trout.notifications, :count)
+ expect { create_post_with_alerts(raw: "Hello @group you are not mentionable") }.not_to change(
+ evil_trout.notifications,
+ :count,
+ )
expect(GroupMention.count).to eq(3)
@@ -635,7 +716,7 @@ RSpec.describe PostAlerter do
expect(GroupMention.count).to eq(4)
end
- it 'takes private mention as precedence' do
+ it "takes private mention as precedence" do
expect {
create_post_with_alerts(raw: "Hello @group and @eviltrout, nice to meet you")
}.to change(evil_trout.notifications, :count).by(1)
@@ -643,32 +724,31 @@ RSpec.describe PostAlerter do
end
it "triggers :before_create_notifications_for_users" do
- events = DiscourseEvent.track_events do
- post
- end
- expect(events).to include(event_name: :before_create_notifications_for_users, params: [[evil_trout], post])
+ events = DiscourseEvent.track_events { post }
+ expect(events).to include(
+ event_name: :before_create_notifications_for_users,
+ params: [[evil_trout], post],
+ )
end
end
- context 'with @mentions' do
-
- let(:mention_post) { create_post_with_alerts(user: user, raw: 'Hello @eviltrout') }
+ context "with @mentions" do
+ let(:mention_post) { create_post_with_alerts(user: user, raw: "Hello @eviltrout") }
let(:topic) { mention_post.topic }
- before do
- Jobs.run_immediately!
- end
+ before { Jobs.run_immediately! }
- it 'notifies a user' do
- expect {
- mention_post
- }.to change(evil_trout.notifications, :count).by(1)
+ it "notifies a user" do
+ expect { mention_post }.to change(evil_trout.notifications, :count).by(1)
end
it "won't notify the user a second time on revision" do
mention_post
expect {
- mention_post.revise(mention_post.user, raw: "New raw content that still mentions @eviltrout")
+ mention_post.revise(
+ mention_post.user,
+ raw: "New raw content that still mentions @eviltrout",
+ )
}.not_to change(evil_trout.notifications, :count)
end
@@ -676,76 +756,79 @@ RSpec.describe PostAlerter do
topic.notify_regular!(user)
mention_post
expect {
- create_post_with_alerts(user: user, raw: 'second post', topic: topic)
+ create_post_with_alerts(user: user, raw: "second post", topic: topic)
}.not_to change(user.notifications, :count)
end
it "triggers :before_create_notifications_for_users" do
- events = DiscourseEvent.track_events do
- mention_post
- end
- expect(events).to include(event_name: :before_create_notifications_for_users, params: [[evil_trout], mention_post])
+ events = DiscourseEvent.track_events { mention_post }
+ expect(events).to include(
+ event_name: :before_create_notifications_for_users,
+ params: [[evil_trout], mention_post],
+ )
end
it "notification comes from editor if mention is added later" do
- post = create_post_with_alerts(user: user, raw: 'No mention here.')
- expect {
- post.revise(admin, raw: "Mention @eviltrout in this edit.")
- }.to change(evil_trout.notifications, :count)
+ post = create_post_with_alerts(user: user, raw: "No mention here.")
+ expect { post.revise(admin, raw: "Mention @eviltrout in this edit.") }.to change(
+ evil_trout.notifications,
+ :count,
+ )
n = evil_trout.notifications.last
expect(n.data_hash["original_username"]).to eq(admin.username)
end
it "doesn't notify the last post editor if they mention themselves" do
- post = create_post_with_alerts(user: user, raw: 'Post without a mention.')
- expect {
- post.revise(evil_trout, raw: "O hai, @eviltrout!")
- }.not_to change(evil_trout.notifications, :count)
+ post = create_post_with_alerts(user: user, raw: "Post without a mention.")
+ expect { post.revise(evil_trout, raw: "O hai, @eviltrout!") }.not_to change(
+ evil_trout.notifications,
+ :count,
+ )
end
- fab!(:alice) { Fabricate(:user, username: 'alice') }
- fab!(:bob) { Fabricate(:user, username: 'bob') }
- fab!(:carol) { Fabricate(:admin, username: 'carol') }
- fab!(:dave) { Fabricate(:user, username: 'dave') }
- fab!(:eve) { Fabricate(:user, username: 'eve') }
- fab!(:group) { Fabricate(:group, name: 'group', mentionable_level: Group::ALIAS_LEVELS[:everyone]) }
-
- before do
- group.bulk_add([alice.id, eve.id])
+ fab!(:alice) { Fabricate(:user, username: "alice") }
+ fab!(:bob) { Fabricate(:user, username: "bob") }
+ fab!(:carol) { Fabricate(:admin, username: "carol") }
+ fab!(:dave) { Fabricate(:user, username: "dave") }
+ fab!(:eve) { Fabricate(:user, username: "eve") }
+ fab!(:group) do
+ Fabricate(:group, name: "group", mentionable_level: Group::ALIAS_LEVELS[:everyone])
end
+ before { group.bulk_add([alice.id, eve.id]) }
+
def create_post_with_alerts(args = {})
post = Fabricate(:post, args)
PostAlerter.post_created(post)
end
def set_topic_notification_level(user, topic, level_name)
- TopicUser.change(user.id, topic.id, notification_level: TopicUser.notification_levels[level_name])
+ TopicUser.change(
+ user.id,
+ topic.id,
+ notification_level: TopicUser.notification_levels[level_name],
+ )
end
context "with topic" do
fab!(:topic) { Fabricate(:topic, user: alice) }
- [:watching, :tracking, :regular].each do |notification_level|
+ %i[watching tracking regular].each do |notification_level|
context "when notification level is '#{notification_level}'" do
- before do
- set_topic_notification_level(alice, topic, notification_level)
- end
+ before { set_topic_notification_level(alice, topic, notification_level) }
it "notifies about @username mention" do
- args = { user: bob, topic: topic, raw: 'Hello @alice' }
+ args = { user: bob, topic: topic, raw: "Hello @alice" }
expect { create_post_with_alerts(args) }.to add_notification(alice, :mentioned)
end
end
end
context "when notification level is 'muted'" do
- before do
- set_topic_notification_level(alice, topic, :muted)
- end
+ before { set_topic_notification_level(alice, topic, :muted) }
it "does not notify about @username mention" do
- args = { user: bob, topic: topic, raw: 'Hello @alice' }
+ args = { user: bob, topic: topic, raw: "Hello @alice" }
expect { create_post_with_alerts(args) }.to_not add_notification(alice, :mentioned)
end
end
@@ -753,50 +836,53 @@ RSpec.describe PostAlerter do
context "with message to users" do
fab!(:pm_topic) do
- Fabricate(:private_message_topic,
- user: alice,
- topic_allowed_users: [
- Fabricate.build(:topic_allowed_user, user: alice),
- Fabricate.build(:topic_allowed_user, user: bob),
- Fabricate.build(:topic_allowed_user, user: Discourse.system_user)
- ]
+ Fabricate(
+ :private_message_topic,
+ user: alice,
+ topic_allowed_users: [
+ Fabricate.build(:topic_allowed_user, user: alice),
+ Fabricate.build(:topic_allowed_user, user: bob),
+ Fabricate.build(:topic_allowed_user, user: Discourse.system_user),
+ ],
)
end
context "when user is part of conversation" do
- [:watching, :tracking, :regular].each do |notification_level|
+ %i[watching tracking regular].each do |notification_level|
context "when notification level is '#{notification_level}'" do
- before do
- set_topic_notification_level(alice, pm_topic, notification_level)
- end
- let(:expected_notification) {
+ before { set_topic_notification_level(alice, pm_topic, notification_level) }
+ let(:expected_notification) do
notification_level == :watching ? :private_message : :mentioned
- }
+ end
it "notifies about @username mention" do
- args = { user: bob, topic: pm_topic, raw: 'Hello @alice' }
- expect { create_post_with_alerts(args) }.to add_notification(alice, expected_notification)
+ args = { user: bob, topic: pm_topic, raw: "Hello @alice" }
+ expect { create_post_with_alerts(args) }.to add_notification(
+ alice,
+ expected_notification,
+ )
end
it "notifies about @username mentions by non-human users" do
- args = { user: Discourse.system_user, topic: pm_topic, raw: 'Hello @alice' }
- expect { create_post_with_alerts(args) }.to add_notification(alice, expected_notification)
+ args = { user: Discourse.system_user, topic: pm_topic, raw: "Hello @alice" }
+ expect { create_post_with_alerts(args) }.to add_notification(
+ alice,
+ expected_notification,
+ )
end
it "notifies about @group mention when allowed user is part of group" do
- args = { user: bob, topic: pm_topic, raw: 'Hello @group' }
+ args = { user: bob, topic: pm_topic, raw: "Hello @group" }
expect { create_post_with_alerts(args) }.to add_notification(alice, :group_mentioned)
end
end
end
context "when notification level is 'muted'" do
- before do
- set_topic_notification_level(alice, pm_topic, :muted)
- end
+ before { set_topic_notification_level(alice, pm_topic, :muted) }
it "does not notify about @username mention" do
- args = { user: bob, topic: pm_topic, raw: 'Hello @alice' }
+ args = { user: bob, topic: pm_topic, raw: "Hello @alice" }
expect { create_post_with_alerts(args) }.to_not add_notification(alice, :mentioned)
end
end
@@ -804,94 +890,90 @@ RSpec.describe PostAlerter do
context "when user is not part of conversation" do
it "does not notify about @username mention even though mentioned user is an admin" do
- args = { user: bob, topic: pm_topic, raw: 'Hello @carol' }
+ args = { user: bob, topic: pm_topic, raw: "Hello @carol" }
expect { create_post_with_alerts(args) }.to_not add_notification(carol, :mentioned)
end
it "does not notify about @username mention by non-human user even though mentioned user is an admin" do
- args = { user: Discourse.system_user, topic: pm_topic, raw: 'Hello @carol' }
+ args = { user: Discourse.system_user, topic: pm_topic, raw: "Hello @carol" }
expect { create_post_with_alerts(args) }.to_not add_notification(carol, :mentioned)
end
it "does not notify about @username mention when mentioned user is not allowed to see message" do
- args = { user: bob, topic: pm_topic, raw: 'Hello @dave' }
+ args = { user: bob, topic: pm_topic, raw: "Hello @dave" }
expect { create_post_with_alerts(args) }.to_not add_notification(dave, :mentioned)
end
it "does not notify about @group mention when user is not an allowed user" do
- args = { user: bob, topic: pm_topic, raw: 'Hello @group' }
+ args = { user: bob, topic: pm_topic, raw: "Hello @group" }
expect { create_post_with_alerts(args) }.to_not add_notification(eve, :group_mentioned)
end
end
end
context "with message to group" do
- fab!(:some_group) { Fabricate(:group, name: 'some_group', mentionable_level: Group::ALIAS_LEVELS[:everyone]) }
+ fab!(:some_group) do
+ Fabricate(:group, name: "some_group", mentionable_level: Group::ALIAS_LEVELS[:everyone])
+ end
fab!(:pm_topic) do
- Fabricate(:private_message_topic,
- user: alice,
- topic_allowed_groups: [
- Fabricate.build(:topic_allowed_group, group: group)
- ],
- topic_allowed_users: [
- Fabricate.build(:topic_allowed_user, user: Discourse.system_user)
- ]
+ Fabricate(
+ :private_message_topic,
+ user: alice,
+ topic_allowed_groups: [Fabricate.build(:topic_allowed_group, group: group)],
+ topic_allowed_users: [Fabricate.build(:topic_allowed_user, user: Discourse.system_user)],
)
end
- before do
- some_group.bulk_add([alice.id, carol.id])
- end
+ before { some_group.bulk_add([alice.id, carol.id]) }
context "when group is part of conversation" do
- [:watching, :tracking, :regular].each do |notification_level|
+ %i[watching tracking regular].each do |notification_level|
context "when notification level is '#{notification_level}'" do
- before do
- set_topic_notification_level(alice, pm_topic, notification_level)
- end
+ before { set_topic_notification_level(alice, pm_topic, notification_level) }
it "notifies about @group mention" do
- args = { user: bob, topic: pm_topic, raw: 'Hello @group' }
+ args = { user: bob, topic: pm_topic, raw: "Hello @group" }
expect { create_post_with_alerts(args) }.to add_notification(alice, :group_mentioned)
end
it "notifies about @group mentions by non-human users" do
- args = { user: Discourse.system_user, topic: pm_topic, raw: 'Hello @group' }
+ args = { user: Discourse.system_user, topic: pm_topic, raw: "Hello @group" }
expect { create_post_with_alerts(args) }.to add_notification(alice, :group_mentioned)
end
it "notifies about @username mention when user belongs to allowed group" do
- args = { user: bob, topic: pm_topic, raw: 'Hello @alice' }
+ args = { user: bob, topic: pm_topic, raw: "Hello @alice" }
expect { create_post_with_alerts(args) }.to add_notification(alice, :mentioned)
end
end
end
context "when notification level is 'muted'" do
- before do
- set_topic_notification_level(alice, pm_topic, :muted)
- end
+ before { set_topic_notification_level(alice, pm_topic, :muted) }
it "does not notify about @group mention" do
- args = { user: bob, topic: pm_topic, raw: 'Hello @group' }
- expect { create_post_with_alerts(args) }.to_not add_notification(alice, :group_mentioned)
+ args = { user: bob, topic: pm_topic, raw: "Hello @group" }
+ expect { create_post_with_alerts(args) }.to_not add_notification(
+ alice,
+ :group_mentioned,
+ )
end
end
end
context "when group is not part of conversation" do
it "does not notify about @group mention even though mentioned user is an admin" do
- args = { user: bob, topic: pm_topic, raw: 'Hello @some_group' }
+ args = { user: bob, topic: pm_topic, raw: "Hello @some_group" }
expect { create_post_with_alerts(args) }.to_not add_notification(carol, :group_mentioned)
end
it "does not notify about @group mention by non-human user even though mentioned user is an admin" do
- args = { user: Discourse.system_user, topic: pm_topic, raw: 'Hello @some_group' }
+ args = { user: Discourse.system_user, topic: pm_topic, raw: "Hello @some_group" }
expect { create_post_with_alerts(args) }.to_not add_notification(carol, :group_mentioned)
end
it "does not notify about @username mention when user doesn't belong to allowed group" do
- args = { user: bob, topic: pm_topic, raw: 'Hello @dave' }
+ args = { user: bob, topic: pm_topic, raw: "Hello @dave" }
expect { create_post_with_alerts(args) }.to_not add_notification(dave, :mentioned)
end
end
@@ -904,11 +986,11 @@ RSpec.describe PostAlerter do
let(:type) { Notification.types[:private_message] }
it "creates a notification for PMs" do
- post.revise(user, { raw: 'This is the revised post' }, revised_at: Time.zone.now)
+ post.revise(user, { raw: "This is the revised post" }, revised_at: Time.zone.now)
- expect {
- PostAlerter.new.create_notification(user, type, post)
- }.to change { user.notifications.count }.by(1)
+ expect { PostAlerter.new.create_notification(user, type, post) }.to change {
+ user.notifications.count
+ }.by(1)
expect(user.notifications.last.data_hash["topic_title"]).to eq(topic.title)
end
@@ -918,26 +1000,24 @@ RSpec.describe PostAlerter do
post.revise(user, { title: "This is the revised title" }, revised_at: Time.now)
- expect {
- PostAlerter.new.create_notification(user, type, post)
- }.to change { user.notifications.count }.by(1)
+ expect { PostAlerter.new.create_notification(user, type, post) }.to change {
+ user.notifications.count
+ }.by(1)
expect(user.notifications.last.data_hash["topic_title"]).to eq(original_title)
end
it "triggers :pre_notification_alert" do
- events = DiscourseEvent.track_events do
- PostAlerter.new.create_notification(user, type, post)
- end
+ events = DiscourseEvent.track_events { PostAlerter.new.create_notification(user, type, post) }
payload = {
- notification_type: type,
- post_number: post.post_number,
- topic_title: post.topic.title,
- topic_id: post.topic.id,
- excerpt: post.excerpt(400, text_entities: true, strip_links: true, remap_emoji: true),
- username: post.username,
- post_url: post.url
+ notification_type: type,
+ post_number: post.post_number,
+ topic_title: post.topic.title,
+ topic_id: post.topic.id,
+ excerpt: post.excerpt(400, text_entities: true, strip_links: true, remap_emoji: true),
+ username: post.username,
+ post_url: post.url,
}
expect(events).to include(event_name: :pre_notification_alert, params: [user, payload])
@@ -946,20 +1026,25 @@ RSpec.describe PostAlerter do
it "does not alert when revising and changing notification type" do
PostAlerter.new.create_notification(user, type, post)
- post.revise(user, { raw: "Editing post to fake include a mention of @eviltrout" }, revised_at: Time.now)
+ post.revise(
+ user,
+ { raw: "Editing post to fake include a mention of @eviltrout" },
+ revised_at: Time.now,
+ )
- events = DiscourseEvent.track_events do
- PostAlerter.new.create_notification(user, Notification.types[:mentioned], post)
- end
+ events =
+ DiscourseEvent.track_events do
+ PostAlerter.new.create_notification(user, Notification.types[:mentioned], post)
+ end
payload = {
- notification_type: type,
- post_number: post.post_number,
- topic_title: post.topic.title,
- topic_id: post.topic.id,
- excerpt: post.excerpt(400, text_entities: true, strip_links: true, remap_emoji: true),
- username: post.username,
- post_url: post.url
+ notification_type: type,
+ post_number: post.post_number,
+ topic_title: post.topic.title,
+ topic_id: post.topic.id,
+ excerpt: post.excerpt(400, text_entities: true, strip_links: true, remap_emoji: true),
+ username: post.username,
+ post_url: post.url,
}
expect(events).not_to include(event_name: :pre_notification_alert, params: [user, payload])
@@ -967,42 +1052,42 @@ RSpec.describe PostAlerter do
it "triggers :before_create_notification" do
type = Notification.types[:private_message]
- events = DiscourseEvent.track_events do
- PostAlerter.new.create_notification(user, type, post, {})
- end
- expect(events).to include(event_name: :before_create_notification, params: [user, type, post, {}])
+ events =
+ DiscourseEvent.track_events { PostAlerter.new.create_notification(user, type, post, {}) }
+ expect(events).to include(
+ event_name: :before_create_notification,
+ params: [user, type, post, {}],
+ )
end
end
describe ".push_notification" do
- let(:mention_post) { create_post_with_alerts(user: user, raw: 'Hello @eviltrout :heart:') }
+ let(:mention_post) { create_post_with_alerts(user: user, raw: "Hello @eviltrout :heart:") }
let(:topic) { mention_post.topic }
before do
SiteSetting.allowed_user_api_push_urls = "https://site.com/push|https://site2.com/push"
2.times do |i|
- UserApiKey.create!(user_id: evil_trout.id,
- client_id: "xxx#{i}",
- application_name: "iPhone#{i}",
- scopes: ['notifications'].map { |name| UserApiKeyScope.new(name: name) },
- push_url: "https://site2.com/push")
+ UserApiKey.create!(
+ user_id: evil_trout.id,
+ client_id: "xxx#{i}",
+ application_name: "iPhone#{i}",
+ scopes: ["notifications"].map { |name| UserApiKeyScope.new(name: name) },
+ push_url: "https://site2.com/push",
+ )
end
end
describe "DiscoursePluginRegistry#push_notification_filters" do
it "sends push notifications when all filters pass" do
- Plugin::Instance.new.register_push_notification_filter do |user, payload|
- true
- end
+ Plugin::Instance.new.register_push_notification_filter { |user, payload| true }
expect { mention_post }.to change { Jobs::PushNotification.jobs.count }.by(1)
DiscoursePluginRegistry.reset!
end
it "does not send push notifications when a filters returns false" do
- Plugin::Instance.new.register_push_notification_filter do |user, payload|
- false
- end
+ Plugin::Instance.new.register_push_notification_filter { |user, payload| false }
expect { mention_post }.not_to change { Jobs::PushNotification.jobs.count }
DiscoursePluginRegistry.reset!
end
@@ -1014,7 +1099,12 @@ RSpec.describe PostAlerter do
end
it "pushes nothing when the user is in 'do not disturb'" do
- Fabricate(:do_not_disturb_timing, user: evil_trout, starts_at: Time.zone.now, ends_at: 1.day.from_now)
+ Fabricate(
+ :do_not_disturb_timing,
+ user: evil_trout,
+ starts_at: Time.zone.now,
+ ends_at: 1.day.from_now,
+ )
expect { mention_post }.to_not change { Jobs::PushNotification.jobs.count }
end
@@ -1024,12 +1114,11 @@ RSpec.describe PostAlerter do
body = nil
headers = nil
- stub_request(:post, "https://site2.com/push")
- .to_return do |request|
- body = request.body
- headers = request.headers
- { status: 200, body: "OK" }
- end
+ stub_request(:post, "https://site2.com/push").to_return do |request|
+ body = request.body
+ headers = request.headers
+ { status: 200, body: "OK" }
+ end
set_subfolder "/subpath"
payload = {
@@ -1038,48 +1127,58 @@ RSpec.describe PostAlerter do
"title" => SiteSetting.title,
"description" => SiteSetting.site_description,
"notifications" => [
- {
- 'notification_type' => 1,
- 'post_number' => 1,
- 'topic_title' => topic.title,
- 'topic_id' => topic.id,
- 'excerpt' => 'Hello @eviltrout ❤',
- 'username' => user.username,
- 'url' => UrlHelper.absolute(Discourse.base_path + mention_post.url),
- 'client_id' => 'xxx0'
- },
- {
- 'notification_type' => 1,
- 'post_number' => 1,
- 'topic_title' => topic.title,
- 'topic_id' => topic.id,
- 'excerpt' => 'Hello @eviltrout ❤',
- 'username' => user.username,
- 'url' => UrlHelper.absolute(Discourse.base_path + mention_post.url),
- 'client_id' => 'xxx1'
- }
- ]
+ {
+ "notification_type" => 1,
+ "post_number" => 1,
+ "topic_title" => topic.title,
+ "topic_id" => topic.id,
+ "excerpt" => "Hello @eviltrout ❤",
+ "username" => user.username,
+ "url" => UrlHelper.absolute(Discourse.base_path + mention_post.url),
+ "client_id" => "xxx0",
+ },
+ {
+ "notification_type" => 1,
+ "post_number" => 1,
+ "topic_title" => topic.title,
+ "topic_id" => topic.id,
+ "excerpt" => "Hello @eviltrout ❤",
+ "username" => user.username,
+ "url" => UrlHelper.absolute(Discourse.base_path + mention_post.url),
+ "client_id" => "xxx1",
+ },
+ ],
}
post = mention_post
expect(JSON.parse(body)).to eq(payload)
- expect(headers["Content-Type"]).to eq('application/json')
+ expect(headers["Content-Type"]).to eq("application/json")
- TopicUser.change(evil_trout.id, topic.id, notification_level: TopicUser.notification_levels[:watching])
+ TopicUser.change(
+ evil_trout.id,
+ topic.id,
+ notification_level: TopicUser.notification_levels[:watching],
+ )
post = Fabricate(:post, topic: post.topic, user_id: evil_trout.id)
user2 = Fabricate(:user)
# if we collapse a reply notification we should get notified on the correct post
- new_post = create_post_with_alerts(topic: post.topic, user_id: user.id, reply_to_post_number: post.post_number, raw: 'this is my first reply')
+ new_post =
+ create_post_with_alerts(
+ topic: post.topic,
+ user_id: user.id,
+ reply_to_post_number: post.post_number,
+ raw: "this is my first reply",
+ )
changes = {
"notification_type" => Notification.types[:posted],
"post_number" => new_post.post_number,
"username" => new_post.user.username,
"excerpt" => new_post.raw,
- "url" => UrlHelper.absolute(Discourse.base_path + new_post.url)
+ "url" => UrlHelper.absolute(Discourse.base_path + new_post.url),
}
payload["notifications"][0].merge! changes
@@ -1087,20 +1186,25 @@ RSpec.describe PostAlerter do
expect(JSON.parse(body)).to eq(payload)
- new_post = create_post_with_alerts(topic: post.topic, user_id: user2.id, reply_to_post_number: post.post_number, raw: 'this is my second reply')
+ new_post =
+ create_post_with_alerts(
+ topic: post.topic,
+ user_id: user2.id,
+ reply_to_post_number: post.post_number,
+ raw: "this is my second reply",
+ )
changes = {
"post_number" => new_post.post_number,
"username" => new_post.user.username,
"excerpt" => new_post.raw,
- "url" => UrlHelper.absolute(Discourse.base_path + new_post.url)
+ "url" => UrlHelper.absolute(Discourse.base_path + new_post.url),
}
payload["notifications"][0].merge! changes
payload["notifications"][1].merge! changes
expect(JSON.parse(body)).to eq(payload)
-
end
context "with push subscriptions" do
@@ -1130,17 +1234,19 @@ RSpec.describe PostAlerter do
evil_trout.update_columns(suspended_till: 1.year.from_now)
events = nil
- messages = MessageBus.track_publish do
- events = DiscourseEvent.track_events do
- PostAlerter.create_notification_alert(
- user: evil_trout,
- post: post,
- notification_type: Notification.types[:custom],
- excerpt: "excerpt",
- username: "username"
- )
+ messages =
+ MessageBus.track_publish do
+ events =
+ DiscourseEvent.track_events do
+ PostAlerter.create_notification_alert(
+ user: evil_trout,
+ post: post,
+ notification_type: Notification.types[:custom],
+ excerpt: "excerpt",
+ username: "username",
+ )
+ end
end
- end
expect(events.size).to eq(0)
expect(messages.size).to eq(0)
@@ -1151,24 +1257,28 @@ RSpec.describe PostAlerter do
evil_trout.update_columns(last_seen_at: 31.days.ago)
SiteSetting.allowed_user_api_push_urls = "https://site2.com/push"
- UserApiKey.create!(user_id: evil_trout.id,
- client_id: "xxx#1",
- application_name: "iPhone1",
- scopes: ['notifications'].map { |name| UserApiKeyScope.new(name: name) },
- push_url: "https://site2.com/push")
+ UserApiKey.create!(
+ user_id: evil_trout.id,
+ client_id: "xxx#1",
+ application_name: "iPhone1",
+ scopes: ["notifications"].map { |name| UserApiKeyScope.new(name: name) },
+ push_url: "https://site2.com/push",
+ )
events = nil
- messages = MessageBus.track_publish do
- events = DiscourseEvent.track_events do
- PostAlerter.create_notification_alert(
- user: evil_trout,
- post: post,
- notification_type: Notification.types[:custom],
- excerpt: "excerpt",
- username: "username"
- )
+ messages =
+ MessageBus.track_publish do
+ events =
+ DiscourseEvent.track_events do
+ PostAlerter.create_notification_alert(
+ user: evil_trout,
+ post: post,
+ notification_type: Notification.types[:custom],
+ excerpt: "excerpt",
+ username: "username",
+ )
+ end
end
- end
expect(events.size).to eq(2)
expect(messages.size).to eq(0)
@@ -1179,34 +1289,42 @@ RSpec.describe PostAlerter do
describe "watching_first_post" do
fab!(:user) { Fabricate(:user) }
fab!(:category) { Fabricate(:category) }
- fab!(:tag) { Fabricate(:tag) }
+ fab!(:tag) { Fabricate(:tag) }
fab!(:topic) { Fabricate(:topic, category: category, tags: [tag]) }
fab!(:post) { Fabricate(:post, topic: topic) }
it "doesn't notify people who aren't watching" do
PostAlerter.post_created(post)
- expect(user.notifications.where(notification_type: Notification.types[:watching_first_post]).count).to eq(0)
+ expect(
+ user.notifications.where(notification_type: Notification.types[:watching_first_post]).count,
+ ).to eq(0)
end
it "notifies the user who is following the first post category" do
level = CategoryUser.notification_levels[:watching_first_post]
CategoryUser.set_notification_level_for_category(user, level, category.id)
PostAlerter.new.after_save_post(post, true)
- expect(user.notifications.where(notification_type: Notification.types[:watching_first_post]).count).to eq(1)
+ expect(
+ user.notifications.where(notification_type: Notification.types[:watching_first_post]).count,
+ ).to eq(1)
end
it "doesn't notify when the record is not new" do
level = CategoryUser.notification_levels[:watching_first_post]
CategoryUser.set_notification_level_for_category(user, level, category.id)
PostAlerter.new.after_save_post(post, false)
- expect(user.notifications.where(notification_type: Notification.types[:watching_first_post]).count).to eq(0)
+ expect(
+ user.notifications.where(notification_type: Notification.types[:watching_first_post]).count,
+ ).to eq(0)
end
it "notifies the user who is following the first post tag" do
level = TagUser.notification_levels[:watching_first_post]
TagUser.change(user.id, tag.id, level)
PostAlerter.post_created(post)
- expect(user.notifications.where(notification_type: Notification.types[:watching_first_post]).count).to eq(1)
+ expect(
+ user.notifications.where(notification_type: Notification.types[:watching_first_post]).count,
+ ).to eq(1)
end
it "notifies the user who is following the first post group" do
@@ -1218,16 +1336,19 @@ RSpec.describe PostAlerter do
GroupUser.where(user_id: user.id, group_id: group.id).update_all(notification_level: level)
PostAlerter.post_created(post)
- expect(user.notifications.where(notification_type: Notification.types[:watching_first_post]).count).to eq(1)
+ expect(
+ user.notifications.where(notification_type: Notification.types[:watching_first_post]).count,
+ ).to eq(1)
end
it "triggers :before_create_notifications_for_users" do
level = CategoryUser.notification_levels[:watching_first_post]
CategoryUser.set_notification_level_for_category(user, level, category.id)
- events = DiscourseEvent.track_events do
- PostAlerter.new.after_save_post(post, true)
- end
- expect(events).to include(event_name: :before_create_notifications_for_users, params: [[user], post])
+ events = DiscourseEvent.track_events { PostAlerter.new.after_save_post(post, true) }
+ expect(events).to include(
+ event_name: :before_create_notifications_for_users,
+ params: [[user], post],
+ )
end
end
@@ -1235,10 +1356,11 @@ RSpec.describe PostAlerter do
it "triggers :before_create_notifications_for_users" do
_post = Fabricate(:post, user: user, topic: topic)
reply = Fabricate(:post, topic: topic, reply_to_post_number: 1)
- events = DiscourseEvent.track_events do
- PostAlerter.post_created(reply)
- end
- expect(events).to include(event_name: :before_create_notifications_for_users, params: [[user], reply])
+ events = DiscourseEvent.track_events { PostAlerter.post_created(reply) }
+ expect(events).to include(
+ event_name: :before_create_notifications_for_users,
+ params: [[user], reply],
+ )
end
it "notifies about regular reply" do
@@ -1247,16 +1369,27 @@ RSpec.describe PostAlerter do
reply = Fabricate(:post, topic: topic, reply_to_post_number: 1)
PostAlerter.post_created(reply)
- expect(user.notifications.where(notification_type: Notification.types[:replied]).count).to eq(1)
+ expect(user.notifications.where(notification_type: Notification.types[:replied]).count).to eq(
+ 1,
+ )
end
it "doesn't notify regular user about whispered reply" do
_post = Fabricate(:post, user: user, topic: topic)
- whispered_reply = Fabricate(:post, user: admin, topic: topic, post_type: Post.types[:whisper], reply_to_post_number: 1)
+ whispered_reply =
+ Fabricate(
+ :post,
+ user: admin,
+ topic: topic,
+ post_type: Post.types[:whisper],
+ reply_to_post_number: 1,
+ )
PostAlerter.post_created(whispered_reply)
- expect(user.notifications.where(notification_type: Notification.types[:replied]).count).to eq(0)
+ expect(user.notifications.where(notification_type: Notification.types[:replied]).count).to eq(
+ 0,
+ )
end
it "notifies staff user about whispered reply" do
@@ -1265,19 +1398,45 @@ RSpec.describe PostAlerter do
_post = Fabricate(:post, user: user, topic: topic)
- whispered_reply1 = Fabricate(:post, user: admin1, topic: topic, post_type: Post.types[:whisper], reply_to_post_number: 1)
- whispered_reply2 = Fabricate(:post, user: admin2, topic: topic, post_type: Post.types[:whisper], reply_to_post_number: 2)
+ whispered_reply1 =
+ Fabricate(
+ :post,
+ user: admin1,
+ topic: topic,
+ post_type: Post.types[:whisper],
+ reply_to_post_number: 1,
+ )
+ whispered_reply2 =
+ Fabricate(
+ :post,
+ user: admin2,
+ topic: topic,
+ post_type: Post.types[:whisper],
+ reply_to_post_number: 2,
+ )
PostAlerter.post_created(whispered_reply1)
PostAlerter.post_created(whispered_reply2)
- expect(admin1.notifications.where(notification_type: Notification.types[:replied]).count).to eq(1)
+ expect(
+ admin1.notifications.where(notification_type: Notification.types[:replied]).count,
+ ).to eq(1)
- TopicUser.change(admin1.id, topic.id, notification_level: TopicUser.notification_levels[:watching])
+ TopicUser.change(
+ admin1.id,
+ topic.id,
+ notification_level: TopicUser.notification_levels[:watching],
+ )
# this should change nothing cause the moderator post has an action code
# if we have an action code then we should never have notifications, this is rare but
# assign whispers are like this
- whispered_reply3 = topic.add_moderator_post(admin2, "i am a reply", post_type: Post.types[:whisper], action_code: 'moderator_thing')
+ whispered_reply3 =
+ topic.add_moderator_post(
+ admin2,
+ "i am a reply",
+ post_type: Post.types[:whisper],
+ action_code: "moderator_thing",
+ )
PostAlerter.post_created(whispered_reply3)
# if this whisper is not ignored like it should we would see a posted notification and no replied notifications
@@ -1295,21 +1454,39 @@ RSpec.describe PostAlerter do
dave = Fabricate(:user, username: "dave", email: "dave@example.com", staged: true)
erin = Fabricate(:user, username: "erin", email: "erin@example.com")
- topic = Fabricate(:private_message_topic, topic_allowed_users: [
- Fabricate.build(:topic_allowed_user, user: alice),
- Fabricate.build(:topic_allowed_user, user: bob),
- Fabricate.build(:topic_allowed_user, user: carol),
- Fabricate.build(:topic_allowed_user, user: dave),
- Fabricate.build(:topic_allowed_user, user: erin)
- ])
+ topic =
+ Fabricate(
+ :private_message_topic,
+ topic_allowed_users: [
+ Fabricate.build(:topic_allowed_user, user: alice),
+ Fabricate.build(:topic_allowed_user, user: bob),
+ Fabricate.build(:topic_allowed_user, user: carol),
+ Fabricate.build(:topic_allowed_user, user: dave),
+ Fabricate.build(:topic_allowed_user, user: erin),
+ ],
+ )
_post = Fabricate(:post, user: alice, topic: topic)
- TopicUser.change(alice.id, topic.id, notification_level: TopicUser.notification_levels[:watching])
- TopicUser.change(bob.id, topic.id, notification_level: TopicUser.notification_levels[:watching])
- TopicUser.change(erin.id, topic.id, notification_level: TopicUser.notification_levels[:watching])
+ TopicUser.change(
+ alice.id,
+ topic.id,
+ notification_level: TopicUser.notification_levels[:watching],
+ )
+ TopicUser.change(
+ bob.id,
+ topic.id,
+ notification_level: TopicUser.notification_levels[:watching],
+ )
+ TopicUser.change(
+ erin.id,
+ topic.id,
+ notification_level: TopicUser.notification_levels[:watching],
+ )
- email = Fabricate(:incoming_email,
- raw: <<~RAW,
+ email =
+ Fabricate(
+ :incoming_email,
+ raw: <<~RAW,
Return-Path:
From: Bob
To: meta+1234@discoursemail.com, dave@example.com
@@ -1323,10 +1500,18 @@ RSpec.describe PostAlerter do
This post was created by email.
RAW
- from_address: "bob@example.com",
- to_addresses: "meta+1234@discoursemail.com;dave@example.com",
- cc_addresses: "carol@example.com;erin@example.com")
- reply = Fabricate(:post_via_email, user: bob, topic: topic, incoming_email: email, reply_to_post_number: 1)
+ from_address: "bob@example.com",
+ to_addresses: "meta+1234@discoursemail.com;dave@example.com",
+ cc_addresses: "carol@example.com;erin@example.com",
+ )
+ reply =
+ Fabricate(
+ :post_via_email,
+ user: bob,
+ topic: topic,
+ incoming_email: email,
+ reply_to_post_number: 1,
+ )
NotificationEmailer.expects(:process_notification).with { |n| n.user_id == alice.id }.once
NotificationEmailer.expects(:process_notification).with { |n| n.user_id == bob.id }.never
@@ -1368,15 +1553,17 @@ RSpec.describe PostAlerter do
u1.notifications.destroy_all
- expect do
- create_post(topic: topic, user: u2)
- end.to change { u1.reload.notifications.count }.by(1)
- expect(u1.notifications.exists?(
- topic_id: topic.id,
- notification_type: Notification.types[:replied],
- post_number: 1,
- read: false
- )).to eq(true)
+ expect do create_post(topic: topic, user: u2) end.to change {
+ u1.reload.notifications.count
+ }.by(1)
+ expect(
+ u1.notifications.exists?(
+ topic_id: topic.id,
+ notification_type: Notification.types[:replied],
+ post_number: 1,
+ read: false,
+ ),
+ ).to eq(true)
end
it "it doesn't notify about small action posts when the topic author is watching the topic " do
@@ -1389,9 +1576,9 @@ RSpec.describe PostAlerter do
u1.notifications.destroy_all
- expect do
- topic.update_status("closed", true, u2, message: "hello world")
- end.not_to change { u1.reload.notifications.count }
+ expect do topic.update_status("closed", true, u2, message: "hello world") end.not_to change {
+ u1.reload.notifications.count
+ }
end
end
@@ -1402,10 +1589,11 @@ RSpec.describe PostAlerter do
post = Fabricate(:post, topic: topic)
level = CategoryUser.notification_levels[:watching]
CategoryUser.set_notification_level_for_category(user, level, category.id)
- events = DiscourseEvent.track_events do
- PostAlerter.post_created(post)
- end
- expect(events).to include(event_name: :before_create_notifications_for_users, params: [[user], post])
+ events = DiscourseEvent.track_events { PostAlerter.post_created(post) }
+ expect(events).to include(
+ event_name: :before_create_notifications_for_users,
+ params: [[user], post],
+ )
end
it "notifies staff about whispered post" do
@@ -1413,13 +1601,16 @@ RSpec.describe PostAlerter do
level = CategoryUser.notification_levels[:watching]
CategoryUser.set_notification_level_for_category(admin, level, category.id)
CategoryUser.set_notification_level_for_category(user, level, category.id)
- whispered_post = Fabricate(:post, user: Fabricate(:admin), topic: topic, post_type: Post.types[:whisper])
- expect {
- PostAlerter.post_created(whispered_post)
- }.to add_notification(admin, :watching_category_or_tag)
- expect {
- PostAlerter.post_created(whispered_post)
- }.not_to add_notification(user, :watching_category_or_tag)
+ whispered_post =
+ Fabricate(:post, user: Fabricate(:admin), topic: topic, post_type: Post.types[:whisper])
+ expect { PostAlerter.post_created(whispered_post) }.to add_notification(
+ admin,
+ :watching_category_or_tag,
+ )
+ expect { PostAlerter.post_created(whispered_post) }.not_to add_notification(
+ user,
+ :watching_category_or_tag,
+ )
end
it "notifies a staged user about a private post, but only if the user has access" do
@@ -1430,27 +1621,38 @@ RSpec.describe PostAlerter do
group.add(group_member)
group.add(staged_member)
- private_category = Fabricate(
- :private_category, group: group,
- email_in: 'test@test.com', email_in_allow_strangers: false
- )
+ private_category =
+ Fabricate(
+ :private_category,
+ group: group,
+ email_in: "test@test.com",
+ email_in_allow_strangers: false,
+ )
level = CategoryUser.notification_levels[:watching]
CategoryUser.set_notification_level_for_category(group_member, level, private_category.id)
CategoryUser.set_notification_level_for_category(staged_member, level, private_category.id)
- CategoryUser.set_notification_level_for_category(staged_non_member, level, private_category.id)
+ CategoryUser.set_notification_level_for_category(
+ staged_non_member,
+ level,
+ private_category.id,
+ )
topic = Fabricate(:topic, category: private_category, user: group_member)
post = Fabricate(:post, topic: topic)
- expect {
- PostAlerter.post_created(post)
- }.to add_notification(staged_member, :watching_category_or_tag)
- .and not_add_notification(staged_non_member, :watching_category_or_tag)
+ expect { PostAlerter.post_created(post) }.to add_notification(
+ staged_member,
+ :watching_category_or_tag,
+ ).and not_add_notification(staged_non_member, :watching_category_or_tag)
end
it "does not update existing unread notification" do
- CategoryUser.set_notification_level_for_category(user, CategoryUser.notification_levels[:watching], category.id)
+ CategoryUser.set_notification_level_for_category(
+ user,
+ CategoryUser.notification_levels[:watching],
+ category.id,
+ )
topic = Fabricate(:topic, category: category)
post = Fabricate(:post, topic: topic)
@@ -1478,10 +1680,11 @@ RSpec.describe PostAlerter do
post = Fabricate(:post, topic: topic)
level = TagUser.notification_levels[:watching]
TagUser.change(user.id, tag.id, level)
- events = DiscourseEvent.track_events do
- PostAlerter.post_created(post)
- end
- expect(events).to include(event_name: :before_create_notifications_for_users, params: [[user], post])
+ events = DiscourseEvent.track_events { PostAlerter.post_created(post) }
+ expect(events).to include(
+ event_name: :before_create_notifications_for_users,
+ params: [[user], post],
+ )
end
it "does not update existing unread notification" do
@@ -1509,7 +1712,7 @@ RSpec.describe PostAlerter do
topic = Fabricate(:topic, tags: [tag])
post = Fabricate(:post, topic: topic)
- tag_group = TagGroup.new(name: 'Only visible to group', tag_names: [tag.name])
+ tag_group = TagGroup.new(name: "Only visible to group", tag_names: [tag.name])
tag_group.permissions = [[group.id, TagGroupPermission.permission_types[:full]]]
tag_group.save!
@@ -1541,26 +1744,59 @@ RSpec.describe PostAlerter do
SiteSetting.tagging_enabled = true
Jobs.run_immediately!
TagUser.change(user.id, watched_tag.id, TagUser.notification_levels[:watching_first_post])
- TopicUser.change(Fabricate(:user).id, post.topic.id, notification_level: TopicUser.notification_levels[:watching])
+ TopicUser.change(
+ Fabricate(:user).id,
+ post.topic.id,
+ notification_level: TopicUser.notification_levels[:watching],
+ )
end
it "triggers a notification" do
- expect(user.notifications.where(notification_type: Notification.types[:watching_first_post]).count).to eq(0)
+ expect(
+ user
+ .notifications
+ .where(notification_type: Notification.types[:watching_first_post])
+ .count,
+ ).to eq(0)
- expect { PostRevisor.new(post).revise!(Fabricate(:user), tags: [other_tag.name, watched_tag.name]) }.to change { Notification.where(user_id: user.id).count }.by(1)
- expect(user.notifications.where(notification_type: Notification.types[:watching_first_post]).count).to eq(1)
+ expect {
+ PostRevisor.new(post).revise!(Fabricate(:user), tags: [other_tag.name, watched_tag.name])
+ }.to change { Notification.where(user_id: user.id).count }.by(1)
+ expect(
+ user
+ .notifications
+ .where(notification_type: Notification.types[:watching_first_post])
+ .count,
+ ).to eq(1)
- expect { PostRevisor.new(post).revise!(Fabricate(:user), tags: [watched_tag.name, other_tag.name]) }.not_to change { Notification.count }
- expect(user.notifications.where(notification_type: Notification.types[:watching_first_post]).count).to eq(1)
+ expect {
+ PostRevisor.new(post).revise!(Fabricate(:user), tags: [watched_tag.name, other_tag.name])
+ }.not_to change { Notification.count }
+ expect(
+ user
+ .notifications
+ .where(notification_type: Notification.types[:watching_first_post])
+ .count,
+ ).to eq(1)
end
it "doesn't trigger a notification if topic is unlisted" do
post.topic.update_column(:visible, false)
- expect(user.notifications.where(notification_type: Notification.types[:watching_first_post]).count).to eq(0)
+ expect(
+ user
+ .notifications
+ .where(notification_type: Notification.types[:watching_first_post])
+ .count,
+ ).to eq(0)
PostRevisor.new(post).revise!(Fabricate(:user), tags: [other_tag.name, watched_tag.name])
- expect(user.notifications.where(notification_type: Notification.types[:watching_first_post]).count).to eq(0)
+ expect(
+ user
+ .notifications
+ .where(notification_type: Notification.types[:watching_first_post])
+ .count,
+ ).to eq(0)
end
end
@@ -1576,9 +1812,21 @@ RSpec.describe PostAlerter do
SiteSetting.tagging_enabled = true
SiteSetting.pm_tags_allowed_for_groups = "1|2|3"
Jobs.run_immediately!
- TopicUser.change(user.id, post.topic.id, notification_level: TopicUser.notification_levels[:watching])
- TopicUser.change(staged.id, post.topic.id, notification_level: TopicUser.notification_levels[:watching])
- TopicUser.change(admin.id, post.topic.id, notification_level: TopicUser.notification_levels[:watching])
+ TopicUser.change(
+ user.id,
+ post.topic.id,
+ notification_level: TopicUser.notification_levels[:watching],
+ )
+ TopicUser.change(
+ staged.id,
+ post.topic.id,
+ notification_level: TopicUser.notification_levels[:watching],
+ )
+ TopicUser.change(
+ admin.id,
+ post.topic.id,
+ notification_level: TopicUser.notification_levels[:watching],
+ )
TagUser.change(staged.id, other_tag.id, TagUser.notification_levels[:watching])
TagUser.change(admin.id, other_tag3.id, TagUser.notification_levels[:watching])
post.topic.allowed_users << user
@@ -1596,7 +1844,7 @@ RSpec.describe PostAlerter do
end
context "with tag groups" do
- fab!(:tag) { Fabricate(:tag) }
+ fab!(:tag) { Fabricate(:tag) }
fab!(:user) { Fabricate(:user) }
fab!(:topic) { Fabricate(:topic, tags: [tag]) }
fab!(:post) { Fabricate(:post, topic: topic) }
@@ -1605,7 +1853,12 @@ RSpec.describe PostAlerter do
it "notifies a user who is watching a tag that does not belong to a tag group" do
TagUser.change(user.id, tag.id, TagUser.notification_levels[notification_level])
PostAlerter.post_created(post)
- expect(user.notifications.where(notification_type: Notification.types[notification_type]).count).to eq(1)
+ expect(
+ user
+ .notifications
+ .where(notification_type: Notification.types[notification_type])
+ .count,
+ ).to eq(1)
end
it "does not notify a user watching a tag with tag group permissions that he does not belong to" do
@@ -1615,7 +1868,12 @@ RSpec.describe PostAlerter do
PostAlerter.post_created(post)
- expect(user.notifications.where(notification_type: Notification.types[notification_type]).count).to eq(0)
+ expect(
+ user
+ .notifications
+ .where(notification_type: Notification.types[notification_type])
+ .count,
+ ).to eq(0)
end
it "notifies a user watching a tag with tag group permissions that he belongs to" do
@@ -1625,7 +1883,12 @@ RSpec.describe PostAlerter do
PostAlerter.post_created(post)
- expect(user.notifications.where(notification_type: Notification.types[notification_type]).count).to eq(1)
+ expect(
+ user
+ .notifications
+ .where(notification_type: Notification.types[notification_type])
+ .count,
+ ).to eq(1)
end
it "notifies a staff watching a tag with tag group permissions that he does not belong to" do
@@ -1638,7 +1901,12 @@ RSpec.describe PostAlerter do
PostAlerter.post_created(post)
- expect(user.notifications.where(notification_type: Notification.types[notification_type]).count).to eq(1)
+ expect(
+ user
+ .notifications
+ .where(notification_type: Notification.types[notification_type])
+ .count,
+ ).to eq(1)
end
end
@@ -1647,16 +1915,18 @@ RSpec.describe PostAlerter do
end
context "with :watching_first_post notification level" do
- include_examples "tag user with notification level", :watching_first_post, :watching_first_post
+ include_examples "tag user with notification level",
+ :watching_first_post,
+ :watching_first_post
end
end
end
- describe '#extract_linked_users' do
+ describe "#extract_linked_users" do
fab!(:post) { Fabricate(:post, topic: topic) }
fab!(:post2) { Fabricate(:post) }
- describe 'when linked post has been deleted' do
+ describe "when linked post has been deleted" do
let(:topic_link) do
TopicLink.create!(
url: "/t/#{topic.id}",
@@ -1665,29 +1935,29 @@ RSpec.describe PostAlerter do
link_post_id: nil,
post_id: post.id,
user: user,
- domain: 'test.com'
+ domain: "test.com",
)
end
- it 'should use the first post of the topic' do
+ it "should use the first post of the topic" do
topic_link
expect(PostAlerter.new.extract_linked_users(post.reload)).to eq([post2.user])
end
end
end
- describe '#notify_post_users' do
+ describe "#notify_post_users" do
fab!(:post) { Fabricate(:post, topic: topic) }
fab!(:last_editor) { Fabricate(:user) }
fab!(:tag) { Fabricate(:tag) }
fab!(:category) { Fabricate(:category) }
- it 'creates single edit notification when post is modified' do
+ it "creates single edit notification when post is modified" do
TopicUser.create!(
user_id: user.id,
topic_id: topic.id,
notification_level: TopicUser.notification_levels[:watching],
- last_read_post_number: post.post_number
+ last_read_post_number: post.post_number,
)
PostRevisor.new(post).revise!(last_editor, tags: [tag.name])
@@ -1700,23 +1970,29 @@ RSpec.describe PostAlerter do
expect(Notification.count).to eq(1)
end
- it 'creates posted notification when Sidekiq is slow' do
- CategoryUser.set_notification_level_for_category(user, CategoryUser.notification_levels[:watching], category.id)
-
- post = PostCreator.create!(
- Fabricate(:user),
- title: "one of my first topics",
- raw: "one of my first posts",
- category: category.id
+ it "creates posted notification when Sidekiq is slow" do
+ CategoryUser.set_notification_level_for_category(
+ user,
+ CategoryUser.notification_levels[:watching],
+ category.id,
)
+ post =
+ PostCreator.create!(
+ Fabricate(:user),
+ title: "one of my first topics",
+ raw: "one of my first posts",
+ category: category.id,
+ )
+
TopicUser.change(user, post.topic_id, last_read_post_number: post.post_number)
# Manually run job after the user read the topic to simulate a slow
# Sidekiq.
- job_args = Jobs::PostAlert.jobs[0]['args'][0]
- expect { Jobs::PostAlert.new.execute(job_args.with_indifferent_access) }
- .to change { Notification.count }.by(1)
+ job_args = Jobs::PostAlert.jobs[0]["args"][0]
+ expect { Jobs::PostAlert.new.execute(job_args.with_indifferent_access) }.to change {
+ Notification.count
+ }.by(1)
expect(Notification.last.notification_type).to eq(Notification.types[:posted])
end
@@ -1741,7 +2017,7 @@ RSpec.describe PostAlerter do
email_username: "discourse@example.com",
email_password: "password",
smtp_enabled: true,
- imap_enabled: true
+ imap_enabled: true,
)
end
@@ -1782,11 +2058,15 @@ RSpec.describe PostAlerter do
incoming_email_post = create_post_with_incoming
topic = incoming_email_post.topic
post = Fabricate(:post, topic: topic)
- expect { PostAlerter.new.after_save_post(post, true) }.to change { ActionMailer::Base.deliveries.size }.by(1)
+ expect { PostAlerter.new.after_save_post(post, true) }.to change {
+ ActionMailer::Base.deliveries.size
+ }.by(1)
email = ActionMailer::Base.deliveries.last
expect(email.from).to include(group.email_username)
- expect(email.to).to contain_exactly(topic.reload.topic_allowed_users.order(:created_at).first.user.email)
- expect(email.cc).to match_array(["bar@discourse.org", "jim@othersite.com"])
+ expect(email.to).to contain_exactly(
+ topic.reload.topic_allowed_users.order(:created_at).first.user.email,
+ )
+ expect(email.cc).to match_array(%w[bar@discourse.org jim@othersite.com])
expect(email.subject).to eq("Re: #{topic.title}")
end
@@ -1798,12 +2078,16 @@ RSpec.describe PostAlerter do
post = Fabricate(:post, topic: topic)
group.update!(smtp_enabled: false)
- expect { PostAlerter.new.after_save_post(post, true) }.to change { ActionMailer::Base.deliveries.size }.by(1)
+ expect { PostAlerter.new.after_save_post(post, true) }.to change {
+ ActionMailer::Base.deliveries.size
+ }.by(1)
email = ActionMailer::Base.deliveries.last
expect(email.from).to include(other_allowed_group.email_username)
- expect(email.to).to contain_exactly(topic.reload.topic_allowed_users.order(:created_at).first.user.email)
- expect(email.cc).to match_array(["bar@discourse.org", "jim@othersite.com"])
+ expect(email.to).to contain_exactly(
+ topic.reload.topic_allowed_users.order(:created_at).first.user.email,
+ )
+ expect(email.cc).to match_array(%w[bar@discourse.org jim@othersite.com])
expect(email.subject).to eq("Re: #{topic.title}")
end
@@ -1812,7 +2096,9 @@ RSpec.describe PostAlerter do
incoming_email_post = create_post_with_incoming
topic = incoming_email_post.topic
post = Fabricate(:post, topic: topic)
- expect { PostAlerter.new.after_save_post(post, true) }.not_to change { ActionMailer::Base.deliveries.size }
+ expect { PostAlerter.new.after_save_post(post, true) }.not_to change {
+ ActionMailer::Base.deliveries.size
+ }
end
it "does not send a group smtp email if SiteSetting.enable_smtp is false" do
@@ -1820,14 +2106,18 @@ RSpec.describe PostAlerter do
incoming_email_post = create_post_with_incoming
topic = incoming_email_post.topic
post = Fabricate(:post, topic: topic)
- expect { PostAlerter.new.after_save_post(post, true) }.not_to change { ActionMailer::Base.deliveries.size }
+ expect { PostAlerter.new.after_save_post(post, true) }.not_to change {
+ ActionMailer::Base.deliveries.size
+ }
end
it "does not send group smtp emails for a whisper" do
incoming_email_post = create_post_with_incoming
topic = incoming_email_post.topic
post = Fabricate(:post, topic: topic, post_type: Post.types[:whisper])
- expect { PostAlerter.new.after_save_post(post, true) }.not_to change { ActionMailer::Base.deliveries.size }
+ expect { PostAlerter.new.after_save_post(post, true) }.not_to change {
+ ActionMailer::Base.deliveries.size
+ }
end
it "sends the group smtp email job with a delay of personal_email_time_window_seconds" do
@@ -1842,9 +2132,9 @@ RSpec.describe PostAlerter do
group_id: group.id,
post_id: post.id,
email: topic.reload.topic_allowed_users.order(:created_at).first.user.email,
- cc_emails: ["bar@discourse.org", "jim@othersite.com"]
+ cc_emails: %w[bar@discourse.org jim@othersite.com],
},
- at: Time.zone.now + SiteSetting.personal_email_time_window_seconds.seconds
+ at: Time.zone.now + SiteSetting.personal_email_time_window_seconds.seconds,
)
end
@@ -1854,7 +2144,9 @@ RSpec.describe PostAlerter do
post = Fabricate(:post, topic: topic)
Fabricate(:incoming_email, post: post, topic: topic, is_auto_generated: true)
expect_not_enqueued_with(job: :group_smtp_email) do
- expect { PostAlerter.new.after_save_post(post, true) }.not_to change { ActionMailer::Base.deliveries.size }
+ expect { PostAlerter.new.after_save_post(post, true) }.not_to change {
+ ActionMailer::Base.deliveries.size
+ }
end
end
@@ -1867,7 +2159,11 @@ RSpec.describe PostAlerter do
group_user1 = Fabricate(:group_user, group: group)
group_user2 = Fabricate(:group_user, group: group)
- TopicUser.create(user: group_user1.user, notification_level: TopicUser.notification_levels[:watching], topic: topic)
+ TopicUser.create(
+ user: group_user1.user,
+ notification_level: TopicUser.notification_levels[:watching],
+ topic: topic,
+ )
post = Fabricate(:post, topic: topic.reload)
# Sends an email for:
@@ -1882,7 +2178,7 @@ RSpec.describe PostAlerter do
email = ActionMailer::Base.deliveries.first
expect(email.from).to eq([group.email_username])
expect(email.to).to contain_exactly("foo@discourse.org")
- expect(email.cc).to match_array(["bar@discourse.org", "jim@othersite.com"])
+ expect(email.cc).to match_array(%w[bar@discourse.org jim@othersite.com])
expect(email.subject).to eq("Re: #{topic.title}")
# The watching group user notification email
@@ -1927,15 +2223,15 @@ RSpec.describe PostAlerter do
}.to change {
User.count # the two new cc addresses have users created
}.by(2).and change {
- TopicAllowedUser.where(topic: topic).count # and they are added as topic allowed users
- }.by(2).and change {
- # but they are not sent emails because they were cc'd on an email, only jim@othersite.com
- # is emailed because he is a topic allowed user cc'd on the _original_ email and he is not
- # the one creating the post, and foo@discourse.org, who is the OP of the topic
- ActionMailer::Base.deliveries.size
- }.by(1).and change {
- Notification.count # and they are still sent their normal discourse notification
- }.by(2)
+ TopicAllowedUser.where(topic: topic).count # and they are added as topic allowed users
+ }.by(2).and change {
+ # but they are not sent emails because they were cc'd on an email, only jim@othersite.com
+ # is emailed because he is a topic allowed user cc'd on the _original_ email and he is not
+ # the one creating the post, and foo@discourse.org, who is the OP of the topic
+ ActionMailer::Base.deliveries.size
+ }.by(1).and change {
+ Notification.count # and they are still sent their normal discourse notification
+ }.by(2)
email = ActionMailer::Base.deliveries.last
@@ -1978,15 +2274,15 @@ RSpec.describe PostAlerter do
}.to change {
User.count # the two new cc addresses have users created
}.by(2).and change {
- TopicAllowedUser.where(topic: topic).count # and they are added as topic allowed users
- }.by(2).and change {
- # but they are not sent emails because they were cc'd on an email, only jim@othersite.com
- # is emailed because he is a topic allowed user cc'd on the _original_ email and he is not
- # the one creating the post
- ActionMailer::Base.deliveries.size
- }.by(1).and change {
- Notification.count # and they are still sent their normal discourse notification
- }.by(2)
+ TopicAllowedUser.where(topic: topic).count # and they are added as topic allowed users
+ }.by(2).and change {
+ # but they are not sent emails because they were cc'd on an email, only jim@othersite.com
+ # is emailed because he is a topic allowed user cc'd on the _original_ email and he is not
+ # the one creating the post
+ ActionMailer::Base.deliveries.size
+ }.by(1).and change {
+ Notification.count # and they are still sent their normal discourse notification
+ }.by(2)
email = ActionMailer::Base.deliveries.last
@@ -2044,30 +2340,32 @@ RSpec.describe PostAlerter do
}.to change {
User.count # the two new cc addresses have users created
}.by(2).and change {
- TopicAllowedUser.where(topic: topic).count # and they are added as topic allowed users
- }.by(2).and not_change {
- # but they are not sent emails because they were cc'd on an email.
- # no group smtp message is sent because the OP is not sent an email,
- # they made this post.
- ActionMailer::Base.deliveries.size
- }.and change {
- Notification.count # and they are still sent their normal discourse notification
- }.by(2)
+ TopicAllowedUser.where(topic: topic).count # and they are added as topic allowed users
+ }.by(2).and not_change {
+ # but they are not sent emails because they were cc'd on an email.
+ # no group smtp message is sent because the OP is not sent an email,
+ # they made this post.
+ ActionMailer::Base.deliveries.size
+ }.and change {
+ Notification.count # and they are still sent their normal discourse notification
+ }.by(2)
last_email = ActionMailer::Base.deliveries.last
expect(email).to eq(last_email)
end
end
- describe 'storing custom data' do
- let(:custom_data) { 'custom_string' }
+ describe "storing custom data" do
+ let(:custom_data) { "custom_string" }
- it 'stores custom data inside a notification' do
+ it "stores custom data inside a notification" do
PostAlerter.new.create_notification(
admin,
Notification.types[:liked],
post,
- custom_data: { custom_key: custom_data }
+ custom_data: {
+ custom_key: custom_data,
+ },
)
liked_notification = Notification.where(notification_type: Notification.types[:liked]).last
@@ -2079,11 +2377,20 @@ RSpec.describe PostAlerter do
it "does not create notifications for PMs if not invited" do
SiteSetting.pm_tags_allowed_for_groups = "#{Group::AUTO_GROUPS[:everyone]}"
watching_first_post_tag = Fabricate(:tag)
- TagUser.change(admin.id, watching_first_post_tag.id, TagUser.notification_levels[:watching_first_post])
+ TagUser.change(
+ admin.id,
+ watching_first_post_tag.id,
+ TagUser.notification_levels[:watching_first_post],
+ )
watching_tag = Fabricate(:tag)
TagUser.change(admin.id, watching_tag.id, TagUser.notification_levels[:watching])
- post = create_post(tags: [watching_first_post_tag.name, watching_tag.name], archetype: Archetype.private_message, target_usernames: "#{evil_trout.username}")
+ post =
+ create_post(
+ tags: [watching_first_post_tag.name, watching_tag.name],
+ archetype: Archetype.private_message,
+ target_usernames: "#{evil_trout.username}",
+ )
expect { PostAlerter.new.after_save_post(post, true) }.to change { Notification.count }.by(1)
notification = Notification.last
@@ -2101,7 +2408,11 @@ RSpec.describe PostAlerter do
category.id,
)
watching_first_post_tag = Fabricate(:tag)
- TagUser.change(user.id, watching_first_post_tag.id, TagUser.notification_levels[:watching_first_post])
+ TagUser.change(
+ user.id,
+ watching_first_post_tag.id,
+ TagUser.notification_levels[:watching_first_post],
+ )
watching_tag = Fabricate(:tag)
TagUser.change(user.id, watching_tag.id, TagUser.notification_levels[:watching])
@@ -2115,20 +2426,18 @@ RSpec.describe PostAlerter do
expect(notification.post_number).to eq(1)
end
- it 'triggers all discourse events' do
- expected_events = [
- :post_alerter_before_mentions,
- :post_alerter_before_replies,
- :post_alerter_before_quotes,
- :post_alerter_before_linked,
- :post_alerter_before_post,
- :post_alerter_before_first_post,
- :post_alerter_after_save_post,
+ it "triggers all discourse events" do
+ expected_events = %i[
+ post_alerter_before_mentions
+ post_alerter_before_replies
+ post_alerter_before_quotes
+ post_alerter_before_linked
+ post_alerter_before_post
+ post_alerter_before_first_post
+ post_alerter_after_save_post
]
- events = DiscourseEvent.track_events do
- PostAlerter.new.after_save_post(post, true)
- end
+ events = DiscourseEvent.track_events { PostAlerter.new.after_save_post(post, true) }
# Expect all the notification events are called
# There are some other events triggered from outside after_save_post
diff --git a/spec/services/post_bookmarkable_spec.rb b/spec/services/post_bookmarkable_spec.rb
index ecba854e04b..94fed97f9af 100644
--- a/spec/services/post_bookmarkable_spec.rb
+++ b/spec/services/post_bookmarkable_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-require 'rails_helper'
+require "rails_helper"
RSpec.describe PostBookmarkable do
fab!(:user) { Fabricate(:user) }
@@ -9,7 +9,9 @@ RSpec.describe PostBookmarkable do
let!(:post1) { Fabricate(:post) }
let!(:post2) { Fabricate(:post) }
- let!(:bookmark1) { Fabricate(:bookmark, user: user, bookmarkable: post1, name: "something i gotta do") }
+ let!(:bookmark1) do
+ Fabricate(:bookmark, user: user, bookmarkable: post1, name: "something i gotta do")
+ end
let!(:bookmark2) { Fabricate(:bookmark, user: user, bookmarkable: post2) }
let!(:bookmark3) { Fabricate(:bookmark) }
let!(:topic_user1) { Fabricate(:topic_user, user: user, topic: post1.topic) }
@@ -19,7 +21,9 @@ RSpec.describe PostBookmarkable do
describe "#perform_list_query" do
it "returns all the user's bookmarks" do
- expect(subject.perform_list_query(user, guardian).map(&:id)).to match_array([bookmark1.id, bookmark2.id])
+ expect(subject.perform_list_query(user, guardian).map(&:id)).to match_array(
+ [bookmark1.id, bookmark2.id],
+ )
end
it "does not return bookmarks for posts where the user does not have access to the topic category" do
@@ -34,13 +38,17 @@ RSpec.describe PostBookmarkable do
end
describe "#perform_search_query" do
- before do
- SearchIndexer.enable
- end
+ before { SearchIndexer.enable }
it "returns bookmarks that match by name" do
ts_query = Search.ts_query(term: "gotta", ts_config: "simple")
- expect(subject.perform_search_query(subject.perform_list_query(user, guardian), "%gotta%", ts_query).map(&:id)).to match_array([bookmark1.id])
+ expect(
+ subject.perform_search_query(
+ subject.perform_list_query(user, guardian),
+ "%gotta%",
+ ts_query,
+ ).map(&:id),
+ ).to match_array([bookmark1.id])
end
it "returns bookmarks that match by post search data (topic title or post content)" do
@@ -48,13 +56,31 @@ RSpec.describe PostBookmarkable do
post2.topic.update(title: "a great topic title")
ts_query = Search.ts_query(term: "post content", ts_config: "simple")
- expect(subject.perform_search_query(subject.perform_list_query(user, guardian), "%post content%", ts_query).map(&:id)).to match_array([bookmark2.id])
+ expect(
+ subject.perform_search_query(
+ subject.perform_list_query(user, guardian),
+ "%post content%",
+ ts_query,
+ ).map(&:id),
+ ).to match_array([bookmark2.id])
ts_query = Search.ts_query(term: "great topic", ts_config: "simple")
- expect(subject.perform_search_query(subject.perform_list_query(user, guardian), "%great topic%", ts_query).map(&:id)).to match_array([bookmark2.id])
+ expect(
+ subject.perform_search_query(
+ subject.perform_list_query(user, guardian),
+ "%great topic%",
+ ts_query,
+ ).map(&:id),
+ ).to match_array([bookmark2.id])
ts_query = Search.ts_query(term: "blah", ts_config: "simple")
- expect(subject.perform_search_query(subject.perform_list_query(user, guardian), "%blah%", ts_query).map(&:id)).to eq([])
+ expect(
+ subject.perform_search_query(
+ subject.perform_list_query(user, guardian),
+ "%blah%",
+ ts_query,
+ ).map(&:id),
+ ).to eq([])
end
end
@@ -74,7 +100,9 @@ RSpec.describe PostBookmarkable do
describe "#reminder_handler" do
it "creates a notification for the user with the correct details" do
- expect { subject.send_reminder_notification(bookmark1) }.to change { Notification.count }.by(1)
+ expect { subject.send_reminder_notification(bookmark1) }.to change { Notification.count }.by(
+ 1,
+ )
notif = user.notifications.last
expect(notif.notification_type).to eq(Notification.types[:bookmark_reminder])
expect(notif.topic_id).to eq(bookmark1.bookmarkable.topic_id)
@@ -85,8 +113,8 @@ RSpec.describe PostBookmarkable do
bookmarkable_url: bookmark1.bookmarkable.url,
display_username: bookmark1.user.username,
bookmark_name: bookmark1.name,
- bookmark_id: bookmark1.id
- }.to_json
+ bookmark_id: bookmark1.id,
+ }.to_json,
)
end
end
diff --git a/spec/services/post_owner_changer_spec.rb b/spec/services/post_owner_changer_spec.rb
index c8511237118..70eb1bb3808 100644
--- a/spec/services/post_owner_changer_spec.rb
+++ b/spec/services/post_owner_changer_spec.rb
@@ -11,13 +11,23 @@ RSpec.describe PostOwnerChanger do
it "raises an error with a parameter missing" do
expect {
- PostOwnerChanger.new(post_ids: [p1.id], topic_id: topic.id, new_owner: nil, acting_user: editor)
+ PostOwnerChanger.new(
+ post_ids: [p1.id],
+ topic_id: topic.id,
+ new_owner: nil,
+ acting_user: editor,
+ )
}.to raise_error(ArgumentError, /new_owner/)
end
it "calls PostRevisor" do
PostRevisor.any_instance.expects(:revise!)
- PostOwnerChanger.new(post_ids: [p1.id], topic_id: topic.id, new_owner: user_a, acting_user: editor).change_owner!
+ PostOwnerChanger.new(
+ post_ids: [p1.id],
+ topic_id: topic.id,
+ new_owner: user_a,
+ acting_user: editor,
+ ).change_owner!
end
it "changes the user" do
@@ -31,7 +41,12 @@ RSpec.describe PostOwnerChanger do
expect(p1.topic.like_count).to eq(1)
freeze_time(now)
- PostOwnerChanger.new(post_ids: [p1.id], topic_id: topic.id, new_owner: user_a, acting_user: editor).change_owner!
+ PostOwnerChanger.new(
+ post_ids: [p1.id],
+ topic_id: topic.id,
+ new_owner: user_a,
+ acting_user: editor,
+ ).change_owner!
p1.reload
expect(p1.topic.like_count).to eq(0)
expect(p1.topic.bumped_at).to eq_time(bumped_at)
@@ -41,16 +56,28 @@ RSpec.describe PostOwnerChanger do
end
it "changes multiple posts" do
- PostOwnerChanger.new(post_ids: [p1.id, p2.id], topic_id: topic.id, new_owner: user_a, acting_user: editor).change_owner!
- p1.reload; p2.reload
+ PostOwnerChanger.new(
+ post_ids: [p1.id, p2.id],
+ topic_id: topic.id,
+ new_owner: user_a,
+ acting_user: editor,
+ ).change_owner!
+ p1.reload
+ p2.reload
expect(p1.user).not_to eq(nil)
expect(p1.user).to eq(user_a)
expect(p1.user).to eq(p2.user)
end
it "ignores posts in other topics" do
- PostOwnerChanger.new(post_ids: [p1.id, p3.id], topic_id: topic.id, new_owner: user_a, acting_user: editor).change_owner!
- p1.reload; p3.reload
+ PostOwnerChanger.new(
+ post_ids: [p1.id, p3.id],
+ topic_id: topic.id,
+ new_owner: user_a,
+ acting_user: editor,
+ ).change_owner!
+ p1.reload
+ p3.reload
expect(p1.user).to eq(user_a)
expect(p3.topic_id).not_to eq(p1.topic_id)
@@ -58,22 +85,39 @@ RSpec.describe PostOwnerChanger do
end
it "skips creating new post revision if skip_revision is true" do
- PostOwnerChanger.new(post_ids: [p1.id, p2.id], topic_id: topic.id, new_owner: user_a, acting_user: editor, skip_revision: true).change_owner!
- p1.reload; p2.reload
+ PostOwnerChanger.new(
+ post_ids: [p1.id, p2.id],
+ topic_id: topic.id,
+ new_owner: user_a,
+ acting_user: editor,
+ skip_revision: true,
+ ).change_owner!
+ p1.reload
+ p2.reload
expect(p1.revisions.size).to eq(0)
expect(p2.revisions.size).to eq(0)
end
it "changes the user even when the post does not pass validation" do
p1.update_attribute(:raw, "foo")
- PostOwnerChanger.new(post_ids: [p1.id], topic_id: topic.id, new_owner: user_a, acting_user: editor).change_owner!
+ PostOwnerChanger.new(
+ post_ids: [p1.id],
+ topic_id: topic.id,
+ new_owner: user_a,
+ acting_user: editor,
+ ).change_owner!
expect(p1.reload.user).to eq(user_a)
end
it "changes the user even when the topic does not pass validation" do
topic.update_column(:title, "short")
- PostOwnerChanger.new(post_ids: [p1.id], topic_id: topic.id, new_owner: user_a, acting_user: editor).change_owner!
+ PostOwnerChanger.new(
+ post_ids: [p1.id],
+ topic_id: topic.id,
+ new_owner: user_a,
+ acting_user: editor,
+ ).change_owner!
expect(p1.reload.user).to eq(user_a)
end
@@ -81,12 +125,22 @@ RSpec.describe PostOwnerChanger do
p4 = Fabricate(:post, topic: topic, reply_to_post_number: p2.post_number)
PostDestroyer.new(editor, p4).destroy
- PostOwnerChanger.new(post_ids: [p4.id], topic_id: topic.id, new_owner: user_a, acting_user: editor).change_owner!
+ PostOwnerChanger.new(
+ post_ids: [p4.id],
+ topic_id: topic.id,
+ new_owner: user_a,
+ acting_user: editor,
+ ).change_owner!
expect(p4.reload.user).to eq(user_a)
end
it "sets 'posted' for TopicUser to true" do
- PostOwnerChanger.new(post_ids: [p1.id], topic_id: topic.id, new_owner: user_a, acting_user: editor).change_owner!
+ PostOwnerChanger.new(
+ post_ids: [p1.id],
+ topic_id: topic.id,
+ new_owner: user_a,
+ acting_user: editor,
+ ).change_owner!
expect(TopicUser.find_by(topic_id: topic.id, user_id: user_a.id).posted).to eq(true)
end
@@ -94,13 +148,23 @@ RSpec.describe PostOwnerChanger do
let(:p4) { create_post(post_number: 2, topic: topic) }
it "'watching' if the first post gets a new owner" do
- PostOwnerChanger.new(post_ids: [p1.id], topic_id: topic.id, new_owner: user_a, acting_user: editor).change_owner!
+ PostOwnerChanger.new(
+ post_ids: [p1.id],
+ topic_id: topic.id,
+ new_owner: user_a,
+ acting_user: editor,
+ ).change_owner!
tu = TopicUser.find_by(user_id: user_a.id, topic_id: topic.id)
expect(tu.notification_level).to eq(3)
end
it "'tracking' if other than the first post gets a new owner" do
- PostOwnerChanger.new(post_ids: [p4.id], topic_id: topic.id, new_owner: user_a, acting_user: editor).change_owner!
+ PostOwnerChanger.new(
+ post_ids: [p4.id],
+ topic_id: topic.id,
+ new_owner: user_a,
+ acting_user: editor,
+ ).change_owner!
tu = TopicUser.find_by(user_id: user_a.id, topic_id: topic.id)
expect(tu.notification_level).to eq(2)
end
@@ -125,10 +189,22 @@ RSpec.describe PostOwnerChanger do
first_post_created_at: p2.created_at,
)
- UserAction.create!(action_type: UserAction::NEW_TOPIC, user_id: p1user.id, acting_user_id: p1user.id,
- target_post_id: -1, target_topic_id: p1.topic_id, created_at: p1.created_at)
- UserAction.create!(action_type: UserAction::REPLY, user_id: p2user.id, acting_user_id: p2user.id,
- target_post_id: p2.id, target_topic_id: p2.topic_id, created_at: p2.created_at)
+ UserAction.create!(
+ action_type: UserAction::NEW_TOPIC,
+ user_id: p1user.id,
+ acting_user_id: p1user.id,
+ target_post_id: -1,
+ target_topic_id: p1.topic_id,
+ created_at: p1.created_at,
+ )
+ UserAction.create!(
+ action_type: UserAction::REPLY,
+ user_id: p2user.id,
+ acting_user_id: p2user.id,
+ target_post_id: p2.id,
+ target_topic_id: p2.topic_id,
+ created_at: p2.created_at,
+ )
UserActionManager.enable
end
@@ -138,7 +214,7 @@ RSpec.describe PostOwnerChanger do
post_ids: [p1.id, p2.id],
topic_id: topic.id,
new_owner: user_a,
- acting_user: editor
+ acting_user: editor,
).change_owner!
end
@@ -148,7 +224,9 @@ RSpec.describe PostOwnerChanger do
change_owners
- p1user.reload; p2user.reload; user_a.reload
+ p1user.reload
+ p2user.reload
+ user_a.reload
expect(p1user.topic_count).to eq(0)
expect(p1user.post_count).to eq(0)
expect(p2user.topic_count).to eq(0)
@@ -172,13 +250,14 @@ RSpec.describe PostOwnerChanger do
end
it "handles whispers" do
- whisper = PostCreator.new(
- editor,
- topic_id: p1.topic_id,
- reply_to_post_number: 1,
- post_type: Post.types[:whisper],
- raw: 'this is a whispered reply'
- ).create
+ whisper =
+ PostCreator.new(
+ editor,
+ topic_id: p1.topic_id,
+ reply_to_post_number: 1,
+ post_type: Post.types[:whisper],
+ raw: "this is a whispered reply",
+ ).create
user_stat = editor.user_stat
@@ -187,18 +266,13 @@ RSpec.describe PostOwnerChanger do
post_ids: [whisper.id],
topic_id: topic.id,
new_owner: Fabricate(:admin),
- acting_user: editor
+ acting_user: editor,
).change_owner!
}.to_not change { user_stat.reload.post_count }
end
- context 'with private message topic' do
- let(:pm) do
- create_post(
- archetype: 'private_message',
- target_usernames: [p2user.username]
- )
- end
+ context "with private message topic" do
+ let(:pm) { create_post(archetype: "private_message", target_usernames: [p2user.username]) }
let(:pm_poster) { pm.user }
it "should update users' counts" do
@@ -209,7 +283,7 @@ RSpec.describe PostOwnerChanger do
post_ids: [pm.id],
topic_id: pm.topic_id,
new_owner: user_a,
- acting_user: editor
+ acting_user: editor,
).change_owner!
}.to_not change { pm_poster.user_stat.post_count }
@@ -239,11 +313,29 @@ RSpec.describe PostOwnerChanger do
end
it "updates reply_to_user_id" do
- p4 = Fabricate(:post, topic: topic, reply_to_post_number: p1.post_number, reply_to_user_id: p1.user_id)
- p5 = Fabricate(:post, topic: topic, reply_to_post_number: p2.post_number, reply_to_user_id: p2.user_id)
+ p4 =
+ Fabricate(
+ :post,
+ topic: topic,
+ reply_to_post_number: p1.post_number,
+ reply_to_user_id: p1.user_id,
+ )
+ p5 =
+ Fabricate(
+ :post,
+ topic: topic,
+ reply_to_post_number: p2.post_number,
+ reply_to_user_id: p2.user_id,
+ )
- PostOwnerChanger.new(post_ids: [p1.id], topic_id: topic.id, new_owner: user_a, acting_user: editor).change_owner!
- p4.reload; p5.reload
+ PostOwnerChanger.new(
+ post_ids: [p1.id],
+ topic_id: topic.id,
+ new_owner: user_a,
+ acting_user: editor,
+ ).change_owner!
+ p4.reload
+ p5.reload
expect(p4.reply_to_user_id).to eq(user_a.id)
expect(p5.reply_to_user_id).to eq(p2.user_id)
diff --git a/spec/services/push_notification_pusher_spec.rb b/spec/services/push_notification_pusher_spec.rb
index 3ea2e52f893..e55bbd0ff0c 100644
--- a/spec/services/push_notification_pusher_spec.rb
+++ b/spec/services/push_notification_pusher_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
RSpec.describe PushNotificationPusher do
-
it "returns badges url by default" do
expect(PushNotificationPusher.get_badge).to eq("/assets/push-notifications/discourse.png")
end
@@ -10,8 +9,7 @@ RSpec.describe PushNotificationPusher do
upload = Fabricate(:upload)
SiteSetting.push_notifications_icon = upload
- expect(PushNotificationPusher.get_badge)
- .to eq(UrlHelper.absolute(upload.url))
+ expect(PushNotificationPusher.get_badge).to eq(UrlHelper.absolute(upload.url))
end
context "with user" do
@@ -31,14 +29,17 @@ RSpec.describe PushNotificationPusher do
end
def execute_push(notification_type: 1)
- PushNotificationPusher.push(user, {
- topic_title: 'Topic',
- username: 'system',
- excerpt: 'description',
- topic_id: 1,
- post_url: "https://example.com/t/1/2",
- notification_type: notification_type
- })
+ PushNotificationPusher.push(
+ user,
+ {
+ topic_title: "Topic",
+ username: "system",
+ excerpt: "description",
+ topic_id: 1,
+ post_url: "https://example.com/t/1/2",
+ notification_type: notification_type,
+ },
+ )
end
it "correctly guesses an image if missing" do
@@ -53,13 +54,18 @@ RSpec.describe PushNotificationPusher do
it "sends notification in user's locale" do
SiteSetting.allow_user_locale = true
- user.update!(locale: 'pt_BR')
+ user.update!(locale: "pt_BR")
- TranslationOverride.upsert!("pt_BR", "discourse_push_notifications.popup.mentioned", "pt_BR notification")
+ TranslationOverride.upsert!(
+ "pt_BR",
+ "discourse_push_notifications.popup.mentioned",
+ "pt_BR notification",
+ )
- WebPush.expects(:payload_send).with do |*args|
- JSON.parse(args.first[:message])["title"] == "pt_BR notification"
- end.once
+ WebPush
+ .expects(:payload_send)
+ .with { |*args| JSON.parse(args.first[:message])["title"] == "pt_BR notification" }
+ .once
create_subscription
execute_push
@@ -94,20 +100,48 @@ RSpec.describe PushNotificationPusher do
end
it "deletes invalid subscriptions during send" do
- missing_endpoint = PushSubscription.create!(user_id: user.id, data:
- { p256dh: "public ECDH key", keys: { auth: "private ECDH key" } }.to_json)
+ missing_endpoint =
+ PushSubscription.create!(
+ user_id: user.id,
+ data: { p256dh: "public ECDH key", keys: { auth: "private ECDH key" } }.to_json,
+ )
- missing_p256dh = PushSubscription.create!(user_id: user.id, data:
- { endpoint: "endpoint 1", keys: { auth: "private ECDH key" } }.to_json)
+ missing_p256dh =
+ PushSubscription.create!(
+ user_id: user.id,
+ data: { endpoint: "endpoint 1", keys: { auth: "private ECDH key" } }.to_json,
+ )
- missing_auth = PushSubscription.create!(user_id: user.id, data:
- { endpoint: "endpoint 2", keys: { p256dh: "public ECDH key" } }.to_json)
+ missing_auth =
+ PushSubscription.create!(
+ user_id: user.id,
+ data: { endpoint: "endpoint 2", keys: { p256dh: "public ECDH key" } }.to_json,
+ )
- valid_subscription = PushSubscription.create!(user_id: user.id, data:
- { endpoint: "endpoint 3", keys: { p256dh: "public ECDH key", auth: "private ECDH key" } }.to_json)
+ valid_subscription =
+ PushSubscription.create!(
+ user_id: user.id,
+ data: {
+ endpoint: "endpoint 3",
+ keys: {
+ p256dh: "public ECDH key",
+ auth: "private ECDH key",
+ },
+ }.to_json,
+ )
- expect(PushSubscription.where(user_id: user.id)).to contain_exactly(missing_endpoint, missing_p256dh, missing_auth, valid_subscription)
- WebPush.expects(:payload_send).with(has_entries(endpoint: "endpoint 3", p256dh: "public ECDH key", auth: "private ECDH key")).once
+ expect(PushSubscription.where(user_id: user.id)).to contain_exactly(
+ missing_endpoint,
+ missing_p256dh,
+ missing_auth,
+ valid_subscription,
+ )
+ WebPush
+ .expects(:payload_send)
+ .with(
+ has_entries(endpoint: "endpoint 3", p256dh: "public ECDH key", auth: "private ECDH key"),
+ )
+ .once
execute_push
diff --git a/spec/services/random_topic_selector_spec.rb b/spec/services/random_topic_selector_spec.rb
index ca37e8ba07d..2e4bcc3343e 100644
--- a/spec/services/random_topic_selector_spec.rb
+++ b/spec/services/random_topic_selector_spec.rb
@@ -1,15 +1,12 @@
# frozen_string_literal: true
RSpec.describe RandomTopicSelector do
-
- it 'can correctly use cache' do
+ it "can correctly use cache" do
key = RandomTopicSelector.cache_key
Discourse.redis.del key
- 4.times do |t|
- Discourse.redis.rpush key, t
- end
+ 4.times { |t| Discourse.redis.rpush key, t }
expect(RandomTopicSelector.next(0)).to eq([])
expect(RandomTopicSelector.next(2)).to eq([0, 1])
@@ -22,8 +19,8 @@ RSpec.describe RandomTopicSelector do
expect(RandomTopicSelector.next(2)).to eq([])
end
- it 'can correctly backfill' do
- category = Fabricate(:category, sort_order: 'op_likes')
+ it "can correctly backfill" do
+ category = Fabricate(:category, sort_order: "op_likes")
t1 = Fabricate(:topic, category_id: category.id)
_t2 = Fabricate(:topic, category_id: category.id, visible: false)
_t3 = Fabricate(:topic, category_id: category.id, deleted_at: 1.minute.ago)
diff --git a/spec/services/search_indexer_spec.rb b/spec/services/search_indexer_spec.rb
index b02d7a530e3..de52cbb7228 100644
--- a/spec/services/search_indexer_spec.rb
+++ b/spec/services/search_indexer_spec.rb
@@ -3,16 +3,12 @@
RSpec.describe SearchIndexer do
let(:post_id) { 99 }
- before do
- SearchIndexer.enable
- end
+ before { SearchIndexer.enable }
- after do
- SearchIndexer.disable
- end
+ after { SearchIndexer.disable }
- it 'correctly indexes chinese' do
- SiteSetting.default_locale = 'zh_CN'
+ it "correctly indexes chinese" do
+ SiteSetting.default_locale = "zh_CN"
data = "你好世界"
SearchIndexer.update_posts_index(
@@ -21,7 +17,7 @@ RSpec.describe SearchIndexer do
category_name: "",
topic_tags: "",
cooked: data,
- private_message: false
+ private_message: false,
)
post_search_data = PostSearchData.find_by(post_id: post_id)
@@ -30,42 +26,48 @@ RSpec.describe SearchIndexer do
expect(post_search_data.search_data).to eq("'世界':2 '你好':1")
end
- it 'extract youtube title' do
- html = "
"
+ it "extract youtube title" do
+ html =
+ "
"
scrubbed = SearchIndexer::HtmlScrubber.scrub(html)
- expect(scrubbed).to eq("Metallica Mixer Explains Missing Bass on 'And Justice for All' [Exclusive]")
+ expect(scrubbed).to eq(
+ "Metallica Mixer Explains Missing Bass on 'And Justice for All' [Exclusive]",
+ )
end
- it 'extract a link' do
+ it "extract a link" do
html = "link "
scrubbed = SearchIndexer::HtmlScrubber.scrub(html)
expect(scrubbed).to eq("http://meta.discourse.org/ link")
end
- it 'ignores autogenerated link anchors' do
+ it "ignores autogenerated link anchors" do
html = "something special "
scrubbed = SearchIndexer::HtmlScrubber.scrub(html)
expect(scrubbed).to eq("something special")
end
- it 'extracts @username from mentions' do
- html = '@狮子 @foo
'
+ it "extracts @username from mentions" do
+ html =
+ '@狮子 @foo
'
scrubbed = SearchIndexer::HtmlScrubber.scrub(html)
- expect(scrubbed).to eq('@狮子 @foo')
+ expect(scrubbed).to eq("@狮子 @foo")
end
- it 'extracts @groupname from group mentions' do
- html = '@автомобилист
'
+ it "extracts @groupname from group mentions" do
+ html =
+ '@автомобилист
'
scrubbed = SearchIndexer::HtmlScrubber.scrub(html)
- expect(scrubbed).to eq('@автомобилист')
+ expect(scrubbed).to eq("@автомобилист")
end
- it 'extracts emoji name from emoji image' do
+ it "extracts emoji name from emoji image" do
emoji = Emoji["wink"]
- html = %Q|" * Nokogiri::Gumbo::DEFAULT_MAX_TREE_DEPTH)
SearchIndexer.update_posts_index(
post_id: post.id,
topic_title: post.topic.title,
category_name: post.topic.category&.name,
- topic_tags: post.topic.tags.map(&:name).join(' '),
+ topic_tags: post.topic.tags.map(&:name).join(" "),
cooked: post.cooked,
- private_message: post.topic.private_message?
+ private_message: post.topic.private_message?,
)
end
- it 'should not index posts with empty raw' do
+ it "should not index posts with empty raw" do
expect do
post = Fabricate.build(:post, raw: "", post_type: Post.types[:small_action])
post.save!(validate: false)
@@ -162,33 +167,31 @@ RSpec.describe SearchIndexer do
post.rebake!
post.reload
- expect(post.post_search_data.raw_data).to eq(
- "https://meta.discourse.org/some.png"
- )
+ expect(post.post_search_data.raw_data).to eq("https://meta.discourse.org/some.png")
expect(post.post_search_data.search_data).to eq(
- "'/some.png':12 'discourse.org':11 'meta.discourse.org':11 'meta.discourse.org/some.png':10 'org':11 'test':8A 'titl':4A 'uncategor':9B"
+ "'/some.png':12 'discourse.org':11 'meta.discourse.org':11 'meta.discourse.org/some.png':10 'org':11 'test':8A 'titl':4A 'uncategor':9B",
)
end
- it 'should not tokenize versions' do
- post.update!(raw: '123.223')
+ it "should not tokenize versions" do
+ post.update!(raw: "123.223")
expect(post.post_search_data.search_data).to eq(
- "'123.223':10 'test':8A 'titl':4A 'uncategor':9B"
+ "'123.223':10 'test':8A 'titl':4A 'uncategor':9B",
)
- post.update!(raw: '15.2.231.423')
+ post.update!(raw: "15.2.231.423")
post.reload
expect(post.post_search_data.search_data).to eq(
- "'15.2.231.423':10 'test':8A 'titl':4A 'uncategor':9B"
+ "'15.2.231.423':10 'test':8A 'titl':4A 'uncategor':9B",
)
end
- it 'should tokenize host of a URL and removes query string' do
- category = Fabricate(:category, name: 'awesome category')
- topic = Fabricate(:topic, category: category, title: 'this is a test topic')
+ it "should tokenize host of a URL and removes query string" do
+ category = Fabricate(:category, name: "awesome category")
+ topic = Fabricate(:topic, category: category, title: "this is a test topic")
post = Fabricate(:post, topic: topic, raw: <<~RAW)
a https://abc.com?bob=1, http://efg.com.au?bill=1 b hij.net/xyz=1
@@ -205,20 +208,22 @@ RSpec.describe SearchIndexer do
# more context to say "hey, this part of ... was a guess by autolinker.
# A blanket treating of non-urls without this logic is risky.
expect(post.post_search_data.raw_data).to eq(
- "a https://abc.com , http://efg.com.au b http://hij.net/xyz=1 hij.net/xyz=1 http://www.klm.net/ www.klm.net/?IGNORE=1 http://abc.de.nop.co.uk test"
+ "a https://abc.com , http://efg.com.au b http://hij.net/xyz=1 hij.net/xyz=1 http://www.klm.net/ www.klm.net/?IGNORE=1 http://abc.de.nop.co.uk test",
)
expect(post.post_search_data.search_data).to eq(
- "'/?ignore=1':21 '/xyz=1':14,17 'abc.com':9 'abc.de.nop.co.uk':22 'au':10 'awesom':6B 'b':11 'categori':7B 'co.uk':22 'com':9 'com.au':10 'de.nop.co.uk':22 'efg.com.au':10 'hij.net':13,16 'hij.net/xyz=1':12,15 'klm.net':18,20 'net':13,16,18,20 'nop.co.uk':22 'test':4A,23 'topic':5A 'uk':22 'www.klm.net':18,20 'www.klm.net/?ignore=1':19"
+ "'/?ignore=1':21 '/xyz=1':14,17 'abc.com':9 'abc.de.nop.co.uk':22 'au':10 'awesom':6B 'b':11 'categori':7B 'co.uk':22 'com':9 'com.au':10 'de.nop.co.uk':22 'efg.com.au':10 'hij.net':13,16 'hij.net/xyz=1':12,15 'klm.net':18,20 'net':13,16,18,20 'nop.co.uk':22 'test':4A,23 'topic':5A 'uk':22 'www.klm.net':18,20 'www.klm.net/?ignore=1':19",
)
end
- it 'should not include lightbox in search' do
+ it "should not include lightbox in search" do
Jobs.run_immediately!
SiteSetting.max_image_width = 1
- stub_request(:get, "https://meta.discourse.org/some.png")
- .to_return(status: 200, body: file_from_fixtures("logo.png").read)
+ stub_request(:get, "https://meta.discourse.org/some.png").to_return(
+ status: 200,
+ body: file_from_fixtures("logo.png").read,
+ )
src = "https://meta.discourse.org/some.png"
@@ -230,17 +235,15 @@ RSpec.describe SearchIndexer do
post.rebake!
post.reload
- expect(post.cooked).not_to include(
- CookedPostProcessor::LIGHTBOX_WRAPPER_CSS_CLASS
- )
+ expect(post.cooked).not_to include(CookedPostProcessor::LIGHTBOX_WRAPPER_CSS_CLASS)
expect(post.post_search_data.raw_data).to eq(
- "Let me see how I can fix this image white walkers GOT"
+ "Let me see how I can fix this image white walkers GOT",
)
end
- it 'should strips audio and videos URLs from raw data' do
- SiteSetting.authorized_extensions = 'mp4'
+ it "should strips audio and videos URLs from raw data" do
+ SiteSetting.authorized_extensions = "mp4"
Fabricate(:video_upload)
post.update!(raw: <<~RAW)
@@ -254,32 +257,32 @@ RSpec.describe SearchIndexer do
RAW
expect(post.post_search_data.raw_data).to eq(
- "link to an external page: https://google.com/ link to an audio file: #{I18n.t("search.audio")} link to a video file: #{I18n.t("search.video")} link to an invalid URL: http:error]"
+ "link to an external page: https://google.com/ link to an audio file: #{I18n.t("search.audio")} link to a video file: #{I18n.t("search.video")} link to an invalid URL: http:error]",
)
expect(post.post_search_data.search_data).to eq(
- "'/audio.m4a':23 '/content/somethingelse.mov':31 'audio':19 'com':15,22,30 'error':38 'extern':13 'file':20,28 'google.com':15 'http':37 'invalid':35 'link':10,16,24,32 'page':14 'somesite.com':22,30 'somesite.com/audio.m4a':21 'somesite.com/content/somethingelse.mov':29 'test':8A 'titl':4A 'uncategor':9B 'url':36 'video':27"
+ "'/audio.m4a':23 '/content/somethingelse.mov':31 'audio':19 'com':15,22,30 'error':38 'extern':13 'file':20,28 'google.com':15 'http':37 'invalid':35 'link':10,16,24,32 'page':14 'somesite.com':22,30 'somesite.com/audio.m4a':21 'somesite.com/content/somethingelse.mov':29 'test':8A 'titl':4A 'uncategor':9B 'url':36 'video':27",
)
end
- it 'should unaccent indexed content' do
+ it "should unaccent indexed content" do
SiteSetting.search_ignore_accents = true
post.update!(raw: "Cette oeuvre d'art n'est pas une œuvre")
post.post_search_data.reload
- expect(post.post_search_data.search_data).not_to include('œuvr')
- expect(post.post_search_data.search_data).to include('oeuvr')
+ expect(post.post_search_data.search_data).not_to include("œuvr")
+ expect(post.post_search_data.search_data).to include("oeuvr")
SiteSetting.search_ignore_accents = false
SearchIndexer.index(post, force: true)
post.post_search_data.reload
- expect(post.post_search_data.search_data).to include('œuvr')
- expect(post.post_search_data.search_data).to include('oeuvr')
+ expect(post.post_search_data.search_data).to include("œuvr")
+ expect(post.post_search_data.search_data).to include("oeuvr")
end
- it 'truncates long words in the index' do
+ it "truncates long words in the index" do
SiteSetting.search_max_indexed_word_length = 4
- title = 'A title that is long enough'
- contents = 'I am the best beige object http://example.com/long/url'
+ title = "A title that is long enough"
+ contents = "I am the best beige object http://example.com/long/url"
topic.update!(title: title)
post.update!(raw: contents)
@@ -289,45 +292,46 @@ RSpec.describe SearchIndexer do
expect(post_search_data.raw_data).to eq(contents)
words = post_search_data.search_data.scan(/'([^']*)'/).map { |match| match[0] }
- expect(words).to contain_exactly('best', 'beig', 'obj', 'http', 'titl', 'long', 'enou', 'unca')
+ expect(words).to contain_exactly(
+ "best",
+ "beig",
+ "obj",
+ "http",
+ "titl",
+ "long",
+ "enou",
+ "unca",
+ )
end
end
- describe '.queue_post_reindex' do
+ describe ".queue_post_reindex" do
let(:post) { Fabricate(:post) }
let(:topic) { post.topic }
- it 'should reset the version of search data for all posts in the topic' do
+ it "should reset the version of search data for all posts in the topic" do
post2 = Fabricate(:post)
SearchIndexer.queue_post_reindex(topic.id)
- expect(post.reload.post_search_data.version).to eq(
- SearchIndexer::REINDEX_VERSION
- )
+ expect(post.reload.post_search_data.version).to eq(SearchIndexer::REINDEX_VERSION)
- expect(post2.reload.post_search_data.version).to eq(
- SearchIndexer::POST_INDEX_VERSION
- )
+ expect(post2.reload.post_search_data.version).to eq(SearchIndexer::POST_INDEX_VERSION)
end
end
- describe '.queue_users_reindex' do
+ describe ".queue_users_reindex" do
let!(:user) { Fabricate(:user) }
let!(:user2) { Fabricate(:user) }
- it 'should reset the version of search data for all users' do
+ it "should reset the version of search data for all users" do
SearchIndexer.index(user, force: true)
SearchIndexer.index(user2, force: true)
SearchIndexer.queue_users_reindex([user.id])
- expect(user.reload.user_search_data.version).to eq(
- SearchIndexer::REINDEX_VERSION
- )
+ expect(user.reload.user_search_data.version).to eq(SearchIndexer::REINDEX_VERSION)
- expect(user2.reload.user_search_data.version).to eq(
- SearchIndexer::USER_INDEX_VERSION
- )
+ expect(user2.reload.user_search_data.version).to eq(SearchIndexer::USER_INDEX_VERSION)
end
end
end
diff --git a/spec/services/sidebar_site_settings_backfiller_spec.rb b/spec/services/sidebar_site_settings_backfiller_spec.rb
index 46459d2895c..872a378964b 100644
--- a/spec/services/sidebar_site_settings_backfiller_spec.rb
+++ b/spec/services/sidebar_site_settings_backfiller_spec.rb
@@ -8,30 +8,42 @@ RSpec.describe SidebarSiteSettingsBackfiller do
fab!(:category) { Fabricate(:category) }
fab!(:category2) { Fabricate(:category) }
fab!(:category3) { Fabricate(:category) }
- fab!(:user_category_sidebar_section_link) { Fabricate(:category_sidebar_section_link, user: user, linkable: category) }
- fab!(:user2_category_sidebar_section_link) { Fabricate(:category_sidebar_section_link, user: user2, linkable: category) }
- fab!(:user3_category2_sidebar_section_link) { Fabricate(:category_sidebar_section_link, user: user3, linkable: category2) }
+ fab!(:user_category_sidebar_section_link) do
+ Fabricate(:category_sidebar_section_link, user: user, linkable: category)
+ end
+ fab!(:user2_category_sidebar_section_link) do
+ Fabricate(:category_sidebar_section_link, user: user2, linkable: category)
+ end
+ fab!(:user3_category2_sidebar_section_link) do
+ Fabricate(:category_sidebar_section_link, user: user3, linkable: category2)
+ end
let!(:category_sidebar_section_link_ids) do
[
user_category_sidebar_section_link.id,
user2_category_sidebar_section_link.id,
- user3_category2_sidebar_section_link.id
+ user3_category2_sidebar_section_link.id,
]
end
fab!(:tag) { Fabricate(:tag) }
fab!(:tag2) { Fabricate(:tag) }
fab!(:tag3) { Fabricate(:tag) }
- fab!(:user_tag_sidebar_section_link) { Fabricate(:tag_sidebar_section_link, user: user, linkable: tag) }
- fab!(:user2_tag_sidebar_section_link) { Fabricate(:tag_sidebar_section_link, user: user2, linkable: tag) }
- fab!(:user3_tag2_sidebar_section_link) { Fabricate(:tag_sidebar_section_link, user: user3, linkable: tag2) }
+ fab!(:user_tag_sidebar_section_link) do
+ Fabricate(:tag_sidebar_section_link, user: user, linkable: tag)
+ end
+ fab!(:user2_tag_sidebar_section_link) do
+ Fabricate(:tag_sidebar_section_link, user: user2, linkable: tag)
+ end
+ fab!(:user3_tag2_sidebar_section_link) do
+ Fabricate(:tag_sidebar_section_link, user: user3, linkable: tag2)
+ end
let!(:tag_sidebar_section_link_ids) do
[
user_tag_sidebar_section_link.id,
user2_tag_sidebar_section_link.id,
- user3_tag2_sidebar_section_link.id
+ user3_tag2_sidebar_section_link.id,
]
end
@@ -40,233 +52,232 @@ RSpec.describe SidebarSiteSettingsBackfiller do
User.real.where("id NOT IN (?)", [user.id, user2.id, user3.id, staged_user.id]).delete_all
end
- it 'raises an error when class is initialized with invalid setting name' do
+ it "raises an error when class is initialized with invalid setting name" do
expect do
- described_class.new('some_random_setting_name', previous_value: '', new_value: '')
+ described_class.new("some_random_setting_name", previous_value: "", new_value: "")
end.to raise_error(RuntimeError, "Invalid setting_name")
end
- describe '#backfill!' do
- context 'for default_sidebar_categories setting' do
- it 'deletes the right sidebar section link records when categories are removed' do
- backfiller = described_class.new(
- "default_sidebar_categories",
- previous_value: "#{category.id}|#{category2.id}|#{category3.id}",
- new_value: "#{category3.id}"
- )
+ describe "#backfill!" do
+ context "for default_sidebar_categories setting" do
+ it "deletes the right sidebar section link records when categories are removed" do
+ backfiller =
+ described_class.new(
+ "default_sidebar_categories",
+ previous_value: "#{category.id}|#{category2.id}|#{category3.id}",
+ new_value: "#{category3.id}",
+ )
- expect do
- backfiller.backfill!
- end.to change { SidebarSectionLink.count }.by(-3)
+ expect do backfiller.backfill! end.to change { SidebarSectionLink.count }.by(-3)
expect(SidebarSectionLink.exists?(id: category_sidebar_section_link_ids)).to eq(false)
end
- it 'creates the right sidebar section link records when categories are added' do
- backfiller = described_class.new(
- "default_sidebar_categories",
- previous_value: "#{category.id}|#{category2.id}",
- new_value: "#{category.id}|#{category2.id}|#{category3.id}"
- )
+ it "creates the right sidebar section link records when categories are added" do
+ backfiller =
+ described_class.new(
+ "default_sidebar_categories",
+ previous_value: "#{category.id}|#{category2.id}",
+ new_value: "#{category.id}|#{category2.id}|#{category3.id}",
+ )
- expect do
- backfiller.backfill!
- end.to change { SidebarSectionLink.count }.by(3)
+ expect do backfiller.backfill! end.to change { SidebarSectionLink.count }.by(3)
- expect(SidebarSectionLink.where(linkable_type: 'Category', linkable_id: category3.id).pluck(:user_id)).to contain_exactly(
- user.id,
- user2.id,
- user3.id
- )
+ expect(
+ SidebarSectionLink.where(linkable_type: "Category", linkable_id: category3.id).pluck(
+ :user_id,
+ ),
+ ).to contain_exactly(user.id, user2.id, user3.id)
end
- it 'creates the right sidebar section link records when categories are added' do
- backfiller = described_class.new(
- "default_sidebar_categories",
- previous_value: "",
- new_value: "#{category.id}|#{category2.id}|#{category3.id}"
- )
+ it "creates the right sidebar section link records when categories are added" do
+ backfiller =
+ described_class.new(
+ "default_sidebar_categories",
+ previous_value: "",
+ new_value: "#{category.id}|#{category2.id}|#{category3.id}",
+ )
- expect do
- backfiller.backfill!
- end.to change { SidebarSectionLink.count }.by(6)
+ expect do backfiller.backfill! end.to change { SidebarSectionLink.count }.by(6)
- expect(SidebarSectionLink.where(linkable_type: 'Category', linkable_id: category.id).pluck(:user_id)).to contain_exactly(
- user.id,
- user2.id,
- user3.id
- )
+ expect(
+ SidebarSectionLink.where(linkable_type: "Category", linkable_id: category.id).pluck(
+ :user_id,
+ ),
+ ).to contain_exactly(user.id, user2.id, user3.id)
- expect(SidebarSectionLink.where(linkable_type: 'Category', linkable_id: category2.id).pluck(:user_id)).to contain_exactly(
- user.id,
- user2.id,
- user3.id
- )
+ expect(
+ SidebarSectionLink.where(linkable_type: "Category", linkable_id: category2.id).pluck(
+ :user_id,
+ ),
+ ).to contain_exactly(user.id, user2.id, user3.id)
- expect(SidebarSectionLink.where(linkable_type: 'Category', linkable_id: category3.id).pluck(:user_id)).to contain_exactly(
- user.id,
- user2.id,
- user3.id
- )
+ expect(
+ SidebarSectionLink.where(linkable_type: "Category", linkable_id: category3.id).pluck(
+ :user_id,
+ ),
+ ).to contain_exactly(user.id, user2.id, user3.id)
end
- it 'deletes and creates the right sidebar section link records when categories are added and removed' do
- backfiller = described_class.new(
- "default_sidebar_categories",
- previous_value: "#{category.id}|#{category2.id}",
- new_value: "#{category3.id}"
- )
+ it "deletes and creates the right sidebar section link records when categories are added and removed" do
+ backfiller =
+ described_class.new(
+ "default_sidebar_categories",
+ previous_value: "#{category.id}|#{category2.id}",
+ new_value: "#{category3.id}",
+ )
original_count = SidebarSectionLink.count
- expect do
- backfiller.backfill!
- end.to change { SidebarSectionLink.where(linkable_type: 'Category', linkable_id: category.id).count }.by(-2)
- .and change { SidebarSectionLink.where(linkable_type: 'Category', linkable_id: category2.id).count }.by(-1)
- .and change { SidebarSectionLink.where(linkable_type: 'Category', linkable_id: category3.id).count }.by(3)
+ expect do backfiller.backfill! end.to change {
+ SidebarSectionLink.where(linkable_type: "Category", linkable_id: category.id).count
+ }.by(-2).and change {
+ SidebarSectionLink.where(linkable_type: "Category", linkable_id: category2.id).count
+ }.by(-1).and change {
+ SidebarSectionLink.where(
+ linkable_type: "Category",
+ linkable_id: category3.id,
+ ).count
+ }.by(3)
expect(SidebarSectionLink.count).to eq(original_count) # Net change of 0
- expect(SidebarSectionLink.where(linkable_type: 'Category', linkable_id: category3.id).pluck(:user_id)).to contain_exactly(
- user.id,
- user2.id,
- user3.id
- )
+ expect(
+ SidebarSectionLink.where(linkable_type: "Category", linkable_id: category3.id).pluck(
+ :user_id,
+ ),
+ ).to contain_exactly(user.id, user2.id, user3.id)
end
end
- context 'for default_sidebar_tags setting' do
- it 'deletes the right sidebar section link records when tags are removed' do
- backfiller = described_class.new(
- "default_sidebar_tags",
- previous_value: "#{tag.name}|#{tag2.name}|#{tag3.name}",
- new_value: "#{tag3.name}"
- )
+ context "for default_sidebar_tags setting" do
+ it "deletes the right sidebar section link records when tags are removed" do
+ backfiller =
+ described_class.new(
+ "default_sidebar_tags",
+ previous_value: "#{tag.name}|#{tag2.name}|#{tag3.name}",
+ new_value: "#{tag3.name}",
+ )
- expect do
- backfiller.backfill!
- end.to change { SidebarSectionLink.count }.by(-3)
+ expect do backfiller.backfill! end.to change { SidebarSectionLink.count }.by(-3)
expect(SidebarSectionLink.exists?(id: tag_sidebar_section_link_ids)).to eq(false)
end
- it 'creates the right sidebar section link records when tags are added' do
- backfiller = described_class.new(
- "default_sidebar_tags",
- previous_value: "#{tag.name}|#{tag2.name}",
- new_value: "#{tag.name}|#{tag2.name}|#{tag3.name}"
- )
+ it "creates the right sidebar section link records when tags are added" do
+ backfiller =
+ described_class.new(
+ "default_sidebar_tags",
+ previous_value: "#{tag.name}|#{tag2.name}",
+ new_value: "#{tag.name}|#{tag2.name}|#{tag3.name}",
+ )
- expect do
- backfiller.backfill!
- end.to change { SidebarSectionLink.count }.by(3)
+ expect do backfiller.backfill! end.to change { SidebarSectionLink.count }.by(3)
- expect(SidebarSectionLink.where(linkable_type: 'Tag', linkable_id: tag3.id).pluck(:user_id)).to contain_exactly(
- user.id,
- user2.id,
- user3.id
- )
+ expect(
+ SidebarSectionLink.where(linkable_type: "Tag", linkable_id: tag3.id).pluck(:user_id),
+ ).to contain_exactly(user.id, user2.id, user3.id)
end
- it 'deletes and creates the right sidebar section link records when tags are added and removed' do
- backfiller = described_class.new(
- "default_sidebar_tags",
- previous_value: "#{tag.name}|#{tag2.name}",
- new_value: "#{tag3.name}"
- )
+ it "deletes and creates the right sidebar section link records when tags are added and removed" do
+ backfiller =
+ described_class.new(
+ "default_sidebar_tags",
+ previous_value: "#{tag.name}|#{tag2.name}",
+ new_value: "#{tag3.name}",
+ )
original_count = SidebarSectionLink.count
- expect do
- backfiller.backfill!
- end.to change { SidebarSectionLink.where(linkable_type: 'Tag', linkable_id: tag.id).count }.by(-2)
- .and change { SidebarSectionLink.where(linkable_type: 'Tag', linkable_id: tag2.id).count }.by(-1)
- .and change { SidebarSectionLink.where(linkable_type: 'Tag', linkable_id: tag3.id).count }.by(3)
+ expect do backfiller.backfill! end.to change {
+ SidebarSectionLink.where(linkable_type: "Tag", linkable_id: tag.id).count
+ }.by(-2).and change {
+ SidebarSectionLink.where(linkable_type: "Tag", linkable_id: tag2.id).count
+ }.by(-1).and change {
+ SidebarSectionLink.where(linkable_type: "Tag", linkable_id: tag3.id).count
+ }.by(3)
expect(SidebarSectionLink.count).to eq(original_count) # net change of 0
- expect(SidebarSectionLink.where(linkable_type: 'Tag', linkable_id: tag3.id).pluck(:user_id)).to contain_exactly(
- user.id,
- user2.id,
- user3.id
- )
+ expect(
+ SidebarSectionLink.where(linkable_type: "Tag", linkable_id: tag3.id).pluck(:user_id),
+ ).to contain_exactly(user.id, user2.id, user3.id)
end
end
end
- describe '#number_of_users_to_backfill' do
- context 'for default_sidebar_categories setting' do
+ describe "#number_of_users_to_backfill" do
+ context "for default_sidebar_categories setting" do
it "returns 3 for the user count when a new category for all users is added" do
- backfiller = described_class.new(
- "default_sidebar_categories",
- previous_value: "",
- new_value: "#{category3.id}"
- )
+ backfiller =
+ described_class.new(
+ "default_sidebar_categories",
+ previous_value: "",
+ new_value: "#{category3.id}",
+ )
expect(backfiller.number_of_users_to_backfill).to eq(3)
end
it "returns 2 for the user count when category which 2 users have configured in sidebar is removed" do
- backfiller = described_class.new(
- "default_sidebar_categories",
- previous_value: "#{category.id}|#{category2.id}",
- new_value: "#{category2.id}"
- )
+ backfiller =
+ described_class.new(
+ "default_sidebar_categories",
+ previous_value: "#{category.id}|#{category2.id}",
+ new_value: "#{category2.id}",
+ )
expect(backfiller.number_of_users_to_backfill).to eq(2)
end
# category, category2 => category2, category3
it "returns 3 for the user count when a new category is added and a category is removed" do
- backfiller = described_class.new(
- "default_sidebar_categories",
- previous_value: "#{category.id}|#{category2.id}",
- new_value: "#{category2.id}|#{category3.id}"
- )
+ backfiller =
+ described_class.new(
+ "default_sidebar_categories",
+ previous_value: "#{category.id}|#{category2.id}",
+ new_value: "#{category2.id}|#{category3.id}",
+ )
expect(backfiller.number_of_users_to_backfill).to eq(3)
end
it "returns 0 for the user count when no new category is added or removed" do
- backfiller = described_class.new(
- "default_sidebar_categories",
- previous_value: "",
- new_value: ""
- )
+ backfiller =
+ described_class.new("default_sidebar_categories", previous_value: "", new_value: "")
expect(backfiller.number_of_users_to_backfill).to eq(0)
end
end
- context 'for default_sidebar_tags setting' do
+ context "for default_sidebar_tags setting" do
it "returns 3 for the user count when a new tag for all users is added" do
- backfiller = described_class.new(
- "default_sidebar_tags",
- previous_value: "",
- new_value: "#{tag3.name}"
- )
+ backfiller =
+ described_class.new("default_sidebar_tags", previous_value: "", new_value: "#{tag3.name}")
expect(backfiller.number_of_users_to_backfill).to eq(3)
end
# tag, tag2 => tag2
it "returns 2 for the user count when tag which 2 users have configured in sidebar is removed" do
- backfiller = described_class.new(
- "default_sidebar_tags",
- previous_value: "#{tag.name}|#{tag2.name}",
- new_value: "#{tag2.name}"
- )
+ backfiller =
+ described_class.new(
+ "default_sidebar_tags",
+ previous_value: "#{tag.name}|#{tag2.name}",
+ new_value: "#{tag2.name}",
+ )
expect(backfiller.number_of_users_to_backfill).to eq(2)
end
# tag, tag2 => tag2, tag3
it "returns 3 for the user count when a new tag is added and a tag is removed" do
- backfiller = described_class.new(
- "default_sidebar_tags",
- previous_value: "#{tag.name}|#{tag2.name}",
- new_value: "#{tag2.name}|#{tag3.name}"
- )
+ backfiller =
+ described_class.new(
+ "default_sidebar_tags",
+ previous_value: "#{tag.name}|#{tag2.name}",
+ new_value: "#{tag2.name}|#{tag3.name}",
+ )
expect(backfiller.number_of_users_to_backfill).to eq(3)
end
diff --git a/spec/services/site_settings_spec.rb b/spec/services/site_settings_spec.rb
index 542d7ec7e18..fb5f0028697 100644
--- a/spec/services/site_settings_spec.rb
+++ b/spec/services/site_settings_spec.rb
@@ -1,27 +1,21 @@
# frozen_string_literal: true
RSpec.describe SiteSettingsTask do
+ before { Discourse::Application.load_tasks }
- before do
- Discourse::Application.load_tasks
- end
-
- describe 'export' do
- it 'creates a hash of all site settings' do
+ describe "export" do
+ it "creates a hash of all site settings" do
sso_url = "https://somewhere.over.com"
SiteSetting.discourse_connect_url = sso_url
SiteSetting.enable_discourse_connect = true
hash = SiteSettingsTask.export_to_hash
- expect(hash).to eq(
- "enable_discourse_connect" => "true",
- "discourse_connect_url" => sso_url
- )
+ expect(hash).to eq("enable_discourse_connect" => "true", "discourse_connect_url" => sso_url)
end
end
- describe 'import' do
- it 'updates site settings' do
+ describe "import" do
+ it "updates site settings" do
yml = "title: Test"
log, counts = SiteSettingsTask.import(yml)
expect(log[0]).to eq "Changed title FROM: Discourse TO: Test"
@@ -33,9 +27,11 @@ RSpec.describe SiteSettingsTask do
original_default_theme_id = SiteSetting.default_theme_id.inspect
yml = "default_theme_id: 999999999"
log, counts = SiteSettingsTask.import(yml)
- expect(log[0]).to eq "Changed default_theme_id FROM: #{original_default_theme_id} TO: 999999999"
+ expect(
+ log[0],
+ ).to eq "Changed default_theme_id FROM: #{original_default_theme_id} TO: 999999999"
expect(counts[:updated]).to eq(1)
- expect(SiteSetting.default_theme_id).to eq(999999999)
+ expect(SiteSetting.default_theme_id).to eq(999_999_999)
end
it "won't update a setting that doesn't exist" do
diff --git a/spec/services/staff_action_logger_spec.rb b/spec/services/staff_action_logger_spec.rb
index b448bb0230f..2f535b410f2 100644
--- a/spec/services/staff_action_logger_spec.rb
+++ b/spec/services/staff_action_logger_spec.rb
@@ -1,34 +1,33 @@
# frozen_string_literal: true
RSpec.describe StaffActionLogger do
-
- fab!(:admin) { Fabricate(:admin) }
+ fab!(:admin) { Fabricate(:admin) }
let(:logger) { described_class.new(admin) }
- describe 'new' do
- it 'raises an error when user is nil' do
+ describe "new" do
+ it "raises an error when user is nil" do
expect { described_class.new(nil) }.to raise_error(Discourse::InvalidParameters)
end
- it 'raises an error when user is not a User' do
+ it "raises an error when user is not a User" do
expect { described_class.new(5) }.to raise_error(Discourse::InvalidParameters)
end
end
- describe 'log_user_deletion' do
+ describe "log_user_deletion" do
fab!(:deleted_user) { Fabricate(:user) }
subject(:log_user_deletion) { described_class.new(admin).log_user_deletion(deleted_user) }
- it 'raises an error when user is nil' do
+ it "raises an error when user is nil" do
expect { logger.log_user_deletion(nil) }.to raise_error(Discourse::InvalidParameters)
end
- it 'raises an error when user is not a User' do
+ it "raises an error when user is not a User" do
expect { logger.log_user_deletion(1) }.to raise_error(Discourse::InvalidParameters)
end
- it 'creates a new UserHistory record' do
+ it "creates a new UserHistory record" do
expect { log_user_deletion }.to change { UserHistory.count }.by(1)
end
end
@@ -47,24 +46,24 @@ RSpec.describe StaffActionLogger do
end
end
- describe 'log_post_deletion' do
+ describe "log_post_deletion" do
fab!(:deleted_post) { Fabricate(:post) }
subject(:log_post_deletion) { described_class.new(admin).log_post_deletion(deleted_post) }
- it 'raises an error when post is nil' do
+ it "raises an error when post is nil" do
expect { logger.log_post_deletion(nil) }.to raise_error(Discourse::InvalidParameters)
end
- it 'raises an error when post is not a Post' do
+ it "raises an error when post is not a Post" do
expect { logger.log_post_deletion(1) }.to raise_error(Discourse::InvalidParameters)
end
- it 'creates a new UserHistory record' do
+ it "creates a new UserHistory record" do
expect { log_post_deletion }.to change { UserHistory.count }.by(1)
end
- it 'does not explode if post does not have a user' do
+ it "does not explode if post does not have a user" do
expect {
deleted_post.update_columns(user_id: nil)
log_post_deletion
@@ -72,65 +71,85 @@ RSpec.describe StaffActionLogger do
end
end
- describe 'log_topic_delete_recover' do
+ describe "log_topic_delete_recover" do
fab!(:topic) { Fabricate(:topic) }
context "when deleting topic" do
- subject(:log_topic_delete_recover) { described_class.new(admin).log_topic_delete_recover(topic) }
+ subject(:log_topic_delete_recover) do
+ described_class.new(admin).log_topic_delete_recover(topic)
+ end
- it 'raises an error when topic is nil' do
+ it "raises an error when topic is nil" do
expect { logger.log_topic_delete_recover(nil) }.to raise_error(Discourse::InvalidParameters)
end
- it 'raises an error when topic is not a Topic' do
+ it "raises an error when topic is not a Topic" do
expect { logger.log_topic_delete_recover(1) }.to raise_error(Discourse::InvalidParameters)
end
- it 'creates a new UserHistory record' do
+ it "creates a new UserHistory record" do
expect { log_topic_delete_recover }.to change { UserHistory.count }.by(1)
end
end
context "when recovering topic" do
- subject(:log_topic_delete_recover) { described_class.new(admin).log_topic_delete_recover(topic, "recover_topic") }
-
- it 'raises an error when topic is nil' do
- expect { logger.log_topic_delete_recover(nil, "recover_topic") }.to raise_error(Discourse::InvalidParameters)
+ subject(:log_topic_delete_recover) do
+ described_class.new(admin).log_topic_delete_recover(topic, "recover_topic")
end
- it 'raises an error when topic is not a Topic' do
- expect { logger.log_topic_delete_recover(1, "recover_topic") }.to raise_error(Discourse::InvalidParameters)
+ it "raises an error when topic is nil" do
+ expect { logger.log_topic_delete_recover(nil, "recover_topic") }.to raise_error(
+ Discourse::InvalidParameters,
+ )
end
- it 'creates a new UserHistory record' do
+ it "raises an error when topic is not a Topic" do
+ expect { logger.log_topic_delete_recover(1, "recover_topic") }.to raise_error(
+ Discourse::InvalidParameters,
+ )
+ end
+
+ it "creates a new UserHistory record" do
expect { log_topic_delete_recover }.to change { UserHistory.count }.by(1)
end
end
end
- describe 'log_trust_level_change' do
+ describe "log_trust_level_change" do
fab!(:user) { Fabricate(:user) }
let(:old_trust_level) { TrustLevel[0] }
let(:new_trust_level) { TrustLevel[1] }
- subject(:log_trust_level_change) { described_class.new(admin).log_trust_level_change(user, old_trust_level, new_trust_level) }
-
- it 'raises an error when user or trust level is nil' do
- expect { logger.log_trust_level_change(nil, old_trust_level, new_trust_level) }.to raise_error(Discourse::InvalidParameters)
- expect { logger.log_trust_level_change(user, nil, new_trust_level) }.to raise_error(Discourse::InvalidParameters)
- expect { logger.log_trust_level_change(user, old_trust_level, nil) }.to raise_error(Discourse::InvalidParameters)
+ subject(:log_trust_level_change) do
+ described_class.new(admin).log_trust_level_change(user, old_trust_level, new_trust_level)
end
- it 'raises an error when user is not a User' do
- expect { logger.log_trust_level_change(1, old_trust_level, new_trust_level) }.to raise_error(Discourse::InvalidParameters)
+ it "raises an error when user or trust level is nil" do
+ expect {
+ logger.log_trust_level_change(nil, old_trust_level, new_trust_level)
+ }.to raise_error(Discourse::InvalidParameters)
+ expect { logger.log_trust_level_change(user, nil, new_trust_level) }.to raise_error(
+ Discourse::InvalidParameters,
+ )
+ expect { logger.log_trust_level_change(user, old_trust_level, nil) }.to raise_error(
+ Discourse::InvalidParameters,
+ )
end
- it 'raises an error when new trust level is not a Trust Level' do
+ it "raises an error when user is not a User" do
+ expect { logger.log_trust_level_change(1, old_trust_level, new_trust_level) }.to raise_error(
+ Discourse::InvalidParameters,
+ )
+ end
+
+ it "raises an error when new trust level is not a Trust Level" do
max_level = TrustLevel.valid_range.max
- expect { logger.log_trust_level_change(user, old_trust_level, max_level + 1) }.to raise_error(Discourse::InvalidParameters)
+ expect { logger.log_trust_level_change(user, old_trust_level, max_level + 1) }.to raise_error(
+ Discourse::InvalidParameters,
+ )
end
- it 'creates a new UserHistory record' do
+ it "creates a new UserHistory record" do
expect { log_trust_level_change }.to change { UserHistory.count }.by(1)
expect(UserHistory.last.previous_value).to eq(old_trust_level.to_s)
expect(UserHistory.last.new_value).to eq(new_trust_level.to_s)
@@ -139,12 +158,18 @@ RSpec.describe StaffActionLogger do
describe "log_site_setting_change" do
it "raises an error when params are invalid" do
- expect { logger.log_site_setting_change(nil, '1', '2') }.to raise_error(Discourse::InvalidParameters)
- expect { logger.log_site_setting_change('i_am_a_site_setting_that_will_never_exist', '1', '2') }.to raise_error(Discourse::InvalidParameters)
+ expect { logger.log_site_setting_change(nil, "1", "2") }.to raise_error(
+ Discourse::InvalidParameters,
+ )
+ expect {
+ logger.log_site_setting_change("i_am_a_site_setting_that_will_never_exist", "1", "2")
+ }.to raise_error(Discourse::InvalidParameters)
end
it "creates a new UserHistory record" do
- expect { logger.log_site_setting_change('title', 'Discourse', 'My Site') }.to change { UserHistory.count }.by(1)
+ expect { logger.log_site_setting_change("title", "Discourse", "My Site") }.to change {
+ UserHistory.count
+ }.by(1)
end
it "logs boolean values" do
@@ -161,7 +186,6 @@ RSpec.describe StaffActionLogger do
end
describe "log_theme_change" do
-
it "raises an error when params are invalid" do
expect { logger.log_theme_change(nil, nil) }.to raise_error(Discourse::InvalidParameters)
end
@@ -171,14 +195,13 @@ RSpec.describe StaffActionLogger do
end
it "logs new site customizations" do
-
log_record = logger.log_theme_change(nil, theme)
expect(log_record.subject).to eq(theme.name)
expect(log_record.previous_value).to eq(nil)
expect(log_record.new_value).to be_present
json = ::JSON.parse(log_record.new_value)
- expect(json['name']).to eq(theme.name)
+ expect(json["name"]).to eq(theme.name)
end
it "logs updated site customizations" do
@@ -191,7 +214,16 @@ RSpec.describe StaffActionLogger do
expect(log_record.previous_value).to be_present
json = ::JSON.parse(log_record.new_value)
- expect(json['theme_fields']).to eq([{ "name" => "scss", "target" => "common", "value" => "body{margin: 10px;}", "type_id" => 1 }])
+ expect(json["theme_fields"]).to eq(
+ [
+ {
+ "name" => "scss",
+ "target" => "common",
+ "value" => "body{margin: 10px;}",
+ "type_id" => 1,
+ },
+ ],
+ )
end
end
@@ -209,14 +241,24 @@ RSpec.describe StaffActionLogger do
expect(log_record.new_value).to eq(nil)
json = ::JSON.parse(log_record.previous_value)
- expect(json['theme_fields']).to eq([{ "name" => "scss", "target" => "common", "value" => "body{margin: 10px;}", "type_id" => 1 }])
+ expect(json["theme_fields"]).to eq(
+ [
+ {
+ "name" => "scss",
+ "target" => "common",
+ "value" => "body{margin: 10px;}",
+ "type_id" => 1,
+ },
+ ],
+ )
end
end
describe "log_theme_setting_change" do
-
it "raises an error when params are invalid" do
- expect { logger.log_theme_setting_change(nil, nil, nil, nil) }.to raise_error(Discourse::InvalidParameters)
+ expect { logger.log_theme_setting_change(nil, nil, nil, nil) }.to raise_error(
+ Discourse::InvalidParameters,
+ )
end
let! :theme do
@@ -229,11 +271,14 @@ RSpec.describe StaffActionLogger do
end
it "raises an error when theme setting is invalid" do
- expect { logger.log_theme_setting_change(:inexistent_setting, nil, nil, theme) }.to raise_error(Discourse::InvalidParameters)
+ expect {
+ logger.log_theme_setting_change(:inexistent_setting, nil, nil, theme)
+ }.to raise_error(Discourse::InvalidParameters)
end
it "logs theme setting changes" do
- log_record = logger.log_theme_setting_change(:custom_setting, "special", "notsospecial", theme)
+ log_record =
+ logger.log_theme_setting_change(:custom_setting, "special", "notsospecial", theme)
expect(log_record.subject).to eq("#{theme.name}: custom_setting")
expect(log_record.previous_value).to eq("special")
expect(log_record.new_value).to eq("notsospecial")
@@ -242,11 +287,15 @@ RSpec.describe StaffActionLogger do
describe "log_site_text_change" do
it "raises an error when params are invalid" do
- expect { logger.log_site_text_change(nil, 'new text', 'old text') }.to raise_error(Discourse::InvalidParameters)
+ expect { logger.log_site_text_change(nil, "new text", "old text") }.to raise_error(
+ Discourse::InvalidParameters,
+ )
end
it "creates a new UserHistory record" do
- expect { logger.log_site_text_change('created', 'new text', 'old text') }.to change { UserHistory.count }.by(1)
+ expect { logger.log_site_text_change("created", "new text", "old text") }.to change {
+ UserHistory.count
+ }.by(1)
end
end
@@ -255,7 +304,9 @@ RSpec.describe StaffActionLogger do
it "raises an error when arguments are missing" do
expect { logger.log_user_suspend(nil, nil) }.to raise_error(Discourse::InvalidParameters)
- expect { logger.log_user_suspend(nil, "He was bad.") }.to raise_error(Discourse::InvalidParameters)
+ expect { logger.log_user_suspend(nil, "He was bad.") }.to raise_error(
+ Discourse::InvalidParameters,
+ )
end
it "reason arg is optional" do
@@ -319,122 +370,123 @@ RSpec.describe StaffActionLogger do
end
end
- describe 'log_roll_up' do
+ describe "log_roll_up" do
let(:subnet) { "1.2.3.0/24" }
- let(:ips) { ["1.2.3.4", "1.2.3.100"] }
+ let(:ips) { %w[1.2.3.4 1.2.3.100] }
subject(:log_roll_up) { described_class.new(admin).log_roll_up(subnet, ips) }
- it 'creates a new UserHistory record' do
+ it "creates a new UserHistory record" do
log_record = logger.log_roll_up(subnet, ips)
expect(log_record).to be_valid
expect(log_record.details).to eq("#{subnet} from #{ips.join(", ")}")
end
end
- describe 'log_custom' do
+ describe "log_custom" do
it "raises an error when `custom_type` is missing" do
expect { logger.log_custom(nil) }.to raise_error(Discourse::InvalidParameters)
end
it "creates the UserHistory record" do
- logged = logger.log_custom('clicked_something', evil: 'trout',
- clicked_on: 'thing',
- topic_id: 1234)
+ logged =
+ logger.log_custom("clicked_something", evil: "trout", clicked_on: "thing", topic_id: 1234)
expect(logged).to be_valid
expect(logged.details).to eq("evil: trout\nclicked_on: thing")
expect(logged.action).to eq(UserHistory.actions[:custom_staff])
- expect(logged.custom_type).to eq('clicked_something')
+ expect(logged.custom_type).to eq("clicked_something")
expect(logged.topic_id).to be === 1234
end
end
- describe 'log_category_settings_change' do
- let(:category) { Fabricate(:category, name: 'haha') }
+ describe "log_category_settings_change" do
+ let(:category) { Fabricate(:category, name: "haha") }
let(:category_group) { Fabricate(:category_group, category: category, permission_type: 1) }
it "raises an error when category is missing" do
- expect { logger.log_category_settings_change(nil, nil) }.to raise_error(Discourse::InvalidParameters)
+ expect { logger.log_category_settings_change(nil, nil) }.to raise_error(
+ Discourse::InvalidParameters,
+ )
end
it "creates new UserHistory records" do
- attributes = {
- name: 'new_name',
- permissions: { category_group.group_name => 2 }
- }
+ attributes = { name: "new_name", permissions: { category_group.group_name => 2 } }
category.update!(attributes)
logger.log_category_settings_change(
category,
attributes,
- old_permissions: { category_group.group_name => category_group.permission_type }
+ old_permissions: {
+ category_group.group_name => category_group.permission_type,
+ },
)
expect(UserHistory.count).to eq(2)
- permission_user_history = UserHistory.find_by_subject('permissions')
+ permission_user_history = UserHistory.find_by_subject("permissions")
expect(permission_user_history.category_id).to eq(category.id)
- expect(permission_user_history.previous_value).to eq({ category_group.group_name => 1 }.to_json)
+ expect(permission_user_history.previous_value).to eq(
+ { category_group.group_name => 1 }.to_json,
+ )
expect(permission_user_history.new_value).to eq({ category_group.group_name => 2 }.to_json)
expect(permission_user_history.action).to eq(UserHistory.actions[:change_category_settings])
expect(permission_user_history.context).to eq(category.url)
- name_user_history = UserHistory.find_by_subject('name')
+ name_user_history = UserHistory.find_by_subject("name")
expect(name_user_history.category).to eq(category)
- expect(name_user_history.previous_value).to eq('haha')
- expect(name_user_history.new_value).to eq('new_name')
+ expect(name_user_history.previous_value).to eq("haha")
+ expect(name_user_history.new_value).to eq("new_name")
end
it "does not log permissions changes for category visible to everyone" do
- attributes = { name: 'new_name' }
+ attributes = { name: "new_name" }
old_permission = category.permissions_params
category.update!(attributes)
logger.log_category_settings_change(
category,
attributes.merge(permissions: { "everyone" => 1 }),
- old_permissions: old_permission
+ old_permissions: old_permission,
)
expect(UserHistory.count).to eq(1)
- expect(UserHistory.find_by_subject('name').category).to eq(category)
+ expect(UserHistory.find_by_subject("name").category).to eq(category)
end
it "logs custom fields changes" do
- attributes = {
- custom_fields: { "auto_populated" => "t" }
- }
+ attributes = { custom_fields: { "auto_populated" => "t" } }
category.update!(attributes)
logger.log_category_settings_change(
category,
attributes,
old_permissions: category.permissions_params,
- old_custom_fields: {}
+ old_custom_fields: {
+ },
)
expect(UserHistory.count).to eq(1)
end
it "does not log custom fields changes if value is unchanged" do
- attributes = {
- custom_fields: { "auto_populated" => "t" }
- }
+ attributes = { custom_fields: { "auto_populated" => "t" } }
category.update!(attributes)
logger.log_category_settings_change(
category,
attributes,
old_permissions: category.permissions_params,
- old_custom_fields: { "auto_populated" => "t" }
+ old_custom_fields: {
+ "auto_populated" => "t",
+ },
)
expect(UserHistory.count).to eq(0)
end
end
- describe 'log_category_deletion' do
+ describe "log_category_deletion" do
fab!(:parent_category) { Fabricate(:category) }
fab!(:category) { Fabricate(:category, parent_category: parent_category) }
@@ -456,7 +508,7 @@ RSpec.describe StaffActionLogger do
end
end
- describe 'log_category_creation' do
+ describe "log_category_creation" do
fab!(:category) { Fabricate(:category) }
it "raises an error when category is missing" do
@@ -475,7 +527,7 @@ RSpec.describe StaffActionLogger do
end
end
- describe 'log_lock_trust_level' do
+ describe "log_lock_trust_level" do
fab!(:user) { Fabricate(:user) }
it "raises an error when argument is missing" do
@@ -495,7 +547,7 @@ RSpec.describe StaffActionLogger do
end
end
- describe 'log_user_activate' do
+ describe "log_user_activate" do
fab!(:user) { Fabricate(:user) }
it "raises an error when argument is missing" do
@@ -504,86 +556,92 @@ RSpec.describe StaffActionLogger do
it "creates a new UserHistory record" do
reason = "Staff activated from admin"
- expect {
- logger.log_user_activate(user, reason)
- }.to change { UserHistory.count }.by(1)
+ expect { logger.log_user_activate(user, reason) }.to change { UserHistory.count }.by(1)
user_history = UserHistory.last
expect(user_history.action).to eq(UserHistory.actions[:activate_user])
expect(user_history.details).to eq(reason)
end
end
- describe '#log_readonly_mode' do
+ describe "#log_readonly_mode" do
it "creates a new record" do
expect { logger.log_change_readonly_mode(true) }.to change { UserHistory.count }.by(1)
user_history = UserHistory.last
expect(user_history.action).to eq(UserHistory.actions[:change_readonly_mode])
- expect(user_history.new_value).to eq('t')
- expect(user_history.previous_value).to eq('f')
+ expect(user_history.new_value).to eq("t")
+ expect(user_history.previous_value).to eq("f")
expect { logger.log_change_readonly_mode(false) }.to change { UserHistory.count }.by(1)
user_history = UserHistory.last
expect(user_history.action).to eq(UserHistory.actions[:change_readonly_mode])
- expect(user_history.new_value).to eq('f')
- expect(user_history.previous_value).to eq('t')
+ expect(user_history.new_value).to eq("f")
+ expect(user_history.previous_value).to eq("t")
end
end
- describe 'log_check_personal_message' do
+ describe "log_check_personal_message" do
fab!(:personal_message) { Fabricate(:private_message_topic) }
- subject(:log_check_personal_message) { described_class.new(admin).log_check_personal_message(personal_message) }
+ subject(:log_check_personal_message) do
+ described_class.new(admin).log_check_personal_message(personal_message)
+ end
- it 'raises an error when topic is nil' do
+ it "raises an error when topic is nil" do
expect { logger.log_check_personal_message(nil) }.to raise_error(Discourse::InvalidParameters)
end
- it 'raises an error when topic is not a Topic' do
+ it "raises an error when topic is not a Topic" do
expect { logger.log_check_personal_message(1) }.to raise_error(Discourse::InvalidParameters)
end
- it 'creates a new UserHistory record' do
+ it "creates a new UserHistory record" do
expect { log_check_personal_message }.to change { UserHistory.count }.by(1)
end
end
- describe 'log_post_approved' do
+ describe "log_post_approved" do
fab!(:approved_post) { Fabricate(:post) }
subject(:log_post_approved) { described_class.new(admin).log_post_approved(approved_post) }
- it 'raises an error when post is nil' do
+ it "raises an error when post is nil" do
expect { logger.log_post_approved(nil) }.to raise_error(Discourse::InvalidParameters)
end
- it 'raises an error when post is not a Post' do
+ it "raises an error when post is not a Post" do
expect { logger.log_post_approved(1) }.to raise_error(Discourse::InvalidParameters)
end
- it 'creates a new UserHistory record' do
+ it "creates a new UserHistory record" do
expect { log_post_approved }.to change { UserHistory.count }.by(1)
end
end
- describe 'log_post_rejected' do
+ describe "log_post_rejected" do
fab!(:reviewable) { Fabricate(:reviewable_queued_post) }
- subject(:log_post_rejected) { described_class.new(admin).log_post_rejected(reviewable, DateTime.now) }
-
- it 'raises an error when reviewable not supplied' do
- expect { logger.log_post_rejected(nil, DateTime.now) }.to raise_error(Discourse::InvalidParameters)
- expect { logger.log_post_rejected(1, DateTime.now) }.to raise_error(Discourse::InvalidParameters)
+ subject(:log_post_rejected) do
+ described_class.new(admin).log_post_rejected(reviewable, DateTime.now)
end
- it 'creates a new UserHistory record' do
+ it "raises an error when reviewable not supplied" do
+ expect { logger.log_post_rejected(nil, DateTime.now) }.to raise_error(
+ Discourse::InvalidParameters,
+ )
+ expect { logger.log_post_rejected(1, DateTime.now) }.to raise_error(
+ Discourse::InvalidParameters,
+ )
+ end
+
+ it "creates a new UserHistory record" do
expect { log_post_rejected }.to change { UserHistory.count }.by(1)
user_history = UserHistory.last
expect(user_history.action).to eq(UserHistory.actions[:post_rejected])
- expect(user_history.details).to include(reviewable.payload['raw'])
+ expect(user_history.details).to include(reviewable.payload["raw"])
end
it "works if the user was destroyed" do
@@ -593,11 +651,11 @@ RSpec.describe StaffActionLogger do
expect { log_post_rejected }.to change { UserHistory.count }.by(1)
user_history = UserHistory.last
expect(user_history.action).to eq(UserHistory.actions[:post_rejected])
- expect(user_history.details).to include(reviewable.payload['raw'])
+ expect(user_history.details).to include(reviewable.payload["raw"])
end
end
- describe 'log_topic_closed' do
+ describe "log_topic_closed" do
fab!(:topic) { Fabricate(:topic) }
it "raises an error when argument is missing" do
@@ -605,12 +663,16 @@ RSpec.describe StaffActionLogger do
end
it "creates a new UserHistory record" do
- expect { logger.log_topic_closed(topic, closed: true) }.to change { UserHistory.where(action: UserHistory.actions[:topic_closed]).count }.by(1)
- expect { logger.log_topic_closed(topic, closed: false) }.to change { UserHistory.where(action: UserHistory.actions[:topic_opened]).count }.by(1)
+ expect { logger.log_topic_closed(topic, closed: true) }.to change {
+ UserHistory.where(action: UserHistory.actions[:topic_closed]).count
+ }.by(1)
+ expect { logger.log_topic_closed(topic, closed: false) }.to change {
+ UserHistory.where(action: UserHistory.actions[:topic_opened]).count
+ }.by(1)
end
end
- describe 'log_topic_archived' do
+ describe "log_topic_archived" do
fab!(:topic) { Fabricate(:topic) }
it "raises an error when argument is missing" do
@@ -618,12 +680,16 @@ RSpec.describe StaffActionLogger do
end
it "creates a new UserHistory record" do
- expect { logger.log_topic_archived(topic, archived: true) }.to change { UserHistory.where(action: UserHistory.actions[:topic_archived]).count }.by(1)
- expect { logger.log_topic_archived(topic, archived: false) }.to change { UserHistory.where(action: UserHistory.actions[:topic_unarchived]).count }.by(1)
+ expect { logger.log_topic_archived(topic, archived: true) }.to change {
+ UserHistory.where(action: UserHistory.actions[:topic_archived]).count
+ }.by(1)
+ expect { logger.log_topic_archived(topic, archived: false) }.to change {
+ UserHistory.where(action: UserHistory.actions[:topic_unarchived]).count
+ }.by(1)
end
end
- describe 'log_post_staff_note' do
+ describe "log_post_staff_note" do
fab!(:post) { Fabricate(:post) }
it "raises an error when argument is missing" do
@@ -631,21 +697,25 @@ RSpec.describe StaffActionLogger do
end
it "creates a new UserHistory record" do
- expect { logger.log_post_staff_note(post, { new_value: 'my note', old_value: nil }) }.to change { UserHistory.count }.by(1)
+ expect {
+ logger.log_post_staff_note(post, { new_value: "my note", old_value: nil })
+ }.to change { UserHistory.count }.by(1)
user_history = UserHistory.last
expect(user_history.action).to eq(UserHistory.actions[:post_staff_note_create])
- expect(user_history.new_value).to eq('my note')
+ expect(user_history.new_value).to eq("my note")
expect(user_history.previous_value).to eq(nil)
- expect { logger.log_post_staff_note(post, { new_value: '', old_value: 'my note' }) }.to change { UserHistory.count }.by(1)
+ expect {
+ logger.log_post_staff_note(post, { new_value: "", old_value: "my note" })
+ }.to change { UserHistory.count }.by(1)
user_history = UserHistory.last
expect(user_history.action).to eq(UserHistory.actions[:post_staff_note_destroy])
expect(user_history.new_value).to eq(nil)
- expect(user_history.previous_value).to eq('my note')
+ expect(user_history.previous_value).to eq("my note")
end
end
- describe 'log_post_staff_note' do
+ describe "log_post_staff_note" do
fab!(:post) { Fabricate(:post) }
it "raises an error when argument is missing" do
@@ -653,21 +723,25 @@ RSpec.describe StaffActionLogger do
end
it "creates a new UserHistory record" do
- expect { logger.log_post_staff_note(post, { new_value: 'my note', old_value: nil }) }.to change { UserHistory.count }.by(1)
+ expect {
+ logger.log_post_staff_note(post, { new_value: "my note", old_value: nil })
+ }.to change { UserHistory.count }.by(1)
user_history = UserHistory.last
expect(user_history.action).to eq(UserHistory.actions[:post_staff_note_create])
- expect(user_history.new_value).to eq('my note')
+ expect(user_history.new_value).to eq("my note")
expect(user_history.previous_value).to eq(nil)
- expect { logger.log_post_staff_note(post, { new_value: nil, old_value: 'my note' }) }.to change { UserHistory.count }.by(1)
+ expect {
+ logger.log_post_staff_note(post, { new_value: nil, old_value: "my note" })
+ }.to change { UserHistory.count }.by(1)
user_history = UserHistory.last
expect(user_history.action).to eq(UserHistory.actions[:post_staff_note_destroy])
expect(user_history.new_value).to eq(nil)
- expect(user_history.previous_value).to eq('my note')
+ expect(user_history.previous_value).to eq("my note")
end
end
- describe '#log_watched_words_creation' do
+ describe "#log_watched_words_creation" do
fab!(:watched_word) { Fabricate(:watched_word, action: WatchedWord.actions[:block]) }
it "raises an error when watched_word is missing" do
@@ -687,7 +761,7 @@ RSpec.describe StaffActionLogger do
end
end
- describe '#log_watched_words_deletion' do
+ describe "#log_watched_words_deletion" do
fab!(:watched_word) { Fabricate(:watched_word, action: WatchedWord.actions[:block]) }
it "raises an error when watched_word is missing" do
diff --git a/spec/services/tag_hashtag_data_source_spec.rb b/spec/services/tag_hashtag_data_source_spec.rb
index e56c3c9af95..3598c664f95 100644
--- a/spec/services/tag_hashtag_data_source_spec.rb
+++ b/spec/services/tag_hashtag_data_source_spec.rb
@@ -33,7 +33,7 @@ RSpec.describe TagHashtagDataSource do
it "includes the topic count for the text of the tag in secondary text" do
expect(described_class.search(guardian, "fact", 5).map(&:secondary_text)).to eq(
- ["x0", "x5", "x4", "x3", "x1"],
+ %w[x0 x5 x4 x3 x1],
)
end
diff --git a/spec/services/themes_spec.rb b/spec/services/themes_spec.rb
index e2857ec9499..6374d1eb0c9 100644
--- a/spec/services/themes_spec.rb
+++ b/spec/services/themes_spec.rb
@@ -3,14 +3,18 @@
RSpec.describe ThemesInstallTask do
fab!(:admin) { Fabricate(:admin) }
- before do
- Discourse::Application.load_tasks
- end
+ before { Discourse::Application.load_tasks }
- describe '.new' do
+ describe ".new" do
THEME_NAME = "awesome theme"
- def about_json(love_color: "FAFAFA", tertiary_low_color: "FFFFFF", color_scheme_name: "Amazing", about_url: "https://www.site.com/about", component: false)
+ def about_json(
+ love_color: "FAFAFA",
+ tertiary_low_color: "FFFFFF",
+ color_scheme_name: "Amazing",
+ about_url: "https://www.site.com/about",
+ component: false
+ )
<<~JSON
{
"name": "#{THEME_NAME}",
@@ -52,7 +56,7 @@ RSpec.describe ThemesInstallTask do
"common/embedded.scss" => "EMBED",
"assets/font.woff2" => "FAKE FONT",
"settings.yaml" => "boolean_setting: true",
- "locales/en.yml" => "sometranslations"
+ "locales/en.yml" => "sometranslations",
)
end
@@ -73,7 +77,7 @@ RSpec.describe ThemesInstallTask do
"common/embedded.scss" => "EMBED",
"assets/font.woff2" => "FAKE FONT",
"settings.yaml" => "boolean_setting: true",
- "locales/en.yml" => "sometranslations"
+ "locales/en.yml" => "sometranslations",
)
end
@@ -86,69 +90,74 @@ RSpec.describe ThemesInstallTask do
`rm -fr #{component_repo}`
end
- it 'gracefully fails' do
- ThemesInstallTask.install("nothing": "fail!")
+ it "gracefully fails" do
+ ThemesInstallTask.install(nothing: "fail!")
expect(Theme.where(name: "fail!").exists?).to eq(false)
end
before do
FinalDestination.stubs(:resolve).with(theme_repo_url).returns(URI.parse(theme_repo_url))
- FinalDestination.stubs(:resolve).with(component_repo_url).returns(URI.parse(component_repo_url))
+ FinalDestination
+ .stubs(:resolve)
+ .with(component_repo_url)
+ .returns(URI.parse(component_repo_url))
end
- around(:each) do |group|
- MockGitImporter.with_mock do
- group.run
- end
- end
+ around(:each) { |group| MockGitImporter.with_mock { group.run } }
describe "no options" do
- it 'installs a theme' do
- ThemesInstallTask.install("some_theme": theme_repo_url)
+ it "installs a theme" do
+ ThemesInstallTask.install(some_theme: theme_repo_url)
expect(Theme.where(name: THEME_NAME).exists?).to eq(true)
end
end
describe "with options" do
- it 'installs a theme from only a url' do
- ThemesInstallTask.install({ "some_theme": { "url": theme_repo_url } })
+ it "installs a theme from only a url" do
+ ThemesInstallTask.install({ some_theme: { url: theme_repo_url } })
expect(Theme.where(name: THEME_NAME).exists?).to eq(true)
end
- it 'does not set the theme to default if the key/value is not present' do
- ThemesInstallTask.install({ "some_theme": { "url": theme_repo_url } })
+ it "does not set the theme to default if the key/value is not present" do
+ ThemesInstallTask.install({ some_theme: { url: theme_repo_url } })
theme = Theme.find_by(name: THEME_NAME)
expect(theme.default?).to eq(false)
end
- it 'sets the theme to default if the key/value is true' do
- ThemesInstallTask.install({ "some_theme": { "url": theme_repo_url, default: true } })
+ it "sets the theme to default if the key/value is true" do
+ ThemesInstallTask.install({ some_theme: { url: theme_repo_url, default: true } })
theme = Theme.find_by(name: THEME_NAME)
expect(theme.default?).to eq(true)
end
- it 'installs theme components, but does not add them to themes' do
- ThemesInstallTask.install({ "some_theme": { "url": component_repo_url } })
+ it "installs theme components, but does not add them to themes" do
+ ThemesInstallTask.install({ some_theme: { url: component_repo_url } })
theme = Theme.find_by(name: THEME_NAME)
expect(theme.component).to eq(true)
end
it 'adds component to all themes if "add_to_all_themes" is true' do
- ThemesInstallTask.install({ "some_theme": { "url": component_repo_url, add_to_all_themes: true } })
+ ThemesInstallTask.install(
+ { some_theme: { url: component_repo_url, add_to_all_themes: true } },
+ )
theme = Theme.find_by(name: THEME_NAME)
- Theme.where(component: false).each do |parent_theme|
- expect(ChildTheme.find_by(parent_theme_id: parent_theme.id, child_theme_id: theme.id).nil?).to eq(false)
- end
+ Theme
+ .where(component: false)
+ .each do |parent_theme|
+ expect(
+ ChildTheme.find_by(parent_theme_id: parent_theme.id, child_theme_id: theme.id).nil?,
+ ).to eq(false)
+ end
end
- it 'updates theme fields' do
- ThemesInstallTask.install({ "some_theme": component_repo_url })
+ it "updates theme fields" do
+ ThemesInstallTask.install({ some_theme: component_repo_url })
theme = Theme.find_by(name: THEME_NAME)
remote = theme.remote_theme
scss = "body { background-color: black; }"
- expect(theme.theme_fields.find_by(name: 'scss', value: scss)).to be_nil
+ expect(theme.theme_fields.find_by(name: "scss", value: scss)).to be_nil
File.write("#{component_repo}/common/common.scss", scss)
@@ -159,30 +168,31 @@ RSpec.describe ThemesInstallTask do
expect(remote.commits_behind).to eq(1)
expect(remote.remote_version).to eq(`cd #{component_repo} && git rev-parse HEAD`.strip)
- ThemesInstallTask.install({ "some_theme": component_repo_url })
+ ThemesInstallTask.install({ some_theme: component_repo_url })
- expect(theme.theme_fields.find_by(name: 'scss', value: scss)).not_to be_nil
+ expect(theme.theme_fields.find_by(name: "scss", value: scss)).not_to be_nil
expect(remote.reload.commits_behind).to eq(0)
end
end
end
- describe '#theme_exists?' do
- it 'can use https or ssh and find the same repo' do
- remote_theme = RemoteTheme.create!(
- remote_url: "https://github.com/org/testtheme.git",
- local_version: "a2ec030e551fc8d8579790e1954876fe769fe40a",
- remote_version: "21122230dbfed804067849393c3332083ddd0c07",
- commits_behind: 2
- )
+ describe "#theme_exists?" do
+ it "can use https or ssh and find the same repo" do
+ remote_theme =
+ RemoteTheme.create!(
+ remote_url: "https://github.com/org/testtheme.git",
+ local_version: "a2ec030e551fc8d8579790e1954876fe769fe40a",
+ remote_version: "21122230dbfed804067849393c3332083ddd0c07",
+ commits_behind: 2,
+ )
Fabricate(:theme, remote_theme: remote_theme, user: admin)
# https
- installer = ThemesInstallTask.new({ "url": "https://github.com/org/testtheme" })
+ installer = ThemesInstallTask.new({ url: "https://github.com/org/testtheme" })
expect(installer.theme_exists?).to eq(true)
# ssh
- installer = ThemesInstallTask.new({ "url": "git@github.com:org/testtheme.git" })
+ installer = ThemesInstallTask.new({ url: "git@github.com:org/testtheme.git" })
expect(installer.theme_exists?).to eq(true)
end
end
diff --git a/spec/services/topic_bookmarkable_spec.rb b/spec/services/topic_bookmarkable_spec.rb
index c254d0fb444..ac2ad2454b4 100644
--- a/spec/services/topic_bookmarkable_spec.rb
+++ b/spec/services/topic_bookmarkable_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-require 'rails_helper'
+require "rails_helper"
RSpec.describe TopicBookmarkable do
fab!(:user) { Fabricate(:user) }
@@ -10,7 +10,9 @@ RSpec.describe TopicBookmarkable do
let!(:topic1) { Fabricate(:topic) }
let!(:topic2) { Fabricate(:topic) }
let!(:post) { Fabricate(:post, topic: topic1) }
- let!(:bookmark1) { Fabricate(:bookmark, user: user, bookmarkable: topic1, name: "something i gotta do") }
+ let!(:bookmark1) do
+ Fabricate(:bookmark, user: user, bookmarkable: topic1, name: "something i gotta do")
+ end
let!(:bookmark2) { Fabricate(:bookmark, user: user, bookmarkable: topic2) }
let!(:bookmark3) { Fabricate(:bookmark) }
let!(:topic_user1) { Fabricate(:topic_user, user: user, topic: topic1) }
@@ -20,7 +22,9 @@ RSpec.describe TopicBookmarkable do
describe "#perform_list_query" do
it "returns all the user's bookmarks" do
- expect(subject.perform_list_query(user, guardian).map(&:id)).to match_array([bookmark1.id, bookmark2.id])
+ expect(subject.perform_list_query(user, guardian).map(&:id)).to match_array(
+ [bookmark1.id, bookmark2.id],
+ )
end
it "does not return bookmarks for posts where the user does not have access to the topic category" do
@@ -35,13 +39,17 @@ RSpec.describe TopicBookmarkable do
end
describe "#perform_search_query" do
- before do
- SearchIndexer.enable
- end
+ before { SearchIndexer.enable }
it "returns bookmarks that match by name" do
ts_query = Search.ts_query(term: "gotta", ts_config: "simple")
- expect(subject.perform_search_query(subject.perform_list_query(user, guardian), "%gotta%", ts_query).map(&:id)).to match_array([bookmark1.id])
+ expect(
+ subject.perform_search_query(
+ subject.perform_list_query(user, guardian),
+ "%gotta%",
+ ts_query,
+ ).map(&:id),
+ ).to match_array([bookmark1.id])
end
it "returns bookmarks that match by post search data (topic title or post content)" do
@@ -49,13 +57,31 @@ RSpec.describe TopicBookmarkable do
topic1.update(title: "a great topic title")
ts_query = Search.ts_query(term: "post content", ts_config: "simple")
- expect(subject.perform_search_query(subject.perform_list_query(user, guardian), "%post content%", ts_query).map(&:id)).to match_array([bookmark1.id])
+ expect(
+ subject.perform_search_query(
+ subject.perform_list_query(user, guardian),
+ "%post content%",
+ ts_query,
+ ).map(&:id),
+ ).to match_array([bookmark1.id])
ts_query = Search.ts_query(term: "great topic", ts_config: "simple")
- expect(subject.perform_search_query(subject.perform_list_query(user, guardian), "%great topic%", ts_query).map(&:id)).to match_array([bookmark1.id])
+ expect(
+ subject.perform_search_query(
+ subject.perform_list_query(user, guardian),
+ "%great topic%",
+ ts_query,
+ ).map(&:id),
+ ).to match_array([bookmark1.id])
ts_query = Search.ts_query(term: "blah", ts_config: "simple")
- expect(subject.perform_search_query(subject.perform_list_query(user, guardian), "%blah%", ts_query).map(&:id)).to eq([])
+ expect(
+ subject.perform_search_query(
+ subject.perform_list_query(user, guardian),
+ "%blah%",
+ ts_query,
+ ).map(&:id),
+ ).to eq([])
end
end
@@ -70,7 +96,9 @@ RSpec.describe TopicBookmarkable do
describe "#reminder_handler" do
it "creates a notification for the user with the correct details" do
- expect { subject.send_reminder_notification(bookmark1) }.to change { Notification.count }.by(1)
+ expect { subject.send_reminder_notification(bookmark1) }.to change { Notification.count }.by(
+ 1,
+ )
notif = user.notifications.last
expect(notif.notification_type).to eq(Notification.types[:bookmark_reminder])
expect(notif.topic_id).to eq(bookmark1.bookmarkable_id)
@@ -81,8 +109,8 @@ RSpec.describe TopicBookmarkable do
bookmarkable_url: bookmark1.bookmarkable.first_post.url,
display_username: bookmark1.user.username,
bookmark_name: bookmark1.name,
- bookmark_id: bookmark1.id
- }.to_json
+ bookmark_id: bookmark1.id,
+ }.to_json,
)
end
end
diff --git a/spec/services/topic_status_updater_spec.rb b/spec/services/topic_status_updater_spec.rb
index af96f34303a..122c7650438 100644
--- a/spec/services/topic_status_updater_spec.rb
+++ b/spec/services/topic_status_updater_spec.rb
@@ -4,18 +4,19 @@
# TODO - test pinning, create_moderator_post
RSpec.describe TopicStatusUpdater do
-
fab!(:user) { Fabricate(:user) }
fab!(:admin) { Fabricate(:admin) }
it "avoids notifying on automatically closed topics" do
# TODO: TopicStatusUpdater should suppress message bus updates from the users it "pretends to read"
- post = PostCreator.create(user,
- raw: "this is a test post 123 this is a test post",
- title: "hello world title",
- )
+ post =
+ PostCreator.create(
+ user,
+ raw: "this is a test post 123 this is a test post",
+ title: "hello world title",
+ )
# TODO needed so counts sync up, PostCreator really should not give back out-of-date Topic
- post.topic.set_or_create_timer(TopicTimer.types[:close], '10')
+ post.topic.set_or_create_timer(TopicTimer.types[:close], "10")
post.topic.reload
TopicStatusUpdater.new(post.topic, admin).update!("autoclosed", true)
@@ -28,13 +29,13 @@ RSpec.describe TopicStatusUpdater do
it "adds an autoclosed message" do
topic = create_topic
- topic.set_or_create_timer(TopicTimer.types[:close], '10')
+ topic.set_or_create_timer(TopicTimer.types[:close], "10")
TopicStatusUpdater.new(topic, admin).update!("autoclosed", true)
last_post = topic.posts.last
expect(last_post.post_type).to eq(Post.types[:small_action])
- expect(last_post.action_code).to eq('autoclosed.enabled')
+ expect(last_post.action_code).to eq("autoclosed.enabled")
expect(last_post.raw).to eq(I18n.t("topic_statuses.autoclosed_enabled_minutes", count: 0))
end
@@ -42,7 +43,7 @@ RSpec.describe TopicStatusUpdater do
topic = create_topic
called = false
- updater = -> (_) { called = true }
+ updater = ->(_) { called = true }
DiscourseEvent.on(:topic_closed, &updater)
TopicStatusUpdater.new(topic, admin).update!("closed", true)
@@ -57,24 +58,27 @@ RSpec.describe TopicStatusUpdater do
Fabricate(:post, topic: topic)
topic.set_or_create_timer(
- TopicTimer.types[:close], nil, based_on_last_post: true, duration_minutes: 600
+ TopicTimer.types[:close],
+ nil,
+ based_on_last_post: true,
+ duration_minutes: 600,
)
TopicStatusUpdater.new(topic, admin).update!("autoclosed", true)
last_post = topic.posts.last
expect(last_post.post_type).to eq(Post.types[:small_action])
- expect(last_post.action_code).to eq('autoclosed.enabled')
- expect(last_post.raw).to eq(I18n.t("topic_statuses.autoclosed_enabled_lastpost_hours", count: 10))
+ expect(last_post.action_code).to eq("autoclosed.enabled")
+ expect(last_post.raw).to eq(
+ I18n.t("topic_statuses.autoclosed_enabled_lastpost_hours", count: 10),
+ )
end
describe "opening the topic" do
it "opens the topic and deletes the timer" do
topic = create_topic
- topic.set_or_create_timer(
- TopicTimer.types[:open], 10.hours.from_now
- )
+ topic.set_or_create_timer(TopicTimer.types[:open], 10.hours.from_now)
TopicStatusUpdater.new(topic, admin).update!("closed", false)
timer = TopicTimer.find_by(topic: topic)
@@ -88,18 +92,20 @@ RSpec.describe TopicStatusUpdater do
before do
# auto close after 3 days, topic was created a day ago
topic.update(
- category: Fabricate(:category, auto_close_hours: 72, auto_close_based_on_last_post: based_on_last_post),
- created_at: 1.day.ago
+ category:
+ Fabricate(
+ :category,
+ auto_close_hours: 72,
+ auto_close_based_on_last_post: based_on_last_post,
+ ),
+ created_at: 1.day.ago,
)
end
it "inherits auto close from the topic category, based on the created_at date of the topic" do
-
# close the topic manually, and set a timer to automatically open
TopicStatusUpdater.new(topic, admin).update!("closed", true)
- topic.set_or_create_timer(
- TopicTimer.types[:open], 10.hours.from_now
- )
+ topic.set_or_create_timer(TopicTimer.types[:open], 10.hours.from_now)
# manually open the topic. it has been 1 days since creation so the
# topic should auto-close 2 days from now, the original auto close time
@@ -111,14 +117,11 @@ RSpec.describe TopicStatusUpdater do
end
it "does not inherit auto close from the topic category if it has already been X hours since topic creation" do
-
topic.category.update(auto_close_hours: 1)
# close the topic manually, and set a timer to automatically open
TopicStatusUpdater.new(topic, admin).update!("closed", true)
- topic.set_or_create_timer(
- TopicTimer.types[:open], 10.hours.from_now
- )
+ topic.set_or_create_timer(TopicTimer.types[:open], 10.hours.from_now)
# manually open the topic. it has been over a day since creation and
# the auto close hours was 1 so a new timer should not be made
@@ -132,12 +135,9 @@ RSpec.describe TopicStatusUpdater do
let(:based_on_last_post) { true }
it "inherits auto close from the topic category, using the duration because the close is based_on_last_post" do
-
# close the topic manually, and set a timer to automatically open
TopicStatusUpdater.new(topic, admin).update!("closed", true)
- topic.set_or_create_timer(
- TopicTimer.types[:open], 10.hours.from_now
- )
+ topic.set_or_create_timer(TopicTimer.types[:open], 10.hours.from_now)
# manually open the topic. it should re open 3 days from now, NOT
# 3 days from creation
@@ -153,7 +153,6 @@ RSpec.describe TopicStatusUpdater do
end
describe "repeat actions" do
-
shared_examples "an action that doesn't repeat" do
it "does not perform the update twice" do
topic = Fabricate(:topic, status_name => false)
@@ -173,7 +172,6 @@ RSpec.describe TopicStatusUpdater do
expect(updated).to eq(false)
expect(topic.posts.where(post_type: Post.types[:small_action]).count).to eq(2)
end
-
end
it_behaves_like "an action that doesn't repeat" do
@@ -190,22 +188,21 @@ RSpec.describe TopicStatusUpdater do
it "updates autoclosed" do
topic = Fabricate(:topic)
- updated = TopicStatusUpdater.new(topic, admin).update!('autoclosed', true)
+ updated = TopicStatusUpdater.new(topic, admin).update!("autoclosed", true)
expect(updated).to eq(true)
expect(topic.closed?).to eq(true)
- updated = TopicStatusUpdater.new(topic, admin).update!('autoclosed', true)
+ updated = TopicStatusUpdater.new(topic, admin).update!("autoclosed", true)
expect(updated).to eq(false)
expect(topic.posts.where(post_type: Post.types[:small_action]).count).to eq(1)
- updated = TopicStatusUpdater.new(topic, admin).update!('autoclosed', false)
+ updated = TopicStatusUpdater.new(topic, admin).update!("autoclosed", false)
expect(updated).to eq(true)
expect(topic.closed?).to eq(false)
- updated = TopicStatusUpdater.new(topic, admin).update!('autoclosed', false)
+ updated = TopicStatusUpdater.new(topic, admin).update!("autoclosed", false)
expect(updated).to eq(false)
expect(topic.posts.where(post_type: Post.types[:small_action]).count).to eq(2)
end
-
end
end
diff --git a/spec/services/topic_timestamp_changer_spec.rb b/spec/services/topic_timestamp_changer_spec.rb
index b1eaad93220..45c41cb7bee 100644
--- a/spec/services/topic_timestamp_changer_spec.rb
+++ b/spec/services/topic_timestamp_changer_spec.rb
@@ -7,19 +7,20 @@ RSpec.describe TopicTimestampChanger do
let!(:p1) { Fabricate(:post, topic: topic, created_at: old_timestamp) }
let!(:p2) { Fabricate(:post, topic: topic, created_at: old_timestamp + 1.day) }
- context 'when new timestamp is in the future' do
+ context "when new timestamp is in the future" do
let(:new_timestamp) { old_timestamp + 2.day }
- it 'should raise the right error' do
- expect { TopicTimestampChanger.new(topic: topic, timestamp: new_timestamp.to_f).change! }
- .to raise_error(TopicTimestampChanger::InvalidTimestampError)
+ it "should raise the right error" do
+ expect {
+ TopicTimestampChanger.new(topic: topic, timestamp: new_timestamp.to_f).change!
+ }.to raise_error(TopicTimestampChanger::InvalidTimestampError)
end
end
- context 'when new timestamp is in the past' do
+ context "when new timestamp is in the past" do
let(:new_timestamp) { old_timestamp - 2.day }
- it 'changes the timestamp of the topic and opening post' do
+ it "changes the timestamp of the topic and opening post" do
freeze_time
TopicTimestampChanger.new(topic: topic, timestamp: new_timestamp.to_f).change!
@@ -40,8 +41,8 @@ RSpec.describe TopicTimestampChanger do
expect(p2.updated_at).to eq_time(new_timestamp + 1.day)
end
- context 'when posts have timestamps in the future' do
- it 'should set the new timestamp as the default timestamp' do
+ context "when posts have timestamps in the future" do
+ it "should set the new timestamp as the default timestamp" do
new_timestamp = freeze_time
p3 = Fabricate(:post, topic: topic, created_at: new_timestamp + 3.days)
@@ -55,7 +56,7 @@ RSpec.describe TopicTimestampChanger do
end
end
- it 'deletes the stats cache' do
+ it "deletes the stats cache" do
Discourse.redis.set AdminDashboardData.stats_cache_key, "X"
Discourse.redis.set About.stats_cache_key, "X"
diff --git a/spec/services/trust_level_granter_spec.rb b/spec/services/trust_level_granter_spec.rb
index ff0033d1b15..03fe30a899a 100644
--- a/spec/services/trust_level_granter_spec.rb
+++ b/spec/services/trust_level_granter_spec.rb
@@ -1,10 +1,8 @@
# frozen_string_literal: true
RSpec.describe TrustLevelGranter do
-
- describe 'grant' do
-
- it 'grants trust level' do
+ describe "grant" do
+ it "grants trust level" do
user = Fabricate(:user, email: "foo@bar.com", trust_level: 0)
TrustLevelGranter.grant(3, user)
diff --git a/spec/services/user_activator_spec.rb b/spec/services/user_activator_spec.rb
index 36bb4cc6c36..ac8591c5177 100644
--- a/spec/services/user_activator_spec.rb
+++ b/spec/services/user_activator_spec.rb
@@ -4,10 +4,10 @@ RSpec.describe UserActivator do
fab!(:user) { Fabricate(:user) }
let!(:email_token) { Fabricate(:email_token, user: user) }
- describe 'email_activator' do
+ describe "email_activator" do
let(:activator) { EmailActivator.new(user, nil, nil, nil) }
- it 'create email token and enqueues user email' do
+ it "create email token and enqueues user email" do
now = freeze_time
activator.activate
email_token = user.reload.email_tokens.last
diff --git a/spec/services/user_anonymizer_spec.rb b/spec/services/user_anonymizer_spec.rb
index f2c50945661..16c7a141151 100644
--- a/spec/services/user_anonymizer_spec.rb
+++ b/spec/services/user_anonymizer_spec.rb
@@ -5,19 +5,19 @@ RSpec.describe UserAnonymizer do
describe "event" do
let(:user) { Fabricate(:user, username: "edward") }
- subject(:make_anonymous) { described_class.make_anonymous(user, admin, anonymize_ip: '2.2.2.2') }
+ subject(:make_anonymous) do
+ described_class.make_anonymous(user, admin, anonymize_ip: "2.2.2.2")
+ end
it "triggers the event" do
- events = DiscourseEvent.track_events do
- make_anonymous
- end
+ events = DiscourseEvent.track_events { make_anonymous }
anon_event = events.detect { |e| e[:event_name] == :user_anonymized }
expect(anon_event).to be_present
params_hash = anon_event[:params][0]
expect(params_hash[:user]).to eq(user)
- expect(params_hash[:opts][:anonymize_ip]).to eq('2.2.2.2')
+ expect(params_hash[:opts][:anonymize_ip]).to eq("2.2.2.2")
end
end
@@ -38,7 +38,7 @@ RSpec.describe UserAnonymizer do
end
it "changes the primary email address when there is an email domain allowlist" do
- SiteSetting.allowed_email_domains = 'example.net|wayne.com|discourse.org'
+ SiteSetting.allowed_email_domains = "example.net|wayne.com|discourse.org"
make_anonymous
expect(user.reload.email).to eq("#{user.username}@anonymized.invalid")
@@ -54,7 +54,7 @@ RSpec.describe UserAnonymizer do
it "turns off all notifications" do
user.user_option.update_columns(
email_level: UserOption.email_level_types[:always],
- email_messages_level: UserOption.email_level_types[:always]
+ email_messages_level: UserOption.email_level_types[:always],
)
make_anonymous
@@ -66,16 +66,10 @@ RSpec.describe UserAnonymizer do
end
context "when Site Settings do not require full name" do
- before do
- SiteSetting.full_name_required = false
- end
+ before { SiteSetting.full_name_required = false }
it "resets profile to default values" do
- user.update!(
- name: "Bibi",
- date_of_birth: 19.years.ago,
- title: "Super Star"
- )
+ user.update!(name: "Bibi", date_of_birth: 19.years.ago, title: "Super Star")
profile = user.reload.user_profile
upload = Fabricate(:upload)
@@ -87,7 +81,7 @@ RSpec.describe UserAnonymizer do
bio_cooked: "I'm Bibi from Moosejaw. I sing and dance.",
profile_background_upload: upload,
bio_cooked_version: 2,
- card_background_upload: upload
+ card_background_upload: upload,
)
prev_username = user.username
@@ -114,9 +108,7 @@ RSpec.describe UserAnonymizer do
end
context "when Site Settings require full name" do
- before do
- SiteSetting.full_name_required = true
- end
+ before { SiteSetting.full_name_required = true }
it "changes name to anonymized username" do
prev_username = user.username
@@ -199,8 +191,19 @@ RSpec.describe UserAnonymizer do
end
it "removes external auth associations" do
- user.user_associated_accounts = [UserAssociatedAccount.create(user_id: user.id, provider_uid: "example", provider_name: "facebook")]
- user.single_sign_on_record = SingleSignOnRecord.create(user_id: user.id, external_id: "example", last_payload: "looks good")
+ user.user_associated_accounts = [
+ UserAssociatedAccount.create(
+ user_id: user.id,
+ provider_uid: "example",
+ provider_name: "facebook",
+ ),
+ ]
+ user.single_sign_on_record =
+ SingleSignOnRecord.create(
+ user_id: user.id,
+ external_id: "example",
+ last_payload: "looks good",
+ )
make_anonymous
user.reload
expect(user.user_associated_accounts).to be_empty
@@ -226,9 +229,7 @@ RSpec.describe UserAnonymizer do
end
context "when executing jobs" do
- before do
- Jobs.run_immediately!
- end
+ before { Jobs.run_immediately! }
it "removes invites" do
Fabricate(:invited_user, invite: Fabricate(:invite), user: user)
@@ -266,16 +267,25 @@ RSpec.describe UserAnonymizer do
it "removes raw email from posts" do
post1 = Fabricate(:post, user: user, via_email: true, raw_email: "raw email from user")
- post2 = Fabricate(:post, user: another_user, via_email: true, raw_email: "raw email from another user")
+ post2 =
+ Fabricate(
+ :post,
+ user: another_user,
+ via_email: true,
+ raw_email: "raw email from another user",
+ )
make_anonymous
expect(post1.reload).to have_attributes(via_email: true, raw_email: nil)
- expect(post2.reload).to have_attributes(via_email: true, raw_email: "raw email from another user")
+ expect(post2.reload).to have_attributes(
+ via_email: true,
+ raw_email: "raw email from another user",
+ )
end
it "does not delete profile views" do
- UserProfileView.add(user.id, '127.0.0.1', another_user.id, Time.now, true)
+ UserProfileView.add(user.id, "127.0.0.1", another_user.id, Time.now, true)
expect { make_anonymous }.to_not change { UserProfileView.count }
end
@@ -284,10 +294,10 @@ RSpec.describe UserAnonymizer do
field2 = Fabricate(:user_field)
user.custom_fields = {
- "some_field": "123",
+ some_field: "123",
"user_field_#{field1.id}": "foo",
"user_field_#{field2.id}": "bar",
- "another_field": "456"
+ another_field: "456",
}
expect { make_anonymous }.to change { user.custom_fields }
@@ -320,34 +330,39 @@ RSpec.describe UserAnonymizer do
screened_email = ScreenedEmail.create!(email: user.email, ip_address: old_ip)
- search_log = SearchLog.create!(
- term: 'wat',
- search_type: SearchLog.search_types[:header],
- user_id: user.id,
- ip_address: old_ip
- )
+ search_log =
+ SearchLog.create!(
+ term: "wat",
+ search_type: SearchLog.search_types[:header],
+ user_id: user.id,
+ ip_address: old_ip,
+ )
- topic_link = TopicLink.create!(
- user_id: admin.id,
+ topic_link =
+ TopicLink.create!(
+ user_id: admin.id,
+ topic_id: topic.id,
+ url: "https://discourse.org",
+ domain: "discourse.org",
+ )
+
+ topic_link_click =
+ TopicLinkClick.create!(topic_link_id: topic_link.id, user_id: user.id, ip_address: old_ip)
+
+ user_profile_view =
+ UserProfileView.create!(
+ user_id: user.id,
+ user_profile_id: admin.user_profile.id,
+ ip_address: old_ip,
+ viewed_at: Time.now,
+ )
+
+ TopicViewItem.create!(
topic_id: topic.id,
- url: 'https://discourse.org',
- domain: 'discourse.org'
- )
-
- topic_link_click = TopicLinkClick.create!(
- topic_link_id: topic_link.id,
user_id: user.id,
- ip_address: old_ip
- )
-
- user_profile_view = UserProfileView.create!(
- user_id: user.id,
- user_profile_id: admin.user_profile.id,
ip_address: old_ip,
- viewed_at: Time.now
+ viewed_at: Time.now,
)
-
- TopicViewItem.create!(topic_id: topic.id, user_id: user.id, ip_address: old_ip, viewed_at: Time.now)
delete_history = StaffActionLogger.new(admin).log_user_deletion(user)
user_history = StaffActionLogger.new(user).log_backup_create
@@ -363,18 +378,17 @@ RSpec.describe UserAnonymizer do
expect(user_history.reload.ip_address).to eq(anon_ip)
expect(user_profile_view.reload.ip_address).to eq(anon_ip)
end
-
end
describe "anonymize_emails" do
it "destroys all associated invites" do
- invite = Fabricate(:invite, email: 'test@example.com')
+ invite = Fabricate(:invite, email: "test@example.com")
user = invite.redeem
Jobs.run_immediately!
described_class.make_anonymous(user, admin)
- expect(user.email).not_to eq('test@example.com')
+ expect(user.email).not_to eq("test@example.com")
expect(Invite.exists?(id: invite.id)).to eq(false)
end
end
diff --git a/spec/services/user_authenticator_spec.rb b/spec/services/user_authenticator_spec.rb
index bb147190c49..5e476e38c64 100644
--- a/spec/services/user_authenticator_spec.rb
+++ b/spec/services/user_authenticator_spec.rb
@@ -11,18 +11,16 @@ RSpec.describe UserAuthenticator do
authenticator_name: "github",
extra_data: {
provider: "github",
- uid: "100"
+ uid: "100",
},
- skip_email_validation: false
+ skip_email_validation: false,
}
end
- before do
- SiteSetting.enable_github_logins = true
- end
+ before { SiteSetting.enable_github_logins = true }
describe "#start" do
- describe 'without authentication session' do
+ describe "without authentication session" do
it "should apply the right user attributes" do
user = User.new
UserAuthenticator.new(user, {}).start
@@ -85,11 +83,9 @@ RSpec.describe UserAuthenticator do
it "raises an error for non-boolean values" do
user = Fabricate(:user, email: "user53@discourse.org")
- session = { authentication: github_auth('string') }
+ session = { authentication: github_auth("string") }
- expect do
- UserAuthenticator.new(user, session).finish
- end.to raise_error ArgumentError
+ expect do UserAuthenticator.new(user, session).finish end.to raise_error ArgumentError
end
end
end
diff --git a/spec/services/user_destroyer_spec.rb b/spec/services/user_destroyer_spec.rb
index 4a053d66b02..48210ff932b 100644
--- a/spec/services/user_destroyer_spec.rb
+++ b/spec/services/user_destroyer_spec.rb
@@ -4,41 +4,45 @@ RSpec.describe UserDestroyer do
fab!(:user) { Fabricate(:user_with_secondary_email) }
fab!(:admin) { Fabricate(:admin) }
- describe '.new' do
- it 'raises an error when user is nil' do
+ describe ".new" do
+ it "raises an error when user is nil" do
expect { UserDestroyer.new(nil) }.to raise_error(Discourse::InvalidParameters)
end
- it 'raises an error when user is not a User' do
+ it "raises an error when user is not a User" do
expect { UserDestroyer.new(5) }.to raise_error(Discourse::InvalidParameters)
end
end
- describe '#destroy' do
- it 'raises an error when user is nil' do
+ describe "#destroy" do
+ it "raises an error when user is nil" do
expect { UserDestroyer.new(admin).destroy(nil) }.to raise_error(Discourse::InvalidParameters)
end
- it 'raises an error when user is not a User' do
- expect { UserDestroyer.new(admin).destroy('nothing') }.to raise_error(Discourse::InvalidParameters)
+ it "raises an error when user is not a User" do
+ expect { UserDestroyer.new(admin).destroy("nothing") }.to raise_error(
+ Discourse::InvalidParameters,
+ )
end
- it 'raises an error when regular user tries to delete another user' do
- expect { UserDestroyer.new(user).destroy(Fabricate(:user)) }.to raise_error(Discourse::InvalidAccess)
+ it "raises an error when regular user tries to delete another user" do
+ expect { UserDestroyer.new(user).destroy(Fabricate(:user)) }.to raise_error(
+ Discourse::InvalidAccess,
+ )
end
shared_examples "successfully destroy a user" do
- it 'should delete the user' do
+ it "should delete the user" do
expect { destroy }.to change { User.count }.by(-1)
end
- it 'should return the deleted user record' do
+ it "should return the deleted user record" do
return_value = destroy
expect(return_value).to eq(user)
expect(return_value).to be_destroyed
end
- it 'should log the action' do
+ it "should log the action" do
StaffActionLogger.any_instance.expects(:log_user_deletion).with(user, anything).once
destroy
end
@@ -49,7 +53,7 @@ RSpec.describe UserDestroyer do
}.to_not change { UserHistory.where(action: UserHistory.actions[:delete_user]).count }
end
- it 'triggers a extensibility event' do
+ it "triggers a extensibility event" do
event = DiscourseEvent.track_events { destroy }.last
expect(event[:event_name]).to eq(:user_destroyed)
@@ -70,23 +74,23 @@ RSpec.describe UserDestroyer do
end
end
- context 'when user deletes self' do
+ context "when user deletes self" do
let(:destroy_opts) { { delete_posts: true, context: "/u/username/preferences/account" } }
subject(:destroy) { UserDestroyer.new(user).destroy(user, destroy_opts) }
include_examples "successfully destroy a user"
- it 'should log proper context' do
+ it "should log proper context" do
destroy
- expect(UserHistory.where(action: UserHistory.actions[:delete_user]).last.context).to eq(I18n.t("staff_action_logs.user_delete_self", url: "/u/username/preferences/account"))
+ expect(UserHistory.where(action: UserHistory.actions[:delete_user]).last.context).to eq(
+ I18n.t("staff_action_logs.user_delete_self", url: "/u/username/preferences/account"),
+ )
end
end
- context 'when context is missing' do
+ context "when context is missing" do
it "logs warning message if context is missing" do
- logger = track_log_messages do
- UserDestroyer.new(admin).destroy(user)
- end
+ logger = track_log_messages { UserDestroyer.new(admin).destroy(user) }
expect(logger.warnings).to include(/User destroyed without context from:/)
end
end
@@ -103,7 +107,7 @@ RSpec.describe UserDestroyer do
context "with a reviewable user" do
let(:reviewable) { Fabricate(:reviewable, created_by: admin) }
- it 'sets the reviewable user as rejected' do
+ it "sets the reviewable user as rejected" do
UserDestroyer.new(admin).destroy(reviewable.target)
expect(reviewable.reload).to be_rejected
@@ -111,7 +115,6 @@ RSpec.describe UserDestroyer do
end
context "with a directory item record" do
-
it "removes the directory item" do
DirectoryItem.create!(
user: user,
@@ -120,7 +123,7 @@ RSpec.describe UserDestroyer do
likes_given: 0,
topics_entered: 0,
topic_count: 0,
- post_count: 0
+ post_count: 0,
)
UserDestroyer.new(admin).destroy(user)
expect(DirectoryItem.where(user_id: user.id).count).to eq(0)
@@ -128,7 +131,7 @@ RSpec.describe UserDestroyer do
end
context "with a draft" do
- let!(:draft) { Draft.set(user, 'test', 0, 'test') }
+ let!(:draft) { Draft.set(user, "test", 0, "test") }
it "removed the draft" do
UserDestroyer.new(admin).destroy(user)
@@ -136,7 +139,7 @@ RSpec.describe UserDestroyer do
end
end
- context 'when user has posts' do
+ context "when user has posts" do
let!(:topic_starter) { Fabricate(:user) }
let!(:topic) { Fabricate(:topic, user: topic_starter) }
let!(:first_post) { Fabricate(:post, user: topic_starter, topic: topic) }
@@ -149,7 +152,7 @@ RSpec.describe UserDestroyer do
user.stubs(:first_post_created_at).returns(Time.zone.now)
end
- it 'should raise the right error' do
+ it "should raise the right error" do
StaffActionLogger.any_instance.expects(:log_user_deletion).never
expect { destroy }.to raise_error(UserDestroyer::PostsExistError)
expect(user.reload.id).to be_present
@@ -186,7 +189,6 @@ RSpec.describe UserDestroyer do
end
context "when delete_as_spammer is true" do
-
before { destroy_opts[:delete_as_spammer] = true }
it "approves reviewable flags" do
@@ -199,7 +201,6 @@ RSpec.describe UserDestroyer do
reviewable.reload
expect(reviewable).to be_approved
end
-
end
end
@@ -218,7 +219,7 @@ RSpec.describe UserDestroyer do
end
end
- context 'when user was invited' do
+ context "when user was invited" do
it "should delete the invite of user" do
invite = Fabricate(:invite)
topic_invite = invite.topic_invites.create!(topic: Fabricate(:topic))
@@ -234,13 +235,13 @@ RSpec.describe UserDestroyer do
end
end
- context 'when user created category' do
+ context "when user created category" do
let!(:topic) { Fabricate(:topic, user: user) }
let!(:first_post) { Fabricate(:post, user: user, topic: topic) }
let!(:second_post) { Fabricate(:post, user: user, topic: topic) }
let!(:category) { Fabricate(:category, user: user, topic_id: topic.id) }
- it 'changes author of first category post to system user and still deletes second post' do
+ it "changes author of first category post to system user and still deletes second post" do
UserDestroyer.new(admin).destroy(user, delete_posts: true)
expect(first_post.reload.deleted_at).to eq(nil)
@@ -251,7 +252,7 @@ RSpec.describe UserDestroyer do
end
end
- context 'when user has no posts, but user_stats table has post_count > 0' do
+ context "when user has no posts, but user_stats table has post_count > 0" do
before do
# out of sync user_stat data shouldn't break UserDestroyer
user.user_stat.update_attribute(:post_count, 1)
@@ -262,7 +263,7 @@ RSpec.describe UserDestroyer do
include_examples "successfully destroy a user"
end
- context 'when user has deleted posts' do
+ context "when user has deleted posts" do
let!(:deleted_post) { Fabricate(:post, user: user, deleted_at: 1.hour.ago) }
it "should mark the user's deleted posts as belonging to a nuked user" do
expect { UserDestroyer.new(admin).destroy(user) }.to change { User.count }.by(-1)
@@ -270,8 +271,8 @@ RSpec.describe UserDestroyer do
end
end
- context 'when user has no posts' do
- context 'when destroy succeeds' do
+ context "when user has no posts" do
+ context "when destroy succeeds" do
let(:destroy_opts) { {} }
subject(:destroy) { UserDestroyer.new(admin).destroy(user) }
@@ -279,10 +280,10 @@ RSpec.describe UserDestroyer do
include_examples "email block list"
end
- context 'when destroy fails' do
+ context "when destroy fails" do
subject(:destroy) { UserDestroyer.new(admin).destroy(user) }
- it 'should not log the action' do
+ it "should not log the action" do
user.stubs(:destroy).returns(false)
StaffActionLogger.any_instance.expects(:log_user_deletion).never
destroy
@@ -290,8 +291,8 @@ RSpec.describe UserDestroyer do
end
end
- context 'when user has posts with links' do
- context 'with external links' do
+ context "when user has posts with links" do
+ context "with external links" do
before do
@post = Fabricate(:post_with_external_links, user: user)
TopicLink.extract_from(@post)
@@ -308,7 +309,7 @@ RSpec.describe UserDestroyer do
end
end
- context 'with internal links' do
+ context "with internal links" do
before do
@post = Fabricate(:post_with_external_links, user: user)
TopicLink.extract_from(@post)
@@ -321,7 +322,7 @@ RSpec.describe UserDestroyer do
end
end
- context 'with oneboxed links' do
+ context "with oneboxed links" do
before do
@post = Fabricate(:post_with_youtube, user: user)
TopicLink.extract_from(@post)
@@ -334,7 +335,7 @@ RSpec.describe UserDestroyer do
end
end
- context 'with ip address screening' do
+ context "with ip address screening" do
it "doesn't create screened_ip_address records by default" do
ScreenedIpAddress.expects(:watch).never
UserDestroyer.new(admin).destroy(user)
@@ -347,15 +348,18 @@ RSpec.describe UserDestroyer do
end
it "creates two new screened_ip_address records when registration_ip_address is different than last ip_address" do
- user.registration_ip_address = '12.12.12.12'
+ user.registration_ip_address = "12.12.12.12"
ScreenedIpAddress.expects(:watch).with(user.ip_address).returns(stub_everything)
- ScreenedIpAddress.expects(:watch).with(user.registration_ip_address).returns(stub_everything)
+ ScreenedIpAddress
+ .expects(:watch)
+ .with(user.registration_ip_address)
+ .returns(stub_everything)
UserDestroyer.new(admin).destroy(user, block_ip: true)
end
end
end
- context 'when user created a category' do
+ context "when user created a category" do
let!(:category) { Fabricate(:category_with_definition, user: user) }
it "assigns the system user to the categories" do
@@ -384,95 +388,85 @@ RSpec.describe UserDestroyer do
end
end
- context 'when user liked things' do
+ context "when user liked things" do
before do
@topic = Fabricate(:topic, user: Fabricate(:user))
@post = Fabricate(:post, user: @topic.user, topic: @topic)
PostActionCreator.like(user, @post)
end
- it 'should destroy the like' do
- expect {
- UserDestroyer.new(admin).destroy(user, delete_posts: true)
- }.to change { PostAction.count }.by(-1)
+ it "should destroy the like" do
+ expect { UserDestroyer.new(admin).destroy(user, delete_posts: true) }.to change {
+ PostAction.count
+ }.by(-1)
expect(@post.reload.like_count).to eq(0)
end
end
- context 'when user belongs to groups that grant trust level' do
+ context "when user belongs to groups that grant trust level" do
let(:group) { Fabricate(:group, grant_trust_level: 4) }
- before do
- group.add(user)
- end
+ before { group.add(user) }
- it 'can delete the user' do
+ it "can delete the user" do
d = UserDestroyer.new(admin)
- expect {
- d.destroy(user)
- }.to change { User.count }.by(-1)
+ expect { d.destroy(user) }.to change { User.count }.by(-1)
end
- it 'can delete the user if they have a manual locked trust level and have no email' do
+ it "can delete the user if they have a manual locked trust level and have no email" do
user.update(manual_locked_trust_level: 3)
UserEmail.where(user: user).delete_all
user.reload
- expect {
- UserDestroyer.new(admin).destroy(user)
- }.to change { User.count }.by(-1)
+ expect { UserDestroyer.new(admin).destroy(user) }.to change { User.count }.by(-1)
end
- it 'can delete the user if they were to fall into another trust level and have no email' do
+ it "can delete the user if they were to fall into another trust level and have no email" do
g2 = Fabricate(:group, grant_trust_level: 1)
g2.add(user)
UserEmail.where(user: user).delete_all
user.reload
- expect {
- UserDestroyer.new(admin).destroy(user)
- }.to change { User.count }.by(-1)
+ expect { UserDestroyer.new(admin).destroy(user) }.to change { User.count }.by(-1)
end
end
- context 'when user has staff action logs' do
+ context "when user has staff action logs" do
before do
logger = StaffActionLogger.new(user)
logger.log_site_setting_change(
- 'site_description',
- 'Our friendly community',
- 'My favourite community',
+ "site_description",
+ "Our friendly community",
+ "My favourite community",
)
logger.log_site_setting_change(
- 'site_description',
- 'Our friendly community',
- 'My favourite community',
- details: "existing details"
+ "site_description",
+ "Our friendly community",
+ "My favourite community",
+ details: "existing details",
)
end
it "should keep the staff action log and add the username" do
username = user.username
- ids = UserHistory.staff_action_records(
- Discourse.system_user,
- acting_user: username
- ).map(&:id)
+ ids =
+ UserHistory.staff_action_records(Discourse.system_user, acting_user: username).map(&:id)
UserDestroyer.new(admin).destroy(user, delete_posts: true)
details = UserHistory.where(id: ids).map(&:details)
expect(details).to contain_exactly(
"\nuser_id: #{user.id}\nusername: #{username}",
- "existing details\nuser_id: #{user.id}\nusername: #{username}"
+ "existing details\nuser_id: #{user.id}\nusername: #{username}",
)
end
end
- context 'when user got an email' do
+ context "when user got an email" do
let!(:email_log) { Fabricate(:email_log, user: user) }
it "does not delete the email log" do
- expect {
- UserDestroyer.new(admin).destroy(user, delete_posts: true)
- }.to_not change { EmailLog.count }
+ expect { UserDestroyer.new(admin).destroy(user, delete_posts: true) }.to_not change {
+ EmailLog.count
+ }
end
end
end
diff --git a/spec/services/user_merger_spec.rb b/spec/services/user_merger_spec.rb
index 8b5d1b45194..a38059c728f 100644
--- a/spec/services/user_merger_spec.rb
+++ b/spec/services/user_merger_spec.rb
@@ -1,8 +1,8 @@
# frozen_string_literal: true
RSpec.describe UserMerger do
- fab!(:target_user) { Fabricate(:user, username: 'alice', email: 'alice@example.com') }
- fab!(:source_user) { Fabricate(:user, username: 'alice1', email: 'alice@work.com') }
+ fab!(:target_user) { Fabricate(:user, username: "alice", email: "alice@example.com") }
+ fab!(:source_user) { Fabricate(:user, username: "alice1", email: "alice@work.com") }
fab!(:walter) { Fabricate(:walter_white) }
fab!(:coding_horror) { Fabricate(:coding_horror) }
@@ -13,11 +13,9 @@ RSpec.describe UserMerger do
fab!(:p5) { Fabricate(:post) }
fab!(:p6) { Fabricate(:post) }
- before do
- Group.refresh_automatic_groups!
- end
+ before { Group.refresh_automatic_groups! }
- def merge_users!(source = nil, target = nil)
+ def merge_users!(source = nil, target = nil)
source ||= source_user
target ||= target_user
UserMerger.new(source, target).merge!
@@ -42,17 +40,19 @@ RSpec.describe UserMerger do
expect(x.reload.user).to eq(target_user)
end
- [post2, post4, topic2, post6].each do |x|
- expect(x.reload.user).to eq(walter)
- end
+ [post2, post4, topic2, post6].each { |x| expect(x.reload.user).to eq(walter) }
end
it "changes owner of personal messages" do
- pm_topic = Fabricate(:private_message_topic, topic_allowed_users: [
- Fabricate.build(:topic_allowed_user, user: target_user),
- Fabricate.build(:topic_allowed_user, user: walter),
- Fabricate.build(:topic_allowed_user, user: source_user)
- ])
+ pm_topic =
+ Fabricate(
+ :private_message_topic,
+ topic_allowed_users: [
+ Fabricate.build(:topic_allowed_user, user: target_user),
+ Fabricate.build(:topic_allowed_user, user: walter),
+ Fabricate.build(:topic_allowed_user, user: source_user),
+ ],
+ )
post1 = Fabricate(:post, topic: pm_topic, user: source_user)
post2 = Fabricate(:post, topic: pm_topic, user: walter)
@@ -93,10 +93,12 @@ RSpec.describe UserMerger do
merge_users!
- category_ids = CategoryUser.where(user_id: target_user.id, notification_level: watching).pluck(:category_id)
+ category_ids =
+ CategoryUser.where(user_id: target_user.id, notification_level: watching).pluck(:category_id)
expect(category_ids).to contain_exactly(category1.id, category2.id, category3.id)
- category_ids = CategoryUser.where(user_id: source_user.id, notification_level: watching).pluck(:category_id)
+ category_ids =
+ CategoryUser.where(user_id: source_user.id, notification_level: watching).pluck(:category_id)
expect(category_ids).to be_empty
end
@@ -134,16 +136,16 @@ RSpec.describe UserMerger do
key_topic_17 = "#{Draft::EXISTING_TOPIC}#{17}"
key_topic_19 = "#{Draft::EXISTING_TOPIC}#{19}"
- create_draft(source_user, Draft::NEW_TOPIC, 'new topic draft by alice1')
- create_draft(source_user, key_topic_17, 'draft by alice1')
- create_draft(source_user, key_topic_19, 'draft by alice1')
- create_draft(target_user, key_topic_19, 'draft by alice')
+ create_draft(source_user, Draft::NEW_TOPIC, "new topic draft by alice1")
+ create_draft(source_user, key_topic_17, "draft by alice1")
+ create_draft(source_user, key_topic_19, "draft by alice1")
+ create_draft(target_user, key_topic_19, "draft by alice")
merge_users!
- expect(current_target_user_draft(Draft::NEW_TOPIC)).to eq('new topic draft by alice1')
- expect(current_target_user_draft(key_topic_17)).to eq('draft by alice1')
- expect(current_target_user_draft(key_topic_19)).to eq('draft by alice')
+ expect(current_target_user_draft(Draft::NEW_TOPIC)).to eq("new topic draft by alice1")
+ expect(current_target_user_draft(key_topic_17)).to eq("draft by alice1")
+ expect(current_target_user_draft(key_topic_19)).to eq("draft by alice")
expect(DraftSequence.where(user_id: source_user.id).count).to eq(0)
expect(Draft.where(user_id: source_user.id).count).to eq(0)
@@ -316,7 +318,9 @@ RSpec.describe UserMerger do
expect(IgnoredUser.where(user_id: source_user.id).count).to eq(0)
expect(IgnoredUser.where(user_id: walter.id, ignored_user_id: target_user.id).count).to eq(1)
- expect(IgnoredUser.where(user_id: coding_horror.id, ignored_user_id: target_user.id).count).to eq(1)
+ expect(
+ IgnoredUser.where(user_id: coding_horror.id, ignored_user_id: target_user.id).count,
+ ).to eq(1)
expect(IgnoredUser.where(ignored_user_id: source_user.id).count).to eq(0)
end
@@ -347,8 +351,9 @@ RSpec.describe UserMerger do
merge_users!
type_ids.each do |type|
- expect(PostAction.where(user_id: target_user.id, post_action_type_id: type)
- .pluck(:post_id)).to contain_exactly(p1.id, p2.id, p3.id)
+ expect(
+ PostAction.where(user_id: target_user.id, post_action_type_id: type).pluck(:post_id),
+ ).to contain_exactly(p1.id, p2.id, p3.id)
end
expect(PostAction.where(user_id: source_user.id).count).to eq(0)
@@ -390,7 +395,7 @@ RSpec.describe UserMerger do
topic_id: post.topic_id,
post_number: post.post_number,
user_id: user.id,
- msecs: msecs
+ msecs: msecs,
)
end
@@ -398,8 +403,10 @@ RSpec.describe UserMerger do
PostTiming.where(
topic_id: post.topic_id,
post_number: post.post_number,
- user_id: user.id
- ).pluck(:msecs)[0] || 0
+ user_id: user.id,
+ ).pluck(:msecs)[
+ 0
+ ] || 0
end
it "merges post timings" do
@@ -408,18 +415,18 @@ RSpec.describe UserMerger do
post3 = p3
post4 = p4
- create_post_timing(post1, source_user, 12345)
+ create_post_timing(post1, source_user, 12_345)
create_post_timing(post2, source_user, 9876)
create_post_timing(post4, source_user, 2**31 - 100)
create_post_timing(post2, target_user, 3333)
- create_post_timing(post3, target_user, 10000)
+ create_post_timing(post3, target_user, 10_000)
create_post_timing(post4, target_user, 5000)
merge_users!
- expect(post_timing_msecs_for(post1, target_user)).to eq(12345)
- expect(post_timing_msecs_for(post2, target_user)).to eq(13209)
- expect(post_timing_msecs_for(post3, target_user)).to eq(10000)
+ expect(post_timing_msecs_for(post1, target_user)).to eq(12_345)
+ expect(post_timing_msecs_for(post2, target_user)).to eq(13_209)
+ expect(post_timing_msecs_for(post3, target_user)).to eq(10_000)
expect(post_timing_msecs_for(post4, target_user)).to eq(2**31 - 1)
expect(PostTiming.where(user_id: source_user.id).count).to eq(0)
@@ -474,16 +481,34 @@ RSpec.describe UserMerger do
expect(reviewable.reviewable_histories.first.created_by).to eq(target_user)
end
- describe 'search logs' do
- after do
- SearchLog.clear_debounce_cache!
- end
+ describe "search logs" do
+ after { SearchLog.clear_debounce_cache! }
it "updates search log entries" do
- SearchLog.log(term: 'hello', search_type: :full_page, ip_address: '192.168.0.1', user_id: source_user.id)
- SearchLog.log(term: 'world', search_type: :full_page, ip_address: '192.168.0.1', user_id: source_user.id)
- SearchLog.log(term: 'star trek', search_type: :full_page, ip_address: '192.168.0.2', user_id: target_user.id)
- SearchLog.log(term: 'bad', search_type: :full_page, ip_address: '192.168.0.3', user_id: walter.id)
+ SearchLog.log(
+ term: "hello",
+ search_type: :full_page,
+ ip_address: "192.168.0.1",
+ user_id: source_user.id,
+ )
+ SearchLog.log(
+ term: "world",
+ search_type: :full_page,
+ ip_address: "192.168.0.1",
+ user_id: source_user.id,
+ )
+ SearchLog.log(
+ term: "star trek",
+ search_type: :full_page,
+ ip_address: "192.168.0.2",
+ user_id: target_user.id,
+ )
+ SearchLog.log(
+ term: "bad",
+ search_type: :full_page,
+ ip_address: "192.168.0.3",
+ user_id: walter.id,
+ )
merge_users!
@@ -519,16 +544,24 @@ RSpec.describe UserMerger do
end
it "merges allowed users for topics" do
- pm_topic1 = Fabricate(:private_message_topic, topic_allowed_users: [
- Fabricate.build(:topic_allowed_user, user: target_user),
- Fabricate.build(:topic_allowed_user, user: walter),
- Fabricate.build(:topic_allowed_user, user: source_user)
- ])
+ pm_topic1 =
+ Fabricate(
+ :private_message_topic,
+ topic_allowed_users: [
+ Fabricate.build(:topic_allowed_user, user: target_user),
+ Fabricate.build(:topic_allowed_user, user: walter),
+ Fabricate.build(:topic_allowed_user, user: source_user),
+ ],
+ )
- pm_topic2 = Fabricate(:private_message_topic, topic_allowed_users: [
- Fabricate.build(:topic_allowed_user, user: walter),
- Fabricate.build(:topic_allowed_user, user: source_user)
- ])
+ pm_topic2 =
+ Fabricate(
+ :private_message_topic,
+ topic_allowed_users: [
+ Fabricate.build(:topic_allowed_user, user: walter),
+ Fabricate.build(:topic_allowed_user, user: source_user),
+ ],
+ )
merge_users!
@@ -552,9 +585,9 @@ RSpec.describe UserMerger do
TopicLink.extract_from(post)
link = topic.topic_links.first
- TopicLinkClick.create!(topic_link_id: link.id, user_id: source_user.id, ip_address: '127.0.0.1')
- TopicLinkClick.create!(topic_link_id: link.id, user_id: target_user.id, ip_address: '127.0.0.1')
- TopicLinkClick.create!(topic_link_id: link.id, user_id: walter.id, ip_address: '127.0.0.1')
+ TopicLinkClick.create!(topic_link_id: link.id, user_id: source_user.id, ip_address: "127.0.0.1")
+ TopicLinkClick.create!(topic_link_id: link.id, user_id: target_user.id, ip_address: "127.0.0.1")
+ TopicLinkClick.create!(topic_link_id: link.id, user_id: walter.id, ip_address: "127.0.0.1")
merge_users!
@@ -568,7 +601,13 @@ RSpec.describe UserMerger do
context "with topic timers" do
def create_topic_timer(topic, user, status_type, deleted_by = nil)
- timer = Fabricate(:topic_timer, topic: topic, user: user, status_type: TopicTimer.types[status_type])
+ timer =
+ Fabricate(
+ :topic_timer,
+ topic: topic,
+ user: user,
+ status_type: TopicTimer.types[status_type],
+ )
timer.trash!(deleted_by) if deleted_by
timer.reload
end
@@ -611,10 +650,12 @@ RSpec.describe UserMerger do
merge_users!
- topic_ids = TopicUser.where(user_id: target_user.id, notification_level: watching).pluck(:topic_id)
+ topic_ids =
+ TopicUser.where(user_id: target_user.id, notification_level: watching).pluck(:topic_id)
expect(topic_ids).to contain_exactly(topic1.id, topic2.id, topic3.id)
- topic_ids = TopicUser.where(user_id: source_user.id, notification_level: watching).pluck(:topic_id)
+ topic_ids =
+ TopicUser.where(user_id: source_user.id, notification_level: watching).pluck(:topic_id)
expect(topic_ids).to be_empty
end
@@ -622,7 +663,7 @@ RSpec.describe UserMerger do
topic1 = Fabricate(:topic)
topic2 = Fabricate(:topic)
topic3 = Fabricate(:topic)
- ip = '127.0.0.1'
+ ip = "127.0.0.1"
TopicViewItem.add(topic1.id, ip, source_user.id)
TopicViewItem.add(topic2.id, ip, source_user.id)
@@ -679,19 +720,23 @@ RSpec.describe UserMerger do
fab!(:post2) { p2 }
def log_like_action(acting_user, user, post)
- UserAction.log_action!(action_type: UserAction::LIKE,
- user_id: user.id,
- acting_user_id: acting_user.id,
- target_topic_id: post.topic_id,
- target_post_id: post.id)
+ UserAction.log_action!(
+ action_type: UserAction::LIKE,
+ user_id: user.id,
+ acting_user_id: acting_user.id,
+ target_topic_id: post.topic_id,
+ target_post_id: post.id,
+ )
end
def log_got_private_message(acting_user, user, topic)
- UserAction.log_action!(action_type: UserAction::GOT_PRIVATE_MESSAGE,
- user_id: user.id,
- acting_user_id: acting_user.id,
- target_topic_id: topic.id,
- target_post_id: -1)
+ UserAction.log_action!(
+ action_type: UserAction::GOT_PRIVATE_MESSAGE,
+ user_id: user.id,
+ acting_user_id: acting_user.id,
+ target_topic_id: topic.id,
+ target_post_id: -1,
+ )
end
it "merges when target_post_id is set" do
@@ -703,29 +748,44 @@ RSpec.describe UserMerger do
expect(UserAction.count).to eq(2)
- action_ids = UserAction.where(action_type: UserAction::LIKE,
- user_id: walter.id,
- acting_user_id: target_user.id).pluck(:id)
+ action_ids =
+ UserAction.where(
+ action_type: UserAction::LIKE,
+ user_id: walter.id,
+ acting_user_id: target_user.id,
+ ).pluck(:id)
expect(action_ids).to contain_exactly(a2.id, a3.id)
end
it "merges when acting_user is neither source_user nor target_user" do
- pm_topic1 = Fabricate(:private_message_topic, topic_allowed_users: [
- Fabricate.build(:topic_allowed_user, user: walter),
- Fabricate.build(:topic_allowed_user, user: source_user),
- Fabricate.build(:topic_allowed_user, user: target_user),
- Fabricate.build(:topic_allowed_user, user: coding_horror),
- ])
+ pm_topic1 =
+ Fabricate(
+ :private_message_topic,
+ topic_allowed_users: [
+ Fabricate.build(:topic_allowed_user, user: walter),
+ Fabricate.build(:topic_allowed_user, user: source_user),
+ Fabricate.build(:topic_allowed_user, user: target_user),
+ Fabricate.build(:topic_allowed_user, user: coding_horror),
+ ],
+ )
- pm_topic2 = Fabricate(:private_message_topic, topic_allowed_users: [
- Fabricate.build(:topic_allowed_user, user: walter),
- Fabricate.build(:topic_allowed_user, user: source_user)
- ])
+ pm_topic2 =
+ Fabricate(
+ :private_message_topic,
+ topic_allowed_users: [
+ Fabricate.build(:topic_allowed_user, user: walter),
+ Fabricate.build(:topic_allowed_user, user: source_user),
+ ],
+ )
- pm_topic3 = Fabricate(:private_message_topic, topic_allowed_users: [
- Fabricate.build(:topic_allowed_user, user: walter),
- Fabricate.build(:topic_allowed_user, user: target_user)
- ])
+ pm_topic3 =
+ Fabricate(
+ :private_message_topic,
+ topic_allowed_users: [
+ Fabricate.build(:topic_allowed_user, user: walter),
+ Fabricate.build(:topic_allowed_user, user: target_user),
+ ],
+ )
_a1 = log_got_private_message(walter, source_user, pm_topic1)
a2 = log_got_private_message(walter, target_user, pm_topic1)
@@ -737,24 +797,35 @@ RSpec.describe UserMerger do
expect(UserAction.count).to eq(4)
- action_ids = UserAction.where(action_type: UserAction::GOT_PRIVATE_MESSAGE,
- user_id: target_user.id,
- acting_user_id: walter.id).pluck(:id)
+ action_ids =
+ UserAction.where(
+ action_type: UserAction::GOT_PRIVATE_MESSAGE,
+ user_id: target_user.id,
+ acting_user_id: walter.id,
+ ).pluck(:id)
expect(action_ids).to contain_exactly(a2.id, a4.id, a5.id)
end
end
it "merges archived messages" do
- pm_topic1 = Fabricate(:private_message_topic, topic_allowed_users: [
- Fabricate.build(:topic_allowed_user, user: target_user),
- Fabricate.build(:topic_allowed_user, user: walter),
- Fabricate.build(:topic_allowed_user, user: source_user)
- ])
+ pm_topic1 =
+ Fabricate(
+ :private_message_topic,
+ topic_allowed_users: [
+ Fabricate.build(:topic_allowed_user, user: target_user),
+ Fabricate.build(:topic_allowed_user, user: walter),
+ Fabricate.build(:topic_allowed_user, user: source_user),
+ ],
+ )
- pm_topic2 = Fabricate(:private_message_topic, topic_allowed_users: [
- Fabricate.build(:topic_allowed_user, user: walter),
- Fabricate.build(:topic_allowed_user, user: source_user)
- ])
+ pm_topic2 =
+ Fabricate(
+ :private_message_topic,
+ topic_allowed_users: [
+ Fabricate.build(:topic_allowed_user, user: walter),
+ Fabricate.build(:topic_allowed_user, user: source_user),
+ ],
+ )
UserArchivedMessage.archive!(source_user.id, pm_topic1)
UserArchivedMessage.archive!(target_user.id, pm_topic1)
@@ -776,7 +847,7 @@ RSpec.describe UserMerger do
granted_by: opts[:granted_by] || Discourse.system_user,
granted_at: opts[:granted_at] || Time.now,
post: opts[:post],
- seq: opts[:seq] || 0
+ seq: opts[:seq] || 0,
)
end
@@ -801,7 +872,7 @@ RSpec.describe UserMerger do
end
it "updates granted_by for user badges" do
- badge = Badge.create!(name: 'Hero', badge_type_id: BadgeType::Gold)
+ badge = Badge.create!(name: "Hero", badge_type_id: BadgeType::Gold)
user_badge = create_badge(badge, walter, seq: 1, granted_by: source_user)
merge_users!
@@ -811,16 +882,16 @@ RSpec.describe UserMerger do
end
it "merges user custom fields" do
- UserCustomField.create!(user_id: source_user.id, name: 'foo', value: '123')
- UserCustomField.create!(user_id: source_user.id, name: 'bar', value: '456')
- UserCustomField.create!(user_id: source_user.id, name: 'duplicate', value: 'source')
- UserCustomField.create!(user_id: target_user.id, name: 'duplicate', value: 'target')
- UserCustomField.create!(user_id: target_user.id, name: 'baz', value: '789')
+ UserCustomField.create!(user_id: source_user.id, name: "foo", value: "123")
+ UserCustomField.create!(user_id: source_user.id, name: "bar", value: "456")
+ UserCustomField.create!(user_id: source_user.id, name: "duplicate", value: "source")
+ UserCustomField.create!(user_id: target_user.id, name: "duplicate", value: "target")
+ UserCustomField.create!(user_id: target_user.id, name: "baz", value: "789")
merge_users!
fields = UserCustomField.where(user_id: target_user.id).pluck(:name, :value)
- expect(fields).to contain_exactly(['foo', '123'], ['bar', '456'], ['duplicate', 'target'], ['baz', '789'])
+ expect(fields).to contain_exactly(%w[foo 123], %w[bar 456], %w[duplicate target], %w[baz 789])
expect(UserCustomField.where(user_id: source_user.id).count).to eq(0)
end
@@ -828,18 +899,18 @@ RSpec.describe UserMerger do
merge_users!
emails = UserEmail.where(user_id: target_user.id).pluck(:email, :primary)
- expect(emails).to contain_exactly(['alice@example.com', true], ['alice@work.com', false])
+ expect(emails).to contain_exactly(["alice@example.com", true], ["alice@work.com", false])
expect(UserEmail.where(user_id: source_user.id).count).to eq(0)
end
it "skips merging email addresses when a secondary email address exists" do
merge_users!(source_user, target_user)
- alice2 = Fabricate(:user, username: 'alice2', email: 'alice@foo.com')
+ alice2 = Fabricate(:user, username: "alice2", email: "alice@foo.com")
merge_users!(alice2, target_user)
emails = UserEmail.where(user_id: target_user.id).pluck(:email, :primary)
- expect(emails).to contain_exactly(['alice@example.com', true], ['alice@work.com', false])
+ expect(emails).to contain_exactly(["alice@example.com", true], ["alice@work.com", false])
expect(UserEmail.where(user_id: source_user.id).count).to eq(0)
end
@@ -862,11 +933,21 @@ RSpec.describe UserMerger do
end
it "updates user history" do
- UserHistory.create(action: UserHistory.actions[:notified_about_get_a_room], target_user_id: source_user.id)
- UserHistory.create(action: UserHistory.actions[:anonymize_user], target_user_id: walter.id, acting_user_id: source_user.id)
+ UserHistory.create(
+ action: UserHistory.actions[:notified_about_get_a_room],
+ target_user_id: source_user.id,
+ )
+ UserHistory.create(
+ action: UserHistory.actions[:anonymize_user],
+ target_user_id: walter.id,
+ acting_user_id: source_user.id,
+ )
merge_users!
- UserHistory.where(action: UserHistory.actions[:merge_user], target_user_id: target_user.id).delete_all
+ UserHistory.where(
+ action: UserHistory.actions[:merge_user],
+ target_user_id: target_user.id,
+ ).delete_all
expect(UserHistory.where(target_user_id: target_user.id).count).to eq(1)
expect(UserHistory.where(target_user_id: source_user.id).count).to eq(0)
@@ -876,7 +957,7 @@ RSpec.describe UserMerger do
end
it "updates user profile views" do
- ip = '127.0.0.1'
+ ip = "127.0.0.1"
UserProfileView.add(source_user.id, ip, walter.id, Time.now, true)
UserProfileView.add(source_user.id, ip, target_user.id, Time.now, true)
UserProfileView.add(target_user.id, ip, source_user.id, Time.now, true)
@@ -894,21 +975,69 @@ RSpec.describe UserMerger do
end
it "merges user visits" do
- freeze_time DateTime.parse('2010-01-01 12:00')
+ freeze_time DateTime.parse("2010-01-01 12:00")
- UserVisit.create!(user_id: source_user.id, visited_at: 2.days.ago, posts_read: 22, mobile: false, time_read: 400)
- UserVisit.create!(user_id: source_user.id, visited_at: Date.yesterday, posts_read: 8, mobile: false, time_read: 100)
- UserVisit.create!(user_id: target_user.id, visited_at: Date.yesterday, posts_read: 12, mobile: true, time_read: 270)
- UserVisit.create!(user_id: target_user.id, visited_at: Date.today, posts_read: 10, mobile: true, time_read: 150)
+ UserVisit.create!(
+ user_id: source_user.id,
+ visited_at: 2.days.ago,
+ posts_read: 22,
+ mobile: false,
+ time_read: 400,
+ )
+ UserVisit.create!(
+ user_id: source_user.id,
+ visited_at: Date.yesterday,
+ posts_read: 8,
+ mobile: false,
+ time_read: 100,
+ )
+ UserVisit.create!(
+ user_id: target_user.id,
+ visited_at: Date.yesterday,
+ posts_read: 12,
+ mobile: true,
+ time_read: 270,
+ )
+ UserVisit.create!(
+ user_id: target_user.id,
+ visited_at: Date.today,
+ posts_read: 10,
+ mobile: true,
+ time_read: 150,
+ )
merge_users!
expect(UserVisit.where(user_id: target_user.id).count).to eq(3)
expect(UserVisit.where(user_id: source_user.id).count).to eq(0)
- expect(UserVisit.where(user_id: target_user.id, visited_at: 2.days.ago, posts_read: 22, mobile: false, time_read: 400).count).to eq(1)
- expect(UserVisit.where(user_id: target_user.id, visited_at: Date.yesterday, posts_read: 20, mobile: true, time_read: 370).count).to eq(1)
- expect(UserVisit.where(user_id: target_user.id, visited_at: Date.today, posts_read: 10, mobile: true, time_read: 150).count).to eq(1)
+ expect(
+ UserVisit.where(
+ user_id: target_user.id,
+ visited_at: 2.days.ago,
+ posts_read: 22,
+ mobile: false,
+ time_read: 400,
+ ).count,
+ ).to eq(1)
+ expect(
+ UserVisit.where(
+ user_id: target_user.id,
+ visited_at: Date.yesterday,
+ posts_read: 20,
+ mobile: true,
+ time_read: 370,
+ ).count,
+ ).to eq(1)
+ expect(
+ UserVisit.where(
+ user_id: target_user.id,
+ visited_at: Date.today,
+ posts_read: 10,
+ mobile: true,
+ time_read: 150,
+ ).count,
+ ).to eq(1)
end
it "updates user warnings" do
@@ -926,9 +1055,7 @@ RSpec.describe UserMerger do
end
it "triggers :merging_users event" do
- events = DiscourseEvent.track_events do
- merge_users!
- end
+ events = DiscourseEvent.track_events { merge_users! }
expect(events).to include(event_name: :merging_users, params: [source_user, target_user])
end
@@ -1004,8 +1131,16 @@ RSpec.describe UserMerger do
end
it "deletes external auth infos of source user" do
- UserAssociatedAccount.create(user_id: source_user.id, provider_name: "facebook", provider_uid: "1234")
- SingleSignOnRecord.create(user_id: source_user.id, external_id: "example", last_payload: "looks good")
+ UserAssociatedAccount.create(
+ user_id: source_user.id,
+ provider_name: "facebook",
+ provider_uid: "1234",
+ )
+ SingleSignOnRecord.create(
+ user_id: source_user.id,
+ external_id: "example",
+ last_payload: "looks good",
+ )
merge_users!
@@ -1047,14 +1182,17 @@ RSpec.describe UserMerger do
end
it "updates the username" do
- Jobs::UpdateUsername.any_instance
+ Jobs::UpdateUsername
+ .any_instance
.expects(:execute)
- .with({
- user_id: source_user.id,
- old_username: 'alice1',
- new_username: 'alice',
- avatar_template: target_user.avatar_template
- })
+ .with(
+ {
+ user_id: source_user.id,
+ old_username: "alice1",
+ new_username: "alice",
+ avatar_template: target_user.avatar_template,
+ },
+ )
.once
merge_users!
@@ -1067,7 +1205,9 @@ RSpec.describe UserMerger do
expect(log_entry.action).to eq(UserHistory.actions[:merge_user])
expect(log_entry.acting_user_id).to eq(Discourse::SYSTEM_USER_ID)
expect(log_entry.target_user_id).to eq(target_user.id)
- expect(log_entry.context).to eq(I18n.t("staff_action_logs.user_merged", username: source_user.username))
+ expect(log_entry.context).to eq(
+ I18n.t("staff_action_logs.user_merged", username: source_user.username),
+ )
expect(log_entry.email).to eq("alice@work.com")
end
end
diff --git a/spec/services/user_notification_schedule_processor_spec.rb b/spec/services/user_notification_schedule_processor_spec.rb
index 43215a209dc..277d18f8e64 100644
--- a/spec/services/user_notification_schedule_processor_spec.rb
+++ b/spec/services/user_notification_schedule_processor_spec.rb
@@ -4,14 +4,13 @@ RSpec.describe UserNotificationScheduleProcessor do
include ActiveSupport::Testing::TimeHelpers
fab!(:user) { Fabricate(:user) }
- let(:standard_schedule) {
- schedule = UserNotificationSchedule.create({
- user: user
- }.merge(UserNotificationSchedule::DEFAULT))
+ let(:standard_schedule) do
+ schedule =
+ UserNotificationSchedule.create({ user: user }.merge(UserNotificationSchedule::DEFAULT))
schedule.enabled = true
schedule.save
schedule
- }
+ end
describe "#create_do_not_disturb_timings" do
[
@@ -19,7 +18,7 @@ RSpec.describe UserNotificationScheduleProcessor do
{ timezone: "America/Chicago", offset: "-06:00" },
{ timezone: "Australia/Sydney", offset: "+11:00" },
].each do |timezone_info|
- it 'creates dnd timings correctly for each timezone' do
+ it "creates dnd timings correctly for each timezone" do
user.user_option.update(timezone: timezone_info[:timezone])
travel_to Time.new(2020, 1, 4, 12, 0, 0, "+00:00") do
@@ -39,12 +38,20 @@ RSpec.describe UserNotificationScheduleProcessor do
expect(dnd_timings[2].ends_at).to eq_time(Time.new(2020, 1, 6, 7, 59, 0, offset))
expect(dnd_timings[3].starts_at).to eq_time(Time.new(2020, 1, 6, 17, 0, 0, offset))
- expect(dnd_timings[3].ends_at).to be_within(1.second).of Time.new(2020, 1, 6, 23, 59, 59, offset)
+ expect(dnd_timings[3].ends_at).to be_within(1.second).of Time.new(
+ 2020,
+ 1,
+ 6,
+ 23,
+ 59,
+ 59,
+ offset,
+ )
end
end
end
- it 'does not create duplicate record, but ensures the correct records exist' do
+ it "does not create duplicate record, but ensures the correct records exist" do
user.user_option.update(timezone: "UTC")
travel_to Time.new(2020, 1, 4, 12, 0, 0, "+00:00") do
@@ -68,21 +75,22 @@ RSpec.describe UserNotificationScheduleProcessor do
end
end
- it 'extends previously scheduled dnd timings to remove gaps' do
+ it "extends previously scheduled dnd timings to remove gaps" do
user.user_option.update(timezone: "UTC")
travel_to Time.new(2020, 1, 4, 12, 0, 0, "+00:00") do
- existing_timing = user.do_not_disturb_timings.create(
- scheduled: true,
- starts_at: 1.day.ago,
- ends_at: Time.new(2020, 1, 03, 11, 0, 0, "+00:00").end_of_day
- )
+ existing_timing =
+ user.do_not_disturb_timings.create(
+ scheduled: true,
+ starts_at: 1.day.ago,
+ ends_at: Time.new(2020, 1, 03, 11, 0, 0, "+00:00").end_of_day,
+ )
UserNotificationScheduleProcessor.create_do_not_disturb_timings_for(standard_schedule)
expect(existing_timing.reload.ends_at).to eq_time(Time.new(2020, 1, 4, 7, 59, 0, "+00:00"))
end
end
- it 'creates the correct timings when the whole schedule is DND (-1)' do
+ it "creates the correct timings when the whole schedule is DND (-1)" do
user.user_option.update(timezone: "UTC")
schedule = standard_schedule
schedule.update(
@@ -98,12 +106,22 @@ RSpec.describe UserNotificationScheduleProcessor do
travel_to Time.new(2020, 1, 4, 12, 0, 0, "+00:00") do
UserNotificationScheduleProcessor.create_do_not_disturb_timings_for(schedule)
expect(user.do_not_disturb_timings.count).to eq(1)
- expect(user.do_not_disturb_timings.first.starts_at).to eq_time(Time.new(2020, 1, 4, 0, 0, 0, "+00:00"))
- expect(user.do_not_disturb_timings.first.ends_at).to be_within(1.second).of Time.new(2020, 1, 6, 23, 59, 59, "+00:00")
+ expect(user.do_not_disturb_timings.first.starts_at).to eq_time(
+ Time.new(2020, 1, 4, 0, 0, 0, "+00:00"),
+ )
+ expect(user.do_not_disturb_timings.first.ends_at).to be_within(1.second).of Time.new(
+ 2020,
+ 1,
+ 6,
+ 23,
+ 59,
+ 59,
+ "+00:00",
+ )
end
end
- it 'creates the correct timings at the end of a month and year' do
+ it "creates the correct timings at the end of a month and year" do
user.user_option.update(timezone: "UTC")
schedule = standard_schedule
schedule.update(
@@ -112,16 +130,34 @@ RSpec.describe UserNotificationScheduleProcessor do
travel_to Time.new(2020, 12, 31, 12, 0, 0, "+00:00") do
UserNotificationScheduleProcessor.create_do_not_disturb_timings_for(schedule)
- expect(user.do_not_disturb_timings[0].starts_at).to eq_time(Time.new(2020, 12, 31, 0, 0, 0, "+00:00"))
- expect(user.do_not_disturb_timings[0].ends_at).to eq_time(Time.new(2021, 1, 1, 7, 59, 0, "+00:00"))
- expect(user.do_not_disturb_timings[1].starts_at).to eq_time(Time.new(2021, 1, 1, 17, 0, 0, "+00:00"))
- expect(user.do_not_disturb_timings[1].ends_at).to eq_time(Time.new(2021, 1, 2, 7, 59, 0, "+00:00"))
- expect(user.do_not_disturb_timings[2].starts_at).to eq_time(Time.new(2021, 1, 2, 17, 0, 0, "+00:00"))
- expect(user.do_not_disturb_timings[2].ends_at).to be_within(1.second).of Time.new(2021, 1, 2, 23, 59, 59, "+00:00")
+ expect(user.do_not_disturb_timings[0].starts_at).to eq_time(
+ Time.new(2020, 12, 31, 0, 0, 0, "+00:00"),
+ )
+ expect(user.do_not_disturb_timings[0].ends_at).to eq_time(
+ Time.new(2021, 1, 1, 7, 59, 0, "+00:00"),
+ )
+ expect(user.do_not_disturb_timings[1].starts_at).to eq_time(
+ Time.new(2021, 1, 1, 17, 0, 0, "+00:00"),
+ )
+ expect(user.do_not_disturb_timings[1].ends_at).to eq_time(
+ Time.new(2021, 1, 2, 7, 59, 0, "+00:00"),
+ )
+ expect(user.do_not_disturb_timings[2].starts_at).to eq_time(
+ Time.new(2021, 1, 2, 17, 0, 0, "+00:00"),
+ )
+ expect(user.do_not_disturb_timings[2].ends_at).to be_within(1.second).of Time.new(
+ 2021,
+ 1,
+ 2,
+ 23,
+ 59,
+ 59,
+ "+00:00",
+ )
end
end
- it 'handles midnight to midnight for multiple days (no timings created)' do
+ it "handles midnight to midnight for multiple days (no timings created)" do
user.user_option.update(timezone: "UTC")
schedule = standard_schedule
schedule.update(
@@ -136,19 +172,21 @@ RSpec.describe UserNotificationScheduleProcessor do
UserNotificationScheduleProcessor.create_do_not_disturb_timings_for(schedule)
expect(user.do_not_disturb_timings.count).to eq(0)
end
-
end
- it 'publishes to message bus when the user should enter DND' do
+ it "publishes to message bus when the user should enter DND" do
user.user_option.update(timezone: "UTC")
schedule = standard_schedule
travel_to Time.new(2020, 12, 31, 1, 0, 0, "+00:00") do
- messages = MessageBus.track_publish("/do-not-disturb/#{user.id}") do
- UserNotificationScheduleProcessor.create_do_not_disturb_timings_for(schedule)
- end
+ messages =
+ MessageBus.track_publish("/do-not-disturb/#{user.id}") do
+ UserNotificationScheduleProcessor.create_do_not_disturb_timings_for(schedule)
+ end
expect(messages.size).to eq(1)
- expect(messages[0].data[:ends_at]).to eq(Time.new(2020, 12, 31, 7, 59, 0, "+00:00").httpdate)
+ expect(messages[0].data[:ends_at]).to eq(
+ Time.new(2020, 12, 31, 7, 59, 0, "+00:00").httpdate,
+ )
expect(messages[0].user_ids).to contain_exactly(user.id)
end
end
diff --git a/spec/services/user_silencer_spec.rb b/spec/services/user_silencer_spec.rb
index cdfac471342..b637fc6e9db 100644
--- a/spec/services/user_silencer_spec.rb
+++ b/spec/services/user_silencer_spec.rb
@@ -5,12 +5,11 @@ RSpec.describe UserSilencer do
fab!(:post) { Fabricate(:post, user: user) }
fab!(:admin) { Fabricate(:admin) }
- describe 'silence' do
-
+ describe "silence" do
let(:silencer) { UserSilencer.new(user) }
subject(:silence_user) { silencer.silence }
- it 'silences the user correctly' do
+ it "silences the user correctly" do
expect { UserSilencer.silence(user, admin) }.to change { user.reload.silenced? }
# no need to silence as we are already silenced
@@ -22,11 +21,12 @@ RSpec.describe UserSilencer do
expect(post.hidden).to eq(true)
# history should be right
- count = UserHistory.where(
- action: UserHistory.actions[:silence_user],
- acting_user_id: admin.id,
- target_user_id: user.id
- ).count
+ count =
+ UserHistory.where(
+ action: UserHistory.actions[:silence_user],
+ acting_user_id: admin.id,
+ target_user_id: user.id,
+ ).count
expect(count).to eq(1)
end
@@ -38,7 +38,7 @@ RSpec.describe UserSilencer do
expect(ActionMailer::Base.deliveries.size).to eq(0)
end
- it 'does not hide posts for tl1' do
+ it "does not hide posts for tl1" do
user.update!(trust_level: 1)
UserSilencer.silence(user, admin)
@@ -67,26 +67,24 @@ RSpec.describe UserSilencer do
expect(old_post.topic).to be_visible
end
- context 'with a plugin hook' do
+ context "with a plugin hook" do
before do
- @override_silence_message = -> (opts) do
+ @override_silence_message = ->(opts) {
opts[:silence_message_params][:message_title] = "override title"
opts[:silence_message_params][:message_raw] = "override raw"
- end
+ }
DiscourseEvent.on(:user_silenced, &@override_silence_message)
end
- after do
- DiscourseEvent.off(:user_silenced, &@override_silence_message)
- end
+ after { DiscourseEvent.off(:user_silenced, &@override_silence_message) }
- it 'allows the message to be overridden' do
+ it "allows the message to be overridden" do
UserSilencer.silence(user, admin)
# force a reload in case instance has no posts
system_user = User.find(Discourse::SYSTEM_USER_ID)
- post = system_user.posts.order('posts.id desc').first
+ post = system_user.posts.order("posts.id desc").first
expect(post.topic.title).to eq("override title")
expect(post.raw).to eq("override raw")
@@ -94,28 +92,26 @@ RSpec.describe UserSilencer do
end
end
- describe 'unsilence' do
-
- it 'unsilences the user correctly' do
+ describe "unsilence" do
+ it "unsilences the user correctly" do
user.update!(silenced_till: 1.year.from_now)
expect { UserSilencer.unsilence(user, admin) }.to change { user.reload.silenced? }
# sends a message
- pm = user.topics_allowed.order('topics.id desc').first
+ pm = user.topics_allowed.order("topics.id desc").first
title = I18n.t("system_messages.unsilenced.subject_template")
expect(pm.title).to eq(title)
# logs it
- count = UserHistory.where(
- action: UserHistory.actions[:unsilence_user],
- acting_user_id: admin.id,
- target_user_id: user.id
- ).count
+ count =
+ UserHistory.where(
+ action: UserHistory.actions[:unsilence_user],
+ acting_user_id: admin.id,
+ target_user_id: user.id,
+ ).count
expect(count).to eq(1)
end
-
end
-
end
diff --git a/spec/services/user_stat_count_updater_spec.rb b/spec/services/user_stat_count_updater_spec.rb
index 57ab1255aa0..c2a98af77a9 100644
--- a/spec/services/user_stat_count_updater_spec.rb
+++ b/spec/services/user_stat_count_updater_spec.rb
@@ -12,11 +12,9 @@ RSpec.describe UserStatCountUpdater do
SiteSetting.verbose_user_stat_count_logging = true
end
- after do
- Rails.logger = @orig_logger
- end
+ after { Rails.logger = @orig_logger }
- it 'should log the exception when a negative count is inserted' do
+ it "should log the exception when a negative count is inserted" do
UserStatCountUpdater.decrement!(post, user_stat: user_stat)
expect(@fake_logger.warnings.last).to match("topic_count")
@@ -28,7 +26,7 @@ RSpec.describe UserStatCountUpdater do
expect(@fake_logger.warnings.last).to match(post_2.id.to_s)
end
- it 'should log the exception when a negative count will be inserted but 0 is used instead' do
+ it "should log the exception when a negative count will be inserted but 0 is used instead" do
UserStatCountUpdater.set!(user_stat: user_stat, count: -10, count_column: :post_count)
expect(@fake_logger.warnings.last).to match("post_count")
diff --git a/spec/services/user_updater_spec.rb b/spec/services/user_updater_spec.rb
index 714e0d2289a..54de5883b37 100644
--- a/spec/services/user_updater_spec.rb
+++ b/spec/services/user_updater_spec.rb
@@ -8,8 +8,8 @@ RSpec.describe UserUpdater do
let(:acting_user) { Fabricate.build(:user) }
- describe '#update_muted_users' do
- it 'has no cross talk' do
+ describe "#update_muted_users" do
+ it "has no cross talk" do
updater = UserUpdater.new(u1, u1)
updater.update_muted_users("#{u2.username},#{u3.username}")
@@ -24,7 +24,7 @@ RSpec.describe UserUpdater do
expect(MutedUser.where(user_id: u3.id).count).to eq(0)
end
- it 'excludes acting user' do
+ it "excludes acting user" do
updater = UserUpdater.new(u1, u1)
updater.update_muted_users("#{u1.username},#{u2.username}")
@@ -32,41 +32,47 @@ RSpec.describe UserUpdater do
end
end
- describe '#update' do
+ describe "#update" do
fab!(:category) { Fabricate(:category) }
fab!(:tag) { Fabricate(:tag) }
fab!(:tag2) { Fabricate(:tag) }
- it 'saves user' do
- user = Fabricate(:user, name: 'Billy Bob')
+ it "saves user" do
+ user = Fabricate(:user, name: "Billy Bob")
updater = UserUpdater.new(user, user)
- updater.update(name: 'Jim Tom')
+ updater.update(name: "Jim Tom")
- expect(user.reload.name).to eq 'Jim Tom'
+ expect(user.reload.name).to eq "Jim Tom"
end
- it 'can update categories and tags' do
+ it "can update categories and tags" do
updater = UserUpdater.new(user, user)
updater.update(watched_tags: "#{tag.name},#{tag2.name}", muted_category_ids: [category.id])
- expect(TagUser.where(
- user_id: user.id,
- tag_id: tag.id,
- notification_level: TagUser.notification_levels[:watching]
- ).exists?).to eq(true)
+ expect(
+ TagUser.where(
+ user_id: user.id,
+ tag_id: tag.id,
+ notification_level: TagUser.notification_levels[:watching],
+ ).exists?,
+ ).to eq(true)
- expect(TagUser.where(
- user_id: user.id,
- tag_id: tag2.id,
- notification_level: TagUser.notification_levels[:watching]
- ).exists?).to eq(true)
+ expect(
+ TagUser.where(
+ user_id: user.id,
+ tag_id: tag2.id,
+ notification_level: TagUser.notification_levels[:watching],
+ ).exists?,
+ ).to eq(true)
- expect(CategoryUser.where(
- user_id: user.id,
- category_id: category.id,
- notification_level: CategoryUser.notification_levels[:muted]
- ).count).to eq(1)
+ expect(
+ CategoryUser.where(
+ user_id: user.id,
+ category_id: category.id,
+ notification_level: CategoryUser.notification_levels[:muted],
+ ).count,
+ ).to eq(1)
end
context "with a staged user" do
@@ -89,24 +95,36 @@ RSpec.describe UserUpdater do
it "updates muted categories and watched tags" do
updater = UserUpdater.new(Fabricate(:admin), staged_user)
updater.update(watched_tags: "#{tag.name}", muted_category_ids: [category.id])
- expect(TagUser.exists?(
- user_id: staged_user.id,
- tag_id: tag.id,
- notification_level: TagUser.notification_levels[:watching]
- )).to eq(true)
+ expect(
+ TagUser.exists?(
+ user_id: staged_user.id,
+ tag_id: tag.id,
+ notification_level: TagUser.notification_levels[:watching],
+ ),
+ ).to eq(true)
- expect(CategoryUser.exists?(
- user_id: staged_user.id,
- category_id: category.id,
- notification_level: CategoryUser.notification_levels[:muted]
- )).to eq(true)
+ expect(
+ CategoryUser.exists?(
+ user_id: staged_user.id,
+ category_id: category.id,
+ notification_level: CategoryUser.notification_levels[:muted],
+ ),
+ ).to eq(true)
end
end
end
it "doesn't remove notification prefs when updating something else" do
- TagUser.create!(user: user, tag: tag, notification_level: TagUser.notification_levels[:watching])
- CategoryUser.create!(user: user, category: category, notification_level: CategoryUser.notification_levels[:muted])
+ TagUser.create!(
+ user: user,
+ tag: tag,
+ notification_level: TagUser.notification_levels[:watching],
+ )
+ CategoryUser.create!(
+ user: user,
+ category: category,
+ notification_level: CategoryUser.notification_levels[:muted],
+ )
updater = UserUpdater.new(acting_user, user)
updater.update(name: "Steve Dave")
@@ -115,7 +133,7 @@ RSpec.describe UserUpdater do
expect(CategoryUser.where(user: user).count).to eq(1)
end
- it 'updates various fields' do
+ it "updates various fields" do
updater = UserUpdater.new(acting_user, user)
date_of_birth = Time.zone.now
SiteSetting.disable_mailing_list_mode = false
@@ -124,25 +142,26 @@ RSpec.describe UserUpdater do
seq = user.user_option.theme_key_seq
- val = updater.update(
- bio_raw: 'my new bio',
- email_level: UserOption.email_level_types[:always],
- mailing_list_mode: true,
- digest_after_minutes: "45",
- new_topic_duration_minutes: 100,
- auto_track_topics_after_msecs: 101,
- notification_level_when_replying: 3,
- email_in_reply_to: false,
- date_of_birth: date_of_birth,
- theme_ids: [theme.id],
- allow_private_messages: false
- )
+ val =
+ updater.update(
+ bio_raw: "my new bio",
+ email_level: UserOption.email_level_types[:always],
+ mailing_list_mode: true,
+ digest_after_minutes: "45",
+ new_topic_duration_minutes: 100,
+ auto_track_topics_after_msecs: 101,
+ notification_level_when_replying: 3,
+ email_in_reply_to: false,
+ date_of_birth: date_of_birth,
+ theme_ids: [theme.id],
+ allow_private_messages: false,
+ )
expect(val).to be_truthy
user.reload
- expect(user.user_profile.bio_raw).to eq 'my new bio'
+ expect(user.user_profile.bio_raw).to eq "my new bio"
expect(user.user_option.email_level).to eq UserOption.email_level_types[:always]
expect(user.user_option.mailing_list_mode).to eq true
expect(user.user_option.digest_after_minutes).to eq 45
@@ -221,7 +240,7 @@ RSpec.describe UserUpdater do
expect(user.user_option.theme_ids).to eq([theme.id, child.id])
end
- let(:schedule_attrs) {
+ let(:schedule_attrs) do
{
enabled: true,
day_0_start_time: 30,
@@ -239,9 +258,9 @@ RSpec.describe UserUpdater do
day_6_start_time: 30,
day_6_end_time: 60,
}
- }
+ end
- context 'with user_notification_schedule' do
+ context "with user_notification_schedule" do
it "allows users to create their notification schedule when it doesn't exist previously" do
expect(user.user_notification_schedule).to be_nil
updater = UserUpdater.new(acting_user, user)
@@ -256,9 +275,7 @@ RSpec.describe UserUpdater do
end
it "allows users to update their notification schedule" do
- UserNotificationSchedule.create({
- user: user,
- }.merge(UserNotificationSchedule::DEFAULT))
+ UserNotificationSchedule.create({ user: user }.merge(UserNotificationSchedule::DEFAULT))
updater = UserUpdater.new(acting_user, user)
updater.update(user_notification_schedule: schedule_attrs)
user.reload
@@ -272,9 +289,9 @@ RSpec.describe UserUpdater do
it "processes the schedule and do_not_disturb_timings are created" do
updater = UserUpdater.new(acting_user, user)
- expect {
- updater.update(user_notification_schedule: schedule_attrs)
- }.to change { user.do_not_disturb_timings.count }.by(4)
+ expect { updater.update(user_notification_schedule: schedule_attrs) }.to change {
+ user.do_not_disturb_timings.count
+ }.by(4)
end
it "removes do_not_disturb_timings when the schedule is disabled" do
@@ -290,8 +307,8 @@ RSpec.describe UserUpdater do
end
end
- context 'when sso overrides bio' do
- it 'does not change bio' do
+ context "when sso overrides bio" do
+ it "does not change bio" do
SiteSetting.discourse_connect_url = "https://www.example.com/sso"
SiteSetting.enable_discourse_connect = true
SiteSetting.discourse_connect_overrides_bio = true
@@ -301,12 +318,12 @@ RSpec.describe UserUpdater do
expect(updater.update(bio_raw: "new bio")).to be_truthy
user.reload
- expect(user.user_profile.bio_raw).not_to eq 'new bio'
+ expect(user.user_profile.bio_raw).not_to eq "new bio"
end
end
- context 'when sso overrides location' do
- it 'does not change location' do
+ context "when sso overrides location" do
+ it "does not change location" do
SiteSetting.discourse_connect_url = "https://www.example.com/sso"
SiteSetting.enable_discourse_connect = true
SiteSetting.discourse_connect_overrides_location = true
@@ -316,12 +333,12 @@ RSpec.describe UserUpdater do
expect(updater.update(location: "new location")).to be_truthy
user.reload
- expect(user.user_profile.location).not_to eq 'new location'
+ expect(user.user_profile.location).not_to eq "new location"
end
end
- context 'when sso overrides website' do
- it 'does not change website' do
+ context "when sso overrides website" do
+ it "does not change website" do
SiteSetting.discourse_connect_url = "https://www.example.com/sso"
SiteSetting.enable_discourse_connect = true
SiteSetting.discourse_connect_overrides_website = true
@@ -331,14 +348,14 @@ RSpec.describe UserUpdater do
expect(updater.update(website: "https://google.com")).to be_truthy
user.reload
- expect(user.user_profile.website).not_to eq 'https://google.com'
+ expect(user.user_profile.website).not_to eq "https://google.com"
end
end
- context 'when updating primary group' do
- let(:new_group) { Group.create(name: 'new_group') }
+ context "when updating primary group" do
+ let(:new_group) { Group.create(name: "new_group") }
- it 'updates when setting is enabled' do
+ it "updates when setting is enabled" do
SiteSetting.user_selected_primary_groups = true
user.groups << new_group
user.update(primary_group_id: nil)
@@ -348,7 +365,7 @@ RSpec.describe UserUpdater do
expect(user.primary_group_id).to eq new_group.id
end
- it 'does not update when setting is disabled' do
+ it "does not update when setting is disabled" do
SiteSetting.user_selected_primary_groups = false
user.groups << new_group
user.update(primary_group_id: nil)
@@ -358,41 +375,49 @@ RSpec.describe UserUpdater do
expect(user.primary_group_id).to eq nil
end
- it 'does not update when changing other profile data' do
+ it "does not update when changing other profile data" do
SiteSetting.user_selected_primary_groups = true
user.groups << new_group
user.update(primary_group_id: new_group.id)
- UserUpdater.new(acting_user, user).update(website: 'http://example.com')
+ UserUpdater.new(acting_user, user).update(website: "http://example.com")
user.reload
expect(user.primary_group_id).to eq new_group.id
end
- it 'can be removed by the user when setting is enabled' do
+ it "can be removed by the user when setting is enabled" do
SiteSetting.user_selected_primary_groups = true
user.groups << new_group
user.update(primary_group_id: new_group.id)
- UserUpdater.new(acting_user, user).update(primary_group_id: '')
+ UserUpdater.new(acting_user, user).update(primary_group_id: "")
user.reload
expect(user.primary_group_id).to eq nil
end
- it 'cannot be removed by the user when setting is disabled' do
+ it "cannot be removed by the user when setting is disabled" do
SiteSetting.user_selected_primary_groups = false
user.groups << new_group
user.update(primary_group_id: new_group.id)
- UserUpdater.new(acting_user, user).update(primary_group_id: '')
+ UserUpdater.new(acting_user, user).update(primary_group_id: "")
user.reload
expect(user.primary_group_id).to eq new_group.id
end
end
- context 'when updating flair group' do
- let(:group) { Fabricate(:group, name: "Group", flair_bg_color: "#111111", flair_color: "#999999", flair_icon: "icon") }
+ context "when updating flair group" do
+ let(:group) do
+ Fabricate(
+ :group,
+ name: "Group",
+ flair_bg_color: "#111111",
+ flair_color: "#999999",
+ flair_icon: "icon",
+ )
+ end
- it 'updates when setting is enabled' do
+ it "updates when setting is enabled" do
group.add(user)
UserUpdater.new(acting_user, user).update(flair_group_id: group.id)
@@ -403,8 +428,8 @@ RSpec.describe UserUpdater do
end
end
- context 'when update fails' do
- it 'returns false' do
+ context "when update fails" do
+ it "returns false" do
user.stubs(save: false)
updater = UserUpdater.new(acting_user, user)
@@ -412,28 +437,26 @@ RSpec.describe UserUpdater do
end
end
- context 'with permission to update title' do
- it 'allows user to change title' do
- user = Fabricate(:user, title: 'Emperor')
- Guardian.any_instance.stubs(:can_grant_title?).with(user, 'Minion').returns(true)
+ context "with permission to update title" do
+ it "allows user to change title" do
+ user = Fabricate(:user, title: "Emperor")
+ Guardian.any_instance.stubs(:can_grant_title?).with(user, "Minion").returns(true)
updater = UserUpdater.new(acting_user, user)
- updater.update(title: 'Minion')
+ updater.update(title: "Minion")
- expect(user.reload.title).to eq 'Minion'
+ expect(user.reload.title).to eq "Minion"
end
end
- context 'when title is from a badge' do
- fab!(:user) { Fabricate(:user, title: 'Emperor') }
- fab!(:badge) { Fabricate(:badge, name: 'Minion') }
+ context "when title is from a badge" do
+ fab!(:user) { Fabricate(:user, title: "Emperor") }
+ fab!(:badge) { Fabricate(:badge, name: "Minion") }
- context 'when badge can be used as a title' do
- before do
- badge.update(allow_title: true)
- end
+ context "when badge can be used as a title" do
+ before { badge.update(allow_title: true) }
- it 'can use as title, sets badge_granted_title' do
+ it "can use as title, sets badge_granted_title" do
BadgeGranter.grant(badge, user)
updater = UserUpdater.new(user, user)
updater.update(title: badge.name)
@@ -441,7 +464,7 @@ RSpec.describe UserUpdater do
expect(user.user_profile.badge_granted_title).to eq(true)
end
- it 'badge has not been granted, does not change title' do
+ it "badge has not been granted, does not change title" do
badge.update(allow_title: true)
updater = UserUpdater.new(user, user)
updater.update(title: badge.name)
@@ -450,21 +473,21 @@ RSpec.describe UserUpdater do
expect(user.user_profile.badge_granted_title).to eq(false)
end
- it 'changing to a title that is not from a badge, unsets badge_granted_title' do
+ it "changing to a title that is not from a badge, unsets badge_granted_title" do
user.update(title: badge.name)
user.user_profile.update(badge_granted_title: true)
- Guardian.any_instance.stubs(:can_grant_title?).with(user, 'Dancer').returns(true)
+ Guardian.any_instance.stubs(:can_grant_title?).with(user, "Dancer").returns(true)
updater = UserUpdater.new(user, user)
- updater.update(title: 'Dancer')
+ updater.update(title: "Dancer")
user.reload
- expect(user.title).to eq('Dancer')
+ expect(user.title).to eq("Dancer")
expect(user.user_profile.badge_granted_title).to eq(false)
end
end
- it 'cannot use as title, does not change title' do
+ it "cannot use as title, does not change title" do
BadgeGranter.grant(badge, user)
updater = UserUpdater.new(user, user)
updater.update(title: badge.name)
@@ -474,69 +497,70 @@ RSpec.describe UserUpdater do
end
end
- context 'without permission to update title' do
- it 'does not allow user to change title' do
- user = Fabricate(:user, title: 'Emperor')
- Guardian.any_instance.stubs(:can_grant_title?).with(user, 'Minion').returns(false)
+ context "without permission to update title" do
+ it "does not allow user to change title" do
+ user = Fabricate(:user, title: "Emperor")
+ Guardian.any_instance.stubs(:can_grant_title?).with(user, "Minion").returns(false)
updater = UserUpdater.new(acting_user, user)
- updater.update(title: 'Minion')
+ updater.update(title: "Minion")
- expect(user.reload.title).not_to eq 'Minion'
+ expect(user.reload.title).not_to eq "Minion"
end
end
- context 'when website includes http' do
- it 'does not add http before updating' do
+ context "when website includes http" do
+ it "does not add http before updating" do
updater = UserUpdater.new(acting_user, user)
- updater.update(website: 'http://example.com')
+ updater.update(website: "http://example.com")
- expect(user.reload.user_profile.website).to eq 'http://example.com'
+ expect(user.reload.user_profile.website).to eq "http://example.com"
end
end
- context 'when website does not include http' do
- it 'adds http before updating' do
+ context "when website does not include http" do
+ it "adds http before updating" do
updater = UserUpdater.new(acting_user, user)
- updater.update(website: 'example.com')
+ updater.update(website: "example.com")
- expect(user.reload.user_profile.website).to eq 'http://example.com'
+ expect(user.reload.user_profile.website).to eq "http://example.com"
end
end
- context 'when website is invalid' do
- it 'returns an error' do
+ context "when website is invalid" do
+ it "returns an error" do
updater = UserUpdater.new(acting_user, user)
- expect(updater.update(website: 'ʔ<')).to eq nil
+ expect(updater.update(website: "ʔ<")).to eq nil
end
end
- context 'when custom_fields is empty string' do
+ context "when custom_fields is empty string" do
it "update is successful" do
- user.custom_fields = { 'import_username' => 'my_old_username' }
+ user.custom_fields = { "import_username" => "my_old_username" }
user.save
updater = UserUpdater.new(acting_user, user)
- updater.update(website: 'example.com', custom_fields: '')
- expect(user.reload.custom_fields).to eq('import_username' => 'my_old_username')
+ updater.update(website: "example.com", custom_fields: "")
+ expect(user.reload.custom_fields).to eq("import_username" => "my_old_username")
end
end
- context 'when skip_new_user_tips is edited' do
- it 'updates seen_popups too' do
- messages = MessageBus.track_publish('/user-tips') do
- UserUpdater.new(Discourse.system_user, user).update(skip_new_user_tips: true)
- end
+ context "when skip_new_user_tips is edited" do
+ it "updates seen_popups too" do
+ messages =
+ MessageBus.track_publish("/user-tips") do
+ UserUpdater.new(Discourse.system_user, user).update(skip_new_user_tips: true)
+ end
expect(user.user_option.skip_new_user_tips).to eq(true)
expect(user.user_option.seen_popups).to eq([-1])
expect(messages.map(&:data)).to contain_exactly([-1])
end
- it 'does not reset seen_popups' do
+ it "does not reset seen_popups" do
user.user_option.update!(seen_popups: [1, 2, 3])
UserUpdater.new(Discourse.system_user, user).update(skip_new_user_tips: false)
@@ -546,11 +570,12 @@ RSpec.describe UserUpdater do
end
end
- context 'when seen_popups is edited' do
- it 'publishes a message' do
- messages = MessageBus.track_publish('/user-tips') do
- UserUpdater.new(Discourse.system_user, user).update(seen_popups: [1])
- end
+ context "when seen_popups is edited" do
+ it "publishes a message" do
+ messages =
+ MessageBus.track_publish("/user-tips") do
+ UserUpdater.new(Discourse.system_user, user).update(seen_popups: [1])
+ end
expect(user.user_option.seen_popups).to eq([1])
expect(messages.map(&:data)).to contain_exactly([1])
@@ -558,45 +583,39 @@ RSpec.describe UserUpdater do
end
it "logs the action" do
- user = Fabricate(:user, name: 'Billy Bob')
+ user = Fabricate(:user, name: "Billy Bob")
- expect do
- UserUpdater.new(user, user).update(name: 'Jim Tom')
- end.to change { UserHistory.count }.by(1)
+ expect do UserUpdater.new(user, user).update(name: "Jim Tom") end.to change {
+ UserHistory.count
+ }.by(1)
- expect(UserHistory.last.action).to eq(
- UserHistory.actions[:change_name]
- )
+ expect(UserHistory.last.action).to eq(UserHistory.actions[:change_name])
- expect do
- UserUpdater.new(user, user).update(name: 'JiM TOm')
- end.to_not change { UserHistory.count }
+ expect do UserUpdater.new(user, user).update(name: "JiM TOm") end.to_not change {
+ UserHistory.count
+ }
- expect do
- UserUpdater.new(user, user).update(bio_raw: 'foo bar')
- end.to_not change { UserHistory.count }
+ expect do UserUpdater.new(user, user).update(bio_raw: "foo bar") end.to_not change {
+ UserHistory.count
+ }
user_without_name = Fabricate(:user, name: nil)
expect do
- UserUpdater.new(user_without_name, user_without_name).update(bio_raw: 'foo bar')
+ UserUpdater.new(user_without_name, user_without_name).update(bio_raw: "foo bar")
end.to_not change { UserHistory.count }
expect do
- UserUpdater.new(user_without_name, user_without_name).update(name: 'Jim Tom')
+ UserUpdater.new(user_without_name, user_without_name).update(name: "Jim Tom")
end.to change { UserHistory.count }.by(1)
- expect(UserHistory.last.action).to eq(
- UserHistory.actions[:change_name]
+ expect(UserHistory.last.action).to eq(UserHistory.actions[:change_name])
+
+ expect do UserUpdater.new(user, user).update(name: "") end.to change { UserHistory.count }.by(
+ 1,
)
- expect do
- UserUpdater.new(user, user).update(name: '')
- end.to change { UserHistory.count }.by(1)
-
- expect(UserHistory.last.action).to eq(
- UserHistory.actions[:change_name]
- )
+ expect(UserHistory.last.action).to eq(UserHistory.actions[:change_name])
end
end
end
diff --git a/spec/services/username_changer_spec.rb b/spec/services/username_changer_spec.rb
index fa6721b4216..158b3166e96 100644
--- a/spec/services/username_changer_spec.rb
+++ b/spec/services/username_changer_spec.rb
@@ -1,22 +1,21 @@
# frozen_string_literal: true
RSpec.describe UsernameChanger do
- before do
- Jobs.run_immediately!
- end
+ before { Jobs.run_immediately! }
- describe '#change' do
+ describe "#change" do
let(:user) { Fabricate(:user) }
- context 'when everything goes well' do
+ context "when everything goes well" do
let!(:old_username) { user.username }
- it 'should change the username' do
+ it "should change the username" do
new_username = "#{user.username}1234"
- events = DiscourseEvent.track_events {
- @result = UsernameChanger.change(user, new_username)
- }.last(2)
+ events =
+ DiscourseEvent
+ .track_events { @result = UsernameChanger.change(user, new_username) }
+ .last(2)
expect(@result).to eq(true)
@@ -34,24 +33,23 @@ RSpec.describe UsernameChanger do
expect(user.username_lower).to eq(new_username.downcase)
end
- it 'do nothing if the new username is the same' do
+ it "do nothing if the new username is the same" do
new_username = user.username
- events = DiscourseEvent.track_events {
- @result = UsernameChanger.change(user, new_username)
- }
+ events =
+ DiscourseEvent.track_events { @result = UsernameChanger.change(user, new_username) }
expect(@result).to eq(false)
expect(events.count).to be_zero
end
end
- context 'when something goes wrong' do
+ context "when something goes wrong" do
let(:wrong_username) { "" }
let(:username_before_change) { user.username }
let(:username_lower_before_change) { user.username_lower }
- it 'should not change the username' do
+ it "should not change the username" do
@result = UsernameChanger.change(user, wrong_username)
expect(@result).to eq(false)
@@ -61,54 +59,52 @@ RSpec.describe UsernameChanger do
end
end
- context 'when changing the case of my username' do
- let!(:myself) { Fabricate(:user, username: 'hansolo') }
+ context "when changing the case of my username" do
+ let!(:myself) { Fabricate(:user, username: "hansolo") }
- it 'should change the username' do
+ it "should change the username" do
expect do
expect(UsernameChanger.change(myself, "HanSolo", myself)).to eq(true)
end.to change { UserHistory.count }.by(1)
- expect(UserHistory.last.action).to eq(
- UserHistory.actions[:change_username]
- )
+ expect(UserHistory.last.action).to eq(UserHistory.actions[:change_username])
- expect(myself.reload.username).to eq('HanSolo')
+ expect(myself.reload.username).to eq("HanSolo")
- expect do
- UsernameChanger.change(myself, "HanSolo", myself)
- end.not_to change { UserHistory.count } # make sure it does not log a dupe
+ expect do UsernameChanger.change(myself, "HanSolo", myself) end.not_to change {
+ UserHistory.count
+ } # make sure it does not log a dupe
- expect do
- UsernameChanger.change(myself, user.username, myself)
- end.not_to change { UserHistory.count } # does not log if the username already exists
+ expect do UsernameChanger.change(myself, user.username, myself) end.not_to change {
+ UserHistory.count
+ } # does not log if the username already exists
end
end
- describe 'allow custom minimum username length from site settings' do
+ describe "allow custom minimum username length from site settings" do
before do
@custom_min = 2
SiteSetting.min_username_length = @custom_min
end
- it 'should allow a shorter username than default' do
- result = UsernameChanger.change(user, 'a' * @custom_min)
+ it "should allow a shorter username than default" do
+ result = UsernameChanger.change(user, "a" * @custom_min)
expect(result).not_to eq(false)
end
- it 'should not allow a shorter username than limit' do
- result = UsernameChanger.change(user, 'a' * (@custom_min - 1))
+ it "should not allow a shorter username than limit" do
+ result = UsernameChanger.change(user, "a" * (@custom_min - 1))
expect(result).to eq(false)
end
- it 'should not allow a longer username than limit' do
- result = UsernameChanger.change(user, 'a' * (User.username_length.end + 1))
+ it "should not allow a longer username than limit" do
+ result = UsernameChanger.change(user, "a" * (User.username_length.end + 1))
expect(result).to eq(false)
end
end
- context 'when there are posts and revisions' do
- let(:user) { Fabricate(:user, username: 'foo') }
+ context "when there are posts and revisions" do
+ let(:user) { Fabricate(:user, username: "foo") }
let(:topic) { Fabricate(:topic, user: user) }
before do
@@ -120,18 +116,18 @@ RSpec.describe UsernameChanger do
stub_image_size
post = create_post(args.merge(topic_id: topic.id))
- args.delete(:revisions)&.each do |revision|
- post.revise(post.user, revision, force_new_version: true)
- end
+ args
+ .delete(:revisions)
+ &.each { |revision| post.revise(post.user, revision, force_new_version: true) }
block.call(post) if block
- UsernameChanger.change(user, args[:target_username] || 'bar')
+ UsernameChanger.change(user, args[:target_username] || "bar")
post.reload
end
- context 'when there are mentions' do
- it 'rewrites cooked correctly' do
+ context "when there are mentions" do
+ it "rewrites cooked correctly" do
post = create_post_and_change_username(raw: "Hello @foo")
expect(post.cooked).to eq(%Q(Hello @bar
))
@@ -139,22 +135,24 @@ RSpec.describe UsernameChanger do
expect(post.cooked).to eq(%Q(Hello @bar
))
end
- it 'removes the username from the search index' do
+ it "removes the username from the search index" do
SearchIndexer.enable
create_post_and_change_username(raw: "Hello @foo")
- results = Search.execute('foo', min_search_term_length: 1)
+ results = Search.execute("foo", min_search_term_length: 1)
expect(results.posts).to be_empty
end
- it 'ignores case when replacing mentions' do
+ it "ignores case when replacing mentions" do
post = create_post_and_change_username(raw: "There's no difference between @foo and @Foo")
expect(post.raw).to eq("There's no difference between @bar and @bar")
- expect(post.cooked).to eq(%Q(There’s no difference between @bar and @bar
))
+ expect(post.cooked).to eq(
+ %Q(There’s no difference between @bar and @bar
),
+ )
end
- it 'replaces mentions when there are leading symbols' do
+ it "replaces mentions when there are leading symbols" do
post = create_post_and_change_username(raw: ".@foo -@foo %@foo _@foo ,@foo ;@foo @@foo")
expect(post.raw).to eq(".@bar -@bar %@bar _@bar ,@bar ;@bar @@bar")
@@ -169,14 +167,16 @@ RSpec.describe UsernameChanger do
HTML
end
- it 'replaces mentions within double and single quotes' do
+ it "replaces mentions within double and single quotes" do
post = create_post_and_change_username(raw: %Q("@foo" '@foo'))
expect(post.raw).to eq(%Q("@bar" '@bar'))
- expect(post.cooked).to eq(%Q(“@bar ” ‘@bar ’
))
+ expect(post.cooked).to eq(
+ %Q(“@bar ” ‘@bar ’
),
+ )
end
- it 'replaces Markdown formatted mentions' do
+ it "replaces Markdown formatted mentions" do
post = create_post_and_change_username(raw: "**@foo** *@foo* _@foo_ ~~@foo~~")
expect(post.raw).to eq("**@bar** *@bar* _@bar_ ~~@bar~~")
@@ -188,7 +188,7 @@ RSpec.describe UsernameChanger do
HTML
end
- it 'replaces mentions when there are trailing symbols' do
+ it "replaces mentions when there are trailing symbols" do
post = create_post_and_change_username(raw: "@foo. @foo, @foo: @foo; @foo_ @foo-")
expect(post.raw).to eq("@bar. @bar, @bar: @bar; @bar_ @bar-")
@@ -202,36 +202,46 @@ RSpec.describe UsernameChanger do
HTML
end
- it 'does not replace mention in cooked when mention contains a trailing underscore' do
+ it "does not replace mention in cooked when mention contains a trailing underscore" do
# Older versions of Discourse detected a trailing underscore as part of a username.
# That doesn't happen anymore, so we need to do create the `cooked` for this test manually.
- post = create_post_and_change_username(raw: "@foobar @foo") do |p|
- p.update_columns(raw: p.raw.gsub("@foobar", "@foo_"), cooked: p.cooked.gsub("@foobar", "@foo_"))
- end
+ post =
+ create_post_and_change_username(raw: "@foobar @foo") do |p|
+ p.update_columns(
+ raw: p.raw.gsub("@foobar", "@foo_"),
+ cooked: p.cooked.gsub("@foobar", "@foo_"),
+ )
+ end
expect(post.raw).to eq("@bar_ @bar")
- expect(post.cooked).to eq(%Q(@foo_ @bar
))
+ expect(post.cooked).to eq(
+ %Q(@foo_ @bar
),
+ )
end
- it 'does not replace mentions when there are leading alphanumeric chars' do
+ it "does not replace mentions when there are leading alphanumeric chars" do
post = create_post_and_change_username(raw: "@foo a@foo 2@foo")
expect(post.raw).to eq("@bar a@foo 2@foo")
- expect(post.cooked).to eq(%Q(@bar a@foo 2@foo
))
+ expect(post.cooked).to eq(
+ %Q(@bar a@foo 2@foo
),
+ )
end
- it 'does not replace username within email address' do
+ it "does not replace username within email address" do
post = create_post_and_change_username(raw: "@foo mail@foo.com")
expect(post.raw).to eq("@bar mail@foo.com")
- expect(post.cooked).to eq(%Q(@bar mail@foo.com
))
+ expect(post.cooked).to eq(
+ %Q(@bar mail@foo.com
),
+ )
end
- it 'does not replace username in a mention of a similar username' do
- Fabricate(:user, username: 'foobar')
- Fabricate(:user, username: 'foo-bar')
- Fabricate(:user, username: 'foo_bar')
- Fabricate(:user, username: 'foo1')
+ it "does not replace username in a mention of a similar username" do
+ Fabricate(:user, username: "foobar")
+ Fabricate(:user, username: "foo-bar")
+ Fabricate(:user, username: "foo_bar")
+ Fabricate(:user, username: "foo1")
post = create_post_and_change_username(raw: "@foo @foobar @foo-bar @foo_bar @foo1")
@@ -241,7 +251,7 @@ RSpec.describe UsernameChanger do
HTML
end
- it 'updates the path to the user even when it links to /user instead of /u' do
+ it "updates the path to the user even when it links to /user instead of /u" do
post = create_post_and_change_username(raw: "Hello @foo")
post.update_column(:cooked, post.cooked.gsub("/u/foo", "/users/foo"))
@@ -249,8 +259,13 @@ RSpec.describe UsernameChanger do
expect(post.cooked).to eq(%Q(Hello @bar
))
end
- it 'replaces mentions within revisions' do
- revisions = [{ raw: "Hello Foo" }, { title: "new topic title" }, { raw: "Hello @foo!" }, { raw: "Hello @foo!!" }]
+ it "replaces mentions within revisions" do
+ revisions = [
+ { raw: "Hello Foo" },
+ { title: "new topic title" },
+ { raw: "Hello @foo!" },
+ { raw: "Hello @foo!!" },
+ ]
post = create_post_and_change_username(raw: "Hello @foo", revisions: revisions)
expect(post.raw).to eq("Hello @bar!!")
@@ -260,82 +275,111 @@ RSpec.describe UsernameChanger do
expect(post.revisions[0].modifications["raw"][0]).to eq("Hello @bar")
expect(post.revisions[0].modifications["raw"][1]).to eq("Hello Foo")
- expect(post.revisions[0].modifications["cooked"][0]).to eq(%Q(Hello @bar
))
- expect(post.revisions[0].modifications["cooked"][1]).to eq(%Q(Hello Foo
))
+ expect(post.revisions[0].modifications["cooked"][0]).to eq(
+ %Q(Hello @bar
),
+ )
+ expect(post.revisions[0].modifications["cooked"][1]).to eq("Hello Foo
")
expect(post.revisions[1].modifications).to include("title")
expect(post.revisions[2].modifications["raw"][0]).to eq("Hello Foo")
expect(post.revisions[2].modifications["raw"][1]).to eq("Hello @bar!")
- expect(post.revisions[2].modifications["cooked"][0]).to eq(%Q(Hello Foo
))
- expect(post.revisions[2].modifications["cooked"][1]).to eq(%Q(Hello @bar !
))
+ expect(post.revisions[2].modifications["cooked"][0]).to eq("Hello Foo
")
+ expect(post.revisions[2].modifications["cooked"][1]).to eq(
+ %Q(Hello @bar !
),
+ )
expect(post.revisions[3].modifications["raw"][0]).to eq("Hello @bar!")
expect(post.revisions[3].modifications["raw"][1]).to eq("Hello @bar!!")
- expect(post.revisions[3].modifications["cooked"][0]).to eq(%Q(Hello @bar !
))
- expect(post.revisions[3].modifications["cooked"][1]).to eq(%Q(Hello @bar !!
))
+ expect(post.revisions[3].modifications["cooked"][0]).to eq(
+ %Q(Hello @bar !
),
+ )
+ expect(post.revisions[3].modifications["cooked"][1]).to eq(
+ %Q(Hello @bar !!
),
+ )
end
- it 'replaces mentions in posts marked for deletion' do
- post = create_post_and_change_username(raw: "Hello @foo") do |p|
- PostDestroyer.new(p.user, p).destroy
- end
+ it "replaces mentions in posts marked for deletion" do
+ post =
+ create_post_and_change_username(raw: "Hello @foo") do |p|
+ PostDestroyer.new(p.user, p).destroy
+ end
expect(post.raw).to_not include("@foo")
expect(post.cooked).to_not include("foo")
expect(post.revisions.count).to eq(1)
expect(post.revisions[0].modifications["raw"][0]).to eq("Hello @bar")
- expect(post.revisions[0].modifications["cooked"][0]).to eq(%Q(Hello @bar
))
+ expect(post.revisions[0].modifications["cooked"][0]).to eq(
+ %Q(Hello @bar
),
+ )
end
- it 'works when users are mentioned with HTML' do
- post = create_post_and_change_username(raw: '@foo and @someuser ')
+ it "works when users are mentioned with HTML" do
+ post =
+ create_post_and_change_username(
+ raw: '@foo and @someuser ',
+ )
expect(post.raw).to eq('@bar and @someuser ')
- expect(post.cooked).to match_html('@bar and @someuser
')
+ expect(post.cooked).to match_html(
+ '@bar and @someuser
',
+ )
end
context "when using Unicode usernames" do
before { SiteSetting.unicode_usernames = true }
- let(:user) { Fabricate(:user, username: 'թռչուն') }
+ let(:user) { Fabricate(:user, username: "թռչուն") }
- it 'it correctly updates mentions' do
- post = create_post_and_change_username(raw: "Hello @թռչուն", target_username: 'птица')
+ it "it correctly updates mentions" do
+ post = create_post_and_change_username(raw: "Hello @թռչուն", target_username: "птица")
expect(post.raw).to eq("Hello @птица")
- expect(post.cooked).to eq(%Q(Hello @птица
))
+ expect(post.cooked).to eq(
+ %Q(Hello @птица
),
+ )
end
- it 'does not replace mentions when there are leading alphanumeric chars' do
- post = create_post_and_change_username(raw: "Hello @թռչուն 鳥@թռչուն 2@թռչուն ٩@թռչուն", target_username: 'птица')
+ it "does not replace mentions when there are leading alphanumeric chars" do
+ post =
+ create_post_and_change_username(
+ raw: "Hello @թռչուն 鳥@թռչուն 2@թռչուն ٩@թռչուն",
+ target_username: "птица",
+ )
expect(post.raw).to eq("Hello @птица 鳥@թռչուն 2@թռչուն ٩@թռչուն")
- expect(post.cooked).to eq(%Q(Hello @птица 鳥@թռչուն 2@թռչուն ٩@թռչուն
))
+ expect(post.cooked).to eq(
+ %Q(Hello @птица 鳥@թռչուն 2@թռչուն ٩@թռչուն
),
+ )
end
- it 'does not replace username in a mention of a similar username' do
- Fabricate(:user, username: 'թռչուն鳥')
- Fabricate(:user, username: 'թռչուն-鳥')
- Fabricate(:user, username: 'թռչուն_鳥')
- Fabricate(:user, username: 'թռչուն٩')
+ it "does not replace username in a mention of a similar username" do
+ Fabricate(:user, username: "թռչուն鳥")
+ Fabricate(:user, username: "թռչուն-鳥")
+ Fabricate(:user, username: "թռչուն_鳥")
+ Fabricate(:user, username: "թռչուն٩")
- post = create_post_and_change_username(raw: "@թռչուն @թռչուն鳥 @թռչուն-鳥 @թռչուն_鳥 @թռչուն٩", target_username: 'птица')
+ post =
+ create_post_and_change_username(
+ raw: "@թռչուն @թռչուն鳥 @թռչուն-鳥 @թռչուն_鳥 @թռչուն٩",
+ target_username: "птица",
+ )
expect(post.raw).to eq("@птица @թռչուն鳥 @թռչուն-鳥 @թռչուն_鳥 @թռչուն٩")
expect(post.cooked).to match_html <<~HTML
@птица @թռչուն鳥 @թռչուն-鳥 @թռչուն_鳥 @թռչուն٩
HTML
end
-
end
end
- context 'when there are quotes' do
- let(:quoted_post) { create_post(user: user, topic: topic, post_number: 1, raw: "quoted post") }
+ context "when there are quotes" do
+ let(:quoted_post) do
+ create_post(user: user, topic: topic, post_number: 1, raw: "quoted post")
+ end
let(:avatar_url) { user.avatar_template_url.gsub("{size}", "40") }
- it 'replaces the username in quote tags and updates avatar' do
+ it "replaces the username in quote tags and updates avatar" do
post = create_post_and_change_username(raw: <<~RAW)
Lorem ipsum
@@ -402,28 +446,24 @@ RSpec.describe UsernameChanger do
HTML
end
- context 'when there is a simple quote' do
- let(:raw) do <<~RAW
+ context "when there is a simple quote" do
+ let(:raw) { <<~RAW }
Lorem ipsum
[quote="foo, post:1, topic:#{quoted_post.topic.id}"]
quoted
[/quote]
RAW
- end
- let(:expected_raw) do
- <<~RAW.strip
+ let(:expected_raw) { <<~RAW.strip }
Lorem ipsum
[quote="bar, post:1, topic:#{quoted_post.topic.id}"]
quoted
[/quote]
RAW
- end
- let(:expected_cooked) do
- <<~HTML.rstrip
+ let(:expected_cooked) { <<~HTML.rstrip }
Lorem ipsum
@@ -434,12 +474,12 @@ RSpec.describe UsernameChanger do
HTML
- end
- it 'replaces the username in quote tags when the post is deleted' do
- post = create_post_and_change_username(raw: raw) do |p|
- PostDestroyer.new(Discourse.system_user, p).destroy
- end
+ it "replaces the username in quote tags when the post is deleted" do
+ post =
+ create_post_and_change_username(raw: raw) do |p|
+ PostDestroyer.new(Discourse.system_user, p).destroy
+ end
expect(post.raw).to eq(expected_raw)
expect(post.cooked).to match_html(expected_cooked)
@@ -447,21 +487,25 @@ RSpec.describe UsernameChanger do
end
end
- context 'when there are oneboxes' do
- let(:quoted_post) { create_post(user: user, topic: topic, post_number: 1, raw: "quoted post") }
+ context "when there are oneboxes" do
+ let(:quoted_post) do
+ create_post(user: user, topic: topic, post_number: 1, raw: "quoted post")
+ end
let(:avatar_url) { user_avatar_url(user) }
let(:evil_trout) { Fabricate(:evil_trout) }
- let(:another_quoted_post) { create_post(user: evil_trout, topic: topic, post_number: 2, raw: "evil post") }
+ let(:another_quoted_post) do
+ create_post(user: evil_trout, topic: topic, post_number: 2, raw: "evil post")
+ end
def protocol_relative_url(url)
- url.sub(/^https?:/, '')
+ url.sub(/^https?:/, "")
end
def user_avatar_url(u)
u.avatar_template_url.gsub("{size}", "40")
end
- it 'updates avatar for linked topics and posts' do
+ it "updates avatar for linked topics and posts" do
raw = "#{quoted_post.full_url}\n#{quoted_post.topic.url}"
post = create_post_and_change_username(raw: raw)
@@ -491,7 +535,7 @@ RSpec.describe UsernameChanger do
HTML
end
- it 'does not update the wrong avatar' do
+ it "does not update the wrong avatar" do
raw = "#{quoted_post.full_url}\n#{another_quoted_post.full_url}"
post = create_post_and_change_username(raw: raw)
@@ -522,18 +566,18 @@ RSpec.describe UsernameChanger do
end
end
- it 'updates username in small action posts' do
+ it "updates username in small action posts" do
invited_by = Fabricate(:user)
- p1 = topic.add_small_action(invited_by, 'invited_user', 'foo')
- p2 = topic.add_small_action(invited_by, 'invited_user', 'foobar')
- UsernameChanger.change(user, 'bar')
+ p1 = topic.add_small_action(invited_by, "invited_user", "foo")
+ p2 = topic.add_small_action(invited_by, "invited_user", "foobar")
+ UsernameChanger.change(user, "bar")
- expect(p1.reload.custom_fields['action_code_who']).to eq('bar')
- expect(p2.reload.custom_fields['action_code_who']).to eq('foobar')
+ expect(p1.reload.custom_fields["action_code_who"]).to eq("bar")
+ expect(p2.reload.custom_fields["action_code_who"]).to eq("foobar")
end
end
- context 'when there are notifications' do
+ context "when there are notifications" do
def create_notification(type, notified_user, post, data = {})
Fabricate(
:notification,
@@ -541,7 +585,7 @@ RSpec.describe UsernameChanger do
user: notified_user,
data: data.to_json,
topic: post&.topic,
- post_number: post&.post_number
+ post_number: post&.post_number,
)
end
@@ -565,31 +609,85 @@ RSpec.describe UsernameChanger do
{ username: username, foo: "bar" }
end
- it 'replaces usernames in notifications' do
+ it "replaces usernames in notifications" do
renamed_user = Fabricate(:user, username: "alice")
another_user = Fabricate(:user, username: "another_user")
notified_user = Fabricate(:user)
p1 = Fabricate(:post, post_number: 1, user: renamed_user)
p2 = Fabricate(:post, post_number: 1, user: another_user)
- Fabricate(:invited_user, invite: Fabricate(:invite, invited_by: notified_user), user: renamed_user)
- Fabricate(:invited_user, invite: Fabricate(:invite, invited_by: notified_user), user: another_user)
+ Fabricate(
+ :invited_user,
+ invite: Fabricate(:invite, invited_by: notified_user),
+ user: renamed_user,
+ )
+ Fabricate(
+ :invited_user,
+ invite: Fabricate(:invite, invited_by: notified_user),
+ user: another_user,
+ )
- n01 = create_notification(:mentioned, notified_user, p1, original_and_display_username("alice"))
- n02 = create_notification(:mentioned, notified_user, p2, original_and_display_username("another_user"))
- n03 = create_notification(:mentioned, notified_user, p1, original_username_and_some_text_as_display_username("alice"))
+ n01 =
+ create_notification(:mentioned, notified_user, p1, original_and_display_username("alice"))
+ n02 =
+ create_notification(
+ :mentioned,
+ notified_user,
+ p2,
+ original_and_display_username("another_user"),
+ )
+ n03 =
+ create_notification(
+ :mentioned,
+ notified_user,
+ p1,
+ original_username_and_some_text_as_display_username("alice"),
+ )
n04 = create_notification(:mentioned, notified_user, p1, only_display_username("alice"))
- n05 = create_notification(:invitee_accepted, notified_user, nil, only_display_username("alice"))
- n06 = create_notification(:invitee_accepted, notified_user, nil, only_display_username("another_user"))
- n07 = create_notification(:granted_badge, renamed_user, nil, username_and_something_else("alice"))
- n08 = create_notification(:granted_badge, another_user, nil, username_and_something_else("another_user"))
- n09 = create_notification(:group_message_summary, renamed_user, nil, username_and_something_else("alice"))
- n10 = create_notification(:group_message_summary, another_user, nil, username_and_something_else("another_user"))
+ n05 =
+ create_notification(:invitee_accepted, notified_user, nil, only_display_username("alice"))
+ n06 =
+ create_notification(
+ :invitee_accepted,
+ notified_user,
+ nil,
+ only_display_username("another_user"),
+ )
+ n07 =
+ create_notification(
+ :granted_badge,
+ renamed_user,
+ nil,
+ username_and_something_else("alice"),
+ )
+ n08 =
+ create_notification(
+ :granted_badge,
+ another_user,
+ nil,
+ username_and_something_else("another_user"),
+ )
+ n09 =
+ create_notification(
+ :group_message_summary,
+ renamed_user,
+ nil,
+ username_and_something_else("alice"),
+ )
+ n10 =
+ create_notification(
+ :group_message_summary,
+ another_user,
+ nil,
+ username_and_something_else("another_user"),
+ )
UsernameChanger.change(renamed_user, "bob")
expect(notification_data(n01)).to eq(original_and_display_username("bob"))
expect(notification_data(n02)).to eq(original_and_display_username("another_user"))
- expect(notification_data(n03)).to eq(original_username_and_some_text_as_display_username("bob"))
+ expect(notification_data(n03)).to eq(
+ original_username_and_some_text_as_display_username("bob"),
+ )
expect(notification_data(n04)).to eq(only_display_username("bob"))
expect(notification_data(n05)).to eq(only_display_username("bob"))
expect(notification_data(n06)).to eq(only_display_username("another_user"))
@@ -601,32 +699,23 @@ RSpec.describe UsernameChanger do
end
end
- describe '#override' do
+ describe "#override" do
common_test_cases = [
- [
- "overrides the username if a new name is different",
- "john", "bill", "bill", false
- ],
- [
- "does not change the username if a new name is the same",
- "john", "john", "john", false
- ],
- [
- "overrides the username if a new name has different case",
- "john", "JoHN", "JoHN", false
- ]
+ ["overrides the username if a new name is different", "john", "bill", "bill", false],
+ ["does not change the username if a new name is the same", "john", "john", "john", false],
+ ["overrides the username if a new name has different case", "john", "JoHN", "JoHN", false],
]
context "when unicode_usernames is off" do
- before do
- SiteSetting.unicode_usernames = false
- end
+ before { SiteSetting.unicode_usernames = false }
[
*common_test_cases,
[
"does not change the username if a new name after unicode normalization is the same",
- "john", "john¥¥", "john"
+ "john",
+ "john¥¥",
+ "john",
],
].each do |testcase_name, current, new, overrode|
it "#{testcase_name}" do
@@ -647,15 +736,15 @@ RSpec.describe UsernameChanger do
end
context "when unicode_usernames is on" do
- before do
- SiteSetting.unicode_usernames = true
- end
+ before { SiteSetting.unicode_usernames = true }
[
*common_test_cases,
[
"overrides the username if a new name after unicode normalization is different only in case",
- "lo\u0308we", "L\u00F6wee", "L\u00F6wee"
+ "lo\u0308we",
+ "L\u00F6wee",
+ "L\u00F6wee",
],
].each do |testcase_name, current, new, overrode|
it "#{testcase_name}" do
diff --git a/spec/services/username_checker_service_spec.rb b/spec/services/username_checker_service_spec.rb
index 7ac08b3d38c..a4946051b29 100644
--- a/spec/services/username_checker_service_spec.rb
+++ b/spec/services/username_checker_service_spec.rb
@@ -1,45 +1,43 @@
# frozen_string_literal: true
RSpec.describe UsernameCheckerService do
- describe '#check_username' do
+ describe "#check_username" do
before do
@service = UsernameCheckerService.new
@nil_email = nil
- @email = 'vincentvega@example.com'
+ @email = "vincentvega@example.com"
end
- context 'when username is invalid' do
- it 'rejects too short usernames' do
- result = @service.check_username('a', @nil_email)
+ context "when username is invalid" do
+ it "rejects too short usernames" do
+ result = @service.check_username("a", @nil_email)
expect(result).to have_key(:errors)
end
- it 'rejects too long usernames' do
- result = @service.check_username('a123456789b123456789c123456789', @nil_email)
+ it "rejects too long usernames" do
+ result = @service.check_username("a123456789b123456789c123456789", @nil_email)
expect(result).to have_key(:errors)
end
- it 'rejects usernames with invalid characters' do
- result = @service.check_username('vincent-', @nil_email)
+ it "rejects usernames with invalid characters" do
+ result = @service.check_username("vincent-", @nil_email)
expect(result).to have_key(:errors)
end
- it 'rejects usernames that do not start with an alphanumeric character' do
- result = @service.check_username('.vincent', @nil_email)
+ it "rejects usernames that do not start with an alphanumeric character" do
+ result = @service.check_username(".vincent", @nil_email)
expect(result).to have_key(:errors)
end
- context 'with reserved usernames' do
- before do
- SiteSetting.reserved_usernames = 'test|donkey'
- end
+ context "with reserved usernames" do
+ before { SiteSetting.reserved_usernames = "test|donkey" }
- it 'rejects usernames that are reserved' do
+ it "rejects usernames that are reserved" do
result = @service.check_username("test", @nil_email)
expect(result[:available]).to eq(false)
end
- it 'allows reserved username checker to be skipped' do
+ it "allows reserved username checker to be skipped" do
@service = UsernameCheckerService.new(allow_reserved_username: true)
result = @service.check_username("test", @nil_email)
expect(result[:available]).to eq(true)
@@ -47,17 +45,17 @@ RSpec.describe UsernameCheckerService do
end
end
- it 'username not available locally' do
+ it "username not available locally" do
User.stubs(:username_available?).returns(false)
- UserNameSuggester.stubs(:suggest).returns('einar-j')
- result = @service.check_username('vincent', @nil_email)
+ UserNameSuggester.stubs(:suggest).returns("einar-j")
+ result = @service.check_username("vincent", @nil_email)
expect(result[:available]).to eq(false)
- expect(result[:suggestion]).to eq('einar-j')
+ expect(result[:suggestion]).to eq("einar-j")
end
- it 'username available locally' do
+ it "username available locally" do
User.stubs(:username_available?).returns(true)
- result = @service.check_username('vincent', @nil_email)
+ result = @service.check_username("vincent", @nil_email)
expect(result[:available]).to eq(true)
end
end
diff --git a/spec/services/wildcard_domain_checker_spec.rb b/spec/services/wildcard_domain_checker_spec.rb
index 8a941df607c..191973df413 100644
--- a/spec/services/wildcard_domain_checker_spec.rb
+++ b/spec/services/wildcard_domain_checker_spec.rb
@@ -1,35 +1,45 @@
# frozen_string_literal: true
RSpec.describe WildcardDomainChecker do
- describe '.check_domain' do
- context 'when domain is valid' do
- it 'returns correct domain' do
- result1 = WildcardDomainChecker.check_domain('*.discourse.org', 'anything.is.possible.discourse.org')
- expect(result1[0]).to eq('anything.is.possible.discourse.org')
+ describe ".check_domain" do
+ context "when domain is valid" do
+ it "returns correct domain" do
+ result1 =
+ WildcardDomainChecker.check_domain(
+ "*.discourse.org",
+ "anything.is.possible.discourse.org",
+ )
+ expect(result1[0]).to eq("anything.is.possible.discourse.org")
- result2 = WildcardDomainChecker.check_domain('www.discourse.org', 'www.discourse.org')
- expect(result2[0]).to eq('www.discourse.org')
+ result2 = WildcardDomainChecker.check_domain("www.discourse.org", "www.discourse.org")
+ expect(result2[0]).to eq("www.discourse.org")
- result3 = WildcardDomainChecker.check_domain('*', 'hello.discourse.org')
- expect(result3[0]).to eq('hello.discourse.org')
+ result3 = WildcardDomainChecker.check_domain("*", "hello.discourse.org")
+ expect(result3[0]).to eq("hello.discourse.org")
end
end
- context 'when domain is invalid' do
+ context "when domain is invalid" do
it "doesn't return the domain" do
- result1 = WildcardDomainChecker.check_domain('*.discourse.org', 'bad-domain.discourse.org.evil.com')
+ result1 =
+ WildcardDomainChecker.check_domain("*.discourse.org", "bad-domain.discourse.org.evil.com")
expect(result1).to eq(nil)
- result2 = WildcardDomainChecker.check_domain('www.discourse.org', 'www.discourse.org.evil.com')
+ result2 =
+ WildcardDomainChecker.check_domain("www.discourse.org", "www.discourse.org.evil.com")
expect(result2).to eq(nil)
- result3 = WildcardDomainChecker.check_domain('www.discourse.org', 'www.www.discourse.org')
+ result3 = WildcardDomainChecker.check_domain("www.discourse.org", "www.www.discourse.org")
expect(result3).to eq(nil)
- result4 = WildcardDomainChecker.check_domain('www.*.discourse.org', 'www.www.discourse.org')
+ result4 = WildcardDomainChecker.check_domain("www.*.discourse.org", "www.www.discourse.org")
expect(result4).to eq(nil)
- result5 = WildcardDomainChecker.check_domain('www.discourse.org', "www.discourse.org\nwww.discourse.org.evil.com")
+ result5 =
+ WildcardDomainChecker.check_domain(
+ "www.discourse.org",
+ "www.discourse.org\nwww.discourse.org.evil.com",
+ )
expect(result5).to eq(nil)
end
end
diff --git a/spec/services/wildcard_url_checker_spec.rb b/spec/services/wildcard_url_checker_spec.rb
index 89522a0a47a..16988d0a425 100644
--- a/spec/services/wildcard_url_checker_spec.rb
+++ b/spec/services/wildcard_url_checker_spec.rb
@@ -1,47 +1,74 @@
# frozen_string_literal: true
RSpec.describe WildcardUrlChecker do
- describe '.check_url' do
- context 'when url is valid' do
- it 'returns true' do
- result1 = described_class.check_url('https://*.discourse.org', 'https://anything.is.possible.discourse.org')
+ describe ".check_url" do
+ context "when url is valid" do
+ it "returns true" do
+ result1 =
+ described_class.check_url(
+ "https://*.discourse.org",
+ "https://anything.is.possible.discourse.org",
+ )
expect(result1).to eq(true)
- result2 = described_class.check_url('https://www.discourse.org', 'https://www.discourse.org')
+ result2 =
+ described_class.check_url("https://www.discourse.org", "https://www.discourse.org")
expect(result2).to eq(true)
- result3 = described_class.check_url('*', 'https://hello.discourse.org')
+ result3 = described_class.check_url("*", "https://hello.discourse.org")
expect(result3).to eq(true)
- result4 = described_class.check_url('discourse://auth_redirect', 'discourse://auth_redirect')
+ result4 =
+ described_class.check_url("discourse://auth_redirect", "discourse://auth_redirect")
expect(result4).to eq(true)
- result5 = described_class.check_url('customprotocol://www.discourse.org', "customprotocol://www.discourse.org")
+ result5 =
+ described_class.check_url(
+ "customprotocol://www.discourse.org",
+ "customprotocol://www.discourse.org",
+ )
expect(result5).to eq(true)
end
end
- context 'when url is invalid' do
+ context "when url is invalid" do
it "returns false" do
- result1 = described_class.check_url('https://*.discourse.org', 'https://bad-domain.discourse.org.evil.com')
+ result1 =
+ described_class.check_url(
+ "https://*.discourse.org",
+ "https://bad-domain.discourse.org.evil.com",
+ )
expect(result1).to eq(false)
- result2 = described_class.check_url('https://www.discourse.org', 'https://www.discourse.org.evil.com')
+ result2 =
+ described_class.check_url(
+ "https://www.discourse.org",
+ "https://www.discourse.org.evil.com",
+ )
expect(result2).to eq(false)
- result3 = described_class.check_url('https://www.discourse.org', 'https://www.www.discourse.org')
+ result3 =
+ described_class.check_url("https://www.discourse.org", "https://www.www.discourse.org")
expect(result3).to eq(false)
- result4 = described_class.check_url('https://www.discourse.org', "https://www.discourse.org\nwww.discourse.org.evil.com")
+ result4 =
+ described_class.check_url(
+ "https://www.discourse.org",
+ "https://www.discourse.org\nwww.discourse.org.evil.com",
+ )
expect(result4).to eq(false)
- result5 = described_class.check_url('https://', "https://")
+ result5 = described_class.check_url("https://", "https://")
expect(result5).to eq(false)
- result6 = described_class.check_url('invalid$protocol://www.discourse.org', "invalid$protocol://www.discourse.org")
+ result6 =
+ described_class.check_url(
+ "invalid$protocol://www.discourse.org",
+ "invalid$protocol://www.discourse.org",
+ )
expect(result6).to eq(false)
- result7 = described_class.check_url('noscheme', "noscheme")
+ result7 = described_class.check_url("noscheme", "noscheme")
expect(result7).to eq(false)
end
end
diff --git a/spec/services/word_watcher_spec.rb b/spec/services/word_watcher_spec.rb
index 842f66303dd..653c0d33faa 100644
--- a/spec/services/word_watcher_spec.rb
+++ b/spec/services/word_watcher_spec.rb
@@ -1,41 +1,46 @@
# frozen_string_literal: true
RSpec.describe WordWatcher do
- let(:raw) do
- <<~RAW.strip
+ let(:raw) { <<~RAW.strip }
Do you like liquorice?
I really like them. One could even say that I am *addicted* to liquorice. And if
you can mix it up with some anise, then I'm in heaven ;)
RAW
- end
- after do
- Discourse.redis.flushdb
- end
+ after { Discourse.redis.flushdb }
describe ".words_for_action" do
it "returns words with metadata including case sensitivity flag" do
Fabricate(:watched_word, action: WatchedWord.actions[:censor])
word1 = Fabricate(:watched_word, action: WatchedWord.actions[:block]).word
- word2 = Fabricate(:watched_word, action: WatchedWord.actions[:block], case_sensitive: true).word
+ word2 =
+ Fabricate(:watched_word, action: WatchedWord.actions[:block], case_sensitive: true).word
expect(described_class.words_for_action(:block)).to include(
- word1 => { case_sensitive: false },
- word2 => { case_sensitive: true }
+ word1 => {
+ case_sensitive: false,
+ },
+ word2 => {
+ case_sensitive: true,
+ },
)
end
it "returns word with metadata including replacement if word has replacement" do
- word = Fabricate(
- :watched_word,
- action: WatchedWord.actions[:link],
- replacement: "http://test.localhost/"
- ).word
+ word =
+ Fabricate(
+ :watched_word,
+ action: WatchedWord.actions[:link],
+ replacement: "http://test.localhost/",
+ ).word
expect(described_class.words_for_action(:link)).to include(
- word => { case_sensitive: false, replacement: "http://test.localhost/" }
+ word => {
+ case_sensitive: false,
+ replacement: "http://test.localhost/",
+ },
)
end
@@ -47,8 +52,12 @@ RSpec.describe WordWatcher do
describe ".word_matcher_regexp_list" do
let!(:word1) { Fabricate(:watched_word, action: WatchedWord.actions[:block]).word }
let!(:word2) { Fabricate(:watched_word, action: WatchedWord.actions[:block]).word }
- let!(:word3) { Fabricate(:watched_word, action: WatchedWord.actions[:block], case_sensitive: true).word }
- let!(:word4) { Fabricate(:watched_word, action: WatchedWord.actions[:block], case_sensitive: true).word }
+ let!(:word3) do
+ Fabricate(:watched_word, action: WatchedWord.actions[:block], case_sensitive: true).word
+ end
+ let!(:word4) do
+ Fabricate(:watched_word, action: WatchedWord.actions[:block], case_sensitive: true).word
+ end
context "when watched_words_regular_expressions = true" do
it "returns the proper regexp" do
@@ -56,7 +65,10 @@ RSpec.describe WordWatcher do
regexps = described_class.word_matcher_regexp_list(:block)
expect(regexps).to be_an(Array)
- expect(regexps.map(&:inspect)).to contain_exactly("/(#{word1})|(#{word2})/i", "/(#{word3})|(#{word4})/")
+ expect(regexps.map(&:inspect)).to contain_exactly(
+ "/(#{word1})|(#{word2})/i",
+ "/(#{word3})|(#{word4})/",
+ )
end
end
@@ -66,7 +78,10 @@ RSpec.describe WordWatcher do
regexps = described_class.word_matcher_regexp_list(:block)
expect(regexps).to be_an(Array)
- expect(regexps.map(&:inspect)).to contain_exactly("/(?:\\W|^)(#{word1}|#{word2})(?=\\W|$)/i", "/(?:\\W|^)(#{word3}|#{word4})(?=\\W|$)/")
+ expect(regexps.map(&:inspect)).to contain_exactly(
+ "/(?:\\W|^)(#{word1}|#{word2})(?=\\W|$)/i",
+ "/(?:\\W|^)(#{word3}|#{word4})(?=\\W|$)/",
+ )
end
it "is empty for an action without watched words" do
@@ -88,7 +103,9 @@ RSpec.describe WordWatcher do
end
it "raises an exception with raise_errors set to true" do
- expect { described_class.word_matcher_regexp_list(:block, raise_errors: true) }.to raise_error(RegexpError)
+ expect {
+ described_class.word_matcher_regexp_list(:block, raise_errors: true)
+ }.to raise_error(RegexpError)
end
end
end
@@ -99,10 +116,16 @@ RSpec.describe WordWatcher do
end
context "with watched words" do
- fab!(:anise) { Fabricate(:watched_word, word: "anise", action: WatchedWord.actions[:require_approval]) }
+ fab!(:anise) do
+ Fabricate(:watched_word, word: "anise", action: WatchedWord.actions[:require_approval])
+ end
it "is falsey without a match" do
- expect(described_class.new("No liquorice for me, thanks...").word_matches_for_action?(:require_approval)).to be_falsey
+ expect(
+ described_class.new("No liquorice for me, thanks...").word_matches_for_action?(
+ :require_approval,
+ ),
+ ).to be_falsey
end
it "is returns matched words if there's a match" do
@@ -112,68 +135,109 @@ RSpec.describe WordWatcher do
end
it "finds at start of string" do
- matches = described_class.new("#{anise.word} is garbage").word_matches_for_action?(:require_approval)
+ matches =
+ described_class.new("#{anise.word} is garbage").word_matches_for_action?(
+ :require_approval,
+ )
expect(matches[1]).to eq(anise.word)
end
it "finds at end of string" do
- matches = described_class.new("who likes #{anise.word}").word_matches_for_action?(:require_approval)
+ matches =
+ described_class.new("who likes #{anise.word}").word_matches_for_action?(:require_approval)
expect(matches[1]).to eq(anise.word)
end
it "finds non-letters in place of letters" do
Fabricate(:watched_word, word: "co(onut", action: WatchedWord.actions[:require_approval])
- matches = described_class.new("This co(onut is delicious.").word_matches_for_action?(:require_approval)
+ matches =
+ described_class.new("This co(onut is delicious.").word_matches_for_action?(
+ :require_approval,
+ )
expect(matches[1]).to eq("co(onut")
end
it "handles * for wildcards" do
Fabricate(:watched_word, word: "a**le*", action: WatchedWord.actions[:require_approval])
- matches = described_class.new("I acknowledge you.").word_matches_for_action?(:require_approval)
+ matches =
+ described_class.new("I acknowledge you.").word_matches_for_action?(:require_approval)
expect(matches[1]).to eq("acknowledge")
end
it "handles word boundary" do
Fabricate(:watched_word, word: "love", action: WatchedWord.actions[:require_approval])
- expect(described_class.new("I Love, bananas.").word_matches_for_action?(:require_approval)[1]).to eq("Love")
- expect(described_class.new("I LOVE; apples.").word_matches_for_action?(:require_approval)[1]).to eq("LOVE")
- expect(described_class.new("love: is a thing.").word_matches_for_action?(:require_approval)[1]).to eq("love")
- expect(described_class.new("I love. oranges").word_matches_for_action?(:require_approval)[1]).to eq("love")
- expect(described_class.new("I :love. pineapples").word_matches_for_action?(:require_approval)[1]).to eq("love")
- expect(described_class.new("peace ,love and understanding.").word_matches_for_action?(:require_approval)[1]).to eq("love")
+ expect(
+ described_class.new("I Love, bananas.").word_matches_for_action?(:require_approval)[1],
+ ).to eq("Love")
+ expect(
+ described_class.new("I LOVE; apples.").word_matches_for_action?(:require_approval)[1],
+ ).to eq("LOVE")
+ expect(
+ described_class.new("love: is a thing.").word_matches_for_action?(:require_approval)[1],
+ ).to eq("love")
+ expect(
+ described_class.new("I love. oranges").word_matches_for_action?(:require_approval)[1],
+ ).to eq("love")
+ expect(
+ described_class.new("I :love. pineapples").word_matches_for_action?(:require_approval)[1],
+ ).to eq("love")
+ expect(
+ described_class.new("peace ,love and understanding.").word_matches_for_action?(
+ :require_approval,
+ )[
+ 1
+ ],
+ ).to eq("love")
end
- context 'when there are multiple matches' do
- context 'with non regexp words' do
- it 'lists all matching words' do
- %w{bananas hate hates}.each do |word|
+ context "when there are multiple matches" do
+ context "with non regexp words" do
+ it "lists all matching words" do
+ %w[bananas hate hates].each do |word|
Fabricate(:watched_word, word: word, action: WatchedWord.actions[:block])
end
- matches = described_class.new("I hate bananas").word_matches_for_action?(:block, all_matches: true)
- expect(matches).to contain_exactly('hate', 'bananas')
+ matches =
+ described_class.new("I hate bananas").word_matches_for_action?(
+ :block,
+ all_matches: true,
+ )
+ expect(matches).to contain_exactly("hate", "bananas")
- matches = described_class.new("She hates bananas too").word_matches_for_action?(:block, all_matches: true)
- expect(matches).to contain_exactly('hates', 'bananas')
+ matches =
+ described_class.new("She hates bananas too").word_matches_for_action?(
+ :block,
+ all_matches: true,
+ )
+ expect(matches).to contain_exactly("hates", "bananas")
end
end
- context 'with regexp words' do
- before do
- SiteSetting.watched_words_regular_expressions = true
- end
+ context "with regexp words" do
+ before { SiteSetting.watched_words_regular_expressions = true }
- it 'lists all matching patterns' do
+ it "lists all matching patterns" do
Fabricate(:watched_word, word: "(pine)?apples", action: WatchedWord.actions[:block])
- Fabricate(:watched_word, word: "((move|store)(d)?)|((watch|listen)(ed|ing)?)", action: WatchedWord.actions[:block])
+ Fabricate(
+ :watched_word,
+ word: "((move|store)(d)?)|((watch|listen)(ed|ing)?)",
+ action: WatchedWord.actions[:block],
+ )
- matches = described_class.new("pine pineapples apples").word_matches_for_action?(:block, all_matches: true)
- expect(matches).to contain_exactly('pineapples', 'apples')
+ matches =
+ described_class.new("pine pineapples apples").word_matches_for_action?(
+ :block,
+ all_matches: true,
+ )
+ expect(matches).to contain_exactly("pineapples", "apples")
- matches = described_class.new("go watched watch ed ing move d moveed moved moving").word_matches_for_action?(:block, all_matches: true)
- expect(matches).to contain_exactly(*%w{watched watch move moved})
+ matches =
+ described_class.new(
+ "go watched watch ed ing move d moveed moved moving",
+ ).word_matches_for_action?(:block, all_matches: true)
+ expect(matches).to contain_exactly(*%w[watched watch move moved])
end
end
end
@@ -182,36 +246,41 @@ RSpec.describe WordWatcher do
it "handles emoji" do
Fabricate(:watched_word, word: ":joy:", action: WatchedWord.actions[:require_approval])
- matches = described_class.new("Lots of emojis here :joy:").word_matches_for_action?(:require_approval)
+ matches =
+ described_class.new("Lots of emojis here :joy:").word_matches_for_action?(
+ :require_approval,
+ )
expect(matches[1]).to eq(":joy:")
end
it "handles unicode emoji" do
Fabricate(:watched_word, word: "🎃", action: WatchedWord.actions[:require_approval])
- matches = described_class.new("Halloween party! 🎃").word_matches_for_action?(:require_approval)
+ matches =
+ described_class.new("Halloween party! 🎃").word_matches_for_action?(:require_approval)
expect(matches[1]).to eq("🎃")
end
it "handles emoji skin tone" do
- Fabricate(:watched_word, word: ":woman:t5:", action: WatchedWord.actions[:require_approval])
+ Fabricate(
+ :watched_word,
+ word: ":woman:t5:",
+ action: WatchedWord.actions[:require_approval],
+ )
- matches = described_class.new("To Infinity and beyond! 🚀 :woman:t5:").word_matches_for_action?(:require_approval)
+ matches =
+ described_class.new("To Infinity and beyond! 🚀 :woman:t5:").word_matches_for_action?(
+ :require_approval,
+ )
expect(matches[1]).to eq(":woman:t5:")
end
end
context "when word is a regular expression" do
- before do
- SiteSetting.watched_words_regular_expressions = true
- end
+ before { SiteSetting.watched_words_regular_expressions = true }
it "supports regular expressions on word boundaries" do
- Fabricate(
- :watched_word,
- word: /\btest\b/,
- action: WatchedWord.actions[:block]
- )
+ Fabricate(:watched_word, word: /\btest\b/, action: WatchedWord.actions[:block])
matches = described_class.new("this is not a test.").word_matches_for_action?(:block)
expect(matches[0]).to eq("test")
@@ -221,13 +290,15 @@ RSpec.describe WordWatcher do
Fabricate(
:watched_word,
word: /tro[uo]+t/,
- action: WatchedWord.actions[:require_approval]
+ action: WatchedWord.actions[:require_approval],
)
- matches = described_class.new("Evil Trout is cool").word_matches_for_action?(:require_approval)
+ matches =
+ described_class.new("Evil Trout is cool").word_matches_for_action?(:require_approval)
expect(matches[0]).to eq("Trout")
- matches = described_class.new("Evil Troot is cool").word_matches_for_action?(:require_approval)
+ matches =
+ described_class.new("Evil Troot is cool").word_matches_for_action?(:require_approval)
expect(matches[0]).to eq("Troot")
matches = described_class.new("trooooooooot").word_matches_for_action?(:require_approval)
@@ -235,20 +306,18 @@ RSpec.describe WordWatcher do
end
it "support uppercase" do
- Fabricate(
- :watched_word,
- word: /a\S+ce/,
- action: WatchedWord.actions[:require_approval]
- )
+ Fabricate(:watched_word, word: /a\S+ce/, action: WatchedWord.actions[:require_approval])
- matches = described_class.new('Amazing place').word_matches_for_action?(:require_approval)
+ matches = described_class.new("Amazing place").word_matches_for_action?(:require_approval)
expect(matches).to be_nil
- matches = described_class.new('Amazing applesauce').word_matches_for_action?(:require_approval)
- expect(matches[0]).to eq('applesauce')
+ matches =
+ described_class.new("Amazing applesauce").word_matches_for_action?(:require_approval)
+ expect(matches[0]).to eq("applesauce")
- matches = described_class.new('Amazing AppleSauce').word_matches_for_action?(:require_approval)
- expect(matches[0]).to eq('AppleSauce')
+ matches =
+ described_class.new("Amazing AppleSauce").word_matches_for_action?(:require_approval)
+ expect(matches[0]).to eq("AppleSauce")
end
end
@@ -258,7 +327,7 @@ RSpec.describe WordWatcher do
:watched_word,
word: "Discourse",
action: WatchedWord.actions[:block],
- case_sensitive: true
+ case_sensitive: true,
)
end
@@ -267,9 +336,10 @@ RSpec.describe WordWatcher do
SiteSetting.watched_words_regular_expressions = true
Fabricate(:watched_word, word: "p(rivate|ublic)", action: WatchedWord.actions[:block])
- matches = described_class
- .new("PUBLIC: Discourse is great for public discourse")
- .word_matches_for_action?(:block, all_matches: true)
+ matches =
+ described_class.new(
+ "PUBLIC: Discourse is great for public discourse",
+ ).word_matches_for_action?(:block, all_matches: true)
expect(matches).to contain_exactly("PUBLIC", "Discourse", "public")
end
end
@@ -279,9 +349,10 @@ RSpec.describe WordWatcher do
SiteSetting.watched_words_regular_expressions = false
Fabricate(:watched_word, word: "private", action: WatchedWord.actions[:block])
- matches = described_class
- .new("PRIVATE: Discourse is also great private discourse")
- .word_matches_for_action?(:block, all_matches: true)
+ matches =
+ described_class.new(
+ "PRIVATE: Discourse is also great private discourse",
+ ).word_matches_for_action?(:block, all_matches: true)
expect(matches).to contain_exactly("PRIVATE", "Discourse", "private")
end
@@ -291,13 +362,30 @@ RSpec.describe WordWatcher do
end
describe ".apply_to_text" do
- fab!(:censored_word) { Fabricate(:watched_word, word: "censored", action: WatchedWord.actions[:censor]) }
- fab!(:replaced_word) { Fabricate(:watched_word, word: "to replace", replacement: "replaced", action: WatchedWord.actions[:replace]) }
- fab!(:link_word) { Fabricate(:watched_word, word: "https://notdiscourse.org", replacement: "https://discourse.org", action: WatchedWord.actions[:link]) }
+ fab!(:censored_word) do
+ Fabricate(:watched_word, word: "censored", action: WatchedWord.actions[:censor])
+ end
+ fab!(:replaced_word) do
+ Fabricate(
+ :watched_word,
+ word: "to replace",
+ replacement: "replaced",
+ action: WatchedWord.actions[:replace],
+ )
+ end
+ fab!(:link_word) do
+ Fabricate(
+ :watched_word,
+ word: "https://notdiscourse.org",
+ replacement: "https://discourse.org",
+ action: WatchedWord.actions[:link],
+ )
+ end
it "replaces all types of words" do
text = "hello censored world to replace https://notdiscourse.org"
- expected = "hello #{described_class::REPLACEMENT_LETTER * 8} world replaced https://discourse.org"
+ expected =
+ "hello #{described_class::REPLACEMENT_LETTER * 8} world replaced https://discourse.org"
expect(described_class.apply_to_text(text)).to eq(expected)
end
@@ -308,7 +396,7 @@ RSpec.describe WordWatcher do
:watched_word,
word: "\\Wplaceholder",
replacement: "replacement",
- action: WatchedWord.actions[:replace]
+ action: WatchedWord.actions[:replace],
)
text = "is \tplaceholder in https://notdiscourse.org"
diff --git a/spec/support/bookmarkable_helper.rb b/spec/support/bookmarkable_helper.rb
index 6e4bdce1718..7a9f053fd78 100644
--- a/spec/support/bookmarkable_helper.rb
+++ b/spec/support/bookmarkable_helper.rb
@@ -47,9 +47,12 @@ class UserTestBookmarkable < BaseBookmarkable
end
def self.list_query(user, guardian)
- user.bookmarks.joins(
- "INNER JOIN users ON users.id = bookmarks.bookmarkable_id AND bookmarks.bookmarkable_type = 'User'"
- ).where(bookmarkable_type: "User")
+ user
+ .bookmarks
+ .joins(
+ "INNER JOIN users ON users.id = bookmarks.bookmarkable_id AND bookmarks.bookmarkable_type = 'User'",
+ )
+ .where(bookmarkable_type: "User")
end
def self.search_query(bookmarks, query, ts_query, &bookmarkable_search)
diff --git a/spec/support/common_basic_reviewable_serializer.rb b/spec/support/common_basic_reviewable_serializer.rb
index 76680076c4e..46cd327f6d5 100644
--- a/spec/support/common_basic_reviewable_serializer.rb
+++ b/spec/support/common_basic_reviewable_serializer.rb
@@ -32,9 +32,7 @@ shared_examples "basic reviewable attributes" do
describe "#flagger_username" do
it "equals to the username of the user who created the reviewable" do
- reviewable.update!(
- created_by: Fabricate(:user, username: "gg.osama")
- )
+ reviewable.update!(created_by: Fabricate(:user, username: "gg.osama"))
expect(subject[:flagger_username]).to eq("gg.osama")
end
end
diff --git a/spec/support/concurrency.rb b/spec/support/concurrency.rb
index 5d3cd0c87c4..ceba7f5f4dd 100644
--- a/spec/support/concurrency.rb
+++ b/spec/support/concurrency.rb
@@ -1,10 +1,11 @@
# frozen_string_literal: true
-require 'fiber'
+require "fiber"
module Concurrency
module Logic
- class DeadEnd < StandardError; end
+ class DeadEnd < StandardError
+ end
module Complete
class Path
@@ -169,9 +170,7 @@ module Concurrency
until @tasks.empty?
task = @path.choose(*@tasks)
task.resume
- unless task.alive?
- @tasks.delete(task)
- end
+ @tasks.delete(task) unless task.alive?
end
end
end
@@ -196,20 +195,14 @@ module Concurrency
end
def multi(&blk)
- with_possible_failure do
- with_in_transaction do
- @redis.multi(&blk)
- end
- end
+ with_possible_failure { with_in_transaction { @redis.multi(&blk) } }
end
def method_missing(method, *args, &blk)
if @in_transaction
@redis.send(method, *args, &blk)
else
- with_possible_failure do
- @redis.send(method, *args, &blk)
- end
+ with_possible_failure { @redis.send(method, *args, &blk) }
end
end
@@ -227,25 +220,17 @@ module Concurrency
def with_possible_failure
outcome =
- @execution.choose_with_weights(
- [:succeed, 0.96],
- [:fail_before, 0.02],
- [:fail_after, 0.02]
- )
+ @execution.choose_with_weights([:succeed, 0.96], [:fail_before, 0.02], [:fail_after, 0.02])
@execution.yield
- if outcome == :fail_before
- raise Redis::ConnectionError
- end
+ raise Redis::ConnectionError if outcome == :fail_before
result = yield
@execution.yield
- if outcome == :fail_after
- raise Redis::ConnectionError
- end
+ raise Redis::ConnectionError if outcome == :fail_after
result
end
diff --git a/spec/support/diagnostics_helper.rb b/spec/support/diagnostics_helper.rb
index 6c335d317a8..b4c4e7e7382 100644
--- a/spec/support/diagnostics_helper.rb
+++ b/spec/support/diagnostics_helper.rb
@@ -20,7 +20,6 @@ module MessageBus::DiagnosticsHelper
ensure
@tracking = nil
end
-
end
module MessageBus
diff --git a/spec/support/discourse_event_helper.rb b/spec/support/discourse_event_helper.rb
index a0531b8ca95..7c1e595f1a9 100644
--- a/spec/support/discourse_event_helper.rb
+++ b/spec/support/discourse_event_helper.rb
@@ -16,11 +16,12 @@ module DiscourseEvent::TestHelper
@events_trigger = nil
if event_name
- events_trigger = events_trigger.filter do |event|
- next if event[:event_name] != event_name
- next if args && event[:params] != args
- true
- end
+ events_trigger =
+ events_trigger.filter do |event|
+ next if event[:event_name] != event_name
+ next if args && event[:params] != args
+ true
+ end
end
events_trigger
diff --git a/spec/support/fake_s3.rb b/spec/support/fake_s3.rb
index 48be0269664..e605ae56df1 100644
--- a/spec/support/fake_s3.rb
+++ b/spec/support/fake_s3.rb
@@ -6,7 +6,11 @@ class FakeS3
def self.create
s3 = self.new
s3.stub_bucket(SiteSetting.s3_upload_bucket) if SiteSetting.s3_upload_bucket.present?
- s3.stub_bucket(File.join(SiteSetting.s3_backup_bucket, RailsMultisite::ConnectionManagement.current_db)) if SiteSetting.s3_backup_bucket.present?
+ if SiteSetting.s3_backup_bucket.present?
+ s3.stub_bucket(
+ File.join(SiteSetting.s3_backup_bucket, RailsMultisite::ConnectionManagement.current_db),
+ )
+ end
s3.stub_s3_helper
s3
end
@@ -27,17 +31,25 @@ class FakeS3
def stub_bucket(full_bucket_name)
bucket_name, _prefix = full_bucket_name.split("/", 2)
- s3_helper = S3Helper.new(
- full_bucket_name,
- Rails.configuration.multisite ? FileStore::S3Store.new.multisite_tombstone_prefix : FileStore::S3Store::TOMBSTONE_PREFIX,
- client: @s3_client
- )
+ s3_helper =
+ S3Helper.new(
+ full_bucket_name,
+ (
+ if Rails.configuration.multisite
+ FileStore::S3Store.new.multisite_tombstone_prefix
+ else
+ FileStore::S3Store::TOMBSTONE_PREFIX
+ end
+ ),
+ client: @s3_client,
+ )
@buckets[bucket_name] = FakeS3Bucket.new(full_bucket_name, s3_helper)
end
def stub_s3_helper
@buckets.each do |bucket_name, bucket|
- S3Helper.stubs(:new)
+ S3Helper
+ .stubs(:new)
.with { |b| b == bucket_name || b == bucket.name }
.returns(bucket.s3_helper)
end
@@ -61,10 +73,7 @@ class FakeS3
end
def log_operation(context)
- @operations << {
- name: context.operation_name,
- params: context.params.dup
- }
+ @operations << { name: context.operation_name, params: context.params.dup }
end
def calculate_etag(context)
@@ -73,64 +82,86 @@ class FakeS3
end
def stub_methods
- @s3_client.stub_responses(:head_object, -> (context) do
- log_operation(context)
+ @s3_client.stub_responses(
+ :head_object,
+ ->(context) do
+ log_operation(context)
- if object = find_object(context.params)
- { content_length: object[:size], last_modified: object[:last_modified], metadata: object[:metadata] }
- else
- { status_code: 404, headers: {}, body: "" }
- end
- end)
+ if object = find_object(context.params)
+ {
+ content_length: object[:size],
+ last_modified: object[:last_modified],
+ metadata: object[:metadata],
+ }
+ else
+ { status_code: 404, headers: {}, body: "" }
+ end
+ end,
+ )
- @s3_client.stub_responses(:get_object, -> (context) do
- log_operation(context)
+ @s3_client.stub_responses(
+ :get_object,
+ ->(context) do
+ log_operation(context)
- if object = find_object(context.params)
- { content_length: object[:size], body: "" }
- else
- { status_code: 404, headers: {}, body: "" }
- end
- end)
+ if object = find_object(context.params)
+ { content_length: object[:size], body: "" }
+ else
+ { status_code: 404, headers: {}, body: "" }
+ end
+ end,
+ )
- @s3_client.stub_responses(:delete_object, -> (context) do
- log_operation(context)
+ @s3_client.stub_responses(
+ :delete_object,
+ ->(context) do
+ log_operation(context)
- find_bucket(context.params)&.delete_object(context.params[:key])
- nil
- end)
+ find_bucket(context.params)&.delete_object(context.params[:key])
+ nil
+ end,
+ )
- @s3_client.stub_responses(:copy_object, -> (context) do
- log_operation(context)
+ @s3_client.stub_responses(
+ :copy_object,
+ ->(context) do
+ log_operation(context)
- source_bucket_name, source_key = context.params[:copy_source].split("/", 2)
- copy_source = { bucket: source_bucket_name, key: source_key }
+ source_bucket_name, source_key = context.params[:copy_source].split("/", 2)
+ copy_source = { bucket: source_bucket_name, key: source_key }
- if context.params[:metadata_directive] == "REPLACE"
- attribute_overrides = context.params.except(:copy_source, :metadata_directive)
- else
- attribute_overrides = context.params.slice(:key, :bucket)
- end
+ if context.params[:metadata_directive] == "REPLACE"
+ attribute_overrides = context.params.except(:copy_source, :metadata_directive)
+ else
+ attribute_overrides = context.params.slice(:key, :bucket)
+ end
- new_object = find_object(copy_source).dup.merge(attribute_overrides)
- find_bucket(new_object).put_object(new_object)
+ new_object = find_object(copy_source).dup.merge(attribute_overrides)
+ find_bucket(new_object).put_object(new_object)
- { copy_object_result: { etag: calculate_etag(context) } }
- end)
+ { copy_object_result: { etag: calculate_etag(context) } }
+ end,
+ )
- @s3_client.stub_responses(:create_multipart_upload, -> (context) do
- log_operation(context)
+ @s3_client.stub_responses(
+ :create_multipart_upload,
+ ->(context) do
+ log_operation(context)
- find_bucket(context.params).put_object(context.params)
- { upload_id: SecureRandom.hex }
- end)
+ find_bucket(context.params).put_object(context.params)
+ { upload_id: SecureRandom.hex }
+ end,
+ )
- @s3_client.stub_responses(:put_object, -> (context) do
- log_operation(context)
+ @s3_client.stub_responses(
+ :put_object,
+ ->(context) do
+ log_operation(context)
- find_bucket(context.params).put_object(context.params)
- { etag: calculate_etag(context) }
- end)
+ find_bucket(context.params).put_object(context.params)
+ { etag: calculate_etag(context) }
+ end,
+ )
end
end
diff --git a/spec/support/helpers.rb b/spec/support/helpers.rb
index 43f4a5b86bf..fef1ad63562 100644
--- a/spec/support/helpers.rb
+++ b/spec/support/helpers.rb
@@ -1,6 +1,7 @@
# frozen_string_literal: true
-GIT_INITIAL_BRANCH_SUPPORTED = Gem::Version.new(`git --version`.match(/[\d\.]+/)[0]) >= Gem::Version.new("2.28.0")
+GIT_INITIAL_BRANCH_SUPPORTED =
+ Gem::Version.new(`git --version`.match(/[\d\.]+/)[0]) >= Gem::Version.new("2.28.0")
module Helpers
extend ActiveSupport::Concern
@@ -27,8 +28,8 @@ module Helpers
end
def fixture_file(filename)
- return '' if filename.blank?
- file_path = File.expand_path(Rails.root + 'spec/fixtures/' + filename)
+ return "" if filename.blank?
+ file_path = File.expand_path(Rails.root + "spec/fixtures/" + filename)
File.read(file_path)
end
@@ -47,9 +48,7 @@ module Helpers
def create_post(args = {})
# Pretty much all the tests with `create_post` will fail without this
# since allow_uncategorized_topics is now false by default
- unless args[:allow_uncategorized_topics] == false
- SiteSetting.allow_uncategorized_topics = true
- end
+ SiteSetting.allow_uncategorized_topics = true unless args[:allow_uncategorized_topics] == false
args[:title] ||= "This is my title #{Helpers.next_seq}"
args[:raw] ||= "This is the raw body of my post, it is cool #{Helpers.next_seq}"
@@ -61,9 +60,7 @@ module Helpers
creator = PostCreator.new(user, args)
post = creator.create
- if creator.errors.present?
- raise StandardError.new(creator.errors.full_messages.join(" "))
- end
+ raise StandardError.new(creator.errors.full_messages.join(" ")) if creator.errors.present?
post
end
@@ -92,7 +89,7 @@ module Helpers
end
def create_staff_only_tags(tag_names)
- create_limited_tags('Staff Tags', Group::AUTO_GROUPS[:staff], tag_names)
+ create_limited_tags("Staff Tags", Group::AUTO_GROUPS[:staff], tag_names)
end
def create_limited_tags(tag_group_name, group_id, tag_names)
@@ -100,12 +97,12 @@ module Helpers
TagGroupPermission.where(
tag_group: tag_group,
group_id: Group::AUTO_GROUPS[:everyone],
- permission_type: TagGroupPermission.permission_types[:full]
+ permission_type: TagGroupPermission.permission_types[:full],
).update(permission_type: TagGroupPermission.permission_types[:readonly])
TagGroupPermission.create!(
tag_group: tag_group,
group_id: group_id,
- permission_type: TagGroupPermission.permission_types[:full]
+ permission_type: TagGroupPermission.permission_types[:full],
)
tag_names.each do |name|
tag_group.tags << (Tag.where(name: name).first || Fabricate(:tag, name: name))
@@ -113,10 +110,7 @@ module Helpers
end
def create_hidden_tags(tag_names)
- tag_group = Fabricate(:tag_group,
- name: 'Hidden Tags',
- permissions: { staff: :full }
- )
+ tag_group = Fabricate(:tag_group, name: "Hidden Tags", permissions: { staff: :full })
tag_names.each do |name|
tag_group.tags << (Tag.where(name: name).first || Fabricate(:tag, name: name))
end
@@ -131,7 +125,7 @@ module Helpers
end
def capture_output(output_name)
- if ENV['RAILS_ENABLE_TEST_STDOUT']
+ if ENV["RAILS_ENABLE_TEST_STDOUT"]
yield
return
end
@@ -160,9 +154,7 @@ module Helpers
old_root = ActionController::Base.config.relative_url_root
ActionController::Base.config.relative_url_root = f
- before_next_spec do
- ActionController::Base.config.relative_url_root = old_root
- end
+ before_next_spec { ActionController::Base.config.relative_url_root = old_root }
end
def setup_git_repo(files)
@@ -192,14 +184,12 @@ module Helpers
def track_sql_queries
queries = []
- callback = ->(*, payload) {
- queries << payload.fetch(:sql) unless ["CACHE", "SCHEMA"].include?(payload.fetch(:name))
- }
-
- ActiveSupport::Notifications.subscribed(callback, "sql.active_record") do
- yield
+ callback = ->(*, payload) do
+ queries << payload.fetch(:sql) unless %w[CACHE SCHEMA].include?(payload.fetch(:name))
end
+ ActiveSupport::Notifications.subscribed(callback, "sql.active_record") { yield }
+
queries
end
end
diff --git a/spec/support/imap_helper.rb b/spec/support/imap_helper.rb
index 6407a54b980..8476192ef8e 100644
--- a/spec/support/imap_helper.rb
+++ b/spec/support/imap_helper.rb
@@ -1,17 +1,20 @@
# frozen_string_literal: true
class MockedImapProvider < Imap::Providers::Gmail
- def connect!; end
- def disconnect!; end
- def open_mailbox(mailbox_name, write: false); end
+ def connect!
+ end
+ def disconnect!
+ end
+ def open_mailbox(mailbox_name, write: false)
+ end
def labels
- ['INBOX']
+ ["INBOX"]
end
end
def EmailFabricator(options)
- email = +''
+ email = +""
email += "Date: Sat, 31 Mar 2018 17:50:19 -0700\n"
email += "From: #{options[:from] || "Dan
"}\n"
email += "To: #{options[:to] || "Joffrey "}\n"
diff --git a/spec/support/integration_helpers.rb b/spec/support/integration_helpers.rb
index 45a7b3cfbc6..3937edecd65 100644
--- a/spec/support/integration_helpers.rb
+++ b/spec/support/integration_helpers.rb
@@ -11,13 +11,14 @@ module IntegrationHelpers
challenge = body["challenge"]
user = Fabricate.build(:user)
- post "/u.json", params: {
- username: user.username,
- email: user.email,
- password: 'asdasljdhaiosdjioaeiow',
- password_confirmation: honeypot,
- challenge: challenge.reverse
- }
+ post "/u.json",
+ params: {
+ username: user.username,
+ email: user.email,
+ password: "asdasljdhaiosdjioaeiow",
+ password_confirmation: honeypot,
+ challenge: challenge.reverse,
+ }
expect(response.status).to eq(200)
@@ -35,11 +36,12 @@ module IntegrationHelpers
end
def read_secure_session
- id = begin
- session[:secure_session_id]
- rescue NoMethodError
- nil
- end
+ id =
+ begin
+ session[:secure_session_id]
+ rescue NoMethodError
+ nil
+ end
# This route will init the secure_session for us
get "/session/hp.json" if id.nil?
diff --git a/spec/support/match_html_matcher.rb b/spec/support/match_html_matcher.rb
index 868dff0eee5..d3aeca28bd8 100644
--- a/spec/support/match_html_matcher.rb
+++ b/spec/support/match_html_matcher.rb
@@ -1,10 +1,8 @@
# frozen_string_literal: true
-require 'nokogiri/xml/parse_options'
+require "nokogiri/xml/parse_options"
RSpec::Matchers.define :match_html do |expected|
- match do |actual|
- make_canonical_html(expected).eql? make_canonical_html(actual)
- end
+ match { |actual| make_canonical_html(expected).eql? make_canonical_html(actual) }
failure_message do |actual|
"after sanitizing for extra white space and compactness, expected:\n#{actual}\n to match:\n#{expected}"
@@ -15,17 +13,16 @@ RSpec::Matchers.define :match_html do |expected|
end
def make_canonical_html(html)
- doc = Nokogiri::HTML5(html) do |config|
- config[:options] = Nokogiri::XML::ParseOptions::NOBLANKS | Nokogiri::XML::ParseOptions::COMPACT
- end
+ doc =
+ Nokogiri.HTML5(html) do |config|
+ config[:options] = Nokogiri::XML::ParseOptions::NOBLANKS |
+ Nokogiri::XML::ParseOptions::COMPACT
+ end
doc.traverse do |node|
- if node.node_name&.downcase == "text"
- node.content = node.content.gsub(/\s+/, ' ').strip
- end
+ node.content = node.content.gsub(/\s+/, " ").strip if node.node_name&.downcase == "text"
end
doc.to_html
end
-
end
diff --git a/spec/support/onebox_helpers.rb b/spec/support/onebox_helpers.rb
index f07f845ef8e..867de71e5c6 100644
--- a/spec/support/onebox_helpers.rb
+++ b/spec/support/onebox_helpers.rb
@@ -6,7 +6,7 @@ module OneboxHelpers
File.exist?(file) ? File.read(file) : ""
end
- def inspect_html_fragment(raw_fragment, tag_name, attribute = 'src')
+ def inspect_html_fragment(raw_fragment, tag_name, attribute = "src")
preview = Nokogiri::HTML::DocumentFragment.parse(raw_fragment)
preview.css(tag_name).first[attribute]
end
@@ -14,7 +14,10 @@ module OneboxHelpers
RSpec.shared_context "with engines" do
before do
fixture = defined?(@onebox_fixture) ? @onebox_fixture : described_class.onebox_name
- stub_request(:get, defined?(@uri) ? @uri : @link).to_return(status: 200, body: onebox_response(fixture))
+ stub_request(:get, defined?(@uri) ? @uri : @link).to_return(
+ status: 200,
+ body: onebox_response(fixture),
+ )
end
let(:onebox) { described_class.new(link) }
diff --git a/spec/support/rate_limit_matcher.rb b/spec/support/rate_limit_matcher.rb
index ebc3ffde239..fa86ee76a46 100644
--- a/spec/support/rate_limit_matcher.rb
+++ b/spec/support/rate_limit_matcher.rb
@@ -1,7 +1,5 @@
# frozen_string_literal: true
RSpec::Matchers.define :rate_limit do |attribute|
- match do |model|
- model.class.include? RateLimiter::OnCreateRecord
- end
+ match { |model| model.class.include? RateLimiter::OnCreateRecord }
end
diff --git a/spec/support/session_controller_helper_routes.rb b/spec/support/session_controller_helper_routes.rb
index 0cb2e191dff..381adbcd550 100644
--- a/spec/support/session_controller_helper_routes.rb
+++ b/spec/support/session_controller_helper_routes.rb
@@ -2,17 +2,18 @@
module SessionControllerExtension
def self.included(base)
- base.skip_before_action :check_xhr, only: %i(test_second_factor_restricted_route)
+ base.skip_before_action :check_xhr, only: %i[test_second_factor_restricted_route]
end
def test_second_factor_restricted_route
- result = run_second_factor!(TestSecondFactorAction) do |manager|
- manager.allow_backup_codes! if params[:allow_backup_codes]
- end
+ result =
+ run_second_factor!(TestSecondFactorAction) do |manager|
+ manager.allow_backup_codes! if params[:allow_backup_codes]
+ end
if result.no_second_factors_enabled?
- render json: { result: 'no_second_factors_enabled' }
+ render json: { result: "no_second_factors_enabled" }
else
- render json: { result: 'second_factor_auth_completed' }
+ render json: { result: "second_factor_auth_completed" }
end
end
end
diff --git a/spec/support/shared_examples_for_stats_cacheable.rb b/spec/support/shared_examples_for_stats_cacheable.rb
index c0b670798fe..07d58a32299 100644
--- a/spec/support/shared_examples_for_stats_cacheable.rb
+++ b/spec/support/shared_examples_for_stats_cacheable.rb
@@ -1,27 +1,27 @@
# frozen_string_literal: true
-RSpec.shared_examples_for 'stats cacheable' do
- describe 'fetch_cached_stats' do
- after do
- Discourse.redis.del(described_class.stats_cache_key)
- end
+RSpec.shared_examples_for "stats cacheable" do
+ describe "fetch_cached_stats" do
+ after { Discourse.redis.del(described_class.stats_cache_key) }
- it 'returns the cached stats' do
+ it "returns the cached stats" do
stats = described_class.fetch_stats.to_json
Discourse.redis.set(described_class.stats_cache_key, stats)
expect(described_class.fetch_cached_stats).to eq(JSON.parse(stats))
end
- it 'returns fetches the stats if stats has not been cached' do
+ it "returns fetches the stats if stats has not been cached" do
freeze_time
Discourse.redis.del(described_class.stats_cache_key)
- expect(described_class.fetch_cached_stats).to eq(JSON.parse(described_class.fetch_stats.to_json))
+ expect(described_class.fetch_cached_stats).to eq(
+ JSON.parse(described_class.fetch_stats.to_json),
+ )
end
end
- describe 'fetch_stats' do
- it 'has not been implemented' do
+ describe "fetch_stats" do
+ it "has not been implemented" do
expect { described_class.fetch_stats }.to_not raise_error
end
end
diff --git a/spec/support/sidekiq_helpers.rb b/spec/support/sidekiq_helpers.rb
index 12dce59e856..883fe0fde05 100644
--- a/spec/support/sidekiq_helpers.rb
+++ b/spec/support/sidekiq_helpers.rb
@@ -30,7 +30,13 @@ module SidekiqHelpers
expect(matched_job).to(
eq(expectation),
- expectation ? "No enqueued job with #{expected} found" : "Enqueued job with #{expected} found"
+ (
+ if expectation
+ "No enqueued job with #{expected} found"
+ else
+ "Enqueued job with #{expected} found"
+ end
+ ),
)
end
@@ -46,9 +52,7 @@ module SidekiqHelpers
# post.update!(raw: 'new raw')
# end
def expect_not_enqueued_with(job:, args: {}, at: nil)
- expect_enqueued_with(job: job, args: args, at: at, expectation: false) do
- yield if block_given?
- end
+ expect_enqueued_with(job: job, args: args, at: at, expectation: false) { yield if block_given? }
end
# Checks whether a job has been enqueued with the given arguments
@@ -88,15 +92,16 @@ module SidekiqHelpers
job_args.merge!(at: job["at"]) if job["at"]
job_args.merge!(enqueued_at: job["enqueued_at"]) if job["enqueued_at"]
- matched_job ||= args.all? do |key, value|
- value = value.to_s if value.is_a?(Symbol)
+ matched_job ||=
+ args.all? do |key, value|
+ value = value.to_s if value.is_a?(Symbol)
- if key == :at
- value.to_f == (job_args[:at] || job_args[:enqueued_at]).to_f
- else
- value == job_args[key]
+ if key == :at
+ value.to_f == (job_args[:at] || job_args[:enqueued_at]).to_f
+ else
+ value == job_args[key]
+ end
end
- end
end
matched_job
diff --git a/spec/support/system_helpers.rb b/spec/support/system_helpers.rb
index ce954dfa7b5..7813ec137e6 100644
--- a/spec/support/system_helpers.rb
+++ b/spec/support/system_helpers.rb
@@ -41,7 +41,10 @@ module SystemHelpers
def resize_window(width: nil, height: nil)
original_size = page.driver.browser.manage.window.size
- page.driver.browser.manage.window.resize_to(width || original_size.width, height || original_size.height)
+ page.driver.browser.manage.window.resize_to(
+ width || original_size.width,
+ height || original_size.height,
+ )
yield
ensure
page.driver.browser.manage.window.resize_to(original_size.width, original_size.height)
@@ -52,9 +55,7 @@ module SystemHelpers
ENV["TZ"] = timezone
- Capybara.using_session(timezone) do
- freeze_time(&example)
- end
+ Capybara.using_session(timezone) { freeze_time(&example) }
ENV["TZ"] = previous_browser_timezone
end
diff --git a/spec/support/test_second_factor_action.rb b/spec/support/test_second_factor_action.rb
index 825d07a4bf6..e93041fab5d 100644
--- a/spec/support/test_second_factor_action.rb
+++ b/spec/support/test_second_factor_action.rb
@@ -9,9 +9,9 @@ class TestSecondFactorAction < SecondFactor::Actions::Base
redirect_url: params[:redirect_url],
callback_params: {
saved_param_1: params[:saved_param_1],
- saved_param_2: params[:saved_param_2]
+ saved_param_2: params[:saved_param_2],
},
- description: "this is description for test action"
+ description: "this is description for test action",
}
end
diff --git a/spec/support/time_matcher.rb b/spec/support/time_matcher.rb
index 5e2732d620b..b3e59efde26 100644
--- a/spec/support/time_matcher.rb
+++ b/spec/support/time_matcher.rb
@@ -1,30 +1,18 @@
# frozen_string_literal: true
RSpec::Matchers.define :be_within_one_second_of do |expected_time|
- match do |actual_time|
- (actual_time - expected_time).abs < 1
- end
- failure_message do |actual_time|
- "#{actual_time} is not within 1 second of #{expected_time}"
- end
+ match { |actual_time| (actual_time - expected_time).abs < 1 }
+ failure_message { |actual_time| "#{actual_time} is not within 1 second of #{expected_time}" }
end
RSpec::Matchers.define :be_within_one_minute_of do |expected_time|
- match do |actual_time|
- (actual_time - expected_time).abs < 60
- end
- failure_message do |actual_time|
- "#{actual_time} is not within 1 minute of #{expected_time}"
- end
+ match { |actual_time| (actual_time - expected_time).abs < 60 }
+ failure_message { |actual_time| "#{actual_time} is not within 1 minute of #{expected_time}" }
end
RSpec::Matchers.define :eq_time do |expected_time|
- match do |actual_time|
- (actual_time - expected_time).abs < 0.001
- end
- failure_message do |actual_time|
- "#{actual_time} is not within 1 millisecond of #{expected_time}"
- end
+ match { |actual_time| (actual_time - expected_time).abs < 0.001 }
+ failure_message { |actual_time| "#{actual_time} is not within 1 millisecond of #{expected_time}" }
failure_message_when_negated do |actual_time|
"#{actual_time} is within 1 millisecond of #{expected_time}"
end
diff --git a/spec/support/topic_guardian_can_see_consistency_check.rb b/spec/support/topic_guardian_can_see_consistency_check.rb
index f50b3dbb721..32f241a15a2 100644
--- a/spec/support/topic_guardian_can_see_consistency_check.rb
+++ b/spec/support/topic_guardian_can_see_consistency_check.rb
@@ -28,7 +28,8 @@ module TopicGuardianCanSeeConsistencyCheck
result = super
if self.class.run_topic_can_see_consistency_check?
- new_result = self.can_see_topic_ids(topic_ids: [topic&.id], hide_deleted: hide_deleted).present?
+ new_result =
+ self.can_see_topic_ids(topic_ids: [topic&.id], hide_deleted: hide_deleted).present?
if result != new_result
raise "result between TopicGuardian#can_see_topic? (#{result}) and TopicGuardian#can_see_topic_ids (#{new_result}) has drifted and returned different results for the same input"
diff --git a/spec/support/uploads_helpers.rb b/spec/support/uploads_helpers.rb
index e26b7e6e532..b307a52d975 100644
--- a/spec/support/uploads_helpers.rb
+++ b/spec/support/uploads_helpers.rb
@@ -4,13 +4,16 @@ module UploadsHelpers
def setup_s3
SiteSetting.enable_s3_uploads = true
- SiteSetting.s3_region = 'us-west-1'
+ SiteSetting.s3_region = "us-west-1"
SiteSetting.s3_upload_bucket = "s3-upload-bucket"
SiteSetting.s3_access_key_id = "some key"
SiteSetting.s3_secret_access_key = "some secrets3_region key"
- stub_request(:head, "https://#{SiteSetting.s3_upload_bucket}.s3.#{SiteSetting.s3_region}.amazonaws.com/")
+ stub_request(
+ :head,
+ "https://#{SiteSetting.s3_upload_bucket}.s3.#{SiteSetting.s3_region}.amazonaws.com/",
+ )
end
def enable_secure_uploads
@@ -19,7 +22,8 @@ module UploadsHelpers
end
def stub_upload(upload)
- url = %r{https://#{SiteSetting.s3_upload_bucket}.s3.#{SiteSetting.s3_region}.amazonaws.com/original/\d+X.*#{upload.sha1}.#{upload.extension}\?acl}
+ url =
+ %r{https://#{SiteSetting.s3_upload_bucket}.s3.#{SiteSetting.s3_region}.amazonaws.com/original/\d+X.*#{upload.sha1}.#{upload.extension}\?acl}
stub_request(:put, url)
end
diff --git a/spec/support/user_sidebar_serializer_attributes.rb b/spec/support/user_sidebar_serializer_attributes.rb
index cf882207bd3..f7cea951b34 100644
--- a/spec/support/user_sidebar_serializer_attributes.rb
+++ b/spec/support/user_sidebar_serializer_attributes.rb
@@ -5,19 +5,19 @@ RSpec.shared_examples "User Sidebar Serializer Attributes" do |serializer_klass|
let(:serializer) { serializer_klass.new(user, scope: Guardian.new(user), root: false) }
- before do
- SiteSetting.navigation_menu = "sidebar"
- end
+ before { SiteSetting.navigation_menu = "sidebar" }
describe "#sidebar_list_destination" do
- it 'is not included when navigation menu is legacy' do
+ it "is not included when navigation menu is legacy" do
SiteSetting.navigation_menu = "legacy"
expect(serializer.as_json[:sidebar_list_destination]).to eq(nil)
end
it "returns choosen value or default" do
- expect(serializer.as_json[:sidebar_list_destination]).to eq(SiteSetting.default_sidebar_list_destination)
+ expect(serializer.as_json[:sidebar_list_destination]).to eq(
+ SiteSetting.default_sidebar_list_destination,
+ )
user.user_option.update!(sidebar_list_destination: "unread_new")
@@ -25,14 +25,20 @@ RSpec.shared_examples "User Sidebar Serializer Attributes" do |serializer_klass|
end
end
- describe '#sidebar_category_ids' do
+ describe "#sidebar_category_ids" do
fab!(:group) { Fabricate(:group) }
fab!(:category) { Fabricate(:category) }
fab!(:category_2) { Fabricate(:category) }
fab!(:private_category) { Fabricate(:private_category, group: group) }
- fab!(:category_sidebar_section_link) { Fabricate(:category_sidebar_section_link, user: user, linkable: category) }
- fab!(:category_sidebar_section_link_2) { Fabricate(:category_sidebar_section_link, user: user, linkable: category_2) }
- fab!(:category_sidebar_section_link_3) { Fabricate(:category_sidebar_section_link, user: user, linkable: private_category) }
+ fab!(:category_sidebar_section_link) do
+ Fabricate(:category_sidebar_section_link, user: user, linkable: category)
+ end
+ fab!(:category_sidebar_section_link_2) do
+ Fabricate(:category_sidebar_section_link, user: user, linkable: category_2)
+ end
+ fab!(:category_sidebar_section_link_3) do
+ Fabricate(:category_sidebar_section_link, user: user, linkable: private_category)
+ end
it "is not included when navigation menu is legacy" do
SiteSetting.navigation_menu = "legacy"
@@ -47,31 +53,32 @@ RSpec.shared_examples "User Sidebar Serializer Attributes" do |serializer_klass|
json = serializer.as_json
- expect(json[:sidebar_category_ids]).to eq([
- category.id,
- category_2.id
- ])
+ expect(json[:sidebar_category_ids]).to eq([category.id, category_2.id])
group.add(user)
serializer = serializer_klass.new(user, scope: Guardian.new(user), root: false)
json = serializer.as_json
- expect(json[:sidebar_category_ids]).to eq([
- category.id,
- category_2.id,
- private_category.id
- ])
+ expect(json[:sidebar_category_ids]).to eq([category.id, category_2.id, private_category.id])
end
end
- describe '#sidebar_tags' do
+ describe "#sidebar_tags" do
fab!(:tag) { Fabricate(:tag, name: "foo") }
fab!(:pm_tag) { Fabricate(:tag, name: "bar", pm_topic_count: 5, topic_count: 0) }
fab!(:hidden_tag) { Fabricate(:tag, name: "secret") }
- fab!(:staff_tag_group) { Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: ["secret"]) }
- fab!(:tag_sidebar_section_link) { Fabricate(:tag_sidebar_section_link, user: user, linkable: tag) }
- fab!(:tag_sidebar_section_link_2) { Fabricate(:tag_sidebar_section_link, user: user, linkable: pm_tag) }
- fab!(:tag_sidebar_section_link_3) { Fabricate(:tag_sidebar_section_link, user: user, linkable: hidden_tag) }
+ fab!(:staff_tag_group) do
+ Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: ["secret"])
+ end
+ fab!(:tag_sidebar_section_link) do
+ Fabricate(:tag_sidebar_section_link, user: user, linkable: tag)
+ end
+ fab!(:tag_sidebar_section_link_2) do
+ Fabricate(:tag_sidebar_section_link, user: user, linkable: pm_tag)
+ end
+ fab!(:tag_sidebar_section_link_3) do
+ Fabricate(:tag_sidebar_section_link, user: user, linkable: hidden_tag)
+ end
it "is not included when navigation menu is legacy" do
SiteSetting.navigation_menu = "legacy"
@@ -99,7 +106,7 @@ RSpec.shared_examples "User Sidebar Serializer Attributes" do |serializer_klass|
expect(json[:sidebar_tags]).to contain_exactly(
{ name: tag.name, pm_only: false },
- { name: pm_tag.name, pm_only: true }
+ { name: pm_tag.name, pm_only: true },
)
user.update!(admin: true)
@@ -109,7 +116,7 @@ RSpec.shared_examples "User Sidebar Serializer Attributes" do |serializer_klass|
expect(json[:sidebar_tags]).to contain_exactly(
{ name: tag.name, pm_only: false },
{ name: pm_tag.name, pm_only: true },
- { name: hidden_tag.name, pm_only: false }
+ { name: hidden_tag.name, pm_only: false },
)
end
end
@@ -117,20 +124,20 @@ RSpec.shared_examples "User Sidebar Serializer Attributes" do |serializer_klass|
describe "#display_sidebar_tags" do
fab!(:tag) { Fabricate(:tag) }
- it 'should not be included in serialised object when navigation menu is legacy' do
+ it "should not be included in serialised object when navigation menu is legacy" do
SiteSetting.tagging_enabled = true
SiteSetting.navigation_menu = "legacy"
expect(serializer.as_json[:display_sidebar_tags]).to eq(nil)
end
- it 'should not be included in serialised object when tagging has been disabled' do
+ it "should not be included in serialised object when tagging has been disabled" do
SiteSetting.tagging_enabled = false
expect(serializer.as_json[:display_sidebar_tags]).to eq(nil)
end
- it 'should be true when user has visible tags' do
+ it "should be true when user has visible tags" do
SiteSetting.tagging_enabled = true
Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [tag.name])
@@ -139,7 +146,7 @@ RSpec.shared_examples "User Sidebar Serializer Attributes" do |serializer_klass|
expect(serializer.as_json[:display_sidebar_tags]).to eq(true)
end
- it 'should be false when user has no visible tags' do
+ it "should be false when user has no visible tags" do
SiteSetting.tagging_enabled = true
Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [tag.name])
diff --git a/spec/support/versioning/shared_examples_for_versioned_model.rb b/spec/support/versioning/shared_examples_for_versioned_model.rb
index 7762d572e56..397f4a83e75 100644
--- a/spec/support/versioning/shared_examples_for_versioned_model.rb
+++ b/spec/support/versioning/shared_examples_for_versioned_model.rb
@@ -3,7 +3,7 @@
RSpec.shared_examples_for "a versioned model" do
let(:model) { Fabricate(described_class.to_s.downcase) }
- it 'should be versioned' do
+ it "should be versioned" do
expect(model).to respond_to(:version)
expect(model.version).to eq(1)
end
diff --git a/spec/support/webauthn_integration_helpers.rb b/spec/support/webauthn_integration_helpers.rb
index 09310d0f575..a62a459500a 100644
--- a/spec/support/webauthn_integration_helpers.rb
+++ b/spec/support/webauthn_integration_helpers.rb
@@ -19,42 +19,47 @@ module WebauthnIntegrationHelpers
# simulate_localhost_webautn_challenge for a real example.
def valid_security_key_data
{
- credential_id: "9GiFosW50+s+juyJlyxKEVAsk3gZLo9XWIhX47eC4gHfDsldF3TWR43Tcl/+3gLTL5t1TjpmcbKA2DUV2eKrBw==",
- public_key: "pQECAyYgASFYIPMGM1OpSuCU5uks+BulAdfVxdlJiYcgGac5Y+LnLXC9Ilgghy0BKvRvptmQdtWz33Jjnf8Y6+HD85XdRiqmo1KMGPE="
+ credential_id:
+ "9GiFosW50+s+juyJlyxKEVAsk3gZLo9XWIhX47eC4gHfDsldF3TWR43Tcl/+3gLTL5t1TjpmcbKA2DUV2eKrBw==",
+ public_key:
+ "pQECAyYgASFYIPMGM1OpSuCU5uks+BulAdfVxdlJiYcgGac5Y+LnLXC9Ilgghy0BKvRvptmQdtWz33Jjnf8Y6+HD85XdRiqmo1KMGPE=",
}
end
def valid_security_key_auth_post_data
{
- signature: "MEYCIQC5xyUQvF4qTPZ2yX7crp/IEs1E/4wqhXgxC1EVAumhfgIhAIC/7w4BVEy+ew6vMYISahtnnIqbqsPZosBeTUSI8Y4j",
- clientData: "eyJjaGFsbGVuZ2UiOiJOR1UzWW1Zek0yWTBNelkyWkdFM05EVTNZak5qWldVNFpUWTNOakJoTm1NMFlqVTVORFptTlRrd016Vm1ZMlZpTURVd01UZzJOemcxTW1RMSIsIm9yaWdpbiI6Imh0dHA6Ly9sb2NhbGhvc3Q6MzAwMCIsInR5cGUiOiJ3ZWJhdXRobi5nZXQifQ==",
+ signature:
+ "MEYCIQC5xyUQvF4qTPZ2yX7crp/IEs1E/4wqhXgxC1EVAumhfgIhAIC/7w4BVEy+ew6vMYISahtnnIqbqsPZosBeTUSI8Y4j",
+ clientData:
+ "eyJjaGFsbGVuZ2UiOiJOR1UzWW1Zek0yWTBNelkyWkdFM05EVTNZak5qWldVNFpUWTNOakJoTm1NMFlqVTVORFptTlRrd016Vm1ZMlZpTURVd01UZzJOemcxTW1RMSIsIm9yaWdpbiI6Imh0dHA6Ly9sb2NhbGhvc3Q6MzAwMCIsInR5cGUiOiJ3ZWJhdXRobi5nZXQifQ==",
authenticatorData: "SZYN5YgOjGh0NBcPZHZgW4/krrmihjLHmVzzuoMdl2MBAAAA2Q==",
- credentialId: valid_security_key_data[:credential_id]
+ credentialId: valid_security_key_data[:credential_id],
}
end
def valid_security_key_challenge_data
- {
- challenge: "4e7bf33f4366da7457b3cee8e6760a6c4b5946f59035fceb0501867852d5"
- }
+ { challenge: "4e7bf33f4366da7457b3cee8e6760a6c4b5946f59035fceb0501867852d5" }
end
def valid_security_key_create_post_data
{
id: "hg7Ojg9H4urf9UlT99T2yr-FQtEGCWnRNdkI5QKEqDxlSjsLHhUcQxeTPelC26cy9XQ_qIg1Nq88PNVDlZvxHA",
- rawId: "hg7Ojg9H4urf9UlT99T2yr+FQtEGCWnRNdkI5QKEqDxlSjsLHhUcQxeTPelC26cy9XQ/qIg1Nq88PNVDlZvxHA==",
+ rawId:
+ "hg7Ojg9H4urf9UlT99T2yr+FQtEGCWnRNdkI5QKEqDxlSjsLHhUcQxeTPelC26cy9XQ/qIg1Nq88PNVDlZvxHA==",
type: "public-key",
- attestation: "o2NmbXRkbm9uZWdhdHRTdG10oGhhdXRoRGF0YVjESZYN5YgOjGh0NBcPZHZgW4/krrmihjLHmVzzuoMdl2NBAAAAAAAAAAAAAAAAAAAAAAAAAAAAQIYOzo4PR+Lq3/VJU/fU9sq/hULRBglp0TXZCOUChKg8ZUo7Cx4VHEMXkz3pQtunMvV0P6iINTavPDzVQ5Wb8RylAQIDJiABIVggJI3i7Svv1+Hu8pGYIQ6XEIeWHxjr+qKVXPmXSQswGysiWCDs0ZRoPXkajl+Mpvc16BPVFrKRxl06V+XTKdKffiMzZQ==",
- clientData: "eyJjaGFsbGVuZ2UiOiJOR1UzWW1Zek0yWTBNelkyWkdFM05EVTNZak5qWldVNFpUWTNOakJoTm1NMFlqVTVORFptTlRrd016Vm1ZMlZpTURVd01UZzJOemcxTW1RMSIsIm9yaWdpbiI6Imh0dHA6Ly9sb2NhbGhvc3Q6MzAwMCIsInR5cGUiOiJ3ZWJhdXRobi5jcmVhdGUifQ==",
- name: "My Security Key"
+ attestation:
+ "o2NmbXRkbm9uZWdhdHRTdG10oGhhdXRoRGF0YVjESZYN5YgOjGh0NBcPZHZgW4/krrmihjLHmVzzuoMdl2NBAAAAAAAAAAAAAAAAAAAAAAAAAAAAQIYOzo4PR+Lq3/VJU/fU9sq/hULRBglp0TXZCOUChKg8ZUo7Cx4VHEMXkz3pQtunMvV0P6iINTavPDzVQ5Wb8RylAQIDJiABIVggJI3i7Svv1+Hu8pGYIQ6XEIeWHxjr+qKVXPmXSQswGysiWCDs0ZRoPXkajl+Mpvc16BPVFrKRxl06V+XTKdKffiMzZQ==",
+ clientData:
+ "eyJjaGFsbGVuZ2UiOiJOR1UzWW1Zek0yWTBNelkyWkdFM05EVTNZak5qWldVNFpUWTNOakJoTm1NMFlqVTVORFptTlRrd016Vm1ZMlZpTURVd01UZzJOemcxTW1RMSIsIm9yaWdpbiI6Imh0dHA6Ly9sb2NhbGhvc3Q6MzAwMCIsInR5cGUiOiJ3ZWJhdXRobi5jcmVhdGUifQ==",
+ name: "My Security Key",
}
end
# all of the valid security key data is sourced from a localhost
# login, if this is not set the specs for webauthn WILL NOT WORK
def stub_as_dev_localhost
- Discourse.stubs(:current_hostname).returns('localhost')
- Discourse.stubs(:base_url).returns('http://localhost:3000')
+ Discourse.stubs(:current_hostname).returns("localhost")
+ Discourse.stubs(:base_url).returns("http://localhost:3000")
end
def simulate_localhost_webauthn_challenge
@@ -62,8 +67,8 @@ module WebauthnIntegrationHelpers
Webauthn::ChallengeGenerator.stubs(:generate).returns(
Webauthn::ChallengeGenerator::ChallengeSession.new(
challenge: valid_security_key_challenge_data[:challenge],
- rp_id: Discourse.current_hostname
- )
+ rp_id: Discourse.current_hostname,
+ ),
)
end
end
diff --git a/spec/swagger_helper.rb b/spec/swagger_helper.rb
index 4a92cc7dc94..6ab5ea12c8a 100644
--- a/spec/swagger_helper.rb
+++ b/spec/swagger_helper.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-require 'json_schemer'
+require "json_schemer"
# Require schema files
Dir["./spec/requests/api/schemas/*.rb"].each { |file| require file }
@@ -89,7 +89,7 @@ RSpec.configure do |config|
# Specify a root folder where Swagger JSON files are generated
# NOTE: If you're using the rswag-api to serve API descriptions, you'll need
# to ensure that it's configured to serve Swagger from the same folder
- config.swagger_root = Rails.root.join('openapi').to_s
+ config.swagger_root = Rails.root.join("openapi").to_s
# Define one or more Swagger documents and provide global metadata for each one
# When you run the 'rswag:specs:swaggerize' rake task, the complete Swagger will
@@ -98,35 +98,37 @@ RSpec.configure do |config|
# document below. You can override this behavior by adding a swagger_doc tag to the
# the root example_group in your specs, e.g. describe '...', swagger_doc: 'v2/swagger.json'
config.swagger_docs = {
- 'openapi.yaml' => {
- openapi: '3.1.0',
+ "openapi.yaml" => {
+ openapi: "3.1.0",
info: {
- title: 'Discourse API Documentation',
- 'x-logo': {
- url: 'https://docs.discourse.org/logo.svg',
+ title: "Discourse API Documentation",
+ "x-logo": {
+ url: "https://docs.discourse.org/logo.svg",
},
- version: 'latest',
+ version: "latest",
description: api_docs_description,
license: {
- name: 'MIT',
- url: 'https://docs.discourse.org/LICENSE.txt'
- }
+ name: "MIT",
+ url: "https://docs.discourse.org/LICENSE.txt",
+ },
+ },
+ paths: {
},
- paths: {},
servers: [
{
- url: 'https://{defaultHost}',
+ url: "https://{defaultHost}",
variables: {
defaultHost: {
- default: 'discourse.example.com'
- }
- }
- }
+ default: "discourse.example.com",
+ },
+ },
+ },
],
components: {
- schemas: {}
- }
- }
+ schemas: {
+ },
+ },
+ },
}
# Specify the format of the output Swagger file when running 'rswag:specs:swaggerize'.
diff --git a/spec/system/admin_customize_themes_spec.rb b/spec/system/admin_customize_themes_spec.rb
index d74e9acdfd6..3d74fa27ff7 100644
--- a/spec/system/admin_customize_themes_spec.rb
+++ b/spec/system/admin_customize_themes_spec.rb
@@ -1,16 +1,14 @@
# frozen_string_literal: true
-describe 'Admin Customize Themes', type: :system, js: true do
+describe "Admin Customize Themes", type: :system, js: true do
fab!(:color_scheme) { Fabricate(:color_scheme) }
fab!(:theme) { Fabricate(:theme) }
fab!(:admin) { Fabricate(:admin) }
- before do
- sign_in(admin)
- end
+ before { sign_in(admin) }
- describe 'when visiting the page to customize the theme' do
- it 'should allow admin to update the color scheme of the theme' do
+ describe "when visiting the page to customize the theme" do
+ it "should allow admin to update the color scheme of the theme" do
visit("/admin/customize/themes/#{theme.id}")
color_scheme_settings = find(".theme-settings__color-scheme")
@@ -22,7 +20,7 @@ describe 'Admin Customize Themes', type: :system, js: true do
color_scheme_settings.find(".color-palettes-row[data-value='#{color_scheme.id}']").click
color_scheme_settings.find(".submit-edit").click
- expect(color_scheme_settings.find('.setting-value')).to have_content(color_scheme.name)
+ expect(color_scheme_settings.find(".setting-value")).to have_content(color_scheme.name)
expect(color_scheme_settings).not_to have_css(".submit-edit")
expect(color_scheme_settings).not_to have_css(".cancel-edit")
diff --git a/spec/system/page_objects/pages/admin_settings.rb b/spec/system/page_objects/pages/admin_settings.rb
index 441be53746b..e7187490ee2 100644
--- a/spec/system/page_objects/pages/admin_settings.rb
+++ b/spec/system/page_objects/pages/admin_settings.rb
@@ -8,10 +8,10 @@ module PageObjects
self
end
- def toggle_setting(setting_name, text = '')
+ def toggle_setting(setting_name, text = "")
setting = find(".admin-detail .row.setting[data-setting='#{setting_name}']")
- setting.find('.setting-value span', text: text).click
- setting.find('.setting-controls button.ok').click
+ setting.find(".setting-value span", text: text).click
+ setting.find(".setting-controls button.ok").click
end
end
end
diff --git a/spec/system/page_objects/pages/category.rb b/spec/system/page_objects/pages/category.rb
index 9c78a2e6f77..e628812a8b8 100644
--- a/spec/system/page_objects/pages/category.rb
+++ b/spec/system/page_objects/pages/category.rb
@@ -16,16 +16,16 @@ module PageObjects
end
def back_to_category
- find('.edit-category-title-bar span', text: 'Back to category').click
+ find(".edit-category-title-bar span", text: "Back to category").click
self
end
def save_settings
- find('#save-category').click
+ find("#save-category").click
self
end
- def toggle_setting(setting, text = '')
+ def toggle_setting(setting, text = "")
find(".edit-category-tab .#{setting} label.checkbox-label", text: text).click
self
end
diff --git a/spec/system/page_objects/pages/search.rb b/spec/system/page_objects/pages/search.rb
index a1b207d2227..417f34ccc13 100644
--- a/spec/system/page_objects/pages/search.rb
+++ b/spec/system/page_objects/pages/search.rb
@@ -3,7 +3,6 @@
module PageObjects
module Pages
class Search < PageObjects::Pages::Base
-
def type_in_search(input)
find("input.full-page-search").send_keys(input)
self
@@ -26,15 +25,12 @@ module PageObjects
end
def has_search_result?
- within(".search-results") do
- page.has_selector?(".fps-result", visible: true)
- end
+ within(".search-results") { page.has_selector?(".fps-result", visible: true) }
end
def is_search_page
has_css?("body.search-page")
end
-
end
end
end
diff --git a/spec/system/page_objects/pages/user.rb b/spec/system/page_objects/pages/user.rb
index a5062bafe5f..4861642c0cf 100644
--- a/spec/system/page_objects/pages/user.rb
+++ b/spec/system/page_objects/pages/user.rb
@@ -26,7 +26,9 @@ module PageObjects
def click_staff_info_warnings_link(warnings_count: 0)
staff_counters = page.find(".staff-counters")
- staff_counters.click_link("#{warnings_count} #{I18n.t("js.user.staff_counters.warnings_received")}")
+ staff_counters.click_link(
+ "#{warnings_count} #{I18n.t("js.user.staff_counters.warnings_received")}",
+ )
self
end
end
diff --git a/spec/system/page_objects/pages/user_preferences.rb b/spec/system/page_objects/pages/user_preferences.rb
index fb8bb3be1b7..42bdc016282 100644
--- a/spec/system/page_objects/pages/user_preferences.rb
+++ b/spec/system/page_objects/pages/user_preferences.rb
@@ -39,9 +39,7 @@ module PageObjects
private
def horizontal_secondary_link_visible?(selector, visible: true)
- within(".user-navigation-secondary") do
- page.has_selector?(selector, visible: visible)
- end
+ within(".user-navigation-secondary") { page.has_selector?(selector, visible: visible) }
end
end
end
diff --git a/spec/system/page_objects/pages/user_preferences_sidebar.rb b/spec/system/page_objects/pages/user_preferences_sidebar.rb
index d0448c5e915..c84d5e33170 100644
--- a/spec/system/page_objects/pages/user_preferences_sidebar.rb
+++ b/spec/system/page_objects/pages/user_preferences_sidebar.rb
@@ -19,8 +19,13 @@ module PageObjects
end
def has_sidebar_list_destination_preference?(type)
- list_selector_header = page.find(".preferences-sidebar-navigation__list-destination-selector .select-kit-header-wrapper")
- list_selector_header.has_content?(I18n.t("js.user.experimental_sidebar.list_destination_#{type}"))
+ list_selector_header =
+ page.find(
+ ".preferences-sidebar-navigation__list-destination-selector .select-kit-header-wrapper",
+ )
+ list_selector_header.has_content?(
+ I18n.t("js.user.experimental_sidebar.list_destination_#{type}"),
+ )
end
end
end
diff --git a/spec/system/search_spec.rb b/spec/system/search_spec.rb
index 19b63054c32..f10b05a038d 100644
--- a/spec/system/search_spec.rb
+++ b/spec/system/search_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe 'Search', type: :system, js: true do
+describe "Search", type: :system, js: true do
let(:search_page) { PageObjects::Pages::Search.new }
fab!(:topic) { Fabricate(:topic) }
fab!(:post) { Fabricate(:post, topic: topic, raw: "This is a test post in a test topic") }
@@ -11,9 +11,7 @@ describe 'Search', type: :system, js: true do
SearchIndexer.index(topic, force: true)
end
- after do
- SearchIndexer.disable
- end
+ after { SearchIndexer.disable }
it "works and clears search page state", mobile: true do
visit("/search")
diff --git a/spec/system/user_page/staff_info_spec.rb b/spec/system/user_page/staff_info_spec.rb
index ef58f4adf14..1ffa8ac8273 100644
--- a/spec/system/user_page/staff_info_spec.rb
+++ b/spec/system/user_page/staff_info_spec.rb
@@ -1,22 +1,18 @@
# frozen_string_literal: true
-describe 'Viewing user staff info as an admin', type: :system, js: true do
+describe "Viewing user staff info as an admin", type: :system, js: true do
fab!(:user) { Fabricate(:user) }
fab!(:admin) { Fabricate(:admin) }
let(:user_page) { PageObjects::Pages::User.new }
- before do
- sign_in(admin)
- end
+ before { sign_in(admin) }
- context 'for warnings' do
+ context "for warnings" do
fab!(:topic) { Fabricate(:private_message_topic, user: admin, recipient: user) }
fab!(:user_warning) { UserWarning.create!(user: user, created_by: admin, topic: topic) }
it "should display the right link to user's warnings with the right count in text" do
- user_page
- .visit(user)
- .click_staff_info_warnings_link(warnings_count: 1)
+ user_page.visit(user).click_staff_info_warnings_link(warnings_count: 1)
expect(user_page).to have_warning_messages_path(user)
end
diff --git a/spec/system/user_preferences_navigation_spec.rb b/spec/system/user_preferences_navigation_spec.rb
index 62ebb16ffb4..54d1de874be 100644
--- a/spec/system/user_preferences_navigation_spec.rb
+++ b/spec/system/user_preferences_navigation_spec.rb
@@ -1,12 +1,12 @@
# frozen_string_literal: true
-describe 'Redesigned user page navigation menu', type: :system, js: true do
+describe "Redesigned user page navigation menu", type: :system, js: true do
fab!(:user) { Fabricate(:user) }
let(:everyone_group) { Group[:everyone] }
let(:user_preferences_page) { PageObjects::Pages::UserPreferences.new }
describe "when visiting the user's preferences page with redesigned user page nav enabled" do
- it 'should allow the user to scroll the horizontal navigation menu when window width is narrow' do
+ it "should allow the user to scroll the horizontal navigation menu when window width is narrow" do
everyone_group.add(user)
SiteSetting.enable_new_user_profile_nav_groups = everyone_group.name
diff --git a/spec/system/viewing_sidebar_preferences_spec.rb b/spec/system/viewing_sidebar_preferences_spec.rb
index 79938a88040..6edf9113880 100644
--- a/spec/system/viewing_sidebar_preferences_spec.rb
+++ b/spec/system/viewing_sidebar_preferences_spec.rb
@@ -1,36 +1,45 @@
# frozen_string_literal: true
-describe 'Viewing sidebar preferences', type: :system, js: true do
+describe "Viewing sidebar preferences", type: :system, js: true do
let(:user_preferences_sidebar_page) { PageObjects::Pages::UserPreferencesSidebar.new }
- before do
- SiteSetting.navigation_menu = "sidebar"
- end
+ before { SiteSetting.navigation_menu = "sidebar" }
- context 'as an admin' do
+ context "as an admin" do
fab!(:admin) { Fabricate(:admin) }
fab!(:user) { Fabricate(:user) }
fab!(:category) { Fabricate(:category) }
fab!(:category2) { Fabricate(:category) }
- fab!(:category_sidebar_section_link) { Fabricate(:category_sidebar_section_link, user: user, linkable: category) }
- fab!(:category2_sidebar_section_link) { Fabricate(:category_sidebar_section_link, user: user, linkable: category2) }
+ fab!(:category_sidebar_section_link) do
+ Fabricate(:category_sidebar_section_link, user: user, linkable: category)
+ end
+ fab!(:category2_sidebar_section_link) do
+ Fabricate(:category_sidebar_section_link, user: user, linkable: category2)
+ end
fab!(:tag) { Fabricate(:tag) }
fab!(:tag2) { Fabricate(:tag) }
- fab!(:tag_sidebar_section_link) { Fabricate(:tag_sidebar_section_link, user: user, linkable: tag) }
- fab!(:tag2_sidebar_section_link) { Fabricate(:tag_sidebar_section_link, user: user, linkable: tag2) }
-
- before do
- sign_in(admin)
+ fab!(:tag_sidebar_section_link) do
+ Fabricate(:tag_sidebar_section_link, user: user, linkable: tag)
+ end
+ fab!(:tag2_sidebar_section_link) do
+ Fabricate(:tag_sidebar_section_link, user: user, linkable: tag2)
end
- it 'should be able to view sidebar preferences of another user' do
+ before { sign_in(admin) }
+
+ it "should be able to view sidebar preferences of another user" do
user.user_option.update!(sidebar_list_destination: "unread_new")
user_preferences_sidebar_page.visit(user)
- expect(user_preferences_sidebar_page).to have_sidebar_categories_preference(category, category2)
+ expect(user_preferences_sidebar_page).to have_sidebar_categories_preference(
+ category,
+ category2,
+ )
expect(user_preferences_sidebar_page).to have_sidebar_tags_preference(tag, tag2)
- expect(user_preferences_sidebar_page).to have_sidebar_list_destination_preference("unread_new")
+ expect(user_preferences_sidebar_page).to have_sidebar_list_destination_preference(
+ "unread_new",
+ )
end
end
end
diff --git a/spec/tasks/incoming_emails_spec.rb b/spec/tasks/incoming_emails_spec.rb
index 755a14c7999..a1684d53c39 100644
--- a/spec/tasks/incoming_emails_spec.rb
+++ b/spec/tasks/incoming_emails_spec.rb
@@ -6,18 +6,22 @@ RSpec.describe "incoming emails tasks" do
Discourse::Application.load_tasks
end
- describe 'email with attachment' do
+ describe "email with attachment" do
fab!(:incoming_email) { Fabricate(:incoming_email, raw: email(:attached_txt_file)) }
- it 'updates record' do
- expect { Rake::Task['incoming_emails:truncate_long'].invoke }.to change { incoming_email.reload.raw }
+ it "updates record" do
+ expect { Rake::Task["incoming_emails:truncate_long"].invoke }.to change {
+ incoming_email.reload.raw
+ }
end
end
- describe 'short email without attachment' do
+ describe "short email without attachment" do
fab!(:incoming_email) { Fabricate(:incoming_email, raw: email(:html_reply)) }
- it 'does not update record' do
- expect { Rake::Task['incoming_emails:truncate_long'].invoke }.not_to change { incoming_email.reload.raw }
+ it "does not update record" do
+ expect { Rake::Task["incoming_emails:truncate_long"].invoke }.not_to change {
+ incoming_email.reload.raw
+ }
end
end
end
diff --git a/spec/tasks/posts_spec.rb b/spec/tasks/posts_spec.rb
index 4d9f849f5d1..0e437aee39d 100644
--- a/spec/tasks/posts_spec.rb
+++ b/spec/tasks/posts_spec.rb
@@ -1,11 +1,11 @@
# frozen_string_literal: true
-require 'highline/import'
-require 'highline/simulate'
+require "highline/import"
+require "highline/simulate"
RSpec.describe "Post rake tasks" do
- fab!(:post) { Fabricate(:post, raw: 'The quick brown fox jumps over the lazy dog') }
- fab!(:tricky_post) { Fabricate(:post, raw: 'Today ^Today') }
+ fab!(:post) { Fabricate(:post, raw: "The quick brown fox jumps over the lazy dog") }
+ fab!(:tricky_post) { Fabricate(:post, raw: "Today ^Today") }
before do
Rake::Task.clear
@@ -13,58 +13,56 @@ RSpec.describe "Post rake tasks" do
STDOUT.stubs(:write)
end
- describe 'remap' do
- it 'should remap posts' do
- HighLine::Simulate.with('y') do
- Rake::Task['posts:remap'].invoke("brown", "red")
- end
+ describe "remap" do
+ it "should remap posts" do
+ HighLine::Simulate.with("y") { Rake::Task["posts:remap"].invoke("brown", "red") }
post.reload
- expect(post.raw).to eq('The quick red fox jumps over the lazy dog')
+ expect(post.raw).to eq("The quick red fox jumps over the lazy dog")
end
- context 'when type == string' do
- it 'remaps input as string' do
- HighLine::Simulate.with('y') do
- Rake::Task['posts:remap'].invoke('^Today', 'Yesterday', 'string')
+ context "when type == string" do
+ it "remaps input as string" do
+ HighLine::Simulate.with("y") do
+ Rake::Task["posts:remap"].invoke("^Today", "Yesterday", "string")
end
- expect(tricky_post.reload.raw).to eq('Today Yesterday')
+ expect(tricky_post.reload.raw).to eq("Today Yesterday")
end
end
- context 'when type == regex' do
- it 'remaps input as regex' do
- HighLine::Simulate.with('y') do
- Rake::Task['posts:remap'].invoke('^Today', 'Yesterday', 'regex')
+ context "when type == regex" do
+ it "remaps input as regex" do
+ HighLine::Simulate.with("y") do
+ Rake::Task["posts:remap"].invoke("^Today", "Yesterday", "regex")
end
- expect(tricky_post.reload.raw).to eq('Yesterday ^Today')
+ expect(tricky_post.reload.raw).to eq("Yesterday ^Today")
end
end
end
- describe 'rebake_match' do
- it 'rebakes matched posts' do
- post.update(cooked: '')
+ describe "rebake_match" do
+ it "rebakes matched posts" do
+ post.update(cooked: "")
- HighLine::Simulate.with('y') do
- Rake::Task['posts:rebake_match'].invoke('brown')
- end
+ HighLine::Simulate.with("y") { Rake::Task["posts:rebake_match"].invoke("brown") }
- expect(post.reload.cooked).to eq('The quick brown fox jumps over the lazy dog
')
+ expect(post.reload.cooked).to eq("The quick brown fox jumps over the lazy dog
")
end
end
- describe 'missing_uploads' do
- let(:url) { "/uploads/#{RailsMultisite::ConnectionManagement.current_db}/original/1X/d1c2d40ab994e8410c.png" }
+ describe "missing_uploads" do
+ let(:url) do
+ "/uploads/#{RailsMultisite::ConnectionManagement.current_db}/original/1X/d1c2d40ab994e8410c.png"
+ end
let(:upload) { Fabricate(:upload, url: url) }
- it 'should create post custom field for missing upload' do
+ it "should create post custom field for missing upload" do
post = Fabricate(:post, raw: "A sample post
