cucumber 1.3.20 → 2.0.0.beta.1

data/features/{support → lib/support}/feature_factory.rb

@@ -50,7 +50,7 @@ Feature: #{name}
   end
 
   def generate_step_definition_filename
-    "features/step_definitions/test_steps#{next_increment(:step_defs)}.rb"
+    "features/step_definitions/steps#{next_increment(:step_defs)}.rb"
   end
 
   def filename(name)

data/features/lib/support/normalise_output.rb

@@ -0,0 +1,33 @@
+# override aruba to filter out some stuff
+module NormaliseArubaOutput
+  def all_stdout
+    normalise_output(super)
+  end
+
+  def normalise_output(out)
+    out = out.gsub(/#{Dir.pwd}\/tmp\/aruba/, '.') # Remove absolute paths
+    out = out.gsub(/tmp\/aruba\//, '')            # Fix aruba path
+    out = out.gsub(/^.*cucumber_process\.rb.*$\n/, '')
+    out = out.gsub(/^\d+m\d+\.\d+s$/, '0m0.012s') # Make duration predictable
+    out = out.gsub(/Coverage report generated .+$\n/, '') # Remove SimpleCov message
+  end
+
+  def normalise_json(json)
+    #make sure duration was captured (should be >= 0)
+    #then set it to what is "expected" since duration is dynamic
+    json.each do |feature|
+      elements = feature.fetch('elements') { [] }
+      elements.each do |scenario|
+        scenario['steps'].each do |step|
+          if step['result']
+            expect(step['result']['duration']).to be >= 0
+            step['result']['duration'] = 1
+          end
+        end
+      end
+    end
+  end
+end
+
+World(NormaliseArubaOutput)
+

data/gem_tasks/cov.rake

@@ -0,0 +1,5 @@
+desc 'Run all tests and collect code coverage'
+task :cov do
+  ENV['SIMPLECOV'] = 'features'
+  Rake::Task['default'].invoke
+end

data/gem_tasks/cucumber.rake

@@ -7,16 +7,12 @@ class Cucumber::Rake::Task
       Cucumber::WINDOWS ? 'jruby_win' : 'jruby'
     elsif Cucumber::WINDOWS_MRI
       'windows_mri'
-    elsif Cucumber::RUBY_1_8_7
-      'ruby_1_8_7'
     elsif Cucumber::RUBY_1_9
       'ruby_1_9'
     elsif Cucumber::RUBY_2_0
       'ruby_2_0'
     elsif Cucumber::RUBY_2_1
       'ruby_2_1'
-    elsif Cucumber::RUBY_2_2
-      'ruby_2_2'
     end
   end
 end
@@ -26,9 +22,4 @@ Cucumber::Rake::Task.new(:features) do |t|
   t.set_profile_for_current_ruby
 end
 
-Cucumber::Rake::Task.new(:legacy_features) do |t|
-  t.fork = true
-  t.profile = :legacy
-end
-
-task :cucumber => [:features, :legacy_features]
+task :cucumber => :features

data/gem_tasks/rspec.rake

@@ -2,7 +2,5 @@ require 'rspec/core/rake_task'
 
 desc "Run RSpec"
 RSpec::Core::RakeTask.new do |t|
-  t.rcov = ENV['RCOV']
-  t.rcov_opts = %w{--exclude osx\/objc,gems\/,spec\/}
   t.verbose = true
 end

data/gem_tasks/yard.rake

@@ -30,11 +30,14 @@ namespace :api do
   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 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/lib/cucumber.rb

@@ -3,10 +3,8 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 require 'yaml'
 require 'cucumber/platform'
-require 'cucumber/parser'
-require 'cucumber/step_mother'
+require 'cucumber/runtime'
 require 'cucumber/cli/main'
-require 'cucumber/broadcaster'
 require 'cucumber/step_definitions'
 require 'cucumber/term/ansicolor'
 

data/lib/cucumber/cli/configuration.rb

@@ -25,10 +25,8 @@ module Cucumber
         @options.parse!(args)
         arrange_formats
         raise("You can't use both --strict and --wip") if strict? && wip?
-
+        # todo: remove
         @options[:tag_expression] = Gherkin::TagExpression.new(@options[:tag_expressions])
-        return @args.replace(@options.expanded_args_without_drb) if drb?
-
         set_environment_variables
       end
 
@@ -36,6 +34,14 @@ module Cucumber
         @options[:verbose]
       end
 
+      def randomize?
+        @options[:order] == 'random'
+      end
+
+      def seed
+        Integer(@options[:seed] || rand(0xFFFF))
+      end
+
       def strict?
         @options[:strict]
       end
@@ -48,14 +54,6 @@ module Cucumber
         @options[:guess]
       end
 
-      def drb?
-        @options[:drb]
-      end
-
-      def drb_port
-        @options[:drb_port].to_i if @options[:drb_port]
-      end
-
       def dry_run?
         @options[:dry_run]
       end
@@ -117,7 +115,7 @@ module Cucumber
             Dir["#{path}/**/*.feature"].sort
           elsif path[0..0] == '@' and # @listfile.txt
               File.file?(path[1..-1]) # listfile.txt is a file
-            IO.read(path[1..-1]).split(/(.*?\.feature.*?) /).collect(&:strip).reject(&:empty?)
+            IO.read(path[1..-1]).split
           else
             path
           end
@@ -140,10 +138,24 @@ module Cucumber
         logger
       end
 
+      # todo: remove
       def tag_expression
         Gherkin::TagExpression.new(@options[:tag_expressions])
       end
 
+      def tag_limits
+        tag_expression.limits.to_hash
+      end
+
+      def tag_expressions
+        @options[:tag_expressions]
+      end
+
+      def name_regexps
+        @options[:name_regexps]
+      end
+
+      # todo: remove as unused
       def filters
         @options.filters
       end
@@ -160,21 +172,8 @@ module Cucumber
       def paths
         @options[:paths]
       end
-    private
-      def with_default_features_path(paths)
-        return ['features'] if paths.empty?
-        paths
-      end
-
 
       def formatters(runtime)
-        # TODO: We should remove the autoformat functionality. That
-        # can be done with the gherkin CLI.
-        if @options[:autoformat]
-          require 'cucumber/formatter/pretty'
-          return [Formatter::Pretty.new(runtime, out_stream, @options)]
-        end
-
         @options[:formats].map do |format_and_out|
           format = format_and_out[0]
           path_or_io = format_and_out[1]
@@ -188,6 +187,12 @@ module Cucumber
         end
       end
 
+    private
+      def with_default_features_path(paths)
+        return ['features'] if paths.empty?
+        paths
+      end
+
       class LogFormatter < ::Logger::Formatter
         def call(severity, time, progname, msg)
           msg

data/lib/cucumber/cli/main.rb

@@ -7,10 +7,7 @@ end
 require 'optparse'
 require 'cucumber'
 require 'logger'
-require 'cucumber/parser'
-require 'cucumber/feature_file'
 require 'cucumber/cli/configuration'
-require 'cucumber/cli/drb_client'
 
 module Cucumber
   module Cli
@@ -21,21 +18,15 @@ module Cucumber
         end
       end
 
-      def initialize(args, stdin=STDIN, out=STDOUT, err=STDERR, kernel=Kernel)
-        raise "args can't be nil" unless args
-        raise "out can't be nil" unless out
-        raise "err can't be nil" unless err
-        raise "kernel can't be nil" unless kernel
+      def initialize(args, _=nil, out=STDOUT, err=STDERR, kernel=Kernel)
         @args   = args
         @out    = out
         @err    = err
         @kernel = kernel
-        @configuration = nil
       end
 
       def execute!(existing_runtime = nil)
         trap_interrupt
-        return @drb_output if run_drb_client
 
         runtime = if existing_runtime
           existing_runtime.configure(configuration)
@@ -48,8 +39,16 @@ module Cucumber
         runtime.write_stepdefs_json
         failure = runtime.results.failure? || Cucumber.wants_to_quit
         @kernel.exit(failure ? 1 : 0)
+      rescue FileNotFoundException => e
+        @err.puts(e.message)
+        @err.puts("Couldn't open #{e.path}")
+        @kernel.exit(1)
+      rescue FeatureFolderNotFoundException => e
+        @err.puts(e.message + ". Please create a #{e.path} directory to get started.")
+        @kernel.exit(1)
       rescue ProfilesNotDefinedError, YmlLoadError, ProfileNotFound => e
         @err.puts(e.message)
+        @kernel.exit(1)
       rescue SystemExit => e
         @kernel.exit(e.status)
       rescue Errno::EACCES, Errno::ENOENT => e
@@ -62,25 +61,14 @@ module Cucumber
       end
 
       def configuration
-        return @configuration if @configuration
-
-        @configuration = Configuration.new(@out, @err)
-        @configuration.parse!(@args)
-        Cucumber.logger = @configuration.log
-        @configuration
+        @configuration ||= Configuration.new(@out, @err).tap do |configuration|
+          configuration.parse!(@args)
+          Cucumber.logger = configuration.log
+        end
       end
 
       private
 
-      def run_drb_client
-        return false unless configuration.drb?
-        warn("Spork is no longer supported as of Cucumber 1.3.0. Please downgrade to version 1.2.5")
-        @drb_output = DRbClient.run(@args, @err, @out, configuration.drb_port)
-        true
-      rescue DRbClientError => e
-        @err.puts "WARNING: #{e.message} Running features locally:"
-      end
-
       def trap_interrupt
         trap('INT') do
           exit!(1) if Cucumber.wants_to_quit

data/lib/cucumber/cli/options.rb

@@ -27,7 +27,7 @@ module Cucumber
       max = BUILTIN_FORMATS.keys.map{|s| s.length}.max
       FORMAT_HELP = (BUILTIN_FORMATS.keys.sort.map do |key|
         "  #{key}#{' ' * (max - key.length)} : #{BUILTIN_FORMATS[key][1]}"
-      end) + ["Use --format rerun --out features.txt to write out failing",
+      end) + ["Use --format rerun --out rerun.txt to write out failing",
         "features. You can rerun them with cucumber @rerun.txt.",
         "FORMAT can also be the fully qualified class name of",
         "your own custom formatter. If the class isn't loaded,",
@@ -38,8 +38,6 @@ module Cucumber
         "path underneath your features/support directory or anywhere",
         "on Ruby's LOAD_PATH, for example in a Ruby gem."
       ]
-      DRB_FLAG = '--drb'
-      DRB_OPTIONAL_FLAG = '--[no-]drb'
       PROFILE_SHORT_FLAG = '-p'
       NO_PROFILE_SHORT_FLAG = '-P'
       PROFILE_LONG_FLAG = '--profile'
@@ -47,8 +45,9 @@ module Cucumber
       OPTIONS_WITH_ARGS = ['-r', '--require', '--i18n', '-f', '--format', '-o', '--out',
                                   '-t', '--tags', '-n', '--name', '-e', '--exclude',
                                   PROFILE_SHORT_FLAG, PROFILE_LONG_FLAG,
-                                  '-a', '--autoformat', '-l', '--lines', '--port',
+                                  '-l', '--lines', '--port',
                                   '-I', '--snippet-type']
+      ORDER_TYPES = %w{defined random}
 
       def self.parse(args, out_stream, error_stream, options = {})
         new(out_stream, error_stream, options).parse!(args)
@@ -76,43 +75,6 @@ module Cucumber
         @options[key] = value
       end
 
-      def expanded_args_without_drb
-        return @expanded_args_without_drb  if @expanded_args_without_drb
-        @expanded_args_without_drb = (
-          previous_flag_was_profile = false
-          previous_flag_requires_arg = false
-
-          @expanded_args.reject do |arg|
-            # ignore profiles
-            if previous_flag_was_profile
-              previous_flag_was_profile = false
-              next true
-            end
-            if [PROFILE_SHORT_FLAG, PROFILE_LONG_FLAG].include?(arg)
-              previous_flag_was_profile = true
-              next true
-            end
-
-            # accept all options which requires arguments
-            # and don't try to look @overridden_paths in it's arguments!
-            if previous_flag_requires_arg
-              previous_flag_requires_arg = false
-              next false
-            end
-            if OPTIONS_WITH_ARGS.include?(arg)
-              previous_flag_requires_arg = true
-              next false
-            end
-
-            # ignore --drb flag and overridden features paths
-            arg == DRB_FLAG || @overridden_paths.include?(arg)
-          end
-        )
-
-        @expanded_args_without_drb.push("--no-profile") unless @expanded_args_without_drb.include?(NO_PROFILE_LONG_FLAG) || @expanded_args_without_drb.include?(NO_PROFILE_SHORT_FLAG)
-        @expanded_args_without_drb
-      end
-
       def parse!(args)
         @args = args
         @expanded_args = @args.dup
@@ -220,16 +182,6 @@ module Cucumber
             "This also omits the loading of your support/env.rb file if it exists.") do
             @options[:dry_run] = true
           end
-          opts.on("-a", "--autoformat DIR",
-            "Reformats (pretty prints) feature files and write them to DIRECTORY.",
-            "Be careful if you choose to overwrite the originals.",
-            "Implies --dry-run --format pretty.") do |directory|
-            @options[:autoformat] = directory
-            Cucumber::Term::ANSIColor.coloring = false
-            @options[:dry_run] = true
-            @quiet = true
-          end
-
           opts.on("-m", "--no-multiline",
             "Don't print multiline strings and tables under steps.") do
             @options[:no_multiline] = true
@@ -271,15 +223,21 @@ module Cucumber
           opts.on("-x", "--expand", "Expand Scenario Outline Tables in output.") do
             @options[:expand] = true
           end
-          opts.on(DRB_OPTIONAL_FLAG, "Run features against a DRb server. (i.e. with the spork gem)") do |drb|
-            @options[:drb] = drb
-          end
-          opts.on("--port PORT", "Specify DRb port.  Ignored without --drb") do |port|
-            @options[:drb_port] = port
-          end
           opts.on("--dotcucumber DIR", "Write metadata to DIR") do |dir|
             @options[:dotcucumber] = dir
           end
+          opts.on("--order TYPE[:SEED]", "Run examples in the specified order. Available types:",
+            *<<-TEXT.split("\n")) do |order|
+  [defined]     Run scenarios in the order they were defined (default).
+  [random]      Shuffle scenarios before running.
+Specify SEED to reproduce the shuffling from a previous run.
+  e.g. --order random:5738
+TEXT
+            @options[:order], @options[:seed] = *order.split(":")
+            unless ORDER_TYPES.include?(@options[:order])
+              fail "'#{@options[:order]}' is not a recognised order type. Please use one of #{ORDER_TYPES.join(", ")}."
+            end
+          end
           opts.on_tail("--version", "Show version.") do
             @out_stream.puts Cucumber::VERSION
             Kernel.exit(0)

data/lib/cucumber/configuration.rb

@@ -14,6 +14,10 @@ module Cucumber
       @options = default_options.merge(user_options)
     end
 
+    def randomize?
+      @options[:randomize]
+    end
+
     def dry_run?
       @options[:dry_run]
     end

data/lib/cucumber/constantize.rb

@@ -33,12 +33,13 @@ module Cucumber
     end
 
     private
-      def constantize_name(constant, name)
-        if Cucumber::RUBY_1_8_7
-          constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
-        else
-          constant.const_defined?(name, false) ? constant.const_get(name, false) : constant.const_missing(name)
-        end
+
+    def constantize_name(constant, name)
+      if constant.const_defined?(name, false)
+        constant.const_get(name, false)
+      else
+        constant.const_missing(name)
       end
+    end
   end
 end