must_be 1.0.3 → 1.1.0

data/spec/must_be/basic_spec.rb

@@ -34,7 +34,7 @@ describe MustBe do
       context "when called with Float" do
         it "should notify" do
           51.must_be(Float).should == 51
-          should notify("51.must_be(Float), but matches Fixnum")
+          should notify("51.must_be(Float), but matches Integer")
         end
       end
       
@@ -48,7 +48,7 @@ describe MustBe do
       context "when called with Enumerable" do
         it "should notify" do
           51.must_be(Enumerable).should == 51
-          should notify("51.must_be(Enumerable), but matches Fixnum")
+          should notify("51.must_be(Enumerable), but matches Integer")
         end
       end
       
@@ -62,14 +62,14 @@ describe MustBe do
       context "when called with String, Time, Array" do
         it "should notify" do
           51.must_be(String, Time, Array).should == 51
-          should notify("51.must_be(String, Time, Array), but matches Fixnum")
+          should notify("51.must_be(String, Time, Array), but matches Integer")
         end
       end
       
       context "when called with [1, 51]" do
         it "should notify" do
           51.must_be([1, 51]).should == 51
-          should notify("51.must_be([1, 51]), but matches Fixnum")
+          should notify("51.must_be([1, 51]), but matches Integer")
         end
       end
       
@@ -118,14 +118,14 @@ describe MustBe do
       context "when called with no arguments" do
         it "should notify" do
           51.must_not_be.should == 51
-          should notify("51.must_not_be, but matches Fixnum")
+          should notify("51.must_not_be, but matches Integer")
         end
       end
       
       context "when called with Numeric" do
         it "should notify" do
           51.must_not_be(Numeric)
-          should notify("51.must_not_be(Numeric), but matches Fixnum")
+          should notify("51.must_not_be(Numeric), but matches Integer")
         end
       end
       
@@ -139,7 +139,7 @@ describe MustBe do
       context "when called with Comparable" do
         it "should notify" do
           51.must_not_be(Comparable)
-          should notify("51.must_not_be(Comparable), but matches Fixnum")
+          should notify("51.must_not_be(Comparable), but matches Integer")
         end
       end
       
@@ -154,7 +154,7 @@ describe MustBe do
         it "should notify" do
           51.must_not_be(Hash, Kernel, Object).should == 51
           should notify("51.must_not_be(Hash, Kernel, Object),"\
-            " but matches Fixnum")
+            " but matches Integer")
         end
       end
       
@@ -205,7 +205,7 @@ describe MustBe do
       it "should raise ArgumentError" do
         expect do
           51.send(the_method_name)
-        end.should raise_error(ArgumentError,
+        end.to raise_error(ArgumentError,
           "wrong number of arguments (0 for 1)")
       end
     end
@@ -214,7 +214,7 @@ describe MustBe do
       it "should raise TypeError" do
         expect do
           51.send(the_method_name, Object, :extra_message, :usual_message)
-        end.should raise_error(TypeError, "class or module required")
+        end.to raise_error(TypeError, "class or module required")
       end
     end
     
@@ -223,7 +223,7 @@ describe MustBe do
       it "should raise TypeError" do
         expect do
           51.send(the_method_name, Object, :not_a_module, Kernel)
-        end.should raise_error(TypeError, "class or module required")
+        end.to raise_error(TypeError, "class or module required")
       end
     end
     
@@ -231,7 +231,7 @@ describe MustBe do
       it "should raise TypeError" do
         expect do
           51.send(the_method_name, :not_a_module)
-        end.should raise_error(TypeError, "class or module required")
+        end.to raise_error(TypeError, "class or module required")
       end
     end    
   end
@@ -244,7 +244,7 @@ describe MustBe do
       context "when called with Float" do
         it "should notify" do
           51.must_be_a(Float)
-          should notify("51.must_be_a(Float), but is a Fixnum")
+          should notify("51.must_be_a(Float), but is a Integer")
         end
       end
       
@@ -276,7 +276,7 @@ describe MustBe do
       context "when called with Float, :message" do
         it "should notify" do
           51.must_be_a(Float, :message)
-          should notify("51.must_be_a(Float, :message), but is a Fixnum")
+          should notify("51.must_be_a(Float, :message), but is a Integer")
         end
       end
     end
@@ -298,7 +298,7 @@ describe MustBe do
         it "should notify" do
           51.must_not_be_a(Kernel, Comparable)
           should notify("51.must_not_be_a(Kernel, Comparable),"\
-            " but is a Fixnum")
+            " but is a Integer")
         end
       end
       
