rspec 1.1.2 → 1.1.3

data/pre_commit/spec/pre_commit/pre_commit_spec.rb

@@ -0,0 +1,15 @@
+require File.dirname(__FILE__) + '/../spec_helper.rb'
+
+##
+# This is not a complete specification of PreCommit, but 
+# just a collection of bug fix regression tests.
+describe "The helper method PreCommit#silent_sh" do
+  before do
+    @pre_commit = PreCommit.new(nil)
+  end
+
+  # bug in r1802
+  it "should return the command output" do
+    @pre_commit.send(:silent_sh, "echo foo").should ==("foo\n")
+  end
+end

data/pre_commit/spec/pre_commit/rspec_on_rails_spec.rb

@@ -0,0 +1,36 @@
+require File.dirname(__FILE__) + '/../spec_helper.rb'
+require 'fileutils'
+
+include FileUtils
+
+##
+# This is not a complete specification of PreCommit.RSpecOnRails, but 
+# just a collection of bug fix regression tests.
+describe "RSpecOnRails pre_commit" do
+  before do
+    @original_dir = File.expand_path(FileUtils.pwd)
+    @rails_app_dir = File.expand_path(File.dirname(__FILE__) + "/../../../example_rails_app/")
+
+    Dir.chdir(@rails_app_dir)
+    rm_rf('vendor/plugins/rspec_on_rails')
+    system("svn export ../rspec_on_rails vendor/plugins/rspec_on_rails")
+
+    @pre_commit = PreCommit::RspecOnRails.new(nil)
+  end
+
+  after do
+    rm('db/migrate/888_create_purchases.rb', :force => true)
+    @pre_commit.destroy_purchase
+    Dir.chdir(@original_dir)
+  end
+
+  # bug in r1802
+  it "should fail noisily if there is a migration name conflict" do
+    touch('db/migrate/888_create_purchases.rb')
+    lambda { @pre_commit.generate_purchase }.should raise_error
+  end
+
+  it "should not fail if tests run ok" do
+    lambda { @pre_commit.generate_purchase }.should_not raise_error
+  end
+end

data/pre_commit/spec/spec_helper.rb

@@ -0,0 +1,3 @@
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
+require 'pre_commit'
+

data/pre_commit/spec/spec_suite.rb

@@ -0,0 +1,11 @@
+class SpecSuite
+  def run
+    system("ruby rspec/spec/rspec_suite.rb") || raise("Rspec Suite FAILED")
+    system("ruby rspec_on_rails/spec/rails_suite.rb") || raise("Rails Suite FAILED")
+    system("ruby cached_example_rails_app/spec/rails_app_suite.rb") || raise("Rails App Suite FAILED")
+  end
+end
+
+if $0 == __FILE__
+  SpecSuite.new.run
+end

data/rake_tasks/examples.rake

@@ -0,0 +1,7 @@
+require 'rake'
+require 'spec/rake/spectask'
+
+desc "Run all examples"
+Spec::Rake::SpecTask.new('examples') do |t|
+  t.spec_files = FileList['examples/**/*.rb']
+end

data/rake_tasks/examples_with_rcov.rake

@@ -0,0 +1,9 @@
+require 'rake'
+require 'spec/rake/spectask'
+
+desc "Run all examples with RCov"
+Spec::Rake::SpecTask.new('examples_with_rcov') do |t|
+  t.spec_files = FileList['examples/**/*.rb']
+  t.rcov = true
+  t.rcov_opts = ['--exclude', 'examples']
+end

data/rake_tasks/failing_examples_with_html.rake

@@ -0,0 +1,9 @@
+require 'rake'
+require 'spec/rake/spectask'
+
+desc "Generate HTML report for failing examples"
+Spec::Rake::SpecTask.new('failing_examples_with_html') do |t|
+  t.spec_files = FileList['failing_examples/**/*.rb']
+  t.spec_opts = ["--format", "html:../doc/output/documentation/tools/failing_examples.html", "--diff"]
+  t.fail_on_error = false
+end

data/rake_tasks/verify_rcov.rake

@@ -0,0 +1,7 @@
+require 'rake'
+require 'spec/rake/verify_rcov'
+
+RCov::VerifyTask.new(:verify_rcov => :spec) do |t|
+  t.threshold = 100.0 # Make sure you have rcov 0.7 or higher!
+  t.index_html = '../doc/output/coverage/index.html'
+end

data/spec/README.jruby

