rspec-core 2.0.0.beta.22 → 2.6.0

data/rspec-core.gemspec

@@ -7,39 +7,18 @@ Gem::Specification.new do |s|
   s.version     = RSpec::Core::Version::STRING
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Chad Humphries", "David Chelimsky"]
-  s.email       = "dchelimsky@gmail.com;chad.humphries@gmail.com"
-  s.homepage    = "http://github.com/rspec/rspec-core"
+  s.email       = "rspec-users@rubyforge.org;"
+  s.homepage    = "http://github.com/rspec"
   s.summary     = "rspec-core-#{RSpec::Core::Version::STRING}"
-  s.description = "RSpec runner and example groups"
+  s.description = "BDD for Ruby. RSpec runner and example groups."
 
-  s.rubygems_version   = "1.3.7"
   s.rubyforge_project  = "rspec"
-  s.default_executable = "rspec"
 
   s.files            = `git ls-files`.split("\n")
   s.test_files       = `git ls-files -- {spec,features}/*`.split("\n")
   s.executables      = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.extra_rdoc_files = [ "README.markdown" ]
+  s.extra_rdoc_files = [ "README.md" ]
   s.rdoc_options     = ["--charset=UTF-8"]
   s.require_path     = "lib"
-
-  s.post_install_message = %Q{**************************************************
-
-  Thank you for installing #{s.summary}
-
-  Please be sure to look at Upgrade.markdown to see what might have changed
-  since the last release.
-
-**************************************************
-}
-
-  s.add_development_dependency "rspec-expectations", ">= #{RSpec::Core::Version::STRING}"
-  s.add_development_dependency "rspec-mocks",        ">= #{RSpec::Core::Version::STRING}"
-  s.add_development_dependency "cucumber",           ">= 0.5.3"
-  s.add_development_dependency "autotest",           ">= 4.2.9"
-  s.add_development_dependency "syntax",             ">= 1.0.0"
-  s.add_development_dependency "flexmock"
-  s.add_development_dependency "mocha"
-  s.add_development_dependency "rr"
 end
 

data/script/FullBuildRakeFile

@@ -0,0 +1,63 @@
+# this is in a separate rakefile because our main one depends on the bundled gems
+# already being installed.  This must be able to run w/o bundled gems installed.
+
+def rake(command = "")
+  sh "rake #{command}"
+end
+
+desc "Run a full build: install necessary gems with bundler, runs specs, run cukes"
+task :build => :bundle_install do
+  rake
+end
+
+desc "Install necessary gems with bundler and runs specs"
+task :spec => :bundle_install do
+  rake "spec"
+end
+
+desc "Install necessary gems with bundler and runs cukes"
+task :cucumber => :bundle_install do
+  rake "cucumber"
+end
+
+desc "Prints description of current ruby interpreter"
+task :print_ruby_description do
+  description = if defined?(RUBY_DESCRIPTION)
+    RUBY_DESCRIPTION
+  else
+    # RUBY_DESCRIPTION is undefined on 1.8.6
+    "ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE} patchlevel #{RUBY_PATCHLEVEL}) [#{RUBY_PLATFORM}]"
+  end
+
+  puts
+  puts "=" * 80
+  puts "Using #{description}"
+  puts "=" * 80
+  puts
+end
+
+task :bundle_install => :ensure_bundler_installed do
+  # Unfortunately, there is no version of ruby-debug that installs cleanly on 1.9.1 and 1.9.2.
+  # Our Gemfile specifies different versions using conditionals, but we still need to bundle update
+  # to get bundler to use the different versions.
+  if RUBY_VERSION =~ /^1\.9/
+    sh "bundle update ruby-debug-base19"
+  end
+
+  sh "bundle install"
+end
+
+task :ensure_bundler_installed => :print_ruby_description do
+  installed = begin
+    require 'rubygems'
+    require 'bundler'
+    true
+  rescue LoadError
+    false
+  end
+
+  unless installed
+    sh "gem install bundler"
+  end
+end
+

data/script/cucumber

@@ -0,0 +1 @@
+rvm 1.8.6,1.8.7,ree,1.9.1,1.9.2,jruby rake -f script/FullBuildRakeFile cucumber | tee tmp/cucumber.out

data/script/full_build

@@ -0,0 +1 @@
+rvm 1.8.6,1.8.7,ree,1.9.1,1.9.2,jruby rake -f script/FullBuildRakeFile build | tee tmp/full_build.out

