cucumber 3.0.0.pre.2 → 3.0.0

data/lib/cucumber/glue/proto_world.rb

@@ -10,11 +10,6 @@ module Cucumber
     # make sense in your domain. For more on that, see {Cucumber::Glue::Dsl#World}
     module ProtoWorld
 
-      # Call a Transform with a string from another Transform definition
-      def Transform(arg)
-        super
-      end
-
       # Run a single Gherkin step
       # @example Call another step
       #   step "I am logged in"

data/lib/cucumber/hooks.rb

@@ -19,7 +19,7 @@ module Cucumber
       end
 
       def after_step_hook(source, location, &block)
-        raise ArgumentError unless source.last.kind_of?(Core::Ast::Step)
+        raise ArgumentError unless source.last.is_a?(Core::Ast::Step)
         build_hook_step(source, location, block, AfterStepHook, Core::Test::Action)
       end
 
@@ -43,7 +43,7 @@ module Cucumber
         @location = location
       end
 
-      def name
+      def text
         'After hook'
       end
 
@@ -63,7 +63,7 @@ module Cucumber
         @location = location
       end
 
-      def name
+      def text
         'Before hook'
       end
 
@@ -83,7 +83,7 @@ module Cucumber
         @location = location
       end
 
-      def name
+      def text
         'AfterStep hook'
       end
 

data/lib/cucumber/multiline_argument.rb

@@ -11,14 +11,14 @@ module Cucumber
         builder.wrap(node)
       end
 
-      def from(argument, location=nil)
+      def from(argument, location=nil, content_type=nil)
         location ||= Core::Ast::Location.of_caller
         case argument
         when String
-          doc_string(argument, 'text/plain', location)
+          builder.doc_string(Core::Ast::DocString.new(argument, content_type, location))
         when Array
           location = location.on_line(argument.first.line..argument.last.line)
-          data_table(argument.map{ |row| row.cells }, location)
+          builder.data_table(argument.map{ |row| row.cells }, location)
         when DataTable, DocString, None
           argument
         when nil
@@ -28,14 +28,6 @@ module Cucumber
         end
       end
 
-      def doc_string(argument, content_type, location)
-        builder.doc_string(Core::Ast::DocString.new(argument, content_type, location))
-      end
-
-      def data_table(data, location)
-        builder.data_table(Core::Ast::DataTable.new(data, location))
-      end
-
       private
 
       def builder

data/lib/cucumber/multiline_argument/data_table.rb

@@ -82,7 +82,7 @@ module Cucumber
       # @param header_mappings [Hash] see map_headers!
       # @param header_conversion_proc [Proc] see map_headers!
       def initialize(data, conversion_procs = NULL_CONVERSIONS.dup, header_mappings = {}, header_conversion_proc = nil)
-        raise ArgumentError, 'data must be a Core::Ast::DataTable' unless data.kind_of? Core::Ast::DataTable
+        raise ArgumentError, 'data must be a Core::Ast::DataTable' unless data.is_a? Core::Ast::DataTable
         ast_table = data
         # Verify that it's square
         ast_table.transpose
@@ -159,8 +159,10 @@ module Cucumber
       #   [{:foo => '2', :bar => '3', :foo_bar => '5'}, {:foo => '7', :bar => '9', :foo_bar => '16'}]
       #
       def symbolic_hashes
-        @header_conversion_proc = lambda { |h| symbolize_key(h) }
-        @symbolic_hashes ||= build_hashes
+        @symbolic_hashes ||=
+          self.hashes.map do |string_hash|
+            Hash[string_hash.map{ |a,b| [symbolize_key(a), b] }]
+          end
       end
 
       # Converts this table into a Hash where the first column is

data/lib/cucumber/project_initializer.rb

@@ -27,7 +27,7 @@ module Cucumber
                     :touch
                   end
 
-      report_exists(file_name) || return if File.exists?(file_name)
+      report_exists(file_name) || return if File.exist?(file_name)
 
       report_creating(file_name)
       FileUtils.send file_type, file_name

data/lib/cucumber/rake/task.rb

@@ -81,11 +81,15 @@ module Cucumber
 
         def cmd
           if use_bundler
