Permalink
Browse files

Merge branch '1451-delete-inode' into crm-3.3

  • Loading branch information...
2 parents 9265dfd + be889df commit e1ff1508bf505dc3abb60a5145cbae7c281994d0 Kevin Olbrich committed Mar 26, 2013
Showing with 10 additions and 1 deletion.
  1. +1 −1 app/controllers/inodes.rb
  2. +1 −0 models/capability.rb
  3. +8 −0 spec/controllers/inodes_controller_spec.rb
@@ -71,7 +71,7 @@
end
# Deletes
- delete :index do
+ delete :index, "/inodes/:uuid" do
logger.info('DELETE - inodes#index')
uuid = params.delete('uuid')
@@ -15,6 +15,7 @@ class Capability < Base::Capability
# )
SUPPORTED_CAPABILITIES = %w(
inode
+ inode_delete
machines
machines_readings
machines_readings_historical
@@ -42,4 +42,12 @@
last_response.should be_ok
end
end
+
+ describe 'DELETE /inodes/:inode' do
+ it "should be successful" do
+ inode.should_receive(:delete).and_return(true)
+ delete '/inodes/inode_id'
+ last_response.should be_empty
+ end
+ end
end

0 comments on commit e1ff150

Please sign in to comment.