shoulda-context 2.0.0.rc1 → 2.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51bde035855288943372f8d9fc71310416ae02ddacbab30f912e5abbce21ab5f
-  data.tar.gz: ce5ee8ece26119b829ab2851b3607ed1f62c00478115ede3e3a987dc86455e16
+  metadata.gz: 0e793247da34487c30f2d2f21bbf192ad399dcd893e1b4ab24088b7efda7ed2e
+  data.tar.gz: 93d6d5ad309c9a190ec8e317b041be600420409f59c12fc033f901b7f492b8b7
 SHA512:
-  metadata.gz: ef854338d26cb4613673c019d38fd66411899e5ab983421ed3d0db45449ac527c982faa8910b831421fd1a1edfbfa6f1e8572bba6d191ba17809b6b8aef4a338
-  data.tar.gz: e2854aad28db7d53de92728d00df9b51395e142d3f74a41da75883e8febc2a2e062c48d84e96879b9bae88f49bbce9002fd29442da33068e7d44d8042eea2e75
+  metadata.gz: a735ff40fc334bc9488c4b2a4daa8ecaf59fa8c233e1c2e0e63f2f238dc6c289e88c7cad7fd8571b9a06f92cd300835b0c86d41a426097a8a9377a6af8642463
+  data.tar.gz: 5a1f213846b5a09efe5cda27d09af30a96a6ba2d6ba7f47f020914469b6426228a766ed18c56b990555a456004c966bba93ef391678733b690b76578b69ef912

data/.hound.yml

@@ -0,0 +1,3 @@
+rubocop:
+  version: 0.64.0
+  config_file: .rubocop.yml

data/CHANGELOG.md

@@ -25,3 +25,6 @@
   framework's automatically.
 * Restore compatibility with Shoulda Matchers, starting from 3.0.
 * Fix some compatibility issues with Minitest 5.
+* Fix running tests within a Rails < 5.2 environment so that when tests fail, an
+  error is not produced claiming that Minitest::Result cannot find a test
+  method.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shoulda-context (2.0.0.rc1)
+    shoulda-context (2.0.0.rc2)
 
 GEM
   remote: https://rubygems.org/
@@ -22,8 +22,8 @@ GEM
     minitest (5.11.3)
     mocha (1.8.0)
       metaclass (~> 0.0.1)
-    parallel (1.14.0)
-    parser (2.6.0.0)
+    parallel (1.17.0)
+    parser (2.6.2.1)
       ast (~> 2.4.0)
     power_assert (1.1.3)
     powerpack (0.1.2)
@@ -33,20 +33,18 @@ GEM
     pry-byebug (3.6.0)
       byebug (~> 10.0)
       pry (~> 0.10)
-    psych (3.1.0)
     rainbow (3.0.0)
     rake (12.3.2)
-    rubocop (0.65.0)
+    rubocop (0.64.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
-      psych (>= 3.1.0)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.4.0)
     ruby-progressbar (1.10.0)
-    snowglobe (0.1.0)
+    snowglobe (0.3.0)
     test-unit (3.3.0)
       power_assert
     thor (0.20.3)
@@ -63,9 +61,9 @@ DEPENDENCIES
   mocha
   pry-byebug
   rake
-  rubocop
+  rubocop (= 0.64.0)
   shoulda-context!
-  snowglobe
+  snowglobe (>= 0.3.0)
   test-unit
 
 BUNDLED WITH

data/gemfiles/rails_4_2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    shoulda-context (2.0.0.rc1)
+    shoulda-context (2.0.0.rc2)
 
 GEM
   remote: https://rubygems.org/
@@ -74,8 +74,8 @@ GEM
       metaclass (~> 0.0.1)
     nokogiri (1.10.1)
       mini_portile2 (~> 2.4.0)
-    parallel (1.14.0)
-    parser (2.6.0.0)
+    parallel (1.17.0)
+    parser (2.6.2.1)
       ast (~> 2.4.0)
     power_assert (1.1.3)
     powerpack (0.1.2)
@@ -85,7 +85,6 @@ GEM
     pry-byebug (3.6.0)
       byebug (~> 10.0)
       pry (~> 0.10)
-    psych (3.1.0)
     rack (1.6.8)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -115,17 +114,16 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rainbow (3.0.0)
     rake (12.3.2)
-    rubocop (0.65.0)
+    rubocop (0.64.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
-      psych (>= 3.1.0)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.4.0)
     ruby-progressbar (1.10.0)
-    snowglobe (0.1.0)
+    snowglobe (0.3.0)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -154,9 +152,9 @@ DEPENDENCIES
   pry-byebug
   rails (~> 4.2.0)
   rake
-  rubocop
+  rubocop (= 0.64.0)
   shoulda-context!
-  snowglobe
+  snowglobe (>= 0.3.0)
   sqlite3 (~> 1.3.6)
   test-unit
 

data/gemfiles/rails_5_0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    shoulda-context (2.0.0.rc1)
+    shoulda-context (2.0.0.rc2)
 
 GEM
   remote: https://rubygems.org/
