diff options
| author | tyler-ball <tyleraball@gmail.com> | 2014-11-04 08:17:39 -0800 |
|---|---|---|
| committer | tyler-ball <tyleraball@gmail.com> | 2014-11-04 08:17:39 -0800 |
| commit | d6687d195091ab67a00ac5d61ededbb7958f32ad (patch) | |
| tree | 2765b1c52a021033e44c6ba38287d7fb77704914 /spec/integration/knife/diff_spec.rb | |
| parent | e5c35f74b8451139605fc5c986eb51405d53d4c2 (diff) | |
| parent | 4fa0ea6f9b942d407b83712ec53e19447ddfa39b (diff) | |
| download | chef-tball/audit-rspec-3.tar.gz | |
Merging mcquin/rspec-3 to this branchtball/audit-rspec-3
Diffstat (limited to 'spec/integration/knife/diff_spec.rb')
| -rw-r--r-- | spec/integration/knife/diff_spec.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/spec/integration/knife/diff_spec.rb b/spec/integration/knife/diff_spec.rb index c12ebbcf8f..465383437f 100644 --- a/spec/integration/knife/diff_spec.rb +++ b/spec/integration/knife/diff_spec.rb @@ -247,7 +247,7 @@ EOM end when_the_chef_server 'has an environment with a different value' do before { environment 'x', { 'description' => 'hi' } } - it 'knife diff reports the difference', :pending => (RUBY_VERSION < "1.9") do + it 'knife diff reports the difference', :skip => (RUBY_VERSION < "1.9") do knife('diff /environments/x.json').should_succeed(/ { - "name": "x", @@ -277,7 +277,7 @@ EOM environment 'x', {} end - it 'knife diff reports the difference', :pending => (RUBY_VERSION < "1.9") do + it 'knife diff reports the difference', :skip => (RUBY_VERSION < "1.9") do knife('diff /environments/x.json').should_succeed(/ { - "name": "x" @@ -291,7 +291,7 @@ EOM before do environment 'x', { 'description' => 'lo' } end - it 'knife diff reports the difference', :pending => (RUBY_VERSION < "1.9") do + it 'knife diff reports the difference', :skip => (RUBY_VERSION < "1.9") do knife('diff /environments/x.json').should_succeed(/ { "name": "x", @@ -533,7 +533,7 @@ EOM end when_the_chef_server 'has an environment with a different value' do before { environment 'x', { 'description' => 'hi' } } - it 'knife diff reports the difference', :pending => (RUBY_VERSION < "1.9") do + it 'knife diff reports the difference', :skip => (RUBY_VERSION < "1.9") do knife('diff /environments/x.json').should_succeed(/ { - "name": "x", @@ -560,7 +560,7 @@ EOM end when_the_chef_server 'has an environment with no value' do before { environment 'x', {} } - it 'knife diff reports the difference', :pending => (RUBY_VERSION < "1.9") do + it 'knife diff reports the difference', :skip => (RUBY_VERSION < "1.9") do knife('diff /environments/x.json').should_succeed(/ { - "name": "x" @@ -574,7 +574,7 @@ EOM before do environment 'x', { 'description' => 'lo' } end - it 'knife diff reports the difference', :pending => (RUBY_VERSION < "1.9") do + it 'knife diff reports the difference', :skip => (RUBY_VERSION < "1.9") do knife('diff /environments/x.json').should_succeed(/ { "name": "x", |