rspec 1.2.8 → 1.2.9

data/examples/failing/predicate_example.rb

@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
 class BddFramework
   def intuitive?
     true

data/examples/failing/team_spec.rb

@@ -1,6 +1,3 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-
 class Team
   attr_reader :players
   def initialize

data/examples/failing/timeout_behaviour.rb

@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
 describe "Something really slow" do
   it "should be failed by RSpec when it takes longer than --timeout" do
     sleep(2)

data/examples/passing/custom_formatter.rb

@@ -1,4 +1,3 @@
-require File.dirname(__FILE__) + '/spec_helper'
 require 'spec/runner/formatter/progress_bar_formatter'
 
 # Example of a formatter with custom bactrace printing. Run me with:

data/examples/passing/dynamic_spec.rb

@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
 describe "The square root" do
   (1..10).each do |n|
     it "of #{n*n} should be #{n}" do

data/examples/passing/file_accessor.rb

@@ -1,4 +1,3 @@
-require File.dirname(__FILE__) + '/spec_helper'
 class FileAccessor
   def open_and_handle_with(pathname, processor)
     pathname.open do |io|
@@ -8,7 +7,7 @@ class FileAccessor
 end
 
 if __FILE__ == $0
-  require File.dirname(__FILE__) + '/io_processor'
+  require 'examples/passing/io_processor'
   require 'pathname'
   
   accessor = FileAccessor.new

data/examples/passing/file_accessor_spec.rb

@@ -1,5 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
-require File.dirname(__FILE__) + '/file_accessor'
+require 'examples/passing/file_accessor'
 require 'stringio'
 
 describe "A FileAccessor" do

data/examples/passing/filtered_formatter.rb

@@ -1,4 +1,3 @@
-$:.unshift File.join(File.dirname(__FILE__), "/../../lib")
 require 'spec/runner/formatter/nested_text_formatter'
 
 class FilteredFormatter < Spec::Runner::Formatter::NestedTextFormatter

data/examples/passing/greeter_spec.rb

@@ -1,4 +1,3 @@
-require File.dirname(__FILE__) + '/spec_helper'
 # greeter.rb
 #
 # Based on http://glu.ttono.us/articles/2006/12/19/tormenting-your-tests-with-heckle

data/examples/passing/helper_method_example.rb

@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
 module HelperMethodExample
   describe "an example group with helper a method" do
     def helper_method

data/examples/passing/implicit_docstrings_example.rb

@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
 # Run "spec implicit_docstrings_example.rb --format specdoc" to see the output of this file
 
 describe "Examples with no docstrings generate their own:" do

data/examples/passing/io_processor_spec.rb

@@ -1,5 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
-require File.dirname(__FILE__) + '/io_processor'
+require 'examples/passing/io_processor'
 require 'stringio'
 
 describe "An IoProcessor" do

data/examples/passing/mocking_example.rb

@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
 describe "A consumer of a mock" do
   it "should be able to send messages to the mock" do
     mock = mock("poke me")

data/examples/passing/nested_classes_example.rb

@@ -1,5 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
-require File.dirname(__FILE__) + '/stack'
+require 'examples/passing/stack'
 
 class StackExamples < Spec::ExampleGroup
   describe(Stack)

data/examples/passing/options_example.rb

@@ -4,8 +4,6 @@
 #   bin/spec --require examples/passing/options_formatter.rb examples/passing/options_example.rb \
 #     --format OptionsFormatter
 
-require File.dirname(__FILE__) + '/spec_helper'
-
 describe "this group will be reported", :report => true do
   it "this example will be reported", :report => true do
     # no-op

data/examples/passing/partial_mock_example.rb

@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
 class MockableClass
   def self.find id
     return :original_return

data/examples/passing/pending_example.rb

@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
 describe "pending example (using pending method)" do
   it %Q|should be reported as "PENDING: for some reason"| do
     pending("for some reason")

data/examples/passing/predicate_example.rb

@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
 class BddFramework
   def intuitive?
     true

data/examples/passing/shared_example_group_example.rb

