rspec 1.1.11 → 1.1.12

data/spec/spec/example/helper_method_spec.rb

@@ -0,0 +1,24 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+# This was added to prove that http://rspec.lighthouseapp.com/projects/5645/tickets/211
+# was fixed in ruby 1.9.1
+
+module HelperMethodExample
+  describe "a helper method" do
+    def helper_method
+      "received call"
+    end
+  
+    it "is available to examples in the same group" do
+      helper_method.should == "received call"
+    end
+    
+    describe "from a nested group" do
+      it "is available to examples in a nested group" do
+        helper_method.should == "received call"
+      end
+    end
+    
+  end
+end
+

data/spec/spec/example/pending_module_spec.rb

@@ -4,14 +4,12 @@ module Spec
       
       it 'should raise an ExamplePendingError if no block is supplied' do
         lambda {
-          include Pending
           pending "TODO"
         }.should raise_error(ExamplePendingError, /TODO/)
       end
       
       it 'should raise an ExamplePendingError if a supplied block fails as expected' do
         lambda {
-          include Pending
           pending "TODO" do
             raise "oops"
           end
@@ -20,7 +18,6 @@ module Spec
       
       it 'should raise an ExamplePendingError if a supplied block fails as expected with a mock' do
         lambda {
-          include Pending
           pending "TODO" do
             m = mock('thing')
             m.should_receive(:foo)
@@ -31,7 +28,6 @@ module Spec
       
       it 'should raise a PendingExampleFixedError if a supplied block starts working' do
         lambda {
-          include Pending
           pending "TODO" do
             # success!
           end
@@ -40,9 +36,8 @@ module Spec
       
       it "should have the correct file and line number for pending given with a block which fails" do
         file = __FILE__
-        line_number = __LINE__ + 3
+        line_number = __LINE__ + 2
         begin
-          include Pending
           pending do
             raise
           end
@@ -53,9 +48,8 @@ module Spec
       
       it "should have the correct file and line number for pending given with no block" do
         file = __FILE__
-        line_number = __LINE__ + 3
+        line_number = __LINE__ + 2
         begin
-          include Pending
           pending("TODO")
         rescue => error
           error.pending_caller.should == "#{file}:#{line_number}"

data/spec/spec/example/shared_example_group_spec.rb

@@ -17,46 +17,25 @@ module Spec
         after(:each) do
           @formatter.rspec_verify
           @example_group = nil
-          Spec::Example::SharedExampleGroup.shared_example_groups.clear
-        end
-
-        def make_shared_example_group(name, opts=nil, &block)
-          example_group = SharedExampleGroup.new(name, :shared => true, &block)
-          SharedExampleGroup.add_shared_example_group(example_group)
-          example_group
-        end
-
-        def non_shared_example_group()
-          @non_shared_example_group ||= Class.new(ExampleGroup).describe("example_group")
-        end
-
-        it "should accept an optional options hash" do
-          lambda { Class.new(ExampleGroup).describe("context") }.should_not raise_error(Exception)
-          lambda { Class.new(ExampleGroup).describe("context", :shared => true) }.should_not raise_error(Exception)
-        end
-
-        it "should return all shared example_groups" do
-          b1 = make_shared_example_group("b1", :shared => true) {}
-          b2 = make_shared_example_group("b2", :shared => true) {}
-
-          b1.should_not be(nil)
-          b2.should_not be(nil)
-
-          SharedExampleGroup.find_shared_example_group("b1").should equal(b1)
-          SharedExampleGroup.find_shared_example_group("b2").should equal(b2)
-        end
-
-        it "should register as shared example_group" do
-          example_group = make_shared_example_group("example_group") {}
-          SharedExampleGroup.shared_example_groups.should include(example_group)
+          Spec::Example::SharedExampleGroup.clear
         end
+        
+        describe "#register" do
+          it "creates a new shared example group with the submitted args" do
+            block = lambda {}
+            group = SharedExampleGroup.new("shared group") do end
+            Spec::Example::SharedExampleGroup.should_receive(:new).with("share me", &block).and_return(group)
+            Spec::Example::SharedExampleGroup.register("share me", &block)
+          end
 
-        it "should not be shared when not configured as shared" do
-          example_group = non_shared_example_group
-          SharedExampleGroup.shared_example_groups.should_not include(example_group)
+          it "registers the shared example group" do
+            lambda do
+              Spec::Example::SharedExampleGroup.register "share me" do end
+            end.should change {Spec::Example::SharedExampleGroup.count}.by(1)
+          end
         end
 
-        it "should complain when adding a second shared example_group with the same description" do
+        it "complains when adding a second shared example_group with the same description" do
           describe "shared example_group", :shared => true do
           end
           lambda do
@@ -64,14 +43,17 @@ module Spec
             end
           end.should raise_error(ArgumentError)
         end
-
-        it "should NOT complain when adding the same shared example_group instance again" do
-          shared_example_group = Class.new(ExampleGroup).describe("shared example_group", :shared => true)
-          SharedExampleGroup.add_shared_example_group(shared_example_group)
-          SharedExampleGroup.add_shared_example_group(shared_example_group)
+        
+        it "does NOT add the same group twice" do
+          lambda do
+            2.times do
+              describe "shared example_group which gets loaded twice", :shared => true do
+              end
+            end
+          end.should change {Spec::Example::SharedExampleGroup.count}.by(1)
         end
 
-        it "should NOT complain when adding the same shared example_group again (i.e. file gets reloaded)" do
+        it "does NOT complain when adding the same shared example_group again (i.e. file gets reloaded)" do
           lambda do
             2.times do
               describe "shared example_group which gets loaded twice", :shared => true do
@@ -80,42 +62,36 @@ module Spec
           end.should_not raise_error(ArgumentError)
         end
 
-        it "should NOT complain when adding the same shared example_group in same file with different absolute path" do
-          shared_example_group_1 = Class.new(ExampleGroup).describe(
+        it "does NOT complain when adding the same shared example_group in same file with different absolute path" do
+          SharedExampleGroup.register(
             "shared example_group",
             :shared => true,
             :spec_path => "/my/spec/a/../shared.rb"
           )
-          shared_example_group_2 = Class.new(ExampleGroup).describe(
+          SharedExampleGroup.register(
             "shared example_group",
             :shared => true,
             :spec_path => "/my/spec/b/../shared.rb"
           )
-
-          SharedExampleGroup.add_shared_example_group(shared_example_group_1)
-          SharedExampleGroup.add_shared_example_group(shared_example_group_2)
         end
 
-        it "should complain when adding a different shared example_group with the same name in a different file with the same basename" do
-          shared_example_group_1 = Class.new(ExampleGroup).describe(
+        it "complains when adding a different shared example_group with the same name in a different file with the same basename" do
+          SharedExampleGroup.register(
             "shared example_group",
             :shared => true,
             :spec_path => "/my/spec/a/shared.rb"
           )
-          shared_example_group_2 = Class.new(ExampleGroup).describe(
-            "shared example_group",
-            :shared => true,
-            :spec_path => "/my/spec/b/shared.rb"
-          )
-
-          SharedExampleGroup.add_shared_example_group(shared_example_group_1)
           lambda do
-            SharedExampleGroup.add_shared_example_group(shared_example_group_2)
+            SharedExampleGroup.register(
+              "shared example_group",
+              :shared => true,
+              :spec_path => "/my/spec/b/shared.rb"
+            )
           end.should raise_error(ArgumentError, /already exists/)
         end
 
-        it "should add examples to current example_group using it_should_behave_like" do
-          shared_example_group = make_shared_example_group("shared example_group") do
+        it "adds examples to current example_group using it_should_behave_like" do
+          shared_example_group = SharedExampleGroup.register("shared example_group") do
             it("shared example") {}
             it("shared example 2") {}
           end
@@ -126,12 +102,12 @@ module Spec
           example_group.number_of_examples.should == 3
         end
 
-        it "should add examples to from two shared groups" do
-          shared_example_group_1 = make_shared_example_group("shared example_group 1") do
+        it "adds examples to from two shared groups" do
+          shared_example_group_1 = SharedExampleGroup.register("shared example_group 1") do
             it("shared example 1") {}
           end
 
-          shared_example_group_1 = make_shared_example_group("shared example_group 2") do
+          shared_example_group_1 = SharedExampleGroup.register("shared example_group 2") do
             it("shared example 2") {}
           end
 
@@ -141,7 +117,7 @@ module Spec
           example_group.number_of_examples.should == 3
         end
 
-        it "should add examples to current example_group using include" do
+        it "adds examples to current example_group using include" do
           shared_example_group = describe "all things", :shared => true do
             it "should do stuff" do end
           end
@@ -153,7 +129,7 @@ module Spec
           example_group.number_of_examples.should == 1
         end
 
-        it "should add examples to current example_group using it_should_behave_like with a module" do
+        it "adds examples to current example_group using it_should_behave_like with a module" do
           AllThings = describe "all things", :shared => true do
             it "should do stuff" do end
           end
@@ -165,9 +141,9 @@ module Spec
           example_group.number_of_examples.should == 1
         end
 
-        it "should run shared examples" do
+        it "runs shared examples" do
           shared_example_ran = false
-          shared_example_group = make_shared_example_group("shared example_group") do
+          shared_example_group = SharedExampleGroup.register("shared example_group") do
             it("shared example") { shared_example_ran = true }
           end
 
@@ -175,17 +151,17 @@ module Spec
 
           example_group.it_should_behave_like("shared example_group")
           example_group.it("example") {example_ran = true}
-          example_group.run
+          example_group.run(options)
           example_ran.should be_true
           shared_example_ran.should be_true
         end
 
-        it "should run setup and teardown from shared example_group" do
+        it "runs before(:each) and after(:each) from shared example_group" do
           shared_setup_ran = false
           shared_teardown_ran = false
-          shared_example_group = make_shared_example_group("shared example_group") do
-            before { shared_setup_ran = true }
-            after { shared_teardown_ran = true }
+          shared_example_group = SharedExampleGroup.register("shared example_group") do
+            before(:each) { shared_setup_ran = true }
+            after(:each)  { shared_teardown_ran = true }
             it("shared example") { shared_example_ran = true }
           end
 
@@ -193,7 +169,7 @@ module Spec
 
           example_group.it_should_behave_like("shared example_group")
           example_group.it("example") {example_ran = true}
-          example_group.run
+          example_group.run(options)
           example_ran.should be_true
           shared_setup_ran.should be_true
           shared_teardown_ran.should be_true
@@ -202,9 +178,9 @@ module Spec
         it "should run before(:all) and after(:all) only once from shared example_group" do
           shared_before_all_run_count = 0
           shared_after_all_run_count = 0
-          shared_example_group = make_shared_example_group("shared example_group") do
+          shared_example_group = SharedExampleGroup.register("shared example_group") do
             before(:all) { shared_before_all_run_count += 1}
-            after(:all) { shared_after_all_run_count += 1}
+            after(:all)  { shared_after_all_run_count += 1}
             it("shared example") { shared_example_ran = true }
           end
 
@@ -212,7 +188,7 @@ module Spec
 
           example_group.it_should_behave_like("shared example_group")
           example_group.it("example") {example_ran = true}
-          example_group.run
+          example_group.run(options)
           example_ran.should be_true
           shared_before_all_run_count.should == 1
           shared_after_all_run_count.should == 1
@@ -221,7 +197,7 @@ module Spec
         it "should include modules, included into shared example_group, into current example_group" do
           @formatter.should_receive(:add_example_group).with(any_args)
 
-          shared_example_group = make_shared_example_group("shared example_group") do
+          shared_example_group = SharedExampleGroup.register("shared example_group") do
             it("shared example") { shared_example_ran = true }
           end
 
@@ -248,13 +224,13 @@ module Spec
             mod1_method
             mod2_method
           end
-          example_group.run
+          example_group.run(options)
           mod1_method_called.should be_true
           mod2_method_called.should be_true
         end
 
         it "should make methods defined in the shared example_group available in consuming example_group" do
-          shared_example_group = make_shared_example_group("shared example_group xyz") do
+          shared_example_group = SharedExampleGroup.register("shared example_group xyz") do
             def a_shared_helper_method
               "this got defined in a shared example_group"
             end
@@ -265,7 +241,7 @@ module Spec
             a_shared_helper_method
             success = true
           end
-          example_group.run
+          example_group.run(options)
           success.should be_true
         end
 

data/spec/spec/expectations/extensions/object_spec.rb

@@ -20,31 +20,6 @@ describe Object, "#should" do
       @target.should @matcher
     }.should fail_with("the failure message")
   end
-  
-  it "should raise error if it receives false directly" do
-    lambda {
-      @target.should false
-    }.should raise_error(Spec::Expectations::InvalidMatcherError)
-  end
-  
-  it "should raise error if it receives false (evaluated)" do
-    lambda {
-      @target.should eql?("foo")
-    }.should raise_error(Spec::Expectations::InvalidMatcherError)
-  end
-  
-  it "should raise error if it receives true" do
-    lambda {
-      @target.should true
-    }.should raise_error(Spec::Expectations::InvalidMatcherError)
-  end
-  
-  it "should raise error if it receives no argument and it is not used as a left side of an operator" do
-    pending "Is it even possible to catch this?"
-    lambda {
-      @target.should
-    }.should raise_error(Spec::Expectations::InvalidMatcherError)
-  end
 end
 
 describe Object, "#should_not" do
@@ -67,29 +42,4 @@ describe Object, "#should_not" do
       @target.should_not @matcher
     }.should fail_with("the negative failure message")
   end
-
-  it "should raise error if it receives false directly" do
-    lambda {
-      @target.should_not false
-    }.should raise_error(Spec::Expectations::InvalidMatcherError)
-  end
-  
-  it "should raise error if it receives false (evaluated)" do
-    lambda {
-      @target.should_not eql?("foo")
-    }.should raise_error(Spec::Expectations::InvalidMatcherError)
-  end
-  
-  it "should raise error if it receives true" do
-    lambda {
-      @target.should_not true
-    }.should raise_error(Spec::Expectations::InvalidMatcherError)
-  end
-
-  it "should raise error if it receives no argument and it is not used as a left side of an operator" do
-    pending "Is it even possible to catch this?"
-    lambda {
-      @target.should_not
-    }.should raise_error(Spec::Expectations::InvalidMatcherError)
-  end
 end

data/spec/spec/expectations/wrap_expectation_spec.rb

@@ -0,0 +1,30 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Matchers
+    describe "wrap_expectation" do
+      
+      def stub_matcher
+        @_stub_matcher ||= simple_matcher do
+        end
+      end
+      
+      def failing_matcher
+        @_failing_matcher ||= simple_matcher do
+          1.should == 2
+        end
+      end
+      
+      it "should return true if there is no error" do
+        wrap_expectation stub_matcher do
+        end.should be_true
+      end
+      
+      it "should return false if there is an error" do
+        wrap_expectation failing_matcher do
+          raise "error"
+        end.should be_false
+      end
+    end
+  end
+end

data/spec/spec/interop/test/unit/spec_spec.rb

@@ -2,11 +2,7 @@ require File.dirname(__FILE__) + '/test_unit_spec_helper'
 
 describe "ExampleGroup with test/unit/interop" do
   include TestUnitSpecHelper
-  
-  def resources
-    File.dirname(__FILE__) + "/resources"
-  end
-  
+    
   describe "with passing examples" do
     it "should output 0 failures" do
       output = ruby("#{resources}/spec_that_passes.rb")