github-migration/hydra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed hydra rspec autorun override

Browse Source
This commit is contained in:
Nick Gauthier 2010-10-25 14:14:58 -04:00
parent e97c65ea78
commit 80a119b350
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/hydra/runner.rb
View File

@ -110,7 +110,7 @@ module Hydra #:nodoc:
require 'rspec' require 'rspec'
require 'hydra/spec/hydra_formatter' require 'hydra/spec/hydra_formatter'
# Ensure we override rspec's at_exit # Ensure we override rspec's at_exit
require 'hydra/spec/autorun_override' RSpec::Core::Runner.disable_autorun!
rescue LoadError => ex rescue LoadError => ex
return ex.to_s return ex.to_s
end end

4
lib/hydra/tasks.rb
View File

@ -79,7 +79,9 @@ module Hydra #:nodoc:
yield self if block_given? yield self if block_given?
# Ensure we override rspec's at_exit # Ensure we override rspec's at_exit
require 'hydra/spec/autorun_override' if defined?(RSpec)
RSpec::Core::Runner.disable_autorun!
end
unless @serial unless @serial
@config = find_config_file @config = find_config_file