@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
 module SharedExampleGroupExample
   class OneThing
     def what_things_do

data/examples/passing/simple_matcher_example.rb

@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
 describe "arrays" do
   def contain_same_elements_as(expected)
     simple_matcher "array with same elements in any order as #{expected.inspect}" do |actual|

data/examples/passing/stack_spec.rb

@@ -1,6 +1,5 @@
-require File.dirname(__FILE__) + '/spec_helper'
-require File.dirname(__FILE__) + "/stack"
-require File.dirname(__FILE__) + '/shared_stack_examples'
+require 'examples/passing/stack'
+require 'examples/passing/shared_stack_examples'
 
 describe Stack, " (empty)" do
   before(:each) do

data/examples/passing/stack_spec_with_nested_example_groups.rb

@@ -1,6 +1,5 @@
-require File.dirname(__FILE__) + '/spec_helper'
-require File.dirname(__FILE__) + '/stack'
-require File.dirname(__FILE__) + '/shared_stack_examples'
+require 'examples/passing/stack'
+require 'examples/passing/shared_stack_examples'
 
 describe Stack do
   

data/examples/passing/stubbing_example.rb

@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
 describe "A consumer of a stub" do
   it "should be able to stub methods on any Object" do
     obj = Object.new

data/examples/passing/yielding_example.rb

@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
 class MessageAppender
   
   def initialize(appendage)

data/features/before_and_after_blocks/before_and_after_blocks.feature

@@ -58,7 +58,7 @@ Feature: before and after blocks
       end
       """
     When I run "spec before_each_in_example_group_spec.rb"
-    Then the stdout should match "3 examples, 0 failures"
+    Then the stdout should include "3 examples, 0 failures"
 
   Scenario: define before(:all) block in example group
     Given a file named "before_all_in_example_group_spec.rb" with:
@@ -90,7 +90,7 @@ Feature: before and after blocks
       end
       """
     When I run "spec before_all_in_example_group_spec.rb"
-    Then the stdout should match "3 examples, 0 failures"
+    Then the stdout should include "3 examples, 0 failures"
 
   Scenario: define before and after blocks in configuration
     Given a file named "befores_in_configuration_spec.rb" with:
@@ -126,7 +126,7 @@ Feature: before and after blocks
       end
       """
     When I run "spec befores_in_configuration_spec.rb"
-    Then the stdout should match "3 examples, 0 failures"
+    Then the stdout should include "3 examples, 0 failures"
 
   Scenario: before/after blocks are run in order
     Given a file named "ensure_block_order_spec.rb" with:
@@ -163,5 +163,5 @@ Feature: before and after blocks
       end
       """
     When I run "spec ensure_block_order_spec.rb"
-    Then the stdout should match /before suite\nbefore all\nbefore each\nafter each\n\.after all\n.*after suite/m
+    Then the stdout should include /before suite\nbefore all\nbefore each\nafter each\n\.after all\n.*after suite/m
 

data/features/command_line/line_number_option.feature

@@ -21,36 +21,36 @@ Feature: Spec and test together
 
   Scenario: two examples - first example on declaration line
     When I run "spec example.rb:3 --format nested"
-    Then the stdout should match "1 example, 0 failures"
-    And the stdout should match "has a first example"
+    Then the stdout should include "1 example, 0 failures"
+    And the stdout should include "has a first example"
     But the stdout should not match "has a second example"
 
   Scenario: two examples - first example from line inside declaration
     When I run "spec example.rb:4 --format nested"
-    Then the stdout should match "1 example, 0 failures"
-    And the stdout should match "has a first example"
+    Then the stdout should include "1 example, 0 failures"
+    And the stdout should include "has a first example"
     But the stdout should not match "has a second example"
 
   Scenario: two examples - first example from line below declaration
     When I run "spec example.rb:6 --format nested"
-    Then the stdout should match "1 example, 0 failures"
-    And the stdout should match "has a first example"
+    Then the stdout should include "1 example, 0 failures"
+    And the stdout should include "has a first example"
     But the stdout should not match "has a second example"
 
   Scenario: two examples - second example from line below declaration
     When I run "spec example.rb:7 --format nested"
