[Fix rubocop#9328] Removing nil check, refactoring spec

thearjunmdas · Jul 14, 2021 · 1fb68ff · 1fb68ff
1 parent aed2f41
commit 1fb68ff
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/lib/rubocop/cop/style/mutable_constant.rb b/lib/rubocop/cop/style/mutable_constant.rb
@@ -133,7 +133,6 @@ def frozen_string_literal?(node)
 
         def shareable_constant_value?(node)
           return false if target_ruby_version < 3.0
-          return false if node.nil?
 
           recent_shareable_value? node
         end

diff --git a/spec/rubocop/cop/style/mutable_constant_spec.rb b/spec/rubocop/cop/style/mutable_constant_spec.rb
@@ -43,11 +43,10 @@
     end
   end
 
-  shared_examples 'freezing all constants' do |o|
+  shared_examples 'literals that are frozen' do |o|
     let(:prefix) { o }
 
     it_behaves_like 'immutable objects', '[1, 2, 3]'
-    it_behaves_like 'immutable objects', 'Set[1, 2]'
     it_behaves_like 'immutable objects', '%w(a b c)'
     it_behaves_like 'immutable objects', '{ a: 1, b: 2 }'
     it_behaves_like 'immutable objects', "'str'"
@@ -62,11 +61,10 @@
     it_behaves_like 'immutable objects', "::ENV['foo']"
   end
 
-  shared_examples 'not freezing all constants' do |o|
+  shared_examples 'literals that are not frozen' do |o|
     let(:prefix) { o }
 
     it_behaves_like 'mutable objects', '[1, 2, 3]'
-    it_behaves_like 'immutable objects', 'Set[1, 2]'
     it_behaves_like 'mutable objects', '%w(a b c)'
     it_behaves_like 'mutable objects', '{ a: 1, b: 2 }'
     it_behaves_like 'mutable objects', "'str'"
@@ -198,10 +196,10 @@
       end
 
       context 'when using shareable_constant_value' do
-        it_behaves_like 'freezing all constants', '# shareable_constant_value: literal'
-        it_behaves_like 'freezing all constants', '# shareable_constant_value: experimental_everything'
-        it_behaves_like 'freezing all constants', '# shareable_constant_value: experimental_copy'
-        it_behaves_like 'not freezing all constants', '# shareable_constant_value: none'
+        it_behaves_like 'literals that are frozen', '# shareable_constant_value: literal'
+        it_behaves_like 'literals that are frozen', '# shareable_constant_value: experimental_everything'
+        it_behaves_like 'literals that are frozen', '# shareable_constant_value: experimental_copy'
+        it_behaves_like 'literals that are not frozen', '# shareable_constant_value: none'
       end
 
       it 'raises offense when shareable_constant_value is specified as an inline comment' do
@@ -287,10 +285,10 @@
       end
 
       context 'when using shareable_constant_values' do
-        it_behaves_like 'not freezing all constants', '# shareable_constant_value: literal'
-        it_behaves_like 'not freezing all constants', '# shareable_constant_value: experimental_everything'
-        it_behaves_like 'not freezing all constants', '# shareable_constant_value: experimental_copy'
-        it_behaves_like 'not freezing all constants', '# shareable_constant_value: none'
+        it_behaves_like 'literals that are not frozen', '# shareable_constant_value: literal'
+        it_behaves_like 'literals that are not frozen', '# shareable_constant_value: experimental_everything'
+        it_behaves_like 'literals that are not frozen', '# shareable_constant_value: experimental_copy'
+        it_behaves_like 'literals that are not frozen', '# shareable_constant_value: none'
       end
     end