rspec-expectations 2.0.0.beta.8 → 2.0.0.beta.9

data/spec/rspec/matchers/be_close_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-module Rspec
+module RSpec
   module Matchers
     describe "[actual.should] be_close(expected, delta)" do
       it "matches when actual == expected" do

data/spec/rspec/matchers/be_instance_of_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-module Rspec
+module RSpec
   module Matchers
     [:be_an_instance_of, :be_instance_of].each do |method|
       describe "actual.should #{method}(expected)" do

data/spec/rspec/matchers/be_kind_of_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-module Rspec
+module RSpec
   module Matchers
     [:be_a_kind_of, :be_kind_of].each do |method|
       describe "actual.should #{method}(expected)" do

data/spec/rspec/matchers/change_spec.rb

@@ -62,7 +62,7 @@ describe "should change { block }" do
   it "should warn if passed a block using do/end instead of {}" do
     expect do
       expect {}.to change do; end
-    end.to raise_error(Rspec::Matchers::MatcherError, /block passed to should or should_not/)
+    end.to raise_error(RSpec::Matchers::MatcherError, /block passed to should or should_not/)
   end
   
   it "provides a #description" do
@@ -89,7 +89,7 @@ describe "should_not change { block }" do
   it "should warn if passed a block using do/end instead of {}" do
     expect do
       expect {}.to_not change do; end
-    end.to raise_error(Rspec::Matchers::MatcherError, /block passed to should or should_not/)
+    end.to raise_error(RSpec::Matchers::MatcherError, /block passed to should or should_not/)
   end
 end
 
@@ -336,7 +336,7 @@ describe "should change{ block }.from(old).to(new)" do
   end
 end
 
-describe Rspec::Matchers::Change do
+describe RSpec::Matchers::Change do
   it "should work when the receiver has implemented #send" do
     @instance = SomethingExpected.new
     @instance.some_value = "string"

data/spec/rspec/matchers/compatibility_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
-Rspec::Matchers.define :have_public_instance_method do |method|
+RSpec::Matchers.define :have_public_instance_method do |method|
   match do |klass|
     klass.public_instance_methods.any? {|m| [method, method.to_sym].include?(m)}
   end
 end
 
-(Rspec::Matchers.constants.sort).each do |c|
-  if (Class === (klass = Rspec::Matchers.const_get(c)))
+(RSpec::Matchers.constants.sort).each do |c|
+  if (Class === (klass = RSpec::Matchers.const_get(c)))
     describe klass do
       if klass.public_instance_methods.any? {|m| ['failure_message_for_should',:failure_message_for_should].include?(m)}
         describe "called with should" do

data/spec/rspec/matchers/description_generation_spec.rb

@@ -2,138 +2,138 @@ require 'spec_helper'
 
 describe "Matchers should be able to generate their own descriptions" do
   after(:each) do
-    Rspec::Matchers.clear_generated_description
+    RSpec::Matchers.clear_generated_description
   end
 
   it "should == expected" do
     "this".should == "this"
-    Rspec::Matchers.generated_description.should == "should == \"this\""
+    RSpec::Matchers.generated_description.should == "should == \"this\""
   end
   
   it "should not == expected" do
     "this".should_not == "that"
-    Rspec::Matchers.generated_description.should == "should not == \"that\""
+    RSpec::Matchers.generated_description.should == "should not == \"that\""
   end
   
   it "should be empty (arbitrary predicate)" do
     [].should be_empty
-    Rspec::Matchers.generated_description.should == "should be empty"
+    RSpec::Matchers.generated_description.should == "should be empty"
   end
   
   it "should not be empty (arbitrary predicate)" do
     [1].should_not be_empty
-    Rspec::Matchers.generated_description.should == "should not be empty"
+    RSpec::Matchers.generated_description.should == "should not be empty"
   end
   
   it "should be true" do
     true.should be_true
-    Rspec::Matchers.generated_description.should == "should be true"
+    RSpec::Matchers.generated_description.should == "should be true"
   end
   
   it "should be false" do
     false.should be_false
