rspec-core 2.0.0.a1 → 2.0.0.a2

data/README.markdown

@@ -2,8 +2,39 @@
 
 See README.markdown at [http://github.com/rspec/meta](http://github.com/rspec/meta)
 
-
 #### Also see
 
-* [http://github.com/rspec/expectations](http://github.com/rspec/expectations)
-* [http://github.com/rspec/mocks](http://github.com/rspec/mocks)
+* [http://github.com/rspec/rspec-expectations](http://github.com/rspec/rspec-expectations)
+* [http://github.com/rspec/rspec-mocks](http://github.com/rspec/rspec-mocks)
+
+## Known Issues
+
+### Ruby-1.9
+
+Due to changes in scoping rules in 1.9, classes defined inside example groups
+are not visible to the examples. For example:
+
+    describe "something" do
+      class Foo
+      end
+
+      it "does something" do
+        Foo.new
+      end
+    end
+
+This runs without incident in ruby-1.8, but raises an `uninitialized constant`
+error in ruby-1.9. We had solved this in rspec-1.x, but rspec-2 has a slightly
+different object model, so this has (for the moment) reared its ugly head. We'll
+certainly resolve this before rspec-core-2.0.0 (final) is released. 
+
+You can, of course, fully qualify the declaration and everything works fine:
+
+    describe "something" do
+      class ::Foo
+      end
+
+      it "does something" do
+        Foo.new
+      end
+    end

data/Rakefile

@@ -1,45 +1,60 @@
 require 'rubygems'
+gem "jeweler", ">= 1.4.0"
 require 'rake'
 require 'yaml'
 
-$:.unshift 'lib'
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__),'lib'))
 
 require 'rake/rdoctask'
 require 'rspec/core/rake_task'
+require 'rspec/core/version'
 require 'cucumber/rake/task'
 
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "rspec-core"
-    gem.summary = "RSpec Core"
-    gem.description = 'RSpec Core'
+    gem.version = Rspec::Core::Version::STRING
+    gem.rubyforge_project = "rspec"
+    gem.summary = 'Rspec runner and example group classes'
     gem.email = "dchelimsky@gmail.com;chad.humphries@gmail.com"
     gem.homepage = "http://github.com/rspec/core"
     gem.authors = ["David Chelimsky", "Chad Humphries"]
-    gem.add_development_dependency('rspec-expectations', '>= 2.0.0.a1')
-    gem.add_development_dependency('rspec-mocks', '>= 2.0.0.a1')
+    gem.version = Rspec::Core::Version::STRING
+    gem.add_development_dependency "rspec-expectations", ">= #{Rspec::Core::Version::STRING}"
+    gem.add_development_dependency "rspec-mocks", ">= #{Rspec::Core::Version::STRING}"
+    gem.add_development_dependency('cucumber', '>= 0.5.3')
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
+  Jeweler::GemcutterTasks.new
 rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-Rspec::Core::RakeTask.new :spec do |t|
-  t.ruby_opts = %[-Ilib -Ispec]
-  t.pattern = "spec/**/*_spec.rb"
+begin
+  Rspec::Core::RakeTask.new :spec do |t|
+    t.pattern = "spec/**/*_spec.rb"
+  end
+
+  desc "Run all examples using rcov"
+  Rspec::Core::RakeTask.new :rcov => :cleanup_rcov_files do |t|
+    t.rcov = true
+    t.rcov_opts =  %[-Ilib -Ispec --exclude "mocks,expectations,gems/*,spec/resources,spec/lib,spec/spec_helper.rb,db/*,/Library/Ruby/*,config/*"]
+    t.rcov_opts << %[--no-html --aggregate coverage.data]
+    t.pattern = "spec/**/*_spec.rb"
+  end
+rescue LoadError
+  puts "Rspec core or one of its dependencies is not installed. Install it with: gem install rspec-meta"
 end
 
 task :cleanup_rcov_files do
   rm_rf 'coverage.data'
 end
 
-desc "Run all examples using rcov"
-Rspec::Core::RakeTask.new :rcov => :cleanup_rcov_files do |t|
-  t.rcov = true
-  t.rcov_opts =  %[-Ilib -Ispec --exclude "mocks,expectations,gems/*,spec/resources,spec/lib,spec/spec_helper.rb,db/*,/Library/Ruby/*,config/*"]
-  t.rcov_opts << %[--no-html --aggregate coverage.data]
-  t.pattern = "spec/**/*_spec.rb"
+task :clobber do
+  rm_rf 'pkg'
+  rm_rf 'tmp'
+  rm_rf 'coverage'
 end
 
 if RUBY_VERSION == '1.9.1'
@@ -47,7 +62,7 @@ if RUBY_VERSION == '1.9.1'
     t.cucumber_opts = %w{--format progress}
   end
 
-  task :default => [:spec, :features]
+  task :default => [:check_dependencies, :spec, :features]
 else
   Cucumber::Rake::Task.new :features do |t|
     t.rcov = true
@@ -56,7 +71,7 @@ else
     t.cucumber_opts = %w{--format progress}
   end
 
-  task :default => [:rcov, :features]
+  task :default => [:check_dependencies, :rcov, :features]
 end
 
 

data/bin/rspec

@@ -1,12 +1,10 @@
 #!/usr/bin/env ruby
-# Temporary, until things are actually gems
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '/../../expectations/lib'))
+$LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
+$LOAD_PATH.unshift(File.expand_path('../../../rspec-expectations/lib', __FILE__))
+$LOAD_PATH.unshift(File.expand_path('../../../rspec-mocks/lib', __FILE__))
 require 'rspec/expectations'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '/../../mocks/lib'))
 require 'rspec/mocks'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'rspec/autorun'
 
