Merge pull request #1540 from himdel/fix-hawk

Fix middleware spec failures on master
ManageIQ · Jun 14, 2017 · 663dd74 · 663dd74
2 parents cb8393a + db36fc9
commit 663dd74
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/spec/controllers/middleware_server_controller_spec.rb b/spec/controllers/middleware_server_controller_spec.rb
@@ -1,5 +1,9 @@
 describe MiddlewareServerController do
-  let(:server) { FactoryGirl.create(:hawkular_middleware_server, :properties => {}, :middleware_server_group => nil) }
+  let(:server) do
+    FactoryGirl.create(:hawkular_middleware_server, :properties              => {},
+                                                    :middleware_server_group => nil,
+                                                    :feed                    => '')
+  end
 
   render_views
   before(:each) do

diff --git a/spec/controllers/middleware_server_group_controller_spec.rb b/spec/controllers/middleware_server_group_controller_spec.rb
@@ -11,11 +11,17 @@
   end
 
   describe '#show' do
-    let(:group) { FactoryGirl.create(:hawkular_middleware_server_group, :properties => {}, :middleware_domain => nil) }
+    let(:group) do
+      FactoryGirl.create(:hawkular_middleware_server_group, :properties        => {},
+                                                            :middleware_domain => nil)
+    end
+
     let(:server) do
       FactoryGirl.create(:hawkular_middleware_server, :properties              => {},
-                                                      :middleware_server_group => group)
+                                                      :middleware_server_group => group,
+                                                      :feed                    => '')
     end
+
     before do
       EvmSpecHelper.create_guid_miq_server_zone
       login_as FactoryGirl.create(:user)

diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
@@ -1298,7 +1298,7 @@
         stub_user(:features => :all)
         allow(helper).to receive_messages(:controller_name => "ems_middleware")
         ems = FactoryGirl.create(:ems_hawkular)
-        MiddlewareDatasource.create(:ext_management_system => ems, :name => "Test Middleware")
+        FactoryGirl.create(:hawkular_middleware_datasource, :ext_management_system => ems, :name => "Test Middleware")
         expect(helper.multiple_relationship_link(ems, "middleware_datasource")).to eq("<li><a title=\"Show Middleware \
 Datasources\" href=\"/ems_middleware/#{ems.id}?display=middleware_datasources\">Middleware Datasources (1)</a></li>")
       end