aslakhellesoy-cucumber 0.1.99.23 → 0.1.100.1

data/History.txt

@@ -58,11 +58,6 @@ pure Ruby users have been enjoying for a while.
 
 == TODO Before 0.2 release
 * Make sure all features and specs pass on Windows, JRuby and Ruby 1.9
-* Tighten up and simplify the grammar. More edge case features/specs.
-* Reintroduce StepInvocation. Reduce some of the redundant calls to StepDefinition/StepMother. Align with JBehave.
-* Make some class diagrams.
-* Implement at least a basic HTML formatter
-* Run a single cucumber feature from rake "rake features FEATURE=/path/to/feature:line"
 * Wiki page about running subsets
 ** file:line
 *** scenario (or step within)
@@ -79,6 +74,7 @@ pure Ruby users have been enjoying for a while.
 ** Full jar and simple jar
 
 == Bugfixes
+* Re-structure the ast: Feature -> Background -> (Scenario|ScenarioOutline)*. Fixes bug with background being called outside transactions. (#181 Joseph Wilk)
 * --strict always exits with status 1 (#230 Tim Cuthbertson)
 * Fix error with nil values in tables raising an exception (#227 Joseph Wilk)
 * Add support for using << in formatters to ensure the html formatter works (#210 Joseph Wilk)
@@ -136,7 +132,7 @@ pure Ruby users have been enjoying for a while.
 * Pure Ruby features are no longer supported.
 * Remove --color option in autotest. Can be added manually in cucumber.yml (#215 Jean-Michel Garnier)
 
-== (0.16.4 aslakhellesoy-webrat gem on GitHub)
+== (0.16.4 aslakhellesoy-cucumber gem on GitHub)
 
 Bugfix release.
 

data/Manifest.txt

@@ -127,6 +127,7 @@ examples/jbehave/src/main/java/cukes/jbehave/examples/trader/model/Stock.java
 examples/jbehave/src/main/java/cukes/jbehave/examples/trader/model/Trader.java
 examples/jbehave/src/main/java/cukes/jbehave/examples/trader/persistence/TraderPersister.java
 examples/jbehave/src/main/java/cukes/jbehave/examples/trader/scenarios/TraderSteps.java
+examples/jbehave/target/maven-archiver/pom.properties
 examples/selenium/Rakefile
 examples/selenium/features/search.feature
 examples/selenium/features/step_definitons/search_steps.rb
@@ -210,14 +211,15 @@ lib/cucumber/ast/background.rb
 lib/cucumber/ast/comment.rb
 lib/cucumber/ast/examples.rb
 lib/cucumber/ast/feature.rb
+lib/cucumber/ast/feature_element.rb
 lib/cucumber/ast/features.rb
-lib/cucumber/ast/filter.rb
 lib/cucumber/ast/outline_table.rb
 lib/cucumber/ast/py_string.rb
 lib/cucumber/ast/scenario.rb
 lib/cucumber/ast/scenario_outline.rb
 lib/cucumber/ast/step.rb
-lib/cucumber/ast/steps.rb
+lib/cucumber/ast/step_collection.rb
+lib/cucumber/ast/step_invocation.rb
 lib/cucumber/ast/table.rb
 lib/cucumber/ast/tags.rb
 lib/cucumber/ast/visitor.rb
@@ -257,8 +259,10 @@ lib/cucumber/rails/rspec.rb
 lib/cucumber/rails/world.rb
 lib/cucumber/rake/task.rb
 lib/cucumber/step_definition.rb
+lib/cucumber/step_match.rb
 lib/cucumber/step_mother.rb
 lib/cucumber/version.rb
+lib/cucumber/world.rb
 rails_generators/cucumber/USAGE
 rails_generators/cucumber/cucumber_generator.rb
 rails_generators/cucumber/templates/cucumber
@@ -276,6 +280,7 @@ spec/cucumber/ast/feature_spec.rb
 spec/cucumber/ast/py_string_spec.rb
 spec/cucumber/ast/scenario_outline_spec.rb
 spec/cucumber/ast/scenario_spec.rb
+spec/cucumber/ast/step_collection_spec.rb
 spec/cucumber/ast/step_spec.rb
 spec/cucumber/ast/table_spec.rb
 spec/cucumber/ast/tags_spec.rb
@@ -316,3 +321,4 @@ spec/cucumber/treetop_parser/with_tags.feature
 spec/cucumber/world/pending_spec.rb
 spec/spec.opts
 spec/spec_helper.rb
+target/maven-archiver/pom.properties

data/examples/i18n/et/features/jagamine.feature

@@ -0,0 +1,9 @@
+Omadus: Jagamine
+  Rumalate vigade vältimiseks
+  Peavad kassapidajad saama arvutada murdudes
+
+  Stsenaarium: Tavalised numrbid
+    Eeldades et olen sisestanud kalkulaatorisse numbri 3
+    Ja olen sisestanud kalkulaatorisse numbri 2
+    Kui ma vajutan jaga
+    Siis vastuseks peab ekraanil kuvatama 1.5

data/examples/jbehave/README.textile

@@ -8,7 +8,10 @@ First, compile the java code (and JBehave steps)
 
 <code>mvn compile jar:jar</code>
 
-Second, run Cucumber:
+Second, set your CLASSPATH
+<code>export CLASSPATH=~/.m2/repository/cucumber/cucumber-support/0.2/cucumber-support-0.2.jar:~/.m2/repository/org/jbehave/jbehave-core/2.1.1/jbehave-core-2.1.1.jar:~/.m2/repository/org/hamcrest/hamcrest-all/1.1/hamcrest-all-1.1.jar:~/.m2/repository/junit/junit/4.4/junit-4.4.jar</code>
+
+Third, run Cucumber:
 
 <code>jruby -S cucumber features</code>
 

data/examples/jbehave/features/trading.feature

@@ -17,6 +17,10 @@ Feature: Trading
     Then the alert status should be OFF
 
   Scenario: Trader sells all stocks
+    # Given the following table
+    #   | a | b |
+    #   | 1 | 2 |
+    #   | 3 | 4 |
     Given a trader of name Mauro
     Given a stock of prices 0.5,1.0 and a threshold of 1.5
     When the stock is traded at 2.0

data/examples/jbehave/pom.xml

@@ -18,6 +18,11 @@
   </repositories>
 
   <dependencies>
+    <dependency>
+      <groupId>cucumber</groupId>
+      <artifactId>cucumber-support</artifactId>
+      <version>0.2</version>
+    </dependency>
     <dependency>
       <groupId>org.jbehave</groupId>
       <artifactId>jbehave-core</artifactId>

data/examples/jbehave/src/main/java/cukes/jbehave/examples/trader/scenarios/TraderSteps.java

@@ -18,6 +18,7 @@ import org.jbehave.scenario.steps.ParameterConverters;
 import org.jbehave.scenario.steps.SilentStepMonitor;
 import org.jbehave.scenario.steps.Steps;
 import org.jbehave.scenario.steps.StepsConfiguration;
+import cucumber.ast.Table;
 
 public class TraderSteps extends Steps {
 
@@ -46,6 +47,11 @@ public class TraderSteps extends Steps {
         stock = new Stock(prices, threshold);
     }
 
+    @Given("the following table")
+    public void theFollowingTable(Table table) {
+        System.out.println("My table:" + table);
+    }
+
     @When("the stock is traded at %price")
     public void theStockIsTradedAt(double price) {
         stock.tradeAt(price);
@@ -61,5 +67,4 @@ public class TraderSteps extends Steps {
         trader.sellAllStocks();
         ensureThat(trader.getStocks().size(), equalTo(0));
     }
-
 }

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

@@ -0,0 +1,13 @@
+Given 'I am on the Google search page' do
+  @browser.open('http://www.google.com/')
+end
+
+When /I search for "(.*)"/ do |query|
+  @browser.type('q', query)   
+  @browser.click 'btnG'
+  @browser.wait_for_page_to_load
+end
+
+Then /I should see a link to (.*)/ do |expected_url|
+  @browser.is_element_present("css=a[href='#{expected_url}']").should be_true
+end

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

@@ -0,0 +1,19 @@
+require 'spec/expectations'
+require 'selenium'
+
+# "before all"
+browser = Selenium::SeleniumDriver.new("localhost", 4444, "*chrome", "http://localhost", 15000)
+
+Before do
+  @browser = browser
+  @browser.start
+end
+
+After do
+  @browser.stop
+end
+
+# "after all"
+at_exit do
+  browser.close rescue nil
+end

data/examples/selenium_webrat/Rakefile

@@ -0,0 +1,6 @@
+$:.unshift(File.dirname(__FILE__) + '/../../lib')
+require 'cucumber/rake/task'
+
+Cucumber::Rake::Task.new do |t|
+  t.cucumber_opts = "--format pretty"
+end

data/examples/selenium_webrat/features/search.feature

@@ -0,0 +1,9 @@
+Feature: Search
+  In order to learn more
+  As an information seeker
+  I want to find more information
+
+  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/

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

@@ -0,0 +1,13 @@
+Given 'I am on the Google search page' do
+  visit('http://www.google.com/')
+end
+
+When /I search for "(.*)"/ do |query|
+  fill_in('q', :with => query)
+  click_button('btnG')
+  selenium.wait_for_page_to_load
+end
+
+Then /I should see a link to (.*)/ do |expected_url|
+  click_link(expected_url)
+end

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

@@ -0,0 +1,41 @@
+require 'spec/expectations'
+
+# START HACK
+# Webrat's Selenium wrongly assumes Rails in available. # We'll just fool it...
+module ActionController
+  class IntegrationTest
+  end
+end
+
+def silence_stream(*args)
+  yield if block_given?
+end
+# END HACK
+
+# RSpec
+require 'spec/expectations'
+
+# Webrat
+require 'webrat'
+Webrat.configure do |config|
+  config.mode = :selenium
+end
+
+World do
+  session = Webrat::SeleniumSession.new
+  session.extend(Webrat::Methods)
+  session.extend(Webrat::Selenium::Methods)
+  session.extend(Webrat::Selenium::Matchers)
+  session
+end
+
+# START HACK
+# Disable Rails-specific code
+module Webrat
+  def self.start_app_server
+  end
+  
+  def self.stop_app_server
+  end
+end
+# END HACK

data/examples/self_test/features/background/failing_background.feature

@@ -2,6 +2,7 @@ Feature: Failing background sample
   
   Background:
     Given failing without a table
+    And '10' cukes
     
   Scenario: failing background
     Then I should have '10' cukes

data/examples/self_test/features/step_definitions/sample_steps.rb

@@ -34,7 +34,7 @@ end
 
 Given /^'(.+)' global cukes$/ do |cukes|
   $scenario_runs ||= 0
-  flunker if $scenario_runs > 0
+  flunker if $scenario_runs >= 1
   $cukes = cukes
   $scenario_runs += 1
 end

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

@@ -19,7 +19,7 @@ module Tag
     def print_summary
       matrix = @counts.to_a.sort{|paira, pairb| paira[0] <=> pairb[0]}.transpose
       table = Cucumber::Ast::Table.new(matrix)
-      Cucumber::Formatter::Pretty.new(@step_mother, @io, {}).visit_multiline_arg(table, :tag)
+      Cucumber::Formatter::Pretty.new(@step_mother, @io, {}).visit_multiline_arg(table)
     end
   end
 end

data/features/background.feature

@@ -16,7 +16,7 @@ Feature: backgrounds
         Then I should have '10' cukes
 
     1 scenario
-    2 passed steps
+    3 passed steps
     
     """
   
@@ -64,7 +64,7 @@ Feature: backgrounds
         | 10    |
 
     2 scenarios
-    4 passed steps
+    5 passed steps
 
     """
 
@@ -80,6 +80,7 @@ Feature: backgrounds
           ./features/step_definitions/sample_steps.rb:2:in `flunker'
           ./features/step_definitions/sample_steps.rb:16:in `/^failing without a table$/'
           features/background/failing_background.feature:4:in `Given failing without a table'
+        And '10' cukes
 
       Scenario: failing background
         Then I should have '10' cukes
@@ -88,8 +89,8 @@ Feature: backgrounds
         Then I should have '10' cukes
 
     2 scenarios
-    2 failed steps
-    2 skipped steps
+    1 failed step
+    5 skipped steps
 
     """
 
@@ -121,8 +122,8 @@ Feature: backgrounds
         | 10    |
 
     2 scenarios
-    2 failed steps
-    2 skipped steps
+    1 failed step
+    4 skipped steps
 
     """
 
@@ -160,15 +161,12 @@ Feature: backgrounds
       Scenario: passing background
         Then I should have '10' global cukes
 
-      Background: 
-        Given passing without a table
+      Scenario: failing background
         And '10' global cukes
           FAIL (RuntimeError)
           ./features/step_definitions/sample_steps.rb:2:in `flunker'
           ./features/step_definitions/sample_steps.rb:37:in `/^'(.+)' global cukes$/'
-          features/background/failing_background_after_success.feature:3:in `And '10' global cukes'
-
-      Scenario: failing background
+          features/background/failing_background_after_success.feature:5:in `And '10' global cukes'
         Then I should have '10' global cukes
 
     2 scenarios

data/features/cucumber_cli.feature

@@ -32,7 +32,7 @@ Feature: Cucumber command line
             features/sample.feature:6:in `Given missing'
 
       1 scenario
-      1 failed step
+      1 undefined step
 
       """
 
@@ -337,6 +337,29 @@ Feature: Cucumber command line
 
       """
 
+  Scenario: Run with a negative tag
+    When I run cucumber -q features/sample.feature --dry-run -t ~four
+    Then it should pass with
+      """
+      @one
+      Feature: Sample
+
+        @two @three
+        Scenario: Missing
+          Given missing
+
+        @three
+        Scenario: Passing
+          Given passing
+            | a | b |
+            | c | d |
+
+      2 scenarios
+      1 skipped step
+      1 undefined step
+
+      """
+
   Scenario: Reformat files with --autoformat
     When I run cucumber --autoformat tmp/formatted features
     Then examples/self_test/tmp/formatted/features/sample.feature should contain

data/features/cucumber_cli_outlines.feature

@@ -17,10 +17,10 @@ Feature: Cucumber command line
           | missing | passing     |
           | passing | passing     |
           | failing | passing     |
-            FAIL (RuntimeError)
-            ./features/step_definitions/sample_steps.rb:2:in `flunker'
-            ./features/step_definitions/sample_steps.rb:16:in `/^failing without a table$/'
-            features/outline_sample.feature:12:in `Given failing without a table'
+          FAIL (RuntimeError)
+          ./features/step_definitions/sample_steps.rb:2:in `flunker'
+          ./features/step_definitions/sample_steps.rb:16:in `/^failing without a table$/'
+          features/outline_sample.feature:6:in `Given <state> without a table'
 
         Examples: Only passing
           | state   | other_state |
@@ -34,8 +34,6 @@ Feature: Cucumber command line
 
       """
 
-  # The "Only Passing" should not be printed
-  @buggy
   Scenario: Run single failing scenario outline table row
     When I run cucumber features/outline_sample.feature:12
     Then it should fail with
@@ -49,13 +47,10 @@ Feature: Cucumber command line
         Examples: Rainbow colours
           | state   | other_state |
           | failing | passing     |
-            FAIL (RuntimeError)
-            ./features/step_definitions/sample_steps.rb:2:in `flunker'
-            ./features/step_definitions/sample_steps.rb:16:in `/^failing without a table$/'
-            features/outline_sample.feature:12:in `Given failing without a table'
-
-        Examples: Only passing
-          | state   | other_state |
+          FAIL (RuntimeError)
+          ./features/step_definitions/sample_steps.rb:2:in `flunker'
+          ./features/step_definitions/sample_steps.rb:16:in `/^failing without a table$/'
+          features/outline_sample.feature:6:in `Given <state> without a table'
 
       1 scenario
       1 failed step
@@ -67,18 +62,14 @@ Feature: Cucumber command line
     When I run cucumber -q --format progress features/outline_sample.feature
     Then it should fail with
       """
-      UUS..FS..
-
-      (::) undefined scenarios (::)
-
-      features/outline_sample.feature:3:in `Scenario: I have no steps'
+      ----U-..F---..
 
       (::) failed steps (::)
 
       FAIL (RuntimeError)
       ./features/step_definitions/sample_steps.rb:2:in `flunker'
       ./features/step_definitions/sample_steps.rb:16:in `/^failing without a table$/'
-      features/outline_sample.feature:12:in `Given failing without a table'
+      features/outline_sample.feature:6:in `Given <state> without a table'
 
       5 scenarios
       1 failed step