aslakhellesoy-cucumber 0.1.99.23 → 0.1.100.1

data/spec/cucumber/ast/feature_factory.rb

@@ -29,11 +29,20 @@ module Cucumber
            I like
           Cucumber sandwich
         }, 10)
+        
+        background = Ast::Background.new(Ast::Comment.new(""), 2, "Background:",
+          [
+            Step.new(3, "Given", "a passing step")
+          ]
+        )
+        
         f = Ast::Feature.new(
+          background,
           Ast::Comment.new("# My feature comment\n"),
           Ast::Tags.new(6, ['one', 'two']),
           "Pretty printing",
           [Ast::Scenario.new(
+            background,
             Ast::Comment.new("    # My scenario comment  \n# On two lines \n"),
             Ast::Tags.new(8, ['three', 'four']),
             9,
@@ -46,7 +55,7 @@ module Cucumber
           )]
         )
         f.file = 'features/pretty_printing.feature'
-        f.features = Features.new(Filter.new({:tags => []}))
+        f.features = Features.new
         f
       end
     end

data/spec/cucumber/ast/feature_spec.rb

@@ -14,46 +14,23 @@ module Cucumber
           [:comment, "# My feature comment\n"], 
           [:tag, "one"], 
           [:tag, "two"], 
+          [:background, 2, 'Background:',
+            [:step, 3, "Given", "a passing step"]],
           [:scenario, 9, "Scenario:", 
             "A Scenario", 
             [:comment, "    # My scenario comment  \n# On two lines \n"], 
             [:tag, "three"], 
-            [:tag, "four"], 
-            [:step, 10, "Given", "a passing step with an inline arg:",
+            [:tag, "four"],
+            [:step_invocation, 3, "Given", "a passing step"], # From the background
+            [:step_invocation, 10, "Given", "a passing step with an inline arg:",
               [:table, 
                 [:row, 
                   [:cell, "1"], [:cell, "22"], [:cell, "333"]], 
                 [:row, 
                   [:cell, "4444"], [:cell, "55555"], [:cell, "666666"]]]], 
-            [:step, 11, "Given", "a happy step with an inline arg:", 
+            [:step_invocation, 11, "Given", "a happy step with an inline arg:", 
               [:py_string, "\n I like\nCucumber sandwich\n"]], 
-            [:step, 12, "Given", "a failing step"]]]
-      end
-
-      it "should only visit scenarios that match" do
-        s1 = mock("Scenario 1")
-        s2 = mock("Scenario 2")
-        s3 = mock("Scenario 3")
-        [s1, s2, s3].each{|s| s.should_receive(:feature=)}
-        f = Ast::Feature.new(
-          Ast::Comment.new(""),
-          Ast::Tags.new(22, []),
-          "My feature",
-          [s1, s2, s3]
-        )
-        features = mock('Features')
-        f.features = features
-
-        f.lines = [33]
-
-        features.should_receive(:visit?).with(s1, [33]).and_return(false)
-        features.should_receive(:visit?).with(s2, [33]).and_return(true)
-        features.should_receive(:visit?).with(s3, [33]).and_return(false)
-
-        s2.should_receive(:accept)
-
-        visitor = Visitor.new(nil)
-        visitor.visit_feature(f)
+            [:step_invocation, 12, "Given", "a failing step"]]]
       end
     end
   end

data/spec/cucumber/ast/scenario_outline_spec.rb

@@ -9,6 +9,7 @@ module Cucumber
       before do
         @step_mother = Object.new
         @step_mother.extend(StepMother)
+
         @step_mother.Given(/^there are (\d+) cucumbers$/) do |n|
           @initial = n.to_i
         end
@@ -23,6 +24,7 @@ module Cucumber
         end
 
         @scenario_outline = ScenarioOutline.new(
+          background=nil,
           Comment.new(""),
           Tags.new(18, []),
           19,
@@ -45,6 +47,7 @@ module Cucumber
               ]
             ]
           ]
+          
         )
       end
 

data/spec/cucumber/ast/scenario_spec.rb

@@ -9,9 +9,6 @@ module Cucumber
         @step_mother = Object.new
         @step_mother.extend(StepMother)
         $x = $y = nil
-        @step_mother.Before do
-          $x = 3
-        end
         @step_mother.Given /y is (\d+)/ do |n|
           $y = n.to_i
         end
