rspec-core 2.0.0.a1 → 2.0.0.a2

data/spec/rspec/core/example_group_subject_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 def describe_double(describes=Object)
   group = Rspec::Core::ExampleGroup.describe(describes) {}

data/spec/rspec/core/example_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Rspec::Core::Example, :parent_metadata => 'sample' do
 
@@ -6,62 +6,52 @@ describe Rspec::Core::Example, :parent_metadata => 'sample' do
     behaviour = stub('behaviour', :metadata => { :behaviour => { :name => 'behaviour_name' }})
     @example = Rspec::Core::Example.new(behaviour, 'description', {}, (lambda {}))
   end
-    
+
   describe "attr readers" do
-  
     it "should have one for the parent behaviour" do
       @example.should respond_to(:behaviour)
     end
-  
+
     it "should have one for it's description" do
       @example.should respond_to(:description)
     end
-  
+
     it "should have one for it's metadata" do
       @example.should respond_to(:metadata)
     end
-  
+
     it "should have one for it's block" do
       @example.should respond_to(:example_block)
     end
-  
   end
-  
+
   describe '#inspect' do
-    
     it "should return 'behaviour_name - description'" do
       @example.inspect.should == 'behaviour_name - description'
     end
-    
   end
-  
+
   describe '#to_s' do
-    
     it "should return #inspect" do
       @example.to_s.should == @example.inspect
     end
-    
   end
-  
+
   describe "accessing metadata within a running example" do
-  
     it "should have a reference to itself when running" do
       running_example.description.should == "should have a reference to itself when running"
     end
-  
+
     it "should be able to access the behaviours top level metadata as if it were its own" do
       running_example.behaviour.metadata.should include(:parent_metadata => 'sample')
       running_example.metadata.should include(:parent_metadata => 'sample')
     end
-  
   end
-  
+
   describe "#run" do
-    
     pending "should run after(:each) when the example fails"
-  
+
     pending "should run after(:each) when the example raises an Exception" 
-    
   end
-  
+
 end

data/spec/rspec/core/formatters/base_formatter_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Rspec::Core::Formatters::BaseFormatter do
   

data/spec/rspec/core/formatters/documentation_formatter_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Rspec::Core::Formatters::DocumentationFormatter do
   

data/spec/rspec/core/formatters/progress_formatter_spec.rb

@@ -1,4 +1,5 @@
-require 'spec/spec_helper'
+require 'spec_helper'
+require 'stringio'
 
 describe Rspec::Core::Formatters::ProgressFormatter do
   
@@ -6,8 +7,8 @@ describe Rspec::Core::Formatters::ProgressFormatter do
      @output = StringIO.new
      @formatter = Rspec::Core::Formatters::ProgressFormatter.new
      @formatter.start(2)
-     @formatter.stubs(:color_enabled?).returns(false)
-     @formatter.stubs(:output).returns(@output)
+     @formatter.stub!(:color_enabled?).and_return(false)
+     @formatter.stub!(:output).and_return(@output)
    end
    
    it "should produce line break on start dump" do

data/spec/rspec/core/kernel_extensions_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Rspec::Core::KernelExtensions do
   

data/spec/rspec/core/metadata_spec.rb

@@ -0,0 +1,101 @@
+require 'spec_helper'
+
+module Rspec
+  module Core
+    describe Metadata do
+      describe "#generated_name" do
+        it "generates name for top level example group" do
+          m = Metadata.new
+          m.process("description", :caller => caller(0))
+          m[:behaviour][:name].should == "description"
+        end
+
+        it "concats args to describe()" do
+          m = Metadata.new
+          m.process(String, "with dots", :caller => caller(0))
+          m[:behaviour][:name].should == "String with dots"
+        end
+
+        it "concats nested names" do
+          m = Metadata.new(:behaviour => {:name => 'parent'})
+          m.process(String, "child", :caller => caller(0))
+          m[:behaviour][:name].should == "parent child"
+        end
+
+        it "strips the name" do
+          m = Metadata.new
+          m.process("  description  \n", :caller => caller(0))
+          m[:behaviour][:name].should == "description"
+        end
+      end
+
+      describe "#determine_file_path" do
+        it "finds the first spec file in the caller array" do
+          m = Metadata.new
+          m.process(:caller => [
+            "foo",
+            "#{__FILE__}:#{__LINE__}",
+            "bar_spec.rb:23",
+            "baz"
+          ])
+          m[:behaviour][:file_path].should == __FILE__
+        end
+      end
+
+      describe "#determine_line_number" do
+        it "finds the line number with the first spec file " do
+          m = Metadata.new
+          m.process(:caller => [
+            "foo",
+            "#{__FILE__}:#{__LINE__}",
+            "bar_spec.rb:23",
+            "baz"
+          ])
+          m[:behaviour][:line_number].should == __LINE__ - 4
+        end
+        it "uses the number after the first : for ruby 1.9" do
+          m = Metadata.new
+          m.process(:caller => [
+            "foo",
+            "#{__FILE__}:#{__LINE__}:999",
+            "bar_spec.rb:23",
+            "baz"
+          ])
+          m[:behaviour][:line_number].should == __LINE__ - 4
+        end
+      end
+
+      describe "#metadata_for_example" do
+        let(:caller_to_use)      { caller(0) }
+        let(:caller_line_number) { __LINE__ - 1 }
+        let(:metadata)           { Metadata.new.process(:caller => caller_to_use) }
+        let(:mfe)                { metadata.for_example("this description", {:caller => caller_to_use, :arbitrary => :options}) }
+
+        it "stores the description" do
+          mfe[:description].should == "this description"
+        end
+
+        it "creates an empty execution result" do
+          mfe[:execution_result].should == {}
+        end
+
+        it "stores the caller" do
+          mfe[:caller].should == caller_to_use
+        end
+
+        it "extracts file path from caller" do
+          mfe[:file_path].should == __FILE__ 
+        end
+
+        it "extracts line number from caller" do
+          mfe[:line_number].should == caller_line_number 
+        end
+
+        it "merges arbitrary options" do
+          mfe[:arbitrary].should == :options 
+        end
+
+      end
+    end
+  end
+end