-Rspec::Core::ExampleGroup.send(:include, Rspec::Matchers)
+# TODO - this feels odd here - move to runner?
+Rspec::Core::ExampleGroup.send(:include, Rspec::Matchers)

data/cucumber.yml

@@ -1,2 +1,3 @@
-default: features -r features -t ~wip
-wip:     features -r features -t wip
+default: features -r features -t ~@wip
+wip:     features -r features -t @wip
+all:     features -r features

data/features-pending/example_groups/example_group_with_should_methods.feature

@@ -8,8 +8,10 @@ Feature: Spec::ExampleGroup with should methods
     Given a file named "example_group_with_should_methods.rb" with:
     """
     require 'rspec/autorun'
+    require 'rspec/expectations'
+    Rspec::Core::ExampleGroup.send(:include, Rspec::Matchers)
 
-    class MySpec < Spec::ExampleGroup
+    class MySpec < Rspec::Core::ExampleGroup
       def should_pass_with_should
         1.should == 1
       end

data/features/before_and_after_blocks/around.feature

@@ -0,0 +1,34 @@
+Feature: before and after blocks
+
+  Scenario: define around(:each) block in example group
+    Given a file named "around_each_in_example_group_spec.rb" with:
+      """
+      class Thing
+        def self.cache
+          @cache ||= []
+        end
+
+        def initialize
+          self.class.cache << self
+        end
+      end
+
+      describe Thing do
+        around(:each) do |example|
+          Thing.new
+          example.run
+          Thing.cache.clear
+        end
+
+        it "has 1 Thing (1)" do
+          Thing.cache.length.should == 1
+        end
+
+        it "has 1 Thing (2)" do
+          Thing.cache.length.should == 1
+        end
+      end
+      """
+    When I run "rspec around_each_in_example_group_spec.rb"
+    Then the stderr should not match "NoMethodError"
+    Then the stdout should match "2 examples, 0 failures"

data/features/example_groups/describe_aliases.feature

@@ -0,0 +1,20 @@
+Feature: Nested example groups
+
+  As an RSpec user
+  I want to use alternate names for describe
+  So that I can better organize my examples
+
+  Scenario Outline: Using context
+    Given a file named "context_instead_of_describe_spec.rb" with:
+    """
+    context "Using context" do
+      context "with nested context" do
+        it "should do this" do
+          true.should be_true
+        end
+      end
+    end
+    """
+    When I run "rspec context_instead_of_describe_spec.rb -fn"
+    Then the stdout should match /^Using context/
+    And the stdout should match /^\s+with nested context/

data/{features-pending → features}/example_groups/nested_groups.feature

@@ -8,6 +8,8 @@ Feature: Nested example groups
     Given a file named "nested_example_groups.rb" with:
     """
     require 'rspec/autorun'
