rspec-core 2.0.0.beta.3 → 2.0.0.beta.4

data/spec/autotest/rspec_spec.rb

@@ -0,0 +1,130 @@
+require "spec_helper"
+
+describe Autotest::Rspec do
+  describe "adding spec.opts --options" do 
+    before(:each) do
+      @rspec_autotest = Autotest::Rspec2.new
+    end
+
+    it "should return the command line option to add spec.opts if the options file exists" do
+      File.stub!(:exist?).and_return true
+      @rspec_autotest.add_options_if_present.should == "-O spec/spec.opts "
+    end
+
+    it "should return an empty string if no spec.opts exists" do
+      File.stub!(:exist?).and_return false
+      Autotest::Rspec2.new.add_options_if_present.should == ""
+    end
+  end  
+
+  describe "commands" do
+    before(:each) do
+      @rspec_autotest = Autotest::Rspec2.new
+      @rspec_autotest.stub!(:ruby).and_return "ruby"
+      @rspec_autotest.stub!(:add_options_if_present).and_return "-O spec/spec.opts"
+    
+      @ruby = @rspec_autotest.ruby
+      @spec_cmd = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin', 'rspec'))
+      @options = @rspec_autotest.add_options_if_present
+      files = %w[file_one file_two]
+      @files_to_test = {
+        files[0] => [],
+        files[1] => []
+      }
+      # this is not the inner representation of Autotest!
+      @rspec_autotest.files_to_test = @files_to_test
+      @to_test = files.map { |f| File.expand_path(f) }.join ' '
+    end
+  
+    it "should make the appropriate test command" do
+      actual = @rspec_autotest.make_test_cmd(@files_to_test)
+      expected = /#{@ruby} #{@spec_cmd} (.*) #{@options}/
+
+      actual.should match(expected)
+
+      actual =~ expected
+      $1.should =~ /#{File.expand_path('file_one')}/
+      $1.should =~ /#{File.expand_path('file_two')}/
+    end
+
+    it "should return a blank command for no files" do
+      @rspec_autotest.make_test_cmd({}).should == ''
+    end
+  end
+
+  describe "mappings" do
+  
+    before(:each) do
+      @lib_file = "lib/something.rb"
+      @spec_file = "spec/something_spec.rb"
+      @rspec_autotest = Autotest::Rspec2.new
+      @rspec_autotest.hook :initialize
+    end
+  
+    it "should find the spec file for a given lib file" do
+      @rspec_autotest.should map_specs([@spec_file]).to(@lib_file)
+    end
+  
+    it "should find the spec file if given a spec file" do
+      @rspec_autotest.should map_specs([@spec_file]).to(@spec_file)
+    end
+  
+    it "should ignore files in spec dir that aren't specs" do
+      @rspec_autotest.should map_specs([]).to("spec/spec_helper.rb")
+    end
+  
+    it "should ignore untracked files (in @file)"  do
+      @rspec_autotest.should map_specs([]).to("lib/untracked_file")
+    end
+  end
+
+  describe "consolidating failures" do
+    before(:each) do
+      @rspec_autotest = Autotest::Rspec2.new
+    
+      @spec_file = "spec/autotest/some_spec.rb"
+      @rspec_autotest.instance_variable_set("@files", {@spec_file => Time.now})
+      @rspec_autotest.stub!(:find_files_to_test).and_return true
+    end
+  
+    it "should return no failures if no failures were given in the output" do
+      @rspec_autotest.consolidate_failures([[]]).should == {}
+    end
+  
+    it "should return a hash with the spec filename => spec name for each failure or error" do
+      @rspec_autotest.stub!(:test_files_for).and_return "spec/autotest/some_spec.rb"
+      failures = [
+        [
+          "false should be false", 
+          "expected: true,\n     got: false (using ==)\n#{@spec_file}:203:"
+        ]
+      ]
+      @rspec_autotest.consolidate_failures(failures).should == {
+        @spec_file => ["false should be false"]
+      }
+    end
+  
+    it "should not include the subject file" do
+      subject_file = "lib/autotest/some.rb"
+      @rspec_autotest.stub!(:test_files_for).and_return "spec/autotest/some_spec.rb"
+      failures = [
+        [
+          "false should be false", 
+          "expected: true,\n     got: false (using ==)\n#{subject_file}:143:\n#{@spec_file}:203:"
+        ]
+      ]
+      @rspec_autotest.consolidate_failures(failures).keys.should_not include(subject_file)
+    end
+  end
+  
+  describe "normalizing file names" do
+    it "should ensure that a single file appears in files_to_test only once" do
+      @rspec_autotest = Autotest::Rspec2.new
+      @files_to_test = {}
+      ['filename.rb', './filename.rb', File.expand_path('filename.rb')].each do |file|
+        @files_to_test[file] = []
+      end
+      @rspec_autotest.normalize(@files_to_test).should have(1).file
+    end
+  end
+end

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