@@ -78,8 +78,8 @@ GEM
     nio4r (2.3.1)
     nokogiri (1.10.1)
       mini_portile2 (~> 2.4.0)
-    parallel (1.14.0)
-    parser (2.6.0.0)
+    parallel (1.17.0)
+    parser (2.6.2.1)
       ast (~> 2.4.0)
     power_assert (1.1.3)
     powerpack (0.1.2)
@@ -89,7 +89,6 @@ GEM
     pry-byebug (3.6.0)
       byebug (~> 10.0)
       pry (~> 0.10)
-    psych (3.1.0)
     rack (2.0.6)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -118,17 +117,16 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rainbow (3.0.0)
     rake (12.3.2)
-    rubocop (0.65.0)
+    rubocop (0.64.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
-      psych (>= 3.1.0)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.4.0)
     ruby-progressbar (1.10.0)
-    snowglobe (0.1.0)
+    snowglobe (0.3.0)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -160,9 +158,9 @@ DEPENDENCIES
   pry-byebug
   rails (~> 5.0.0)
   rake
-  rubocop
+  rubocop (= 0.64.0)
   shoulda-context!
-  snowglobe
+  snowglobe (>= 0.3.0)
   sqlite3 (~> 1.3.6)
   test-unit
 

data/gemfiles/rails_5_1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    shoulda-context (2.0.0.rc1)
+    shoulda-context (2.0.0.rc2)
 
 GEM
   remote: https://rubygems.org/
@@ -78,8 +78,8 @@ GEM
     nio4r (2.3.1)
     nokogiri (1.10.1)
       mini_portile2 (~> 2.4.0)
-    parallel (1.14.0)
-    parser (2.6.0.0)
+    parallel (1.17.0)
+    parser (2.6.2.1)
       ast (~> 2.4.0)
     power_assert (1.1.3)
     powerpack (0.1.2)
@@ -89,7 +89,6 @@ GEM
     pry-byebug (3.6.0)
       byebug (~> 10.0)
       pry (~> 0.10)
-    psych (3.1.0)
     rack (2.0.6)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -118,17 +117,16 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rainbow (3.0.0)
     rake (12.3.2)
-    rubocop (0.65.0)
+    rubocop (0.64.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
-      psych (>= 3.1.0)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.4.0)
     ruby-progressbar (1.10.0)
-    snowglobe (0.1.0)
+    snowglobe (0.3.0)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -160,9 +158,9 @@ DEPENDENCIES
   pry-byebug
   rails (~> 5.1.0)
   rake
-  rubocop
+  rubocop (= 0.64.0)
   shoulda-context!
-  snowglobe
+  snowglobe (>= 0.3.0)
   sqlite3 (~> 1.3.6)
   test-unit
 

data/gemfiles/rails_5_2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    shoulda-context (2.0.0.rc1)
+    shoulda-context (2.0.0.rc2)
 
 GEM
   remote: https://rubygems.org/
@@ -85,8 +85,8 @@ GEM
     nio4r (2.3.1)
     nokogiri (1.10.1)
       mini_portile2 (~> 2.4.0)
-    parallel (1.14.0)
-    parser (2.6.0.0)
+    parallel (1.17.0)
+    parser (2.6.2.1)
       ast (~> 2.4.0)
     power_assert (1.1.3)
     powerpack (0.1.2)
@@ -96,7 +96,6 @@ GEM
     pry-byebug (3.6.0)
       byebug (~> 10.0)
       pry (~> 0.10)
-    psych (3.1.0)
     rack (2.0.6)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -126,17 +125,16 @@ GEM
       thor (>= 0.19.0, < 2.0)
     rainbow (3.0.0)
     rake (12.3.2)
-    rubocop (0.65.0)
+    rubocop (0.64.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
-      psych (>= 3.1.0)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.4.0)
     ruby-progressbar (1.10.0)
-    snowglobe (0.1.0)
+    snowglobe (0.3.0)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -168,9 +166,9 @@ DEPENDENCIES
   pry-byebug
   rails (~> 5.2.0)
   rake
-  rubocop
+  rubocop (= 0.64.0)
   shoulda-context!
-  snowglobe
+  snowglobe (>= 0.3.0)
   sqlite3 (~> 1.3.6)
   test-unit
 

data/lib/shoulda/context.rb

@@ -9,6 +9,7 @@ require "shoulda/context/world"
 
 if defined?(Rails)
   require "shoulda/context/railtie"
+  require "shoulda/context/rails_test_unit_reporter_patch"
 end
 
 Shoulda::Context.configure do |config|

data/lib/shoulda/context/context.rb

@@ -112,22 +112,26 @@ module Shoulda
             "'#{test_name}' is defined more than once."
           )
         end
-        test_methods[test_unit_class][test_name.to_s] = true
 
+        test_methods[test_unit_class][test_name.to_s] = true
+        file, line_no = should[:block].source_location
         context = self
