Keep rspec-given alive!

.gitignore

@@ -7,4 +7,5 @@ extra
 html
 pkg
 xxx-*
-.bundle
+.bundle
+.ruby-version

.travis.yml

@@ -1,8 +1,11 @@
 language: ruby
+sudo: false
 bundler_args: --without dev
 env:
-  - CI=true
+  - RSPEC_VERSION="2.14.0"
+  - RSPEC_VERSION=">=3.1.0"
 rvm:
   - jruby
+  - rbx-2
   - 1.9.3
-  - 2.0.0
+  - 2.3.0

Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
 gem 'rake'
-gem 'rspec',    '>= 2.12'
+gem 'rspec',    ENV['RSPEC_VERSION'] || '>= 2.14.0'
 gem 'minitest', '>= 4.3'
 gem 'sorcerer', '>= 0.3.7'

README.md

@@ -2,9 +2,9 @@
 
 | Master |
 | :----: |
-| [![Master Build Status](https://secure.travis-ci.org/jimweirich/rspec-given.png?branch=master)](https://travis-ci.org/jimweirich/rspec-given) |
+| [![Master Build Status](https://secure.travis-ci.org/rspec-given/rspec-given.png?branch=master)](https://travis-ci.org/rspec-given/rspec-given) |
 
-Covering rspec-given, minitest-given, and given-core, version 3.5.3.
+Covering rspec-given, minitest-given, and given-core, version 3.8.2.
 
 rspec-given and minitest-given are extensions to your favorite testing
 framework to allow Given/When/Then notation when writing specs.
@@ -27,7 +27,7 @@ The rspec-given gem is the original given/when/then extension for
 RSpec. It now depends on a given_core gem for the basic functionality
 and then adds the RSpec specific code.
 
-* rspec-given now requires RSpec version 2.12 or better.
+* rspec-given now requires RSpec version 2.14.0 or better.
 
 ### Minitest/Given
 
@@ -53,7 +53,7 @@ things to watch out for:
 
 * Only one before block is allowed in any given Minitest::Spec
   describe block. This doesn't effect the number of Givens you are
-  allowed to use, but it may surprise if you are use to RSpec.
+  allowed to use, but it may surprise you if you are used to RSpec.
 
 ### Auto Selecting
 
@@ -72,9 +72,9 @@ end
 ```
 
 See
-[stack_spec.rb](https://github.com/jimweirich/rspec-given/blob/minispec/examples/stack/stack_spec.rb)
+[stack_spec.rb](https://github.com/rspec-given/rspec-given/blob/minispec/examples/stack/stack_spec.rb)
 and
-[example_helper.rb](https://github.com/jimweirich/rspec-given/blob/minispec/examples/example_helper.rb)
+[example_helper.rb](https://github.com/rspec-given/rspec-given/blob/minispec/examples/example_helper.rb)
 
 ## Installation
 
@@ -347,6 +347,17 @@ should use an empty _Then_ clause, like this:
     Then { }
 ```
 
+A _Then_ clause accepts arguments for user-defined RSpec metadata:
+
+```ruby
+    Then(:zippy, :foo => 17) { ... }
+```
+
+Metadata on _Then_ clauses is an RSpec-only feature. You can read more about
+metadata [in RSpec's
+documentation](https://www.relishapp.com/rspec/rspec-core/docs/metadata/user-defined-metadata).
+
+
 #### Then examples:
 
 ```ruby
@@ -760,12 +771,13 @@ _expect_.
 
 Given uses the Ripper library to parse the source lines and failing
 conditions to find all the sub-expression values upon a failure.
-Currently Ripper is not supported on Rubinius and versions of JRuby
-prior to JRuby-1.7.5.
 
-If you want to use a version of Ruby that does not support Ripper,
-then natural assertions will disabled. In addition, you should also
-disable source caching in the configuration (see the configuration
+If Ripper is not available, like on Rubinius and versions of JRuby prior to
+JRuby-1.7.5, detailed explanations of failures for natural assertions won't be
+available.  Natural assertions will still work, though.
+
+If you want to use a version of Ruby that does not support Ripper, then you
+should disable source caching in the configuration (see the configuration
 section below).
 
 ### Non-Spec Assertions
@@ -870,6 +882,30 @@ License. See the MIT-LICENSE file in the source distribution.
 
 # History
 
+* Version 3.8.1
+
+  * Fix deprecation warnings fro Ruby 2.6 & up
+
+* Version 3.8.0
+
+  * RSpec metadata can now be added to _Then_ clauses (see [#11](https://github.com/rspec-given/rspec-given/pull/11))
+  * Natural assertions now run on Rubinius and older versions of JRuby (see [#15](https://github.com/rspec-given/rspec-given/issues/15))
+    * WARNING: On these platforms, detailed failure explanations aren't available and source code snippets of Then clauses will only show the first line.
+    * WARNING: Assertions of void statements (e.g. `Then { }`) will fail only under runtimes lacking Ripper support
+  * `Given.ok_to_use_natural_assertions` was removed; the method was never properly supported as public, but it was publicly reachable
+
+* 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))
+
+* Version 3.6.0
+
+  * Various fixes for RSpec 3.0 (See [#1](https://github.com/rspec-given/rspec-given/pull/1))
+
 * Version 3.5.4
 
   * Accommodate the name change on RSpec's Pending exception.
@@ -948,7 +984,7 @@ License. See the MIT-LICENSE file in the source distribution.
 
 # Links
 
-* Github: [https://github.com/jimweirich/rspec-given](https://github.com/jimweirich/rspec-given)
-* Clone URL: git://github.com/jimweirich/rspec-given.git
-* Bug/Issue Reporting: [https://github.com/jimweirich/rspec-given/issues](https://github.com/jimweirich/rspec-given/issues)
-* Continuous Integration: [http://travis-ci.org/#!/jimweirich/rspec-given](http://travis-ci.org/#!/jimweirich/rspec-given)
+* Github: [https://github.com/rspec-given/rspec-given](https://github.com/rspec-given/rspec-given)
+* Clone URL: git://github.com/rspec-given/rspec-given.git
+* Bug/Issue Reporting: [https://github.com/rspec-given/rspec-given/issues](https://github.com/rspec-given/rspec-given/issues)
+* Continuous Integration: [http://travis-ci.org/#!/rspec-given/rspec-given](http://travis-ci.org/#!/rspec-given/rspec-given)

Rakefile

@@ -62,13 +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']
-
-unless Given::NATURAL_ASSERTIONS_SUPPORTED
-  EXAMPLES.exclude("examples/stack/*.rb")
-end
+MT_EXAMPLES = FileList['examples/minitest-rails/**/*_spec.rb', 'examples/minitest/**/*_spec.rb']
 
 FAILING_EXAMPLES = FileList['examples/failing/**/*_spec.rb']
 

doc/main.rdoc

@@ -4,4 +4,4 @@ rspec-given is an RSpec extension to allow Given/When/Then notation in
 RSpec specifications.  It is a natural extension of the experimental
 work done on the Given framework.
 
-For more information see http://github.com/jimweirich/rspec-given
+For more information see http://github.com/rspec-given/rspec-given

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

examples/example_helper.rb

@@ -5,6 +5,7 @@
   require 'spec_helper'
 else
   require 'minitest/autorun'
+  require 'active_support_helper'
   require 'minitest/given'
   require 'minitest_helper'
 end

examples/integration/failing_messages_spec.rb

@@ -2,30 +2,44 @@
 require 'open3'
 
 describe "Failing Messages" do
-  use_natural_assertions_if_supported
-
   IOS = Struct.new(:out, :err)
 
   def run_spec(filename)
-    inn, out, err, wait = Open3.popen3("rspec", "examples/integration/failing/#{filename}")
+    _inn, out, err, _wait = Open3.popen3(
+      "rspec", "examples/integration/failing/#{filename}",
+      # Ensure our `project_source_dirs` config is set when we shell out to RSpec.
+      "-rexample_helper"
+    )
     IOS.new(out.read, err.read)
   end
 
   When(:ios) { run_spec(failing_test) }
 
   context "when referencing constants from nested modules" do
+    skip_natural_assertions_if_not_supported
     Given(:failing_test) { "module_nesting_spec.rb" }
     Then { ios.err == "" }
     And { ios.out !~ /uninitialized constant RSpec::Given::InstanceExtensions::X/ }
   end
 
   context "when referencing undefined methods" do
+    skip_natural_assertions_if_not_supported
     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
+    skip_natural_assertions_if_not_supported
     Given(:failing_test) { "eval_subexpression_spec.rb" }
     Then { ios.err == "" }
     And  { ios.out =~ /false *<- array\[index\]\.upcase == value$/ }
@@ -42,8 +56,9 @@ def run_spec(filename)
   end
 
   context "with an oddly formatted then" do
+    skip_natural_assertions_if_not_supported
     Given(:failing_test) { "oddly_formatted_then.rb" }
-    Then { ios.out =~ /Failure\/Error: Then \{ result == \['a',$/ }
+    Then { ios.out =~ /Failure\/Error:\s*Then \{ result == \['a',$/ }
     And  { ios.out =~ /expected: "anything"/ }
     And  { ios.out =~ /to equal: \["a", "a"\]/ }
   end

examples/integration/given_spec.rb

@@ -55,8 +55,8 @@
   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
 

examples/integration/then_spec.rb

@@ -11,11 +11,10 @@ def to_bool
 
 describe "Then" do
   context "empty thens with natural assertions" do
-    use_natural_assertions_if_supported
+    skip_natural_assertions_if_not_supported #<--we can't detect void statements
     Then { }
   end
   context "thens to_bool/true will pass" do
-    use_natural_assertions_if_supported
     Then { ToBool.new(true) }
   end
 end

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
+

examples/minitest_helper.rb

@@ -1,4 +1,3 @@
-
 module GivenAssertions
   def given_assert(cond)
     assert cond
@@ -23,16 +22,13 @@ def given_assert_raises(error, pattern=//, &block)
 end
 
 module NaturalAssertionControl
-  def use_natural_assertions_if_supported(enabled=true)
-    if enabled && ! Given::NATURAL_ASSERTIONS_SUPPORTED
-      Given {
-        skip "Natural assertions are not supported in JRuby"
-      }
-    else
-      use_natural_assertions(enabled)
+  def skip_natural_assertions_if_not_supported
+    if !Given::NATURAL_ASSERTIONS_SUPPORTED
+      Given { skip "This test requires a Ruby runtime with full natural assertions support." }
     end
   end
 end
 
 Minitest::Spec.send(:include, GivenAssertions)
+Minitest::Test.send(:include, GivenAssertions)
 include NaturalAssertionControl