rspec-core 2.4.0 → 2.5.0

data/features/command_line/line_number_option.feature

@@ -1,8 +1,8 @@
-Feature: --line option
+Feature: --line_number option
 
-  To run a single example or group, you can use the --line option:
+  To run a single example or group, you can use the --line_number option:
 
-      rspec path/to/example_spec.rb --line 37
+      rspec path/to/example_spec.rb --line_number 37
 
   Scenario: standard examples
     Given a file named "example_spec.rb" with:
@@ -21,10 +21,10 @@ Feature: --line option
         
       end
       """
-    When I run "rspec example_spec.rb --line 5 --format doc"
-    Then the output should contain "1 example, 0 failures"
+    When I run "rspec example_spec.rb --line_number 5 --format doc"
+    Then the examples should all pass
     Then the output should contain "should be > 8"
-    But the stdout should not contain "should be < 10"
+    But the output should not contain "should be < 10"
 
   Scenario: one liner
     Given a file named "example_spec.rb" with:
@@ -39,7 +39,7 @@ Feature: --line option
         
       end
       """
-    When I run "rspec example_spec.rb --line 5 --format doc"
-    Then the output should contain "1 example, 0 failures"
+    When I run "rspec example_spec.rb --line_number 5 --format doc"
+    Then the examples should all pass
     Then the output should contain "should be > 8"
-    But the stdout should not contain "should be < 10"
+    But the output should not contain "should be < 10"

data/features/command_line/tag.feature

@@ -28,17 +28,17 @@ Feature: --tag option
 
   Scenario: filter examples with non-existent tag
     When I run "rspec . --tag mytag"
-    And the output should contain "0 examples, 0 failures"
+    And the examples should all pass
 
   Scenario: filter examples with a simple tag
     When I run "rspec . --tag focus"
     Then the output should contain "Run filtered using {:focus=>true}"
-    And the output should contain "1 example, 0 failures"
+    And the examples should all pass
 
   Scenario: filter examples with a simple tag and @
     When I run "rspec . --tag @focus"
     Then the output should contain "Run filtered using {:focus=>true}"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
 
   Scenario: filter examples with a name:value tag
     When I run "rspec . --tag type:special"
@@ -46,7 +46,7 @@ Feature: --tag option
       """
       Run filtered using {:type=>"special"}
       """
-    And the output should contain "1 example, 0 failures"
+    And the examples should all pass
   
   Scenario: filter examples with a name:value tag and @
     When I run "rspec . --tag @type:special"
@@ -54,21 +54,21 @@ Feature: --tag option
       """
       Run filtered using {:type=>"special"}
       """
-    And the output should contain "1 example, 0 failures"
+    And the examples should all pass
   
   Scenario: exclude examples with a simple tag
     When I run "rspec . --tag ~skip"
-    Then the output should contain "4 examples, 0 failures"
+    Then the examples should all pass
 
   Scenario: exclude examples with a simple tag and @
     When I run "rspec . --tag ~@skip"
-    Then the output should contain "4 examples, 0 failures"
+    Then the examples should all pass
     
   Scenario: exclude examples with a name:value tag
     When I run "rspec . --tag ~speed:slow"
-    Then the output should contain "4 examples, 0 failures"
+    Then the examples should all pass
   
   Scenario: exclude examples with a name:value tag and @
     When I run "rspec . --tag ~@speed:slow"
-    Then the output should contain "4 examples, 0 failures"
+    Then the examples should all pass
 

data/features/configuration/custom_settings.feature

@@ -30,7 +30,7 @@ Feature: custom settings
       end
       """
     When I run "rspec ./additional_setting_spec.rb"
-    Then the output should contain "0 failures"
+    Then the examples should all pass
 
   Scenario: default to true
     Given a file named "additional_setting_spec.rb" with:
@@ -56,7 +56,7 @@ Feature: custom settings
       end
       """
     When I run "rspec ./additional_setting_spec.rb"
-    Then the output should contain "0 failures"
+    Then the examples should all pass
 
   Scenario: overridden in a subsequent RSpec.configure block
     Given a file named "additional_setting_spec.rb" with:
