rails5-spec-converter 1.0.20 → 1.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c39727a6db3accd9728ab2c8bfa6d815f643a4a8
-  data.tar.gz: 9e5417f24316cc7e52e641a9326300a53076b860
+  metadata.gz: 2b243c703f835ef357017c5dd87464e345b44dca
+  data.tar.gz: a1acb2cea1494ccbcc37e7fcb3988d2924be9b5b
 SHA512:
-  metadata.gz: 567c6d0ce3b8cb2ba351c66016cfca5b48237bb1a1320b75db87d422b8b666cf8bc0eeb20f16afa850a95da025b94445b58b366b9295e2c45f373dcb8baa294f
-  data.tar.gz: 1d24dea46469e77d819a67351601b004ac25ed9b4ef5fe53cefa241e2a5e27cdbcdffdd73c471746490a4a1148215a9b81fbc75d651787bf4200bde3546fee4c
+  metadata.gz: 1cbaa53a1fcd05235f7cbd8e940879307e908003fbd8f83c0021fd338fdea0384d0456b743eb89c21fb4b335304beebfd59855ba92a3a2c0f80370fbf8658821
+  data.tar.gz: b6be580cefc1bd2bd3acea6624463d325285e17ed46f8fb728189199133f66938c059e672533686136ae988ece1aca658802f298e24dce9cc36d35b8f9add2b9

data/README.md

@@ -1,4 +1,4 @@
-# Rails5::SpecConverter
+# Rails5 Spec Converter
 
 [![Build Status](https://travis-ci.org/tjgrathwell/rails5-spec-converter.svg?branch=master)](https://travis-ci.org/tjgrathwell/rails5-spec-converter)
 
@@ -33,7 +33,7 @@ Make sure you've committed everything to Git first, then
     $ cd some-project
     $ rails5-spec-converter
 
-This will update all the files in that directory matching the glob `spec/**/*_spec.rb`. It should be idempotent.
+This will update all the files in that directory matching the globs `spec/**/*_spec.rb` or `test/**/*_test.rb`.
 
 If you want to specify a specific set of files instead, you can run `rails5-spec-converter path_to_my_files`.
 
@@ -76,7 +76,7 @@ even though `format` should be **outside** the params hash.
     format: :json
   }
 
-  _inner, _outer = all_the_params.partition { |k,v| %i{session flash method body xhr format}.include?(k) }.map { |a| Hash[a] }
+  _outer, _inner = all_the_params.partition { |k,v| %i{format}.include?(k) }.map { |a| Hash[a] }
   get :users, _outer.merge(params: _inner)
   ```
 
@@ -128,6 +128,10 @@ post :users, params: {user: {name: 'bayleef'}}
 
 * `--hash-spacing` will force hashes to be written **with** extra whitespace in all files regardless of context.
 
+## Compatibility
+
+It **should** work for both RSpec and MiniTest, but who really knows?
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `bundle exec rspec spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/rails5/spec_converter/cli.rb

@@ -41,7 +41,7 @@ module Rails5
       end
 
       def run
-        paths = @files.length > 0 ? @files : ["spec/**/*_spec.rb"]
+        paths = @files.length > 0 ? @files : ["spec/**/*_spec.rb", "test/**/*_test.rb"]
 
         paths.each do |path|
           Dir.glob(path) do |file_path|

data/lib/rails5/spec_converter/hash_rewriter.rb

@@ -1,8 +1,7 @@
 require 'rails5/spec_converter/node_textifier'
 
 class HashRewriter
-  # technically format is special
-  ALLOWED_KWARG_KEYS = %i(params session flash method body xhr format)
+  OUTSIDE_PARAMS_KEYS = %i(format)
 
   attr_reader :hash_node, :original_indent
 
@@ -97,7 +96,7 @@ class HashRewriter
     hash_node.children.each do |pair|
       key = pair.children[0].children[0]
 
-      if ALLOWED_KWARG_KEYS.include?(key)
+      if OUTSIDE_PARAMS_KEYS.include?(key)
         @pairs_that_belong_outside_params << pair
       else
         @pairs_that_belong_in_params << pair
@@ -138,11 +137,11 @@ class HashRewriter
     value_str_lines[1].match(/^(\s*)/)[1].sub(original_indent, '')
   end
 
-  def additional_indent(hash_node)
+  def should_indent_restrung_content?(hash_node)
     return nil if indent_before_first_pair(hash_node)
 
     joiner = first_joiner_between_pairs
-    joiner && joiner.include?("\n") ? @options.indent : nil
+    joiner && joiner.include?("\n")
   end
 
   def existing_indent(hash_node)
@@ -188,14 +187,18 @@ class HashRewriter
 
   def appropriately_indented_params_hash(pairs:)
     outer_indent = existing_indent(hash_node)
-    middle_indent = indent_of_first_value_if_multiline(hash_node)
-    inner_indent = additional_indent(hash_node)
 
     restrung_hash = restring_hash(
       pairs,
-      indent: outer_indent + (inner_indent || ''),
+      indent: outer_indent,
       joiner: ",\n"
     )
+
+    if should_indent_restrung_content?(hash_node)
+      restrung_hash = add_indent(restrung_hash, @options.indent)
+    end
+
+    middle_indent = indent_of_first_value_if_multiline(hash_node)
     if middle_indent
       restrung_hash = original_indent + add_indent(restrung_hash, middle_indent)
     end

data/lib/rails5/spec_converter/test_type_identifier.rb

@@ -36,6 +36,15 @@ module Rails5
 
       def test_type_from_content
         root_node = @parser.parse(@source_buffer)
+        root_node.each_node(:class) do |node|
+          class_const_node, superclass_const_node = node.children
+          next unless superclass_const_node && superclass_const_node.const_type?
+
+          superclass_str = superclass_const_node.loc.expression.source
+          return :controller if superclass_str == "ActionController::TestCase"
+          return :request if superclass_str == "ActionDispatch::IntegrationTest"
+        end
+
         root_node.each_node(:send) do |node|
           target, method, test_name, params = node.children
           next unless target.nil? || target == :RSpec
@@ -51,9 +60,9 @@ module Rails5
         return nil unless @options.file_path
 
         dirs = @options.file_path.split('/')
-        spec_folder_index = dirs.index('spec')
-        return nil unless spec_folder_index
-        DIRECTORY_TO_TYPE_MAP[dirs[spec_folder_index + 1]]
+        folder_index = dirs.index('spec') || dirs.index('test')
+        return nil unless folder_index
+        DIRECTORY_TO_TYPE_MAP[dirs[folder_index + 1]]
       end
 
       def type_from_params_hash(params)

data/lib/rails5/spec_converter/text_transformer.rb

@@ -86,7 +86,7 @@ module Rails5
         end
 
         if @options.uglify_ambiguous_params?
-          keys = (HashRewriter::ALLOWED_KWARG_KEYS - [:params]).join(' ')
+          keys = HashRewriter::OUTSIDE_PARAMS_KEYS.join(' ')
           partition_clause = [
             @textifier.node_to_string(args[0]),
             "partition { |k,v| %i{#{keys}}.include?(k) }",

data/lib/rails5/spec_converter/version.rb

@@ -1,5 +1,5 @@
 module Rails5
   module SpecConverter
-    VERSION = "1.0.20"
+    VERSION = "1.0.21"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails5-spec-converter
 version: !ruby/object:Gem::Version
-  version: 1.0.20
+  version: 1.0.21
 platform: ruby
 authors:
 - Travis Grathwell