diff options
| author | danielsdeleo <dan@opscode.com> | 2013-03-27 10:49:43 -0700 |
|---|---|---|
| committer | danielsdeleo <dan@opscode.com> | 2013-04-23 14:59:26 -0700 |
| commit | f26fbf8df39475db8741ed009e1fc9c5ea877f0c (patch) | |
| tree | 115bef478f4b08aef4eb5443fa67b6576d982557 | |
| parent | 2f910f4cdce4438f14b5c8eae4ef49d6529de82a (diff) | |
| download | chef-f26fbf8df39475db8741ed009e1fc9c5ea877f0c.tar.gz | |
avoid clobbering original diff disable state when nested
| -rw-r--r-- | spec/support/shared/functional/diff_disabled.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/support/shared/functional/diff_disabled.rb b/spec/support/shared/functional/diff_disabled.rb index 36cb64027d..950e152d26 100644 --- a/spec/support/shared/functional/diff_disabled.rb +++ b/spec/support/shared/functional/diff_disabled.rb @@ -1,7 +1,7 @@ shared_context "diff disabled" do before do - @original_diff_disable = Chef::Config[:diff_disabled] + @original_diff_disable ||= Chef::Config[:diff_disabled] Chef::Config[:diff_disabled] = true end |