rspec-core 2.6.4 → 2.7.0.rc1

data/spec/rspec/core/pending_example_spec.rb

@@ -30,10 +30,10 @@ describe "an example" do
       it "does not have an auto-generated description" do
         group = RSpec::Core::ExampleGroup.describe('group') do
           it "checks something" do
-            (3+4).should == 7
+            (3+4).should eq(7)
           end
           pending do
-            "string".reverse.should == "gnirts"
+            "string".reverse.should eq("gnirts")
           end
         end
         example = group.examples.last
@@ -45,7 +45,7 @@ describe "an example" do
       it "does not show any message" do
         group = RSpec::Core::ExampleGroup.describe('group') do
           it "checks something" do
-            (3+4).should == 7
+            (3+4).should eq(7)
           end
           specify do
             pending
@@ -145,7 +145,7 @@ describe "an example" do
 
     context "that passes" do
       def run_example(*pending_args)
-        super(*pending_args) { 3.should == 3 }
+        super(*pending_args) { 3.should eq(3) }
       end
 
       context "when given no options" do

data/spec/rspec/core/rake_task_spec.rb

@@ -1,18 +1,29 @@
 require "spec_helper"
 require "rspec/core/rake_task"
+require 'tempfile'
 
 module RSpec::Core
   describe RakeTask do
     let(:task) { RakeTask.new }
 
-    before do
-      File.stub(:exist?) { false }
+    def ruby
+      FileUtils::RUBY
     end
 
-    def with_bundler
-      task.skip_bundler = false
-      File.stub(:exist?) { true }
-      yield
+    def with_bundle_gemfile(val)
+      begin
+        orig = ENV['BUNDLE_GEMFILE']
+        ENV['BUNDLE_GEMFILE'] = val
+        yield
+      ensure
+        ENV['BUNDLE_GEMFILE'] = orig
+      end
+    end
+
+    def without_bundler
+      with_bundle_gemfile nil do
+        yield
+      end
     end
 
     def with_rcov
@@ -24,52 +35,41 @@ module RSpec::Core
       task.__send__(:spec_command)
     end
 
-    context "default" do
+    context "default (BUNDLE_GEMFILE nil)" do
       it "renders rspec" do
-        spec_command.should =~ /^-S rspec/
-      end
-    end
-
-    context "with bundler" do
-      context "with Gemfile" do
-        it "renders bundle exec rspec" do
-          File.stub(:exist?) { true }
-          task.skip_bundler = false
-          spec_command.should match(/bundle exec/)
+        with_bundle_gemfile nil do
+          spec_command.should =~ /^#{ruby} -S rspec/
         end
       end
+    end
 
-      context "with non-standard Gemfile" do
-        it "renders bundle exec rspec" do
-          File.stub(:exist?) {|f| f =~ /AltGemfile/}
-          task.gemfile = 'AltGemfile'
-          task.skip_bundler = false
-          spec_command.should match(/bundle exec/)
+    context "default (BUNDLE_GEMFILE '')" do
+      it "renders rspec" do
+        with_bundle_gemfile '' do
+          spec_command.should =~ /^#{ruby} -S rspec/
         end
       end
+    end
 
-      context "without Gemfile" do
-        it "renders bundle exec rspec" do
-          File.stub(:exist?) { false }
-          task.skip_bundler = false
-          spec_command.should_not match(/bundle exec/)
-        end
+    context "with bundler (BUNDLE_GEMFILE non-blank)" do
+      it "renders bundle exec rspec" do
+        spec_command.should match(/bundle exec/)
       end
     end
 
     context "with rcov" do
       it "renders rcov" do
-        with_rcov do
-          spec_command.should =~ /^-S rcov/
+        without_bundler do
+          with_rcov do
+            spec_command.should =~ /^#{ruby} -S rcov/
+          end
         end
       end
-    end
 
-    context "with bundler and rcov" do
-      it "renders bundle exec rcov" do
-        with_bundler do
+      context "with bundler" do
+        it "renders bundle exec rcov" do
           with_rcov do
-            spec_command.should =~ /^-S bundle exec rcov/
+            spec_command.should =~ /^bundle exec #{ruby} -S rcov/
           end
         end
       end
@@ -77,8 +77,10 @@ module RSpec::Core
 
     context "with ruby options" do
       it "renders them before -S" do
-        task.ruby_opts = "-w"
-        spec_command.should =~ /^-w -S rspec/
+        without_bundler do
+          task.ruby_opts = "-w"
+          spec_command.should =~ /^#{ruby} -w -S rspec/
+        end
       end
     end
 
