rutabaga 2.1.6 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 131a900096212a9e96f19e0d51909e7ba1aea969
-  data.tar.gz: 8183023b1311fe93540e0986d69007a1a29853d3
+SHA256:
+  metadata.gz: 396a9f18753e8f782961dc51ab7921804cc5f7aa860367de27c374a8b1f5cc50
+  data.tar.gz: cc7123622b454d61a9fe058ded68011153f4101ad6d40382e2ab1c254677bcd5
 SHA512:
-  metadata.gz: 69dafa7ad275b5efe944da37db51eae4d4650d1f4b4f03aef59577df8dd2d51a4226818bf3d2592dd6b6563a1f40c821c5faee1fc6c1f4783ce645bc598b67df
-  data.tar.gz: c560410a9e9667c37a71f8e3acc7710d4d468ddbdaea3734f899b13b5b62bbdaceb71168bcbce7124192f1d7fc85670f007f502faab5ea3466bd73d90e8b2e42
+  metadata.gz: 8e0d4ba85c3125c08b13a62a2ef5baaa3ce89f1f3a10eaa19493979d0b7a897af1f39c29b140e9a24c3d913b190a0456047f02a73c71487a6b6b00ea5b30a47d
+  data.tar.gz: 26b1d0ba08c4ae8a75f81b7f19fa332b228f834557a7c6175d6970ceb97de55856df29fa48fdeebbff2dd67b16d388a9973e61ac0e5b21c2feeb09300b52895f

data/.travis.yml

@@ -1,11 +1,19 @@
 language: ruby
 rvm:
-  - 2.3.4
-  - 2.4.1
-  - jruby-9.1.7.0
+  - 2.4
+  - 2.5
+  - 2.6
+  - jruby
 
 gemfile:
   - Gemfile
-  - ./Gemfile.turnip2
+  - ./Gemfile.turnip3
+
+matrix:
+  allow_failures:
+  - rvm: 2.6 # Google protobuf, requirement for turnip 4 not compatible yet
+    gemfile: Gemfile
+  - rvm: jruby # Google protobuf, requirement for turnip 4 not compatible yet
+    gemfile: Gemfile
 
 script: bundle exec rspec spec

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changes
 
+## Version 3.0.0
+
+- Adds Turnip 4 support
+- Removes Turnip 2 support
+- Removes deprecated way of calling features
+
 ## Version 2.1.6
 
 - Support for Turnip 3.0

data/{Gemfile.turnip2 → Gemfile.turnip3}

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 eval_gemfile File.join(File.dirname(__FILE__), "Gemfile")
 
-gem 'turnip', '2.1.1'
+gem 'turnip', '3.1.0'

data/README.md

@@ -199,9 +199,9 @@ Put the following (example in a `Gemfile_for_xxx`) to test other versions of gem
 # Use global Gemfile and customize
 eval(IO.read('Gemfile'), binding)
 
