cucumber 2.0.0.beta.5 → 2.0.0.rc.1

data/spec/cucumber/formatter/pretty_spec.rb

@@ -534,7 +534,6 @@ OUTPUT
 
       context "In --expand mode" do
         let(:runtime)   { Runtime.new({:expand => true})}
-        let(:mappings)  { Mappings.new(runtime) }
         before(:each) do
           Cucumber::Term::ANSIColor.coloring = false
           @out = StringIO.new
@@ -624,7 +623,6 @@ OUTPUT
 
       context "In --expand mode with --source as an option" do
         let(:runtime)   { Runtime.new({:expand => true})}
-        let(:mappings)  { Mappings.new(runtime) }
         before(:each) do
           Cucumber::Term::ANSIColor.coloring = false
           @out = StringIO.new

data/spec/cucumber/formatter/rerun_spec.rb

@@ -1,6 +1,7 @@
 require 'cucumber/formatter/rerun'
 require 'cucumber/core'
 require 'cucumber/core/gherkin/writer'
+require 'cucumber/core/filter'
 
 module Cucumber::Formatter
   describe Rerun do
@@ -9,17 +10,20 @@ module Cucumber::Formatter
 
     # after_test_case
     context 'when 2 scenarios fail in the same file' do
-      class StepTestMappings
-        Failure = Class.new(StandardError)
-
-        def test_case(test_case, mapper)
-          self
-        end
+      class WithSteps < Cucumber::Core::Filter.new
+        def test_case(test_case)
+          test_steps = test_case.test_steps.map do |step|
+            case step.name
+            when /fail/
+              step.with_action { raise Failure }
+            when /pass/
+              step.with_action {}
+            else
+              step
+            end
+          end
 
-        def test_step(step, mapper)
-          mapper.map { raise Failure } if step.name =~ /fail/
-          mapper.map {}                if step.name =~ /pass/
-          self
+          test_case.with_steps(test_steps).describe_to(receiver)
         end
       end
 
@@ -41,9 +45,8 @@ module Cucumber::Formatter
         end
         io = StringIO.new
         report = Rerun.new(double, io, double)
-        mappings = StepTestMappings.new
 
-        execute [gherkin], mappings, report
+        execute [gherkin], report, [WithSteps.new]
 
         expect( io.string ).to eq 'foo.feature:3:6'
       end
@@ -77,9 +80,8 @@ module Cucumber::Formatter
 
         io = StringIO.new
         report = Rerun.new(double, io, double)
-        mappings = StepTestMappings.new
 
-        execute [foo, bar], mappings, report
+        execute [foo, bar], report, [WithSteps.new]
 
         expect(io.string).to eq 'foo.feature:3:6 bar.feature:3'
       end
@@ -97,9 +99,8 @@ module Cucumber::Formatter
 
         io = StringIO.new
         report = Rerun.new(double, io, double)
-        mappings = StepTestMappings.new
 
-        execute [gherkin], mappings, report
+        execute [gherkin], report, [WithSteps.new]
       end
     end
   end

data/spec/cucumber/formatter/spec_helper.rb

@@ -20,12 +20,17 @@ module Cucumber
       def run_defined_feature
         define_steps
         runtime.visitor = report
-        execute [gherkin_doc], mappings, report
-      end
 
-      require 'cucumber/mappings'
-      def mappings
-        @mappings ||= Mappings.new
+        receiver = Test::Runner.new(report)
+        filters = [
+          Filters::ActivateSteps.new(runtime.support_code),
+          Filters::ApplyAfterStepHooks.new(runtime.support_code),
+          Filters::ApplyBeforeHooks.new(runtime.support_code),
+          Filters::ApplyAfterHooks.new(runtime.support_code),
+          Filters::ApplyAroundHooks.new(runtime.support_code),
+          Filters::PrepareWorld.new(runtime)
+        ]
+        compile [gherkin_doc], receiver, filters
       end
 
       require 'cucumber/formatter/legacy_api/adapter'
@@ -47,7 +52,7 @@ module Cucumber
       end
 
       def runtime
-        mappings.runtime
+        @runtime ||= Runtime.new
       end
 
       def define_steps