data/spec/rspec/core/mocha_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe "Mocha Regression involving double reporting of errors" do
   
@@ -10,7 +10,7 @@ describe "Mocha Regression involving double reporting of errors" do
 
     use_formatter(formatter) do
 
-      isolate_behaviour do
+      isolate_example_group do
         desc = Rspec::Core::ExampleGroup.describe("my favorite pony") do
           example("showing a double fail") do
             foo = "string"

data/spec/rspec/core/runner_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Rspec::Core::Runner do
 
@@ -13,14 +13,14 @@ describe Rspec::Core::Runner do
   describe 'at_exit' do
     
     it 'should set an at_exit hook if none is already set' do
-      Rspec::Core::Runner.stubs(:installed_at_exit?).returns(false)
-      Rspec::Core::Runner.expects(:at_exit)
+      Rspec::Core::Runner.stub!(:installed_at_exit?).and_return(false)
+      Rspec::Core::Runner.should_receive(:at_exit)
       Rspec::Core::Runner.autorun
     end
     
     it 'should not set the at_exit hook if it is already set' do
-      Rspec::Core::Runner.stubs(:installed_at_exit?).returns(true)
-      Rspec::Core::Runner.expects(:at_exit).never
+      Rspec::Core::Runner.stub!(:installed_at_exit?).and_return(true)
+      Rspec::Core::Runner.should_receive(:at_exit).never
       Rspec::Core::Runner.autorun
     end
     

data/spec/rspec/core/shared_behaviour_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Rspec::Core::SharedBehaviour do
 
@@ -25,7 +25,7 @@ describe Rspec::Core::SharedBehaviour do
   describe "share_examples_for" do
 
     it "should capture the given name and block in the Worlds collection of shared behaviours" do
-      Rspec::Core.world.shared_behaviours.expects(:[]=).with(:foo, anything)
+      Rspec::Core.world.shared_behaviours.should_receive(:[]=).with(:foo, anything)
       share_examples_for(:foo) { }
     end
 
@@ -47,8 +47,8 @@ describe Rspec::Core::SharedBehaviour do
           'extra_helper'
         end
       }
-      Rspec::Core.world.stubs(:shared_behaviours).returns({ :a => block1, :shared_behaviour => block2 })
-      group.expects(:module_eval).once
+      Rspec::Core.world.stub!(:shared_behaviours).and_return({ :a => block1, :shared_behaviour => block2 })
+      group.should_receive(:module_eval).once
       group.it_should_behave_like :shared_behaviour
     end
 
@@ -58,7 +58,7 @@ describe Rspec::Core::SharedBehaviour do
         def self.class_helper; end
         def extra_helper; end
       }
-      Rspec::Core.world.stubs(:shared_behaviours).returns({ :shared_behaviour => block })
+      Rspec::Core.world.stub!(:shared_behaviours).and_return({ :shared_behaviour => block })
       group.it_should_behave_like :shared_behaviour
       with_ruby(1.8) do
         group.instance_methods.should include('extra_helper')

data/spec/rspec/core/world_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 class Bar; end
 class Foo; end
@@ -7,7 +7,7 @@ describe Rspec::Core::World do
   
   before do
     @world = Rspec::Core::World.new
-    Rspec::Core.stubs(:world).returns(@world)
+    Rspec::Core.stub!(:world).and_return(@world)
   end
 
   describe "behaviour groups" do
@@ -100,7 +100,7 @@ describe Rspec::Core::World do
     it "should find nothing if all describes match the exclusion filter" do
       options = { :network_access => true }      
       
-      isolate_behaviour do
+      isolate_example_group do
         group1 = Rspec::Core::ExampleGroup.describe(Bar, "find group-1", options) do
           it("foo") {}
           it("bar") {}
@@ -109,7 +109,7 @@ describe Rspec::Core::World do
         @world.apply_exclusion_filters(group1.examples, :network_access => true).should == []
       end
       
