dchelimsky-rspec 1.1.99.9 → 1.1.99.13

data/.autotest

@@ -1,4 +1,5 @@
 Autotest.add_hook :initialize do |at|
   at.add_exception("spec/interop/test/unit/resources")
   at.add_exception("spec/spec/runner/drb_command_line_spec.rb")
-end
+end
+

data/.document

@@ -0,0 +1,7 @@
+features/**/*.feature
+lib/**/*.rb
+History.txt
+License.txt
+README.txt
+Ruby1.9.markdown
+Upgrade.markdown

data/History.txt

@@ -9,10 +9,19 @@ WARNINGS:
   * require 'spec/test/unit' to invoke test/unit interop if you're using
     RSpec's core (this is handled implicitly with spec-rails)
 
-  * setup/teardown is gone - use before/after instead
+  * setup and teardown are gone - use before and after instead
 
-    * you can still use setup/teardown if you're using Test::Unit::TestCase as
-      the base ExampleGroup class (which is implicit in rspec-rails)
+    * you can still use setup and teardown if you're using
+      Test::Unit::TestCase as the base ExampleGroup class (which is implicit
+      in rspec-rails)
+      
+  * The matcher protocol has been improved. The old protocol is still
+    supported, so as long as you're not monkey patching rspec's built-in
+    matchers, or using extension libraries that do, this should not affect
+    you. If you run into trouble, you'll just need to change:
+    
+    * failure_message          => failure_message_for_should
+    * negative_failure_message => failure_message_for_should_not
       
   * All references to rubygems have been removed from within rspec's code.
   
@@ -35,13 +44,17 @@ WARNINGS:
   * added handling for does_not_match? for matchers that want to know the context in which they were called
   * lots of ruby 1.9.1 compatibility fixes from Chad Humprhies
   * improved feedback from be_kind_of/be_a_kind_of/be_instance_of/be_an_instance_of (Jakub Šťastný)
-  * added --silent (-l) formatter option, which is now the default when running --heckle (Bob Aman)
+  * added --format silent (l) option, which is now the default when running --heckle (Bob Aman)
+  * sexy new custom matcher creation (Corey Haines & David Chelimsky - initial concept by Yehuda Katz)
+  * improved matcher protocol - old one is still supported, but new one is cleaner and prefered
   
 * bug fixes
 
   * support delegating operator matchers to subject with should_not
   * all arguments are included if --drb is specified in spec.opts (Neil Buckley). Closes #671.
   * added --autospec option hack (used internally) to get --color to work when using --drb and autospec.
+  * Fixed mock framework failure message bug in which similar calls were excluded from the output
+  * cryptic error message on change.rb when the from value is wrong (Michael Murray). Closes #706.
 
 === Version 1.1.12 / 2009-01-11
 

data/Manifest.txt

@@ -1,4 +1,5 @@
 .autotest
+.document
 History.txt
 License.txt
 Manifest.txt
@@ -6,6 +7,7 @@ README.txt
 Rakefile
 Ruby1.9.markdown
 TODO.txt
+Upgrade.markdown
 bin/autospec
 bin/spec
 cucumber.yml
@@ -19,6 +21,7 @@ examples/failing/mocking_with_flexmock.rb
 examples/failing/mocking_with_mocha.rb
 examples/failing/mocking_with_rr.rb
 examples/failing/partial_mock_example.rb
+examples/failing/pending_example.rb
 examples/failing/predicate_example.rb
 examples/failing/raising_example.rb
 examples/failing/spec_helper.rb
@@ -45,7 +48,6 @@ examples/passing/nested_classes_example.rb
 examples/passing/partial_mock_example.rb
 examples/passing/pending_example.rb
 examples/passing/predicate_example.rb
-examples/passing/priority.txt
 examples/passing/shared_example_group_example.rb
 examples/passing/shared_stack_examples.rb
 examples/passing/simple_matcher_example.rb
@@ -66,9 +68,12 @@ features/heckle/heckle.feature
 features/interop/examples_and_tests_together.feature
 features/interop/test_but_not_test_unit.feature
 features/interop/test_case_with_should_methods.feature
+features/matchers/create_matcher.feature
 features/mock_framework_integration/use_flexmock.feature
 features/mock_framework_integration/use_mocha.feature
 features/mock_framework_integration/use_rr.feature
+features/mocks/mix_stubs_and_mocks.feature
+features/pending/pending_examples.feature
 features/step_definitions/running_rspec.rb
 features/support/env.rb
 features/support/matchers/smart_match.rb