-            [ Cucumber::RUBY_BINARY, '-S', 'bundle', 'exec', 'cucumber', @cucumber_opts,
-            @feature_files ].flatten
+            [
+              Cucumber::RUBY_BINARY,'-S', 'bundle', 'exec', 'cucumber',
+              @cucumber_opts, @feature_files
+            ].flatten
           else
-            [ Cucumber::RUBY_BINARY, '-I', load_path, quoted_binary(@cucumber_bin),
-            @cucumber_opts, @feature_files ].flatten
+            [
+              Cucumber::RUBY_BINARY, '-I', load_path,
+              quoted_binary(@cucumber_bin), @cucumber_opts, @feature_files
+            ].flatten
           end
         end
 

data/lib/cucumber/runtime.rb

@@ -229,7 +229,7 @@ module Cucumber
       if @configuration.wip?
         summary_report.test_cases.total_passed > 0
       else
-        !summary_report.ok?(@configuration.strict?)
+        !summary_report.ok?(@configuration.strict)
       end
     end
     public :failure?
@@ -256,7 +256,7 @@ module Cucumber
           filters << Filters::ApplyBeforeHooks.new(@support_code)
           filters << Filters::ApplyAfterHooks.new(@support_code)
           filters << Filters::ApplyAroundHooks.new(@support_code)
-          filters << Filters::BroadcastTestRunStartingEvent.new(@configuration)
+          filters << Filters::BroadcastTestRunStartedEvent.new(@configuration)
           filters << Filters::Quit.new
           filters << Filters::Retry.new(@configuration)
           # need to do this last so it becomes the first test step

data/lib/cucumber/runtime/support_code.rb

@@ -34,7 +34,7 @@ module Cucumber
 
           if argument
             if argument[:type] == :DocString
-              MultilineArgument.doc_string(argument[:content], argument[:content_type], location)
+              MultilineArgument.from(argument[:content], location, argument[:content_type])
             else
               MultilineArgument::DataTable.from(argument[:rows].map { |row| row[:cells].map { |cell| cell[:value] } })
             end

data/lib/cucumber/runtime/user_interface.rb

@@ -33,11 +33,11 @@ module Cucumber
         STDOUT.flush
         puts(question)
 
-        if(Cucumber::JRUBY)
-          answer = jruby_gets(timeout_seconds)
-        else
-          answer = mri_gets(timeout_seconds)
-        end
+        answer = if(Cucumber::JRUBY)
+                   jruby_gets(timeout_seconds)
+                 else
+                   mri_gets(timeout_seconds)
+                 end
 
         raise("Waited for input for #{timeout_seconds} seconds, then timed out.") unless answer
         puts(answer)

data/lib/cucumber/step_match.rb

@@ -140,4 +140,17 @@ module Cucumber
       return test_step
     end
   end
+
+  class AmbiguousStepMatch
+
+    def initialize(error)
+      @error = error
+    end
+
+    def activate(test_step)
+      return test_step.with_action { raise @error }
+    end
+
+  end
+
 end

data/lib/cucumber/version

@@ -1 +1 @@
-3.0.0.pre.2
+3.0.0

data/scripts/{update-history → update-changelog}

@@ -11,7 +11,10 @@ class PullRequest
 
   def entry
     pr = gh.pull_request('cucumber/cucumber-ruby', num)
-    "#{pr['title']} ([##{num}(#{pr['url']}) @#{pr['user']['login']})"
+    username = pr['user']['login']
+    url = pr['html_url']
+    title = pr['title']
+    "#{title} ([##{num}](#{url}) [@#{username}](https://github.com/#{username}))"
   end
 
   def labels
@@ -32,12 +35,12 @@ class PullRequest
   end
 end
 
-class HistoryFile
+class Changelog
   def self.open(path, &block)
-    full_path = File.expand_path(File.dirname(__FILE__) + '/' + path + '/History.md')
-    history = new(File.read(full_path))
-    history.instance_exec(&block)
-    File.write(full_path, history.body)
+    full_path = File.expand_path(File.dirname(__FILE__) + '/' + path + '/CHANGELOG.md')
+    log = new(File.read(full_path))
+    log.instance_exec(&block)
+    File.write(full_path, log.body)
   end
 
   attr_reader :lines