@@ -306,7 +306,7 @@ describe MustBe do
         it "should notify" do
           51.must_not_be_a(Float, Integer)
           should notify("51.must_not_be_a(Float, Integer),"\
-            " but is a Fixnum")
+            " but is a Integer")
         end
       end
       
@@ -314,7 +314,7 @@ describe MustBe do
         it "should notify" do
           51.must_not_be_a(Numeric, :message)
           should notify("51.must_not_be_a(Numeric, :message),"\
-            " but is a Fixnum")
+            " but is a Integer")
         end
       end
     end
@@ -325,7 +325,7 @@ describe MustBe do
       it "should raise NoMethodError" do
         expect do
           "hi".send(the_method_name, :does_not_respond_to_include?)
-        end.should raise_error(NoMethodError)
+        end.to raise_error(NoMethodError)
       end
     end
   end
@@ -470,27 +470,27 @@ describe MustBe do
     it "should raise ArgumentError if delta cannot be compared" do
       expect do
         200.0.send(the_method_name, 2.0, :a_little)
-      end.should raise_error(ArgumentError)
+      end.to raise_error(ArgumentError)
     end
     
     it "should raise TypeError if expected cannot be subtracted from"\
         " receiver" do
       expect do
         200.0.send(the_method_name, :some)
-      end.should raise_error(TypeError)
+      end.to raise_error(TypeError)
     end
 
     it "should raise NoMethodError if receiver does not respond to :-" do
       expect do
         :lots.send(the_method_name, 2.0)
-      end.should raise_error(NoMethodError)
+      end.to raise_error(NoMethodError)
     end
 
     it "should rasie NoMethodError if (receiver - expected) does not"\
         " respond to :abs" do
       expect do
         Time.new.send(the_method_name, 2.0, :five)
-      end.should raise_error(NoMethodError)
+      end.to raise_error(NoMethodError)
     end
   end
   

data/spec/must_be/containers_spec.rb

@@ -154,7 +154,7 @@ describe MustBe do
       it "should notify if any member matches one of the cases" do
         subject.must_not_contain(Range, Numeric).should == subject
         should notify("must_not_contain: 11.must_not_be(Range, Numeric),"\
-          " but matches Fixnum in container [11, :sin, \"cos\"]")
+          " but matches Integer in container [11, :sin, \"cos\"]")
       end
     
       context "when there are no cases" do
@@ -310,7 +310,7 @@ describe MustBe do
       
       context "after disabling" do
         before do
-          @enabled_array = [].must_only_ever_contain(Fixnum)
+          @enabled_array = [].must_only_ever_contain(Integer)
         end
         
         before_disable_after_enable
@@ -340,7 +340,7 @@ describe MustBe do
         
         context "when #must_only_ever_contain is called" do
           before do 
-            @disabled_array = [].must_only_ever_contain(Fixnum)
+            @disabled_array = [].must_only_ever_contain(Integer)
           end
           
           it "should not notify" do
@@ -734,7 +734,7 @@ describe MustBe do
           it "should raise TypeError" do
             expect do
               subject.must_only_ever_contain(Symbol)