@@ -83,6 +88,7 @@ lib/spec/adapters/mock_frameworks/rspec.rb
 lib/spec/autorun.rb
 lib/spec/dsl.rb
 lib/spec/dsl/main.rb
+lib/spec/dsl/matchers.rb
 lib/spec/example.rb
 lib/spec/example/before_and_after_hooks.rb
 lib/spec/example/errors.rb
@@ -120,12 +126,14 @@ lib/spec/matchers/eql.rb
 lib/spec/matchers/equal.rb
 lib/spec/matchers/errors.rb
 lib/spec/matchers/exist.rb
+lib/spec/matchers/extensions/instance_exec.rb
 lib/spec/matchers/generated_descriptions.rb
 lib/spec/matchers/has.rb
 lib/spec/matchers/have.rb
 lib/spec/matchers/include.rb
 lib/spec/matchers/match.rb
 lib/spec/matchers/match_array.rb
+lib/spec/matchers/matcher.rb
 lib/spec/matchers/method_missing.rb
 lib/spec/matchers/operator_matcher.rb
 lib/spec/matchers/raise_error.rb
@@ -199,6 +207,7 @@ spec/rspec_suite.rb
 spec/ruby_forker.rb
 spec/spec.opts
 spec/spec/dsl/main_spec.rb
+spec/spec/dsl/matchers_spec.rb
 spec/spec/example/example_group_class_definition_spec.rb
 spec/spec/example/example_group_factory_spec.rb
 spec/spec/example/example_group_methods_spec.rb
@@ -214,6 +223,7 @@ spec/spec/example/subclassing_example_group_spec.rb
 spec/spec/expectations/differs/default_spec.rb
 spec/spec/expectations/extensions/object_spec.rb
 spec/spec/expectations/fail_with_spec.rb
+spec/spec/expectations/handler_spec.rb
 spec/spec/expectations/wrap_expectation_spec.rb
 spec/spec/interop/test/unit/resources/spec_that_fails.rb
 spec/spec/interop/test/unit/resources/spec_that_passes.rb
@@ -236,13 +246,13 @@ spec/spec/matchers/description_generation_spec.rb
 spec/spec/matchers/eql_spec.rb
 spec/spec/matchers/equal_spec.rb
 spec/spec/matchers/exist_spec.rb
-spec/spec/matchers/handler_spec.rb
 spec/spec/matchers/has_spec.rb
 spec/spec/matchers/have_spec.rb
 spec/spec/matchers/include_spec.rb
 spec/spec/matchers/match_array_spec.rb
 spec/spec/matchers/match_spec.rb
 spec/spec/matchers/matcher_methods_spec.rb
+spec/spec/matchers/matcher_spec.rb
 spec/spec/matchers/operator_matcher_spec.rb
 spec/spec/matchers/raise_error_spec.rb
 spec/spec/matchers/respond_to_spec.rb

data/README.txt

@@ -51,7 +51,4 @@ examples.
 
  or
 
-  git clone git://github.com/dchelimsky/rspec.git
-  cd rspec
-  rake gem
-  rake install_gem
+ clone, build, install - See http://wiki.github.com/dchelimsky/rspec

data/Rakefile

@@ -1,7 +1,6 @@
 # -*- ruby -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), 'lib'))
-require 'rubygems'
 require 'hoe'
 require 'spec/version'
 require 'spec/rake/spectask'
@@ -22,6 +21,7 @@ Hoe.new('rspec', Spec::VERSION::STRING) do |p|
   p.developer('RSpec Development Team', 'rspec-devel@rubyforge.org')
   p.extra_dev_deps = [["cucumber",">= 0.1.13"]]
   p.remote_rdoc_dir = "rspec/#{Spec::VERSION::STRING}"
+  p.rspec_options = ['--options', 'spec/spec.opts']
 end
 
 ['audit','test','test_deps','default','post_blog'].each do |task|
@@ -36,12 +36,6 @@ load File.dirname(__FILE__) + '/resources/rake/verify_rcov.rake'
 
 task :default => [:verify_rcov, :features]
 
-desc "Run all specs"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts = ['--options', 'spec/spec.opts']
-end
-
 namespace :spec do
   desc "Run all specs with rcov"
   Spec::Rake::SpecTask.new('rcov') do |t|
@@ -98,11 +92,6 @@ namespace :update do
   task :manifest do
     system %q[touch Manifest.txt; rake check_manifest | grep -v "(in " | patch]
   end