-    Rspec::Matchers.generated_description.should == "should be false"
+    RSpec::Matchers.generated_description.should == "should be false"
   end
   
   it "should be nil" do
     nil.should be_nil
-    Rspec::Matchers.generated_description.should == "should be nil"
+    RSpec::Matchers.generated_description.should == "should be nil"
   end
   
   it "should be > n" do
     5.should be > 3
-    Rspec::Matchers.generated_description.should == "should be > 3"
+    RSpec::Matchers.generated_description.should == "should be > 3"
   end
   
   it "should be predicate arg1, arg2 and arg3" do
     5.0.should be_between(0,10)
-    Rspec::Matchers.generated_description.should == "should be between 0 and 10"
+    RSpec::Matchers.generated_description.should == "should be between 0 and 10"
   end
 
   it "should equal" do
     expected = "expected"
     expected.should equal(expected)
-    Rspec::Matchers.generated_description.should == "should equal \"expected\""
+    RSpec::Matchers.generated_description.should == "should equal \"expected\""
   end
   
   it "should_not equal" do
     5.should_not equal(37)
-    Rspec::Matchers.generated_description.should == "should not equal 37"
+    RSpec::Matchers.generated_description.should == "should not equal 37"
   end
   
   it "should eql" do
     "string".should eql("string")
-    Rspec::Matchers.generated_description.should == "should eql \"string\""
+    RSpec::Matchers.generated_description.should == "should eql \"string\""
   end
   
   it "should not eql" do
     "a".should_not eql(:a)
-    Rspec::Matchers.generated_description.should == "should not eql :a"
+    RSpec::Matchers.generated_description.should == "should not eql :a"
   end
   
   it "should have_key" do
     {:a => "a"}.should have_key(:a)
-    Rspec::Matchers.generated_description.should == "should have key :a"
+    RSpec::Matchers.generated_description.should == "should have key :a"
   end
   
   it "should have n items" do
     team.should have(3).players
-    Rspec::Matchers.generated_description.should == "should have 3 players"
+    RSpec::Matchers.generated_description.should == "should have 3 players"
   end
   
   it "should have at least n items" do
     team.should have_at_least(2).players
-    Rspec::Matchers.generated_description.should == "should have at least 2 players"
+    RSpec::Matchers.generated_description.should == "should have at least 2 players"
   end
   
   it "should have at most n items" do
     team.should have_at_most(4).players
-    Rspec::Matchers.generated_description.should == "should have at most 4 players"
+    RSpec::Matchers.generated_description.should == "should have at most 4 players"
   end
   
   it "should include" do
     [1,2,3].should include(3)
-    Rspec::Matchers.generated_description.should == "should include 3"
+    RSpec::Matchers.generated_description.should == "should include 3"
   end
 
   it "array.should =~ [1,2,3]" do
     [1,2,3].should =~ [1,2,3]
-    Rspec::Matchers.generated_description.should == "should contain exactly 1, 2 and 3"
+    RSpec::Matchers.generated_description.should == "should contain exactly 1, 2 and 3"
   end
   
   it "should match" do
     "this string".should match(/this string/)
-    Rspec::Matchers.generated_description.should == "should match /this string/"
+    RSpec::Matchers.generated_description.should == "should match /this string/"
   end
   
   it "should raise_error" do
     lambda { raise }.should raise_error
-    Rspec::Matchers.generated_description.should == "should raise Exception"
+    RSpec::Matchers.generated_description.should == "should raise Exception"
   end
   
   it "should raise_error with type" do
     lambda { raise }.should raise_error(RuntimeError)
-    Rspec::Matchers.generated_description.should == "should raise RuntimeError"
+    RSpec::Matchers.generated_description.should == "should raise RuntimeError"
   end
   
   it "should raise_error with type and message" do
     lambda { raise "there was an error" }.should raise_error(RuntimeError, "there was an error")