@@ -19,23 +16,9 @@ module Cucumber
         @visitor.options = {}
       end
 
-      it "should execute Before blocks before steps" do
-        scenario = Scenario.new(
-          comment=Comment.new(""), 
-          tags=Tags.new(98,[]),
-          line=99,
-          keyword="", 
-          name="", 
-          steps=[
-            Step.new(7, "Given", "y is 5")
-          ])
-        @visitor.visit_feature_element(scenario)
-        $x.should == 3
-        $y.should == 5
-      end
-
       it "should skip steps when previous is not passed" do
         scenario = Scenario.new(
+          background=nil,
           comment=Comment.new(""),
           tags=Tags.new(98, []), 
           line=99,
@@ -47,20 +30,20 @@ module Cucumber
           ])
         @visitor.visit_feature_element(scenario)
 
-        $x.should == 3
         $y.should == nil
       end
 
       it "should be at exact line" do
-        s = Scenario.new(comment=Comment.new(""), 
+        s = Scenario.new(background=nil, comment=Comment.new(""), 
           tags=Tags.new(44, []), 45, keyword="", name="", steps=[])
 
-        s.should be_at_lines([44])
-        s.should be_at_lines([45])
+        s.should be_matches_lines([44])
+        s.should be_matches_lines([45])
       end
 
       it "should be at line if tags or steps are" do
         s = Scenario.new(
+          background=nil,
           comment=Comment.new(""), 
           tags=Tags.new(43, []), 
           line=45,
@@ -73,9 +56,9 @@ module Cucumber
           ]
         )
 
-        s.should be_at_lines([43])
-        s.should be_at_lines([47])
-        s.should_not be_at_lines([49])
+        s.should be_matches_lines([43])
+        s.should be_matches_lines([47])
+        s.should_not be_matches_lines([49])
       end
     end
   end

data/spec/cucumber/ast/step_collection_spec.rb

@@ -0,0 +1,8 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+module Cucumber
+  module Ast
+    describe StepCollection do
+    end
+  end
+end

data/spec/cucumber/ast/step_spec.rb

@@ -5,40 +5,48 @@ require 'cucumber/core_ext/string'
 
 module Cucumber
   module Ast
-    describe StepMother do
-      it "should calculate comment padding" do
-        scenario = Scenario.new(comment=nil, tags=nil, line=nil, keyword='Given', name='Gazpacho', steps=[
-          Step.new(22, "Given", "tøtal 13"),
-          Step.new(23, "And",   "the total 15")
-        ])
-        step1, step2 = *scenario.instance_variable_get('@steps')
+    describe Step do
+      it "should replace arguments in name" do
+        step = Step.new(1, 'Given', 'a <color> cucumber')
 
-        step1.source_indent.should == 2
-        step2.source_indent.should == 0
+        invocation_table = Table.new([
+          %w{color taste},
+          %w{green juicy}
+        ])
+        cells = invocation_table.cells_rows[1]
+        step_invocation = step.step_invocation_from_cells(cells)
+        
+        step_invocation.name.should == 'a green cucumber'
       end
-    end
-    
-    describe Step do
-      describe "execute step with arguments" do
-      
-        it "should replace arguments in multiline args" do
-          mock_multiline_arg = mock('multiline arg')
-          step = Step.new(23, 'Given', '<test>', mock_multiline_arg)
 
-          mock_multiline_arg.should_receive(:arguments_replaced).with({'<test>' => '10'}).and_return(mock_multiline_arg)
+      it "should replace arguments in table arg" do
+        arg_table = Table.new([%w{taste_<taste> color_<color>}])
+
+        step = Step.new(1, 'Given', 'a <color> cucumber', arg_table)
+
+        invocation_table = Table.new([
+          %w{color taste},
+          %w{green juicy}
+        ])
+        cells = invocation_table.cells_rows[1]
+        step_invocation = step.step_invocation_from_cells(cells)
         
