cucumber 0.8.3 → 0.8.4

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

@@ -1,12 +1,12 @@
 require 'webrat'
-require 'spec'
+require 'rspec'
 
 Webrat.configure do |config|
   config.mode = :mechanize
 end
 
 class WebratWorld
-  include Spec::Matchers
+  include RSpec::Matchers
   include Webrat::Methods
   include Webrat::Matchers
 end

data/features/background.feature

@@ -119,7 +119,7 @@ Feature: backgrounds
     6 steps (1 failed, 5 skipped)
 
     """
-    And "examples/self_test/tmp/after.txt" should exist
+    And "fixtures/self_test/tmp/after.txt" should exist
 
   Scenario: run a feature with scenario outlines that has a background that fails
     When I run cucumber -q features/background/scenario_outline_failing_background.feature --require features

data/features/cucumber_cli.feature

@@ -167,37 +167,6 @@ Feature: Cucumber command line
 
       """
 
-  Scenario: Run Norwegian
-    Given I am in i18n/no
-    When I run cucumber -q features
-    Then STDERR should be empty
-    Then it should pass with
-      """
-      # language: no
-      Egenskap: Summering
-        For å slippe å gjøre dumme feil
-        Som en regnskapsfører
-        Vil jeg kunne legge sammen
-
-        Scenario: to tall
-          Gitt at jeg har tastet inn 5
-          Og at jeg har tastet inn 7
-          Når jeg summerer
-          Så skal resultatet være 12
-
-        @iterasjon3
-        Scenario: tre tall
-          Gitt at jeg har tastet inn 5
-          Og at jeg har tastet inn 7
-          Og at jeg har tastet inn 1
-          Når jeg summerer
-          Så skal resultatet være 13
-
-      2 scenarios (2 passed)
-      9 steps (9 passed)
-
-      """
-
   Scenario: --dry-run
     When I run cucumber --dry-run --no-source features/*.feature --tags ~@lots
     Then it should pass with
@@ -370,7 +339,7 @@ Feature: Cucumber command line
   Scenario: Multiple formatters and outputs
     When I run cucumber --format progress --out tmp/progress.txt --format pretty --out tmp/pretty.txt --no-source --dry-run features/lots_of_undefined.feature
     Then STDERR should be empty
-    Then "examples/self_test/tmp/progress.txt" should contain
+    Then "fixtures/self_test/tmp/progress.txt" should contain
       """
       UUUUU
 
@@ -378,7 +347,7 @@ Feature: Cucumber command line
       5 steps (5 undefined)
 
       """
-    And "examples/self_test/tmp/pretty.txt" should contain
+    And "fixtures/self_test/tmp/pretty.txt" should contain
       """
       Feature: Lots of undefined
 
@@ -528,70 +497,34 @@ Feature: Cucumber command line
 
   Scenario: Run with limited tag count, blowing it on scenario
      When I run cucumber -q features/tags_sample.feature --no-source --dry-run --tags @sample_three:1
-     Then it should fail with      
-     """
-     @sample_one
-     Feature: Tag samples
-
-       @sample_three
-       Scenario Outline: 
-         Given <state>
-
-         Examples: 
-           | state   |
-           | missing |
-
-       @sample_three @sample_four
-       Scenario: Skipped
-         Given missing
-
-     2 scenarios (2 undefined)
-     2 steps (2 undefined)
-
-     @sample_three occurred 2 times, but the limit was set to 1
-       features/tags_sample.feature:9
-       features/tags_sample.feature:16
-
-     """
+     Then it should fail with
+       """
+       @sample_three occurred 2 times, but the limit was set to 1
+         features/tags_sample.feature:11
+         features/tags_sample.feature:16
+       """
 
    Scenario: Run with limited tag count, blowing it via feature inheritance
      When I run cucumber -q features/tags_sample.feature --no-source --dry-run --tags @sample_one:1
-     Then STDERR should be empty
      Then it should fail with
-     """
-     @sample_one
-     Feature: Tag samples
-
-       @sample_two @sample_four
-       Scenario: Passing
-         Given missing
-
-       @sample_three
-       Scenario Outline: 
-         Given <state>
-
-         Examples: 
-           | state   |
-           | missing |
-
-       @sample_three @sample_four
-       Scenario: Skipped
-         Given missing
-
-     3 scenarios (3 undefined)
-     3 steps (3 undefined)
-
-     @sample_one occurred 3 times, but the limit was set to 1
-       features/tags_sample.feature:5
-       features/tags_sample.feature:9
-       features/tags_sample.feature:16
-
-     """
+       """
+       @sample_one occurred 3 times, but the limit was set to 1
+         features/tags_sample.feature:5
+         features/tags_sample.feature:11
+         features/tags_sample.feature:16
+       """
+
+   Scenario: Run with limited tag count using negative tag, blowing it via a tag that is not run
+     When I run cucumber -q features/tags_sample.feature --no-source --dry-run --tags ~@sample_one:1
+     Then it should fail with
+       """
+       @sample_one occurred 3 times, but the limit was set to 1
+       """
 
   Scenario: Reformat files with --autoformat
     When I run cucumber --autoformat tmp/formatted features
     Then STDERR should be empty
-    Then "examples/self_test/tmp/formatted/features/sample.feature" should contain
+    Then "fixtures/self_test/tmp/formatted/features/sample.feature" should contain
       """
       # Feature comment
       @one
@@ -623,7 +556,7 @@ Feature: Cucumber command line
   Scenario: Generate PDF with pdf formatter
     When I run cucumber --format pdf --out tmp/sample.pdf --dry-run features/sample.feature
     Then STDERR should be empty
-    Then "examples/self_test/tmp/sample.pdf" should match "Pages 2"
+    Then "fixtures/self_test/tmp/sample.pdf" should match "Pages 2"
 
   Scenario: Run feature elements which match a name using -n
     When I run cucumber -n Pisang -q features/

data/features/{cucumber_cli_diff_disabled.feature → diffing.feature}

@@ -12,12 +12,7 @@ Feature: Cucumber command line
         Scenario: Failing expectation
           Given failing expectation
             expected: "that",
-                 got: "this" (using ==)
-            Diff:
-            @@ -1,2 +1,2 @@
-            -that
-            +this
-             (RSpec::Expectations::ExpectationNotMetError)
+                 got: "this" (using ==) (RSpec::Expectations::ExpectationNotMetError)
             ./features/step_definitions/sample_steps.rb:63:in `/^failing expectation$/'
             features/failing_expectation.feature:4:in `Given failing expectation'
       

data/features/html_formatter.feature

@@ -3,6 +3,6 @@ Feature: HTML formatter
   In order to make it easy to read Cucumber results
   there should be a HTML formatter with an awesome CSS
   
-  Scenario: Everything in examples/self_test
+  Scenario: Everything in fixtures/self_test
     When I run cucumber -q --format html --out tmp/a.html features
-    Then "examples/self_test/tmp/a.html" should have the same contents as "features/html_formatter/a.html"
+    Then "fixtures/self_test/tmp/a.html" should have the same contents as "features/html_formatter/a.html"

data/features/html_formatter/a.html

@@ -508,12 +508,7 @@ features/call_undefined_step_from_step_def.feature:7:in `Given call step "a step
 <span class="linenum">20</span><span class="keyword">end</span></code></pre><pre>Given /^$/ do
   pending # express the regexp above with the code you wish you had
 end</pre></li> <script type="text/javascript">moveProgressBar('38.4');</script></ol></div></div><div class="feature"><h2><span class="val">Feature: Failing expectation</span></h2><p class="narrative"></p><div class='scenario'><h3 id="scenario_19"><span class="keyword">Scenario:</span> <span class="val">Failing expectation</span></h3><ol><script>makeRed('scenario_19');</script><li id='features_failing_expectation_feature_4' class='step failed'><div class="step_name"><span class="keyword">Given </span><span class="step val">failing expectation</span></div><div class="step_file"><span>features/step_definitions/sample_steps.rb:62</span></div><div class="message"><pre>expected: "that",
-     got: "this" (using ==)
-Diff:
-@@ -1,2 +1,2 @@
--that
-+this
-</pre></div><div class="backtrace"><pre>./features/step_definitions/sample_steps.rb:63:in `/^failing expectation$/'
+     got: "this" (using ==)</pre></div><div class="backtrace"><pre>./features/step_definitions/sample_steps.rb:63:in `/^failing expectation$/'
 features/failing_expectation.feature:4:in `Given failing expectation':in `/^failing expectation$/'
 ./features/step_definitions/sample_steps.rb:63:in `/^failing expectation$/'
 features/failing_expectation.feature:4:in `Given failing expectation':in `Given failing expectation'</pre></div><pre class="ruby"><code><span class="linenum">61</span>

data/features/json_formatter.feature

@@ -13,7 +13,7 @@ Feature: JSON output formatter
     And it should fail with
       """
       """
-    And "examples/json/tmp/out.json" should match "^\{\"features\":\["
+    And "fixtures/json/tmp/out.json" should match "^\{\"features\":\["
 
   Scenario: one feature, one passing scenario, one failing scenario
     When I run cucumber --format json_pretty features/one_passing_one_failing.feature

data/features/junit_formatter.feature

@@ -12,7 +12,7 @@ Feature: JUnit output formatter
       """
 
       """
-    And "examples/junit/tmp/TEST-one_passing_one_failing.xml" with junit duration "0.005" should contain
+    And "fixtures/junit/tmp/TEST-one_passing_one_failing.xml" with junit duration "0.005" should contain
       """
       <?xml version="1.0" encoding="UTF-8"?>
       <testsuite errors="0" failures="1" name="One passing scenario, one failing scenario" tests="2" time="0.005">
@@ -38,7 +38,7 @@ Feature: JUnit output formatter
       """
       
       """
-    And "examples/junit/tmp/TEST-pending.xml" with junit duration "0.009" should contain
+    And "fixtures/junit/tmp/TEST-pending.xml" with junit duration "0.009" should contain
       """
       <?xml version="1.0" encoding="UTF-8"?>
       <testsuite errors="0" failures="0" name="Pending step" tests="0" time="0.009">
@@ -52,7 +52,7 @@ Feature: JUnit output formatter
       """
 
       """
-    And "examples/junit/tmp/TEST-pending.xml" with junit duration "0.000160" should contain
+    And "fixtures/junit/tmp/TEST-pending.xml" with junit duration "0.000160" should contain
       """
       <?xml version="1.0" encoding="UTF-8"?>
       <testsuite errors="0" failures="1" name="Pending step" tests="1" time="0.000160">
@@ -73,8 +73,8 @@ Feature: JUnit output formatter
       """
       
       """
-    And "examples/junit/tmp/TEST-one_passing_one_failing.xml" should exist
-    And "examples/junit/tmp/TEST-pending.xml" should exist
+    And "fixtures/junit/tmp/TEST-one_passing_one_failing.xml" should exist
+    And "fixtures/junit/tmp/TEST-pending.xml" should exist
   
   Scenario: show correct error message if no --out is passed
     When I run cucumber --format junit features

data/features/language_help.feature

@@ -40,6 +40,7 @@ Feature: Language help
             | en-Scouse | Scouse                 | Scouse               |
             | en-au     | Australian             | Australian           |
             | en-lol    | LOLCAT                 | LOLCAT               |
+            | en-pirate | Pirate                 | Pirate               |
             | en-tx     | Texan                  | Texan                |
             | eo        | Esperanto              | Esperanto            |
             | es        | Spanish                | español              |

data/features/step_definitions/cucumber_steps.rb

@@ -2,7 +2,7 @@
 require 'tempfile'
 
 Given /^I am in (.*)$/ do |example_dir_relative_path|
-  @current_dir = examples_dir(example_dir_relative_path)
+  @current_dir = fixtures_dir(example_dir_relative_path)
 end
 
 Given /^a standard Cucumber project directory structure$/ do
@@ -68,7 +68,7 @@ Then /^it should (fail|pass)$/ do |success|
 end
 
 Then /^it should (fail|pass) with$/ do |success, output|
-  last_stdout.should == output
+  combined_output.should =~ Regexp.compile(Regexp.escape(output))
   Then("it should #{success}")
 end
 

data/features/support/env.rb

@@ -11,19 +11,19 @@ require 'cucumber/formatter/unicode'
 
 class CucumberWorld
   extend Forwardable
-  def_delegators CucumberWorld, :examples_dir, :self_test_dir, :working_dir, :cucumber_lib_dir
+  def_delegators CucumberWorld, :fixtures_dir, :self_test_dir, :working_dir, :cucumber_lib_dir
 
-  def self.examples_dir(subdir=nil)
-    @examples_dir ||= File.expand_path(File.join(File.dirname(__FILE__), '../../examples'))
-    subdir ? File.join(@examples_dir, subdir) : @examples_dir
+  def self.fixtures_dir(subdir=nil)
+    @fixtures_dir ||= File.expand_path(File.join(File.dirname(__FILE__), '../../fixtures'))
+    subdir ? File.join(@fixtures_dir, subdir) : @fixtures_dir
   end
 
   def self.self_test_dir
-    @self_test_dir ||= examples_dir('self_test')
+    @self_test_dir ||= fixtures_dir('self_test')
   end
 
   def self.working_dir
-    @working_dir ||= examples_dir('self_test/tmp')
+    @working_dir ||= fixtures_dir('self_test/tmp')
   end
 
   def cucumber_lib_dir
@@ -42,12 +42,16 @@ class CucumberWorld
     strip_1_9_paths(strip_duration(@last_stdout))
   end
 
+  def combined_output
+    last_stdout + "\n" + last_stderr
+  end
+
   def strip_duration(s)
     s.gsub(/^\d+m\d+\.\d+s\n/m, "")
   end
 
   def strip_1_9_paths(s)
-    s.gsub(/#{Dir.pwd}\/examples\/self_test\/tmp/m, ".").gsub(/#{Dir.pwd}\/examples\/self_test/m, ".")
+    s.gsub(/#{Dir.pwd}\/fixtures\/self_test\/tmp/m, ".").gsub(/#{Dir.pwd}\/fixtures\/self_test/m, ".")
   end
 
   def replace_duration(s, replacement)