-    Rspec::Matchers.generated_description.should == "should raise RuntimeError with \"there was an error\""
+    RSpec::Matchers.generated_description.should == "should raise RuntimeError with \"there was an error\""
   end
   
   it "should respond_to" do
     [].should respond_to(:insert)
-    Rspec::Matchers.generated_description.should == "should respond to #insert"
+    RSpec::Matchers.generated_description.should == "should respond to #insert"
   end
   
   it "should throw symbol" do
     lambda { throw :what_a_mess }.should throw_symbol
-    Rspec::Matchers.generated_description.should == "should throw a Symbol"
+    RSpec::Matchers.generated_description.should == "should throw a Symbol"
   end
   
   it "should throw symbol (with named symbol)" do
     lambda { throw :what_a_mess }.should throw_symbol(:what_a_mess)
-    Rspec::Matchers.generated_description.should == "should throw :what_a_mess"
+    RSpec::Matchers.generated_description.should == "should throw :what_a_mess"
   end
   
   def team
@@ -155,6 +155,6 @@ describe "a Matcher with no description" do
   
   it "should provide a helpful message when used in a string-less example block" do
     5.should matcher
-    Rspec::Matchers.generated_description.should =~ /When you call.*description method/m
+    RSpec::Matchers.generated_description.should =~ /When you call.*description method/m
   end
 end

data/spec/rspec/matchers/dsl_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-module Rspec
+module RSpec
   module Matchers
     module DSL
       describe "#define" do
@@ -9,13 +9,13 @@ module Rspec
           # more robust - that expects new to be called with a specific
           # block (lambda, proc, whatever)
           mod = Module.new
-          mod.extend Rspec::Matchers::DSL
+          mod.extend RSpec::Matchers::DSL
           mod.define(:foo)
     
           obj = Object.new
           obj.extend mod
     
-          Rspec::Matchers::Matcher.should_receive(:new).with(:foo, 3) { stub('matcher').as_null_object }
+          RSpec::Matchers::Matcher.should_receive(:new).with(:foo, 3) { stub('matcher').as_null_object }
 
           obj.foo(3)
         end

data/spec/rspec/matchers/eq_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-module Rspec
+module RSpec
   module Matchers
     describe "eq" do
       it "matches when actual == expected" do

data/spec/rspec/matchers/eql_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-module Rspec
+module RSpec
   module Matchers
     describe "eql" do
       it "should match when actual.eql?(expected)" do

data/spec/rspec/matchers/equal_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-module Rspec
+module RSpec
   module Matchers
     describe "equal" do
       

data/spec/rspec/matchers/exist_spec.rb

@@ -14,7 +14,7 @@ class Substance
 end
   
 class SubstanceTester
-  include Rspec::Matchers
+  include RSpec::Matchers
   def initialize substance
     @substance = substance
   end

data/spec/rspec/matchers/have_spec.rb

@@ -3,7 +3,7 @@ require 'stringio'
 
 share_as :HaveSpecHelper do
   def create_collection_owner_with(n)
-    owner = Rspec::Expectations::Helper::CollectionOwner.new
+    owner = RSpec::Expectations::Helper::CollectionOwner.new
     (1..n).each do |number|
       owner.add_to_collection_with_length_method(number)
       owner.add_to_collection_with_size_method(number)
@@ -329,7 +329,7 @@ describe "have(n).things on an object which is not a collection nor contains one
   end
 end
 
-describe Rspec::Matchers::Have, "for a collection owner that implements #send" do
+describe RSpec::Matchers::Have, "for a collection owner that implements #send" do
   include HaveSpecHelper
   
   before(:each) do
@@ -357,7 +357,7 @@ describe Rspec::Matchers::Have, "for a collection owner that implements #send" d
   end
 end
 
-module Rspec
+module RSpec
   module Matchers
     describe Have do
       it "should have method_missing as private" do

data/spec/rspec/matchers/match_array_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 class UnsortableObject
+  # ruby-1.9.2 adds <=> to Object
+  undef_method :<=> rescue nil
+
   def initialize(id)
     @id = id
   end