@@ -1,104 +1,44 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Rspec::Core::Formatters::BaseFormatter do
   
-  before do
-    @formatter = Rspec::Core::Formatters::BaseFormatter.new 
-  end
-
-  class HaveInterfaceMatcher
-    def initialize(method)
-      @method = method
-    end
-
-    attr_reader :object
-    attr_reader :method
-
-    def matches?(object)
-      @object = object
-      object.respond_to?(@method)
-    end
-
-    def with(arity)
-      WithArity.new(self, @method, arity)
-    end
-
-    class WithArity
-      def initialize(matcher, method, arity)
-        @have_matcher = matcher
-        @method = method
-        @arity  = arity
-      end
-
-      def matches?(an_object)
-        @have_matcher.matches?(an_object) && real_arity == @arity
-      end
-
-      def failure_message
-        "#{@have_matcher} should have method :#{@method} with #{argument_arity}, but it had #{real_arity}"
-      end
-
-      def arguments
-        self
-      end
-
-      alias_method :argument, :arguments
-
-      private
-
-      def real_arity
-        @have_matcher.object.method(@method).arity
-      end
-
-      def argument_arity
-        if @arity == 1
-          "1 argument"
-        else
-          "#{@arity} arguments"
-        end
-      end
-    end
-  end
-
-  def have_interface_for(method)
-    HaveInterfaceMatcher.new(method)
-  end
+  let(:formatter) { Rspec::Core::Formatters::BaseFormatter.new }
 
-  it "should have start as an interface with one argument" do
-    @formatter.should have_interface_for(:start).with(1).argument
+  it "has start as an interface with one argument" do
+    formatter.should have_interface_for(:start).with(1).argument
   end
 
-  it "should have add_example_group as an interface with one argument" do
-    @formatter.should have_interface_for(:add_example_group).with(1).argument
+  it "has add_example_group as an interface with one argument" do
+    formatter.should have_interface_for(:add_example_group).with(1).argument
   end
 
-  it "should have example_finished as an interface with one argument" do
-    @formatter.should have_interface_for(:example_finished).with(1).arguments
+  it "has example_finished as an interface with one argument" do
+    formatter.should have_interface_for(:example_finished).with(1).arguments
   end
 
-  it "should have start_dump as an interface with 1 arguments" do
-    @formatter.should have_interface_for(:start_dump).with(1).arguments
+  it "has start_dump as an interface with 1 arguments" do
+    formatter.should have_interface_for(:start_dump).with(1).arguments
   end
 
-  it "should have dump_failures as an interface with no arguments" do
-    @formatter.should have_interface_for(:dump_failures).with(0).arguments
+  it "has dump_failures as an interface with no arguments" do
+    formatter.should have_interface_for(:dump_failures).with(0).arguments
   end
 
-  it "should have dump_summary as an interface with zero arguments" do
-    @formatter.should have_interface_for(:dump_summary).with(0).arguments
+  it "has dump_summary as an interface with zero arguments" do
+    formatter.should have_interface_for(:dump_summary).with(0).arguments
   end
 