@@ -80,5 +80,5 @@ Feature: custom settings
       end
       """
     When I run "rspec ./additional_setting_spec.rb"
-    Then the output should contain "0 failures"
+    Then the examples should all pass
 

data/features/configuration/fail_fast.feature

@@ -1,8 +1,8 @@
 Feature: fail fast
 
-  Use the fail_fast option to tell RSpec to abort the run on first failure.
+  Use the fail_fast option to tell RSpec to abort the run on first failure:
 
-    RSpec.configure {|c| c.fail_fast = true}
+      RSpec.configure {|c| c.fail_fast = true}
 
   Background:
     Given a file named "spec/spec_helper.rb" with:
@@ -22,7 +22,7 @@ Feature: fail fast
       end
       """
     When I run "rspec spec/example_spec.rb"
-    Then the output should contain "2 examples, 0 failures"
+    Then the examples should all pass
 
   Scenario: fail_fast with first example failing (only runs the one example)
     Given a file named "spec/example_spec.rb" with:

data/features/configuration/read_options_from_file.feature

@@ -31,7 +31,7 @@ Feature: read command line configuration options from files
       end
       """
     When I run "rspec ./spec/example_spec.rb"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
 
   Scenario: custom options file
     Given a file named "my.options" with:
@@ -48,7 +48,7 @@ Feature: read command line configuration options from files
       end
       """
     When I run "rspec spec/example_spec.rb --options my.options"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
 
   Scenario: RSpec ignores ./.rspec when custom options file is used
     Given a file named "my.options" with:
@@ -68,7 +68,7 @@ Feature: read command line configuration options from files
       end
       """
     When I run "rspec spec/example_spec.rb --options my.options"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
 
   Scenario: using ERB in .rspec
     Given a file named ".rspec" with:
@@ -84,4 +84,4 @@ Feature: read command line configuration options from files
       end
       """
     When I run "rspec ./spec/example_spec.rb"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass

data/features/example_groups/shared_example_group.feature

@@ -46,7 +46,7 @@ Feature: shared example group
     end
     """
     When I run "rspec collection_spec.rb --format documentation"
-    Then the output should contain "6 examples, 0 failures"
+    Then the examples should all pass
     And the output should contain:
       """
       Array
@@ -98,7 +98,7 @@ Feature: shared example group
     end
     """
     When I run "rspec shared_example_group_spec.rb --format documentation"
-    Then the output should contain "2 examples, 0 failures"
+    Then the examples should all pass
     And the output should contain:
       """
       Array
@@ -134,7 +134,7 @@ Feature: shared example group
     end
     """
     When I run "rspec shared_example_group_params_spec.rb --format documentation"
-    Then the output should contain "4 examples, 0 failures"
+    Then the examples should all pass
     And the output should contain:
       """
       Array with 3 items
@@ -168,7 +168,7 @@ Feature: shared example group
       end
       """
     When I run "rspec shared_example_group_spec.rb --format documentation"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
     And the output should contain:
       """
       String

data/features/expectation_framework_integration/configure_expectation_framework.feature

@@ -3,9 +3,11 @@ Feature: configure expectation framework
   By default, RSpec is configured to include rspec-expectations for expressing
   desired outcomes. You can also configure RSpec to use:
 
-    rspec/expectations (explicitly)
-    test/unit/assertions
-    rspec/expecations _and_ test/unit assertions
+  * rspec/expectations (explicitly)
+  * stdlib assertions
+    * test/unit assertions in ruby 1.8
+    * minitest assertions in ruby 1.9
+  * rspec/expecations _and_ stlib assertions
 
   Scenario: configure rspec-expectations (explicitly)
     Given a file named "example_spec.rb" with:
@@ -21,8 +23,7 @@ Feature: configure expectation framework
       end
       """
     When I run "rspec example_spec.rb"
-    Then the output should contain "1 example, 0 failures"
-    And the exit status should be 0
+    Then the examples should all pass
 
   Scenario: configure test/unit assertions
     Given a file named "example_spec.rb" with:
@@ -38,8 +39,7 @@ Feature: configure expectation framework
       end
       """
     When I run "rspec example_spec.rb"