+    require 'rspec/expectations'
+    Rspec::Core::ExampleGroup.send(:include, Rspec::Matchers)
 
     describe "Some Object" do
       describe "with some more context" do
@@ -22,11 +24,7 @@ Feature: Nested example groups
       end
     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/
-
-  Scenarios: Run with ruby and spec
-    | Command |
-    | ruby    |
-    | spec    |
+    When I run "rspec nested_example_groups.rb -fn"
+    Then the stdout should match /^Some Object/
+    And the stdout should match /^\s+with some more context/
+    And the stdout should match /^\s+with some other context/

data/features/expectations/customized_message.feature

@@ -5,7 +5,7 @@ Feature: customized message
   I want to customize the failure message per example
   
   Scenario: one additional method
-    Given a file named "node_spec.rb.rb" with:
+    Given a file named "node_spec.rb" with:
       """
       class Node
         def initialize(state=:waiting)
@@ -24,28 +24,28 @@ Feature: customized message
           @state = :started
         end
       end
-      
+
       describe "a new Node" do
         it "should be waiting" do
           node = Node.new(:started) #start w/ started to trigger failure
           node.should be_waiting, "node.state: #{node.state} (first example)"
         end
-        
+
         it "should not be started" do
           node = Node.new(:started) #start w/ started to trigger failure
           node.should_not be_started, "node.state: #{node.state} (second example)"
         end
       end
-      
+
       describe "node.start" do
         it "should change the state" do
           node = Node.new(:started) #start w/ started to trigger failure
           lambda {node.start}.should change{node.state}, "expected a change"
         end
       end
-      
+
       """
-    When I run "spec node_spec.rb.rb --format specdoc"
+    When I run "rspec node_spec.rb --format n"
     Then the stdout should match "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"

data/{features-pending → features}/matchers/define_matcher.feature

@@ -32,13 +32,13 @@ Feature: define matcher
       end
 
       """
-    When I run "spec matcher_with_default_message_spec.rb --format specdoc"
+    When I run "rspec matcher_with_default_message_spec.rb --format specdoc"
     Then the exit code should be 256
 
     And the stdout should match "should be a multiple of 3"
     And the stdout should match "should not be a multiple of 4"
-    And the stdout should match "should be a multiple of 4 (FAILED - 1)"
-    And the stdout should match "should not be a multiple of 3 (FAILED - 2)"
+    And the stdout should match "should be a multiple of 4\n    Failure"
+    And the stdout should match "should not be a multiple of 3\n    Failure"
 
     And the stdout should match "4 examples, 2 failures"
     And the stdout should match "expected 9 to be a multiple of 4"
@@ -61,7 +61,7 @@ Feature: define matcher
         it {should be_a_multiple_of(4)}
       end
       """
-    When I run "spec matcher_with_failure_message_spec.rb"
+    When I run "rspec matcher_with_failure_message_spec.rb"
     Then the exit code should be 256
     And the stdout should match "1 example, 1 failure"
     And the stdout should match "expected that 9 would be a multiple of 4"
@@ -83,7 +83,7 @@ Feature: define matcher
         it {should_not be_a_multiple_of(3)}
       end
       """
-    When I run "spec matcher_with_failure_for_message_spec.rb"
+    When I run "rspec matcher_with_failure_for_message_spec.rb"
     Then the exit code should be 256
     And the stdout should match "1 example, 1 failure"
     And the stdout should match "expected that 9 would not be a multiple of 3"
@@ -108,7 +108,7 @@ Feature: define matcher
         it {should_not be_a_multiple_of(4)}
       end
       """
-    When I run "spec matcher_overriding_description_spec.rb --format specdoc"
+    When I run "rspec matcher_overriding_description_spec.rb --format specdoc"
     Then the exit code should be 0
     And the stdout should match "2 examples, 0 failures"
     And the stdout should match "should be multiple of 3"
