Fixing broken rh-cloud tests in develop

Author: parthaa

test/controllers/insights_cloud/api/machine_telemetries_controller_test.rb

@@ -3,6 +3,8 @@
 
 module InsightsCloud::Api
   class MachineTelemetriesControllerTest < ActionController::TestCase
+    include KatelloCVEHelper
+
     setup do
       FactoryBot.create(:common_parameter, name: InsightsCloud.enable_client_param, key_type: 'boolean', value: true)
     end
@@ -122,29 +124,17 @@ class MachineTelemetriesControllerTest < ActionController::TestCase
       setup do
         UpstreamOnlySettingsTestHelper.set_if_available('allow_multiple_content_views')
         User.current = User.find_by(login: 'secret_admin')
-
-        @env = FactoryBot.create(:katello_k_t_environment)
-        @env2 = FactoryBot.create(:katello_k_t_environment, organization: @env.organization)
+        env = FactoryBot.create(:katello_k_t_environment)
+        env2 = FactoryBot.create(:katello_k_t_environment, organization: env.organization)
 
         @host = FactoryBot.create(
           :host,
           :with_subscription,
           :with_content,
           :with_hostgroup,
           :with_parameter,
-          content_view_environments: [
-            FactoryBot.create(
-              :katello_content_view_environment,
-              content_view: FactoryBot.create(:katello_content_view, organization: @env.organization),
-              lifecycle_environment: @env
-            ),
-            FactoryBot.create(
-              :katello_content_view_environment,
-              content_view: FactoryBot.create(:katello_content_view, organization: @env.organization),
-              lifecycle_environment: @env2
-            ),
-          ],
-          organization: @env.organization
+          content_view_environments: [make_cve(lifecycle_environment: env), make_cve(lifecycle_environment: env2)],
+          organization: env.organization
         )
 
         @host.subscription_facet.pools << FactoryBot.create(:katello_pool, account_number: '5678', cp_id: 1)

test/jobs/inventory_full_sync_test.rb

@@ -4,22 +4,23 @@
 class InventoryFullSyncTest < ActiveSupport::TestCase
   include ForemanTasks::TestHelpers::WithInThreadExecutor
   include MockCerts
+  include KatelloCVEHelper
 
   setup do
     User.current = User.find_by(login: 'secret_admin')
 
     InventorySync::Async::InventoryFullSync.any_instance.stubs(:plan_self_host_sync)
     Organization.any_instance.stubs(:manifest_expired?).returns(false)
 
-    env = FactoryBot.create(:katello_k_t_environment)
-    cv = env.content_views << FactoryBot.create(:katello_content_view, organization: env.organization)
+    cve = make_cve
+    env = cve.lifecycle_environment
 
     # this host would pass our plugin queries, so it could be uploaded to the cloud.
     @host1 = FactoryBot.create(
       :host,
       :with_subscription,
       :with_content,
-      content_view: cv.first,
+      content_view: cve.content_view,
       lifecycle_environment: env,
       organization: env.organization
     )
@@ -33,7 +34,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
       :host,
       :with_subscription,
       :with_content,
-      content_view: cv.first,
+      content_view: cve.content_view,
       lifecycle_environment: env,
       organization: env.organization
     )
@@ -46,7 +47,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
       :host,
       :with_subscription,
       :with_content,
-      content_view: cv.first,
+      content_view: cve.content_view,
       lifecycle_environment: env,
       organization: env.organization
     )

test/jobs/inventory_hosts_sync_test.rb

@@ -4,19 +4,19 @@
 class InventoryHostsSyncTest < ActiveSupport::TestCase
   include ForemanTasks::TestHelpers::WithInThreadExecutor
   include MockCerts
+  include KatelloCVEHelper
 
   setup do
     User.current = User.find_by(login: 'secret_admin')
-
-    env = FactoryBot.create(:katello_k_t_environment)
-    cv = env.content_views << FactoryBot.create(:katello_content_view, organization: env.organization)
-
+    cve = make_cve
+    env = cve.lifecycle_environment
+    cv = cve.content_view
     # this host would pass our plugin queries, so it could be uploaded to the cloud.
     @host1 = FactoryBot.create(
       :host,
       :with_subscription,
       :with_content,
-      content_view: cv.first,
+      content_view: cv,
       lifecycle_environment: env,
       organization: env.organization
     )
@@ -30,7 +30,7 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
       :host,
       :with_subscription,
       :with_content,
-      content_view: cv.first,
+      content_view: cv,
       lifecycle_environment: env,
       organization: env.organization
     )

test/test_plugin_helper.rb