-    Then the output should contain "1 example, 0 failures"
-    And the exit status should be 0
+    Then the examples should all pass
 
   Scenario: configure rspec/expecations AND test/unit assertions
     Given a file named "example_spec.rb" with:
@@ -59,5 +59,4 @@ Feature: configure expectation framework
       end
       """
     When I run "rspec example_spec.rb"
-    Then the output should contain "2 examples, 0 failures"
-    And the exit status should be 0
+    Then the examples should all pass

data/features/filtering/exclusion_filters.feature

@@ -79,7 +79,7 @@ Feature: exclusion filters
       """
     When I run "rspec ./spec/sample_spec.rb --format doc"
     Then the output should match /No examples were matched. Perhaps \{.*:broken=>true.*\} is excluding everything?/
-    And  the output should contain "0 examples, 0 failures"
+    And  the examples should all pass
     And  the output should not contain "group 1"
     And  the output should not contain "group 2"
 

data/features/filtering/run_all_when_everything_filtered.feature

@@ -33,7 +33,7 @@ Feature: run all when everything filtered
       """
     When I run "rspec spec/sample_spec.rb --format doc"
     Then the output should contain "No examples were matched by {:focus=>true}, running all"
-    And the output should contain "3 examples, 0 failures"
+    And the examples should all pass
     And the output should contain:
       """
       group 1

data/features/formatters/custom_formatter.feature

@@ -1,32 +1,36 @@
 Feature: custom formatters
 
-  In order to format output/reporting to my particular needs
-  As an RSpec user
-  I want to create my own custom output formatters
+  RSpec ships with general purpose output formatters. You can tell RSpec which
+  one to use using the [`--format` command line
+  option]('../command_line/format_option').
+  
+  When RSpec's built-in output formatters don't, however, give you everything
+  you need, you can write your own custom formatter and tell RSpec to use that
+  one instead.  The simplest way is to subclass RSpec's `BaseTextFormatter`,
+  and then override just the methods that you want to modify.
 
-  @wip
-  Scenario: specdoc format
+  Scenario: custom formatter
     Given a file named "custom_formatter.rb" with:
       """
-      require "rspec/runner/formatter/base_formatter"
+      require "rspec/core/formatters/base_text_formatter"
 
-      class CustomFormatter < RSpec::Runner::Formatter::BaseFormatter
-        def initialize(options, output)
-          @output = output
+      class CustomFormatter < RSpec::Core::Formatters::BaseTextFormatter
+        def initialize(output)
+          super(output)
         end
+
         def example_started(proxy)
-          @output << "example: " << proxy.description
+          output << "example: " << proxy.description
         end
       end
       """
-    And a file named "simple_example_spec.rb" with:
+    And a file named "example_spec.rb" with:
       """
       describe "my group" do
         specify "my example" do
         end
       end
       """
-
-    When I run "rspec ./simple_example_spec.rb --require custom_formatter.rb --format CustomFormatter"
+    When I run "rspec example_spec.rb --require ./custom_formatter.rb --format CustomFormatter"
     Then the output should contain "example: my example"
     And  the exit status should be 0

data/features/helper_methods/arbitrary_methods.feature

@@ -0,0 +1,40 @@
+Feature: arbitrary helper methods
+
+  You can define methods in any example group using Ruby's `def` keyword or
+  `define_method` method. These _helper_ methods are exposed to examples in the
+  group in which they are defined and groups nested within that group, but not
+  parent or sibling groups.
+
+  Scenario: use a method defined in the same group
+    Given a file named "example_spec.rb" with:
+      """
+      describe "an example" do
+        def help
+          :available
+        end
+
+        it "has access to methods defined in its group" do
+          help.should be(:available)
+        end
+      end
+      """
+    When I run "rspec example_spec.rb"
+    Then the examples should all pass
+
+  Scenario: use a method defined in a parent group
+    Given a file named "example_spec.rb" with:
+      """
+      describe "an example" do
+        def help
+          :available
+        end
+
+        describe "in a nested group" do
+          it "has access to methods defined in its parent group" do
+            help.should be(:available)
+          end
+        end
+      end
+      """
+    When I run "rspec example_spec.rb"
+    Then the examples should all pass