@@ -49,16 +52,16 @@ class HistoryFile
   def insert(label, entry)
     section_index = lines.index { |line| line.strip == heading_for(label) }
     unless section_index
-      raise("Unable to find matching heading in History.md for '#{label}' (#{heading_for(label)})")
+      raise("Unable to find matching heading in CHANGELOG.md for '#{label}' (#{heading_for(label)})")
     end
     lines.insert(section_index + 2, "* #{entry}\n")
   end
 
   def heading_for(label)
     text = {
-      'type: new feature' => 'New Features',
-      'type: bug' => 'Bugfixes',
-      'type: refactoring / developer experience' => 'Refactoring / Developer Experience'
+      'type: new feature' => 'Added',
+      'type: bug' => 'Fixed',
+      'type: refactoring / developer experience' => 'Changed'
     }.fetch(label)
     "### #{text}"
   end
@@ -75,7 +78,7 @@ begin
   gh = Octokit::Client.new(access_token: token)
   pr = PullRequest.new(gh, num)
 
-  HistoryFile.open('..') do
+  Changelog.open('..') do
     insert(pr.type_label, pr.entry)
   end
 rescue StandardError => error

data/spec/cucumber/cli/configuration_spec.rb

@@ -71,7 +71,19 @@ module Cli
 
         config.parse!(%w{--profile bongo})
 
-        expect(config.options[:strict]).to be true
+        expect(config.options[:strict].strict?(:undefined)).to be true
+        expect(config.options[:strict].strict?(:pending)).to be true
+        expect(config.options[:strict].strict?(:flaky)).to be true
+      end
+
+      it 'allows --strict from a profile to be selectively overridden' do
+        given_cucumber_yml_defined_as({'bongo' => '--strict'})
+
+        config.parse!(%w{--profile bongo --no-strict-flaky})
+
+        expect(config.options[:strict].strict?(:undefined)).to be true
+        expect(config.options[:strict].strict?(:pending)).to be true
+        expect(config.options[:strict].strict?(:flaky)).to be false
       end
 
       it 'parses ERB syntax in the cucumber.yml file' do

data/spec/cucumber/cli/options_spec.rb

@@ -310,7 +310,7 @@ module Cucumber
               <% $cucumber_yml_read_count += 1 %>
               default: --format pretty
               END
-              )
+                                           )
               options = Options.new(output_stream, error_stream, :default_profile => 'default')
               options.parse!(%w(-f progress))
 

data/spec/cucumber/filters/activate_steps_spec.rb

@@ -27,7 +27,7 @@ describe Cucumber::Filters::ActivateSteps do
 
     it 'activates each step' do
       expect(step_match).to receive(:activate) do |test_step|
-        expect(test_step.name).to eq 'a passing step'
+        expect(test_step.text).to eq 'a passing step'
       end
       compile [doc], receiver, [filter]
     end
@@ -35,7 +35,7 @@ describe Cucumber::Filters::ActivateSteps do
     it 'notifies with a StepActivated event' do
       expect(configuration).to receive(:notify) do |message, test_step, step_match|
         expect(message).to eq :step_activated
-        expect(test_step.name).to eq 'a passing step'
+        expect(test_step.text).to eq 'a passing step'
         expect(step_match).to eq step_match
       end
       compile [doc], receiver, [filter]
@@ -60,7 +60,7 @@ describe Cucumber::Filters::ActivateSteps do
 
     it 'activates each step' do
       expect(step_match).to receive(:activate) do |test_step|
-        expect(test_step.name).to eq 'a passing step'
+        expect(test_step.text).to eq 'a passing step'
       end
       compile [doc], receiver, [filter]
     end
@@ -115,7 +115,7 @@ describe Cucumber::Filters::ActivateSteps do
     it 'notifies with a StepActivated event' do
       expect(configuration).to receive(:notify) do |message, test_step, step_match|
         expect(message).to eq :step_activated
