cucumber 0.3.101 → 0.3.102

data/spec/cucumber/core_ext/string_spec.rb

@@ -1,19 +1,24 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/../../../lib/cucumber/core_ext/string'
+require 'cucumber/core_ext/string'
+require 'cucumber/rb_support/rb_group'
 
 describe String, "#gzub" do
+  def groups(a)
+    a.map{|c| Cucumber::RbSupport::RbGroup.new(c[0], c[1])}
+  end
+  
   it "should format groups with format string" do
-    "I ate 1 egg this morning".gzub(/I (\w+) (\d+) (\w+) this (\w+)/, "<span>%s</span>").should ==
+    "I ate 1 egg this morning".gzub(groups([['ate', 2], ['1', 6], ['egg', 8],  ['morning', 17]]), "<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
-    "I bob 1 bo this bobs".gzub(/I (\w+) (\d+) (\w+) this (\w+)/, "<span>%s</span>").should ==
+    "I bob 1 bo this bobs".gzub(groups([['bob', 2], ['1', 6], ['bo', 8],  ['bobs', 16]]), "<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
-    f = "I ate 1 egg this morning".gzub(/I (\w+) (\d+) (\w+) this (\w+)/) do |m|
+    f = "I ate 1 egg this morning".gzub(groups([['ate', 2], ['1', 6], ['egg', 8],  ['morning', 17]])) do |m|
       "<span>#{m}</span>"
     end
     f.should == "I <span>ate</span> <span>1</span> <span>egg</span> this <span>morning</span>"
@@ -23,21 +28,14 @@ describe String, "#gzub" do
     proc = lambda do |m|
       "<span>#{m}</span>"
     end
-    f = "I ate 1 egg this morning".gzub(/I (\w+) (\d+) (\w+) this (\w+)/, proc)
+    f = "I ate 1 egg this morning".gzub(groups([['ate', 2], ['1', 6], ['egg', 8],  ['morning', 17]]), proc)
     f.should == "I <span>ate</span> <span>1</span> <span>egg</span> this <span>morning</span>"
   end
   
   it "should format groups with block with not all placeholders having a value" do
-    f = "another member named Bob joins the group".gzub(/(a|another) (user|member) named ([^ ]+)( who is not logged in)?/) do |m|
+    f = "another member named Bob joins the group".gzub(groups([['another', 0], ['member', 8], ['Bob', 21]])) do |m|
       "<span>#{m}</span>"
     end
     f.should == "<span>another</span> <span>member</span> named <span>Bob</span> joins the group"
   end
-
-  it "should format match groups in a textile table row" do
-    f = "I ate 1 egg this morning".gzub(/I (\w+) (\d+) (\w+) this (\w+)/) do |m|
-      "<span>#{m}</span>"
-    end
-    f.should == "I <span>ate</span> <span>1</span> <span>egg</span> this <span>morning</span>"
-  end
 end

data/spec/cucumber/parser/feature_parser_spec.rb

@@ -68,8 +68,8 @@ Feature: hi
           parse("# My comment\n@hello @world Feature: hi\n").to_sexp.should ==
           [:feature, nil, "Feature: hi",
             [:comment, "# My comment\n"],
-            [:tag, "hello"],
-            [:tag, "world"]]
+            [:tag, "@hello"],
+            [:tag, "@world"]]
         end
 
         it "should not take the tags as part of a multiline name feature element" do
@@ -77,7 +77,7 @@ Feature: hi
           [:feature, nil, "Feature: hi",
            [:scenario, 2, "Scenario:", "test"], 
            [:scenario, 4, "Scenario:", "another", 
-             [:tag, "hello"]]]
+             [:tag, "@hello"]]]
         end
 
         it "should parse a file with tags on a scenario" do
@@ -94,13 +94,13 @@ Feature: hi
   Scenario: Second}).to_sexp.should ==
           [:feature, nil, "Feature: hi",
             [:comment, "# FC\n  "],
-            [:tag, "ft"],
+            [:tag, "@ft"],
             [:scenario, 6, 'Scenario:', 'First',
-              [:tag, "st1"], [:tag, "st2"],
+              [:tag, "@st1"], [:tag, "@st2"],
               [:step_invocation, 7, "Given", "Pepper"]
             ],
             [:scenario, 11, 'Scenario:', 'Second',
-              [:tag, "st3"], [:tag, "st4"], [:tag, "ST5"], [:tag, "#^%&ST6**!"]]]
+              [:tag, "@st3"], [:tag, "@st4"], [:tag, "@ST5"], [:tag, "@#^%&ST6**!"]]]
         end
       end
       

data/spec/cucumber/step_mother_spec.rb

@@ -186,96 +186,99 @@ or http://wiki.github.com/aslakhellesoy/cucumber/a-whole-new-world.
   end
 
   describe StepMother, "step argument transformations" do
-    after(:each) do
-      # generally transforms are global, but state should be 
-      # cleared when testing them here at the unit level
-      class StepMother; @@transforms = [] end
+    before do
+      @dsl = Object.new
+      @dsl.extend(RbSupport::RbDsl)
+
+      @step_mother = StepMother.new
+      @step_mother.load_natural_language('en')
+      @rb = @step_mother.load_programming_language('rb')
     end
 
     describe "without capture groups" do
       it "complains when registering with a with no transform block" do
         lambda do
-          StepMother.register_transform('^abc$')
-        end.should raise_error(Cucumber::ArityMismatchError)
+          @dsl.Transform('^abc$')
+        end.should raise_error(Cucumber::RbSupport::RbTransform::MissingProc)
       end
       
       it "complains when registering with a zero-arg transform block" do
         lambda do
-          StepMother.register_transform('^abc$') {42}
-        end.should raise_error(Cucumber::ArityMismatchError)
+          @dsl.Transform('^abc$') {42}
+        end.should raise_error(Cucumber::RbSupport::RbTransform::MissingProc)
       end
 
       it "complains when registering with a splat-arg transform block" do
         lambda do
-          StepMother.register_transform('^abc$') {|*splat| 42 }
-        end.should raise_error(Cucumber::ArityMismatchError)
+          @dsl.Transform('^abc$') {|*splat| 42 }
+        end.should raise_error(Cucumber::RbSupport::RbTransform::MissingProc)
       end
 
       it "complains when transforming with an arity mismatch" do
         lambda do
-          StepMother.register_transform('^abc$') {|one, two| 42 }
-          StepMother.transform_arguments(['abc'])
+          @dsl.Transform('^abc$') {|one, two| 42 }
+          @rb.execute_transforms(['abc'])
         end.should raise_error(Cucumber::ArityMismatchError)
       end
 
       it "allows registering a regexp pattern that yields the step_arg matched" do
-        StepMother.register_transform(/^ab*c$/) {|arg| 42}
-        StepMother.transform_arguments(['ab']).should == ['ab']
-        StepMother.transform_arguments(['ac']).should == [42]
-        StepMother.transform_arguments(['abc']).should == [42]
-        StepMother.transform_arguments(['abbc']).should == [42]
+        @dsl.Transform(/^ab*c$/) {|arg| 42}
+        @rb.execute_transforms(['ab']).should == ['ab']
+        @rb.execute_transforms(['ac']).should == [42]
+        @rb.execute_transforms(['abc']).should == [42]
+        @rb.execute_transforms(['abbc']).should == [42]
       end
     end
 
     describe "with capture groups" do
       it "complains when registering with a with no transform block" do
         lambda do
-          StepMother.register_transform('^a(.)c$')
-        end.should raise_error(Cucumber::ArityMismatchError)
+          @dsl.Transform('^a(.)c$')
+        end.should raise_error(Cucumber::RbSupport::RbTransform::MissingProc)
       end
       
       it "complains when registering with a zero-arg transform block" do
         lambda do
-          StepMother.register_transform('^a(.)c$') { 42 }
-        end.should raise_error(Cucumber::ArityMismatchError)
+          @dsl.Transform('^a(.)c$') { 42 }
+        end.should raise_error(Cucumber::RbSupport::RbTransform::MissingProc)
       end
 
       it "complains when registering with a splat-arg transform block" do
         lambda do
-          StepMother.register_transform('^a(.)c$') {|*splat| 42 }
-        end.should raise_error(Cucumber::ArityMismatchError)
+          @dsl.Transform('^a(.)c$') {|*splat| 42 }
+        end.should raise_error(Cucumber::RbSupport::RbTransform::MissingProc)
       end
 
       it "complains when transforming with an arity mismatch" do
         lambda do
-          StepMother.register_transform('^a(.)c$') {|one, two| 42 }
-          StepMother.transform_arguments(['abc'])
+          @dsl.Transform('^a(.)c$') {|one, two| 42 }
+          @rb.execute_transforms(['abc'])
         end.should raise_error(Cucumber::ArityMismatchError)
       end
       
       it "allows registering a regexp pattern that yields capture groups" do
-        StepMother.register_transform(/^shape: (.+), color: (.+)$/) do |shape, color|
+        @dsl.Transform(/^shape: (.+), color: (.+)$/) do |shape, color|
           {shape.to_sym => color.to_sym}
         end
-        StepMother.transform_arguments(['shape: circle, color: blue']).should == [{:circle => :blue}]
-        StepMother.transform_arguments(['shape: square, color: red']).should == [{:square => :red}]      
-        StepMother.transform_arguments(['not shape: square, not color: red']).should == ['not shape: square, not color: red']
+        @rb.execute_transforms(['shape: circle, color: blue']).should == [{:circle => :blue}]
+        @rb.execute_transforms(['shape: square, color: red']).should == [{:square => :red}]
+        @rb.execute_transforms(['not shape: square, not color: red']).should == ['not shape: square, not color: red']
       end
     end
     
     it "allows registering a string pattern" do
-      StepMother.register_transform('^ab*c$') {|arg| 42}
-      StepMother.transform_arguments(['ab']).should == ['ab']
-      StepMother.transform_arguments(['ac']).should == [42]
-      StepMother.transform_arguments(['abc']).should == [42]
-      StepMother.transform_arguments(['abbc']).should == [42]
+      @dsl.Transform('^ab*c$') {|arg| 42}
+      @rb.execute_transforms(['ab']).should == ['ab']
+      @rb.execute_transforms(['ac']).should == [42]
+      @rb.execute_transforms(['abc']).should == [42]
+      @rb.execute_transforms(['abbc']).should == [42]
     end
 
     it "gives match priority to transforms defined last" do
-      StepMother.register_transform(/^transform_me$/) {|arg| :foo }
-      StepMother.register_transform(/^transform_me$/) {|arg| :bar }
-      StepMother.register_transform(/^transform_me$/) {|arg| :baz }
-      StepMother.transform_arguments(['transform_me']).should == [:baz]
+      @dsl.Transform(/^transform_me$/) {|arg| :foo }
+      @dsl.Transform(/^transform_me$/) {|arg| :bar }
+      @dsl.Transform(/^transform_me$/) {|arg| :baz }
+      @rb.execute_transforms(['transform_me']).should == [:baz]
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.3.101
+  version: 0.3.102
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-15 00:00:00 +02:00
+date: 2009-09-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.0
+        version: 1.4.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: polyglot
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.8
+        version: 0.2.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: diff-lcs
@@ -289,7 +289,6 @@ files:
 - examples/self_test/features/support/env.rb
 - examples/self_test/features/tags_sample.feature
 - examples/self_test/features/tons_of_cukes.feature
-- examples/self_test/features/transform_sample.feature
 - examples/self_test/features/undefined_multiline_args.feature
 - examples/self_test/list-of-features.txt
 - examples/sinatra/README.textile
@@ -347,6 +346,7 @@ files:
 - features/cucumber_cli_diff_disabled.feature
 - features/cucumber_cli_outlines.feature
 - features/custom_formatter.feature
+- features/default_snippets.feature
 - features/drb_server_integration.feature
 - features/exception_in_after_block.feature
 - features/exception_in_after_step_block.feature
@@ -358,6 +358,7 @@ files:
 - features/junit_formatter.feature
 - features/language_from_header.feature
 - features/multiline_names.feature
+- features/negative_tagged_hooks.feature
 - features/post_configuration_hook.feature
 - features/profiles.feature
 - features/rake_task.feature
@@ -455,13 +456,18 @@ files:
 - lib/cucumber/py_support/py_dsl.py
 - lib/cucumber/py_support/py_language.py
 - lib/cucumber/py_support/py_language.rb
+- lib/cucumber/rails/action_controller.rb
+- lib/cucumber/rails/active_record.rb
 - lib/cucumber/rails/rspec.rb
+- lib/cucumber/rails/test_unit.rb
 - 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/rspec_neuter.rb
 - lib/cucumber/step_match.rb
@@ -507,9 +513,6 @@ files:
 - spec/cucumber/formatter/progress_spec.rb
 - spec/cucumber/parser/feature_parser_spec.rb
 - spec/cucumber/parser/table_parser_spec.rb
-- spec/cucumber/rails/stubs/mini_rails.rb
-- spec/cucumber/rails/stubs/test_help.rb
-- spec/cucumber/rails/world_spec.rb
 - spec/cucumber/rb_support/rb_step_definition_spec.rb
 - spec/cucumber/sell_cucumbers.feature
 - spec/cucumber/step_mother_spec.rb

data/examples/self_test/features/transform_sample.feature

@@ -1,10 +0,0 @@
-Feature: Step argument transformations
-
-  Scenario: transform with matches
-    Then I should transform '10' to an Integer
-
-  Scenario: transform with matches that capture
-    Then I should transform 'abc' to a Symbol
-
-  Scenario: transform without matches
-    Then I should not transform '10' to an Integer

data/spec/cucumber/rails/stubs/mini_rails.rb

@@ -1,18 +0,0 @@
-# Define some stubs to fake Rails...
-module ActiveRecord
-  class Base
-  end
-end
-
-module ActionController
-  class Dispatcher
-  end
-
-  class Base
-  end
-
-  class IntegrationTest
-    def self.use_transactional_fixtures=(x)
-    end
-  end
-end

data/spec/cucumber/rails/stubs/test_help.rb

@@ -1 +0,0 @@
-# This file is loaded by rails/world.rb

data/spec/cucumber/rails/world_spec.rb

@@ -1,16 +0,0 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-$:.unshift(File.dirname(__FILE__) + '/stubs')
-
-describe "Rails world" do
-
-  it "should run without Test::Unit.run defined" do
-    require "mini_rails"
-
-    step_mother = Cucumber::StepMother.new
-    step_mother.load_natural_language('en')
-    rb = step_mother.load_programming_language('rb')
-
-    require "cucumber/rails/world"
-  end
-
-end