kosmas58-cucumber 0.3.102 → 0.3.103

data/spec/cucumber/formatter/progress_spec.rb

@@ -8,13 +8,18 @@ module Cucumber
       before(:each) do
         Term::ANSIColor.coloring = false
         @out = StringIO.new
-        @progress = Progress.new(mock("step mother"), @out, {})
+        progress = Progress.new(mock("step mother"), @out, {})
+        @visitor = Ast::TreeWalker.new(nil, [progress])
       end
  
       describe "visiting a table cell value without a status" do
         it "should take the status from the last run step" do
-          @progress.visit_step_result('', '', nil, :failed, nil, 10, nil)
-          @progress.visit_table_cell_value('value', nil)
+          @visitor.visit_step_result('', '', nil, :failed, nil, 10, nil)
+          outline_table = mock()
+          outline_table.should_receive(:accept) do |visitor|
+            visitor.visit_table_cell_value('value', nil)
+          end
+          @visitor.visit_outline_table(outline_table)
 
           @out.string.should == "FF"
         end
@@ -22,7 +27,7 @@ module Cucumber
 
       describe "visiting a table cell which is a table header" do
         it "should not output anything" do
-          @progress.visit_table_cell_value('value', :skipped_param)
+          @visitor.visit_table_cell_value('value', :skipped_param)
 
           @out.string.should == ""
         end

data/spec/cucumber/parser/feature_parser_spec.rb

@@ -361,34 +361,38 @@ Given I am a step
 
       describe "Filtering" do
         it "should filter outline tables" do
-          ff = FeatureFile.new(
-            File.dirname(__FILE__) + '/../../../examples/self_test/features/outline_sample.feature:12')
-          f = ff.parse(@step_mother, {:lang => 'en'})
-          f.to_sexp.should ==
+          path = '/self_test/features/outline_sample.feature'
+          f = parse_example_file("#{path}:12")
+          actual_sexp = f.to_sexp
+          
+          # check path is equivalent, if not same
+          File.expand_path(actual_sexp[1]).should == File.expand_path(File.dirname(__FILE__) + "/../../../examples#{path}")
+          actual_sexp[1] = 'made/up/path.feature'
+          actual_sexp.should ==
           [:feature,
-           "./spec/cucumber/parser/../../../examples/self_test/features/outline_sample.feature",
-           "Feature: Outline Sample",
-           [:scenario_outline,
-            "Scenario Outline:",
-            "Test state",
-            [:step, 6, "Given", "<state> without a table"],
-            [:step, 7, "Given", "<other_state> without a table"],
-            [:examples,
-             "Examples:",
-             "Rainbow colours",
-             [:table,
-              [:row, 9, [:cell, "state"], [:cell, "other_state"]],
-#              [:row, 10, [:cell, "missing"], [:cell, "passing"]],
-#              [:row, 11, [:cell, "passing"], [:cell, "passing"]],
-              [:row, 12, [:cell, "failing"], [:cell, "passing"]]]]
-            # ,
-            # [:examples,
-            #  "Examples:",
-            #  "Only passing",
-            #  [:table,
-            #   [:row, 14, [:cell, "state"], [:cell, "other_state"]],
-            #   [:row, 15, [:cell, "passing"], [:cell, "passing"]]]]]
-              ]]
+            'made/up/path.feature',
+            "Feature: Outline Sample",
+            [:scenario_outline,
+              "Scenario Outline:",
+              "Test state",
+              [:step, 6, "Given", "<state> without a table"],
+              [:step, 7, "Given", "<other_state> without a table"],
+              [:examples,
+                "Examples:",
+                "Rainbow colours",
+                [:table,
+                  [:row, 9, 
+                    [:cell, "state"], 
+                    [:cell, "other_state"]
+                  ],
+                  [:row, 12, 
+                    [:cell, "failing"], 
+                    [:cell, "passing"]
+                  ]
+                ]
+              ]
+            ]
+          ]
         end
       end
     end

data/spec/cucumber/rb_support/regexp_argument_matcher_spec.rb

@@ -0,0 +1,18 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+require 'cucumber/rb_support/regexp_argument_matcher'
+
+module Cucumber
+  module RbSupport
+    describe RegexpArgumentMatcher do
+      it "should create 2 arguments" do
+        arguments = RegexpArgumentMatcher.arguments_from(/I (\w+) (\w+)/, "I like fish")
+        arguments.map{|argument| [argument.val, argument.pos]}.should == [["like", 2], ["fish", 7]]
+      end
+
+      it "should create 2 arguments when first group is optional" do
+        arguments = RegexpArgumentMatcher.arguments_from(/should( not)? be flashed '([^']*?)'$/, "I should be flashed 'Login failed.'")
+        arguments.map{|argument| [argument.val, argument.pos]}.should == [[nil, nil], ["Login failed.", 21]]
+      end
+    end
+  end
+end

