cucumber 0.7.3 → 0.8.0

data/lib/cucumber/formatter/json.rb

@@ -0,0 +1,154 @@
+require "json"
+require "cucumber/formatter/io"
+
+module Cucumber
+  module Formatter
+    # The formatter used for <tt>--format json</tt>
+    class Json
+      class Error < StandardError
+      end
+
+      include Io
+
+      def initialize(step_mother, io, options)
+        @io      = ensure_io(io, "json")
+        @options = options
+      end
+
+      def before_features(features)
+        @json = {:features => []}
+      end
+
+      def before_feature(feature)
+        @current_object = {:file => feature.file, :name => feature.name}
+        @json[:features] << @current_object
+      end
+
+      def before_tags(tags)
+        @current_object[:tags] = tags.tag_names
+      end
+
+      def before_background(background)
+        background = {}
+        @current_object[:background] = background
+        @current_object = background
+      end
+
+      def after_background(background)
+        @current_object = last_feature
+      end
+
+      def before_feature_element(feature_element)
+        elements = @current_object[:elements] ||= []
+
+        # change current object to the feature_element
+        @current_object = {}
+        elements << @current_object
+      end
+
+      def scenario_name(keyword, name, file_colon_line, source_indent)
+        @current_object[:keyword] = keyword
+        @current_object[:name] = name
+        @current_object[:file_colon_line] = file_colon_line
+      end
+
+      def before_steps(steps)
+        @current_object[:steps] = []
+      end
+
+      def before_step(step)
+        @current_step = {}
+        @current_object[:steps] << @current_step
+      end
+
+      def before_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
+        if exception
+          @current_step[:exception] = exception_hash_for(exception)
+        end
+      end
+
+      def step_name(keyword, step_match, status, source_indent, background)
+        @current_step[:status]          = status
+        @current_step[:name]            = "#{keyword}#{step_match.name || step_match.format_args}" # ?
+        @current_step[:file_colon_line] = step_match.file_colon_line
+      end
+
+      def after_step(step)
+        @current_step = nil
+      end
+
+      def before_examples(examples)
+        @current_object[:examples] = {}
+      end
+
+      def examples_name(keyword, name)
+        @current_object[:examples][:name] = "#{keyword} #{name}"
+      end
+
+      def before_outline_table(*args)
+        @current_object[:examples][:table] = []
+      end
+
+      def before_table_row(row)
+        @current_row = {:cells => []}
+
+        if @current_object.member? :examples
+          @current_object[:examples][:table] << @current_row
+        elsif @current_step
+          (@current_step[:table] ||= []) << @current_row
+        else
+          internal_error
+        end
+      end
+
+      def table_cell_value(value, status)
+        @current_row[:cells] << {:text => value, :status => status}
+      end
+
+      def after_table_row(row)
+        if row.exception
+          @current_row[:exception] = exception_hash_for(row.exception)
+        end
+        @current_row = nil
+      end
+
+      def py_string(string)
+        @current_step[:py_string] = string
+      end
+
+      def after_feature_element(feature_element)
+        # change current object back to the last feature
+        @current_object = last_feature
+      end
+
+      def after_features(features)
+        @io.write json_string
+        @io.flush
+      end
+
+      private
+
+      def json_string
+        @json.to_json
+      end
+
+      def last_feature
+        @json[:features].last
+      end
+
+      def exception_hash_for(e)
+        {
+          :class     => e.class.name,
+          :message   => e.message,
+          :backtrace => e.backtrace
+        }
+      end
+
+      def internal_error
+        raise Error, "you've found a bug in the JSON formatter!"
+      end
+
+    end # Json
+  end # Formatter
+end # Cucumber
+

data/lib/cucumber/formatter/json_pretty.rb

@@ -0,0 +1,14 @@
+require "cucumber/formatter/json"
+
+module Cucumber
+  module Formatter
+    # The formatter used for <tt>--format json_pretty</tt>
+    class JsonPretty < Json
+
+      def json_string
+        JSON.pretty_generate @json
+      end
+
+    end
+  end
+end

data/lib/cucumber/js_support/js_dsl.js

@@ -20,8 +20,16 @@ var CucumberJsDsl = {
     CucumberJsDsl.__registerJsHook('after', tag_expressions_or_func, func);
   },
 
+  steps: function(step_names){
+    jsLanguage.steps(step_names);
+  },
+
   Table: function(raw_table){
-     this.raw = raw_table;
+    //TODO: Create a ruby table and send it back for use in js world
+  },
+
+  world: function(files){
+    jsLanguage.world(files);
   },
 
   __registerJsHook: function(label, tag_expressions_or_func, func){
@@ -36,34 +44,14 @@ var CucumberJsDsl = {
   }
 }
 