-  
-  desc "update the gemspec"
-  task :gemspec do
-    system %q[rake debug_gem | grep -v "(in " | grep -v "else" | grep -v "s.add_dependency(%q<hoe" | grep -v "s.add_dependency(%q<cuc" > `basename \\`pwd\\``.gemspec]
-  end
 end
 
 task :clobber => :clobber_tmp

data/Upgrade.markdown

@@ -0,0 +1,62 @@
+# Upgrade to rspec-1.1.99.x (pre rspec-1.2)
+
+## What's Changed
+
+### WARNINGS
+
+* If you use the ruby command to run specs instead of the spec command, you'll
+  need to require 'spec/autorun' or they won't run. This won't affect you if
+  you use the spec command or the Spec::Rake::SpecTask that ships with RSpec.
+
+* require 'spec/test/unit' to invoke test/unit interop if you're using
+  RSpec's core (this is handled implicitly with spec-rails)
+
+* setup and teardown are gone - use before and after instead
+
+  * you can still use setup and teardown if you're using
+    Test::Unit::TestCase as the base ExampleGroup class (which is implicit
+    in rspec-rails)
+
+* The matcher protocol has been improved. The old protocol is still
+  supported, so as long as you're not monkey patching rspec's built-in
+  matchers, or using extension libraries that do, this should not affect
+  you. If you run into trouble, you'll just need to change:
+  
+  * ``failure_message          => failure_message_for_should``
+  * ``negative_failure_message => failure_message_for_should_not``
+
+* All references to rubygems have been removed from within rspec's code.
+
+  * See Ryan Tomayko's http://gist.github.com/54177 for rationale and
+    suggestions on alternative approaches to loading rubygems
+
+## What's new
+
+### Ruby 1.9
+
+RSpec (core only - not rails yet) now works with Ruby 1.9.1
+
+### Improved heckle integration
+
+RSpec works with heckle again! Gotta use heckle >= 1.4.2 for this to work
+though.
+
+    [sudo] gem install heckle --version ">=1.4.2"
+    spec spec/game/mastermind.rb --heckle Game::Mastermind
+
+### New Matcher DSL
+
+We've added a new DSL for generating custom matchers very simply and cleanly.
+We'll still support the simple_matcher method, so never fear if you're using
+that, but we recommend that you start developing your new matchers with this
+new syntax.
+
+    Spec::Matchers.create do :be_a_multiple_of |smaller|
+      match do |bigger|
+        bigger % smaller == 0
+      end
+    end
+
+    9.should be_a_multiple_of(3)
+
+See ``features/matchers/create_matcher_.feature`` for more examples

data/examples/failing/pending_example.rb

@@ -0,0 +1,9 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe "pending example (which is fixed)" do
+  it %Q|reports "FIXED ... Expected ... to fail.  No Error was raised."| do
+    pending("for some reason") do
+      # success
+    end
+  end
+end

data/features/matchers/create_matcher.feature

@@ -0,0 +1,115 @@
+Feature: custom matcher shortcut
+
+  In order to express my domain clearly in my code examples
+  As an RSpec user
+  I want a shortcut for create custom matchers
+
+  Scenario: creating a matcher with default messages
+    Given the following spec:
+      """
+      Spec::Matchers.create :be_a_multiple_of do |expected|
+        match do |actual|
+          actual % expected == 0
+        end
+      end
+
+      describe 9 do
+        it {should be_a_multiple_of(3)}
+      end
+
+      describe 9 do
+        it {should_not be_a_multiple_of(4)}
+      end
+
+      # fail intentionally to generate expected output
+      describe 9 do
+        it {should be_a_multiple_of(4)}
+      end
+
+      # fail intentionally to generate expected output
+      describe 9 do
+        it {should_not be_a_multiple_of(3)}
+      end
+
+      """
+    When I run it with the spec command --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 "4 examples, 2 failures"
+    And the stdout should match "expected 9 to be a multiple of 4"
+    And the stdout should match "expected 9 not to be a multiple of 3"
+    
+  Scenario: overriding the failure_message_for_should
+    Given the following spec:
+      """
+      Spec::Matchers.create :be_a_multiple_of do |expected|
+        match do |actual|
+          actual % expected == 0
+        end
+        failure_message_for_should do |actual|
+          "expected that #{actual} would be a multiple of #{expected}"
+        end
+      end
+  
+      # fail intentionally to generate expected output
+      describe 9 do
+        it {should be_a_multiple_of(4)}
+      end
+      """
+    When I run it with the spec command
+    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"
+  
+  Scenario: overriding the failure_message_for_should_not
+    Given the following spec:
+      """
+      Spec::Matchers.create :be_a_multiple_of do |expected|
+        match do |actual|
+          actual % expected == 0
+        end
+        failure_message_for_should_not do |actual|
+          "expected that #{actual} would not be a multiple of #{expected}"
+        end
+      end
+  
+      # fail intentionally to generate expected output
+      describe 9 do
+        it {should_not be_a_multiple_of(3)}
+      end
+      """
+    When I run it with the spec command
+    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"
+  
+  Scenario: overriding the description
+    Given the following spec:
+      """
+      Spec::Matchers.create :be_a_multiple_of do |expected|
+        match do |actual|
+          actual % expected == 0
+        end
+        description do
+          "be multiple of #{expected}"
+        end
+      end
+  
+      describe 9 do
+        it {should be_a_multiple_of(3)}
+      end
+  
+      describe 9 do
+        it {should_not be_a_multiple_of(4)}
+      end
+      """
+    When I run it with the spec command --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"
+    And the stdout should match "should not be multiple of 4"

