rutabaga 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d96fde16c64a7ea6f2138c7378c074bcbab8531
-  data.tar.gz: 993021b4c36832315de1e8b8fece7c7743e7ca5d
+  metadata.gz: e58e8070c7453412e6eafb4f217f074332f4dd7a
+  data.tar.gz: 8b1d97c2f13b45a8243ca2cb26b70b3128e8b769
 SHA512:
-  metadata.gz: 5b423b019a5bb8a5cc965d6b9c1af1b32a01b1a0acfa426721b563aeaed764e0a2d3d3d2c4ce87258fc2ba5e721b5b99ffaff511a0d76747ad6cf4a96644b35d
-  data.tar.gz: 48ab6716ca80419dcb4ab238d42a2792cf34600d6df993cf97ba08410a6ebc7ae63e1eba79cbd9cebd7f81f596e364d0cc105ce6ba398cb08e8ee0ccde2344fa
+  metadata.gz: 9cb1eb1ac790e09087282c9fffedfd0ee043cbd4176db57c6cafac8a30413f0399a880e49b1955885453ca07e301dcff975c872d47cf0c607ae4d1f6e97a4fc7
+  data.tar.gz: 0e970b4afb65f580d050f4e246bf8f715ce3915b4ca339ab2e8efb579cf4dab5410ac12fa3c002024a38e98d8c02553f7e7cfc6e2890bf843d7d0425974bdc32

data/.travis.yml

@@ -1,36 +1,29 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1.7
+  - 2.2.3
   - jruby-19mode
 
 gemfile:
   - Gemfile
-  - Gemfile_turnip_1_1_0_rspec_2
-  - Gemfile_turnip_1_1_0
-  - Gemfile_rspec_2_7
+  - Gemfile_turnip_1_2_4
+  - Gemfile_rspec_2_14
 
 # Run the full suite against ruby 2.0.0 only
 matrix:
   exclude:
-    - rvm: 1.9.3
-      gemfile: Gemfile_turnip_1_1_0_rspec_2
-    - rvm: 2.1.0
-      gemfile: Gemfile_turnip_1_1_0_rspec_2
+    - rvm: 2.0.0
+      gemfile: Gemfile_turnip_1_2_4
+    - rvm: 2.1.7
+      gemfile: Gemfile_turnip_1_2_4
     - rvm: jruby-19mode
-      gemfile: Gemfile_turnip_1_1_0_rspec_2
-    - rvm: 1.9.3
-      gemfile: Gemfile_turnip_1_1_0
-    - rvm: 2.1.0
-      gemfile: Gemfile_turnip_1_1_0
+      gemfile: Gemfile_turnip_1_2_4
+    - rvm: 2.0.0
+      gemfile: Gemfile_rspec_2_14
+    - rvm: 2.1.7
+      gemfile: Gemfile_rspec_2_14
     - rvm: jruby-19mode
-      gemfile: Gemfile_turnip_1_1_0
-    - rvm: 1.9.3
-      gemfile: Gemfile_rspec_2_7
-    - rvm: 2.1.0
-      gemfile: Gemfile_rspec_2_7
-    - rvm: jruby-19mode
-      gemfile: Gemfile_rspec_2_7
+      gemfile: Gemfile_rspec_2_14
 
 script: bundle exec rspec spec

data/Gemfile

@@ -2,3 +2,4 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rutabaga.gemspec
 gemspec
+

data/{Gemfile_rspec_2_7 → Gemfile_rspec_2_14}

@@ -2,4 +2,4 @@
 eval(IO.read('Gemfile'), binding)
 
 # Test lowest supported version of rspec
-gem 'rspec', '~>2.7.0'
+gem 'rspec', '~>2.14'

data/{Gemfile_turnip_1_1_0 → Gemfile_turnip_1_2_4}

@@ -1,4 +1,4 @@
 # Use global Gemfile and customize
 eval(IO.read('Gemfile'), binding)
 
-gem 'turnip', '1.1.0'
+gem 'turnip', '1.2.4'

data/README.md