data/spec/cucumber/hooks_spec.rb

@@ -0,0 +1,30 @@
+require 'cucumber/hooks'
+module Cucumber::Hooks
+  shared_examples_for 'a source node' do
+    it "responds to name" do
+      expect( subject.name ).to be_a(String)
+    end
+
+    it "responds to location" do
+      expect( subject.location ).to eq(location)
+    end
+
+    it "responds to match_locations?" do
+      expect( subject.match_locations? [location] ).to be_truthy
+      expect( subject.match_locations? [] ).to be_falsey
+    end
+  end
+
+  require 'cucumber/core/ast/location'
+  describe BeforeHook do
+    subject { BeforeHook.new(location) }
+    let(:location) { Cucumber::Core::Ast::Location.new('hooks.rb', 1) }
+    it_behaves_like 'a source node'
+  end
+
+  describe AfterHook do
+    subject { AfterHook.new(location) }
+    let(:location) { Cucumber::Core::Ast::Location.new('hooks.rb', 1) }
+    it_behaves_like 'a source node'
+  end
+end

data/spec/cucumber/rb_support/rb_step_definition_spec.rb

@@ -18,7 +18,11 @@ module Cucumber
       end
 
       def run_step(text)
-        support_code.step_match(text).invoke(MultilineArgument::None.new)
+        step_match(text).invoke(MultilineArgument::None.new)
+      end
+
+      def step_match(text)
+        support_code.step_match(text)
       end
 
       it "allows calling of other steps" do
@@ -111,14 +115,17 @@ module Cucumber
         }).to raise_error(Cucumber::ArityMismatchError)
       end
 
-      it "does not allow modification of args since it messes up pretty formatting" do
+      it "does not modify the step_match arg when arg is modified in a step" do
         dsl.Given(/My car is (.*)/) do |colour|
           colour << "xxx"
         end
 
+        step_name = "My car is white"
+        step_args = step_match(step_name).args
+
         expect(-> {
-          run_step "My car is white"
-        }).to raise_error(RuntimeError, /can't modify frozen String/i)
+          run_step step_name
+        }).not_to change{ step_args.first }
       end
 
       it "allows puts" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cucumber
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.5
+  version: 2.0.0.rc.1
 platform: ruby
 authors:
 - Aslak Hellesøy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.4
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.4
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -645,13 +645,6 @@ files:
 - gem_tasks/sass.rake
 - gem_tasks/stats
 - gem_tasks/versions.txt
-- gem_tasks/yard.rake
-- gem_tasks/yard/default/layout/html/bubble_32x32.png
-- gem_tasks/yard/default/layout/html/footer.erb
-- gem_tasks/yard/default/layout/html/index.erb
-- gem_tasks/yard/default/layout/html/layout.erb
-- gem_tasks/yard/default/layout/html/logo.erb
-- gem_tasks/yard/default/layout/html/setup.rb
 - lib/autotest/cucumber.rb
 - lib/autotest/cucumber_mixin.rb
 - lib/autotest/cucumber_rails.rb
@@ -662,6 +655,7 @@ files:
 - lib/autotest/discover.rb
 - lib/cucumber.rb
 - lib/cucumber/ast.rb
+- lib/cucumber/ast/facade.rb
 - lib/cucumber/cli/configuration.rb
 - lib/cucumber/cli/main.rb
 - lib/cucumber/cli/options.rb
@@ -673,7 +667,14 @@ files:
 - lib/cucumber/core_ext/string.rb
 - lib/cucumber/errors.rb
 - lib/cucumber/file_specs.rb
+- lib/cucumber/filters.rb
+- lib/cucumber/filters/activate_steps.rb
+- lib/cucumber/filters/apply_after_hooks.rb
+- lib/cucumber/filters/apply_after_step_hooks.rb
+- lib/cucumber/filters/apply_around_hooks.rb
+- lib/cucumber/filters/apply_before_hooks.rb
 - lib/cucumber/filters/gated_receiver.rb
+- lib/cucumber/filters/prepare_world.rb
 - lib/cucumber/filters/quit.rb
 - lib/cucumber/filters/randomizer.rb
 - lib/cucumber/filters/tag_limits.rb
