shoulda-context 2.0.0.rc2 → 2.0.0.rc3

data/lib/shoulda/context/context.rb

@@ -115,7 +115,12 @@ module Shoulda
 
         test_methods[test_unit_class][test_name.to_s] = true
         file, line_no = should[:block].source_location
-        context = self
+
+        # Ruby doesn't know that we are referring to this variable inside of the
+        # eval, so it will emit a warning that it's "assigned but unused".
+        # However, making a double assignment places `context` on the right hand
+        # side of the assignment, thereby putting it into use.
+        context = context = self
 
         test_unit_class.class_eval <<-end_eval, file, line_no
           define_method test_name do

data/lib/shoulda/context/version.rb

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

data/shoulda-context.gemspec

@@ -23,9 +23,11 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "appraisal"
   s.add_development_dependency "bundler", "~> 1.0"
+  s.add_development_dependency "byebug"
   s.add_development_dependency "m"
   s.add_development_dependency "mocha"
-  s.add_development_dependency "pry-byebug"
+  s.add_development_dependency "pry", "~> 0.12.0"
+  s.add_development_dependency "pry-byebug", "~> 3.6.0"
   s.add_development_dependency "rake"
   s.add_development_dependency "rubocop", "0.64.0"
   s.add_development_dependency "snowglobe", ">= 0.3.0"

data/test/shoulda/rerun_snippet_test.rb

@@ -19,9 +19,16 @@ class RerunSnippetTest < PARENT_TEST_CASE
 
         command_runner = app.run_n_unit_test_suite
 
+        expected_file_path_with_line_number =
+          if rails_version >= 6
+            "rails test test/models/failing_test.rb:5"
+          else
+            "bin/rails test test/models/failing_test.rb:5"
+          end
+
         assert_includes(
           command_runner.output,
-          "bin/rails test test/models/failing_test.rb:5"
+          expected_file_path_with_line_number
         )
       end
     end
@@ -30,4 +37,9 @@ class RerunSnippetTest < PARENT_TEST_CASE
   def app
     @_app ||= RailsApplicationWithShouldaContext.new
   end
+
+  def rails_version
+    # TODO: Update snowglobe so that we don't have to do this
+    app.send(:bundle).version_of("rails")
+  end
 end

data/test/test_helper.rb

@@ -4,6 +4,9 @@ Tests::CurrentBundle.instance.assert_appraisal!
 
 #---
 
+require "pry-byebug"
+require "warnings_logger"
+
 TEST_FRAMEWORK = ENV.fetch("TEST_FRAMEWORK", "minitest")
 
 if TEST_FRAMEWORK == "test_unit"
@@ -14,8 +17,6 @@ else
   require "mocha/minitest"
 end
 
-require "pry-byebug"
-
 PROJECT_DIR = File.expand_path("../..", __FILE__)
 PARENT_TEST_CASE =
   if TEST_FRAMEWORK == "test_unit"
@@ -30,6 +31,13 @@ ASSERTION_CLASS =
     Minitest::Assertion
   end
 
+WarningsLogger::Spy.call(
+  project_name: "shoulda-context",
+  project_directory: Pathname.new("../..").expand_path(__FILE__)
+)
+
+require_relative "support/rails_application_with_shoulda_context"
+
 require_relative "../lib/shoulda/context"
 
 Shoulda.autoload_macros(
@@ -37,4 +45,4 @@ Shoulda.autoload_macros(
   File.join("vendor", "{plugins,gems}", "*")
 )
 
-require_relative "support/rails_application_with_shoulda_context"
+$VERBOSE = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoulda-context
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc2
+  version: 2.0.0.rc3
 platform: ruby
 authors:
 - thoughtbot, inc.
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-21 00:00:00.000000000 Z
+date: 2020-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: m
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -58,7 +58,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: m
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -72,7 +72,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -85,6 +85,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.0
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -162,6 +190,8 @@ files:
 - gemfiles/rails_5_1.gemfile.lock
 - gemfiles/rails_5_2.gemfile
 - gemfiles/rails_5_2.gemfile.lock
+- gemfiles/rails_6_0.gemfile
+- gemfiles/rails_6_0.gemfile.lock
 - lib/shoulda-context.rb
 - lib/shoulda/context.rb
 - lib/shoulda/context/assertions.rb
@@ -215,8 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Context framework extracted from Shoulda