-      isolate_behaviour do
+      isolate_example_group do
         group2 = Rspec::Core::ExampleGroup.describe(Bar, "find group-1") do
           it("foo", :network_access => true) {}
           it("bar") {}
@@ -121,7 +121,7 @@ describe Rspec::Core::World do
     end
     
     it "should find nothing if a regexp matches the exclusion filter" do
-      isolate_behaviour do
+      isolate_example_group do
         group = Rspec::Core::ExampleGroup.describe(Bar, "find group-1", :name => "exclude me with a regex", :another => "foo") do
           it("foo") {}
           it("bar") {}
@@ -154,9 +154,9 @@ describe Rspec::Core::World do
     end
 
     it "should run matches" do
-      Rspec::Core.world.stubs(:exclusion_filter).returns({ :awesome => false })
-      Rspec::Core.world.stubs(:filter).returns({ :color => :red })
-      Rspec::Core.world.stubs(:behaviours).returns([@group1])
+      Rspec::Core.world.stub!(:exclusion_filter).and_return({ :awesome => false })
+      Rspec::Core.world.stub!(:filter).and_return({ :color => :red })
+      Rspec::Core.world.stub!(:behaviours).and_return([@group1])
       filtered_behaviours = @world.filter_behaviours
       filtered_behaviours.should == [@group1]
       @group1.examples_to_run.should == @group1.examples[0..1]      

data/spec/rspec/core_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Rspec::Core do
 

data/spec/spec_helper.rb

@@ -3,11 +3,11 @@ lib_path = File.expand_path("#{dir}/../lib")
 $LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)
 
 require 'rubygems'
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '/../../expectations/lib'))
+$LOAD_PATH.unshift(File.expand_path('../../../expectations/lib'), __FILE__)
 require 'rspec/expectations'
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '/../../mocks/lib'))
+$LOAD_PATH.unshift(File.expand_path('../../../mocks/lib'), __FILE__)
 require 'rspec/mocks'
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.expand_path('../../lib'), __FILE__)
 require 'rspec/core'
 
 Rspec::Core::ExampleGroup.send(:include, Rspec::Matchers)
@@ -17,7 +17,6 @@ def with_ruby(version)
 end
 
 require 'rubygems'
-require 'mocha'
 
 require File.expand_path(File.dirname(__FILE__) + "/resources/example_classes")
 
@@ -39,10 +38,16 @@ def remove_last_describe_from_world
   Rspec::Core.world.behaviours.pop
 end
 
-def isolate_behaviour
+def isolate_example_group
   if block_given?
-    yield
-    Rspec::Core.world.behaviours.pop
+    example_groups = Rspec::Core.world.behaviours.dup
+    begin
+      Rspec::Core.world.behaviours.clear
+      yield
+    ensure
+      Rspec::Core.world.behaviours.clear
+      Rspec::Core.world.behaviours.concat(example_groups)
+    end
   end
 end
 
@@ -66,7 +71,9 @@ def not_in_editor?
 end
 
 Rspec::Core.configure do |c|
-  c.mock_framework = :mocha
+  c.mock_framework = :rspec
+  # c.filter_run :focused => true
+  # TODO: Filter run needs normal before/after/include filter logic
   c.filter_run :focused => true
   c.color_enabled = not_in_editor?
 end

data/specs.watchr

@@ -0,0 +1,57 @@
+# Run me with:
+#
+#   $ watchr specs.watchr
+
+# --------------------------------------------------
+# Convenience Methods
+# --------------------------------------------------
+def all_test_files
+  Dir['spec/**/*_spec.rb']
+end
+
+def run_test_matching(thing_to_match)
+  matches = all_test_files.grep(/#{thing_to_match}/i)
+  if matches.empty?
+    puts "Sorry, thanks for playing, but there were no matches for #{thing_to_match}"  
+  else
+    run matches.join(' ')
+  end
+end
+
+def run(files_to_run)
+  puts("Running: #{files_to_run}")
+  system("clear;bin/rspec -cfn #{files_to_run}")
+  no_int_for_you
+end
+
+def run_all_tests
+  run(all_test_files.join(' '))
+end
+
+# --------------------------------------------------
+# Watchr Rules
+# --------------------------------------------------
+watch('^spec/(.*)_spec\.rb'  )   { |m| run_test_matching(m[1]) }
+watch('^lib/(.*)\.rb'               )   { |m| run_test_matching(m[1]) }
+watch('^spec/spec_helper\.rb')   { run_all_tests }
+# --------------------------------------------------
+# Signal Handling
+# --------------------------------------------------
+
+def no_int_for_you
+  @sent_an_int = nil
+end
+
+Signal.trap 'INT' do
+  if @sent_an_int then      
+    puts "   A second INT?  Ok, I get the message.  Shutting down now."
+    exit
+  else
+    puts "   Did you just send me an INT? Ugh.  I'll quit for real if you do it again."
+    @sent_an_int = true
+    Kernel.sleep 1.5
+    run_all_tests
+  end
+end
+
+# vim:ft=ruby