data/spec/cucumber/step_match_spec.rb

@@ -0,0 +1,40 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'cucumber/rb_support/rb_step_definition'
+require 'cucumber/rb_support/rb_language'
+
+module Cucumber
+  describe StepMatch do
+    before do
+      @rb_language = RbSupport::RbLanguage.new(nil)
+    end
+
+    def stepdef(regexp)
+      RbSupport::RbStepDefinition.new(@rb_language, regexp, lambda{})
+    end
+
+    it "should format groups with format string" do
+      m = stepdef(/I (\w+) (\d+) (\w+) this (\w+)/).step_match("I ate 1 egg this morning", nil)
+      m.format_args("<span>%s</span>").should == "I <span>ate</span> <span>1</span> <span>egg</span> this <span>morning</span>"
+    end
+
+    it "should format groups with format string when there are dupes" do
+      m = stepdef(/I (\w+) (\d+) (\w+) this (\w+)/).step_match("I bob 1 bo this bobs", nil)
+      m.format_args("<span>%s</span>").should == "I <span>bob</span> <span>1</span> <span>bo</span> this <span>bobs</span>"
+    end
+
+    it "should format groups with block" do
+      m = stepdef(/I (\w+) (\d+) (\w+) this (\w+)/).step_match("I ate 1 egg this morning", nil)
+      m.format_args(&lambda{|m| "<span>#{m}</span>"}).should == "I <span>ate</span> <span>1</span> <span>egg</span> this <span>morning</span>"
+    end
+
+    it "should format groups with proc object" do
+      m = stepdef(/I (\w+) (\d+) (\w+) this (\w+)/).step_match("I ate 1 egg this morning", nil)
+      m.format_args(lambda{|m| "<span>#{m}</span>"}).should == "I <span>ate</span> <span>1</span> <span>egg</span> this <span>morning</span>"
+    end
+
+    it "should format groups even when first group is optional and not matched" do
+      m = stepdef(/should( not)? be flashed '([^']*?)'$/).step_match("I should be flashed 'Login failed.'", nil)
+      m.format_args("<span>%s</span>").should == "I should be flashed '<span>Login failed.</span>'"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kosmas58-cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.3.102
+  version: 0.3.103
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-22 00:00:00 -07:00
+date: 2009-09-24 00:00:00 -07:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -463,13 +463,14 @@ files:
 - lib/cucumber/rails/world.rb
 - lib/cucumber/rake/task.rb
 - lib/cucumber/rb_support/rb_dsl.rb
-- lib/cucumber/rb_support/rb_group.rb
 - lib/cucumber/rb_support/rb_hook.rb
 - lib/cucumber/rb_support/rb_language.rb
 - lib/cucumber/rb_support/rb_step_definition.rb
 - lib/cucumber/rb_support/rb_transform.rb
 - lib/cucumber/rb_support/rb_world.rb
+- lib/cucumber/rb_support/regexp_argument_matcher.rb
 - lib/cucumber/rspec_neuter.rb
+- lib/cucumber/step_argument.rb
 - lib/cucumber/step_match.rb
 - lib/cucumber/step_mother.rb
 - lib/cucumber/version.rb
@@ -515,7 +516,9 @@ files:
 - spec/cucumber/parser/feature_parser_spec.rb
 - spec/cucumber/parser/table_parser_spec.rb
 - spec/cucumber/rb_support/rb_step_definition_spec.rb
+- spec/cucumber/rb_support/regexp_argument_matcher_spec.rb
 - spec/cucumber/sell_cucumbers.feature
+- spec/cucumber/step_match_spec.rb
 - spec/cucumber/step_mother_spec.rb
 - spec/cucumber/treetop_parser/empty_feature.feature
 - spec/cucumber/treetop_parser/empty_scenario.feature

data/lib/cucumber/rb_support/rb_group.rb

@@ -1,32 +0,0 @@
-module Cucumber
-  module RbSupport
-    # A Group encapsulates data from a regexp match.
-    # A Group instance has to attributes:
-    #
-    # * The value of the group
-    # * The start index from the matched string where the group value starts
-    #
-    # See rb_group_spec.rb for examples
-    #
-    class RbGroup
-      attr_reader :val, :start
-
-      def self.groups_from(regexp, step_name)
-        match = regexp.match(step_name)
-        if match
-          n = 0
-          match.captures.map do |val|
-            n += 1
-            new(val, match.offset(n)[0])
-          end
-        else
-          nil
-        end
-      end
-
-      def initialize(val, start)
-        @val, @start = val, start
-      end
-    end
-  end
-end