@@ -0,0 +1,15 @@
+= Running specs on JRuby =
+
+svn co http://svn.codehaus.org/jruby/trunk jruby
+cd jruby/jruby
+ant clean
+ant
+# put JRuby's bin dir on your PATH
+jruby -S gem install rake --no-ri --no-rdoc
+jruby -S gem install diff-lcs
+jruby -S gem install syntax
+cd ../testsuites/rspec
+mkdir target
+jruby -S rake checkout_code
+cd target/rspec
+jruby bin/spec spec -c

data/spec/autotest/rspec_spec.rb

@@ -88,11 +88,10 @@ HERE
     end
     
     it "should use the ALT_SEPARATOR if it is non-nil" do
-      pending("autotest got re-worked so this is failing for the moment")
       @rspec_autotest = Rspec.new
       spec_command = File.expand_path("#{File.dirname(__FILE__)}/../../bin/spec")
       @rspec_autotest.stub!(:spec_commands).and_return [spec_command]
-      @rspec_autotest.spec_command.should == spec_command.gsub('/', '\\')
+      @rspec_autotest.spec_command(@windows_alt_separator).should == spec_command.gsub('/', @windows_alt_separator)
     end
     
     it "should not use the ALT_SEPATOR if it is nil" do
@@ -143,93 +142,25 @@ HERE
     end
   end
   
-  describe Rspec, "test mappings" do
-    before :each do
-      @rspec_autotest = Rspec.new
-      @rspec_autotest.hook :initialize
-    end
-      
-    it "should map all filenames in spec/ which end in .rb" do
-      @rspec_autotest.instance_eval{@test_mappings}.should have_key(%r%^spec/.*\.rb$%)
-    end
-    
-    it "should map all names in lib which end in .rb to the corresponding ones in spec/" do
-      @rspec_autotest.instance_eval{@test_mappings}.should have_key(%r%^lib/(.*)\.rb$%)
-    end
-    
-    it "should find all files in spec/shares/* and the spec helper in spec/spec_helper"  do
-      @rspec_autotest.instance_eval{@test_mappings}.should have_key(%r%^spec/(spec_helper|shared/.*)\.rb$%)
-    end
-  end
-  
-  describe Rspec, "handling results" do
-    include AutotestHelper
-    
-    before :each do
-      common_setup
-      @rspec_autotest = Rspec.new
-      @rspec_autotest.stub!(:hook)
-      
-      @results = mock String
-      @results.stub!(:scan).and_return ""
-    end
-    
-    it "should call hook(:red) if there are failures" do
-      @rspec_autotest.stub!(:consolidate_failures).and_return ["spec/some_spec.rb"]
-      
-      @rspec_autotest.should_receive(:hook).with(:red)
-      @rspec_autotest.handle_results(@results)
-    end
+  describe Rspec, "mappings" do
     
-    it "should call hook(:green) if there are no failures" do
-      @rspec_autotest.stub!(:consolidate_failures).and_return []
-      @rspec_autotest.should_receive(:hook).with(:green)
-      @rspec_autotest.handle_results(@results)
-    end
-  end
-  
-  describe Rspec, "handling failed results" do
-    include AutotestHelper
-    
-    before :each do
-      common_setup
-    end
-    
-    it %(should scan the output into a multi-dimensional array, 
-        consisting of the failing spec's name as the first element, 
-        and the failure as the second) do
-      @rspec_autotest = Rspec.new
-      @rspec_autotest.failed_results(@rspec_output).should == [
-        [
-          "false should be false", 
-          "expected: true,\n     got: false (using ==)\n./spec/autotest/rspec_spec.rb:203:"
-        ]
-      ]
-    end
-  end
-  
-  describe Rspec, "specs for a given file" do
-    before :each do
+    before(:each) do
       @lib_file = "lib/something.rb"
       @spec_file = "spec/something_spec.rb"
       @rspec_autotest = Rspec.new
       @rspec_autotest.hook :initialize
-
-      @rspec_autotest.instance_variable_set("@files", {@lib_file => Time.now, @spec_file => Time.now})
-      @rspec_autotest.stub!(:find_files_to_test).and_return true
     end
     
     it "should find the spec file for a given lib file" do
-      @rspec_autotest.specs_for_file(@lib_file).should == [@spec_file]
+      @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.specs_for_file(@spec_file).should == [@spec_file]
+      @rspec_autotest.should map_specs([@spec_file]).to(@spec_file)
     end
     
     it "should only find the file if the file is being tracked (in @file)"  do
-      @other_file = "lib/some_non_tracked_file"
-      @rspec_autotest.specs_for_file(@other_file).should == []
+      @rspec_autotest.should map_specs([]).to("lib/untracked_file")
     end
   end
   
