rspec-mocks 2.0.0.rc → 2.0.0

data/Gemfile

@@ -7,6 +7,7 @@ gem "autotest"
 gem "rspec-mocks", :path => "."
 gem "rspec-core", :path => "../rspec-core"
 gem "rspec-expectations", :path => "../rspec-expectations"
+gem "relish"
 
 case RUBY_VERSION.to_s
 when '1.9.2'

data/History.markdown

@@ -1,5 +1,9 @@
 ## rspec-mocks release history (incomplete)
 
+### 2.0.0 / 2010-10-10
+
+[full changelog](http://github.com/rspec/rspec-expectations/compare/v2.0.0.beta.22...v2.0.0)
+
 ### 2.0.0.rc / 2010-10-05
 
 [full changelog](http://github.com/rspec/rspec-mocks/compare/v2.0.0.beta.22...v2.0.0.rc)

data/Rakefile

@@ -7,13 +7,6 @@ require 'rspec/core/rake_task'
 require 'rspec/mocks/version'
 require 'cucumber/rake/task'
 
-RSpec::Core::RakeTask.new(:spec)
-
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.rcov = true
-  spec.rcov_opts = %[--exclude "core,expectations,gems/*,spec/resources,spec/spec,spec/spec_helper.rb,db/*,/Library/Ruby/*,config/*" --text-summary  --sort coverage]
-end
-
 class Cucumber::Rake::Task::ForkedCucumberRunner
   # When cucumber shells out, we still need it to run in the context of our
   # bundle.
@@ -22,10 +15,38 @@ class Cucumber::Rake::Task::ForkedCucumberRunner
   end
 end
 
-Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = %w{--format progress}
+task :cleanup_rcov_files do
+  rm_rf 'coverage.data'
+end
+
+desc "Run all examples"
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = %w[--color]
+end
+
+Cucumber::Rake::Task.new(:cucumber)
+
+namespace :spec do
+  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 "gems/*,features"]
+    t.rcov_opts << %[--text-report --sort coverage --no-html --aggregate coverage.data]
+  end
+end
+
+namespace :cucumber do
+  desc "Run cucumber features using rcov"
+  Cucumber::Rake::Task.new :rcov => :cleanup_rcov_files do |t|
+    t.cucumber_opts = %w{--format progress}
+    t.rcov = true
+    t.rcov_opts =  %[-Ilib -Ispec --exclude "gems/*,features"]
+    t.rcov_opts << %[--text-report --sort coverage --aggregate coverage.data]
+  end
 end
 
+task :default => [:spec, :cucumber]
+
 task :clobber do
   rm_rf 'pkg'
   rm_rf 'tmp'
@@ -40,4 +61,10 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
+desc "Push cukes to relishapp using the relish-client-gem"
+task :relish, :version do |t, args|
+  raise "rake relish[VERSION]" unless args[:version]
+  sh "bundle exec relish --organization rspec --project rspec-mocks -v #{args[:version]} push"
+end
+
 task :default => [:spec, :cucumber]

data/features/README.markdown

@@ -1,12 +1,30 @@
-# Cucumber features
+rspec-mocks is used to create dynamic "doubles", which stand in for real
+objects in examples. You can set message expectations on them (i.e. mock
+methods), and/or stub return values for arbitrary messages:
 
-RSpec is specified using both RSpec and
-[Cucumber](http://github.com/aslakhellesoy/cucumber). Cucumber provides
-_executable documentation_.  This means that the _.feature_ files below this
-directory serve as specification, documentation _and_ regression tests of the
-behaviour.
+    describe Account do
+      context "when closed" do
+        it "logs an account closed message" do
+          logger = double()
+          account = Account.new
+          account.logger = logger
+
+          logger.should_receive(:account_closed).with(account)
+
+          account.close
+        end
+      end
+    end
+
+Message expectations like the one in the example above are verified at
+the end of each example.
 
 ## Issues
 
-If you find this documentation incomplete or confusing, please [submit an
-issue](http://github.com/rspec/rspec-mocks/issues).
+The documentation for rspec-mocks is a work in progress. We'll be adding
+Cucumber features over time, and clarifying existing ones.  If you have
+specific features you'd like to see added, find the existing documentation
+incomplete or confusing, or, better yet, wish to write a missing Cucumber
+feature yourself, please [submit an
+issue](http://github.com/rspec/rspec-mocks/issues) or a [pull
+request](http://github.com/rspec/rspec-mocks).

data/features/{mocks/block_local_expectations.feature → message_expectations/block_local_expectations.feature.pending}

@@ -14,27 +14,28 @@ Feature: block local expectations
       """
 
   Scenario: passing example
-    Given a file named "spec/account_passing_spec.rb" with:
+    Given a file named "spec/account_spec.rb" with:
       """
       require 'account'
 
       describe "account DSL" do
         it "it succeeds when the block local receives the given call" do
-          Account.should_receive(:create).and_yield do |account|
+          account = double("Account")
+          Account.should_receive(:create).and_yield(account) do |account|
             account.should_receive(:opening_balance).with(100, :USD)
           end
-          Account.create do
-            opening_balance 100, :USD
+          Account.create do |account|
+            account.opening_balance 100, :USD
           end
         end
       end
       """
-    When I run "rspec ./spec/account_passing_spec.rb"
+    When I run "rspec ./spec/account_spec.rb"
     Then the output should contain "1 example, 0 failures"
     
   Scenario: failing example
     
-    Given a file named "spec/account_failing_spec.rb" with:
+    Given a file named "spec/account_spec.rb" with:
       """
       require 'account'
 
@@ -43,12 +44,12 @@ Feature: block local expectations
           Account.should_receive(:create).and_yield do |account|
             account.should_receive(:opening_balance).with(100, :USD)
           end
-          Account.create do
+          Account.create do |account|
             # opening_balance is not called here
           end
         end
       end
       """
 
-    When I run "rspec ./spec/account_failing_spec.rb"
+    When I run "rspec ./spec/account_spec.rb"
     Then the output should contain "1 example, 1 failure"

data/features/message_expectations/expect_message.feature

@@ -0,0 +1,94 @@
+Feature: Expect a message
+
+  Use should_receive() to set an expectation that a receiver should receive a
+  message before the example is completed.
+
+  Scenario: expect a message
+    Given a file named "spec/account_spec.rb" with:
+      """
+      require "account"
+
+      describe Account do
+        context "when closed" do
+          it "logs an account closed message" do
+            logger = double("logger")
+            account = Account.new
+            account.logger = logger
+
+            logger.should_receive(:account_closed)
+
+            account.close
+          end
+        end
+      end
+      """
+    And a file named "lib/account.rb" with:
+      """
+      class Account
+        attr_accessor :logger
+
+        def close
+          logger.account_closed
+        end
+      end
+      """
+    When I run "rspec spec/account_spec.rb"
+    Then the output should contain "1 example, 0 failures"
+
+  Scenario: expect a message with an argument
+    Given a file named "spec/account_spec.rb" with:
+      """
+      require "account"
+
+      describe Account do
+        context "when closed" do
+          it "logs an account closed message" do
+            logger = double("logger")
+            account = Account.new
+            account.logger = logger
+
+            logger.should_receive(:account_closed).with(account)
+
+            account.close
+          end
+        end
+      end
+      """
+    And a file named "lib/account.rb" with:
+      """
+      class Account
+        attr_accessor :logger
+
+        def close
+          logger.account_closed(self)
+        end
+      end
+      """
+    When I run "rspec spec/account_spec.rb"
+    Then the output should contain "1 example, 0 failures"
+
+  Scenario: provide a return value
+    Given a file named "message_expectation_spec.rb" with:
+      """
+      describe "a message expectation" do
+        context "with a return value" do
+          context "specified in a block" do
+            it "returns the specified value" do
+              receiver = double("receiver")
+              receiver.should_receive(:message) { :return_value }
+              receiver.message.should eq(:return_value)
+            end
+          end
+
+          context "specified with and_return" do
+            it "returns the specified value" do
+              receiver = double("receiver")
+              receiver.should_receive(:message).and_return(:return_value)
+              receiver.message.should eq(:return_value)
+            end
+          end
+        end
+      end
+      """
+    When I run "rspec message_expectation_spec.rb"
+    Then the output should contain "2 examples, 0 failures"

data/features/{mocks → message_expectations}/warn_when_expectation_is_set_on_nil.feature

@@ -1,4 +1,4 @@
-Feature: warn when expectation is set on nil
+Feature: Warn when expectation is set on nil
 
   Scenario: nil instance variable
     Given a file named "example_spec.rb" with:

data/features/{configuration.feature → outside_rspec/configuration.feature}

@@ -1,4 +1,4 @@
-Feature: configure a test frawework to use rspec-mocks
+Feature: Configure any test framework to use rspec-mocks
 
   Test frameworks that want to use rspec-mocks can use
   RSpec::Mocks::setup(self) to hook into rspec-mocks. Doing so adds the

data/features/stubs/simple_return_value.feature

@@ -0,0 +1,55 @@
+Feature: Stub with simple return value
+
+  Use the stub() method on a test double or a real object to tell the object to
+  return a value (or values) in response to a given message. If the message is
+  never received, nothing happens.
+
+  Scenario: simple stub with no return value
+    Given a file named "example_spec.rb" with:
+      """
+      describe "a simple stub with no return value specified" do
+        let(:receiver) { double("receiver") }
+
+        it "returns nil" do
+          receiver.stub(:message)
+          receiver.message.should be(nil)
+        end
+
+        it "quietly carries on when not called" do
+          receiver.stub(:message)
+        end
+      end
+      """
+    When I run "rspec example_spec.rb"
+    Then the output should contain "0 failures"
+
+  Scenario: single return value
+    Given a file named "example_spec.rb" with:
+      """
+      describe "a simple stub with a return value" do
+        context "specified in a block" do
+          it "returns the specified value" do
+            receiver = double("receiver")
+            receiver.stub(:message) { :return_value }
+            receiver.message.should eq(:return_value)
+          end
+        end
+
+        context "specified in the double declaration" do
+          it "returns the specified value" do
+            receiver = double("receiver", :message => :return_value)
+            receiver.message.should eq(:return_value)
+          end
+        end
+
+        context "specified with and_return" do
+          it "returns the specified value" do
+            receiver = double("receiver")
+            receiver.stub(:message).and_return(:return_value)
+            receiver.message.should eq(:return_value)
+          end
+        end
+      end
+      """
+    When I run "rspec example_spec.rb"
+    Then the output should contain "0 failures"

data/features/stubs/stub_chain.feature

@@ -1,4 +1,4 @@
-Feature: stub_chain
+Feature: Stub a chain of methods
 
   The stub_chain method lets you to stub a chain of methods in one statement.
   Method chains are considered a design smell, but it's not really the method

data/features/stubs/stub_implementation.feature

@@ -1,15 +1,11 @@
-Feature: stub implementation
+Feature: Stub with substitute implementation
 
-  As an rspec user, I want to stub a complete implementation, not just a
-  return value.
+  You can stub an implementation of a method (a.k.a. fake) by passing a block
+  to the stub() method.
   
   Scenario: stub implementation
     Given a file named "stub_implementation_spec.rb" with:
       """
-      RSpec.configure do |c|
-        c.mock_with :rspec
-      end
-
       describe "a stubbed implementation" do
         it "works" do
           object = Object.new
@@ -21,8 +17,8 @@ Feature: stub implementation
             end
           end
           
-          object.foo(:this).should == "got this"
-          object.foo(:that).should == "got that"
+          object.foo(:this).should eq("got this")
+          object.foo(:that).should eq("got that")
         end
       end
       """

data/lib/rspec/mocks/version.rb

@@ -1,7 +1,7 @@
 module RSpec # :nodoc:
   module Mocks # :nodoc:
     module Version # :nodoc:
-      STRING = '2.0.0.rc'
+      STRING = '2.0.0'
     end
   end
 end

data/spec/rspec/mocks/mock_spec.rb

@@ -88,7 +88,14 @@ module RSpec
         @mock.rspec_verify
       end
 
-      it "returns nil if no return value set" do
+      it "returns the previously stubbed value if no return value is set" do
+        @mock.stub!(:something).with("a","b","c").and_return(:stubbed_value)
+        @mock.should_receive(:something).with("a","b","c")
+        @mock.something("a","b","c").should == :stubbed_value
+        @mock.rspec_verify
+      end
+
+      it "returns nil if no return value is set and there is no previously stubbed value" do
         @mock.should_receive(:something).with("a","b","c")
         @mock.something("a","b","c").should be_nil
         @mock.rspec_verify
@@ -144,9 +151,11 @@ module RSpec
         }.to raise_error(RSpec::Mocks::MockExpectationError, /Double \"test double\" received :something but passed block failed with: expected false to be true/)
       end
 
-      it "passes block to expectation block" do
+      it "passes block to expectation block", :ruby => '> 1.8.6' do
         a = nil
-        @mock.should_receive(:something) { |&block| a = block }
+        # We eval this because Ruby 1.8.6's syntax parser barfs on { |&block| ... }
+        # and prevents the entire spec suite from running.
+        eval("@mock.should_receive(:something) { |&block| a = block }")
         b = lambda { }
         @mock.something(&b)
         a.should == b

data/spec/spec_helper.rb

@@ -38,4 +38,15 @@ RSpec.configure do |config|
   config.color_enabled = true
   config.extend(Macros)
   config.include(RSpec::Mocks::Methods)
+
+  config.filter_run_excluding :ruby => lambda {|version|
+    case version.to_s
+    when "!jruby"
+      RUBY_ENGINE != "jruby"
+    when /^> (.*)/
+      !(RUBY_VERSION.to_s > $1)
+    else
+      !(RUBY_VERSION.to_s =~ /^#{version.to_s}/)
+    end
+  }
 end

metadata

@@ -1,14 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-mocks
 version: !ruby/object:Gem::Version 
-  hash: 7712058
-  prerelease: true
+  prerelease: false
   segments: 
   - 2
   - 0
   - 0
-  - rc
-  version: 2.0.0.rc
+  version: 2.0.0
 platform: ruby
 authors: 
 - David Chelimsky
@@ -17,43 +15,39 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-04 00:00:00 -05:00
+date: 2010-10-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: rspec-core
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 7712058
         segments: 
         - 2
         - 0
         - 0
-        - rc
-        version: 2.0.0.rc
-  requirement: *id001
+        version: 2.0.0
   type: :runtime
-  name: rspec-core
   prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: rspec-expectations
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 7712058
         segments: 
         - 2
         - 0
         - 0
-        - rc
-        version: 2.0.0.rc
-  requirement: *id002
+        version: 2.0.0
   type: :runtime
-  name: rspec-expectations
   prerelease: false
+  version_requirements: *id002
 description: RSpec's 'test double' framework, with support for stubbing and mocking
 email: dchelimsky@gmail.com;chad.humphries@gmail.com
 executables: []
@@ -74,9 +68,11 @@ files:
 - autotest/discover.rb
 - cucumber.yml
 - features/README.markdown
-- features/configuration.feature
-- features/mocks/block_local_expectations.feature
-- features/mocks/warn_when_expectation_is_set_on_nil.feature
+- features/message_expectations/block_local_expectations.feature.pending
+- features/message_expectations/expect_message.feature
+- features/message_expectations/warn_when_expectation_is_set_on_nil.feature
+- features/outside_rspec/configuration.feature
+- features/stubs/simple_return_value.feature
 - features/stubs/stub_chain.feature
 - features/stubs/stub_implementation.feature
 - features/support/env.rb
@@ -159,33 +155,33 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -3165430952158630133
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: -3165430952158630133
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: rspec
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: rspec-mocks-2.0.0.rc
+summary: rspec-mocks-2.0.0
 test_files: 
 - features/README.markdown
-- features/configuration.feature
-- features/mocks/block_local_expectations.feature
-- features/mocks/warn_when_expectation_is_set_on_nil.feature
+- features/message_expectations/block_local_expectations.feature.pending
+- features/message_expectations/expect_message.feature
+- features/message_expectations/warn_when_expectation_is_set_on_nil.feature
+- features/outside_rspec/configuration.feature
+- features/stubs/simple_return_value.feature
 - features/stubs/stub_chain.feature
 - features/stubs/stub_implementation.feature
 - features/support/env.rb