-    Then the stdout should match "1 example, 0 failures"
-    And the stdout should match "has a second example"
+    Then the stdout should include "1 example, 0 failures"
+    And the stdout should include "has a second example"
     But the stdout should not match "has a first example"
 
   Scenario: two examples - both examples from the group declaration
     When I run "spec example.rb:1 --format nested"
-    Then the stdout should match "2 examples, 0 failures"
-    And the stdout should match "has a second example"
-    And the stdout should match "has a first example"
+    Then the stdout should include "2 examples, 0 failures"
+    And the stdout should include "has a second example"
+    And the stdout should include "has a first example"
 
   Scenario: two examples - both examples from above the first example declaration
     When I run "spec example.rb:2 --format nested"
-    Then the stdout should match "2 examples, 0 failures"
-    And the stdout should match "has a second example"
-    And the stdout should match "has a first example"
+    Then the stdout should include "2 examples, 0 failures"
+    And the stdout should include "has a second example"
+    And the stdout should include "has a first example"

data/features/command_line/line_number_option_with_example_with_no_name.feature

@@ -17,6 +17,6 @@ Feature: Spec and test together
 
   Scenario: two examples - first example on declaration line
     When I run "spec example.rb:3 --format nested"
-    Then the stdout should match "1 example, 0 failures"
-    Then the stdout should match "should be > 8"
+    Then the stdout should include "1 example, 0 failures"
+    Then the stdout should include "should be > 8"
     But the stdout should not match "should be < 10"

data/features/example_groups/define_example_attribute.feature

@@ -0,0 +1,41 @@
+Feature: Define example attribute
+
+  In order to streamline process
+  As an RSpec user
+  I want to easily define helper methods that act as a variable assignment
+  
+  It is fairly common to start with a local variable in one example, use the same
+  local variable in the next, and then extract the declaration of that variable
+  to before(:each). This requires converting the locals to instance variables.
+  
+  This feature streamlines the process by defining a helper method so you can extract
+  the duplication without having to change other references to the same variables
+  to @instance_variables.
+
+  Scenario: 
+    Given a file named "counter_spec.rb" with:
+    """
+    require 'spec/autorun'
+    
+    class Counter
+      def initialize
+        @count = 0
+      end
+      def count
+        @count += 1
+      end
+    end
+
+    describe Counter do
+      let(:counter) { Counter.new }
+      it "returns 1 the first time" do
+        counter.count.should == 1
+      end
+      it "returns 2 the second time because the counter itself is cached by the 'assign' method" do
+        counter.count
+        counter.count.should == 2
+      end
+    end
+    """
+    When I run "spec counter_spec.rb"
+    Then the stdout should include "2 examples, 0 failures"

data/features/example_groups/example_group_with_should_methods.feature

@@ -21,7 +21,7 @@ Feature: Spec::ExampleGroup with should methods
     """
     When I run "<Command> example_group_with_should_methods.rb"
     Then the exit code should be 256
-    And the stdout should match "2 examples, 1 failure"
+    And the stdout should include "2 examples, 1 failure"
 
   Scenarios: Run with ruby and spec
     | Command |

data/features/example_groups/implicit_docstrings.feature

@@ -21,9 +21,9 @@ Feature: implicit docstrings
 
     When I run "<Command> implicit_docstrings_example.rb -fs"
 
-    Then the stdout should match /should be < 5/
-    And the stdout should match /should include "a"/
-    And the stdout should match /should respond to #size/
+    Then the stdout should include /should be < 5/
+    And the stdout should include /should include "a"/
+    And the stdout should include /should respond to #size/
 
   Scenarios: Run with ruby and spec
     | Command |
@@ -53,7 +53,7 @@ Feature: implicit docstrings
 
     When I run "<Command> failing_implicit_docstrings_example.rb -fs"
 
-    Then the stdout should match /should equal 2/
-    And the stdout should match /should be > 5/
-    And the stdout should match /should include "b"/
-    And the stdout should match /should not respond to #size/
+    Then the stdout should include /should equal 2/
+    And the stdout should include /should be > 5/
+    And the stdout should include /should include "b"/
+    And the stdout should include /should not respond to #size/

data/features/example_groups/nested_groups.feature

@@ -23,8 +23,8 @@ Feature: Nested example groups
     end
     """
     When I run "<Command> nested_example_groups.rb -fs"
