rspec 1.1.3 → 1.1.4

data/spec/spec/example/example_group_methods_spec.rb

@@ -24,26 +24,53 @@ module Spec
         ExampleGroup.reset
       end
 
-      describe "#describe" do
-        attr_reader :child_example_group
-        before do
-          @child_example_group = @example_group.describe("Another ExampleGroup") do
-            it "should pass" do
-              true.should be_true
+      ["describe","context"].each do |method|
+        describe "#{method}" do
+          describe "when creating an ExampleGroup" do
+            attr_reader :child_example_group
+            before do
+              @child_example_group = @example_group.send method, "Another ExampleGroup" do
+                it "should pass" do
+                  true.should be_true
+                end
+              end
+            end
+
+            it "should create a subclass of the ExampleGroup when passed a block" do
+              child_example_group.superclass.should == @example_group
+              @options.example_groups.should include(child_example_group)
+            end
+
+            it "should not inherit examples" do
+              child_example_group.examples.length.should == 1
             end
           end
-        end
 
-        it "should create a subclass of the ExampleGroup when passed a block" do
-          child_example_group.superclass.should == @example_group
-          @options.example_groups.should include(child_example_group)
-        end
+          describe "when creating a SharedExampleGroup" do
+            attr_reader :name, :shared_example_group
+            before do
+              @name = "A Shared ExampleGroup"
+              @shared_example_group = @example_group.send method, name, :shared => true do
+                it "should pass" do
+                  true.should be_true
+                end
+              end
+            end
+
+            after do
+              SharedExampleGroup.shared_example_groups.delete_if do |registered_shared_example_group|
+                registered_shared_example_group == shared_example_group
+              end
+            end
+
+            it "should create a SharedExampleGroup" do
+              SharedExampleGroup.find_shared_example_group(name).should == shared_example_group
+            end
+          end
 
-        it "should not inherit examples" do
-          child_example_group.examples.length.should == 1
         end
       end