@@ -708,10 +709,10 @@ files:
 - lib/cucumber/formatter/summary.rb
 - lib/cucumber/formatter/unicode.rb
 - lib/cucumber/formatter/usage.rb
+- lib/cucumber/hooks.rb
 - lib/cucumber/language_support.rb
 - lib/cucumber/language_support/language_methods.rb
 - lib/cucumber/load_path.rb
-- lib/cucumber/mappings.rb
 - lib/cucumber/multiline_argument.rb
 - lib/cucumber/multiline_argument/data_table.rb
 - lib/cucumber/multiline_argument/doc_string.rb
@@ -728,7 +729,10 @@ files:
 - lib/cucumber/rspec/disable_option_parser.rb
 - lib/cucumber/rspec/doubles.rb
 - lib/cucumber/runtime.rb
+- lib/cucumber/runtime/after_hooks.rb
+- lib/cucumber/runtime/before_hooks.rb
 - lib/cucumber/runtime/for_programming_languages.rb
+- lib/cucumber/runtime/step_hooks.rb
 - lib/cucumber/runtime/support_code.rb
 - lib/cucumber/runtime/user_interface.rb
 - lib/cucumber/step_definition_light.rb
@@ -753,6 +757,7 @@ files:
 - spec/cucumber/constantize_spec.rb
 - spec/cucumber/core_ext/proc_spec.rb
 - spec/cucumber/file_specs_spec.rb
+- spec/cucumber/filters/activate_steps_spec.rb
 - spec/cucumber/filters/gated_receiver_spec.rb
 - spec/cucumber/filters/tag_limits/test_case_index_spec.rb
 - spec/cucumber/filters/tag_limits/verifier_spec.rb
@@ -768,7 +773,7 @@ files:
 - spec/cucumber/formatter/progress_spec.rb
 - spec/cucumber/formatter/rerun_spec.rb
 - spec/cucumber/formatter/spec_helper.rb
-- spec/cucumber/mappings_spec.rb
+- spec/cucumber/hooks_spec.rb
 - spec/cucumber/multiline_argument/data_table_spec.rb
 - spec/cucumber/rake/forked_spec.rb
 - spec/cucumber/rb_support/rb_language_spec.rb
@@ -810,10 +815,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: cucumber-2.0.0.beta.5
+summary: cucumber-2.0.0.rc.1
 test_files:
 - features/docs/api/list_step_defs_as_json.feature
 - features/docs/api/run_cli_main_with_existing_runtime.feature
@@ -900,6 +905,7 @@ test_files:
 - spec/cucumber/constantize_spec.rb
 - spec/cucumber/core_ext/proc_spec.rb
 - spec/cucumber/file_specs_spec.rb
+- spec/cucumber/filters/activate_steps_spec.rb
 - spec/cucumber/filters/gated_receiver_spec.rb
 - spec/cucumber/filters/tag_limits/test_case_index_spec.rb
 - spec/cucumber/filters/tag_limits/verifier_spec.rb
@@ -915,7 +921,7 @@ test_files:
 - spec/cucumber/formatter/progress_spec.rb
 - spec/cucumber/formatter/rerun_spec.rb
 - spec/cucumber/formatter/spec_helper.rb
-- spec/cucumber/mappings_spec.rb
+- spec/cucumber/hooks_spec.rb
 - spec/cucumber/multiline_argument/data_table_spec.rb
 - spec/cucumber/rake/forked_spec.rb
 - spec/cucumber/rb_support/rb_language_spec.rb

data/gem_tasks/yard.rake

