rspec 1.1.11 → 1.1.12

data/spec/spec/example/example_group_spec.rb

@@ -60,7 +60,7 @@ module Spec
 
     describe ExampleGroup, "#run with failure in example", :shared => true do
       it "should add an example failure to the TestResult" do
-        example_group.run.should be_false
+        example_group.run(options).should be_false
       end
     end
 
@@ -96,7 +96,7 @@ module Spec
 
           reporter = mock("Reporter")
           reporter.should_not_receive(:add_example_group)
-          example_group.run
+          example_group.run(options)
         end
       
         describe "when before_each fails" do
@@ -114,12 +114,12 @@ module Spec
           end
 
           it "should not run example block" do
-            example_group.run
+            example_group.run(options)
             $example_ran.should be_false
           end
         
           it "should run after_each" do
-            example_group.run
+            example_group.run(options)
             $after_each_ran.should be_true
           end
 
@@ -127,7 +127,7 @@ module Spec
             reporter.should_receive(:example_finished) do |example_group, error|
               error.message.should eql("in before_each")
             end
-            example_group.run
+            example_group.run(options)
           end
         end
 
@@ -142,7 +142,7 @@ module Spec
             ExampleGroup.before(:all) { before_all_ran = true }
             ExampleGroup.after(:all) { after_all_ran = true }
             example_group.it("should") {}
-            example_group.run
+            example_group.run(options)
             before_all_ran.should be_false
             after_all_ran.should be_false
           end
@@ -150,7 +150,7 @@ module Spec
           it "should not run example" do
             example_ran = false
             example_group.it("should") {example_ran = true}
-            example_group.run
+            example_group.run(options)
             example_ran.should be_false
           end
         end
@@ -174,11 +174,11 @@ module Spec
                   examples_that_were_run << 'should also be run'
                 end
               end
-              options.examples = ["the ExampleGroup"]
+              options.parse_example "the ExampleGroup"
             end
 
             it "should not run the Examples in the ExampleGroup" do
-              example_group.run
+              example_group.run(options)
               examples_that_were_run.should == ['should be run', 'should also be run']
             end
           end
@@ -192,11 +192,11 @@ module Spec
                   examples_that_were_run << 'should be run'
                 end
               end
-              options.examples = ["should be run"]
+              options.parse_example "should be run"
             end
 
             it "should not run the example" do
-              example_group.run
+              example_group.run(options)
               examples_that_were_run.should == ['should be run']
             end
           end
@@ -210,11 +210,11 @@ module Spec
                   examples_that_were_run << 'should be something else'
                 end
               end
-              options.examples = ["does not match anything"]
+              options.parse_example "does not match anything"
             end
 
             it "should not run the example" do
-              example_group.run
+              example_group.run(options)
               examples_that_were_run.should == []
             end
           end
@@ -231,16 +231,16 @@ module Spec
                   examples_that_were_run << 'should not be run'
                 end
               end
-              options.examples = ["should be run"]
+              options.parse_example "should be run"
             end
 
             it "should run only the example, when there is only one" do
-              example_group.run
+              example_group.run(options)
               examples_that_were_run.should == ["should be run"]
             end
 
             it "should run only the one example" do
-              example_group.run
+              example_group.run(options)
               examples_that_were_run.should == ["should be run"]          end
           end
         end
@@ -258,14 +258,14 @@ module Spec
           end
 
           it "should send reporter add_example_group" do
-            example_group.run
+            example_group.run(options)
             reporter.example_groups.should == [example_group]
           end
 
           it "should run example on run" do
             example_ran = false
             example_group.it("should") {example_ran = true}
-            example_group.run
+            example_group.run(options)
             example_ran.should be_true
           end
 
@@ -274,7 +274,7 @@ module Spec
             example_group.before(:all) {before_all_run_count_run_count += 1}
             example_group.it("test") {true}
             example_group.it("test2") {true}
-            example_group.run
+            example_group.run(options)
             before_all_run_count_run_count.should == 1
           end
 
@@ -283,7 +283,7 @@ module Spec
             example_group.after(:all) {after_all_run_count += 1}
             example_group.it("test") {true}
             example_group.it("test2") {true}
-            example_group.run
+            example_group.run(options)
             after_all_run_count.should == 1
             @reporter.rspec_verify
           end
@@ -294,7 +294,7 @@ module Spec
             example_group.before(:all) { @instance_var = context_instance_value_in }
             example_group.after(:all) { context_instance_value_out = @instance_var }
             example_group.it("test") {true}
-            example_group.run
+            example_group.run(options)
             context_instance_value_in.should == context_instance_value_out
           end
 
@@ -303,7 +303,7 @@ module Spec
             context_instance_value_out = ""
             example_group.before(:all) { @instance_var = context_instance_value_in }
             example_group.it("test") {context_instance_value_out = @instance_var}
