rspec-core 2.0.0.a2 → 2.0.0.a3

data/spec/rspec/core/command_line_options_spec.rb

@@ -43,6 +43,20 @@ describe Rspec::Core::CommandLineOptions do
 
   end
 
+  describe 'line_number' do
+    it "is parsed from -l or --line_number" do
+      options_from_args('-l','3').should include(:line_number => '3')
+      options_from_args('--line_number','3').should include(:line_number => '3')
+    end
+  end
+
+  describe "example" do
+    it "is parsed from --example or -e" do
+      options_from_args('--example','foo').should include(:full_description => /foo/)
+      options_from_args('-e','bar').should include(:full_description => /bar/)
+    end
+  end
+
   describe "files_or_directories_to_run" do
 
     it "parses files from '-c file.rb dir/file.rb'" do

data/spec/rspec/core/configuration_spec.rb

@@ -102,6 +102,24 @@ describe Rspec::Core::Configuration do
 
     end
 
+    context "with line number" do
+
+      it "assigns the line number as the filter" do
+        @config.files_or_directories_to_run = "path/to/a_spec.rb:37"
+        @config.filter.should == {:line_number => 37}
+      end
+
+    end
+
+    context "with full_description" do
+
+      it "assigns the example name as the filter on description" do
+        @config.full_description = "foo"
+        @config.filter.should == {:full_description => /foo/}
+      end
+
+    end
+
   end
   
   describe "include" do
@@ -112,14 +130,12 @@ describe Rspec::Core::Configuration do
       end
     end
 
-    it "should include the given module into each matching behaviour" do
+    it "should include the given module into each matching example group" do
       Rspec::Core.configuration.include(InstanceLevelMethods, :magic_key => :include)
       
-      isolate_example_group do
-        group = Rspec::Core::ExampleGroup.describe(Object, 'does like, stuff and junk', :magic_key => :include) { }
-        group.should_not respond_to(:you_call_this_a_blt?)
-        group.new.you_call_this_a_blt?.should == "egad man, where's the mayo?!?!?"
-      end
+      group = isolated_example_group('does like, stuff and junk', :magic_key => :include) { }
+      group.should_not respond_to(:you_call_this_a_blt?)
+      group.new.you_call_this_a_blt?.should == "egad man, where's the mayo?!?!?"
     end
 
   end
@@ -133,30 +149,30 @@ describe Rspec::Core::Configuration do
 
     end
 
-    it "should extend the given module into each matching behaviour" do
+    it "should extend the given module into each matching example group" do
       Rspec::Core.configuration.extend(ThatThingISentYou, :magic_key => :extend)      
       group = Rspec::Core::ExampleGroup.describe(ThatThingISentYou, :magic_key => :extend) { }
       
       group.should respond_to(:that_thing)
-      remove_last_describe_from_world
+      remove_last_example_group_from_world
     end
 
   end
 
   describe "run_all_when_everything_filtered" do
 
-    it "defaults to true" do
-      Rspec::Core::Configuration.new.run_all_when_everything_filtered.should == true
+    it "defaults to false" do
+      Rspec::Core::Configuration.new.run_all_when_everything_filtered.should == false
     end
 
     it "can be queried with question method" do
       config = Rspec::Core::Configuration.new
-      config.run_all_when_everything_filtered = false
-      config.run_all_when_everything_filtered?.should == false
+      config.run_all_when_everything_filtered = true
+      config.run_all_when_everything_filtered?.should == true
     end
   end
   
-  describe 'formatter' do
+  describe 'formatter=' do
 
     it "sets formatter_to_use based on name" do
       config = Rspec::Core::Configuration.new
@@ -173,4 +189,26 @@ describe Rspec::Core::Configuration do
     
   end
 
+  describe "line_number=" do
+    it "sets the line number" do
+      config = Rspec::Core::Configuration.new
+      config.line_number = '37'
+      config.filter.should == {:line_number => 37}
+    end
+    
+    it "overrides :focused" do
+      config = Rspec::Core::Configuration.new
+      config.filter_run :focused => true
+      config.line_number = '37'
+      config.filter.should == {:line_number => 37}
+    end
+    
+    it "prevents :focused" do
+      config = Rspec::Core::Configuration.new
+      config.line_number = '37'
+      config.filter_run :focused => true
+      config.filter.should == {:line_number => 37}
+    end
+  end
+
 end

data/spec/rspec/core/example_group_spec.rb

@@ -1,12 +1,5 @@
 require 'spec_helper'
 
-def empty_example_group(name='Empty ExampleGroup Group')
-  group = Rspec::Core::ExampleGroup.describe(Object, name) {}
-  remove_last_describe_from_world
-  yield group if block_given?
-  group
-end
-
 describe Rspec::Core::ExampleGroup do
 
   describe "#describe" do