-CucumberJsDsl.Table.prototype.hashes = function(){
-  var rows = this.rows();
-  var headers = this.headers();
-  var hashes = [];
-
-  for (var rowIndex in rows){
-    var hash_row = [];
-    for (var cellIndex in headers){
-      hash_row[headers[cellIndex]] = rows[rowIndex][cellIndex];
-    }
-    hashes[rowIndex] = hash_row;
-  }
-  return hashes;
-}
-
-CucumberJsDsl.Table.prototype.rows = function(){
-  return this.raw.slice(1);
-}
-
-CucumberJsDsl.Table.prototype.headers = function(){
-  var raw_cells = this.raw.slice(0);
-  return raw_cells.shift();
-}
-
 var Given = CucumberJsDsl.registerStepDefinition;
 var When = CucumberJsDsl.registerStepDefinition;
 var Then = CucumberJsDsl.registerStepDefinition;
 
 var Before = CucumberJsDsl.beforeHook;
 var After = CucumberJsDsl.afterHook;
-var Transform = CucumberJsDsl.registerTransform;
+var Transform = CucumberJsDsl.registerTransform;
+
+var World = CucumberJsDsl.world;
+
+var steps = CucumberJsDsl.steps;

data/lib/cucumber/js_support/js_language.rb

@@ -1,3 +1,4 @@
+gem 'therubyracer', '>=0.7.1'
 require 'v8'
 
 require 'cucumber/js_support/js_snippets'
@@ -7,7 +8,7 @@ module Cucumber
 
     def self.argument_safe_string(string)
       arg_string = string.to_s.gsub(/[']/, '\\\\\'')
-      "'#{arg_string.gsub("\n", '\n')}'"
+      arg_string.gsub("\n", '\n')
     end
 
     class JsWorld
@@ -16,15 +17,7 @@ module Cucumber
       end
 
       def execute(js_function, args=[])
-        js_args = args.map do |arg|
-          if arg.is_a?(Ast::Table)
-            "new CucumberJsDsl.Table(#{arg.raw.inspect})"
-          else
-            JsSupport.argument_safe_string(arg)
-          end
-        end
-
-        @world.eval("(#{js_function.ToString})(#{js_args.join(',')});")
+        js_function.call(*args)
       end
 
       def method_missing(method_name, *args)
@@ -34,7 +27,7 @@ module Cucumber
 
     class JsStepDefinition
       def initialize(js_language, regexp, js_function)
-        @js_language, @regexp, @js_function = js_language, regexp.ToString, js_function
+        @js_language, @regexp, @js_function = js_language, regexp.to_s, js_function
       end
 
       def invoke(args)
@@ -45,7 +38,7 @@ module Cucumber
       def arguments_from(step_name)
         matches = eval_js "#{@regexp}.exec('#{step_name}')"
         if matches
-          matches[1..-1].map do |match|
+          matches.to_a[1..-1].map do |match|
             JsArg.new(match)
           end
         end
@@ -73,17 +66,17 @@ module Cucumber
 
     class JsTransform
       def initialize(js_language, regexp, js_function)
-        @js_language, @regexp, @js_function = js_language, regexp.ToString, js_function
+        @js_language, @regexp, @js_function = js_language, regexp.to_s, js_function
       end
 
       def match(arg)
         arg = JsSupport.argument_safe_string(arg)
-        matches = eval_js "#{@regexp}.exec(#{arg});"
-        matches ? matches[1..-1] : nil
+        matches = (eval_js "#{@regexp}.exec('#{arg}');").to_a
+        matches.empty? ? nil : matches[1..-1]
       end
 
       def invoke(arg)
-        @js_language.current_world.execute(@js_function, [arg])
+        @js_function.call([arg])
       end
     end
 
@@ -117,10 +110,17 @@ module Cucumber
         @world.load(js_file)
       end
 
+      def world(js_files)
+        js_files.each do |js_file|
+          load_code_file("#{path_to_load_js_from}#{js_file}")
+        end
+      end
+
       def alias_adverbs(adverbs)
       end
 
       def begin_scenario(scenario)
+        @language = scenario.language
       end
 
       def end_scenario
@@ -157,6 +157,21 @@ module Cucumber
         @world
       end
 
+      def steps(steps_text)
+        @step_mother.invoke_steps(steps_text, @language)
+      end
+
+      private
+      def path_to_load_js_from
+        paths = @step_mother.options[:paths]
+        if paths.empty?
+          '' # Using rake
+        else
+          path = paths[0][/(^.*\/?features)/, 0]
+          path ? "#{path}/../" : '../'
+        end
+      end
+
     end
   end
 end

data/lib/cucumber/rb_support/rb_language.rb

@@ -41,6 +41,26 @@ module Cucumber
         @step_definitions = []
         RbDsl.rb_language = self
         @world_proc = @world_modules = nil
+        enable_rspec_expectations_if_available
+      end
+
+      def enable_rspec_expectations_if_available
+        begin
+          # RSpec >=2.0
+          require 'rspec/expectations'
+          @rspec_matchers = ::RSpec::Matchers
+        rescue LoadError => try_rspec_1_2_4_or_higher
+          begin
+            require 'spec/expectations'
+            require 'spec/runner/differs/default'
+            require 'ostruct'
+            options = OpenStruct.new(:diff_format => :unified, :context_lines => 3)
+            Spec::Expectations.differ = Spec::Expectations::Differs::Default.new(options)
+            @rspec_matchers = ::Spec::Matchers
+          rescue LoadError => give_up
+            @rspec_matchers = Module.new{}
+          end
+        end
       end
 
       # Gets called for each file under features (or whatever is overridden
@@ -132,7 +152,7 @@ module Cucumber
       private
 
       PARAM_PATTERN = /"([^"]*)"/