-
+    
       describe "#it" do
         it "should should create an example instance" do
           lambda {
@@ -52,20 +79,25 @@ module Spec
         end
       end
 
-      describe "#xit" do
+      describe "#xit and #xspecify" do
         before(:each) do
           Kernel.stub!(:warn)
         end
 
-        it "should NOT  should create an example instance" do
+        it "should NOT create an example instance" do
           lambda {
             @example_group.xit("")
           }.should_not change(@example_group.examples, :length)
+
+          lambda {
+            @example_group.xspecify("")
+          }.should_not change(@example_group.examples, :length)
         end
 
         it "should warn that it is disabled" do
-          Kernel.should_receive(:warn).with("Example disabled: foo")
+          Kernel.should_receive(:warn).with("Example disabled: foo").twice
           @example_group.xit("foo")
+          @example_group.xspecify("foo")
         end
       end
 
@@ -395,6 +427,7 @@ module Spec
         it "should have accessible class methods from included module" do
           mod1_method_called = false
           mod1 = Module.new do
+            extend Spec::MetaClass
             class_methods = Module.new do
               define_method :mod1_method do
                 mod1_method_called = true
@@ -410,6 +443,7 @@ module Spec
 
           mod2_method_called = false
           mod2 = Module.new do
+            extend Spec::MetaClass
             class_methods = Module.new do
               define_method :mod2_method do
                 mod2_method_called = true

data/spec/spec/example/example_group_spec.rb

@@ -673,6 +673,10 @@ module Spec
     end
 
     describe Enumerable do
+      before(:each) do
+        Kernel.stub!(:warn)
+      end
+      
       def each(&block)
         ["4", "2", "1"].each(&block)
       end
@@ -683,6 +687,10 @@ module Spec
     end
 
     describe "An", Enumerable, "as a second argument" do
+      before(:each) do
+        Kernel.stub!(:warn)
+      end
+      
       def each(&block)
         ["4", "2", "1"].each(&block)
       end
@@ -694,6 +702,10 @@ module Spec
 
     describe Enumerable do
       describe "as the parent of nested example groups" do
+        before(:each) do
+          Kernel.stub!(:warn)
+        end
+        
         it "should be included in examples because it is a module" do
           pending("need to make sure nested groups know the described type") do
             map{|e| e.to_i}.should == [4,2,1]
@@ -703,7 +715,7 @@ module Spec
     end
 
     describe String do
-      it"should not be included in examples because it is not a module" do
+      it "should not be included in examples because it is not a module" do
         lambda{self.map}.should raise_error(NoMethodError, /undefined method `map' for/)
       end
     end

data/spec/spec/example/example_methods_spec.rb

@@ -23,7 +23,9 @@ module Spec
 
       describe "lifecycle" do
         before do
+          @original_rspec_options = $rspec_options
           @options = ::Spec::Runner::Options.new(StringIO.new, StringIO.new)
+          $rspec_options = @options
           @options.formatters << mock("formatter", :null_object => true)
           @options.backtrace_tweaker = mock("backtrace_tweaker", :null_object => true)
           @reporter = FakeReporter.new(@options)
@@ -41,6 +43,7 @@ module Spec
         end
 
         after do
+          $rspec_options = @original_rspec_options
           ExampleMethods.instance_variable_set("@before_all_parts", [])
           ExampleMethods.instance_variable_set("@before_each_parts", [])
           ExampleMethods.instance_variable_set("@after_each_parts", [])
@@ -48,28 +51,36 @@ module Spec
         end
 
         it "should pass before and after callbacks to all ExampleGroup subclasses" do
-          ExampleMethods.before(:all) do
+          ExampleMethods.before(:suite) do
             ExampleMethods.count.should == 1
           end
 
-          ExampleMethods.before(:each) do
+          ExampleMethods.before(:all) do
             ExampleMethods.count.should == 2
           end
 
-          ExampleMethods.after(:each) do
+          ExampleMethods.before(:each) do
             ExampleMethods.count.should == 3
           end
 
-          ExampleMethods.after(:all) do
+          ExampleMethods.after(:each) do
             ExampleMethods.count.should == 4
           end
 
+          ExampleMethods.after(:all) do
+            ExampleMethods.count.should == 5
+          end
+
+          ExampleMethods.after(:suite) do
+            ExampleMethods.count.should == 6
+          end
+
           @example_group = Class.new(ExampleGroup) do
             it "should use ExampleMethods callbacks" do
             end
           end
-          @example_group.run
-          ExampleMethods.count.should == 5
+          @options.run_examples
+          ExampleMethods.count.should == 7
         end
 
         describe "run_with_description_capturing" do
@@ -99,6 +110,17 @@ module Spec
           example.implementation_backtrace.join("\n").should include("#{__FILE__}:#{__LINE__-4}")
         end
       end
+
+      describe "#__full_description" do
+        it "should return the full description of the ExampleGroup and Example" do
+          example_group = Class.new(ExampleGroup).describe("An ExampleGroup") do
+            it "should do something" do
+            end
+          end
+          example = example_group.examples.first
+          example.__full_description.should == "An ExampleGroup should do something"
+        end
+      end
     end
   end
 end

data/spec/spec/example/nested_example_group_spec.rb

@@ -55,5 +55,17 @@ module Spec
         end
       end
     end
+
+    describe "Nested Example Groups" do
+      describe "description options", :other_options => "other options" do
+        it "should have a spec_path" do
+          self.class.description_options[:spec_path].should match(/#{__FILE__}/)
+        end
+
+        it "should pass other options" do
+          self.class.description_options[:other_options].should == "other options"
+        end
+      end
+    end
   end
 end

data/spec/spec/expectations/differs/default_spec.rb

@@ -28,7 +28,25 @@ describe "Diff" do
   it "should output unified diff of two strings" do
     expected="foo\nbar\nzap\nthis\nis\nsoo\nvery\nvery\nequal\ninsert\na\nline\n"
     actual="foo\nzap\nbar\nthis\nis\nsoo\nvery\nvery\nequal\ninsert\na\nanother\nline\n"
-    expected_diff="\n\n@@ -1,6 +1,6 @@\n foo\n-bar\n zap\n+bar\n this\n is\n soo\n@@ -9,5 +9,6 @@\n equal\n insert\n a\n+another\n line\n"
+    expected_diff= <<'EOD'
+
+
+@@ -1,6 +1,6 @@
+ foo
+-zap
+ bar
++zap
+ this
+ is
+ soo
+@@ -9,6 +9,5 @@
+ equal
+ insert
+ a
+-another
+ line
+EOD
+
     diff = @differ.diff_as_string(expected, actual)
     diff.should eql(expected_diff)
   end
@@ -44,11 +62,11 @@ describe "Diff" do
   :metasyntactic,
   "variable",
   :delta,
-- "charlie",
-+ "tango",
+- "tango",
++ "charlie",
   :width,
-- "quite wide"]
-+ "very wide"]
+- "very wide"]
++ "quite wide"]
 EOD
 
 
@@ -65,8 +83,8 @@ EOD
 @@ -1,5 +1,5 @@
  <Animal
    name=bob,
--  species=giraffe
-+  species=tortoise
+-  species=tortoise
++  species=giraffe
  >
 EOD
 
@@ -94,12 +112,12 @@ describe "Diff in context format" do
 *** 1,5 ****
   <Animal
     name=bob,
-!   species=giraffe
+!   species=tortoise
   >
 --- 1,5 ----
   <Animal
     name=bob,
-!   species=tortoise
+!   species=giraffe
   >
 EOD
 

data/spec/spec/matchers/be_spec.rb

@@ -222,3 +222,27 @@ describe "should be(value)" do
     lambda { 5.should be(6) }.should fail_with("expected 6, got 5")
   end
 end
+
+
+describe "arbitrary predicate with DelegateClass" do
+  it "should access methods defined in the delegating class (LH[#48])" do
+    pending(%{
+      Looks like DelegateClass is delegating #should to the
+      delegate. Not sure how to fix this one. Or if we even should."
+    })
+    require 'delegate'
+    class ArrayDelegate < DelegateClass(Array)
+      def initialize(array)
+        @internal_array = array
+        super(@internal_array)
+      end
+
+      def large?
+        @internal_array.size >= 5
+      end
+    end
+
+    delegate = ArrayDelegate.new([1,2,3,4,5,6])
+    delegate.should be_large
+  end
+end

data/spec/spec/matchers/has_spec.rb

@@ -16,6 +16,14 @@ describe "should have_sym(*args)" do
       Object.new.should have_key(:a)
     }.should raise_error(NoMethodError)
   end
+  
+  it "should reraise an exception thrown in #has_sym?(*args)" do
+    o = Object.new
+    def o.has_sym?(*args)
+      raise "Funky exception"
+    end
+    lambda { o.should have_sym(:foo) }.should raise_error("Funky exception")
+  end
 end
 
 describe "should_not have_sym(*args)" do
@@ -34,4 +42,12 @@ describe "should_not have_sym(*args)" do
       Object.new.should have_key(:a)
     }.should raise_error(NoMethodError)
   end
+  
+  it "should reraise an exception thrown in #has_sym?(*args)" do
+    o = Object.new
+    def o.has_sym?(*args)
+      raise "Funky exception"
+    end
+    lambda { o.should_not have_sym(:foo) }.should raise_error("Funky exception")
+  end
 end

data/spec/spec/matchers/raise_error_spec.rb

@@ -28,6 +28,9 @@ describe "should raise_error(message)" do
   it "should pass if RuntimeError is raised with the right message" do
     lambda {raise 'blah'}.should raise_error('blah')
   end
+  it "should pass if RuntimeError is raised with a matching message" do
+    lambda {raise 'blah'}.should raise_error(/blah/)
+  end
   it "should pass if any other error is raised with the right message" do
     lambda {raise NameError.new('blah')}.should raise_error('blah')
   end
@@ -126,6 +129,127 @@ describe "should raise_error(NamedError, error_message) with String" do
   end
 end
 
+describe "should raise_error(NamedError, error_message) { |err| ... }" do
+  it "should yield exception if named error is raised with same message" do
+    ran = false
+
+    lambda {
+      raise "example message"
+    }.should raise_error(RuntimeError, "example message") { |err|
+      ran = true
+      err.class.should == RuntimeError
+      err.message.should == "example message"
+    }
+
+    ran.should == true
+  end
+
+  it "yielded block should be able to fail on it's own right" do
+    ran, passed = false, false
+
+    lambda {
+      lambda {
+        raise "example message"
+      }.should raise_error(RuntimeError, "example message") { |err|
+        ran = true
+        5.should == 4
+        passed = true
+      }
+    }.should fail_with(/expected: 4/m)
+
+    ran.should == true
+    passed.should == false
+  end
+
+  it "should NOT yield exception if no error was thrown" do
+    ran = false
+
+    lambda {
+      lambda {}.should raise_error(RuntimeError, "example message") { |err|
+        ran = true
+      }
+    }.should fail_with("expected RuntimeError with \"example message\" but nothing was raised")
+
+    ran.should == false
+  end
+
+  it "should not yield exception if error class is not matched" do
+    ran = false
+
+    lambda {
+      lambda {
+        raise "example message"
+      }.should raise_error(SyntaxError, "example message") { |err|
+        ran = true
+      }
+    }.should fail_with("expected SyntaxError with \"example message\", got #<RuntimeError: example message>")
+
+    ran.should == false
+  end
+
+  it "should NOT yield exception if error message is not matched" do
+    ran = false
+
+    lambda {
+      lambda {
+        raise "example message"
+      }.should raise_error(RuntimeError, "different message") { |err|
+        ran = true
+      }
+    }.should fail_with("expected RuntimeError with \"different message\", got #<RuntimeError: example message>")
+
+    ran.should == false
+  end
+end
+
+describe "should_not raise_error(NamedError, error_message) { |err| ... }" do
+  it "should pass if nothing is raised" do
+    ran = false
+
+    lambda {}.should_not raise_error(RuntimeError, "example message") { |err|
+      ran = true
+    }
+
+    ran.should == false
+  end
+
+  it "should pass if a different error is raised" do
+    ran = false
+
+    lambda { raise }.should_not raise_error(NameError, "example message") { |err|
+      ran = true
+    }
+
+    ran.should == false
+  end
+
+  it "should pass if same error is raised with different message" do
+    ran = false
+
+    lambda {
+      raise RuntimeError.new("not the example message")
+    }.should_not raise_error(RuntimeError, "example message") { |err|
+      ran = true
+    }
+
+    ran.should == false
+  end
+
+  it "should fail if named error is raised with same message" do
+    ran = false
+
+    lambda {
+      lambda {
+        raise "example message"
+      }.should_not raise_error(RuntimeError, "example message") { |err|
+        ran = true
+      }
+    }.should fail_with("expected no RuntimeError with \"example message\", got #<RuntimeError: example message>")
+
+    ran.should == false
+  end
+end
+
 describe "should_not raise_error(NamedError, error_message) with String" do
   it "should pass if nothing is raised" do
     lambda {}.should_not raise_error(RuntimeError, "example message")