@@ -24,29 +17,26 @@ describe Rspec::Core::ExampleGroup do
   describe '#name' do
 
     it "uses the first parameter as name" do
-      isolate_example_group do
+      disconnect_from_world do
         Rspec::Core::ExampleGroup.describe("my favorite pony") { }.name.should == 'my favorite pony'
       end
     end
 
     it "accepts a constant as the first parameter" do
-      isolate_example_group do
+      disconnect_from_world do
         Rspec::Core::ExampleGroup.describe(Object) { }.name.should == 'Object'
       end
     end
 
     it "concats nested names" do
-      isolate_example_group do
-        behaviour_to_test = nil
-        group = empty_example_group('test')
-        group.name.should == 'Object test'
+      group = isolated_example_group(Object, 'test')
+      group.name.should == 'Object test'
 
-        nested_group_one = group.describe('nested one') { }
-        nested_group_one.name.should == 'Object test nested one'
+      nested_group_one = group.describe('nested one') { }
+      nested_group_one.name.should == 'Object test nested one'
 
-        nested_group_two = nested_group_one.describe('nested two') { }
-        nested_group_two.name.should == 'Object test nested one nested two'
-      end
+      nested_group_two = nested_group_one.describe('nested two') { }
+      nested_group_two.name.should == 'Object test nested one nested two'
     end
 
   end
@@ -56,7 +46,7 @@ describe Rspec::Core::ExampleGroup do
     context "with a constant as the first parameter" do
 
       it "is that constant" do
-        isolate_example_group do
+        disconnect_from_world do
           Rspec::Core::ExampleGroup.describe(Object) { }.describes.should == Object
         end
       end
@@ -66,7 +56,7 @@ describe Rspec::Core::ExampleGroup do
     context "with a string as the first parameter" do
 
       it "is nil" do
-        isolate_example_group do
+        disconnect_from_world do
           Rspec::Core::ExampleGroup.describe("i'm a computer") { }.describes.should be_nil
         end
       end
@@ -78,14 +68,14 @@ describe Rspec::Core::ExampleGroup do
   describe '#description' do
 
     it "exposes the second parameter as description" do
-      isolate_example_group do
+      disconnect_from_world do
         Rspec::Core::ExampleGroup.describe(Object, "my desc") { }.description.should == 'my desc'
       end
     end
 
     it "allows the second parameter to be nil" do
-      isolate_example_group do
-        Rspec::Core::ExampleGroup.describe(Object, nil) { }.description.size.should == 0
+      disconnect_from_world do
+        Rspec::Core::ExampleGroup.describe(Object, nil) { }.description.should == ""
       end
     end
 
@@ -94,46 +84,46 @@ describe Rspec::Core::ExampleGroup do
   describe '#metadata' do
 
     it "adds the third parameter to the metadata" do
-      isolate_example_group do
+      disconnect_from_world do
         Rspec::Core::ExampleGroup.describe(Object, nil, 'foo' => 'bar') { }.metadata.should include({ "foo" => 'bar' })
       end
     end
 
     it "adds the caller to metadata" do