data/script/spec

@@ -0,0 +1 @@
+rvm 1.8.6,1.8.7,ree,1.9.1,1.9.2,jruby rake -f script/FullBuildRakeFile spec | tee tmp/spec.out

data/spec/autotest/discover_spec.rb

@@ -0,0 +1,19 @@
+require "spec_helper"
+
+describe "autotest/discover.rb" do
+  context "with /.rspec present" do
+    it "adds 'rspec2' to the list of discoveries" do
+      File.stub(:exist?).with("./.rspec") { true }
+      Autotest.should_receive(:add_discovery)
+      load File.expand_path("../../../lib/autotest/discover.rb", __FILE__)
+    end
+  end
+
+  context "with /.rspec absent" do
+    it "does not add 'rspec2' to the list of discoveries" do
+      File.stub(:exist?) { false }
+      Autotest.should_not_receive(:add_discovery)
+      load File.expand_path("../../../lib/autotest/discover.rb", __FILE__)
+    end
+  end
+end

data/spec/autotest/failed_results_re_spec.rb

@@ -5,17 +5,33 @@ describe "failed_results_re for autotest" do
   let(:formatter) { RSpec::Core::Formatters::BaseTextFormatter.new(output) }
   let(:example_output) do
     group = RSpec::Core::ExampleGroup.describe("group name")
-    example = group.example("example name") { "this".should eq("that") }
-    group.run_all(formatter)
-    RSpec.configuration.stub(:color_enabled?) { false }
+    group.example("example name") { "this".should eq("that") }
+    group.run(formatter)
     formatter.dump_failures
     output.string
   end
-  
-  it "should match a failure" do
-    re = Autotest::Rspec2.new.failed_results_re
-    re =~ example_output
-    $1.should == "group name example name\n     Failure/Error: example = group.example(\"example name\") { \"this\".should eq(\"that\") }"
-    $2.should == __FILE__.sub(File.expand_path('.'),'.')
+
+  context "output does not have color enabled" do
+    before do
+      RSpec.configuration.stub(:color_enabled?) { false }
+    end
+
+    it "matches a failure" do
+      re = Autotest::Rspec2.new.failed_results_re
+      example_output.should =~ re
+      example_output.should include(__FILE__.sub(File.expand_path('.'),'.'))
+    end
+  end
+
+  context "output has color enabled" do
+    before do
+      RSpec.configuration.stub(:color_enabled?) { true }
+    end
+
+    it "matches a failure" do
+      re = Autotest::Rspec2.new.failed_results_re
+      example_output.should =~ re
+      example_output.should include(__FILE__.sub(File.expand_path('.'),'.'))
+    end
   end
 end

data/spec/autotest/rspec_spec.rb

@@ -5,6 +5,16 @@ describe Autotest::Rspec2 do
   let(:spec_cmd) { File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin', 'rspec')) }
   let(:ruby_cmd) { "ruby" }
 
+  before do
+    File.stub(:exist?) { false }
+  end
+
+  it "uses autotest's prefix" do
+    rspec_autotest.prefix = "this is the prefix "
+    rspec_autotest.
+      make_test_cmd({'a' => 'b'}).should match(/this is the prefix/)
+  end
+
   describe "commands" do
     before do
       rspec_autotest.stub(:ruby => ruby_cmd)
@@ -39,6 +49,12 @@ describe Autotest::Rspec2 do
         cmd.should match(/'#{File.expand_path(file_to_test)}'/)
       end
     end
+
+    it "gives '--tty' to #{Autotest::Rspec2::SPEC_PROGRAM}, not '--autotest'" do
+      cmd = rspec_autotest.make_test_cmd(@files_to_test)
+      cmd.should match(' --tty ')
+      cmd.should_not match(' --autotest ')
+    end
   end
 
   describe "mappings" do
@@ -66,39 +82,32 @@ describe Autotest::Rspec2 do
   end
 
   describe "consolidating failures" do
-    before do
-      @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
+    let(:subject_file) { "lib/autotest/some.rb" }
+    let(:spec_file)    { "spec/autotest/some_spec.rb" }
 
     it "returns no failures if no failures were given in the output" do
       rspec_autotest.consolidate_failures([[]]).should == {}
     end
 
     it "returns 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",
-          "#{@spec_file}"
-        ]
-      ]
+      failures = [ [ "false should be false", spec_file ] ]
       rspec_autotest.consolidate_failures(failures).should == {
-        @spec_file => ["false should be false"]
+        spec_file => ["false should be false"]
       }
     end
 