-        expect(test_step.name).to eq 'a passing step'
+        expect(test_step.text).to eq 'a passing step'
         expect(step_match).to eq step_match
       end
       compile [doc], receiver, [filter]

data/spec/cucumber/formatter/fail_fast_spec.rb

@@ -75,7 +75,7 @@ module Cucumber::Formatter
       end
 
       context 'in strict mode' do
-        let(:configuration) { Cucumber::Configuration.new strict: true }
+        let(:configuration) { Cucumber::Configuration.new strict: Cucumber::Core::Test::Result::StrictConfiguration.new([:undefined]) }
 
         it 'sets Cucumber.wants_to_quit' do
           execute [@gherkin], [StandardStepActions.new], configuration.event_bus

data/spec/cucumber/formatter/html_spec.rb

@@ -355,7 +355,7 @@ module Cucumber
 
         describe 'with a step that embeds a text' do
           define_steps do
-            Given(/log/) { embed('log.txt', 'text/plain') }
+            Given(/log/) { embed('log.txt', 'text/plain', 'foo') }
           end
 
           define_feature(<<-FEATURE)

data/spec/cucumber/formatter/json_spec.rb

@@ -18,31 +18,6 @@ module Cucumber
           run_defined_feature
         end
 
-        describe 'with a scenario with no steps' do
-          define_feature <<-FEATURE
-          Feature: Banana party
-
-            Scenario: Monkey eats bananas
-            FEATURE
-
-          it 'outputs the json data' do
-            expect(load_normalised_json(@out)).to eq MultiJson.load(%{
-              [{"id": "banana-party",
-                "uri": "spec.feature",
-                "keyword": "Feature",
-                "name": "Banana party",
-                "line": 1,
-                "description": "",
-                "elements":
-                 [{"id": "banana-party;monkey-eats-bananas",
-                   "keyword": "Scenario",
-                   "name": "Monkey eats bananas",
-                   "line": 3,
-                   "description": "",
-                   "type": "scenario"}]}]})
-          end
-        end
-
         describe 'with a scenario with an undefined step' do
           define_feature <<-FEATURE
           Feature: Banana party
@@ -106,7 +81,7 @@ module Cucumber
                     [{"keyword": "Given ",
                       "name": "there are bananas",
                       "line": 4,
-                      "match": {"location": "spec/cucumber/formatter/json_spec.rb:87"},
+                      "match": {"location": "spec/cucumber/formatter/json_spec.rb:62"},
                       "result": {"status": "passed",
                                  "duration": 1}}]}]}]})
           end
@@ -143,9 +118,9 @@ module Cucumber
                     [{"keyword": "Given ",
                       "name": "there are bananas",
                       "line": 4,
-                      "match": {"location": "spec/cucumber/formatter/json_spec.rb:124"},
+                      "match": {"location": "spec/cucumber/formatter/json_spec.rb:99"},
                       "result": {"status": "failed",
-                                 "error_message": "no bananas (RuntimeError)\\n./spec/cucumber/formatter/json_spec.rb:124:in `/^there are bananas$/'\\nspec.feature:4:in `Given there are bananas'",
+                                 "error_message": "no bananas (RuntimeError)\\n./spec/cucumber/formatter/json_spec.rb:99:in `/^there are bananas$/'\\nspec.feature:4:in `Given there are bananas'",
                                  "duration": 1}}]}]}]})
           end
         end
@@ -181,9 +156,9 @@ module Cucumber
                     [{"keyword": "Given ",
                       "name": "there are bananas",
                       "line": 4,
-                      "match": {"location": "spec/cucumber/formatter/json_spec.rb:162"},
+                      "match": {"location": "spec/cucumber/formatter/json_spec.rb:137"},
                       "result": {"status": "pending",
-                                 "error_message": "TODO (Cucumber::Pending)\\n./spec/cucumber/formatter/json_spec.rb:162:in `/^there are bananas$/'\\nspec.feature:4:in `Given there are bananas'",
+                                 "error_message": "TODO (Cucumber::Pending)\\n./spec/cucumber/formatter/json_spec.rb:137:in `/^there are bananas$/'\\nspec.feature:4:in `Given there are bananas'",
                                  "duration": 1}}]}]}]})
           end
         end