data/spec/rspec/matchers/matcher_spec.rb

@@ -2,12 +2,12 @@ require 'spec_helper'
 
 class UnexpectedError < StandardError; end
 
-module Rspec
+module RSpec
   module Matchers
     describe Matcher do
       context "without overrides" do
         before(:each) do
-          @matcher = Rspec::Matchers::Matcher.new(:be_a_multiple_of, 3) do |multiple|
+          @matcher = RSpec::Matchers::Matcher.new(:be_a_multiple_of, 3) do |multiple|
             match do |actual|
               actual % multiple == 0
             end
@@ -30,22 +30,22 @@ module Rspec
       end
 
       it "is not diffable by default" do
-        matcher = Rspec::Matchers::Matcher.new(:name) {}
+        matcher = RSpec::Matchers::Matcher.new(:name) {}
         matcher.should_not be_diffable
       end
 
       it "is diffable when told to be" do
-        matcher = Rspec::Matchers::Matcher.new(:name) { diffable }
+        matcher = RSpec::Matchers::Matcher.new(:name) { diffable }
         matcher.should be_diffable
       end
 
       it "provides expected" do
-        matcher = Rspec::Matchers::Matcher.new(:name, 'expected string') {}
+        matcher = RSpec::Matchers::Matcher.new(:name, 'expected string') {}
         matcher.expected.should == ['expected string']
       end
 
       it "provides actual" do
-        matcher = Rspec::Matchers::Matcher.new(:name, 'expected string') do
+        matcher = RSpec::Matchers::Matcher.new(:name, 'expected string') do
           match {|actual|}
         end
 
@@ -56,7 +56,7 @@ module Rspec
 
       context "wrapping another expectation (should == ...)" do
         it "returns true if the wrapped expectation passes" do
-          matcher = Rspec::Matchers::Matcher.new(:name, 'value') do |expected|
+          matcher = RSpec::Matchers::Matcher.new(:name, 'value') do |expected|
             match do |actual|
               actual.should == expected
             end
@@ -65,7 +65,7 @@ module Rspec
         end
 
         it "returns false if the wrapped expectation fails" do
-          matcher = Rspec::Matchers::Matcher.new(:name, 'value') do |expected|
+          matcher = RSpec::Matchers::Matcher.new(:name, 'value') do |expected|
             match do |actual|
               actual.should == expected
             end
@@ -76,7 +76,7 @@ module Rspec
 
       context "with overrides" do
         before(:each) do
-          @matcher = Rspec::Matchers::Matcher.new(:be_boolean, true) do |boolean|
+          @matcher = RSpec::Matchers::Matcher.new(:be_boolean, true) do |boolean|
             match do |actual|
               actual
             end
@@ -117,7 +117,7 @@ module Rspec
 
       context "#new" do
         it "passes matches? arg to match block" do
-          matcher = Rspec::Matchers::Matcher.new(:ignore) do
+          matcher = RSpec::Matchers::Matcher.new(:ignore) do
             match do |actual|
               actual == 5
             end
@@ -126,7 +126,7 @@ module Rspec
         end
 
         it "exposes arg submitted through #new to matcher block" do
-          matcher = Rspec::Matchers::Matcher.new(:ignore, 4) do |expected|
+          matcher = RSpec::Matchers::Matcher.new(:ignore, 4) do |expected|
             match do |actual|
               actual > expected
             end
@@ -137,7 +137,7 @@ module Rspec
 
       context "with no args" do
         before(:each) do
-          @matcher = Rspec::Matchers::Matcher.new(:matcher_name) do
+          @matcher = RSpec::Matchers::Matcher.new(:matcher_name) do
             match do |actual|
               actual == 5
             end
@@ -155,7 +155,7 @@ module Rspec
 
       context "with 1 arg" do
         before(:each) do