@@ -131,7 +131,7 @@ Feature: define matcher
         it {should have_7_fingers}
       end
       """
-    When I run "spec matcher_with_no_args_spec.rb --format specdoc"
+    When I run "rspec matcher_with_no_args_spec.rb --format specdoc"
     Then the exit code should be 0
     And the stdout should match "1 example, 0 failures"
     And the stdout should match "should have 7 fingers"
@@ -149,7 +149,7 @@ Feature: define matcher
         it {should be_the_sum_of(1,2,3,4)}
       end
       """
-    When I run "spec matcher_with_multiple_args_spec.rb --format specdoc"
+    When I run "rspec matcher_with_multiple_args_spec.rb --format specdoc"
     Then the exit code should be 0
     And the stdout should match "1 example, 0 failures"
     And the stdout should match "should be the sum of 1, 2, 3, and 4"
@@ -173,7 +173,7 @@ Feature: define matcher
         end
       end
       """
-    When I run "spec matcher_with_internal_helper_spec.rb"
+    When I run "rspec matcher_with_internal_helper_spec.rb"
     Then the exit code should be 0
     And the stdout should match "1 example, 0 failures"
 

data/features/mock_framework_integration/use_rspec.feature

@@ -18,6 +18,6 @@ Feature: mock with rspec
         end
       end
       """
-    When I run "spec rspec_example_spec.rb"
+    When I run "rspec rspec_example_spec.rb"
     Then the stdout should match "1 example, 0 failures" 
     And the exit code should be 0

data/features/mocks/block_local_expectations.feature

@@ -0,0 +1,68 @@
+Feature: block local expectations
+
+  In order to set message expectations on ...
+  As an RSpec user
+  I want to configure the evaluation context
+
+  Background:
+    Given a file named "account.rb" with:
+      """
+      class Account
+        def self.create
+          yield new
+        end
+
+        def opening_balance(amount, currency)
+        end
+      end
+      """
+
+  Scenario: passing example
+    Given a file named "account_passing_spec.rb" with:
+      """
+      require 'account'
+
+      Rspec::Core.configure do |config|
+        config.mock_framework = :rspec
+      end
+
+      describe "account DSL" do
+        it "it succeeds when the block local receives the given call" do
+          account = Account.new
+          Account.should_receive(:create).and_yield do |account|
+            account.should_receive(:opening_balance).with(100, :USD)
+          end
+          Account.create do
+            opening_balance 100, :USD
+          end
+        end
+      end
+      """
+    When I run "rspec account_passing_spec.rb"
+    Then the stdout should match "1 example, 0 failures"
+    
+  Scenario: failing example
+    
+    Given a file named "account_failing_spec.rb" with:
+      """
+      require 'account'
+
+      Rspec::Core.configure do |config|
+        config.mock_framework = :rspec
+      end
+
+      describe "account DSL" do
+        it "fails when the block local does not receive the expected call" do
+          account = Account.new
+          Account.should_receive(:create).and_yield do |account|
+            account.should_receive(:opening_balance).with(100, :USD)
+          end
+          Account.create do
+            # opening_balance is not called here
+          end
+        end
+      end
+      """
+
+    When I run "rspec account_failing_spec.rb"
+    Then the stdout should match "1 example, 1 failure"

data/{features-pending → features}/mocks/mix_stubs_and_mocks.feature

@@ -6,6 +6,10 @@ Feature: Spec and test together
   Scenario: stub in before
     Given a file named "stub_and_mocks_spec.rb" with:
       """
+      Rspec::Core.configure do |config|
+        config.mock_framework = :rspec
+      end
+
       describe "a stub in before" do
         before(:each) do
           @messenger = mock('messenger').as_null_object
@@ -18,5 +22,5 @@ Feature: Spec and test together
         end
       end
       """
-    When I run "spec stub_and_mocks_spec.rb --format nested"
+    When I run "rspec stub_and_mocks_spec.rb -fs"
     Then the stdout should match "expected :foo with (\"first\") but received it with ([\"second\"], [\"third\"])"