@@ -223,7 +198,7 @@ module Cucumber
                     [{"keyword": "Given ",
                       "name": "there are bananas",
                       "line": 8,
-                      "match": {"location": "spec/cucumber/formatter/json_spec.rb:204"},
+                      "match": {"location": "spec/cucumber/formatter/json_spec.rb:179"},
                       "result": {"status": "passed",
                                  "duration": 1}}]}]}]})
           end
@@ -277,7 +252,7 @@ module Cucumber
                     [{"keyword": "Given ",
                       "name": "there are bananas",
                       "line": 6,
-                      "match": {"location": "spec/cucumber/formatter/json_spec.rb:252"},
+                      "match": {"location": "spec/cucumber/formatter/json_spec.rb:227"},
                       "result": {"status": "passed",
                                  "duration": 1}}]},
                    {"id": "banana-party;monkey-eats-bananas;fruit-table;2",
@@ -296,7 +271,7 @@ module Cucumber
                     [{"keyword": "Given ",
                       "name": "there are bananas",
                       "line": 15,
-                      "match": {"location": "spec/cucumber/formatter/json_spec.rb:252"},
+                      "match": {"location": "spec/cucumber/formatter/json_spec.rb:227"},
                       "result": {"status": "passed",
                                  "duration": 1}}]}]}]})
           end
@@ -355,7 +330,7 @@ module Cucumber
                     [{"keyword": "Given ",
                       "name": "there are bananas",
                       "line": 6,
-                      "match": {"location": "spec/cucumber/formatter/json_spec.rb:332"},
+                      "match": {"location": "spec/cucumber/formatter/json_spec.rb:307"},
                       "result": {"status": "passed",
                                  "duration": 1}}]},
                   {"id": "banana-party;monkey-eats-bananas",
@@ -372,7 +347,7 @@ module Cucumber
                       "line": 11,
                       "comments": [{"value": "#step comment1",
                                     "line": 10}],
-                      "match": {"location": "spec/cucumber/formatter/json_spec.rb:333"},
+                      "match": {"location": "spec/cucumber/formatter/json_spec.rb:308"},
                       "result": {"status": "passed",
                                  "duration": 1}}]},
                   {"keyword": "Background",
@@ -386,7 +361,7 @@ module Cucumber
                     [{"keyword": "Given ",
                       "name": "there are bananas",
                       "line": 6,
-                      "match": {"location": "spec/cucumber/formatter/json_spec.rb:332"},
+                      "match": {"location": "spec/cucumber/formatter/json_spec.rb:307"},
                       "result": {"status": "passed",
                                  "duration": 1}}]},
                    {"id": "banana-party;monkey-eats-bananas;fruit-table;2",
@@ -407,7 +382,7 @@ module Cucumber
                       "line": 22,
                       "comments": [{"value": "#step comment2",
                                     "line": 15}],
-                      "match": {"location": "spec/cucumber/formatter/json_spec.rb:333"},
+                      "match": {"location": "spec/cucumber/formatter/json_spec.rb:308"},
                       "result": {"status": "passed",
                                  "duration": 1}}]}]}]})
           end
@@ -450,7 +425,7 @@ module Cucumber
                       "doc_string": {"value": "the doc string",
                                      "content_type": "",
                                      "line": 5},
-                      "match": {"location": "spec/cucumber/formatter/json_spec.rb:428"},
+                      "match": {"location": "spec/cucumber/formatter/json_spec.rb:403"},
                       "result": {"status": "passed",
                                  "duration": 1}}]}]}]})
           end
@@ -488,7 +463,7 @@ module Cucumber
                       "name": "there are bananas",
                       "line": 4,
                       "output": ["from step"],
-                      "match": {"location": "spec/cucumber/formatter/json_spec.rb:468"},
+                      "match": {"location": "spec/cucumber/formatter/json_spec.rb:443"},
                       "result": {"status": "passed",
                                  "duration": 1}}]}]}]})
           end