@@ -138,23 +140,42 @@ module RSpec::Core
     end
 
     context "with paths with quotes" do
-      before do
-        @tmp_dir = File.expand_path('./tmp/rake_task_example/')
-        FileUtils.mkdir_p @tmp_dir
-        @task = RakeTask.new do |t|
-          t.pattern = File.join(@tmp_dir, "*spec.rb")
+      it "escapes the quotes" do
+        task = RakeTask.new do |t|
+          t.pattern = File.join(Dir.tmpdir, "*spec.rb")
         end
         ["first_spec.rb", "second_\"spec.rb", "third_\'spec.rb"].each do |file_name|
-          FileUtils.touch(File.join(@tmp_dir, file_name))
+          FileUtils.touch(File.join(Dir.tmpdir, file_name))
         end
+        task.__send__(:files_to_run).sort.should eq([
+          File.join(Dir.tmpdir, "first_spec.rb"),
+          File.join(Dir.tmpdir, "second_\\\"spec.rb"),
+          File.join(Dir.tmpdir, "third_\\\'spec.rb")
+        ])
       end
+    end
 
-      it "escapes the quotes" do
-        @task.__send__(:files_to_run).sort.should eq([
-          File.join(@tmp_dir, "first_spec.rb"),
-          File.join(@tmp_dir, "second_\\\"spec.rb"),
-          File.join(@tmp_dir, "third_\\\'spec.rb") 
-        ])
+    context "with paths including symlinked directories" do
+      it "finds the files" do
+        project_dir = File.join(Dir.tmpdir, "project")
+        FileUtils.rm_rf project_dir
+
+        foos_dir = File.join(project_dir, "spec/foos")
+        FileUtils.mkdir_p foos_dir
+        FileUtils.touch(File.join(foos_dir, "foo_spec.rb"))
+
+        bars_dir = File.join(Dir.tmpdir, "shared/spec/bars")
+        FileUtils.mkdir_p bars_dir
+        FileUtils.touch(File.join(bars_dir, "bar_spec.rb"))
+
+        FileUtils.ln_s bars_dir, File.join(project_dir, "spec/bars")
+
+        FileUtils.cd(project_dir) do
+          RakeTask.new.__send__(:files_to_run).sort.should eq([
+            "./spec/bars/bar_spec.rb",
+            "./spec/foos/foo_spec.rb"
+          ])
+        end
       end
     end
   end

data/spec/rspec/core/reporter_spec.rb

@@ -44,14 +44,14 @@ module RSpec::Core
 
         group.run(Reporter.new(formatter))
 
-        order.should == [
+        order.should eq([
            "Started: root",
            "Started: context 1",
            "Finished: context 1",
            "Started: context 2",
            "Finished: context 2",
            "Finished: root"
-        ]
+        ])
       end
     end
 

data/spec/rspec/core/ruby_project_spec.rb

@@ -7,14 +7,14 @@ module RSpec
         context "with ancestor containing spec directory" do
           it "returns ancestor containing the spec directory" do
             RubyProject.stub(:ascend_until).and_return('foodir')
-            RubyProject.determine_root.should == 'foodir'
+            RubyProject.determine_root.should eq("foodir")
           end
         end
 
         context "without ancestor containing spec directory" do
           it "returns current working directory" do
             RubyProject.stub(:find_first_parent_containing).and_return(nil)
-            RubyProject.determine_root.should == '.'
+            RubyProject.determine_root.should eq(".")
           end
         end
 

data/spec/rspec/core/runner_spec.rb

@@ -7,6 +7,7 @@ module RSpec::Core
         RSpec::Core::Runner.stub(:installed_at_exit?).and_return(false)
         RSpec::Core::Runner.stub(:running_in_drb?).and_return(false)
         RSpec::Core::Runner.stub(:at_exit_hook_disabled?).and_return(false)
+        RSpec::Core::Runner.stub(:run).and_return(-1)
         RSpec::Core::Runner.should_receive(:at_exit)
         RSpec::Core::Runner.autorun
       end
@@ -25,6 +26,7 @@ module RSpec::Core
       let(:out) { StringIO.new }
 
       it "resets world and configuration" do
+        RSpec.configuration.stub(:files_to_run) { [] }
         RSpec.configuration.should_receive(:reset)
         RSpec.world.should_receive(:reset)
         RSpec::Core::Runner.run([], err, out)
@@ -58,6 +60,7 @@ module RSpec::Core
           end
 
           it "outputs a message" do