-          step.execute_with_arguments({'test' => '10'}, stub('world'), :passed, visitor=nil, line=-1)
-        end
-       
-        it "should invoke step with replaced multiline args" do
-          mock_step_definition = mock('step definition')
-          mock_multiline_arg_replaced = mock('multiline arg replaced')
-          mock_multiline_arg = mock('multiline arg', :arguments_replaced => mock_multiline_arg_replaced)
-          step = Step.new(45, 'Given', '<test>', mock_multiline_arg)
+        step_invocation.instance_variable_get('@multiline_arg').raw.should == [%w{taste_juicy color_green}]
+      end
+
+      it "should replace arguments in py string arg" do
+        py_string = PyString.new(1, 2, 'taste_<taste> color_<color>', 0)
+
+        step = Step.new(1, 'Given', 'a <color> cucumber', py_string)
+
+        invocation_table = Table.new([
+          %w{color taste},
+          %w{green juicy}
+        ])
+        cells = invocation_table.cells_rows[1]
+        step_invocation = step.step_invocation_from_cells(cells)
         
-          step.execute_with_arguments({'test' => '10'}, stub('world'), :passed, visitor=nil, line=-1)
-        end
-  
+        step_invocation.instance_variable_get('@multiline_arg').to_s.should == 'taste_juicy color_green'
       end
     end
   end

data/spec/cucumber/ast/tags_spec.rb

@@ -8,27 +8,11 @@ module Cucumber
       end
 
       it "should be among other tags" do
-        @tags.should be_among(%w{one})
-      end
-
-      it "should be among other tags even with @ prefix" do
-        @tags.should be_among(%w{@one})
-      end
-
-      it "should not be among other tags" do
-        @tags.should_not be_among(%w{one ~two})
-      end
-
-      it "should not be among other tags with @ prefix" do
-        @tags.should_not be_among(%w{one ~@two})
-      end
-
-      it "should be among other tags with irrelevant negative tag" do
-        @tags.should be_among(%w{~bacon})
+        @tags.should have_tags(%w{one})
       end
 
       it "should not be among other tags with irrelevent tag" do
-        @tags.should_not be_among(%w{bacon})
+        @tags.should_not have_tags(%w{bacon})
       end
     end
   end

data/spec/cucumber/cli/configuration_spec.rb

@@ -201,6 +201,13 @@ END_OF_MESSAGE
       config.parse!(['--no-color'])
     end
     
+    it "should parse tags" do
+      config = Configuration.new(nil)
+      includes, excludes = config.parse_tags("one,~two,@three,~@four")
+      includes.should == ['one', 'three']
+      excludes.should == ['two', 'four']
+    end
+    
     describe "--backtrace" do
       before do
         Exception.cucumber_full_backtrace = false

data/spec/cucumber/cli/main_spec.rb

@@ -25,7 +25,7 @@ module Cli
     describe "verbose mode" do
       
       before(:each) do
-        @empty_feature = Ast::Feature.new(Ast::Comment.new(''), Ast::Tags.new(2, []), "Feature", [])
+        @empty_feature = Ast::Feature.new(nil, Ast::Comment.new(''), Ast::Tags.new(2, []), "Feature", [])
         Dir.stub!(:[])
       end
 

data/spec/cucumber/parser/feature_parser_spec.rb

@@ -94,14 +94,15 @@ Feature: hi
     Given Pepper
 
 @st3 
-   @st4 @ST5 @#^%&ST6**!
+   @st4    @ST5  @#^%&ST6**!
   Scenario: Second}).to_sexp.should ==
           [:feature, "Feature: hi",
             [:comment, "# FC\n  "],
             [:tag, "ft"],
             [:scenario, 6, 'Scenario:', 'First',
               [:tag, "st1"], [:tag, "st2"],
-              [:step, 7, "Given", "Pepper"]],
+              [:step_invocation, 7, "Given", "Pepper"]
+            ],
             [:scenario, 11, 'Scenario:', 'Second',
               [:tag, "st3"], [:tag, "st4"], [:tag, "ST5"], [:tag, "#^%&ST6**!"]]]
         end
@@ -135,7 +136,7 @@ Scenario: bar
           parse("Feature: Hi\nScenario: Hello\nGiven I am a step\n").to_sexp.should ==
           [:feature, "Feature: Hi",
             [:scenario, 2, "Scenario:", "Hello",
-              [:step, 3, "Given", "I am a step"]]]
+              [:step_invocation, 3, "Given", "I am a step"]]]
         end
 
         it "should have steps with inline table" do