-gem 'turnip', '2.0.0'
+gem 'turnip', '3.1.0'
 ```
 
 ## Copyright
 
-Copyright © 2012-2016 Simply Business. See LICENSE for details.
+Copyright © 2012-2019 Simply Business. See LICENSE for details.

data/examples/test_spec.rb

@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 describe "should find the feature file using the root (and monkey patching the result)" do
-  it "examples/test2.feature" do
-    feature
-  end
+  feature "examples/test2.feature"
 
   step "that :first + :second is calculated" do |first, second|
     @first = first

data/lib/rutabaga.rb

@@ -1,6 +1,5 @@
 require 'rutabaga/version'
 require 'turnip'
-require 'rutabaga/feature'
 require 'rutabaga/example_group/feature'
 require 'rspec/core/example_group_patch'
 require 'rutabaga/util'

data/lib/rutabaga/util.rb

@@ -3,11 +3,15 @@
 # Monkey patch for Turnip to not have to copy loads of code
 module Turnip::RSpec
   def self.rutabaga_run(feature_file, example_group_class)
-    features = Rutabaga::Util.build_features(feature_file)
+    features = Rutabaga::Util.build_scenario_groups(feature_file)
     features.each do |feature|
       instance_eval <<-EOS, feature_file, feature.line
         describe = example_group_class.describe feature.name, feature.metadata_hash.reject { |key, _| key == :type }
-        run_feature(describe, feature, feature_file)
+        if Turnip::VERSION[0].to_i >= 4
+          run_scenario_group(describe, feature, feature_file)
+        else # run against turnip 3
+          run_feature(describe, feature, feature_file)
+        end
       EOS
     end
   end
@@ -44,12 +48,8 @@ module Rutabaga
         raise unless e.message.include?(filename)
       end
 
-      def build_features(feature_file)
-        if Gem::Version.new(Turnip::VERSION) >= Gem::Version.new('3.0.0')
-          [Turnip::Builder.build(feature_file)]
-        else
-          Turnip::Builder.build(feature_file).features
-        end
+      def build_scenario_groups(feature_file)
+        [Turnip::Builder.build(feature_file)]
       end
 
       private
@@ -71,7 +71,6 @@ module Rutabaga
 end
 
 ::RSpec.configure do |c|
-  c.include Rutabaga::Feature
   # Blow away turnip's pattern, and focus just on features directory
   if defined?(Rutabaga::NO_TURNIP)
     c.pattern.gsub!(",**/*.feature", "")

data/lib/rutabaga/version.rb

@@ -1,3 +1,3 @@
 module Rutabaga
-  VERSION = '2.1.6'
+  VERSION = '3.0.0'
 end

data/rutabaga.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.version       = Rutabaga::VERSION
   gem.license       = 'MIT'
 
-  gem.add_runtime_dependency 'turnip', ['>= 2.1.1', '< 4.0']
+  gem.add_runtime_dependency 'turnip', ['>= 3.1.0', '< 5.0']
   gem.add_runtime_dependency 'rspec', ['~> 3.0']
 
   gem.add_development_dependency 'capybara'

data/spec/feature_spec.rb

@@ -30,7 +30,7 @@ describe 'integration', :type => :integration do
     end
 
     it "prints out failures and successes" do
-      expect(@result).to include('19 examples, 4 failures')
+      expect(@result).to include('18 examples, 4 failures')
     end
 
     it "should find features relative to the root" do
@@ -49,10 +49,6 @@ describe 'integration', :type => :integration do
     it "should provide failure messages that allow a specific scenario to be run" do
       expect(@result).to include("rspec ./examples/test_feature_example_group_spec.rb[1:1:1:4:1]")
     end
-
-    it "should have a feature deprecation warning" do
-      expect(@result).to include("Calling `feature` from an `it` block is deprecated.")
-    end
   end
 
   describe 'compatibility' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rutabaga
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 3.0.0
 platform: ruby
 authors:
 - Lukas Oberhuber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-12 00:00:00.000000000 Z
+date: 2019-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: turnip
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 3.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 3.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -83,7 +83,7 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.turnip2
+- Gemfile.turnip3
 - LICENSE
 - README.md
 - Rakefile
@@ -100,7 +100,6 @@ files:
 - lib/rspec/core/example_group_patch.rb
 - lib/rutabaga.rb
 - lib/rutabaga/example_group/feature.rb
-- lib/rutabaga/feature.rb
 - lib/rutabaga/no_turnip.rb
 - lib/rutabaga/turnip.rb
 - lib/rutabaga/util.rb
@@ -133,8 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Calling Turnip feature files from RSpec, which allows encapsulating a feature
@@ -147,4 +145,3 @@ test_files:
 - spec/rspec_formatter/formatter.rb
 - spec/rutabaga/util_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/lib/rutabaga/feature.rb

@@ -1,61 +0,0 @@
-require 'turnip/rspec'
-require 'rspec'
-
-module Rutabaga
-  module Feature
-    def feature(feature_file = nil)
-      RSpec.deprecate(
-        "Calling `feature` from an `it` block",
-        :message => "Calling `feature` from an `it` block " \
-                    "is deprecated.\nYou should now put your steps inside " \
-                    "a `feature` block.\n\n" \
-                    "```\n" \
-                    "feature \"optional feature file location\" do\n" \
-                    "  step \"a step\" do\n" \
-                    "    ...\n" \
-                    "  end\n" \
-                    "end\n" \
-                    "```"
-      )
-
-      feature_file = Util.find_feature(feature_file || RSpec.current_example.description)
-      example_group_class = self.class
-
-      # Hack turnip into the rspec only when needed
-      example_group_class.send(:include, Turnip::RSpec::Execute)
-      example_group_class.send(:include, Turnip::Steps)
-
-      run(feature_file, example_group_class)
-    end
-
-    # Adapted from jnicklas/turnip v2.0.0
-    def run(feature_file, example_group_class)
-      features = Util.build_features(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
-        RSpec.current_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
-  end
-end