Browse files

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

  • Loading branch information...
2 parents 35c722e + 18d58a6 commit f293f9aa66040e64e7cdfd03d279dbc57633c5cb @dchelimsky dchelimsky committed Nov 17, 2010
Showing with 7 additions and 7 deletions.
  1. +1 −1 lib/rspec/core/rake_task.rb
  2. +4 −3 lib/rspec/core/subject.rb
  3. +2 −3 spec/rspec/core/rake_task_spec.rb
View
2 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
View
7 lib/rspec/core/subject.rb
@@ -88,9 +88,10 @@ module ClassMethods
# onto the subject in an expression.
#
# describe Person do
- # let(:person) do
- # person = Person.new
- # person.phone_numbers << "555-1212"
+ # subject do
+ # Person.new.tap do |person|
+ # person.phone_numbers << "555-1212"
+ # end
# end
#
# its("phone_numbers.first") { should == "555-1212" }
View
5 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.*-Ilib/
+ spec_command.should =~ /rcov.*-Ispec:lib/
end
end
end

0 comments on commit f293f9a

Please sign in to comment.