+            RSpec.configuration.stub(:files_to_run) { [] }
             err.should_receive(:puts).with(
               "No DRb server is running. Running in local process instead ..."
             )
@@ -65,7 +68,7 @@ module RSpec::Core
           end
 
           it "builds a CommandLine and runs the specs" do
-            process_proxy = double(RSpec::Core::CommandLine, :run => true)
+            process_proxy = double(RSpec::Core::CommandLine, :run => 0)
             process_proxy.should_receive(:run).with(err, out)
 
             RSpec::Core::CommandLine.should_receive(:new).and_return(process_proxy)

data/spec/rspec/core/shared_example_group_spec.rb

@@ -1,8 +1,10 @@
 require 'spec_helper'
 
 module RSpec::Core
-
   describe SharedExampleGroup do
+    
+    ExampleModule = Module.new
+    ExampleClass = Class.new
 
     %w[share_examples_for shared_examples_for].each do |method_name|
       describe method_name do
@@ -17,20 +19,15 @@ module RSpec::Core
             group.send(method_name, 'shared group') {}
           end.should raise_error(ArgumentError, "Shared example group 'shared group' already exists")
         end
-
-        context "given a string" do
-          it "captures the given string and block in the World's collection of shared example groups" do
-            implementation = lambda {}
-            RSpec.world.shared_example_groups.should_receive(:[]=).with("name", implementation)
-            send(method_name, "name", &implementation)
-          end
-        end
-
-        context "given a symbol" do
-          it "captures the given symbol and block in the World's collection of shared example groups" do
-            implementation = lambda {}
-            RSpec.world.shared_example_groups.should_receive(:[]=).with(:name, implementation)
-            send(method_name, :name, &implementation)
+        
+        ["name", :name, ExampleModule, ExampleClass].each do |object|
+          type = object.class.name.downcase
+          context "given a #{type}" do
+            it "captures the given #{type} and block in the World's collection of shared example groups" do
+              implementation = lambda {}
+              RSpec.world.shared_example_groups.should_receive(:[]=).with(object, implementation)
+              send(method_name, object, &implementation)
+            end
           end
         end
 
@@ -64,107 +61,6 @@ module RSpec::Core
       end
     end
 