@@ -145,6 +145,10 @@ My goal is to test just the business rule, in Turnip, and not the login, the htm
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
+## For maintainers
+
+Use `gem-release` to maintain versions https://github.com/svenfuchs/gem-release.
+
 ## Copyright
 
 Copyright © 2012 Simply Business. See LICENSE for details.

data/examples/test_background.feature

@@ -0,0 +1,8 @@
+Feature: Test that background steps are properly called
+
+Background:
+  Given we add 10
+
+Scenario: ensures the feature is called
+Given that 2 * 4 is calculated
+Then my result is 18

data/examples/test_spec.rb

@@ -11,7 +11,7 @@ describe "test" do
   end
 
   step "my result is :result" do |result|
-    result.to_i.should == @first.to_i + @second.to_i
+    expect(@first.to_i + @second.to_i).to eq(result.to_i)
   end
 end
 
@@ -26,7 +26,7 @@ describe "should find the feature file using the root (and monkey patching the r
   end
 
   step "my result is :result" do |result|
-    result.to_i.should == @first.to_i + @second.to_i - 1
+    expect(@first.to_i + @second.to_i - 1).to eq(result.to_i)
   end
 
 end
@@ -42,7 +42,7 @@ describe "causes a failing test" do
   end
 
   step "my result is :result" do |result|
-    result.to_i.should == @first.to_i + @second.to_i
+    expect(@first.to_i + @second.to_i).to eq(result.to_i)
   end
 
 end
@@ -58,7 +58,27 @@ describe "finds a feature file given as parameter to the 'feature' method" do
   end
 
   step "my result is :result" do |result|
-    result.to_i.should == @first.to_i * @second.to_i
+    expect(@first.to_i * @second.to_i).to eq(result.to_i)
   end
 
 end
+
+describe "backgrounds are properly called" do
+  it "implements the named feature" do
+    feature "examples/test_background.feature"
+  end
+
+  step "we add :initial" do |initial|
+    @initial = 10
+  end
+
+  step "that :first * :second is calculated" do |first, second|
+    @first = first
+    @second = second
+  end
+
+  step "my result is :result" do |result|
+    expect(@initial.to_i + @first.to_i * @second.to_i).to eq(result.to_i)
+  end
+
+end

data/lib/rutabaga/feature.rb

@@ -1,37 +1,17 @@
 require 'turnip/rspec'
+require 'rspec'
 
 module Rutabaga
   module Feature
     def feature(feature_file = find_feature)
 
-      rspec_class = self.class
+      example_group_class = self.class
 
       # Hack turnip into the rspec only when needed
-      rspec_class.send(:include, Turnip::RSpec::Execute)
-      rspec_class.send(:include, Turnip::Steps)
+      example_group_class.send(:include, Turnip::RSpec::Execute)
+      example_group_class.send(:include, Turnip::Steps)
 
-      builder = Turnip::Builder.build(feature_file)
-      builder.features.each do |feature|
-        rspec_class.describe(feature.name, feature.metadata_hash) do
-          rspec_class.before do
-            # This is kind of a hack, but it will make RSpec throw way nicer exceptions
-            get_example.metadata[:file_path] = feature_file
-
-            feature.backgrounds.map(&:steps).flatten.each do |step|
-              run_step(feature_file, step)
-            end
-          end
-          feature.scenarios.each do |scenario|
-            rspec_class.describe(scenario.name, scenario.metadata_hash) do
-              it scenario.steps.map(&:description).join(' -> ') do
-                scenario.steps.each do |step|
-                  run_step(feature_file, step)
-                end
-              end
-            end
-          end
-        end
-      end
+      run(feature_file, example_group_class)
     end
 
     def find_feature
@@ -47,6 +27,35 @@ module Rutabaga
 
     private
 