@@ -600,7 +575,7 @@ module Cucumber
                       "line": 4,
                       "embeddings": [{"mime_type": "mime-type",
                                       "data": "YWJj"}],
-                      "match": {"location": "spec/cucumber/formatter/json_spec.rb:578"},
+                      "match": {"location": "spec/cucumber/formatter/json_spec.rb:553"},
                       "result": {"status": "passed",
                                  "duration": 1}}]}]}]})
           end
@@ -645,7 +620,7 @@ module Cucumber
                       "line": 4,
                       "embeddings": [{"mime_type": "image/png",
                                       "data": "Zm9v"}],
-                      "match": {"location": "spec/cucumber/formatter/json_spec.rb:618"},
+                      "match": {"location": "spec/cucumber/formatter/json_spec.rb:593"},
                       "result": {"status": "passed",
                                  "duration": 1}}]}]}]})
           end
@@ -686,31 +661,31 @@ module Cucumber
                    "description": "",
                    "type": "scenario",
                    "before":
-                    [{"match": {"location": "spec/cucumber/formatter/json_spec.rb:663"},
+                    [{"match": {"location": "spec/cucumber/formatter/json_spec.rb:638"},
                       "result": {"status": "passed",
                                  "duration": 1}},
-                     {"match": {"location": "spec/cucumber/formatter/json_spec.rb:664"},
+                     {"match": {"location": "spec/cucumber/formatter/json_spec.rb:639"},
                       "result": {"status": "passed",
                                  "duration": 1}}],
                    "steps":
                     [{"keyword": "Given ",
                       "name": "there are bananas",
                       "line": 4,
-                      "match": {"location": "spec/cucumber/formatter/json_spec.rb:670"},
+                      "match": {"location": "spec/cucumber/formatter/json_spec.rb:645"},
                       "result": {"status": "passed",
                                  "duration": 1},
                       "after":
-                       [{"match": {"location": "spec/cucumber/formatter/json_spec.rb:667"},
+                       [{"match": {"location": "spec/cucumber/formatter/json_spec.rb:642"},
                          "result": {"status": "passed",
                                     "duration": 1}},
-                        {"match": {"location": "spec/cucumber/formatter/json_spec.rb:668"},
+                        {"match": {"location": "spec/cucumber/formatter/json_spec.rb:643"},
                          "result": {"status": "passed",
                                     "duration": 1}}]}],
                    "after":
-                    [{"match": {"location": "spec/cucumber/formatter/json_spec.rb:666"},
+                    [{"match": {"location": "spec/cucumber/formatter/json_spec.rb:641"},
                       "result": {"status": "passed",
                                  "duration": 1}},
-                     {"match": {"location": "spec/cucumber/formatter/json_spec.rb:665"},
+                     {"match": {"location": "spec/cucumber/formatter/json_spec.rb:640"},
                       "result": {"status": "passed",
                                  "duration": 1}}]}]}]})
           end
@@ -748,13 +723,13 @@ module Cucumber
                     [{"keyword": "Given ",
                       "name": "there are bananas",
                       "line": 4,
-                      "match": {"location": "spec/cucumber/formatter/json_spec.rb:729"},
+                      "match": {"location": "spec/cucumber/formatter/json_spec.rb:704"},
                       "result": {"status": "passed",
                                  "duration": 1}}],
                    "around":
                     [{"match": {"location": "unknown_hook_location:1"},
                       "result": {"status": "failed",
-                                 "error_message": "error (RuntimeError)\\n./spec/cucumber/formatter/json_spec.rb:728:in `Around'",
+                                 "error_message": "error (RuntimeError)\\n./spec/cucumber/formatter/json_spec.rb:703:in `Around'",
                                  "duration": 1}}]}]}]})
           end
         end
@@ -795,7 +770,7 @@ module Cucumber
                        "rows":
                          [{"cells": ["aa", "bb"]},
                           {"cells": ["cc", "dd"]}],
-                       "match": {"location": "spec/cucumber/formatter/json_spec.rb:773"},
+                       "match": {"location": "spec/cucumber/formatter/json_spec.rb:748"},
                        "result": {"status": "passed",
                                   "duration": 1}}]}]}]})
           end