rspec-expectations 2.7.0 → 2.8.0.rc1

data/lib/rspec/matchers/respond_to.rb

@@ -1,6 +1,5 @@
 module RSpec
   module Matchers
-    
     class RespondTo
       def initialize(*names)
         @names = names
@@ -69,14 +68,10 @@ module RSpec
       end
     end
     
-    # :call-seq:
-    #   should respond_to(*names)
-    #   should_not respond_to(*names)
-    #
     # Matches if the target object responds to all of the names
     # provided. Names can be Strings or Symbols.
     #
-    # == Examples
+    # @example
     # 
     def respond_to(*names)
       Matchers::RespondTo.new(*names)

data/lib/rspec/matchers/satisfy.rb

@@ -1,6 +1,5 @@
 module RSpec
   module Matchers
-    
     class Satisfy
       def initialize(&block)
         @block = block
@@ -25,10 +24,6 @@ module RSpec
       end
     end
     
-    # :call-seq:
-    #   should satisfy {}
-    #   should_not satisfy {}
-    #
     # Passes if the submitted block returns true. Yields target to the
     # block.
     #
@@ -39,7 +34,7 @@ module RSpec
     # If you do find yourself in such a situation, you could always write
     # a custom matcher, which would likely make your specs more expressive.
     #
-    # == Examples
+    # @example
     #
     #   5.should satisfy { |n|
     #     n > 3

data/lib/rspec/matchers/throw_symbol.rb

@@ -1,6 +1,5 @@
 module RSpec
   module Matchers
-    
     class ThrowSymbol
       def initialize(expected_symbol = nil, expected_arg=nil)
         @expected_symbol = expected_symbol
@@ -90,14 +89,6 @@ module RSpec
 
     end
  
-    # :call-seq:
-    #   should throw_symbol()
-    #   should throw_symbol(:sym)
-    #   should throw_symbol(:sym, arg)
-    #   should_not throw_symbol()
-    #   should_not throw_symbol(:sym)
-    #   should_not throw_symbol(:sym, arg)
-    #
     # Given no argument, matches if a proc throws any Symbol.
     #
     # Given a Symbol, matches if the given proc throws the specified Symbol.
@@ -105,7 +96,7 @@ module RSpec
     # Given a Symbol and an arg, matches if the given proc throws the
     # specified Symbol with the specified arg.
     #
-    # == Examples
+    # @example
     #
     #   lambda { do_something_risky }.should throw_symbol
     #   lambda { do_something_risky }.should throw_symbol(:that_was_risky)
@@ -114,7 +105,7 @@ module RSpec
     #   lambda { do_something_risky }.should_not throw_symbol
     #   lambda { do_something_risky }.should_not throw_symbol(:that_was_risky)
     #   lambda { do_something_risky }.should_not throw_symbol(:that_was_risky, culprit)
-    def throw_symbol(expected_symbol = nil, expected_arg=nil)
+    def throw_symbol(expected_symbol=nil, expected_arg=nil)
       Matchers::ThrowSymbol.new(expected_symbol, expected_arg)
     end
   end

data/spec/rspec/expectations/handler_spec.rb

@@ -76,7 +76,7 @@ module RSpec
             :diffable? => true,
             :failure_message_for_should => "message",
             :matches? => false,
-            :expected => [1],
+            :expected => 1,
             :actual   => 2
           )
           actual = Object.new

data/spec/rspec/matchers/change_spec.rb

@@ -113,7 +113,7 @@ describe "should change(actual, message)" do
         end
 
         def dup
-          self.class.new *elements
+          self.class.new(*elements)
         end
 
         def ==(other)

data/spec/rspec/matchers/description_generation_spec.rb

@@ -7,12 +7,12 @@ describe "Matchers should be able to generate their own descriptions" do
 
   it "should eq expected" do
     "this".should eq "this"
-    RSpec::Matchers.generated_description.should eq "should eq this"
+    RSpec::Matchers.generated_description.should eq "should eq \"this\""
   end
 
   it "should not eq expected" do
     "this".should_not eq "that"