+    # Adapted from jnicklas/turnip v1.3.1
+    def run(feature_file, example_group_class)
+      Turnip::Builder.build(feature_file).features.each do |feature|
+        describe = example_group_class.describe feature.name, feature.metadata_hash
+        run_feature(describe, feature, feature_file, example_group_class)
+      end
+    end
+
+    def run_feature(describe, feature, filename, example_group_class)
+      example_group_class.before do
+        # This is kind of a hack, but it will make RSpec throw way nicer exceptions
+        get_example.metadata[:file_path] = filename
+
+        feature.backgrounds.map(&:steps).flatten.each do |step|
+          run_step(filename, step)
+        end
+      end
+
+      feature.scenarios.each do |scenario|
+        example_group_class.describe scenario.name, scenario.metadata_hash do
+          it(scenario.steps.map(&:to_s).join(' -> ')) do
+            scenario.steps.each do |step|
+              run_step(filename, step)
+            end
+          end
+        end
+      end
+    end
+
     # For compatibility with rspec 2 and rspec 3. RSpec.current_example was added late in
     # the rspec 2 cycle.
     def get_example

data/lib/rutabaga/version.rb

@@ -1,3 +1,3 @@
 module Rutabaga
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/rutabaga.gemspec

@@ -16,5 +16,6 @@ Gem::Specification.new do |gem|
   gem.version       = Rutabaga::VERSION
   gem.license       = 'MIT'
 
-  gem.add_runtime_dependency 'turnip', ['>= 1.1.0', '<2.0']    
+  gem.add_runtime_dependency 'turnip', ['>= 1.1.0', '<2.0']
+  gem.add_development_dependency "pry", '~> 0'
 end

data/spec/feature_spec.rb

@@ -6,31 +6,31 @@ describe 'integration', :type => :integration do
   end
 
   it "shows the correct description" do
-    @result.should include('ensures the feature is called')
-    @result.should include('that 2 + 2 is calculated')
-    @result.should include('my result is 4')
+    expect(@result).to include('ensures the feature is called')
+    expect(@result).to include('that 2 + 2 is calculated')
+    expect(@result).to include('my result is 4')
   end
 
   it "should not show any pending steps" do
-    @result.should_not include('PENDING')
-    @result.should_not include('No such step')
+    expect(@result).not_to include('PENDING')
+    expect(@result).not_to include('No such step')
   end
 
   it "prints out failures and successes" do
-    @result.should include('8 examples, 1 failure')
+    expect(@result).to include('10 examples, 1 failure')
   end
 
   it "should find features relative to the root" do
-    @result.should_not include('Feature file not found')
+    expect(@result).not_to include('Feature file not found')
   end
 
   it "finds the .feature file given as parameter to the 'feature' method" do
-    @result.should include('that 2 * 4 is calculated')
-    @result.should include('my result is 8')
+    expect(@result).to include('that 2 * 4 is calculated')
+    expect(@result).to include('my result is 8')
   end
 
   it "should scope steps to describe blocks" do
-    @result.should_not include('Turnip::Ambiguous')
+    expect(@result).not_to include('Turnip::Ambiguous')
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rutabaga
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Lukas Oberhuber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
+date: 2015-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: turnip
@@ -30,6 +30,20 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Allows using feature from within RSpec and is built on top of Turnip
 email:
 - lukas.oberhuber@simplybusiness.co.uk
@@ -40,9 +54,8 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
-- Gemfile_rspec_2_7
-- Gemfile_turnip_1_1_0
-- Gemfile_turnip_1_1_0_rspec_2
+- Gemfile_rspec_2_14
+- Gemfile_turnip_1_2_4
 - LICENSE
 - README.md
 - Rakefile
@@ -50,6 +63,7 @@ files:
 - examples/test.feature
 - examples/test2.feature
 - examples/test3.feature
+- examples/test_background.feature
 - examples/test_spec.rb
 - lib/rutabaga.rb
 - lib/rutabaga/feature.rb
@@ -77,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Calling Turnip feature files from RSpec, which allows encapsulating a feature
@@ -85,3 +99,4 @@ summary: Calling Turnip feature files from RSpec, which allows encapsulating a f
 test_files:
 - spec/feature_spec.rb
 - spec/spec_helper.rb
+has_rdoc: 

data/Gemfile_turnip_1_1_0_rspec_2

@@ -1,6 +0,0 @@
-# Use global Gemfile and customize
-eval(IO.read('Gemfile'), binding)
-
-# Avoid deprecation warnings for rspec 2.99
-gem 'rspec', '~>2.7', '<2.99'
-gem 'turnip', '1.1.0'