@@ -118,6 +118,20 @@ module CandlepinIsolation
   end
 end
 
+module KatelloCVEHelper
+  def make_cve(lifecycle_environment: nil, content_view: nil)
+    env = lifecycle_environment || FactoryBot.create(:katello_k_t_environment)
+    content_view ||= FactoryBot.create(:katello_content_view, organization: env.organization)
+    cvv = ::Katello::ContentViewVersion.create!(:major => 2, :content_view => content_view)
+    FactoryBot.create(
+      :katello_content_view_environment,
+      content_view_version: cvv,
+      content_view: content_view,
+      lifecycle_environment: env
+    )
+  end
+end
+
 module UpstreamOnlySettingsTestHelper
   def self.set_if_available(setting_name, value: true)
     Setting[setting_name] = value

test/unit/archived_report_generator_test.rb

@@ -2,18 +2,18 @@
 
 class ArchivedReportGeneratorTest < ActiveSupport::TestCase
   include MockForemanHostname
+  include KatelloCVEHelper
 
   setup do
     User.current = User.find_by(login: 'secret_admin')
-
-    env = FactoryBot.create(:katello_k_t_environment)
-    cv = env.content_views << FactoryBot.create(:katello_content_view, organization: env.organization)
+    cve = make_cve
+    env = cve.lifecycle_environment
 
     @host = FactoryBot.create(
       :host,
       :with_subscription,
       :with_content,
-      content_view: cv.first,
+      content_view: cve.content_view,
       lifecycle_environment: env,
       organization: env.organization
     )

test/unit/services/foreman_rh_cloud/branch_info_test.rb

@@ -1,21 +1,22 @@
 require 'test_plugin_helper'
 
 class BranchInfoTest < ActiveSupport::TestCase
+  include KatelloCVEHelper
+
   setup do
     User.current = User.find_by(login: 'secret_admin')
 
-    @env = FactoryBot.create(:katello_k_t_environment)
-    cv = @env.content_views << FactoryBot.create(:katello_content_view, organization: @env.organization)
-
+    cve = make_cve
+    env = cve.lifecycle_environment
     @host = FactoryBot.create(
       :host,
       :with_subscription,
       :with_content,
       :with_hostgroup,
       :with_parameter,
-      content_view: cv.first,
-      lifecycle_environment: @env,
-      organization: @env.organization
+      content_view: cve.content_view,
+      lifecycle_environment: env,
+      organization: env.organization
     )
 
     @host.subscription_facet.pools << FactoryBot.create(:katello_pool, account_number: '5678', cp_id: 1)

test/unit/slice_generator_test.rb

@@ -3,21 +3,20 @@
 class SliceGeneratorTest < ActiveSupport::TestCase
   include KatelloLocationFix
   include CandlepinIsolation
+  include KatelloCVEHelper
 
   setup do
     User.current = User.find_by(login: 'secret_admin')
-
-    env = FactoryBot.create(:katello_k_t_environment)
-    cv = env.content_views << FactoryBot.create(:katello_content_view, organization: env.organization)
-
+    cve = make_cve
+    env = cve.lifecycle_environment
     location = FactoryBot.create(:location)
 
     @host = FactoryBot.create(
       :host,
       :redhat,
       :with_subscription,
       :with_content,
-      content_view: cv.first,
+      content_view: cve.content_view,
       lifecycle_environment: env,
       organization: env.organization,
       location: location

test/unit/tags_generator_test.rb

@@ -3,6 +3,7 @@
 class TagsGeneratorTest < ActiveSupport::TestCase
   include KatelloLocationFix
   include CandlepinIsolation
+  include KatelloCVEHelper
 
   setup do
     UpstreamOnlySettingsTestHelper.set_if_available('allow_multiple_content_views')
@@ -25,18 +26,7 @@ class TagsGeneratorTest < ActiveSupport::TestCase
       organization: env.organization,
       location: @location2,
       hostgroup: @hostgroup2,
-      content_view_environments: [
-        FactoryBot.create(
-          :katello_content_view_environment,
-          content_view: FactoryBot.create(:katello_content_view, organization: env.organization),
-          lifecycle_environment: env
-        ),
-        FactoryBot.create(
-          :katello_content_view_environment,
-          content_view: FactoryBot.create(:katello_content_view, organization: env.organization),
-          lifecycle_environment: env2
-        ),
-      ]
+      content_view_environments: [make_cve(lifecycle_environment: env), make_cve(lifecycle_environment: env2)]
     )
 
     @host.organization.pools << FactoryBot.create(:katello_pool, account_number: '1234', cp_id: 1)