-    RSpec::Matchers.generated_description.should eq "should not eq that"
+    RSpec::Matchers.generated_description.should eq "should not eq \"that\""
   end
 
   it "should be empty (arbitrary predicate)" do

data/spec/rspec/matchers/eq_spec.rb

@@ -30,7 +30,7 @@ module RSpec
       it "provides message, expected and actual on #negative_failure_message" do
         matcher = eq(1)
         matcher.matches?(1)
-        matcher.failure_message_for_should_not.should == "\nexpected 1 not to equal 1\n\n(compared using ==)\n"
+        matcher.failure_message_for_should_not.should == "\nexpected: value != 1\n     got: 1\n\n(compared using ==)\n"
       end
     end
   end

data/spec/rspec/matchers/eql_spec.rb

@@ -24,13 +24,13 @@ module RSpec
       it "provides message, expected and actual on #failure_message" do
         matcher = eql("1")
         matcher.matches?(1)
-        matcher.failure_message_for_should.should == "\nexpected \"1\"\n     got 1\n\n(compared using eql?)\n"
+        matcher.failure_message_for_should.should == "\nexpected: \"1\"\n     got: 1\n\n(compared using eql?)\n"
       end
       
       it "provides message, expected and actual on #negative_failure_message" do
         matcher = eql(1)
         matcher.matches?(1)
-        matcher.failure_message_for_should_not.should == "\nexpected 1 not to equal 1\n\n(compared using eql?)\n"
+        matcher.failure_message_for_should_not.should == "\nexpected: value != 1\n     got: 1\n\n(compared using eql?)\n"
       end
     end
   end

data/spec/rspec/matchers/equal_spec.rb

@@ -12,7 +12,7 @@ module RSpec
       end
 
       it "does not match when !actual.equal?(expected)" do
-        1.should_not equal("1")
+        "1".should_not equal("1")
       end
       
       it "describes itself" do

data/spec/rspec/matchers/include_spec.rb

@@ -39,6 +39,10 @@ describe "should include(expected)" do
 end
 
 describe "should include(with, multiple, args)" do
+  it "has a description" do
+    matcher = include("a")
+    matcher.description.should eq("include \"a\"")
+  end
   context "for a string target" do
     it "passes if target includes all items" do
       "a string".should include("str", "a")

data/spec/rspec/matchers/raise_error_spec.rb

@@ -181,8 +181,8 @@ describe "should raise_error(NamedError, error_message) { |err| ... }" do
       }
     }.should fail_with(/expected: 4/m)
 
-    ran.should be(true)
-    passed.should be(false)
+    ran.should    be_true
+    passed.should be_false
   end
 
   it "does NOT yield exception if no error was thrown" do

data/spec/spec_helper.rb

@@ -23,4 +23,5 @@ RSpec::configure do |config|
   config.color_enabled = true
   config.filter_run :focused => true
   config.run_all_when_everything_filtered = true
+  config.order = :random
 end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-expectations
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: 
+  hash: 15424215
+  prerelease: 6
   segments: 
   - 2
-  - 7
+  - 8
   - 0
-  version: 2.7.0
+  - rc
+  - 1
+  version: 2.8.0.rc1
 platform: ruby
 authors: 
 - David Chelimsky
@@ -16,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-16 00:00:00 Z
+date: 2011-11-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -56,6 +58,7 @@ files:
 - lib/rspec/expectations/handler.rb
 - lib/rspec/expectations/version.rb
 - lib/rspec/matchers.rb
+- lib/rspec/matchers/base_matcher.rb
 - lib/rspec/matchers/be.rb
 - lib/rspec/matchers/be_close.rb
 - lib/rspec/matchers/be_instance_of.rb
@@ -172,19 +175,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.8.11
 signing_key: 
 specification_version: 3
-summary: rspec-expectations-2.7.0
+summary: rspec-expectations-2.8.0.rc1
 test_files: 
 - features/README.markdown
 - features/Upgrade.md