@@ -246,18 +177,18 @@ HERE
     end
     
     it "should return no failures if no failures were given in the output" do
-      @rspec_autotest.stub!(:failed_results).and_return [[]]
-      @rspec_autotest.consolidate_failures(@rspec_autotest.failed_results).should == {}
+      @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!(:failed_results).and_return([
+      @rspec_autotest.stub!(:test_files_for).and_return "./spec/autotest/rspec_spec.rb"
+      foo = [
         [
           "false should be false", 
           "expected: true,\n     got: false (using ==)\n./spec/autotest/rspec_spec.rb:203:"
         ]
-      ])
-      @rspec_autotest.consolidate_failures(@rspec_autotest.failed_results).should == {@spec_file => ["false should be false"]}
+      ]
+      @rspec_autotest.consolidate_failures(foo).should == {@spec_file => ["false should be false"]}
     end
     
   end

data/spec/autotest_helper.rb

@@ -2,4 +2,5 @@ require "rubygems"
 require 'autotest'
 dir = File.dirname(__FILE__)
 require "#{dir}/spec_helper"
-require File.expand_path("#{dir}/../lib/autotest/rspec")
+require File.expand_path("#{dir}/../lib/autotest/rspec")
+require "#{dir}/autotest_matchers"

data/spec/autotest_matchers.rb

@@ -0,0 +1,47 @@
+module Spec
+  module Matchers
+    class AutotestMappingMatcher
+      def initialize(specs)
+        @specs = specs
+      end
+  
+      def to(file)
+        @file = file
+        self
+      end
+  
+      def matches?(autotest)
+        @autotest = prepare autotest
+        @actual = autotest.test_files_for(@file)
+        @actual == @specs
+      end
+  
+      def failure_message
+        "expected #{@autotest.class} to map #{@specs.inspect} to #{@file.inspect}\ngot #{@actual.inspect}"
+      end
+  
+      private
+      def prepare autotest
+        stub_found_files autotest
+        stub_find_order autotest
+        autotest
+      end
+  
+      def stub_found_files autotest
+        found_files = @specs.inject({}){|h,f| h[f] = Time.at(0)}
+        autotest.stub!(:find_files).and_return(found_files)
+      end
+
+      def stub_find_order autotest
+        find_order = @specs.dup << @file
+        autotest.instance_eval { @find_order = find_order }
+      end
+
+    end
+    
+    def map_specs(specs)
+      AutotestMappingMatcher.new(specs)
+    end
+    
+  end
+end

data/spec/rspec_suite.rb

@@ -1,6 +1,6 @@
 if __FILE__ == $0
   dir = File.dirname(__FILE__)
-  Dir["#{dir}/**/*_spec.rb"].each do |file|
+  Dir["#{dir}/**/*_spec.rb"].reverse.each do |file|
 #    puts "require '#{file}'"
     require file
   end

data/spec/spec.opts

@@ -0,0 +1,6 @@
+--colour
+--format
+profile
+--timeout
+20
+--diff

data/spec/spec/example/example_group_methods_spec.rb

@@ -459,14 +459,16 @@ module Spec
 
       describe '#register' do
         it "should add ExampleGroup to set of ExampleGroups to be run" do
-          example_group.register
+          options.example_groups.delete(example_group)
+          options.example_groups.should_not include(example_group)
+          
+          example_group.register {}
           options.example_groups.should include(example_group)
         end
       end
 
       describe '#unregister' do
         before do
-          example_group.register
           options.example_groups.should include(example_group)
         end
 
@@ -475,6 +477,13 @@ module Spec
           options.example_groups.should_not include(example_group)
         end
       end
+
+      describe "#registration_backtrace" do
+        it "returns the backtrace of where the ExampleGroup was registered" do
+          example_group = Class.new(ExampleGroup)
+          example_group.registration_backtrace.join("\n").should include("#{__FILE__}:#{__LINE__-1}")
+        end
+      end
     end
   end
 end

data/spec/spec/example/example_methods_spec.rb

@@ -14,76 +14,89 @@ module Spec
       end
     end
 
