summaryrefslogtreecommitdiff
path: root/spec/integration
diff options
context:
space:
mode:
authorJohn Keiser <jkeiser@opscode.com>2013-10-09 12:26:27 -0700
committerJohn Keiser <jkeiser@opscode.com>2013-10-09 12:26:27 -0700
commita5337fcad5ed979078b6cf57c7e1e6ec8f0b76cf (patch)
tree11a5e98513f9496d3ce15a823e7a84cd4d178f58 /spec/integration
parent836705dee684032baa85920c808a3eca5f5a8a87 (diff)
downloadchef-a5337fcad5ed979078b6cf57c7e1e6ec8f0b76cf.tar.gz
Use new Chef::ServerAPI API class in upload/download/diff
Diffstat (limited to 'spec/integration')
-rw-r--r--spec/integration/knife/redirection_spec.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/spec/integration/knife/redirection_spec.rb b/spec/integration/knife/redirection_spec.rb
index 48944b1140..5af9fd36e1 100644
--- a/spec/integration/knife/redirection_spec.rb
+++ b/spec/integration/knife/redirection_spec.rb
@@ -50,9 +50,7 @@ describe 'redirection' do
end
it 'knife list /roles returns the role' do
- pending 'merge of api-code-path branch' do
- knife('list /roles').should_succeed "/roles/x.json\n"
- end
+ knife('list /roles').should_succeed "/roles/x.json\n"
end
end
end