-  it "should have dump_pending as an interface with zero arguments" do
-    @formatter.should have_interface_for(:dump_pending).with(0).arguments
+  it "has dump_pending as an interface with zero arguments" do
+    formatter.should have_interface_for(:dump_pending).with(0).arguments
   end
 
-  it "should have close as an interface with zero arguments" do
-    @formatter.should have_interface_for(:close).with(0).arguments
+  it "has close as an interface with zero arguments" do
+    formatter.should have_interface_for(:close).with(0).arguments
   end
   
   describe '#format_backtrace' do
     
-    it "should display the full backtrace when the example is given the :full_backtrace => true option", :full_backtrace => true
+    it "displays the full backtrace when the example is given the :full_backtrace => true option", :full_backtrace => true
     
   end
   

data/spec/rspec/core/runner_spec.rb

@@ -5,7 +5,7 @@ describe Rspec::Core::Runner do
   describe 'reporter' do
 
     it 'should return the configured formatter' do
-      Rspec::Core::Runner.new.reporter.should == Rspec::Core.configuration.formatter
+      Rspec::Core::Runner.new.reporter.should == Rspec.configuration.formatter
     end
 
   end  

data/spec/rspec/core/shared_example_group_spec.rb

@@ -65,7 +65,14 @@ module Rspec::Core
         group.singleton_methods.should include(:class_helper)
       end
 
-      it "should raise when named shared example_group can not be found" 
+      it "raises when named shared example_group can not be found" do
+        cleanup_shared_example_groups do
+          group = ExampleGroup.create("example_group")
+          lambda do
+            group.it_should_behave_like("a group that does not exist")
+          end.should raise_error(/Could not find shared example group named/)
+        end
+      end
 
       it "adds examples to current example_group using it_should_behave_like" do
         cleanup_shared_example_groups do
@@ -142,35 +149,70 @@ module Rspec::Core
         share_examples_for("it runs shared examples") do
           include RunningSharedExamplesJustForTesting
 
+          class << self
+            def magic
+              $magic ||= {}
+            end
+
+            def count(scope)
+              @counters ||= {
+                :before_all  => 0,
+                :before_each => 0,
+                :after_each  => 0,
+                :after_all   => 0
+              }
+              @counters[scope] += 1
+            end
+          end
+
           def magic
-            @magic ||= {}
+            $magic ||= {}
+          end
+
+          def count(scope)
+            self.class.count(scope)
           end
 
-          before(:each) { magic[:before_each] = 'each' }
-          after(:each)  { magic[:after_each] = 'each' }
-          before(:all)  { magic[:before_all] = 'all' }
+          before(:all)  { magic[:before_all]  = "before all #{count(:before_all)}" }
+          before(:each) { magic[:before_each] = "before each #{count(:before_each)}" }
+          after(:each)  { magic[:after_each]  = "after each #{count(:after_each)}" }
+          after(:all)   { magic[:after_all]   = "after all #{count(:after_all)}" }
         end
 
-        it_should_behave_like "it runs shared examples"
+        let(:group) do
+          group = ExampleGroup.create("example group") do
+            it_should_behave_like "it runs shared examples"
+            it "has one example" do; end
+            it "has another example" do; end
+          end
+        end
+
+        before { group.run(stub('reporter').as_null_object) }
+
+        it "runs before(:all) only once from shared example_group", :compat => 'rspec-1.2' do
+          group.magic[:before_all].should eq("before all 1")
+        end
 
         it "runs before(:each) from shared example_group", :compat => 'rspec-1.2' do
-          magic[:before_each].should == 'each'
+          group.magic[:before_each].should eq("before each 2")
         end
 
-        it "runs after(:each) from shared example_group", :compat => 'rspec-1.2' 
+        it "runs after(:each) from shared example_group", :compat => 'rspec-1.2' do
+          group.magic[:after_each].should eq("after each 2")
+        end
 
-        it "should run before(:all) only once from shared example_group", :compat => 'rspec-1.2' do
-          magic[:before_all].should == 'all'
+        it "runs after(:all) only once from shared example_group", :compat => 'rspec-1.2' do
+          group.magic[:after_all].should eq("after all 1")
         end
 