-      ESCAPED_PARAM_PATTERN = '"([^\\"]*)"'
+      ESCAPED_PARAM_PATTERN = '"([^"]*)"'
 
       def create_world
         if(@world_proc)
@@ -145,8 +165,7 @@ module Cucumber
 
       def extend_world
         @current_world.extend(RbWorld)
-        @current_world.extend(::Spec::Matchers) if defined?(::Spec::Matchers)   # RSpec 1.x
-        @current_world.extend(::Rspec::Matchers) if defined?(::Rspec::Matchers) # RSpec 2.x
+        @current_world.extend(@rspec_matchers)
         (@world_modules || []).each do |mod|
           @current_world.extend(mod)
         end

data/spec/cucumber/ast/scenario_spec.rb

@@ -33,7 +33,7 @@ module Cucumber
             Step.new(8, "Given", "y is 5")
           ]
         )
-        scenario.feature = mock('feature', :null_object => true)
+        scenario.feature = mock('feature').as_null_object
         @visitor.visit_feature_element(scenario)
 
         $y.should == nil

data/spec/cucumber/cli/configuration_spec.rb

@@ -54,7 +54,7 @@ module Cli
     end
 
     it "should require files in vendor/{plugins,gems}/*/cucumber/*.rb" do
-      given_the_following_files("/vendor/gems/gem_a/cucumber/bar.rb", 
+      given_the_following_files("/vendor/gems/gem_a/cucumber/bar.rb",
                                 "/vendor/plugins/plugin_a/cucumber/foo.rb")
 
       config.parse!(%w{--require /features})
@@ -142,7 +142,7 @@ module Cli
 
       it "allows --strict to be set by a profile" do
         given_cucumber_yml_defined_as({'bongo' => '--strict'})
-        
+
         config.parse!(%w{--profile bongo})
         config.options[:strict].should be_true
       end
@@ -347,20 +347,6 @@ END_OF_MESSAGE
       end
     end
 
-    describe "diff output" do
-
-      it "is enabled by default" do
-        config.diff_enabled?.should be_true
-      end
-
-      it "is disabled when the --no-diff option is supplied" do
-        config.parse!(%w{--no-diff})
-
-        config.diff_enabled?.should be_false
-      end
-
-    end
-
     it "should accept multiple --name options" do
       config.parse!(['--name', "User logs in", '--name', "User signs up"])
 
@@ -375,6 +361,12 @@ END_OF_MESSAGE
       config.options[:name_regexps].should include(/User signs up/)
     end
 
+    it "should preserve the order of the feature files" do
+      config.parse!(%w{b.feature c.feature a.feature})
+
+      config.feature_files.should == ["b.feature", "c.feature", "a.feature"]
+    end
+
     it "should search for all features in the specified directory" do
       File.stub!(:directory?).and_return(true)
       Dir.should_receive(:[]).with("feature_directory/**/*.feature").

data/spec/cucumber/cli/main_spec.rb

@@ -41,7 +41,7 @@ module Cucumber
             Object.stub!(:const_defined?).and_return(true)
             mock_module.stub!(:const_defined?).and_return(true)
 
-            f = stub('formatter', :null_object => true)
+            f = stub('formatter').as_null_object
 
             Object.should_receive(:const_get).with('ZooModule').and_return(mock_module)
             mock_module.should_receive(:const_get).with('MonkeyFormatterClass').and_return(mock('formatter class', :new => f))
@@ -55,8 +55,8 @@ module Cucumber
       describe "setup step sequence" do
         
         it "should load files and execute hooks in order" do
-          Configuration.stub!(:new).and_return(configuration = mock('configuration', :null_object => true))
-          step_mother = mock('step mother', :null_object => true)
+          Configuration.stub!(:new).and_return(configuration = mock('configuration').as_null_object)
+          step_mother = mock('step mother').as_null_object
           configuration.stub!(:drb?).and_return false
           cli = Main.new(%w{--verbose example.feature}, @out)
           cli.stub!(:require)
@@ -96,13 +96,13 @@ module Cucumber
 
       context "--drb" do
         before(:each) do
-          @configuration = mock('Configuration', :drb? => true, :null_object => true)
+          @configuration = mock('Configuration', :drb? => true).as_null_object
           Configuration.stub!(:new).and_return(@configuration)
 
           @args = ['features']
 
           @cli = Main.new(@args, @out, @err)
-          @step_mother = mock('StepMother', :null_object => true)
+          @step_mother = mock('StepMother').as_null_object
         end
 
         it "delegates the execution to the DRB client passing the args and streams" do