@@ -146,7 +147,7 @@ Given I have a table
 }).to_sexp.should ==
           [:feature, "Feature: Hi",
             [:scenario, 2, "Scenario:", "Hello",
-              [:step, 3, "Given", "I have a table",
+              [:step_invocation, 3, "Given", "I have a table",
                 [:table,
                   [:row,
                     [:cell, "a"],
@@ -167,7 +168,7 @@ Given I have a string
 }).to_sexp.should ==
           [:feature, "Feature: Hi",
             [:scenario, 2, "Scenario:", "Hello",
-              [:step, 3, "Given", "I have a string",
+              [:step_invocation, 3, "Given", "I have a string",
                 [:py_string, "hello\nworld"]]]]
         end
       end

data/spec/cucumber/step_definition_spec.rb

@@ -8,7 +8,7 @@ module Cucumber
   describe StepDefinition do
     before do
       extend StepMother
-      @world = new_world
+      @world = new_world!
       $inside = nil
     end
 
@@ -20,7 +20,7 @@ module Cucumber
         $inside = true
       end
 
-      step_definition("Outside").execute(nil, @world)
+      step_match("Outside").invoke(@world, nil)
       $inside.should == true
     end
 
@@ -32,7 +32,7 @@ module Cucumber
         $inside = table.raw[0][0]
       end
 
-      step_definition("Outside").execute(nil, @world)
+      step_match("Outside").invoke(@world, nil)
       $inside.should == 'inside'
     end
 
@@ -45,7 +45,7 @@ module Cucumber
       step.should_receive(:exception=)
       lambda do
         @world.__cucumber_current_step = step
-        step_definition('Outside').execute(nil, @world)
+        step_match('Outside').invoke(@world, nil)
       end.should raise_error(Undefined, 'Undefined step: "Inside"')
     end
 
@@ -55,7 +55,7 @@ module Cucumber
       end
 
       lambda do
-        step_definition("Outside").execute(nil, @world)
+        step_match("Outside").invoke(@world, nil)
       end.should raise_error(Pending, "Do me!")
     end
     

data/spec/cucumber/step_mother_spec.rb

@@ -15,7 +15,7 @@ module Cucumber
       end
       @step_mother.Given(/nope something else/) do |what, month|
       end
-      format = @step_mother.step_definition("it snows in april").format_args("it snows in april", "[%s]")
+      format = @step_mother.step_match("it snows in april").format_args("[%s]")
       format.should == "it [snows] in [april]"
     end
 
@@ -24,7 +24,7 @@ module Cucumber
       @step_mother.Given(/Three blind (.*)/) {|animal|}
 
       lambda do
-        @step_mother.step_definition("Three blind mice")
+        @step_mother.step_match("Three blind mice")
       end.should raise_error(Ambiguous, %{Ambiguous match of "Three blind mice":
 
 spec/cucumber/step_mother_spec.rb:23:in `/Three (.*) mice/'
@@ -39,7 +39,7 @@ spec/cucumber/step_mother_spec.rb:24:in `/Three blind (.*)/'
       @step_mother.Given(/Three (.*)/) {|animal|}
 
       lambda do
-        @step_mother.step_definition("Three blind mice")
+        @step_mother.step_match("Three blind mice")
       end.should_not raise_error
     end
     
@@ -47,19 +47,19 @@ spec/cucumber/step_mother_spec.rb:24:in `/Three blind (.*)/'
       @step_mother.options = {:guess => true}
       right = @step_mother.Given(/Three (.*) mice/) {|disability|}
       wrong = @step_mother.Given(/Three (.*)/) {|animal|}
-      @step_mother.step_definition("Three blind mice").should == right
+      @step_mother.step_match("Three blind mice").step_definition.should == right
     end
     
     it "should pick right step definition when --guess is enabled and unequal number of capture groups" do
       @step_mother.options = {:guess => true}
       right = @step_mother.Given(/Three (.*) mice ran (.*)/) {|disability|}
       wrong = @step_mother.Given(/Three (.*)/) {|animal|}
-      @step_mother.step_definition("Three blind mice ran far").should == right
+      @step_mother.step_match("Three blind mice ran far").step_definition.should == right
     end
     
     it "should raise Undefined error when no step definitions match" do
       lambda do
-        @step_mother.step_definition("Three blind mice")
+        @step_mother.step_match("Three blind mice")
       end.should raise_error(Undefined)
     end