Handle generic exceptions and re-word MiqException::Error message

https://bugzilla.redhat.com/show_bug.cgi?id=1392617
ManageIQ · Nov 9, 2016 · bd8353c · bd8353c
1 parent b44839b
commit bd8353c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/app/controllers/miq_ae_tools_controller.rb b/app/controllers/miq_ae_tools_controller.rb
@@ -131,8 +131,8 @@ def import_via_git
       git_based_domain_import_service.import(params[:git_repo_id], params[:git_branch_or_tag], current_tenant.id)
 
       add_flash(_("Imported from git"), :info)
-    rescue MiqException::Error
-      add_flash(_("The selected branch or tag does not have valid domain object data"), :error)
+    rescue => error
+      add_flash(_("Error: import failed: %{message}") % {:message => error.message}, :error)
     end
 
     respond_to do |format|

diff --git a/app/services/git_based_domain_import_service.rb b/app/services/git_based_domain_import_service.rb
@@ -77,7 +77,8 @@ def import(git_repo_id, branch_or_tag, tenant_id)
     task = MiqTask.wait_for_taskid(task_id)
 
     domain = task.task_results
-    raise MiqException::Error, "Domain object not available from task results" unless domain.kind_of?(MiqAeDomain)
+    error_message = _("Selected branch or tag does not contain a valid domain")
+    raise MiqException::Error, error_message unless domain.kind_of?(MiqAeDomain)
     domain.update_attribute(:enabled, true)
   end
 

diff --git a/spec/controllers/miq_ae_tools_controller_spec.rb b/spec/controllers/miq_ae_tools_controller_spec.rb
@@ -484,14 +484,14 @@
       before do
         tenant_id = controller.current_tenant.id
         allow(git_based_domain_import_service).to receive(:import).with("123", "branch_or_tag", tenant_id).and_raise(
-          MiqException::Error
+          MiqException::Error, "kaboom"
         )
       end
 
       it "responds with an error message" do
         post :import_via_git, :params => params, :xhr => true
         expect(response.body).to eq(
-          [{:message => "The selected branch or tag does not have valid domain object data", :level => :error}].to_json
+          [{:message => "Error: import failed: kaboom", :level => :error}].to_json
         )
       end
     end

diff --git a/spec/services/git_based_domain_import_service_spec.rb b/spec/services/git_based_domain_import_service_spec.rb
@@ -87,11 +87,13 @@
     context "when import fails and the task result is nil" do
       let(:git_branches) { [double("GitBranch", :name => ref_name)] }
 
-      it "raises exception" do
+      it "raises an exception with a message" do
         allow(task).to receive(:task_results).and_return(nil)
         expect(MiqTask).to receive(:generic_action_with_callback).with(task_options, queue_options).and_return(task.id)
 
-        expect { subject.import(git_repo.id, ref_name, 321) }.to raise_exception(MiqException::Error)
+        expect { subject.import(git_repo.id, ref_name, 321) }.to raise_exception(
+          MiqException::Error, "Selected branch or tag does not contain a valid domain"
+        )
       end
     end
   end