dchelimsky-rspec 1.1.11.1 → 1.1.11.2

data/spec/spec/dsl/main_spec.rb

@@ -12,7 +12,7 @@ module Spec
           it "should delegate to Spec::Example::ExampleGroupFactory.create_example_group" do
             block = lambda {}
             Spec::Example::ExampleGroupFactory.should_receive(:create_example_group).with(
-              "The ExampleGroup", &block
+              "The ExampleGroup", hash_including(:spec_path), &block
             )
             @main.__send__ method, "The ExampleGroup", &block
           end
@@ -23,8 +23,8 @@ module Spec
         describe "##{method}" do
           it "should create a shared ExampleGroup" do
             block = lambda {}
-            Spec::Example::SharedExampleGroup.should_receive(:register).with(
-              "shared group", &block
+            Spec::Example::ExampleGroupFactory.should_receive(:create_shared_example_group).with(
+              "shared group", hash_including(:spec_path), &block
             )
             @main.__send__ method, "shared group", &block
           end
@@ -43,8 +43,11 @@ module Spec
         end
         
         it "registers a shared ExampleGroup" do
-          Spec::Example::SharedExampleGroup.should_receive(:register)
-          group = @main.share_as group_name do end
+          block = lambda {}
+          Spec::Example::ExampleGroupFactory.should_receive(:create_shared_example_group).with(
+            group_name, hash_including(:spec_path), &block
+          )
+          @main.share_as group_name, &block
         end
       
         it "creates a constant that points to a Module" do

data/spec/spec/example/configuration_spec.rb

@@ -12,27 +12,27 @@ module Spec
         end
 
         it "should default mock framework to rspec" do
-          @config.mock_framework.should =~ /\/plugins\/mock_frameworks\/rspec$/
+          @config.mock_framework.should =~ /\/adapters\/mock_frameworks\/rspec$/
         end
 
         it "should set rspec mocking explicitly" do
           @config.mock_with(:rspec)
-          @config.mock_framework.should =~ /\/plugins\/mock_frameworks\/rspec$/
+          @config.mock_framework.should =~ /\/adapters\/mock_frameworks\/rspec$/
         end
 
         it "should set mocha" do
           @config.mock_with(:mocha)
-          @config.mock_framework.should =~ /\/plugins\/mock_frameworks\/mocha$/
+          @config.mock_framework.should =~ /\/adapters\/mock_frameworks\/mocha$/
         end
 
         it "should set flexmock" do
           @config.mock_with(:flexmock)
-          @config.mock_framework.should =~ /\/plugins\/mock_frameworks\/flexmock$/
+          @config.mock_framework.should =~ /\/adapters\/mock_frameworks\/flexmock$/
         end
 
         it "should set rr" do
           @config.mock_with(:rr)
-          @config.mock_framework.should =~ /\/plugins\/mock_frameworks\/rr$/
+          @config.mock_framework.should =~ /\/adapters\/mock_frameworks\/rr$/
         end
 
         it "should set an arbitrary adapter module" do
@@ -150,7 +150,7 @@ module Spec
             @example_group.it "calls prepend_before" do
             end
         
-            @example_group.run
+            @example_group.run(Spec::Runner.options)
             order.should == [
               :prepend__before_all,
               :special_prepend__before_all,
@@ -193,7 +193,7 @@ module Spec
             @example_group.it "calls append_before" do
             end
 
-            @example_group.run
+            @example_group.run(Spec::Runner.options)
             order.should == [
               :append_before_all,
               :special_append_before_all,
@@ -236,7 +236,7 @@ module Spec
             @example_group.it "calls prepend_after" do
             end
 
-            @example_group.run
+            @example_group.run(Spec::Runner.options)
             order.should == [
               :special_child_prepend__after_each,
               :special_prepend__after_each,
@@ -279,7 +279,7 @@ module Spec
             @example_group.it "calls append_after" do
             end
 
-            @example_group.run
+            @example_group.run(Spec::Runner.options)
             order.should == [
               :special_child_append__after_each,
               :special_append__after_each,

data/spec/spec/example/example_group_factory_spec.rb

@@ -73,7 +73,7 @@ module Spec
         end
 
         it "should not run unregistered ExampleGroups" do
-          example_group = Spec::Example::ExampleGroupFactory.create_example_group "The ExampleGroup" do unregister; end
+          example_group = Spec::Example::ExampleGroupFactory.create_example_group "The ExampleGroup" do Spec::Runner.options.remove_example_group self; end
           Spec::Runner.options.example_groups.should_not include(example_group)
         end
 
@@ -112,6 +112,12 @@ module Spec
           ) {}
           custom_example_group.superclass.should == parent_example_group
         end
+        
+        it "sets the spec_path from the caller" do
+          options = {}
+          shared_example_group = Spec::Example::ExampleGroupFactory.create_example_group("foo", options) {}
+          options[:spec_path].should =~ /#{__FILE__}:#{__LINE__ - 1}/
+        end
 
         describe "with :shared => true" do
           def shared_example_group
@@ -142,17 +148,30 @@ module Spec
 
         it "should enable unregistering of ExampleGroups" do
           example_group = Spec::Example::ExampleGroupFactory.create_example_group("The ExampleGroup") do
-            unregister
+            Spec::Runner.options.remove_example_group self
           end
           Spec::Runner.options.example_groups.should_not include(example_group)
         end
         
-        
         after(:each) do
           Spec::Example::ExampleGroupFactory.reset
         end
       end
       
+      describe "#create_shared_example_group" do
+        it "registers a new shared example group" do
+          shared_example_group = Spec::Example::ExampleGroupFactory.create_shared_example_group("something shared") {}
+          shared_example_group.should be_an_instance_of(Spec::Example::SharedExampleGroup)
+          SharedExampleGroup.should include(shared_example_group)
+        end
+        
+        it "sets the spec_path from the caller" do
+          options = {}
+          shared_example_group = Spec::Example::ExampleGroupFactory.create_shared_example_group("foo", options) {}
+          options[:spec_path].should =~ /#{__FILE__}:#{__LINE__ - 1}/
+        end
+      end
+
       describe "#registered_or_ancestor_of_registered?" do
         before(:each) do
           @unregistered_parent = Class.new(ExampleGroup)

data/spec/spec/example/example_group_methods_spec.rb

@@ -42,6 +42,10 @@ module Spec
               it "should not inherit examples" do
                 @child_example_group.should have(1).examples
               end
+              
+              it "records the spec path" do
+                @child_example_group.spec_path.should =~ /#{__FILE__}:#{__LINE__ - 15}/
+              end
             end
 
             describe "when creating a SharedExampleGroup" do
@@ -120,7 +124,7 @@ module Spec
               end
             end
             example_group.examples.length.should == 1
-            example_group.run.should be_true
+            example_group.run(options).should be_true
           end
 
           it "should include methods that begin with should and has an arity of 0 in suite" do
@@ -145,7 +149,7 @@ module Spec
               end
             end
             example_group.should have(4).examples
-            descriptions = example_group.examples.collect {|example| example.description}
+            descriptions = example_group.examples.collect {|example| example.description.to_s}
             descriptions.should include(
               "shouldCamelCase",
               "should_any_args",
@@ -185,7 +189,7 @@ module Spec
               end
             end
             example_group.should have(1).examples
-            example_group.run.should be_true
+            example_group.run(options).should be_true
           end
 
           it "should run should_methods" do
@@ -195,7 +199,7 @@ module Spec
               end
             end
             example_group.should have(1).examples
-            example_group.run.should be_false
+            example_group.run(options).should be_false
           end
         end
 
@@ -412,12 +416,12 @@ module Spec
               after(:each, &proc)
             end
 
-            example_group.run
+            example_group.run(options)
             after_all_ran.should be_true
 
             after_all_ran = false
             example_group.remove_after(:each, &proc)
-            example_group.run
+            example_group.run(options)
             after_all_ran.should be_false
           end
         end
@@ -465,7 +469,7 @@ module Spec
                 FOO.should == 1
               end
             end
-            success = example_group.run
+            success = example_group.run(options)
             success.should be_true
             Object.const_defined?(:FOO).should == false
           end
@@ -473,20 +477,20 @@ module Spec
 
         describe '#register' do
           after(:each) do
-            example_group.unregister
+            Spec::Runner.options.remove_example_group example_group
           end
           it "should add ExampleGroup to set of ExampleGroups to be run" do
-            example_group.register
+            Spec::Runner.options.add_example_group example_group
             options.example_groups.should include(example_group)
           end
         end
 
         describe '#unregister' do
           before(:each) do
-            example_group.register
+            Spec::Runner.options.add_example_group example_group
           end
           it "should remove ExampleGroup from set of ExampleGroups to be run" do
-            example_group.unregister
+            Spec::Runner.options.remove_example_group example_group
             options.example_groups.should_not include(example_group)
           end
         end
@@ -498,7 +502,7 @@ module Spec
                 example("anything") {}
               end
               reporter.should_receive(:add_example_group)
-              example_group.run
+              example_group.run(options)
             end
           end
 
@@ -506,7 +510,7 @@ module Spec
             it "should NOT call add_example_group" do
               example_group = Class.new(ExampleGroup) do end
               reporter.should_not_receive(:add_example_group)
-              example_group.run
+              example_group.run(options)
             end
           end
         end
@@ -527,12 +531,12 @@ module Spec
             matcher.should_receive(:matches?).with(["something"]).any_number_of_times
           
             matcher_class = Class.new
-            matcher_class.should_receive(:new).with("TestMatcher", "should do something").twice.and_return(matcher)
+            matcher_class.should_receive(:new).with("TestMatcher", "should do something").and_return(matcher)
 
             begin 
               ExampleGroupMethods.matcher_class = matcher_class
 
-              example_group.run
+              example_group.run(options)
             ensure 
               ExampleGroupMethods.matcher_class = ExampleMatcher
             end

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,7 +443,7 @@ 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
 
@@ -467,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
@@ -486,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
 
@@ -501,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
 
@@ -515,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
 
@@ -540,7 +540,7 @@ module Spec
             end
 
             example_group.it("test") {true}
-            example_group.run
+            example_group.run(options)
           end
         end
 
@@ -554,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
@@ -569,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
@@ -598,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
@@ -627,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
@@ -641,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

data/spec/spec/example/example_methods_spec.rb

@@ -212,7 +212,7 @@ module Spec
               example { should == @foo}
               it { should == 'foo'}
             end
-            example_group.run.should be_true
+            example_group.run(options).should be_true
           end
         end
       end
@@ -234,7 +234,7 @@ module Spec
                 it { should eql('expected') }
               end
               @example = example_group.examples.first
-              @success = example_group.run
+              @success = example_group.run(options)
             end
 
             it "should create an example using the description from the matcher" do
@@ -253,7 +253,7 @@ module Spec
                 it { should eql('this is the subject') }
               end
               example = example_group.examples.first
-              example_group.run
+              example_group.run(options)
               example.description.should =~ /should eql "this is the subject"/
             end
           end
@@ -264,7 +264,7 @@ module Spec
                 it { should == Thing.new }
               end
               example = example_group.examples.first
-              success = example_group.run
+              success = example_group.run(options)
               example.description.should =~ /should == #<Spec::Example::Thing/
               success.should be_true
             end
@@ -290,7 +290,7 @@ module Spec
             end
             @example = @example_group.examples.first
 
-            @success = example_group.run
+            @success = example_group.run(options)
           end
 
           it "should create an example using the description from the matcher" do

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
+