-        it "should run after(:all) only once from shared example_group", :compat => 'rspec-1.2' 
+        it_should_behave_like "it runs shared examples"
 
-        it "should include modules, included into shared example_group, into current example_group", :compat => 'rspec-1.2' do
+        it "includes modules, included into shared example_group, into current example_group", :compat => 'rspec-1.2' do
           running_example.example_group.included_modules.should include(RunningSharedExamplesJustForTesting)
         end
 
-        it "should make methods defined in the shared example_group available in consuming example_group", :compat => 'rspec-1.2' do
-          magic.should be_a(Hash)
+        it "makes methods defined in the shared example_group available in consuming example_group", :compat => 'rspec-1.2' do
+          group.magic.should be_a(Hash)
         end
 
       end

data/spec/rspec/core_spec.rb

@@ -4,17 +4,21 @@ describe Rspec::Core do
 
   describe "#configuration" do
     
-    it "should return an instance of Rspec::Core::Configuration" do
-      Rspec::Core.configuration.should be_an_instance_of(Rspec::Core::Configuration)
+    it "returns an instance of Rspec::Core::Configuration" do
+      Rspec.configuration.should be_an_instance_of(Rspec::Core::Configuration)
     end
-    
+
+    it "returns the same object every time" do
+      Rspec.configuration.should equal(Rspec.configuration)
+    end
+
   end
   
   describe "#configure" do
     
     it "should yield the current configuration" do
       Rspec.configure do |config|
-        config.should == Rspec::Core.configuration
+        config.should == Rspec::configuration
       end
     end
     

data/spec/spec_helper.rb

@@ -6,8 +6,18 @@ $LOAD_PATH << File.expand_path('../../../rspec-mocks/lib', __FILE__)
 require 'rspec/expectations'
 require 'rspec/mocks'
 
+begin
+  require 'autotest'
+rescue LoadError
+  raise "You must install ZenTest to use autotest"
+end
+
+require 'autotest/rspec2'
+
 Rspec::Core::ExampleGroup.send(:include, Rspec::Matchers)
 
+Dir['./spec/support/**/*.rb'].map {|f| require f}
+
 module Rspec
   module Core
     module Matchers
@@ -23,11 +33,11 @@ module Rspec
 end
 
 def use_formatter(new_formatter)
-  original_formatter = Rspec::Core.configuration.formatter
-  Rspec::Core.configuration.instance_variable_set(:@formatter, new_formatter)
+  original_formatter = Rspec.configuration.formatter
+  Rspec.configuration.instance_variable_set(:@formatter, new_formatter)
   yield
 ensure
-  Rspec::Core.configuration.instance_variable_set(:@formatter, original_formatter)
+  Rspec.configuration.instance_variable_set(:@formatter, original_formatter)
 end
 
 def in_editor?

data/spec/support/matchers.rb

@@ -0,0 +1,44 @@
+Rspec::Matchers.define :map_specs do |specs|
+  match do |autotest|
+    @specs = specs
+    @autotest = prepare(autotest)
+    autotest.test_files_for(@file) == specs
+  end
+
+  chain :to do |file|
+    @file = file
+  end
+
+  failure_message_for_should do
+    "expected #{@autotest.class} to map #{@specs.inspect} to #{@file.inspect}\ngot #{@actual.inspect}"
+  end
+
+  def prepare(autotest)
+    find_order = @specs.dup << @file
+    autotest.instance_eval { @find_order = find_order }
+    autotest
+  end
+end
+
+Rspec::Matchers.define :have_interface_for do |method|
+  match do |object|
+    @method = method
+    @object = object
+    object.respond_to?(method) && actual_arity == @expected_arity
+  end
+
+  chain :with do |arity|
+    @expected_arity = arity
+  end
+
+  chain(:argument) {}
+  chain(:arguments) {}
+
+  failure_message_for_should do
+    "#{@object} should have method :#{@method} with #{@expected_arity} argument(s), but it had #{actual_arity}"
+  end
+
+  def actual_arity
+    @object.method(@method).arity
+  end
+end