-        test_unit_class.__send__(:define_method, test_name) do
-          @shoulda_context = context
-          begin
-            context.run_parent_setup_blocks(self)
-            if should[:before]
-              instance_exec(&should[:before])
+
+        test_unit_class.class_eval <<-end_eval, file, line_no
+          define_method test_name do
+            @shoulda_context = context
+            begin
+              context.run_parent_setup_blocks(self)
+              if should[:before]
+                instance_exec(&should[:before])
+              end
+              context.run_current_setup_blocks(self)
+              instance_exec(&should[:block])
+            ensure
+              context.run_all_teardown_blocks(self)
             end
-            context.run_current_setup_blocks(self)
-            instance_exec(&should[:block])
-          ensure
-            context.run_all_teardown_blocks(self)
           end
-        end
+        end_eval
       end
 
       def build_test_name_from(should)

data/lib/shoulda/context/rails_test_unit_reporter_patch.rb

@@ -0,0 +1,21 @@
+begin
+  require "rails/test_unit/reporter"
+
+  Rails::TestUnitReporter.class_eval do
+    # Fix #format_rerun_snippet so that it works with recent versions of Minitest.
+    # This was cribbed from:
+    # <https://github.com/rails/rails/commit/ff0d5f14504f1aa29ad908ab15bab66b101427b7#diff-a071a1c8f51ce3b8bcb17ca59c79fc70>
+    def format_rerun_snippet(result)
+      location, line =
+        if result.respond_to?(:source_location)
+          result.source_location
+        else
+          result.method(result.name).source_location
+        end
+
+      "#{executable} #{relative_path_for(location)}:#{line}"
+    end
+  end
+rescue LoadError
+  # Rails::TestUnitReporter was introduced in Rails 5
+end

data/lib/shoulda/context/version.rb

@@ -1,5 +1,5 @@
 module Shoulda
   module Context
-    VERSION = "2.0.0.rc1".freeze
+    VERSION = "2.0.0.rc2".freeze
   end
 end

data/shoulda-context.gemspec

@@ -27,6 +27,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "mocha"
   s.add_development_dependency "pry-byebug"
   s.add_development_dependency "rake"
-  s.add_development_dependency "rubocop"
-  s.add_development_dependency "snowglobe"
+  s.add_development_dependency "rubocop", "0.64.0"
+  s.add_development_dependency "snowglobe", ">= 0.3.0"
 end

data/test/shoulda/railtie_test.rb

@@ -33,7 +33,7 @@ class RailtieTest < PARENT_TEST_CASE
         end
       RUBY
 
-      app.run_command!("bundle exec rake test")
+      app.run_n_unit_test_suite
     end
   end
 

data/test/shoulda/rerun_snippet_test.rb

@@ -0,0 +1,33 @@
+require "test_helper"
+
+class RerunSnippetTest < PARENT_TEST_CASE
+  context "A Rails application with shoulda-context added to it" do
+    should "display the correct rerun snippet when a test fails" do
+      if app.rails_version >= 5 && TEST_FRAMEWORK == "minitest"
+        app.create
+
+        app.write_file("test/models/failing_test.rb", <<~RUBY)
+          ENV["RAILS_ENV"] = "test"
+          require_relative "../../config/environment"
+
+          class FailingTest < #{PARENT_TEST_CASE}
+            should "fail" do
+              assert false
+            end
+          end
+        RUBY
+
+        command_runner = app.run_n_unit_test_suite
+
+        assert_includes(
+          command_runner.output,
+          "bin/rails test test/models/failing_test.rb:5"
+        )
+      end
+    end
+  end
+
+  def app
+    @_app ||= RailsApplicationWithShouldaContext.new
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoulda-context
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.0.rc2
 platform: ruby
 authors:
 - thoughtbot, inc.
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-20 00:00:00.000000000 Z
+date: 2019-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -103,30 +103,30 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.64.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.64.0
 - !ruby/object:Gem::Dependency
   name: snowglobe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
 description: Context framework extracted from Shoulda
 email: support@thoughtbot.com
 executables:
@@ -135,6 +135,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".hound.yml"
 - ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
@@ -169,6 +170,7 @@ files:
 - lib/shoulda/context/context.rb
 - lib/shoulda/context/dsl.rb
 - lib/shoulda/context/proc_extensions.rb
+- lib/shoulda/context/rails_test_unit_reporter_patch.rb
 - lib/shoulda/context/railtie.rb
 - lib/shoulda/context/tasks.rb
 - lib/shoulda/context/tasks/list_tests.rake
@@ -187,6 +189,7 @@ files:
 - test/shoulda/convert_to_should_syntax_test.rb
 - test/shoulda/helpers_test.rb
 - test/shoulda/railtie_test.rb
+- test/shoulda/rerun_snippet_test.rb
 - test/shoulda/should_test.rb
 - test/shoulda/test_framework_detection_test.rb
 - test/support/current_bundle.rb
@@ -227,6 +230,7 @@ test_files:
 - test/shoulda/convert_to_should_syntax_test.rb
 - test/shoulda/helpers_test.rb
 - test/shoulda/railtie_test.rb
+- test/shoulda/rerun_snippet_test.rb
 - test/shoulda/should_test.rb
 - test/shoulda/test_framework_detection_test.rb
 - test/support/current_bundle.rb