minitest-given 3.7.0 → 3.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa21ad961fcb26d8049ba62734d6026114d9f3f4
-  data.tar.gz: 3e082bc1ec7468b205c204384315c7da845fa03c
+  metadata.gz: 39a78e633e738fbce67c2563b5fae535ec81b4f7
+  data.tar.gz: 5b0485aae6e42d5df7e6d3f6306d8f5c3e93700c
 SHA512:
-  metadata.gz: 6819cb252f5bd2a2cefa76e931958f200964db3e799096ed71ee07a5e5eec54e337536de5b4aec86eacdd9cd8cd033d739ab7813daeb83c7e56c2d3591532baa
-  data.tar.gz: bb328c179e705ff0a9f5aa53aee0be38087503cd65ae11a246c6a99bbdf8a2578d538d376a2b327aa653fc5892bc40f217b247da69bc6e0b908b6789c5bd626d
+  metadata.gz: 45d5123c6470195a71154f48dc8226f2f655e69add11c20a5d775d64471c1a268ab619afa632d0e17eef7cdd4841bbd940cab71227c76e373be75f54e7a04fd8
+  data.tar.gz: 569c233f21a5c3a195963f79e95839fad5e8ae98e298770ace4212c188b85dd8b4a70ad22c4dd1f569243b6dd79b59f991bea0cfd7ac49c9cf7cdf981905c38e

data/Gemfile.lock

@@ -2,24 +2,24 @@ GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.2.5)
-    minitest (5.5.0)
+    minitest (5.7.0)
     rake (10.4.2)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.1)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
     sorcerer (1.0.2)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES

data/README.md

@@ -870,6 +870,10 @@ License. See the MIT-LICENSE file in the source distribution.
 
 # History
 
+* Version 3.7.1
+
+  * Mixin Minitest extensions for both ActiveSupport::TestCase (when present) as well as for MiniTest::Spec (see [#8](https://github.com/rspec-given/rspec-given/pulls/8))
+
 * Version 3.7.0
 
   * Add support for Rails tests when using minitest-given (See [#6](https://github.com/rspec-given/rspec-given/pull/6))

data/Rakefile

@@ -62,9 +62,10 @@ end
 EXAMPLES = FileList['examples/**/*_spec.rb', 'examples/use_assertions.rb'].
   exclude('examples/failing/*.rb').
   exclude('examples/minitest/*.rb').
+  exclude('examples/minitest-rails/*.rb').
   exclude('examples/integration/failing/*.rb')
 
-MT_EXAMPLES = FileList['examples/minitest/**/*_spec.rb']
+MT_EXAMPLES = FileList['examples/minitest-rails/**/*_spec.rb', 'examples/minitest/**/*_spec.rb']
 
 unless Given::NATURAL_ASSERTIONS_SUPPORTED
   EXAMPLES.exclude("examples/stack/*.rb")

data/examples/active_support_helper.rb

@@ -0,0 +1,10 @@
+module ActiveSupport
+  class TestCase < Minitest::Test
+    # Add spec DSL
+    extend ::Minitest::Spec::DSL
+
+    register_spec_type(self) do |desc, *addl|
+      addl.include? :model
+    end
+  end
+end

data/examples/example_helper.rb

@@ -5,6 +5,7 @@ if defined?(RSpec)
   require 'spec_helper'
 else
   require 'minitest/autorun'
+  require 'active_support_helper'
   require 'minitest/given'
   require 'minitest_helper'
 end

data/examples/integration/failing_messages_spec.rb

@@ -22,7 +22,16 @@ describe "Failing Messages" do
   context "when referencing undefined methods" do
     Given(:failing_test) { "undefined_method_spec.rb" }
     Then { ios.err == "" }
-    And { ios.out =~ /undefined local variable or method `xyz'/ }
+    And { complains_xyz_is_not_in_scope?(ios.out) }
+
+    def complains_xyz_is_not_in_scope?(out)
+      [
+        # RSpec <3.2's message:
+        "undefined local variable or method `xyz'",
+        # RSpec >3.2's message:
+        "`xyz` is not available from within an example"
+      ].any? { |msg| out.include?(msg) }
+    end
   end
 
   context "when breaking down expressions" do

data/examples/integration/given_spec.rb

@@ -55,8 +55,8 @@ describe "Lazy Givens" do
   end
 
   context "when not called" do
-    Given(:value) { :ok }
-    Then { given_assert_equal :ok, value }
+    Given(:some_value) { :ok }
+    Then { given_assert_equal :ok, some_value }
   end
 end
 

data/examples/minitest-rails/test_case_spec.rb

@@ -0,0 +1,33 @@
+require 'minitest/autorun'
+require 'active_support_helper'
+require 'minitest/given'
+require 'example_helper'
+
+
+describe ActiveSupport::TestCase, :model do
+  Given(:info) { [] }
+  Given { info << "outer1" }
+  Given { info << "outer2" }
+
+  context "using a when without result" do
+    When { info << "when" }
+
+    context "inner with When" do
+      Given { info << "inner1" }
+      Given { info << "inner2" }
+      Then { given_assert_equal ["outer1", "outer2", "inner1", "inner2", "when"], info }
+
+      context "using a nested When" do
+        When { info << "when2" }
+        Then { given_assert_equal ["outer1", "outer2", "inner1", "inner2", "when", "when2"], info}
+      end
+
+      context "using two nested When" do
+        When { info << "when2a" }
+        When { info << "when2b" }
+        Then { given_assert_equal ["outer1", "outer2", "inner1", "inner2", "when", "when2a", "when2b"], info }
+      end
+    end
+  end
+end
+

data/examples/minitest_helper.rb

@@ -35,4 +35,5 @@ module NaturalAssertionControl
 end
 
 Minitest::Spec.send(:include, GivenAssertions)
+Minitest::Test.send(:include, GivenAssertions)
 include NaturalAssertionControl

data/lib/minitest/given.rb

@@ -1,15 +1,2 @@
 require 'minitest/spec'
-
-if defined?(ActiveSupport::TestCase)
-  Minitest::Spec.tap do |original_spec|
-    Minitest.send(:remove_const, :Spec)
-    Minitest::Spec = ActiveSupport::TestCase
-
-    require 'given/minitest/all'
-
-    Minitest.send(:remove_const, :Spec)
-    Minitest::Spec = original_spec
-  end
-else
-  require 'given/minitest/all'
-end
+require 'given/minitest/all'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minitest-given
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.7.1
 platform: ruby
 authors:
 - Jim Weirich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-15 00:00:00.000000000 Z
+date: 2015-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: given_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.7.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -54,6 +54,7 @@ files:
 - TODO
 - doc/article/custom_error_messages.md
 - doc/main.rdoc
+- examples/active_support_helper.rb
 - examples/example_helper.rb
 - examples/failing/natural_failing_spec.rb
 - examples/failing/sample_spec.rb
@@ -69,6 +70,7 @@ files:
 - examples/integration/invariant_spec.rb
 - examples/integration/then_spec.rb
 - examples/loader.rb
+- examples/minitest-rails/test_case_spec.rb
 - examples/minitest/assert_raises_spec.rb
 - examples/minitest_helper.rb
 - examples/other/line_example.rb
@@ -109,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: given
-rubygems_version: 2.4.4
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Given/When/Then Specification Extensions for Minitest::Spec.