Merge branch 'master' of github.com:rspec/rspec-core

rspec · Nov 18, 2010 · f293f9a · f293f9a
2 parents 35c722e + 18d58a6
commit f293f9a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/lib/rspec/core/rake_task.rb b/lib/rspec/core/rake_task.rb
@@ -161,7 +161,7 @@ def spec_command
                             cmd_parts << "bundle exec" if gemfile? unless skip_bundler
                             cmd_parts << runner
                             if rcov
-                              cmd_parts << ["-Ispec", "-Ilib", rcov_opts]
+                              cmd_parts << ["-Ispec:lib", rcov_opts]
                             else
                               cmd_parts << rspec_opts
                             end

diff --git a/lib/rspec/core/subject.rb b/lib/rspec/core/subject.rb
@@ -88,9 +88,10 @@ module ClassMethods
         # onto the subject in an expression.
         #   
         #   describe Person do
-        #     let(:person) do
+        #     subject do
-        #       person = Person.new
+        #       Person.new.tap do |person|
-        #       person.phone_numbers << "555-1212"
+        #         person.phone_numbers << "555-1212"
+        #       end
         #     end
         #
         #     its("phone_numbers.first") { should == "555-1212" }

diff --git a/spec/rspec/core/rake_task_spec.rb b/spec/rspec/core/rake_task_spec.rb
@@ -97,11 +97,10 @@ def spec_command
           spec_command.should =~ /rcov.*--exclude "mocks"/
         end
 
-        it "ensures that -Ispec and -Ilib are in the resulting command" do
+        it "ensures that -Ispec:lib is in the resulting command" do
           task.rcov = true
           task.rcov_opts = '--exclude "mocks"'
-          spec_command.should =~ /rcov.*-Ispec/
+          spec_command.should =~ /rcov.*-Ispec:lib/
-          spec_command.should =~ /rcov.*-Ilib/
         end
       end
     end