-            example_group.run
+            example_group.run(options)
             context_instance_value_in.should == context_instance_value_out
           end
 
@@ -321,7 +321,7 @@ module Spec
               describe("I'm not special", :type => :not_special)
               it "does nothing"
             end
-            example_group.run
+            example_group.run(options)
             fiddle.should == [
               'Example.prepend_before(:all)',
               'Example.before(:all)',
@@ -341,7 +341,7 @@ module Spec
 
             example_group = Class.new(@special_example_group).describe("I'm a special example_group") {}
             example_group.it("test") {true}
-            example_group.run
+            example_group.run(options)
             fiddle.should == [
               'Example.prepend_before(:all)',
               'Example.before(:all)',
@@ -361,7 +361,7 @@ module Spec
             example_group.before(:all) { fiddle << "before(:all)" }
             example_group.prepend_before(:each) { fiddle << "prepend_before(:each)" }
             example_group.before(:each) { fiddle << "before(:each)" }
-            example_group.run
+            example_group.run(options)
             fiddle.should == [
               'Example.prepend_before(:all)',
               'Example.before(:all)',
@@ -380,7 +380,7 @@ module Spec
             example_group.append_after(:all) { fiddle << "append_after(:all)" }
             ExampleGroup.after(:all) { fiddle << "Example.after(:all)" }
             ExampleGroup.append_after(:all) { fiddle << "Example.append_after(:all)" }
-            example_group.run
+            example_group.run(options)
             fiddle.should == [
               'after(:each)',
               'append_after(:each)',
@@ -412,7 +412,7 @@ 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
@@ -427,7 +427,7 @@ module Spec
             example_group = Class.new(@special_example_group).describe("I'm special", :type => :special) do
               it "does nothing"
             end
-            example_group.run
+            example_group.run(options)
 
             example_group.included_modules.should include(mod1)
             example_group.included_modules.should include(mod2)
@@ -443,16 +443,14 @@ module Spec
                 $included_predicate_matcher_found = respond_to?(:do_something)
               end
             end
-            example_group.run
+            example_group.run(options)
             $included_predicate_matcher_found.should be(true)
           end
 
           it "should use a mock framework set up in config" do
             mod = Module.new do
-              class << self
-                def included(mod)
-                  $included_module = mod
-                end
+              def self.included(mod)
+                $included_module = mod
               end
 
               def teardown_mocks_for_rspec
@@ -469,7 +467,7 @@ module Spec
                 describe('example')
                 it "does nothing"
               end
-              example_group.run
+              example_group.run(options)
 
               $included_module.should_not be_nil
               $torn_down.should == true
@@ -488,7 +486,7 @@ module Spec
 
           it "should send example_pending to formatter" do
             @formatter.should_receive(:example_pending).with("example", "should be pending", "Example fails")
-            example_group.run
+            example_group.run(options)
           end
         end
 
@@ -503,7 +501,7 @@ module Spec
 
           it "should send example_pending to formatter" do
             @formatter.should_receive(:example_pending).with("example", "should be pending", "Example passes")
-            example_group.run
+            example_group.run(options)
           end
         end
 
@@ -517,21 +515,21 @@ module Spec
           it "should not run any example" do
             spec_ran = false
             example_group.it("test") {spec_ran = true}
-            example_group.run
+            example_group.run(options)
             spec_ran.should be_false
           end
 
           it "should run ExampleGroup after(:all)" do
             after_all_ran = false
             ExampleGroup.after(:all) { after_all_ran = true }
-            example_group.run
+            example_group.run(options)
             after_all_ran.should be_true
           end
 
           it "should run example_group after(:all)" do
             after_all_ran = false
             example_group.after(:all) { after_all_ran = true }
-            example_group.run
+            example_group.run(options)
             after_all_ran.should be_true
           end
 
@@ -542,7 +540,7 @@ module Spec
             end
 
             example_group.it("test") {true}
-            example_group.run
+            example_group.run(options)
           end
         end
 
@@ -556,7 +554,7 @@ module Spec
           it "should run after(:all)" do
             after_all_ran = false
             ExampleGroup.after(:all) { after_all_ran = true }
-            example_group.run
+            example_group.run(options)
             after_all_ran.should be_true
           end
         end
@@ -571,7 +569,7 @@ module Spec
           it "should run after(:all)" do
             after_all_ran = false
             ExampleGroup.after(:all) { after_all_ran = true }
-            example_group.run
+            example_group.run(options)
             after_all_ran.should be_true
           end
         end
@@ -600,7 +598,7 @@ module Spec
               example.should equal(example)
               error.message.should eql("first")
             end
-            example_group.run
+            example_group.run(options)
             example_group.first_after_ran.should be_true
             example_group.second_after_ran.should be_true
           end
@@ -629,7 +627,7 @@ module Spec
             reporter.should_receive(:example_finished) do |name, error|
               error.message.should eql("first")
             end
-            example_group.run
+            example_group.run(options)
             example_group.first_before_ran.should be_true
             example_group.second_before_ran.should be_false
           end
@@ -643,7 +641,7 @@ module Spec
           end
 
           it "should return false" do
-            example_group.run.should be_false
+            example_group.run(options).should be_false
           end
         end
       end
@@ -661,7 +659,7 @@ module Spec
         example_group = Class.new(ExampleSubclass) do
           describe(Array)
         end
-        example_group.send(:described_type).should == Array
+        example_group.__send__(:described_type).should == Array
       end
 
       it "should concat descriptions when nested" do
@@ -673,11 +671,5 @@ module Spec
         $nested_group.description.to_s.should == "Array when empty"
       end
     end
-
-    describe String 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
   end
 end

data/spec/spec/example/example_matcher_spec.rb

@@ -2,31 +2,14 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
 module Spec
   module Example
-    module ExampleMatcherSpecHelper
-      class MatchDescription
-        def initialize(description)
-          @description = description
-        end
-        
-        def matches?(matcher)
-          matcher.matches?(@description)
-        end
-        
-        def failure_message
-          "expected matcher.matches?(#{@description.inspect}) to return true, got false"
-        end
-        
-        def negative_failure_message
-          "expected matcher.matches?(#{@description.inspect}) to return false, got true"
-        end
-      end
+    describe ExampleMatcher, "#matches?" do
       def match_description(description)
-        MatchDescription.new(description)
+        simple_matcher do |actual, matcher|
+          matcher.failure_message = "expected matcher.matches?(#{description.inspect}) to return true, got false"
+          matcher.negative_failure_message = "expected matcher.matches?(#{description.inspect}) to return false, got true"
+          actual.matches?(description)
+        end
       end
-    end
-
-    describe ExampleMatcher, "#matches?" do
-      include ExampleMatcherSpecHelper
       
       it "should match correct example_group and example" do
         matcher = ExampleMatcher.new("example_group", "example")

data/spec/spec/example/example_methods_spec.rb

@@ -23,20 +23,22 @@ module Spec
 
       describe "lifecycle" do
         with_sandboxed_options do
-          before do
-            @options.formatters << mock("formatter", :null_object => true)
-            @options.backtrace_tweaker = mock("backtrace_tweaker", :null_object => true)
-            @reporter = FakeReporter.new(@options)
-            @options.reporter = @reporter
+          with_sandboxed_config do
+            before do
+              @options.formatters << mock("formatter", :null_object => true)
+              @options.backtrace_tweaker = mock("backtrace_tweaker", :null_object => true)
+              @reporter = FakeReporter.new(@options)
+              @options.reporter = @reporter
             
-            ExampleGroup.before_all_parts.should == []
-            ExampleGroup.before_each_parts.should == []
-            ExampleGroup.after_each_parts.should == []
-            ExampleGroup.after_all_parts.should == []
-            def ExampleGroup.count
-              @count ||= 0
-              @count = @count + 1
-              @count
+              ExampleGroup.before_all_parts.should == []
+              ExampleGroup.before_each_parts.should == []
+              ExampleGroup.after_each_parts.should == []
+              ExampleGroup.after_all_parts.should == []
+              def ExampleGroup.count
+                @count ||= 0
+                @count = @count + 1
+                @count
+              end
             end
           end
 
@@ -47,38 +49,6 @@ module Spec
             ExampleGroup.instance_variable_set("@after_all_parts", [])
           end
 
-          it "should pass before and after callbacks to all ExampleGroup subclasses" do
-            ExampleGroup.before(:suite) do
-              ExampleGroup.count.should == 1
-            end
-
-            ExampleGroup.before(:all) do
-              ExampleGroup.count.should == 2
-            end
-
-            ExampleGroup.before(:each) do
-              ExampleGroup.count.should == 3
-            end
-
-            ExampleGroup.after(:each) do
-              ExampleGroup.count.should == 4
-            end
-
-            ExampleGroup.after(:all) do
-              ExampleGroup.count.should == 5
-            end
-
-            ExampleGroup.after(:suite) do
-              ExampleGroup.count.should == 6
-            end
-
-            Class.new(ExampleGroup) do
-              it "should use ExampleMethods callbacks" do end
-            end
-            @options.run_examples
-            ExampleGroup.count.should == 7
-          end
-
           describe "eval_block" do
             before(:each) do
               @example_group = Class.new(ExampleGroup)
@@ -127,32 +97,184 @@ module Spec
                   @example.eval_block
                 end
               
-                error.pending_caller.should == "#{file}:#{line_number}"
+                error.pending_caller.should =~ /#{file}:#{line_number}/
               end
             end
           end
         end
       end
 
-      describe "#implementation_backtrace" do
-        it "returns the backtrace of where the implementation was defined" do
-          example_group = Class.new(ExampleGroup) do
-            it "should use ExampleMethods callbacks" do
+      describe "#backtrace" do        
+        with_sandboxed_options do
+          it "returns the backtrace from where the example was defined" do
+            example_group = Class.new(ExampleGroup) do
+              example "of something" do; end
             end
+            
+            example = example_group.examples.first
+            example.backtrace.join("\n").should include("#{__FILE__}:#{__LINE__-4}")
           end
-          example = example_group.examples.first
-          example.implementation_backtrace.join("\n").should include("#{__FILE__}:#{__LINE__-4}")
         end
       end
+      
+      describe "#implementation_backtrace (deprecated)" do
+        with_sandboxed_options do
+          before(:each) do
+            Kernel.stub!(:warn)
+          end
 
-      describe "#__full_description" do
+          it "sends a deprecation warning" do
+            example_group = Class.new(ExampleGroup) {}
+            example = example_group.example("") {}
+            Kernel.should_receive(:warn).with(/#implementation_backtrace.*deprecated.*#backtrace instead/m)
+            example.implementation_backtrace
+          end
+          
+          it "returns the backtrace from where the example was defined" do
+            example_group = Class.new(ExampleGroup) do
+              example "of something" do; end
+            end
+            
+            example = example_group.examples.first
+            example.backtrace.join("\n").should include("#{__FILE__}:#{__LINE__-4}")
+          end
+        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"
+          example.full_description.should == "An ExampleGroup should do something"
+        end
+      end
+      
+      describe "#subject" do
+        with_sandboxed_options do
+          it "should return an instance variable named after the described type" do
+            example_group = Class.new(ExampleGroup).describe(Array) do
+              example {}
+            end
+            example = example_group.examples.first
+            example.subject.should == []
+          end
+      
+          it "should not barf on a module (as opposed to a class)" do
+            example_group = Class.new(ExampleGroup).describe(ObjectSpace) do
+              example {}
+            end
+            example_group.examples.first.subject.should be_nil
+          end
+      
+          it "should not barf on a string" do
+            example_group = Class.new(ExampleGroup).describe('foo') do
+              example {}
+            end
+            example_group.examples.first.subject.should be_nil
+          end
+      
+          it "should interact with the same scope as the before block" do
+            example_group = Class.new(ExampleGroup) do
+              subject { @foo = 'foo'}
+              example { should == @foo}
+              it { should == 'foo'}
+            end
+            example_group.run(options).should be_true
+          end
+        end
+      end
+
+      describe "#should" do
+        with_sandboxed_options do
+          class Thing
+            def ==(other)
+              true
+            end
+          end
+          
+          describe "in an ExampleGroup with the ivar defined in before" do
+            attr_reader :example, :success
+
+            before(:each) do
+              example_group = describe(Thing, "1") do
+                before(:each) { @spec_example_thing = 'expected' }
+                it { should eql('expected') }
+              end
+              @example = example_group.examples.first
+              @success = example_group.run(options)
+            end
+
+            it "should create an example using the description from the matcher" do
+              example.description.should == 'should eql "expected"'
+            end
+
+            it "should test the matcher returned from the block" do
+              success.should be_true
+            end
+          end
+
+          describe "in an ExampleGroup with the subject defined using #subject" do
+            it "should create an example using the description from the matcher" do
+              example_group = describe(Thing, "2") do
+                subject {'this is the subject'}
+                it { should eql('this is the subject') }
+              end
+              example = example_group.examples.first
+              example_group.run(options)
+              example.description.should =~ /should eql "this is the subject"/
+            end
+          end
+          
+          describe "in an ExampleGroup using an implicit ivar" do
+            it "should create an example using the description from the matcher" do
+              example_group = describe(Thing, "3") do
+                it { should == Thing.new }
+              end
+              example = example_group.examples.first
+              success = example_group.run(options)
+              example.description.should =~ /should == #<Spec::Example::Thing/
+              success.should be_true
+            end
+          end
+          
+          after(:each) do
+            ExampleGroup.reset
+          end
+          
+        end
+      end
+
+      describe "#should_not" do
+        with_sandboxed_options do
+
+          attr_reader :example_group, :example, :success
+
+          before do
+            @example_group = Class.new(ExampleGroup) do
+              def subject; @actual; end
+              before(:each) { @actual = 'expected' }
+              it { should_not eql('unexpected') }
+            end
+            @example = @example_group.examples.first
+
+            @success = example_group.run(options)
+          end
+
+          it "should create an example using the description from the matcher" do
+            example.description.should == 'should not eql "unexpected"'
+          end
+
+          it "should test the matcher returned from the block" do
+            success.should be_true
+          end
+
+          after do
+            ExampleGroup.reset
+          end
+
         end
       end
     end