data/features/helper_methods/let.feature

@@ -0,0 +1,50 @@
+Feature: let and let!
+
+  Use `let` to define a memoized helper method.  The value will be cached
+  across multiple calls in the same example but not across examples.
+
+  Note that `let` is lazy-evaluated: it is not evaluated until the first time
+  the method it defines is invoked. You can use `let!` to force the method's
+  invocation before each example.
+
+  Scenario: use let to define memoized helper method
+    Given a file named "let_spec.rb" with:
+      """
+      $count = 0
+      describe "let" do
+        let(:count) { $count += 1 }
+
+        it "memoizes the value" do
+          count.should == 1
+          count.should == 1
+        end
+
+        it "is not cached across examples" do
+          count.should == 2
+        end
+      end
+      """
+    When I run "rspec let_spec.rb"
+    Then the examples should all pass
+
+  Scenario: use let! to define a memoized helper method that is called in a before hook
+    Given a file named "let_bang_spec.rb" with:
+      """
+      $count = 0
+      describe "let!" do
+        invocation_order = []
+
+        let!(:count) do
+          invocation_order << :let!
+          $count += 1
+        end
+
+        it "calls the helper method in a before hook" do
+          invocation_order << :example
+          invocation_order.should == [:let!, :example]
+          count.should == 1
+        end
+      end
+      """
+    When I run "rspec let_bang_spec.rb"
+    Then the examples should all pass

data/features/hooks/before_and_after_hooks.feature

@@ -53,7 +53,7 @@ Feature: before and after hooks
       end
       """
     When I run "rspec ./before_each_spec.rb"
-    Then the output should contain "3 examples, 0 failures"
+    Then the examples should all pass
 
   Scenario: define before(:all) block in example group
     Given a file named "before_all_spec.rb" with:
@@ -87,10 +87,10 @@ Feature: before and after hooks
       end
       """
     When I run "rspec ./before_all_spec.rb"
-    Then the output should contain "3 examples, 0 failures"
+    Then the examples should all pass
 
     When I run "rspec ./before_all_spec.rb:15"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
 
   Scenario: failure in before(:all) block
     Given a file named "before_all_spec.rb" with:
@@ -166,7 +166,7 @@ Feature: before and after hooks
       end
       """
     When I run "rspec after_all_spec.rb"
-    Then the output should contain "2 examples, 0 failures"
+    Then the examples should all pass
     And the output should contain:
       """
       An error occurred in an after(:all) hook.
@@ -201,7 +201,7 @@ Feature: before and after hooks
       end
       """
     When I run "rspec ./befores_in_configuration_spec.rb"
-    Then the output should contain "2 examples, 0 failures"
+    Then the examples should all pass
 
   Scenario: before/after blocks are run in order
     Given a file named "ensure_block_order_spec.rb" with:
@@ -317,7 +317,7 @@ Feature: before and after hooks
       end
       """
     When I run "rspec ./before_and_after_all_spec.rb"
-    Then the output should contain "2 examples, 0 failures"
+    Then the examples should all pass
     And the output should contain:
       """
       outer before all
@@ -327,7 +327,7 @@ Feature: before and after hooks
       """
 
     When I run "rspec ./before_and_after_all_spec.rb:14"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
     And the output should contain:
       """
       outer before all
@@ -337,7 +337,7 @@ Feature: before and after hooks
       """
 
     When I run "rspec ./before_and_after_all_spec.rb:6"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
     And the output should contain:
       """
       outer before all
@@ -372,7 +372,7 @@ Feature: before and after hooks
       end
       """
     When I run "rspec before_all_spec.rb"
-    Then the output should contain "3 examples, 0 failures"
+    Then the examples should all pass
 
   Scenario: before/after all blocks have access to state
     Given a file named "before_and_after_all_spec.rb" with:
@@ -408,7 +408,7 @@ Feature: before and after hooks
       end
       """
     When I run "rspec ./before_and_after_all_spec.rb"
-    Then the output should contain "2 examples, 0 failures"
+    Then the examples should all pass
 
   Scenario: exception in before(:each) is captured and reported as failure
     Given a file named "error_in_before_each_spec.rb" with: