aslakhellesoy-cucumber 0.3.2 → 0.3.3

data/History.txt

@@ -1,3 +1,13 @@
+== 0.3.3 (In Git)
+
+=== Bugfixes
+* Summaries are no longer printed in an empty () if there are no scenarios/steps (Aslak Hellesøy)
+* Background, Scenario Outline, Before Hook interaction (#309 Aslak Hellesøy)
+* Multiline String snippets no longer give misleading info. It's a String, not a PyString that's sent to step def.
+
+=== Removed/changed features
+* New aliases: --no-source/-s, --name/-n (#317 Lonnon Foster)
+
 == 0.3.2 2009-05-05
 
 This release has some minor bug fixes and new features.

data/Manifest.txt

@@ -158,11 +158,13 @@ examples/selenium/features/search.feature
 examples/selenium/features/step_definitons/search_steps.rb
 examples/selenium/features/support/env.rb
 examples/selenium_webrat/Rakefile
+examples/selenium_webrat/config.ru
 examples/selenium_webrat/features/search.feature
 examples/selenium_webrat/features/step_definitons/search_steps.rb
 examples/selenium_webrat/features/support/env.rb
 examples/self_test/README.textile
 examples/self_test/Rakefile
+examples/self_test/features/background/background_tagged_before_on_outline.feature
 examples/self_test/features/background/background_with_name.feature
 examples/self_test/features/background/failing_background.feature
 examples/self_test/features/background/failing_background_after_success.feature

data/examples/selenium_webrat/features/search.feature

@@ -6,4 +6,4 @@ Feature: Search
   Scenario: Find what I'm looking for
     Given I am on the Google search page
     When I search for "rspec"
-    Then I should see a link to http://rspec.info/
+    Then I should see a link to RSpec-1.2.4: Home

data/examples/selenium_webrat/features/step_definitons/search_steps.rb

@@ -4,10 +4,10 @@ end
 
 When /I search for "(.*)"/ do |query|
   fill_in('q', :with => query)
-  click_button('btnG')
+  click_button 'Google Search'
   selenium.wait_for_page_to_load
 end
 
 Then /I should see a link to (.*)/ do |expected_url|
-  click_link(expected_url)
+  click_link expected_url
 end

data/examples/selenium_webrat/features/support/env.rb

@@ -17,6 +17,7 @@ require 'spec/expectations'
 
 # Webrat
 require 'webrat'
+
 Webrat.configure do |config|
   config.mode = :selenium
 end
@@ -31,11 +32,14 @@ end
 
 # START HACK
 # Disable Rails-specific code
-module Webrat
-  def self.start_app_server
+class Webrat::Selenium::ApplicationServer
+  def self.boot
+    
+    STDOUT.puts "Starting app server"
   end
   
-  def self.stop_app_server
+  def self.stop_at_exit
+    STDOUT.puts "Stopping app server"
   end
 end
 # END HACK

data/examples/self_test/features/search_sample.feature

@@ -1,7 +1,7 @@
 Feature: search examples
 
- Background: Hantu Pisang background match
-   Given passing without a table
+  Background: Hantu Pisang background match
+    Given passing without a table
 
   Scenario: should match Hantu Pisang
     Given passing without a table
@@ -12,21 +12,21 @@ Feature: search examples
   Scenario Outline: Ignore me
     Given <state> without a table
     Examples:
-      |state|
-      |failing|
+      | state   |
+      | failing |
 
   Scenario Outline: Hantu Pisang match
     Given <state> without a table
     Examples:
-      |state|
-      |passing|
+      | state   |
+      | passing |
   
   Scenario Outline: no match in name but in examples
     Given <state> without a table
     Examples: Hantu Pisang
-      |state|
-      |passing|
+      | state   |
+      | passing |
 
     Examples: Ignore me
-      |state|
-      |failing|
+      | state   |
+      | failing |

data/examples/self_test/features/support/env.rb

@@ -1 +1,17 @@
-require 'spec/expectations'
+require 'spec/expectations'
+
+Before('@not_used') do
+  raise "Should never run"
+end
+
+After('@not_used') do
+  raise "Should never run"
+end
+
+Before('@background_tagged_before_on_outline') do
+  @cukes = '888'
+end
+
+After('@background_tagged_before_on_outline') do
+  @cukes.should == '888'
+end

data/examples/tickets/Rakefile

@@ -10,7 +10,7 @@ Cucumber::Rake::Task.new(:html) do |t|
 end
 
 Cucumber::Rake::Task.new(:progress) do |t|
-  t.cucumber_opts = "--tags ~@intentional_failure --format progress -i -n"
+  t.cucumber_opts = "--tags ~@intentional_failure --format progress -i -s"
 end
 
 task :default => [:pretty, :html, :progress]

data/features/background.feature

@@ -68,6 +68,28 @@ Feature: backgrounds
 
     """
 
+  Scenario: run a feature with scenario outlines that has a background that passes
+    When I run cucumber -q features/background/background_tagged_before_on_outline.feature --require features
+    Then it should pass with
+    """
+    @background_tagged_before_on_outline
+    Feature: Background tagged Before on Outline
+
+      Background: 
+        Given passing without a table
+
+      Scenario Outline: passing background
+        Then I should have '<count>' cukes
+
+        Examples: 
+          | count |
+          | 888   |
+
+    1 scenario (1 passed)
+    2 steps (2 passed)
+
+    """
+
   Scenario: run a feature with a background that fails
     When I run cucumber -q features/background/failing_background.feature --require features
     Then it should fail with

data/features/cucumber_cli.feature

@@ -367,7 +367,7 @@ Feature: Cucumber command line
 
       """
 
-  Scenario: Run a single background which matches a name using --name
+  Scenario: Run a single background which matches a name using --name (Useful if there is an error in it)
     When I run cucumber --name 'Hantu Pisang background' -q features/
     Then it should pass with
       """
@@ -376,7 +376,7 @@ Feature: Cucumber command line
         Background: Hantu Pisang background match
           Given passing without a table
 
-      0 scenarios ()
+      0 scenarios
       1 step (1 passed)
 
       """
@@ -486,3 +486,33 @@ Feature: Cucumber command line
 
       """
 
+  Scenario: Run feature elements which match a name using -n
+    When I run cucumber -n Pisang -q features/
+    Then it should pass with
+      """
+      Feature: search examples
+
+        Background: Hantu Pisang background match
+          Given passing without a table
+
+        Scenario: should match Hantu Pisang
+          Given passing without a table
+
+        Scenario Outline: Hantu Pisang match
+          Given <state> without a table
+
+          Examples: 
+            | state   |
+            | passing |
+
+        Scenario Outline: no match in name but in examples
+          Given <state> without a table
+
+          Examples: Hantu Pisang
+            | state   |
+            | passing |
+
+      3 scenarios (3 passed)
+      6 steps (6 passed)
+
+      """

data/features/custom_formatter.feature

@@ -4,8 +4,8 @@ Feature: Custom Formatter
     When I run cucumber --format Tag::Count features
     Then it should fail with
       """
-      | after_file | four | lots | one | three | two |
-      | 1          | 1    | 1    | 1   | 2     | 1   |
+      | after_file | background_tagged_before_on_outline | four | lots | one | three | two |
+      | 1          | 1                                   | 1    | 1    | 1   | 2     | 1   |
 
       """
     

data/features/snippet.feature

@@ -4,16 +4,15 @@ Feature: Snippets
   I want snippet suggestions for undefined step definitions
 
   Scenario: Snippet for undefined step with a pystring
-    When I run cucumber features/undefined_multiline_args.feature:3 -n
+    When I run cucumber features/undefined_multiline_args.feature:3 -s
     Then the output should contain
       """
       Given /^a pystring$/ do |string|
-        # string is a Cucumber::Ast::PyString
         pending
       end
       """
   Scenario: Snippet for undefined step with a step table
-    When I run cucumber features/undefined_multiline_args.feature:9 -n
+    When I run cucumber features/undefined_multiline_args.feature:9 -s
     Then the output should contain
       """
       Given /^a table$/ do |table|

data/features/usage.feature

@@ -8,6 +8,7 @@ Feature: Cucumber command line
     Then it should pass with
       """
       /^passing without a table$/          # features/step_definitions/sample_steps.rb:12
+       Given passing without a table       # features/background/background_tagged_before_on_outline.feature:5
        Given passing without a table       # features/background/failing_background_after_success.feature:4
        Given passing without a table       # features/multiline_name.feature:6
        Given passing without a table       # features/multiline_name.feature:11
@@ -83,6 +84,7 @@ Feature: Cucumber command line
        Given '2' cukes   # features/tons_of_cukes.feature:51
        Given '2' cukes   # features/tons_of_cukes.feature:52
       /^I should have '(.+)' cukes$/      # features/step_definitions/sample_steps.rb:31
+       Then I should have '<count>' cukes # features/background/background_tagged_before_on_outline.feature:8
        Then I should have '10' cukes      # features/background/background_with_name.feature:7
        Then I should have '10' cukes      # features/background/failing_background.feature:9
        Then I should have '10' cukes      # features/background/failing_background.feature:12

data/lib/cucumber/ast/background.rb

@@ -32,7 +32,12 @@ module Cucumber
       end
 
       def accept_hook?(hook)
-        false
+        if hook_context != self
+          hook_context.accept_hook?(hook)
+        else
+          # We have no scenarios
+          false
+        end
       end
 
       def failed?

data/lib/cucumber/ast/scenario_outline.rb

@@ -23,6 +23,8 @@ module Cucumber
           examples_table = OutlineTable.new(examples_matrix, self)
           Examples.new(examples_line, examples_keyword, examples_name, examples_table)
         end
+
+        @background.feature_elements << self if @background
       end
 
       def accept(visitor)

data/lib/cucumber/cli/configuration.rb

@@ -28,7 +28,7 @@ module Cucumber
             "Examples:",
             "cucumber examples/i18n/en/features",
             "cucumber --language it examples/i18n/it/features/somma.feature:6:98:113",
-            "cucumber -n -i http://rubyurl.com/eeCl", "", "",
+            "cucumber -s -i http://rubyurl.com/eeCl", "", "",
           ].join("\n")
           opts.on("-r LIBRARY|DIR", "--require LIBRARY|DIR", 
             "Require files before executing the features. If this",
@@ -78,7 +78,7 @@ module Cucumber
             "with or without the @ prefix.") do |v|
             @options[:include_tags], @options[:exclude_tags] = *parse_tags(v)
           end
-          opts.on("-n NAME", "--name NAME", 
+          opts.on("-n NAME", "--name NAME",
             "Only execute the feature elements which match part of the given name.",
             "If this option is given more than once, it will match against all the",
             "given names.") do |v|
@@ -114,7 +114,7 @@ module Cucumber
             "Don't print multiline strings and tables under steps.") do
             @options[:no_multiline] = true
           end
-          opts.on("-n", "--no-source", 
+          opts.on("-s", "--no-source", 
             "Don't print the file and line of the step definition with the steps.") do
             @options[:source] = false
           end

data/lib/cucumber/formatter/console.rb

@@ -97,8 +97,12 @@ module Cucumber
         counts = [:failed, :skipped, :undefined, :pending, :passed].map do |status|
           elements = yield status
           elements.any? ? format_string("#{elements.length} #{status.to_s}", status) : nil
+        end.compact
+        if counts.any?
+          @io.puts(" (#{counts.join(', ')})")
+        else
+          @io.puts
         end
-        @io.puts(" (#{counts.compact.join(', ')})")
       end
 
       def dump_count(count, what, state=nil)

data/lib/cucumber/step_definition.rb

@@ -70,9 +70,12 @@ module Cucumber
       end
       block_args << multiline_arg_class.default_arg_name unless multiline_arg_class.nil?
       block_arg_string = block_args.empty? ? "" : " |#{block_args.join(", ")}|"
-      multiline_class_string = multiline_arg_class ? "# #{multiline_arg_class.default_arg_name} is a #{multiline_arg_class.to_s}\n  " : ""
+      multiline_class_comment = ""
+      if(multiline_arg_class == Ast::Table)
+        multiline_class_comment = "# #{multiline_arg_class.default_arg_name} is a #{multiline_arg_class.to_s}\n  "
+      end
 
-      "#{step_keyword} /^#{escaped}$/ do#{block_arg_string}\n  #{multiline_class_string}pending\nend"
+      "#{step_keyword} /^#{escaped}$/ do#{block_arg_string}\n  #{multiline_class_comment}pending\nend"
     end
 
     class MissingProc < StandardError

data/lib/cucumber/version.rb

@@ -3,7 +3,7 @@ module Cucumber #:nodoc:
     MAJOR = 0
     MINOR = 3
     TINY  = 2
-    PATCH = nil # Set to nil for official release
+    PATCH = 1 # Set to nil for official release
 
     STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
   end

data/rails_generators/cucumber/templates/webrat_steps.rb

@@ -107,19 +107,19 @@ Then /^I should not see "([^\"]*)"$/ do |text|
 end
 
 Then /^the "([^\"]*)" field should contain "([^\"]*)"$/ do |field, value|
-  <% if framework == :rspec -%>
-    field_labeled(field).value.should =~ /#{value}/
-  <% else -%>
-    assert_match(/#{value}/, field_labeled(field).value)
-  <% end -%>
+<% if framework == :rspec -%>
+  field_labeled(field).value.should =~ /#{value}/
+<% else -%>
+  assert_match(/#{value}/, field_labeled(field).value)
+<% end -%>
 end
 
 Then /^the "([^\"]*)" field should not contain "([^\"]*)"$/ do |field, value|
-  <% if framework == :rspec -%>
-    field_labeled(field).value.should_not =~ /#{value}/
-  <% else -%>
-    assert_no_match(/#{value}/, field_labeled(field).value)
-  <% end -%>
+<% if framework == :rspec -%>
+  field_labeled(field).value.should_not =~ /#{value}/
+<% else -%>
+  assert_no_match(/#{value}/, field_labeled(field).value)
+<% end -%>
 end
     
 Then /^the "([^\"]*)" checkbox should be checked$/ do |label|

data/spec/cucumber/cli/configuration_spec.rb

@@ -263,9 +263,18 @@ END_OF_MESSAGE
       config.options[:name_regexps].should include(/User signs up/)
     end
     
+    it "should accept multiple -n options" do
+      config = Configuration.new
+      config.parse!(['-n', "User logs in", '-n', "User signs up"])
+
+      config.options[:name_regexps].should include(/User logs in/)
+      config.options[:name_regexps].should include(/User signs up/)
+    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").any_number_of_times.and_return(["cucumber.feature"])
+      Dir.should_receive(:[]).with("feature_directory/**/*.feature").
+        any_number_of_times.and_return(["cucumber.feature"])
       
       config = Configuration.new(StringIO)
       config.parse!(%w{feature_directory/})

data/spec/cucumber/parser/feature_parser_spec.rb

@@ -313,7 +313,7 @@ Given I am a step
 }).to_sexp.should ==
             [:feature, nil, "Feature: Hi",
               [:scenario, 2, "Scenario:", "When I have when in scenario",
-                [:step, 3, "Given", "I am a step"]]]
+                [:step_invocation, 3, "Given", "I am a step"]]]
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aslakhellesoy-cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-03 00:00:00 -07:00
+date: 2009-05-04 00:00:00 -07:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -473,7 +473,7 @@ requirements: []
 rubyforge_project: rspec
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Executable Feature scenarios
 test_files: []