data/features/mocks/mix_stubs_and_mocks.feature

@@ -0,0 +1,22 @@
+Feature: Spec and test together
+
+  As an RSpec user
+  I want to use stubs and mocks together
+
+  Scenario: stub in before
+    Given the following spec:
+      """
+      describe "a stub in before" do
+        before(:each) do
+          @messenger = mock('messenger').as_null_object
+        end
+      
+        it "a" do
+          @messenger.should_receive(:foo).with('first')
+          @messenger.foo('second')
+          @messenger.foo('third')
+        end
+      end
+      """
+    When I run it with the spec command --format nested
+    Then the stdout should match "expected :foo with (\"first\") but received it with ([\"second\"], [\"third\"])"

data/features/pending/pending_examples.feature

@@ -0,0 +1,81 @@
+Feature: pending examples
+
+  RSpec offers three ways to indicate that an example is disabled pending
+  some action.
+  
+  Scenario: pending implementation
+    Given the following spec:
+      """
+      describe "an example" do
+        it "has not yet been implemented"
+      end
+      """
+    When I run it with the spec command
+    Then the exit code should be 0
+    And the stdout should match "1 example, 0 failures, 1 pending"
+    And the stdout should match "Not Yet Implemented"
+    And the stdout should match "current_example.rb:2"
+    
+  Scenario: pending implementation with spec/test/unit
+    Given the following spec:
+      """
+      require 'spec/test/unit'
+      describe "an example" do
+        it "has not yet been implemented"
+      end
+      """
+    When I run it with the spec command
+    Then the exit code should be 0
+    And the stdout should match "1 example, 0 failures, 1 pending"
+    And the stdout should match "Not Yet Implemented"
+    And the stdout should match "current_example.rb:3"
+
+  Scenario: pending any arbitary reason, with no block
+    Given the following spec:
+      """
+      describe "an example" do
+        it "is implemented but waiting" do
+          pending("something else getting finished")
+        end
+      end
+      """
+    When I run it with the spec command
+    Then the exit code should be 0
+    And the stdout should match "1 example, 0 failures, 1 pending"
+    And the stdout should match "(something else getting finished)"
+    And the stdout should match "current_example.rb:3"
+
+  Scenario: pending any arbitary reason, with a block
+    Given the following spec:
+      """
+      describe "an example" do
+        it "is implemented but waiting" do
+          pending("something else getting finished") do
+            raise "this is the failure"
+          end
+        end
+      end
+      """
+    When I run it with the spec command
+    Then the exit code should be 0
+    And the stdout should match "1 example, 0 failures, 1 pending"
+    And the stdout should match "(something else getting finished)"
+    And the stdout should match "current_example.rb:3"
+
+  Scenario: pending any arbitary reason, with a block that passes
+    Given the following spec:
+      """
+      describe "an example" do
+        it "is implemented but waiting" do
+          pending("something else getting finished") do
+            true.should be(true)
+          end
+        end
+      end
+      """
+    When I run it with the spec command
+    Then the exit code should be 256
+    And the stdout should match "1 example, 1 failure"
+    And the stdout should match "FIXED"
+    And the stdout should match "Expected pending 'something else getting finished' to fail. No Error was raised."
+    And the stdout should match "current_example.rb:3"