Merge pull request #2119 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

3 files changed, 20 insertions, 16 deletions

diff --git a/spec/support/examples/lib/settings/scoped_settings.rb b/spec/support/examples/lib/settings/scoped_settings.rb
index 2457dcfbf..106adb4fa 100644
--- a/spec/support/examples/lib/settings/scoped_settings.rb
+++ b/spec/support/examples/lib/settings/scoped_settings.rb
@@ -3,13 +3,13 @@
 shared_examples 'ScopedSettings' do
   describe '[]' do
     it 'inherits default settings' do
-      expect(Setting.boost_modal).to eq false
-      expect(Setting.interactions['must_be_follower']).to eq false
+      expect(Setting.boost_modal).to be false
+      expect(Setting.interactions['must_be_follower']).to be false
 
       settings = create!
 
-      expect(settings['boost_modal']).to eq false
-      expect(settings['interactions']['must_be_follower']).to eq false
+      expect(settings['boost_modal']).to be false
+      expect(settings['interactions']['must_be_follower']).to be false
     end
   end
 
@@ -17,16 +17,16 @@ shared_examples 'ScopedSettings' do
     # expecting [] and []= works
 
     it 'returns records merged with default values except hashes' do
-      expect(Setting.boost_modal).to eq false
-      expect(Setting.delete_modal).to eq true
+      expect(Setting.boost_modal).to be false
+      expect(Setting.delete_modal).to be true
 
       settings = create!
       settings['boost_modal'] = true
 
       records = settings.all_as_records
 
-      expect(records['boost_modal'].value).to eq true
-      expect(records['delete_modal'].value).to eq true
+      expect(records['boost_modal'].value).to be true
+      expect(records['delete_modal'].value).to be true
     end
   end
 
@@ -34,15 +34,15 @@ shared_examples 'ScopedSettings' do
     # expecting [] and []= works.
 
     it 'reads settings' do
-      expect(Setting.boost_modal).to eq false
+      expect(Setting.boost_modal).to be false
       settings = create!
-      expect(settings.boost_modal).to eq false
+      expect(settings.boost_modal).to be false
     end
 
     it 'updates settings' do
       settings = fabricate
       settings.boost_modal = true
-      expect(settings['boost_modal']).to eq true
+      expect(settings['boost_modal']).to be true
     end
   end
 
@@ -54,13 +54,13 @@ shared_examples 'ScopedSettings' do
 
     Setting.save!
 
-    expect(settings['boost_modal']).to eq true
-    expect(settings['interactions']['must_be_follower']).to eq true
+    expect(settings['boost_modal']).to be true
+    expect(settings['interactions']['must_be_follower']).to be true
 
     Rails.cache.clear
 
-    expect(settings['boost_modal']).to eq true
-    expect(settings['interactions']['must_be_follower']).to eq true
+    expect(settings['boost_modal']).to be true
+    expect(settings['interactions']['must_be_follower']).to be true
   end
 
   xit 'does not mutate defaults via the cache' do
@@ -69,6 +69,6 @@ shared_examples 'ScopedSettings' do
     # This mutates the global settings default such that future
     # instances will inherit the incorrect starting values
 
-    expect(fabricate.settings['interactions']['must_be_follower']).to eq false
+    expect(fabricate.settings['interactions']['must_be_follower']).to be false
   end
 end
diff --git a/spec/support/matchers/json/match_json_schema.rb b/spec/support/matchers/json/match_json_schema.rb
index 5d9c9a618..3a275199e 100644
--- a/spec/support/matchers/json/match_json_schema.rb
+++ b/spec/support/matchers/json/match_json_schema.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec::Matchers.define :match_json_schema do |schema|
   match do |input_json|
     schema_path = Rails.root.join('spec', 'support', 'schema', "#{schema}.json").to_s
diff --git a/spec/support/matchers/model/model_have_error_on_field.rb b/spec/support/matchers/model/model_have_error_on_field.rb
index d85db2fca..21632b574 100644
--- a/spec/support/matchers/model/model_have_error_on_field.rb
+++ b/spec/support/matchers/model/model_have_error_on_field.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec::Matchers.define :model_have_error_on_field do |expected|
   match do |record|
     record.valid? if record.errors.empty?