-          @matcher = Rspec::Matchers::Matcher.new(:matcher_name, 1) do |expected|
+          @matcher = RSpec::Matchers::Matcher.new(:matcher_name, 1) do |expected|
             match do |actual|
               actual == 5 && expected == 1
             end
@@ -173,7 +173,7 @@ module Rspec
 
       context "with multiple args" do
         before(:each) do
-          @matcher = Rspec::Matchers::Matcher.new(:matcher_name, 1, 2, 3, 4) do |a,b,c,d|
+          @matcher = RSpec::Matchers::Matcher.new(:matcher_name, 1, 2, 3, 4) do |a,b,c,d|
             match do |sum|
               a + b + c + d == sum
             end
@@ -190,7 +190,7 @@ module Rspec
       end
 
       it "supports helper methods" do
-        matcher = Rspec::Matchers::Matcher.new(:be_similar_to, [1,2,3]) do |sample|
+        matcher = RSpec::Matchers::Matcher.new(:be_similar_to, [1,2,3]) do |sample|
           match do |actual|
             similar?(sample, actual)
           end
@@ -204,7 +204,7 @@ module Rspec
       end
 
       it "supports fluent interface" do
-        matcher = Rspec::Matchers::Matcher.new(:first_word) do
+        matcher = RSpec::Matchers::Matcher.new(:first_word) do
           def second_word
             self
           end
@@ -214,14 +214,14 @@ module Rspec
       end
 
       it "treats method missing normally for undeclared methods" do
-        matcher = Rspec::Matchers::Matcher.new(:ignore) { }
+        matcher = RSpec::Matchers::Matcher.new(:ignore) { }
         expect { matcher.non_existent_method }.to raise_error(NoMethodError)
       end
 
       it "has access to other matchers" do
-        matcher = Rspec::Matchers::Matcher.new(:ignore, 3) do |expected|
+        matcher = RSpec::Matchers::Matcher.new(:ignore, 3) do |expected|
           match do |actual|
-            extend Rspec::Matchers
+            extend RSpec::Matchers
             actual.should eql(5 + expected)
           end
         end
@@ -240,7 +240,7 @@ module Rspec
           end
           let(:matcher) do
             m = mod
-            Rspec::Matchers::Matcher.new :equal, 4 do |expected|
+            RSpec::Matchers::Matcher.new :equal, 4 do |expected|
               extend m
               match_unless_raises UnexpectedError do
                 assert_equal expected, actual
@@ -257,7 +257,7 @@ module Rspec
 
         context "with an unexpected error" do
           let(:matcher) do
-            Rspec::Matchers::Matcher.new :foo, :bar do |expected|
+            RSpec::Matchers::Matcher.new :foo, :bar do |expected|
               match_unless_raises SyntaxError do |actual|
                 raise "unexpected exception"
               end
@@ -274,7 +274,7 @@ module Rspec
       end
 
       it "can define chainable methods" do
-        matcher = Rspec::Matchers::Matcher.new(:name) do
+        matcher = RSpec::Matchers::Matcher.new(:name) do
           chain(:expecting) do |expected_value|
             @expected_value = expected_value
           end
@@ -291,7 +291,7 @@ module Rspec
         end
 
         it "can access methods in the running_example" do
-          Rspec::Matchers.define(:__access_running_example) do
+          RSpec::Matchers.define(:__access_running_example) do
             match do |actual|
               a_method_in_the_example == "method defined in the example"
             end
@@ -300,7 +300,7 @@ module Rspec
         end
 
         it "raises NoMethodError for methods not in the running_example" do
-          Rspec::Matchers.define(:__raise_no_method_error) do
+          RSpec::Matchers.define(:__raise_no_method_error) do
             match do |actual|
               a_method_not_in_the_example == "method defined in the example"
             end
@@ -308,7 +308,7 @@ module Rspec
 
           expect do
             running_example.should __raise_no_method_error
-          end.to raise_error(/Rspec::Matchers::Matcher/)
+          end.to raise_error(/RSpec::Matchers::Matcher/)
         end
       end