Browse files

Remove the automatic call to RSpec.reset

This also updates the specs that are effected by this call. The order
specs were effected because the RSpec runner was being invoked within
the same ruby process (I think). The run_command helper in the
order_spec file has been updated to explicitly invoke the reset method.

Signed-off-by: Sam Phippen <samphippen@googlemail.com>
  • Loading branch information...
1 parent 336f201 commit d6d0d359627c057ef81c9a5d2bb9397604c363df @samphippen committed Oct 7, 2012
Showing with 1 addition and 8 deletions.
  1. +0 −2 lib/rspec/core/runner.rb
  2. +1 −0 spec/command_line/order_spec.rb
  3. +0 −6 spec/rspec/core/runner_spec.rb
View
2 lib/rspec/core/runner.rb
@@ -68,8 +68,6 @@ def self.run(args, err=$stderr, out=$stdout)
else
CommandLine.new(options).run(err, out)
end
- ensure
- RSpec.reset
end
end
end
View
1 spec/command_line/order_spec.rb
@@ -194,6 +194,7 @@ def split_in_half(array)
def run_command(cmd)
RSpec::Core::Runner.run(cmd.split, stderr, stdout)
+ RSpec.reset
end
def run_command_expecting_error(cmd)
View
6 spec/rspec/core/runner_spec.rb
@@ -26,12 +26,6 @@ module RSpec::Core
let(:err) { StringIO.new }
let(:out) { StringIO.new }
- it "tells RSpec to reset" do
- RSpec.configuration.stub(:files_to_run => [])
- RSpec.should_receive(:reset)
- RSpec::Core::Runner.run([], err, out)
- end
-
context "with --drb or -X" do
before(:each) do

0 comments on commit d6d0d35

Please sign in to comment.