rspec-core 2.4.0 → 2.5.0

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/failed_results_re_spec.rb

@@ -7,14 +7,31 @@ describe "failed_results_re for autotest" do
     group = RSpec::Core::ExampleGroup.describe("group name")
     group.example("example name") { "this".should eq("that") }
     group.run(formatter)
-    RSpec.configuration.stub(:color_enabled?) { false }
     formatter.dump_failures
     output.string
   end
 
-  it "matches a failure" do
-    re = Autotest::Rspec2.new.failed_results_re
-    example_output.should =~ re
-    example_output[re, 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[re, 2].should == __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[re, 2].should == __FILE__.sub(File.expand_path('.'),'.')
+    end
   end
 end

data/spec/autotest/rspec_spec.rb

@@ -5,6 +5,138 @@ describe Autotest::Rspec2 do
   let(:spec_cmd) { File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin', 'rspec')) }
   let(:ruby_cmd) { "ruby" }
 
+  before do
+    RSpec.stub(:warn_deprecation)
+    File.stub(:exist?) { false }
+    @orig_argv = ARGV.dup; ARGV.clear
+  end
+
+  after  { ARGV.clear; ARGV.concat(@orig_argv) }
+
+  context "with ARGV" do
+    it "passes ARGV to command" do
+      ARGV.concat(%w[-c -f d])
+      rspec_autotest.cl_args.should eq(%w[-c -f d --tty])
+    end
+
+    context "with --skip-bundler" do
+      before do
+        ARGV.concat(%w[--skip-bundler])
+      end
+      it "extracts --skip-bundler" do
+        rspec_autotest.cl_args.should eq(%w[--tty])
+      end
+
+      it "sets skip_bundler? true" do
+        rspec_autotest.skip_bundler?.should be_true
+      end
+    end
+  end
+
+  describe "handling bundler" do
+    context "gemfile, no prefix" do
+      before do
+        File.stub(:exist?).with("./Gemfile") { true }
+      end
+
+      it "warns of deprecation of implicit inclusion of 'bundle exec'" do
+        RSpec.should_receive(:warn_deprecation)
+        rspec_autotest.make_test_cmd({})
+      end
+
+      it "includes bundle exec" do
+        rspec_autotest.
+          make_test_cmd({'a' => 'b'}).should match(/bundle exec/)
+      end
+    end
+
+    context "gemfile, no prefix, --skip-bundler" do
+      before do
+        File.stub(:exist?).with("./Gemfile") { true }
+        ARGV.concat(%w[--skip-bundler])
+      end
+
+      it "does not warn" do
+        RSpec.should_not_receive(:warn_deprecation)
+        rspec_autotest.make_test_cmd({})
+      end
+
+      it "does not include bundle exec" do
+        rspec_autotest.
+          make_test_cmd({'a' => 'b'}).should_not match(/bundle exec/)
+      end
+    end
+
+    context "no gemfile, prefix" do
+      before do
+        File.stub(:exist?).with("./Gemfile") { false }
+      end
+
+      it "does not warn" do
+        RSpec.should_not_receive(:warn_deprecation)
+        rspec_autotest.make_test_cmd({'a' => 'b'})
+      end
+
+      it "includes bundle exec" do
+        rspec_autotest.prefix = "bundle exec "
+        rspec_autotest.
+          make_test_cmd({'a' => 'b'}).should match(/bundle exec/)
+      end
+    end
+
+    context "gemfile, prefix" do
+      before do
+        File.stub(:exist?).with("./Gemfile") { true }
+        rspec_autotest.prefix = "bundle exec "
+      end
+
+      it "does not warn" do
+        RSpec.should_not_receive(:warn_deprecation)
+        rspec_autotest.make_test_cmd({'a' => 'b'})
+      end
+
+      it "includes bundle exec" do
+        rspec_autotest.prefix = "bundle exec "
+        rspec_autotest.
+          make_test_cmd({'a' => 'b'}).should match(/bundle exec/)
+      end
+    end
+
+    context "gemfile, prefix, --skip-bundler" do
+      before do
+        File.stub(:exist?).with("./Gemfile") { true }
+        rspec_autotest.prefix = "bundle exec "
+        rspec_autotest.stub(:skip_bundler?) { true }
+      end
+
+      it "does not warn" do
+        RSpec.should_not_receive(:warn_deprecation)
+        rspec_autotest.make_test_cmd({'a' => 'b'})
+      end
+
+      it "does not include bundle exec" do
+        rspec_autotest.
+          make_test_cmd({'a' => 'b'}).should_not match(/bundle exec/)
+      end
+    end
+
+    context "no gemfile, no prefix" do
+      before do
+        File.stub(:exist?).with("./Gemfile") { false }
+      end
+
+      it "does not warn" do
+        RSpec.should_not_receive(:warn_deprecation)
+        rspec_autotest.make_test_cmd({'a' => 'b'})
+      end
+
+      it "does not include bundle exec" do
+        rspec_autotest.
+          make_test_cmd({'a' => 'b'}).should_not match(/bundle exec/)
+      end
+    end
+  end
+
   describe "commands" do
     before do
       rspec_autotest.stub(:ruby => ruby_cmd)
@@ -110,20 +242,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.make_test_cmd({'a' => 'b'}).should =~ /bundle exec .*ruby/
-      end
-    end
-
-    context "not using bundler" do
-      it "returns the ruby command generated by Autotest" do
-        File.stub(:exists?).with("./Gemfile") { false }
-        rspec_autotest.make_test_cmd({'a' => 'b'}).should_not =~ /bundle exec/
-      end
-    end
-  end
 end

data/spec/rspec/core/configuration_options_spec.rb

@@ -162,6 +162,7 @@ describe RSpec::Core::ConfigurationOptions do
     it "does not send --drb back to the parser after parsing options" do
       config_options_object("--drb", "--color").drb_argv.should_not include("--drb")
     end
+
   end
 
   describe "files_or_directories_to_run" do
@@ -204,6 +205,38 @@ describe RSpec::Core::ConfigurationOptions do
       config_options_object(*%w[--options custom.opts]).drb_argv.should include("--options", "custom.opts")
     end
 
+    context "with tags" do
+      it "includes the tags" do
+        coo = config_options_object("--tag", "tag")
+        coo.drb_argv.should eq(["--tag", "tag"])
+      end
+
+      it "leaves tags intact" do
+        coo = config_options_object("--tag", "tag")
+        coo.drb_argv
+        coo.options[:filter].should eq( {:tag=>true} )
+      end
+    end
+
+    context "with formatters" do
+      it "includes the formatters" do
+        coo = config_options_object("--format", "d")
+        coo.drb_argv.should eq(["--format", "d"])
+      end
+
+      it "leaves formatters intact" do
+        coo = config_options_object("--format", "d")
+        coo.drb_argv
+        coo.options[:formatters].should eq([["d"]])
+      end
+
+      it "leaves output intact" do
+        coo = config_options_object("--format", "p", "--out", "foo.txt", "--format", "d")
+        coo.drb_argv
+        coo.options[:formatters].should eq([["p","foo.txt"],["d"]])
+      end
+    end
+
     context "--drb specified in ARGV" do
       it "renders all the original arguments except --drb" do
         config_options_object(*%w[ --drb --color --format s --line_number 1 --example pattern --profile --backtrace -I path/a -I path/b --require path/c --require path/d]).
@@ -239,7 +272,7 @@ describe RSpec::Core::ConfigurationOptions do
     end
   end
 
-  describe "sources: ~/.rspec, ./.rspec, custom, SPEC_OPTS, and CLI" do
+  describe "sources: ~/.rspec, ./.rspec, custom, CLI, and SPEC_OPTS" do
     let(:local_options_file)  { File.join(Dir.tmpdir, ".rspec-local") }
     let(:global_options_file) { File.join(Dir.tmpdir, ".rspec-global") }
     let(:custom_options_file) { File.join(Dir.tmpdir, "custom.options") }
@@ -280,16 +313,15 @@ describe RSpec::Core::ConfigurationOptions do
       options[:drb].should be_true
     end
 
-    it "prefers CLI over SPEC_OPTS" do
+    it "prefers SPEC_OPTS over CLI" do
       ENV["SPEC_OPTS"] = "--format spec_opts"
-      parse_options("--format", "cli")[:formatters].should eq([['cli']])
+      parse_options("--format", "cli")[:formatters].should eq([['spec_opts']])
     end
 
-    it "prefers SPEC_OPTS over file options" do
+    it "prefers CLI over file options" do
       write_options(:local,  "--format local")
       write_options(:global, "--format global")
-      ENV["SPEC_OPTS"] = "--format spec_opts"
-      parse_options[:formatters].should eq([['spec_opts']])
+      parse_options("--format", "cli")[:formatters].should eq([['cli']])
     end
 
     it "prefers local file options over global" do

data/spec/rspec/core/example_group_spec.rb

@@ -228,6 +228,21 @@ module RSpec::Core
 
     end
 
+    [:focus, :focused].each do |example_alias|
+      describe "##{example_alias}" do
+        let(:group) { ExampleGroup.describe }
+        subject { group.send example_alias, "a focused example" }
+
+        it 'defines an example that can be filtered with :focused => true' do
+          subject.metadata.should include(:focused => true)
+        end
+
+        it 'defines an example that can be filtered with :focus => true' do
+          subject.metadata.should include(:focus => true)
+        end
+      end
+    end
+
     describe "#before, after, and around hooks" do
 
       it "runs the before alls in order" do
@@ -620,70 +635,6 @@ module RSpec::Core
       end
     end
 
-    describe "#its" do
-      context "with nil value" do
-        subject do
-          Class.new do
-            def nil_value
-              nil
-            end
-          end.new
-        end
-        its(:nil_value) { should be_nil }
-      end
-
-      context "with nested attributes" do
-        subject do
-          Class.new do
-            def name
-              "John"
-            end
-          end.new
-        end
-        its("name.size") { should == 4 }
-        its("name.size.class") { should == Fixnum }
-      end
-
-      context "when it is a Hash" do
-        subject do
-          { :attribute => 'value',
-            'another_attribute' => 'another_value' }
-        end
-        its([:attribute]) { should == 'value' }
-        its([:attribute]) { should_not == 'another_value' }
-        its([:another_attribute]) { should == 'another_value' }
-        its([:another_attribute]) { should_not == 'value' }
-        its(:keys) { should =~ ['another_attribute', :attribute] }
-        context "when referring to an attribute without the proper array syntax" do
-          context "it raises an error" do
-            its(:attribute) do
-              expect do
-                should eq('value')
-              end.to raise_error(NoMethodError)
-            end
-          end
-        end
-      end
-
-      context "calling and overriding super" do
-        it "calls to the subject defined in the parent group" do
-          group = ExampleGroup.describe(Array) do
-            subject { [1, 'a'] }
-
-            its(:last) { should == 'a' }
-
-            describe '.first' do
-              def subject; super().first; end
-
-              its(:next) { should == 2 }
-            end
-          end
-
-          group.run.should be_true
-        end
-      end
-
-    end
 
     describe "#top_level_description" do
       it "returns the description from the outermost example group" do

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

@@ -31,6 +31,29 @@ describe RSpec::Core::Formatters::BaseFormatter do
         formatter.send(:read_failed_line, exception, example)
       }.should_not raise_error
     end
+
+    context "when String alias to_int to_i" do
+      before do
+        class String
+          alias :to_int :to_i
+        end
+      end
+
+      after do
+        class String
+          undef to_int
+        end
+      end
+
+      it "doesn't hang when file exists" do
+        exception = mock(:Exception, :backtrace => [ "#{__FILE__}:#{__LINE__}"])
+
+        example = mock(:Example, :file_path => __FILE__)
+        formatter.send(:read_failed_line, exception, example).should
+          eql %Q{        exception = mock(:Exception, :backtrace => [ "\#{__FILE__}:\#{__LINE__}"])\n}
+      end
+
+    end
   end
 
 end