rspec-expectations 2.5.0 → 2.6.0.rc2

data/spec/rspec/matchers/matcher_spec.rb

@@ -1,10 +1,56 @@
 require 'spec_helper'
 
 class UnexpectedError < StandardError; end
+module MatcherHelperModule
+  def self.included(base)
+    base.module_eval do
+      def included_method; end
+    end
+  end
+
+  def self.extended(base)
+    base.instance_eval do
+      def extended_method; end
+    end
+  end
+
+  def greeting
+    "Hello, World"
+  end
+end
 
 module RSpec
   module Matchers
     describe Matcher do
+      context "with an included module" do
+        let(:matcher) do
+          RSpec::Matchers::Matcher.new(:be_a_greeting) do
+            include MatcherHelperModule
+            match { |actual| actual == greeting }
+          end
+        end
+
+        it "has access to the module's methods" do
+          matcher.matches?("Hello, World")
+        end
+
+        it "runs the module's included hook" do
+          matcher.should respond_to(:included_method)
+        end
+
+        it "does not run the module's extended hook" do
+          matcher.should_not respond_to(:extended_method)
+        end
+
+        it 'allows multiple modules to be included at once' do
+          m = RSpec::Matchers::Matcher.new(:multiple_modules) do
+            include Enumerable, Comparable
+          end
+          m.should be_a(Enumerable)
+          m.should be_a(Comparable)
+        end
+      end
+
       context "without overrides" do
         before(:each) do
           @matcher = RSpec::Matchers::Matcher.new(:be_a_multiple_of, 3) do |multiple|

data/spec/rspec/matchers/matchers_spec.rb

@@ -1,19 +1,5 @@
 require 'spec_helper'
 
-module Test
-  module Unit
-    class TestCase
-    end
-  end
-end
-
-module MiniTest
-  module Unit
-    class TestCase
-    end
-  end
-end
-
 module RSpec
   describe Matchers do
 
@@ -25,21 +11,15 @@ module RSpec
     end
 
     context "once required" do
-
-      before(:all) do
-        path = File.expand_path("../../../../#{path}", __FILE__)
-        load File.join(path, 'lib/rspec/matchers.rb')
-      end
-
       it "includes itself in Test::Unit::TestCase" do
-        test_unit_case = Test::Unit::TestCase.new
+        test_unit_case = Test::Unit::TestCase.allocate
         sample_matchers.each do |sample_matcher|
             test_unit_case.should respond_to(sample_matcher)
         end
       end
 
-      it "includes itself in MiniTest::Unit::TestCase" do
-        minitest_case = MiniTest::Unit::TestCase.new
+      it "includes itself in MiniTest::Unit::TestCase", :if => defined?(MiniTest) do
+        minitest_case = MiniTest::Unit::TestCase.allocate
         sample_matchers.each do |sample_matcher|
             minitest_case.should respond_to(sample_matcher)
         end

data/spec/rspec/matchers/method_missing_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+shared_examples_for "a well-behaved method_missing hook" do
+  it "raises a NoMethodError (and not SystemStackError) for an undefined method" do
+    expect { subject.some_undefined_method }.to raise_error(NoMethodError)
+  end
+end
+
+describe "RSpec::Matchers method_missing hook" do
+  subject { self }
+  it_behaves_like "a well-behaved method_missing hook"
+
+  context 'when invoked in a Test::Unit::TestCase' do
+    subject { Test::Unit::TestCase.allocate }
+    it_behaves_like "a well-behaved method_missing hook"
+  end
+
+  context 'when invoked in a MiniTest::Unit::TestCase', :if => defined?(MiniTest) do
+    subject { MiniTest::Unit::TestCase.allocate }
+    it_behaves_like "a well-behaved method_missing hook"
+  end
+end
+

data/spec/spec_helper.rb

@@ -7,6 +7,8 @@ def add_to_load_path(path, prepend=false)
   end
 end
 
+require 'test/unit'
+
 add_to_load_path("rspec-expectations", :prepend)
 add_to_load_path("rspec-core")
 add_to_load_path("rspec-mocks")

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-expectations
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 15424049
+  prerelease: 6
   segments: 
   - 2
-  - 5
+  - 6
   - 0
-  version: 2.5.0
+  - rc
+  - 2
+  version: 2.6.0.rc2
 platform: ruby
 authors: 
 - David Chelimsky
@@ -16,11 +18,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-05 00:00:00 -06:00
+date: 2011-04-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :runtime
+  name: diff-lcs
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -31,10 +36,7 @@ dependencies:
         - 1
         - 2
         version: 1.1.2
-  type: :runtime
-  name: diff-lcs
-  prerelease: false
-  version_requirements: *id001
+  requirement: *id001
 description: rspec expectations (should[_not] and matchers)
 email: dchelimsky@gmail.com;chad.humphries@gmail.com
 executables: []
@@ -46,6 +48,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- .travis.yml
 - Gemfile
 - Guardfile
 - License.txt
@@ -149,13 +152,13 @@ files:
 - spec/rspec/matchers/match_spec.rb
 - spec/rspec/matchers/matcher_spec.rb
 - spec/rspec/matchers/matchers_spec.rb
+- spec/rspec/matchers/method_missing_spec.rb
 - spec/rspec/matchers/operator_matcher_spec.rb
 - spec/rspec/matchers/raise_error_spec.rb
 - spec/rspec/matchers/respond_to_spec.rb
 - spec/rspec/matchers/satisfy_spec.rb
 - spec/rspec/matchers/throw_symbol_spec.rb
 - spec/spec_helper.rb
-- spec/suite.rb
 - spec/support/classes.rb
 - spec/support/matchers.rb
 - spec/support/ruby_version.rb
@@ -181,19 +184,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: rspec
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
-summary: rspec-expectations-2.5.0
+summary: rspec-expectations-2.6.0.rc2
 test_files: 
 - features/Changelog.md
 - features/README.markdown
@@ -248,13 +253,13 @@ test_files:
 - spec/rspec/matchers/match_spec.rb
 - spec/rspec/matchers/matcher_spec.rb
 - spec/rspec/matchers/matchers_spec.rb
+- spec/rspec/matchers/method_missing_spec.rb
 - spec/rspec/matchers/operator_matcher_spec.rb
 - spec/rspec/matchers/raise_error_spec.rb
 - spec/rspec/matchers/respond_to_spec.rb
 - spec/rspec/matchers/satisfy_spec.rb
 - spec/rspec/matchers/throw_symbol_spec.rb
 - spec/spec_helper.rb
-- spec/suite.rb
 - spec/support/classes.rb
 - spec/support/matchers.rb
 - spec/support/ruby_version.rb

data/spec/suite.rb

@@ -1 +0,0 @@
-Dir["spec/**/*_spec.rb"].each {|f| require f}