summaryrefslogtreecommitdiff
path: root/spec/functional/audit
diff options
context:
space:
mode:
authortyler-ball <tyleraball@gmail.com>2015-02-03 15:45:04 -0800
committertyler-ball <tyleraball@gmail.com>2015-02-04 08:38:22 -0800
commitfe50d7921039c1659e55e7868b1381a83f066d1d (patch)
treef6bf49d6e83bc15a8f4fe86f9751b3704166bfcf /spec/functional/audit
parent235622a134cecf6696bcb451038618dc682108cc (diff)
downloadchef-fe50d7921039c1659e55e7868b1381a83f066d1d.tar.gz
Fixing Rspec 3.2 update. We were overriding private APIs which changed.tball/rspec32-fix
Diffstat (limited to 'spec/functional/audit')
-rw-r--r--spec/functional/audit/rspec_formatter_spec.rb5
-rw-r--r--spec/functional/audit/runner_spec.rb5
2 files changed, 6 insertions, 4 deletions
diff --git a/spec/functional/audit/rspec_formatter_spec.rb b/spec/functional/audit/rspec_formatter_spec.rb
index 43d3c2f6dd..009374db68 100644
--- a/spec/functional/audit/rspec_formatter_spec.rb
+++ b/spec/functional/audit/rspec_formatter_spec.rb
@@ -19,9 +19,10 @@
#
require 'spec_helper'
-require 'spec/support/audit_helper'
+require 'rspec/core/sandbox'
require 'chef/audit/runner'
require 'rspec/support/spec/in_sub_process'
+require 'rspec/support/spec/stderr_splitter'
require 'chef/audit/rspec_formatter'
describe Chef::Audit::RspecFormatter do
@@ -37,7 +38,7 @@ describe Chef::Audit::RspecFormatter do
let!(:formatter) { Chef::Audit::RspecFormatter.new(output) }
around(:each) do |ex|
- Sandboxing.sandboxed { ex.run }
+ RSpec::Core::Sandbox.sandboxed { ex.run }
end
it "should not close the output using our formatter" do
diff --git a/spec/functional/audit/runner_spec.rb b/spec/functional/audit/runner_spec.rb
index aa35548f2f..4bb58118f6 100644
--- a/spec/functional/audit/runner_spec.rb
+++ b/spec/functional/audit/runner_spec.rb
@@ -17,9 +17,10 @@
#
require 'spec_helper'
-require 'spec/support/audit_helper'
+require 'rspec/core/sandbox'
require 'chef/audit/runner'
require 'rspec/support/spec/in_sub_process'
+require 'rspec/support/spec/stderr_splitter'
require 'tempfile'
##
@@ -42,7 +43,7 @@ describe Chef::Audit::Runner do
let(:stdout) { StringIO.new }
around(:each) do |ex|
- Sandboxing.sandboxed { ex.run }
+ RSpec::Core::Sandbox.sandboxed { ex.run }
end
before do