Merge pull request #687 from martinpovolny/display_methods

Fix middleware display methods methods
ManageIQ · Mar 15, 2017 · 18093b3 · 18093b3
2 parents f22f681 + a623717
commit 18093b3
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/app/controllers/middleware_domain_controller.rb b/app/controllers/middleware_domain_controller.rb
@@ -10,7 +10,7 @@ class MiddlewareDomainController < ApplicationController
   after_action :set_session_data
 
   def self.display_methods
-    %i(middleware_server_groups)
+    %w(middleware_server_groups)
   end
 
   menu_section :cnt

diff --git a/app/controllers/middleware_server_controller.rb b/app/controllers/middleware_server_controller.rb
@@ -159,7 +159,7 @@ def add_datasource
   end
 
   def self.display_methods
-    %i(middleware_datasources middleware_deployments middleware_messagings)
+    %w(middleware_datasources middleware_deployments middleware_messagings)
   end
 
   def button

diff --git a/app/controllers/middleware_server_group_controller.rb b/app/controllers/middleware_server_group_controller.rb
@@ -35,7 +35,7 @@ def self.operations
   end
 
   def self.display_methods
-    %i(middleware_servers)
+    %w(middleware_servers)
   end
 
   def textual_group_list

diff --git a/spec/controllers/middleware_server_controller_spec.rb b/spec/controllers/middleware_server_controller_spec.rb
@@ -30,4 +30,18 @@
       end
     end
   end
+
+  # FIXME: should test for nested entities: %w(middleware_datasources middleware_deployments middleware_messagings)
+  describe '#show' do
+    before do
+      EvmSpecHelper.create_guid_miq_server_zone
+    end
+
+    let(:server) { FactoryGirl.create(:middleware_server) }
+    let(:deployment) { FactoryGirl.create(:middleware_deployment, :middleware_server => server) }
+
+    it "show associated server groups" do
+      assert_nested_list(server, [deployment], 'middleware_deployments', 'All Middleware Deployments')
+    end
+  end
 end