spec/spec_helper.rb in serverspec-0.6.12 vs spec/spec_helper.rb in serverspec-0.6.13
- old
+ new
@@ -4,25 +4,26 @@
PROJECT_ROOT = (Pathname.new(File.dirname(__FILE__)) + '..').expand_path
Dir[PROJECT_ROOT.join("spec/support/**/*.rb")].each { |file| require(file) }
+
module Serverspec
module Backend
class Exec
def run_command(cmd)
if cmd =~ /invalid/
{
- :stdout => ::RSpec.configuration.stdout,
- :stderr => ::RSpec.configuration.stderr,
+ :stdout => ::Serverspec.configuration.stdout,
+ :stderr => ::Serverspec.configuration.stderr,
:exit_status => 1,
:exit_signal => nil
}
else
{
- :stdout => ::RSpec.configuration.stdout,
- :stderr => ::RSpec.configuration.stderr,
+ :stdout => ::Serverspec.configuration.stdout,
+ :stderr => ::Serverspec.configuration.stderr,
:exit_status => 0,
:exit_signal => nil
}
end
end
@@ -35,11 +36,6 @@
cmd = backend.build_command('command')
backend.add_pre_command(cmd)
end
end
end
-end
-
-RSpec.configure do |c|
- c.add_setting :stdout, :default => ''
- c.add_setting :stderr, :default => ''
end