@@ -1,43 +0,0 @@
-require 'yard'
-require 'yard/rake/yardoc_task'
-require File.expand_path(File.dirname(__FILE__) + '/../lib/cucumber/platform')
-
-DOC_DIR      = File.expand_path(File.dirname(__FILE__) + '/../doc')
-SITE_DIR     = File.expand_path(File.dirname(__FILE__) + '/../../cucumber.github.com')
-API_DIR      = File.join(SITE_DIR, 'api', 'cucumber', 'ruby', 'yardoc')
-TEMPLATE_DIR = File.expand_path(File.join(File.dirname(__FILE__), 'yard'))
-YARD::Templates::Engine.register_template_path(TEMPLATE_DIR)
-
-namespace :api do
-  YARD::Rake::YardocTask.new(:yard) do |yard|
-    yard.options = ["--out", DOC_DIR]
-  end
-
-  task :sync_with_git do
-    unless File.directory?(SITE_DIR)
-      raise "You need to git clone git@github.com:cucumber/cucumber.github.com.git #{SITE_DIR}"
-    end
-    Dir.chdir(SITE_DIR) do
-      sh 'git pull -u'
-    end
-  end
-
-  task :copy_to_website do
-    rm_rf API_DIR
-    cp_r DOC_DIR, API_DIR
-  end
-
-  task :release do
-    Dir.chdir(SITE_DIR) do
-      sh 'git add .'
-      sh '''git commit -m "Update API docs for Cucumber-Ruby v#{Cucumber::VERSION}"'''
-      sh 'git push'
-    end
-  end
-
-  desc "Generate YARD docs for Cucumber's API"
-  task :doc => [:yard, :sync_with_git, :copy_to_website, :release]
-  
-  desc "Build cucumber gem and doc locally"
-  task :build => [:yard, :sync_with_git, :copy_to_website]
-end

data/gem_tasks/yard/default/layout/html/footer.erb

@@ -1,5 +0,0 @@
-<div id="footer">
-  Generated on <%= Time.now.strftime("%c") %> by 
-  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  <%= YARD::VERSION %> (ruby-<%= RUBY_VERSION %>).
-</div>

data/gem_tasks/yard/default/layout/html/index.erb

@@ -1 +0,0 @@
-<%= yieldall %>

data/gem_tasks/yard/default/layout/html/layout.erb

@@ -1,25 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <%= erb(:headers) %>
-  </head>
-  <body>
-    <script type="text/javascript" charset="utf-8">
-      if (window.top.frames.main) document.body.className = 'frames';
-    </script>
-    
-    <div id="header">
-      <%= erb(:logo) %>
-      <%= erb(:breadcrumb) %>
-      <%= erb(:search) %>
-      <div class="clear"></div>
-    </div>
-    
-    <iframe id="search_frame"></iframe>
-    
-    <div id="content"><%= yieldall %></div>
-    
-    <%= erb(:footer) %>
-  </body>
-</html>

data/gem_tasks/yard/default/layout/html/logo.erb

@@ -1 +0,0 @@
-<h3><img src="<%= url_for('images/bubble_32x32.png') %>"></img> Cucumber <%= Cucumber::VERSION %></h3>

data/gem_tasks/yard/default/layout/html/setup.rb

@@ -1,4 +0,0 @@
-def init
-  super
-  options[:serializer].serialize('/images/bubble_32x32.png', IO.read(File.dirname(__FILE__) + '/bubble_32x32.png'))
-end

data/lib/cucumber/mappings.rb