-    it "does 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)
+    context "when subject file appears before the spec file in the backtrace" do
+      let(:failures) do
+        [ [ "false should be false", "#{subject_file}:143:\n#{spec_file}:203:" ] ]
+      end
+
+      it "excludes the subject file" do
+        rspec_autotest.consolidate_failures(failures).keys.should_not include(subject_file)
+      end
+
+      it "includes the spec file" do
+        rspec_autotest.consolidate_failures(failures).keys.should include(spec_file)
+      end
     end
   end
 
@@ -111,22 +120,4 @@ describe Autotest::Rspec2 do
       rspec_autotest.normalize(@files_to_test).should have(1).file
     end
   end
-
-  describe "ruby command" do
-    context "using bundler" do
-      it "returns 'bundle exec'" do
-        File.stub(:exists?).with("./Gemfile") { true }
-        rspec_autotest.ruby.should eq("bundle exec")
-      end
-    end
-
-    context "not using bundler" do
-      it "returns the ruby command generated by Autotest" do
-        autotest = Autotest.new
-        autotest_ruby_command = autotest.ruby
-        File.stub(:exists?).with("./Gemfile") { false }
-        rspec_autotest.ruby.should eq(autotest_ruby_command)
-      end
-    end
-  end
 end

data/spec/rspec/core/command_line_spec.rb

@@ -4,6 +4,42 @@ require 'tmpdir'
 
 module RSpec::Core
   describe CommandLine do
+
+    describe "#run" do
+      include_context "spec files"
+
+      let(:out)    { StringIO.new }
+      let(:err)    { StringIO.new }
+
+      def config_options(argv=[])
+        options = RSpec::Core::ConfigurationOptions.new(argv)
+        options.parse_options
+        options
+      end
+
+      def command_line(args)
+        RSpec::Core::CommandLine.new(config_options(args))
+      end
+
+      def config_options(argv=[])
+        options = RSpec::Core::ConfigurationOptions.new(argv)
+        options.parse_options
+        options
+      end
+
+      it "returns 0 if spec passes" do
+        err, out = StringIO.new, StringIO.new
+        result = command_line([passing_spec_filename]).run(err, out)
+        result.should be(0)
+      end
+
+      it "returns 1 if spec passes" do
+        err, out = StringIO.new, StringIO.new
+        result = command_line([failing_spec_filename]).run(err, out)
+        result.should be(1)
+      end
+    end
+
     context "given an Array of options" do
       it "assigns ConfigurationOptions built from Array to @options" do
         config_options = ConfigurationOptions.new(%w[--color])
@@ -31,28 +67,46 @@ module RSpec::Core
         config_options
       end
 
-      let(:command_line) do
-        CommandLine.new(config_options, config)
-      end
-
       let(:config) do
         RSpec::Core::Configuration.new
       end
 
+      let(:world) do
+        RSpec::Core::World.new
+      end
+
+      let(:command_line) do
+        CommandLine.new(config_options, config, world)
+      end
+
       let(:out) { ::StringIO.new }
+      let(:err) { ::StringIO.new }
 
       before do
         config.stub(:run_hook)
+
+        config.should_receive(:load_spec_files)
+
+        world.should_receive(:announce_inclusion_filter)
+        world.should_receive(:announce_exclusion_filter)
+      end
+
+      it "configures streams before command line options" do
+        # this is necessary to ensure that color works correctly on windows
+        config.should_receive(:error_stream=).ordered
+        config.should_receive(:output_stream=).ordered
+        config.should_receive(:color_enabled=).ordered
+        command_line.run(err, out) rescue nil
       end
 
       it "runs before suite hooks" do
         config.should_receive(:run_hook).with(:before, :suite)
-        command_line.run(out, out)
+        command_line.run(err, out)
       end
 
       it "runs after suite hooks" do
         config.should_receive(:run_hook).with(:after, :suite)
-        command_line.run(out, out)
+        command_line.run(err, out)
       end
 
       it "runs after suite hooks even after an error" do
@@ -66,10 +120,11 @@ module RSpec::Core
           end
         end
         expect do
-          command_line.run(out, out)
+          command_line.run(err, out)
         end.to raise_error
         after_suite_called.should be_true
       end
+
     end
 
     describe "#run with custom output" do