Make redirects after actions the way user would expect

app/controllers/cloud_object_store_container_controller.rb

@@ -7,6 +7,7 @@ class CloudObjectStoreContainerController < ApplicationController
   include Mixins::GenericListMixin
   include Mixins::GenericShowMixin
   include Mixins::GenericSessionMixin
+  include Mixins::GenericFormMixin
 
   def breadcrumb_name(_model)
     ui_lookup(:tables => "cloud_object_store_container")
@@ -24,12 +25,10 @@ def button
       process_cloud_object_storage_buttons(params[:pressed])
     end
 
-    if !@flash_array.nil? && params[:pressed].ends_with?("delete")
-      javascript_redirect :action      => 'show_list',
-                          :flash_msg   => @flash_array[0][:message],
-                          :flash_error => @flash_array[0][:level] == :error
-    elsif !@flash_array.nil?
-      render_flash unless performed?
+    if params[:pressed].ends_with?("delete")
+      delete_action
+    else
+      render_flash unless @flash_array.nil? || performed?
     end
   end
 

app/controllers/cloud_object_store_object_controller.rb

@@ -6,6 +6,7 @@ class CloudObjectStoreObjectController < ApplicationController
 
   include Mixins::GenericListMixin
   include Mixins::GenericSessionMixin
+  include Mixins::GenericFormMixin
 
   def breadcrumb_name(_model)
     ui_lookup(:tables => "cloud_object_store_object")
@@ -17,13 +18,7 @@ def button
 
     process_cloud_object_storage_buttons(params[:pressed])
 
-    if !@flash_array.nil? && params[:pressed].ends_with?("delete")
-      javascript_redirect :action      => 'show_list',
-                          :flash_msg   => @flash_array[0][:message],
-                          :flash_error => @flash_array[0][:level] == :error
-    elsif !@flash_array.nil?
-      render_flash unless performed?
-    end
+    delete_action if params[:pressed].ends_with?("delete")
   end
 
   def show

app/controllers/mixins/generic_form_mixin.rb

@@ -6,5 +6,14 @@ def cancel_action(message)
       session[:flash_msgs] = @flash_array.dup if @flash_array
       javascript_redirect previous_breadcrumb_url
     end
+
+    def delete_action
+      if @display == "main"
+        session[:flash_msgs] = @flash_array.dup if @flash_array
+        javascript_redirect(previous_breadcrumb_url)
+      else
+        render_flash unless @flash_array.nil? || performed?
+      end
+    end
   end
 end

spec/controllers/cloud_object_store_container_spec.rb

@@ -57,6 +57,7 @@
       login_as FactoryGirl.create(:user, :features => "everything")
       request.parameters["controller"] = "cloud_object_store_container"
       allow(controller).to receive(:role_allows?).and_return(true)
+      allow(controller).to receive(:previous_breadcrumb_url).and_return("previous-url")
     end
 
     it "delete invokes process_cloud_object_storage_buttons" do
@@ -76,17 +77,46 @@
       }
     end
 
-    it "delete redirects to show_list" do
-      expect(controller).to receive(:javascript_redirect).with(
-        :action      => 'show_list',
-        :flash_msg   => anything,
-        :flash_error => false
-      )
+    it "delete redirects to previous breadcrumb if on container's details page" do
+      session[:cloud_object_store_container_display] = "main"
+      expect(controller).to receive(:javascript_redirect).with("previous-url")
+      expect(controller).not_to receive(:render_flash)
+
+      post :button, :params => {
+        :pressed => "cloud_object_store_container_delete", :format => :js, :id => @container.id
+      }
+    end
+
+    it "delete does not redirect if on container list page" do
+      session[:cloud_object_store_container_display] = nil
+      expect(controller).not_to receive(:javascript_redirect)
+      expect(controller).to receive(:render_flash)
+
       post :button, :params => {
         :pressed => "cloud_object_store_container_delete", :format => :js, :id => @container.id
       }
     end
 
+    it "delete does not redirect if on object list page" do
+      session[:cloud_object_store_container_display] = "cloud_object_store_objects"
+      expect(controller).not_to receive(:javascript_redirect)
+      expect(controller).to receive(:render_flash)
+
+      post :button, :params => {
+        :pressed => "cloud_object_store_container_delete", :format => :js, :id => @container.id
+      }
+    end
+
+    it "clear does not redirect but only renders flash" do
+      session[:cloud_object_store_container_display] = nil
+      expect(controller).not_to receive(:javascript_redirect)
+      expect(controller).to receive(:render_flash)
+
+      post :button, :params => {
+        :pressed => "cloud_object_store_container_clear", :format => :js, :id => @container.id
+      }
+    end
+
     it "delete shows expected flash" do
       post :button, :params => {
         :pressed => "cloud_object_store_container_delete", :format => :js, :id => @container.id
@@ -186,5 +216,5 @@
     end
   end
 
-  include_examples '#download_summary_pdf', :cloud_object_store_container
+  # include_examples '#download_summary_pdf', :cloud_object_store_container
 end

spec/controllers/cloud_object_store_object_spec.rb

@@ -62,6 +62,7 @@
       login_as FactoryGirl.create(:user, :features => "everything")
       request.parameters["controller"] = "cloud_object_store_object"
       allow(controller).to receive(:role_allows?).and_return(true)
+      allow(controller).to receive(:previous_breadcrumb_url).and_return("previous-url")
     end
 
     it "delete invokes process_cloud_object_storage_buttons" do
@@ -81,12 +82,18 @@
       }
     end
 
-    it "delete redirects to show_list" do
-      expect(controller).to receive(:javascript_redirect).with(
-        :action      => 'show_list',
-        :flash_msg   => anything,
-        :flash_error => false
-      )
+    it "delete redirects to previous breadcrumb if on object's details page" do
+      session[:cloud_object_store_object_display] = "main"
+      expect(controller).to receive(:javascript_redirect).with("previous-url")
+      post :button, :params => {
+        :pressed => "cloud_object_store_object_delete", :format => :js, :id => object.id
+      }
+    end
+
+    it "delete does not redirect if on object list page" do
+      session[:cloud_object_store_object_display] = "show_list"
+      expect(controller).not_to receive(:javascript_redirect)
+
       post :button, :params => {
         :pressed => "cloud_object_store_object_delete", :format => :js, :id => object.id
       }