FIX rubocop#159 - enum hash auto correct for % arrays

ngouy · Dec 3, 2019 · f830f29 · f830f29
1 parent 1ab92f2
commit f830f29
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 5 deletions.
diff --git a/lib/rubocop/cop/rails/enum_hash.rb b/lib/rubocop/cop/rails/enum_hash.rb
@@ -42,7 +42,7 @@ def on_send(node)
 
         def autocorrect(node)
           hash = node.children.each_with_index.map do |elem, index|
-            "#{elem.source} => #{index}"
+            "#{source(elem)} => #{index}"
           end.join(', ')
 
           ->(corrector) { corrector.replace(node.loc.expression, "{#{hash}}") }
@@ -58,6 +58,17 @@ def enum_name(key)
             key.source
           end
         end
+
+        def source(elem)
+          case elem.type
+          when :str
+            "\"#{elem.value}\""
+          when :sym
+            elem.source.include?(":") ? elem.source : ":#{elem.value}"
+          else
+            elem.source
+          end
+        end
       end
     end
   end

diff --git a/spec/rubocop/cop/rails/enum_hash_spec.rb b/spec/rubocop/cop/rails/enum_hash_spec.rb
@@ -7,38 +7,54 @@
 
   context 'when array syntax is used' do
     context 'with %i[] syntax' do
-      it 'registers an offense' do
+      it 'autocorrects' do
         expect_offense(<<~RUBY)
           enum status: %i[active archived]
                        ^^^^^^^^^^^^^^^^^^^ Enum defined as an array found in `status` enum declaration. Use hash syntax instead.
         RUBY
+
+        expect_correction(<<~RUBY)
+          enum status: {:active => 0, :archived => 1}
+        RUBY
       end
     end
 
     context 'with %w[] syntax' do
-      it 'registers an offense' do
+      it 'autocorrects' do
         expect_offense(<<~RUBY)
           enum status: %w[active archived]
                        ^^^^^^^^^^^^^^^^^^^ Enum defined as an array found in `status` enum declaration. Use hash syntax instead.
         RUBY
+
+        expect_correction(<<~RUBY)
+          enum status: {"active" => 0, "archived" => 1}
+        RUBY
       end
     end
 
     context 'with %i() syntax' do
-      it 'registers an offense' do
+      it 'autocorrects' do
         expect_offense(<<~RUBY)
           enum status: %i(active archived)
                        ^^^^^^^^^^^^^^^^^^^ Enum defined as an array found in `status` enum declaration. Use hash syntax instead.
         RUBY
+
+        expect_correction(<<~RUBY)
+          enum status: {:active => 0, :archived => 1}
+        RUBY
       end
     end
 
     context 'with %w() syntax' do
-      it 'registers an offense' do
+      it 'autocorrects' do
         expect_offense(<<~RUBY)
           enum status: %w(active archived)
                        ^^^^^^^^^^^^^^^^^^^ Enum defined as an array found in `status` enum declaration. Use hash syntax instead.
         RUBY
+
+        expect_correction(<<~RUBY)
+          enum status: {"active" => 0, "archived" => 1}
+        RUBY
       end
     end
 
@@ -49,6 +65,13 @@
                        ^^^^^^^^^^^^^^^^^^^^ Enum defined as an array found in `status` enum declaration. Use hash syntax instead.
         RUBY
       end
+
+      it 'registers an offense' do
+        expect_offense(<<~RUBY)
+          enum status: ["active", "archived"]
+                       ^^^^^^^^^^^^^^^^^^^^^^ Enum defined as an array found in `status` enum declaration. Use hash syntax instead.
+        RUBY
+      end
     end
 
     context 'when the enum name is a string' do