-    Then the stdout should match /Some Object with some more context/
-    And the stdout should match /Some Object with some other context/
+    Then the stdout should include /Some Object with some more context/
+    And the stdout should include /Some Object with some other context/
 
   Scenarios: Run with ruby and spec
     | Command |

data/features/expectations/customized_message.feature

@@ -46,9 +46,9 @@ Feature: customized message
       
       """
     When I run "spec node_spec.rb.rb --format specdoc"
-    Then the stdout should match "3 examples, 3 failures"
+    Then the stdout should include "3 examples, 3 failures"
     And  the stdout should not match "to return true, got false"
     And  the stdout should not match "to return false, got true"
-    And  the stdout should match "node.state: started (first example)"
-    And  the stdout should match "node.state: started (second example)"
-    And  the stdout should match "expected a change"
+    And  the stdout should include "node.state: started (first example)"
+    And  the stdout should include "node.state: started (second example)"
+    And  the stdout should include "expected a change"

data/features/expectations/expect_change.feature

@@ -30,8 +30,8 @@ Feature: expect change
       end
       """
     When I run "spec expect_change.rb"
-    Then the stdout should match "2 examples, 1 failure"
-    Then the stdout should match "should have been changed by 2, but was changed by 1"
+    Then the stdout should include "2 examples, 1 failure"
+    Then the stdout should include "should have been changed by 2, but was changed by 1"
 
   Scenario: expecting no change
     Given a file named "expect_no_change.rb" with:
@@ -61,5 +61,5 @@ Feature: expect change
       end
       """
     When I run "spec expect_no_change.rb"
-    Then the stdout should match "2 examples, 1 failure"
-    Then the stdout should match "should not have changed, but did change from 1 to 2"
+    Then the stdout should include "2 examples, 1 failure"
+    Then the stdout should include "should not have changed, but did change from 1 to 2"

data/features/expectations/expect_error.feature

@@ -19,8 +19,8 @@ Feature: expect error
       end
       """
     When I run "spec expect_error.rb"
-    Then the stdout should match "2 examples, 1 failure"
-    Then the stdout should match "expected NameError but nothing was raised"
+    Then the stdout should include "2 examples, 1 failure"
+    Then the stdout should include "expected NameError but nothing was raised"
 
   Scenario: expect no error
     Given a file named "expect_no_error.rb" with:
@@ -39,6 +39,6 @@ Feature: expect error
       end
       """
     When I run "spec expect_no_error.rb"
-    Then the stdout should match "2 examples, 1 failure"
-    Then the stdout should match "undefined method `non_existent_message'"
+    Then the stdout should include "2 examples, 1 failure"
+    Then the stdout should include "undefined method `non_existent_message'"
 

data/features/extensions/custom_example_group.feature

@@ -2,18 +2,18 @@ Feature: custom example group
 
   Scenario: simple custom example group
     Given a file named "custom_example_group_spec.rb" with:
-    """
-    class CustomGroup < Spec::ExampleGroup
-    end
+      """
+      class CustomGroup < Spec::ExampleGroup
+      end
 
-    Spec::Example::ExampleGroupFactory.default(CustomGroup)
+      Spec::Example::ExampleGroupFactory.default(CustomGroup)
 
-    describe "setting a default example group base class" do
-      it "should use that class by default" do
-        CustomGroup.should === self
+      describe "a custom group set as the default" do
+        it "becomes the default base class for example groups" do
+          CustomGroup.should === self
+        end
       end
-    end
-    """
+      """
     When I run "spec custom_example_group_spec.rb"
-    Then the stdout should match "1 example, 0 failures"
+    Then the stdout should include "1 example, 0 failures"