-            end.should raise_error(TypeError,
+            end.to raise_error(TypeError,
               /No MustOnlyEverContain.registered_class for .*Box/)
           end
         end
@@ -751,7 +751,7 @@ describe MustBe do
                 end
               end
               subject.must_only_ever_contain(Symbol)
-            end.should raise_error(ArgumentError,
+            end.to raise_error(ArgumentError,
               /must_only_ever_contain adds singleton methods but receiver .*/)
           end
         end
@@ -784,13 +784,13 @@ describe MustBe do
           it "should raise when trying to register a non-class" do
             expect do
               MustOnlyEverContain.register(:not_a_class)
-            end.should raise_error(ArgumentError)
+            end.to raise_error(ArgumentError)
           end
           
           it "should raise when trying to register a class more than once" do
             expect do
               MustOnlyEverContain.register(Box)
-            end.should raise_error(ArgumentError)
+            end.to raise_error(ArgumentError)
           end
         end
       end
@@ -821,7 +821,7 @@ describe MustBe do
         it "should notify if obj is non-nil" do
           subject << 5
           should notify("must_never_ever_contain: Array#<<(5):"\
-            " 5.must_not_be, but matches Fixnum in container"\
+            " 5.must_not_be, but matches Integer in container"\
             " [nil, 5]")
         end
       end
@@ -893,7 +893,7 @@ describe MustBe do
           it "should raise TypeError" do
             expect do
               subject.must_never_ever_contain(String)
-            end.should raise_error(TypeError,
+            end.to raise_error(TypeError,
               /No MustOnlyEverContain.registered_class for .*Box/)
           end
         end
@@ -910,7 +910,7 @@ describe MustBe do
                 end
               end
               subject.must_never_ever_contain(Symbol)
-            end.should raise_error(ArgumentError,
+            end.to raise_error(ArgumentError,
               /must_never_ever_contain adds singleton methods but .*/)
           end
         end

data/spec/must_be/core_spec.rb

@@ -26,6 +26,16 @@ describe MustBe do
       si.length.should == MustBe::SHORT_INSPECT_CUTOFF_LENGTH
     end
     
+    it "should not mutate #inspect strings" do
+      o = Object.new
+      class <<o
+        def inspect
+          ("x" * (MustBe::SHORT_INSPECT_CUTOFF_LENGTH + 10)).freeze
+        end
+      end
+      MustBe.short_inspect(o)
+    end
+    
     it "should break at word boundries if possible" do
       side_length = MustBe::SHORT_INSPECT_CUTOFF_LENGTH / 2
       padding = "x" * (side_length - 7)
@@ -63,7 +73,7 @@ describe MustBe do
     example "#must_check should not yield to its block" do
       yielded = false
       must_check { yielded = true }
-      yielded.should be_false
+      yielded.should be false
     end
     
     example "#must should return receiver (not a proxy)" do
@@ -90,7 +100,7 @@ describe MustBe do
       
       example "#must_be should notify" do
         5799.must_be(:lolly).should == 5799
-        should notify("5799.must_be(:lolly), but matches Fixnum")
+        should notify("5799.must_be(:lolly), but matches Integer")
       end
 
       example "#must_notify should return a note" do
@@ -101,7 +111,7 @@ describe MustBe do
       example "#must_check should yield to its block" do
         yielded = false
         must_check { yielded = true }
-        yielded.should be_true
+        yielded.should be true
       end
 
       example "#must should return a proxy" do
@@ -180,7 +190,7 @@ describe MustBe do
         before_disable_after_enable
         
         example "handler should be called" do
-          @handler_called.should be_false
+          @handler_called.should be false
         end
       end
     end
@@ -193,7 +203,7 @@ describe MustBe do
       end
       
       example "handler should be called immediately" do
-        @handler_called.should be_false
+        @handler_called.should be false
       end
       
       context "when enabled" do
@@ -202,7 +212,7 @@ describe MustBe do
         end
         
         example "handler should be called" do
-          @handler_called.should be_true
+          @handler_called.should be true
         end
       end
     end
@@ -219,7 +229,7 @@ describe MustBe do
     it "should yield" do
       did_yield = false
       must_just_yield { did_yield = true }
-      did_yield.should be_true
+      did_yield.should be true
       should_not notify
     end
   end
@@ -253,7 +263,7 @@ describe MustBe do
         3.must_be(4)
         
         $stdout.string.should match(
-          /3.must_be\(4\), but matches Fixnum\n\t.*core_spec.rb:\d+.*\n\t/)
+          /3.must_be\(4\), but matches Integer\n\t.*core_spec.rb:\d+.*\n\t/)
       end
     end
     
@@ -279,10 +289,10 @@ describe MustBe do
           " and call the debugger" do
         3.must_be(4)
         
-        $stdout.string.should == "3.must_be(4), but matches Fixnum\n"\
+        $stdout.string.should == "3.must_be(4), but matches Integer\n"\
           "Starting debugger ($must_be__note stores the note)...\n"
-        $must_be__note.message.should == "3.must_be(4), but matches Fixnum"
-        $must_be__did_call_debugger.should be_true
+        $must_be__note.message.should == "3.must_be(4), but matches Integer"
+        $must_be__did_call_debugger.should be true
       end
     end
   end
@@ -310,13 +320,13 @@ describe MustBe do
     it "should raise NoMethodError when argument does not respond to :to_sym" do
       expect do
         MustBe.set_notifier_from_env(nil)
-      end.should raise_error(NoMethodError)
+      end.to raise_error(NoMethodError)
     end
     
     it "should raise ArgumentError when unknown notifier name provided" do
       expect do
         MustBe.set_notifier_from_env(:unknown)
-      end.should raise_error(ArgumentError)
+      end.to raise_error(ArgumentError)
     end
         
     it "should treat 'disable' as a special case" do
@@ -373,7 +383,7 @@ describe MustBe do
     it "should raise Note" do
       expect do
           must_notify("funny bunny")
-      end.should(raise_error(Note, "funny bunny") do |note|
+      end.to(raise_error(Note, "funny bunny") do |note|
         note.backtrace[0].should_not match(/`must_notify'/)
       end)
     end
@@ -493,15 +503,15 @@ describe MustBe do
     
     context "when called with #additional_message" do
       subject do
-        must_notify(5, :must_be, [String], nil, ", but matches Fixnum")
+        must_notify(5, :must_be, [String], nil, ", but matches Integer")
       end
       
-      it_should_notify("5.must_be(String), but matches Fixnum")
+      it_should_notify("5.must_be(String), but matches Integer")
       its(:receiver) { should == 5 }
       its(:assertion) { should == :must_be }
       its(:args) { should == [String] }
       its(:block) { should be_nil }
-      its(:additional_message) { should == ", but matches Fixnum"}
+      its(:additional_message) { should == ", but matches Integer"}
     end
   end
   
@@ -523,7 +533,7 @@ describe MustBe do
       it "should return nil" do
         did_yield = false
         note = must_check { did_yield = true }
-        did_yield.should be_true
+        did_yield.should be true
         should_not notify
         note.should == nil
       end
@@ -535,7 +545,7 @@ describe MustBe do
         must_check(lambda {}) do
           did_call_block = true
         end
-        did_call_block.should be_false
+        did_call_block.should be false
       end
       
       it "should call its block and notify if the proc notifies" do
@@ -545,7 +555,7 @@ describe MustBe do
           note.message.should == "check"
           Note.new("mate")
         end
-        did_call_block.should be_true
+        did_call_block.should be true
         should notify("mate")
       end
       
@@ -556,7 +566,7 @@ describe MustBe do
           note.message.should == "check"
           "mate"
         end
-        did_call_block.should be_true
+        did_call_block.should be true
         should notify("mate")
       end
     end
@@ -608,7 +618,7 @@ describe MustBe do
           must_check do
             raise
           end
-        end.should raise_error
+        end.to raise_error(RuntimeError)
       
         must_notify
         should notify