-      isolate_example_group do
-        Rspec::Core::ExampleGroup.describe(Object) { }.metadata[:behaviour][:caller].any? {|f|
+      disconnect_from_world do
+        Rspec::Core::ExampleGroup.describe(Object) { }.metadata[:example_group][:caller].any? {|f|
           f =~ /#{__FILE__}/
         }.should be_true
       end
     end
 
     it "adds the the file_path to metadata" do
-      isolate_example_group do
-        Rspec::Core::ExampleGroup.describe(Object) { }.metadata[:behaviour][:file_path].should == __FILE__
+      disconnect_from_world do
+        Rspec::Core::ExampleGroup.describe(Object) { }.metadata[:example_group][:file_path].should == __FILE__
       end
     end
 
     it "has a reader for file_path" do
-      isolate_example_group do
+      disconnect_from_world do
         Rspec::Core::ExampleGroup.describe(Object) { }.file_path.should == __FILE__
       end
     end
 
     it "adds the line_number to metadata" do
-      isolate_example_group do
-        Rspec::Core::ExampleGroup.describe(Object) { }.metadata[:behaviour][:line_number].should == __LINE__
+      disconnect_from_world do
+        Rspec::Core::ExampleGroup.describe(Object) { }.metadata[:example_group][:line_number].should == __LINE__
       end
     end
 
     it "adds file path and line number metadata for arbitrarily nested describes" do
       Rspec::Core::ExampleGroup.describe(Object) do
         Rspec::Core::ExampleGroup.describe("foo") do
-          Rspec::Core::ExampleGroup.describe(Object) { }.metadata[:behaviour][:file_path].should == __FILE__
-          Rspec::Core::ExampleGroup.describe(Object) { }.metadata[:behaviour][:line_number].should == __LINE__
+          Rspec::Core::ExampleGroup.describe(Object) { }.metadata[:example_group][:file_path].should == __FILE__
+          Rspec::Core::ExampleGroup.describe(Object) { }.metadata[:example_group][:line_number].should == __LINE__
         end
       end
 
-      4.times { remove_last_describe_from_world }
+      4.times { remove_last_example_group_from_world }
     end
 
   end
@@ -141,13 +131,13 @@ describe Rspec::Core::ExampleGroup do
   describe "adding before, after, and around hooks" do
 
     it "should expose the before each blocks at before_eachs" do
-      group = empty_example_group
+      group = isolated_example_group
       group.before(:each) { 'foo' }
       group.should have(1).before_eachs
     end
 
     it "should maintain the before each block order" do
-      group = empty_example_group 
+      group = isolated_example_group 
       group.before(:each) { 15 }
       group.before(:each) { 'A' }
       group.before(:each) { 33.5 }
@@ -158,13 +148,13 @@ describe Rspec::Core::ExampleGroup do
     end
 
     it "should expose the before all blocks at before_alls" do
-      group = empty_example_group
+      group = isolated_example_group
       group.before(:all) { 'foo' }
       group.should have(1).before_alls
     end
 
     it "should maintain the before all block order" do
-      group = empty_example_group 
+      group = isolated_example_group 
       group.before(:all) { 15 }
       group.before(:all) { 'A' }
       group.before(:all) { 33.5 }
@@ -175,13 +165,13 @@ describe Rspec::Core::ExampleGroup do
     end
 
     it "should expose the after each blocks at after_eachs" do
-      group = empty_example_group
+      group = isolated_example_group
       group.after(:each) { 'foo' }
       group.should have(1).after_eachs
     end
 
     it "should maintain the after each block order" do
-      group = empty_example_group 
+      group = isolated_example_group 
       group.after(:each) { 15 }
       group.after(:each) { 'A' }
       group.after(:each) { 33.5 }
@@ -192,13 +182,13 @@ describe Rspec::Core::ExampleGroup do
     end
 
     it "should expose the after all blocks at after_alls" do
-      group = empty_example_group
+      group = isolated_example_group
       group.after(:all) { 'foo' }
       group.should have(1).after_alls
     end
 
     it "should maintain the after each block order" do
-      group = empty_example_group 
+      group = isolated_example_group 
       group.after(:all) { 15 }
       group.after(:all) { 'A' }
       group.after(:all) { 33.5 }
@@ -209,7 +199,7 @@ describe Rspec::Core::ExampleGroup do
     end
 
     it "should expose the around each blocks at after_alls" do
-      group = empty_example_group
+      group = isolated_example_group
       group.around(:each) { 'foo' }
       group.should have(1).around_eachs
     end
@@ -219,13 +209,13 @@ describe Rspec::Core::ExampleGroup do
   describe "adding examples" do
 
     it "should allow adding an example using 'it'" do
-      group = empty_example_group
+      group = isolated_example_group
       group.it("should do something") { }
       group.examples.size.should == 1
     end
 
     it "should expose all examples at examples" do
-      group = empty_example_group
+      group = isolated_example_group
       group.it("should do something 1") { }
       group.it("should do something 2") { }
       group.it("should do something 3") { }
@@ -233,7 +223,7 @@ describe Rspec::Core::ExampleGroup do
     end
 
     it "should maintain the example order" do
-      group = empty_example_group
+      group = isolated_example_group
       group.it("should 1") { }
       group.it("should 2") { }
       group.it("should 3") { }
@@ -248,15 +238,15 @@ describe Rspec::Core::ExampleGroup do
 
     describe "A sample nested group", :nested_describe => "yep" do
       it "sets the described class to the constant Object" do
-        running_example.behaviour.describes.should == Object
+        running_example.example_group.describes.should == Object
       end
 
       it "sets the description to 'A sample nested describe'" do
-        running_example.behaviour.description.should == 'A sample nested group'
+        running_example.example_group.description.should == 'A sample nested group'
       end
 
-      it "has top level metadata from the behaviour and its ancestors" do
-        running_example.behaviour.metadata.should include(:little_less_nested => 'yep', :nested_describe => 'yep')
+      it "has top level metadata from the example_group and its ancestors" do
+        running_example.example_group.metadata.should include(:little_less_nested => 'yep', :nested_describe => 'yep')
       end
 
       it "exposes the parent metadata to the contained examples" do
@@ -271,41 +261,44 @@ describe Rspec::Core::ExampleGroup do
       @fake_formatter = Rspec::Core::Formatters::BaseFormatter.new
     end
 
-    def stub_behaviour
-      behaviour = mock('behaviour', :null_object => true)
-      behaviour.stub!(:metadata).and_return(:metadata => { :behaviour => { :name => 'behaviour_name' }})
-      behaviour
+    def stub_example_group
+      stub('example_group', 
+        :metadata => Rspec::Core::Metadata.new.process(
+          'example_group_name',
+          :caller => ['foo_spec.rb:37']
+        )
+      ).as_null_object 
     end
 
     it "should return true if all examples pass" do
       use_formatter(@fake_formatter) do
-        passing_example1 = Rspec::Core::Example.new(stub_behaviour, 'description', {}, (lambda { 1.should == 1 }))
-        passing_example2 = Rspec::Core::Example.new(stub_behaviour, 'description', {}, (lambda { 1.should == 1 }))
+        passing_example1 = Rspec::Core::Example.new(stub_example_group, 'description', {}, (lambda { 1.should == 1 }))
+        passing_example2 = Rspec::Core::Example.new(stub_example_group, 'description', {}, (lambda { 1.should == 1 }))
         Rspec::Core::ExampleGroup.stub!(:examples_to_run).and_return([passing_example1, passing_example2])
 
-        Rspec::Core::ExampleGroup.run_examples(stub_behaviour, mock('reporter', :null_object => true)).should be_true
+        Rspec::Core::ExampleGroup.run_examples(stub_example_group, mock('reporter').as_null_object).should be_true
       end
     end
 
     it "should return false if any of the examples return false" do
       use_formatter(@fake_formatter) do
-        failing_example = Rspec::Core::Example.new(stub_behaviour, 'description', {}, (lambda { 1.should == 2 }))
-        passing_example = Rspec::Core::Example.new(stub_behaviour, 'description', {}, (lambda { 1.should == 1 }))
+        failing_example = Rspec::Core::Example.new(stub_example_group, 'description', {}, (lambda { 1.should == 2 }))
+        passing_example = Rspec::Core::Example.new(stub_example_group, 'description', {}, (lambda { 1.should == 1 }))
         Rspec::Core::ExampleGroup.stub!(:examples_to_run).and_return([failing_example, passing_example])
 
-        Rspec::Core::ExampleGroup.run_examples(stub_behaviour, mock('reporter', :null_object => true)).should be_false
+        Rspec::Core::ExampleGroup.run_examples(stub_example_group, mock('reporter').as_null_object).should be_false
       end
     end
 
     it "should run all examples, regardless of any of them failing" do
       use_formatter(@fake_formatter) do
-        failing_example = Rspec::Core::Example.new(stub_behaviour, 'description', {}, (lambda { 1.should == 2 }))
-        passing_example = Rspec::Core::Example.new(stub_behaviour, 'description', {}, (lambda { 1.should == 1 }))
+        failing_example = Rspec::Core::Example.new(stub_example_group, 'description', {}, (lambda { 1.should == 2 }))
+        passing_example = Rspec::Core::Example.new(stub_example_group, 'description', {}, (lambda { 1.should == 1 }))
         Rspec::Core::ExampleGroup.stub!(:examples_to_run).and_return([failing_example, passing_example])
 
         passing_example.should_receive(:run)
 
-        Rspec::Core::ExampleGroup.run_examples(stub_behaviour, mock('reporter', :null_object => true))
+        Rspec::Core::ExampleGroup.run_examples(stub_example_group, mock('reporter', :null_object => true))
       end
     end
 
@@ -330,19 +323,19 @@ describe Rspec::Core::ExampleGroup do
 
     it "should be able to access the before all ivars in the before_all_ivars hash" do
       with_ruby('1.8') do
-        running_example.behaviour.before_all_ivars.should include('@before_all_top_level' => 'before_all_top_level')
+        running_example.example_group.before_all_ivars.should include('@before_all_top_level' => 'before_all_top_level')
       end
       with_ruby('1.9') do
-        running_example.behaviour.before_all_ivars.should include(:@before_all_top_level => 'before_all_top_level')
+        running_example.example_group.before_all_ivars.should include(:@before_all_top_level => 'before_all_top_level')
       end
     end
 
     describe "but now I am nested" do
-      it "should be able to access a parent behaviours before each ivar at a nested level" do
+      it "should be able to access a parent example groups before each ivar at a nested level" do
         @before_each_top_level.should == 'before_each_top_level'
       end
 
-      it "should be able to access a parent behaviours before all ivar at a nested level" do
+      it "should be able to access a parent example groups before all ivar at a nested level" do
         @before_all_top_level.should == "before_all_top_level"
       end
 
@@ -350,7 +343,7 @@ describe Rspec::Core::ExampleGroup do
         @before_all_top_level = "ive been changed"
       end
 
-      describe "accessing a before_all ivar that was changed in a parent behaviour" do
+      describe "accessing a before_all ivar that was changed in a parent example_group" do
         it "does not have access to the modified version" do
           @before_all_top_level.should == 'before_all_top_level'
         end