Raise error if stack deletion fails (#229)

acquia · Jul 25, 2017 · 2577d5e · 2577d5e
1 parent 10f3548
commit 2577d5e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/lib/moonshot/controller.rb b/lib/moonshot/controller.rb
@@ -152,9 +152,13 @@ def delete
 
       run_plugins(:pre_delete)
       run_hook(:deploy, :pre_delete)
-      stack.delete
-      run_hook(:deploy, :post_delete)
-      run_plugins(:post_delete)
+      stack_ok = stack.delete
+      if stack_ok # rubocop:disable GuardClause
+        run_hook(:deploy, :post_delete)
+        run_plugins(:post_delete)
+      else
+        raise 'Stack deletion failed!'
+      end
     end
 
     def doctor

diff --git a/spec/moonshot/plugins_spec.rb b/spec/moonshot/plugins_spec.rb
@@ -38,7 +38,7 @@ def post_create
   end
 
   it "doesn't call an undefined method" do
-    expect(stack).to receive(:delete)
+    expect(stack).to receive(:delete).and_return(true)
 
     # The assertion here is that calling MockPlugin#pre_delete would cause an
     # exception. Using an expect().not_to receive() changes the behavior of