-    describe "ExampleMethods with an included module that is reopened" do
-      it "should have repoened methods" do
-        method(:module_that_is_reopened_method).should_not be_nil
-      end
-    end
-
-    describe ExampleMethods, "lifecycle" do
-      before do
-        @options = ::Spec::Runner::Options.new(StringIO.new, StringIO.new)
-        @options.formatters << mock("formatter", :null_object => true)
-        @options.backtrace_tweaker = mock("backtrace_tweaker", :null_object => true)
-        @reporter = FakeReporter.new(@options)
-        @options.reporter = @reporter
-
-        ExampleMethods.before_all_parts.should == []
-        ExampleMethods.before_each_parts.should == []
-        ExampleMethods.after_each_parts.should == []
-        ExampleMethods.after_all_parts.should == []
-        def ExampleMethods.count
-          @count ||= 0
-          @count = @count + 1
-          @count
+    describe ExampleMethods do
+      describe "with an included module that is reopened" do
+        it "should have repoened methods" do
+          method(:module_that_is_reopened_method).should_not be_nil
         end
       end
 
-      after do
-        ExampleMethods.instance_variable_set("@before_all_parts", [])
-        ExampleMethods.instance_variable_set("@before_each_parts", [])
-        ExampleMethods.instance_variable_set("@after_each_parts", [])
-        ExampleMethods.instance_variable_set("@after_all_parts", [])
-      end
+      describe "lifecycle" do
+        before do
+          @options = ::Spec::Runner::Options.new(StringIO.new, StringIO.new)
+          @options.formatters << mock("formatter", :null_object => true)
+          @options.backtrace_tweaker = mock("backtrace_tweaker", :null_object => true)
+          @reporter = FakeReporter.new(@options)
+          @options.reporter = @reporter
 
-      it "should pass before and after callbacks to all ExampleGroup subclasses" do
-        ExampleMethods.before(:all) do
-          ExampleMethods.count.should == 1
+          ExampleMethods.before_all_parts.should == []
+          ExampleMethods.before_each_parts.should == []
+          ExampleMethods.after_each_parts.should == []
+          ExampleMethods.after_all_parts.should == []
+          def ExampleMethods.count
+            @count ||= 0
+            @count = @count + 1
+            @count
+          end
         end
 
-        ExampleMethods.before(:each) do
-          ExampleMethods.count.should == 2
+        after do
+          ExampleMethods.instance_variable_set("@before_all_parts", [])
+          ExampleMethods.instance_variable_set("@before_each_parts", [])
+          ExampleMethods.instance_variable_set("@after_each_parts", [])
+          ExampleMethods.instance_variable_set("@after_all_parts", [])
         end
 
-        ExampleMethods.after(:each) do
-          ExampleMethods.count.should == 3
-        end
+        it "should pass before and after callbacks to all ExampleGroup subclasses" do
+          ExampleMethods.before(:all) do
+            ExampleMethods.count.should == 1
+          end
+
+          ExampleMethods.before(:each) do
+            ExampleMethods.count.should == 2
+          end
+
+          ExampleMethods.after(:each) do
+            ExampleMethods.count.should == 3
+          end
 
-        ExampleMethods.after(:all) do
-          ExampleMethods.count.should == 4
+          ExampleMethods.after(:all) do
+            ExampleMethods.count.should == 4
+          end
+
+          @example_group = Class.new(ExampleGroup) do
+            it "should use ExampleMethods callbacks" do
+            end
+          end
+          @example_group.run
+          ExampleMethods.count.should == 5
         end
 
-        @example_group = Class.new(ExampleGroup) do
-          it "should use ExampleMethods callbacks" do
+        describe "run_with_description_capturing" do
+          before(:each) do
+            @example_group = Class.new(ExampleGroup) do end
+            @example = @example_group.new("foo", &(lambda { 2.should == 2 }))
+            @example.run_with_description_capturing
+          end
+
+          it "should provide the generated description" do
+            @example.instance_eval { @_matcher_description }.should == "should == 2"
+          end
+
+          it "should clear the global generated_description" do
+            Spec::Matchers.generated_description.should == nil
           end
         end
-        @example_group.run
-        ExampleMethods.count.should == 5
       end
-      
-      describe "run_with_description_capturing" do
-        before(:each) do
-          @example_group = Class.new(ExampleGroup) do end
-          @example = @example_group.new("foo", &(lambda { 2.should == 2 }))
-          @example.run_with_description_capturing
-        end
-      
-        it "should provide the generated description" do
-          @example.instance_eval { @_matcher_description }.should == "should == 2"
-        end
-      
-        it "should clear the global generated_description" do
-          Spec::Matchers.generated_description.should == nil
+
+      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
+            end
+          end
+          example = example_group.examples.first
+          example.implementation_backtrace.join("\n").should include("#{__FILE__}:#{__LINE__-4}")
         end
       end
     end