@@ -1,238 +0,0 @@
-require 'cucumber/runtime'
-require 'cucumber'
-require 'cucumber/multiline_argument'
-
-module Cucumber
-  class Mappings
-
-    def self.for(runtime)
-      if runtime.dry_run?
-        Mappings::DryRun.new(runtime)
-      else
-        Mappings.new(runtime)
-      end
-    end
-
-    def initialize(runtime = nil)
-      @runtime = runtime
-    end
-
-    def test_step(step, mapper)
-      map_step(step, mapper)
-      map_after_step_hooks(mapper)
-    end
-
-    def test_case(test_case, mapper)
-      map_test_case(test_case, mapper)
-      map_test_case_hooks(mapper)
-    end
-
-    def runtime
-      return @runtime if @runtime
-      result = Cucumber::Runtime.new
-      result.support_code.load_files!(support_files)
-      @runtime = result
-    end
-
-    private
-
-    attr_reader :scenario
-    private :scenario
-
-    def ruby
-      @ruby ||= runtime.load_programming_language('rb')
-    end
-
-    def support_files
-      Dir['features/**/*.rb']
-    end
-
-    def map_step(step, mapper)
-      step.describe_source_to MapStep.new(runtime, mapper)
-    end
-
-    def map_after_step_hooks(mapper)
-      ruby.hooks_for(:after_step, scenario).each do |hook|
-        mapper.after do
-          hook.invoke 'AfterStep', scenario
-        end
-      end
-    end
-
-    def map_test_case(test_case, mapper)
-      @scenario = Source.new(test_case).build_scenario
-      mapper.before do
-        runtime.begin_scenario(scenario)
-      end
-    end
-
-    def map_test_case_hooks(mapper)
-      ruby.hooks_for(:before, scenario).each do |hook|
-        mapper.before do |result|
-          hook.invoke('Before', scenario.with_result(result))
-        end
-      end
-      ruby.hooks_for(:after, scenario).each do |hook|
-        mapper.after do |result|
-          hook.invoke('After', scenario.with_result(result))
-        end
-      end
-      ruby.hooks_for(:around, scenario).each do |hook|
-        mapper.around do |run_scenario|
-          hook.invoke('Around', scenario, &run_scenario)
-        end
-      end
-    end
-
-    # adapts our test_case to look like the Cucumber Runtime's old Scenario
-    class TestCase
-      def initialize(test_case, feature, result = Core::Test::Result::Unknown.new)
-        @test_case = test_case
-        @feature = feature
-        @result = result
-      end
-
-      def accept_hook?(hook)
-        hook.tag_expressions.all? { |expression| @test_case.match_tags?(expression) }
-      end
-
-      def failed?
-        @result.failed?
-      end
-
-      def language
-        @test_case.language
-      end
-
-      def feature
-        @feature
-      end
-
-      def name
-        @test_case.name
-      end
-
-      def title
-        warn("deprecated: call #name instead")
-        name
-      end
-
-      def source_tags
-        #warn('deprecated: call #tags instead')
-        tags
-      end
-
-      def source_tag_names
-        tags.map &:name
-      end
-
-      def tags
-        @test_case.tags
-      end
-
-      def outline?
-        false
-      end
-
-      def with_result(result)
-        self.class.new(@test_case, @feature, result)
-      end
-    end
-
-    class Scenario < TestCase
-    end
-
-    class ScenarioOutlineExample < TestCase
-      def outline?
-        true
-      end
-
-      def scenario_outline
-        self
-      end
-    end
-
-    class Source
-      def initialize(test_case)
-        @test_case = test_case
-        test_case.describe_source_to(self)
-      end
-
-      def feature(feature)
-        @feature = feature
-      end
-
-      def scenario(scenario)
-        @factory = Scenario
-      end
-
-      def scenario_outline(scenario)
-        @factory = ScenarioOutlineExample
-      end
-
-      def examples_table(examples_table)
-      end
-
-      def examples_table_row(row)
-      end
-
-      def build_scenario
-        @factory.new(@test_case, Feature.new(@feature.legacy_conflated_name_and_description))
-      end
-    end
-
-    class DryRun < Mappings
-
-      private
-
-      def map_test_case(*)
-        # NOOP - we don't want to create World etc for dry run
-      end
-
-      def map_step(step, mapper)
-        step.describe_source_to MapStep::DryRun.new(runtime, mapper)
-      end
-
-      def map_after_step_hooks(mapper)
-        # NOOP - we don't need after step hooks for dry run
-      end
-
-      def map_test_case_hooks(mapper)
-        # NOOP - we don't need hooks for dry run
-      end
-    end
-
-    Feature = Struct.new(:name)
-
-    class MapStep
-      include Cucumber.initializer(:runtime, :mapper)
-
-      def step(node)
-        step_match = runtime.step_match(node.name)
-        map_step(node, step_match)
-      rescue Cucumber::Undefined
-      end
-
-      def feature(*);end
-      def scenario(*);end
-      def background(*);end
-      def scenario_outline(*);end
-      def examples_table(*);end
-      def examples_table_row(*);end
-
-      private
-      def map_step(node, step_match)
-        multiline_arg = MultilineArgument.from_core(node.multiline_arg)
-        mapper.map { step_match.invoke(multiline_arg) }
-      end
-
-      class DryRun < MapStep
-        private
-        def map_step(node, step_match)
-          mapper.map { raise Core::Test::Result::Skipped, "dry run" }
-        end
-      end
-    end
-
-  end
-end