-    describe "#it_should_behave_like" do
-      it "creates a nested group" do
-        shared_examples_for("thing") {}
-        group = ExampleGroup.describe('fake group')
-        group.it_should_behave_like("thing")
-        group.should have(1).children
-      end
-
-      it "adds shared examples to nested group" do
-        shared_examples_for("thing") do
-          it("does something")
-        end
-        group = ExampleGroup.describe('fake group')
-        shared_group = group.it_should_behave_like("thing")
-        shared_group.should have(1).examples
-      end
-
-      it "adds shared instance methods to nested group" do
-        shared_examples_for("thing") do
-          def foo; end
-        end
-        group = ExampleGroup.describe('fake group')
-        shared_group = group.it_should_behave_like("thing")
-        shared_group.public_instance_methods.map{|m| m.to_s}.should include("foo")
-      end
-
-      it "adds shared class methods to nested group" do
-        shared_examples_for("thing") do
-          def self.foo; end
-        end
-        group = ExampleGroup.describe('fake group')
-        shared_group = group.it_should_behave_like("thing")
-        shared_group.methods.map{|m| m.to_s}.should include("foo")
-      end
-
-      context "given some parameters" do
-        it "passes the parameters to the shared example group" do
-          passed_params = {}
-
-          shared_examples_for("thing") do |param1, param2|
-            it("has access to the given parameters") do
-              passed_params[:param1] = param1
-              passed_params[:param2] = param2
-            end
-          end
-
-          group = ExampleGroup.describe("group") do
-            it_should_behave_like "thing", :value1, :value2
-          end
-          group.run
-
-          passed_params.should == { :param1 => :value1, :param2 => :value2 }
-        end
-
-        it "adds shared instance methods to nested group" do
-          shared_examples_for("thing") do |param1|
-            def foo; end
-          end
-          group = ExampleGroup.describe('fake group')
-          shared_group = group.it_should_behave_like("thing", :a)
-          shared_group.public_instance_methods.map{|m| m.to_s}.should include("foo")
-        end
-
-        it "evals the shared example group only once" do
-          eval_count = 0
-          shared_examples_for("thing") { |p| eval_count += 1 }
-          group = ExampleGroup.describe('fake group')
-          shared_group = group.it_should_behave_like("thing", :a)
-          eval_count.should == 1
-        end
-      end
-
-      context "given a block" do
-        it "evaluates the block in nested group" do
-          scopes = []
-          shared_examples_for("thing") do
-            it("gets run in the nested group") do
-              scopes << self.class
-            end
-          end
-          group = ExampleGroup.describe("group") do
-            it_should_behave_like "thing" do
-              it("gets run in the same nested group") do
-                scopes << self.class
-              end
-            end
-          end
-          group.run
-
-          scopes[0].should be(scopes[1])
-        end
-      end
-
-      it "raises when named shared example_group can not be found" do
-        group = ExampleGroup.describe("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
-
     describe "#share_as" do
       it "is exposed to the global namespace" do
         Kernel.should respond_to("share_as")
@@ -173,15 +69,15 @@ module RSpec::Core
       it "adds examples to current example_group using include", :compat => 'rspec-1.2' do
         share_as('Cornucopia') do
           it "is plentiful" do
-            5.should == 4
+            5.should eq(4)
           end
         end
         group = ExampleGroup.describe('group') { include Cornucopia }
         phantom_group = group.children.first
         phantom_group.description.should eql("")
         phantom_group.metadata[:shared_group_name].should eql('Cornucopia')
-        phantom_group.examples.length.should == 1
-        phantom_group.examples.first.metadata[:description].should == "is plentiful"
+        phantom_group.examples.length.should eq(1)
+        phantom_group.examples.first.metadata[:description].should eq("is plentiful")
       end
     end
   end

data/spec/rspec/core/subject_spec.rb

@@ -8,25 +8,25 @@ module RSpec::Core
     describe "implicit subject" do
       describe "with a class" do
         it "returns an instance of the class" do
-          ExampleGroup.describe(Array).subject.call.should == []
+          ExampleGroup.describe(Array).subject.call.should eq([])
         end
       end
 
       describe "with a Module" do
         it "returns the Module" do
-          ExampleGroup.describe(Enumerable).subject.call.should == Enumerable
+          ExampleGroup.describe(Enumerable).subject.call.should eq(Enumerable)
         end
       end
 
       describe "with a string" do
         it "return the string" do
-          ExampleGroup.describe("Foo").subject.call.should == 'Foo'
+          ExampleGroup.describe("Foo").subject.call.should eq("Foo")
         end
       end
 
       describe "with a number" do
         it "returns the number" do
-          ExampleGroup.describe(15).subject.call.should == 15
+          ExampleGroup.describe(15).subject.call.should eq(15)
         end
       end
 
@@ -56,7 +56,7 @@ module RSpec::Core
         it "replaces the implicit subject in that group" do
           group = ExampleGroup.describe(Array)
           group.subject { [1,2,3] }
-          group.subject.call.should == [1,2,3]
+          group.subject.call.should eq([1,2,3])
         end
       end
 
@@ -69,13 +69,13 @@ module RSpec::Core
 
         it "is available in a nested group (subclass)" do
           nested_group = group.describe("I'm nested!") { }
-          nested_group.subject.call.should == [4,5,6]
+          nested_group.subject.call.should eq([4,5,6])
         end
 
         it "is available in a doubly nested group (subclass)" do
           nested_group = group.describe("Nesting level 1") { }
           doubly_nested_group = nested_group.describe("Nesting level 2") { }
-          doubly_nested_group.subject.call.should == [4,5,6]
+          doubly_nested_group.subject.call.should eq([4,5,6])
         end
       end
     end
@@ -149,9 +149,9 @@ module RSpec::Core
             end
           end.new
         end
-        its([:a]) { should == 'Symbol: a' }
-        its(['a']) { should == 'String: a' }
-        its([:b, 'c', 4]) { should == 'Symbol: b; String: c; Fixnum: 4' }
+        its([:a]) { should eq("Symbol: a") }
+        its(['a']) { should eq("String: a") }
+        its([:b, 'c', 4]) { should eq("Symbol: b; String: c; Fixnum: 4") }
         its(:name) { should = "George" }
         context "when referring to an attribute without the proper array syntax" do
           context "it raises an error" do
@@ -170,7 +170,7 @@ module RSpec::Core
         context "it raises an error" do
           its([:a]) do
             expect do
-              should == 'Symbol: a'
+              should eq("Symbol: a")
             end.to raise_error(NoMethodError)
           end
         end
@@ -181,12 +181,12 @@ module RSpec::Core
           group = ExampleGroup.describe(Array) do
             subject { [1, 'a'] }
 
-            its(:last) { should == 'a' }
+            its(:last) { should eq("a") }
 
             describe '.first' do
               def subject; super().first; end
 
-              its(:next) { should == 2 }
+              its(:next) { should eq(2) }
             end
           end