foreman_rh_cloud 2.0.6 → 2.0.7

data/webpack/ForemanRhCloudReducers.js

@@ -0,0 +1,8 @@
+import { combineReducers } from 'redux';
+import inventoryUploadReducers from './ForemanInventoryUpload/ForemanInventoryUploadReducers';
+
+export default {
+  ForemanRhCloud: combineReducers({
+    ...inventoryUploadReducers,
+  }),
+};

data/webpack/ForemanRhCloudSelectors.js

@@ -0,0 +1,3 @@
+export const selectForemanRhCloud = state => state.ForemanRhCloud;
+export const selectForemanInventoryUpload = state =>
+  selectForemanRhCloud(state).inventoryUpload;

data/webpack/ForemanRhCloudTestHelpers.js

@@ -0,0 +1,5 @@
+export const inventoryStateWrapper = innerState => ({
+  ForemanRhCloud: {
+    inventoryUpload: { ...innerState },
+  },
+});

data/webpack/__mocks__/foremanReact/components/Layout/LayoutConstants.js

@@ -0,0 +1 @@
+export const LAYOUT_CHANGE_ORG = 'LAYOUT_CHANGE_ORG';

data/webpack/__tests__/ForemanRhCloudHelpers.test.js

@@ -0,0 +1,11 @@
+import { testSelectorsSnapshotWithFixtures } from '@theforeman/test';
+import { foremanUrl } from '../ForemanRhCloudHelpers';
+
+global.URL_PREFIX = 'MY_TEST_URL_PREFIX.example.com';
+
+const fixtures = {
+  'should return foreman Url': () => foremanUrl('/test_path'),
+};
+
+describe('ForemanRhCloud helpers', () =>
+  testSelectorsSnapshotWithFixtures(fixtures));

data/webpack/__tests__/ForemanRhCloudSelectors.test.js

@@ -0,0 +1,17 @@
+import { testSelectorsSnapshotWithFixtures } from '@theforeman/test';
+import { inventoryStateWrapper } from '../ForemanRhCloudTestHelpers';
+import {
+  selectForemanRhCloud,
+  selectForemanInventoryUpload,
+} from '../ForemanRhCloudSelectors';
+
+const state = inventoryStateWrapper({ inventoryReducersNamespaces: {} });
+
+const fixtures = {
+  'should return ForemanRhCloud': () => selectForemanRhCloud(state),
+  'should return ForemanInventoryUpload': () =>
+    selectForemanInventoryUpload(state),
+};
+
+describe('ForemanRhCloud selectors', () =>
+  testSelectorsSnapshotWithFixtures(fixtures));

data/webpack/__tests__/ForemanRhCloudTestHelpers.test.js

@@ -0,0 +1,10 @@
+import { testSelectorsSnapshotWithFixtures } from '@theforeman/test';
+import { inventoryStateWrapper } from '../ForemanRhCloudTestHelpers';
+
+const fixtures = {
+  'should return inventory wrapper': () =>
+    inventoryStateWrapper({ inventoryChildren: null }),
+};
+
+describe('ForemanRhCloud helpers', () =>
+  testSelectorsSnapshotWithFixtures(fixtures));

data/webpack/__tests__/__snapshots__/ForemanRhCloudHelpers.test.js.snap

@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ForemanRhCloud helpers should return foreman Url 1`] = `"MY_TEST_URL_PREFIX.example.com/test_path"`;

data/webpack/__tests__/__snapshots__/ForemanRhCloudSelectors.test.js.snap

@@ -0,0 +1,15 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ForemanRhCloud selectors should return ForemanInventoryUpload 1`] = `
+Object {
+  "inventoryReducersNamespaces": Object {},
+}
+`;
+
+exports[`ForemanRhCloud selectors should return ForemanRhCloud 1`] = `
+Object {
+  "inventoryUpload": Object {
+    "inventoryReducersNamespaces": Object {},
+  },
+}
+`;

data/webpack/__tests__/__snapshots__/ForemanRhCloudTestHelpers.test.js.snap

@@ -0,0 +1,11 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ForemanRhCloud helpers should return inventory wrapper 1`] = `
+Object {
+  "ForemanRhCloud": Object {
+    "inventoryUpload": Object {
+      "inventoryChildren": null,
+    },
+  },
+}
+`;

data/webpack/index.js

@@ -3,7 +3,7 @@
 /* eslint-disable import/extensions */
 import componentRegistry from 'foremanReact/components/componentRegistry';
 import { registerReducer } from 'foremanReact/common/MountingService';
-import reducers from './ForemanInventoryUpload/ForemanInventoryUploadReducers';
+import reducers from './ForemanRhCloudReducers';
 import ForemanInventoryUpload from './ForemanInventoryUpload';
 
 // register reducers

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-22 00:00:00.000000000 Z
+date: 2020-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -105,12 +105,13 @@ files:
 - README.md
 - Rakefile
 - app/controllers/foreman_inventory_upload/accounts_controller.rb
-- app/controllers/foreman_inventory_upload/react_controller.rb
 - app/controllers/foreman_inventory_upload/reports_controller.rb
 - app/controllers/foreman_inventory_upload/uploads_controller.rb
+- app/controllers/foreman_rh_cloud/react_controller.rb
 - app/helpers/foreman_inventory_upload_helper.rb
 - app/models/setting/rh_cloud.rb
-- app/views/foreman_inventory_upload/layouts/react.html.erb
+- app/views/foreman_rh_cloud/react/inventory_upload.html.erb
+- app/views/layouts/foreman_rh_cloud/application.html.erb
 - config/routes.rb
 - lib/foreman_inventory_upload.rb
 - lib/foreman_inventory_upload/async/async_helpers.rb
@@ -147,7 +148,6 @@ files:
 - test/unit/metadata_generator_test.rb
 - test/unit/shell_process_job_test.rb
 - test/unit/slice_generator_test.rb
-- test/unit/slice_generator_test.rb.orig
 - webpack/ForemanInventoryUpload/Components/AccountList/AccountList.fixtures.js
 - webpack/ForemanInventoryUpload/Components/AccountList/AccountList.js
 - webpack/ForemanInventoryUpload/Components/AccountList/AccountList.stories.js
@@ -156,6 +156,11 @@ files:
 - webpack/ForemanInventoryUpload/Components/AccountList/AccountListHelper.js
 - webpack/ForemanInventoryUpload/Components/AccountList/AccountListReducer.js
 - webpack/ForemanInventoryUpload/Components/AccountList/AccountListSelectors.js
+- webpack/ForemanInventoryUpload/Components/AccountList/Components/EmptyResults/EmptyResults.js
+- webpack/ForemanInventoryUpload/Components/AccountList/Components/EmptyResults/__tests__/EmptyResults.test.js
+- webpack/ForemanInventoryUpload/Components/AccountList/Components/EmptyResults/__tests__/__snapshots__/EmptyResults.test.js.snap
+- webpack/ForemanInventoryUpload/Components/AccountList/Components/EmptyResults/emptyResults.scss
+- webpack/ForemanInventoryUpload/Components/AccountList/Components/EmptyResults/index.js
 - webpack/ForemanInventoryUpload/Components/AccountList/Components/EmptyState/EmptyState.fixtures.js
 - webpack/ForemanInventoryUpload/Components/AccountList/Components/EmptyState/EmptyState.js
 - webpack/ForemanInventoryUpload/Components/AccountList/Components/EmptyState/EmptyStateHelper.js
@@ -186,6 +191,7 @@ files:
 - webpack/ForemanInventoryUpload/Components/AccountList/Components/ListItemStatus/listItemStatus.scss
 - webpack/ForemanInventoryUpload/Components/AccountList/__tests__/AccountList.test.js
 - webpack/ForemanInventoryUpload/Components/AccountList/__tests__/AccountListActions.test.js
+- webpack/ForemanInventoryUpload/Components/AccountList/__tests__/AccountListHelper.test.js
 - webpack/ForemanInventoryUpload/Components/AccountList/__tests__/AccountListIntegration.test.js
 - webpack/ForemanInventoryUpload/Components/AccountList/__tests__/AccountListReducer.test.js
 - webpack/ForemanInventoryUpload/Components/AccountList/__tests__/AccountListSelectors.test.js
@@ -238,6 +244,26 @@ files:
 - webpack/ForemanInventoryUpload/Components/FullScreenModal/__tests__/__snapshots__/FullScreenModal.test.js.snap
 - webpack/ForemanInventoryUpload/Components/FullScreenModal/fullScreenModal.scss
 - webpack/ForemanInventoryUpload/Components/FullScreenModal/index.js
+- webpack/ForemanInventoryUpload/Components/InventoryFilter/Components/ClearButton/ClearButton.js
+- webpack/ForemanInventoryUpload/Components/InventoryFilter/Components/ClearButton/index.js
+- webpack/ForemanInventoryUpload/Components/InventoryFilter/InventoryFilter.fixtures.js
+- webpack/ForemanInventoryUpload/Components/InventoryFilter/InventoryFilter.js
+- webpack/ForemanInventoryUpload/Components/InventoryFilter/InventoryFilterActions.js
+- webpack/ForemanInventoryUpload/Components/InventoryFilter/InventoryFilterConstants.js
+- webpack/ForemanInventoryUpload/Components/InventoryFilter/InventoryFilterReducer.js
+- webpack/ForemanInventoryUpload/Components/InventoryFilter/InventoryFilterSelectors.js
+- webpack/ForemanInventoryUpload/Components/InventoryFilter/__tests__/InventoryFilter.test.js
+- webpack/ForemanInventoryUpload/Components/InventoryFilter/__tests__/InventoryFilterActions.test.js
+- webpack/ForemanInventoryUpload/Components/InventoryFilter/__tests__/InventoryFilterReducer.test.js
+- webpack/ForemanInventoryUpload/Components/InventoryFilter/__tests__/InventoryFilterSelectors.test.js
+- webpack/ForemanInventoryUpload/Components/InventoryFilter/__tests__/__snapshots__/InventoryFilter.test.js.snap
+- webpack/ForemanInventoryUpload/Components/InventoryFilter/__tests__/__snapshots__/InventoryFilterActions.test.js.snap
+- webpack/ForemanInventoryUpload/Components/InventoryFilter/__tests__/__snapshots__/InventoryFilterReducer.test.js.snap
+- webpack/ForemanInventoryUpload/Components/InventoryFilter/__tests__/__snapshots__/InventoryFilterSelectors.test.js.snap
+- webpack/ForemanInventoryUpload/Components/InventoryFilter/__tests__/__snapshots__/integration.test.js.snap
+- webpack/ForemanInventoryUpload/Components/InventoryFilter/__tests__/integration.test.js
+- webpack/ForemanInventoryUpload/Components/InventoryFilter/index.js
+- webpack/ForemanInventoryUpload/Components/InventoryFilter/inventoryFilter.scss
 - webpack/ForemanInventoryUpload/Components/NavContainer/NavContainer.fixtures.js
 - webpack/ForemanInventoryUpload/Components/NavContainer/NavContainer.js
 - webpack/ForemanInventoryUpload/Components/NavContainer/NavContainerHelper.js
@@ -249,6 +275,7 @@ files:
 - webpack/ForemanInventoryUpload/Components/PageHeader/__tests__/PageHeader.test.js
 - webpack/ForemanInventoryUpload/Components/PageHeader/__tests__/__snapshots__/PageHeader.test.js.snap
 - webpack/ForemanInventoryUpload/Components/PageHeader/index.js
+- webpack/ForemanInventoryUpload/Components/PageHeader/pageHeader.scss
 - webpack/ForemanInventoryUpload/Components/ReportGenerate/ReportGenerate.fixtures.js
 - webpack/ForemanInventoryUpload/Components/ReportGenerate/ReportGenerate.js
 - webpack/ForemanInventoryUpload/Components/ReportGenerate/ReportGenerateHelper.js
@@ -312,15 +339,29 @@ files:
 - webpack/ForemanInventoryUpload/Components/Terminal/__tests__/__snapshots__/Terminal.test.js.snap
 - webpack/ForemanInventoryUpload/Components/Terminal/index.js
 - webpack/ForemanInventoryUpload/Components/Terminal/terminal.scss
+- webpack/ForemanInventoryUpload/ForemanInventoryConstants.js
+- webpack/ForemanInventoryUpload/ForemanInventoryHelpers.js
 - webpack/ForemanInventoryUpload/ForemanInventoryUpload.js
-- webpack/ForemanInventoryUpload/ForemanInventoryUpload.test.js
 - webpack/ForemanInventoryUpload/ForemanInventoryUploadReducers.js
-- webpack/ForemanInventoryUpload/ForemanInventoryUploadSelectors.js
-- webpack/ForemanInventoryUpload/__snapshots__/ForemanInventoryUpload.test.js.snap
+- webpack/ForemanInventoryUpload/__tests__/ForemanInventoryHelpers.test.js
+- webpack/ForemanInventoryUpload/__tests__/ForemanInventoryUpload.test.js
+- webpack/ForemanInventoryUpload/__tests__/__snapshots__/ForemanInventoryHelpers.test.js.snap
+- webpack/ForemanInventoryUpload/__tests__/__snapshots__/ForemanInventoryUpload.test.js.snap
 - webpack/ForemanInventoryUpload/index.js
+- webpack/ForemanRhCloudHelpers.js
+- webpack/ForemanRhCloudReducers.js
+- webpack/ForemanRhCloudSelectors.js
+- webpack/ForemanRhCloudTestHelpers.js
 - webpack/__mocks__/foremanReact/API.js
 - webpack/__mocks__/foremanReact/common/I18n.js
 - webpack/__mocks__/foremanReact/common/helpers.js
+- webpack/__mocks__/foremanReact/components/Layout/LayoutConstants.js
+- webpack/__tests__/ForemanRhCloudHelpers.test.js
+- webpack/__tests__/ForemanRhCloudSelectors.test.js
+- webpack/__tests__/ForemanRhCloudTestHelpers.test.js
+- webpack/__tests__/__snapshots__/ForemanRhCloudHelpers.test.js.snap
+- webpack/__tests__/__snapshots__/ForemanRhCloudSelectors.test.js.snap
+- webpack/__tests__/__snapshots__/ForemanRhCloudTestHelpers.test.js.snap
 - webpack/index.js
 homepage: https://github.com/theforeman/foreman_rh_cloud
 licenses:
@@ -353,7 +394,6 @@ test_files:
 - test/factories/inventory_upload_factories.rb
 - test/unit/shell_process_job_test.rb
 - test/unit/metadata_generator_test.rb
-- test/unit/slice_generator_test.rb.orig
 - test/unit/fact_helpers_test.rb
 - test/unit/archived_report_generator_test.rb
 - test/unit/slice_generator_test.rb

data/app/controllers/foreman_inventory_upload/react_controller.rb

@@ -1,7 +0,0 @@
-module ForemanInventoryUpload
-  class ReactController < ::ApplicationController
-    def index
-      render 'foreman_inventory_upload/layouts/react', :layout => false
-    end
-  end
-end

data/test/unit/slice_generator_test.rb.orig

@@ -1,280 +0,0 @@
-require 'test_plugin_helper'
-
-class ReportGeneratorTest < ActiveSupport::TestCase
-  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)
-
-    @host = FactoryBot.create(
-      :host,
-      :with_subscription,
-      :with_content,
-      content_view: cv.first,
-      lifecycle_environment: env,
-      organization: env.organization
-    )
-
-    @host.organization.pools << FactoryBot.create(:katello_pool, account_number: '1234', cp_id: 1)
-
-    ForemanInventoryUpload::Generators::Queries.instance_variable_set(:@fact_names, nil)
-  end
-
-  def interesting_facts
-    [
-      'dmi::system::uuid',
-      'virt::uuid',
-      'cpu::cpu(s)',
-      'cpu::cpu_socket(s)',
-      'cpu::core(s)_per_socket',
-      'memory::memtotal',
-      'dmi::bios::vendor',
-      'dmi::bios::version',
-      'dmi::bios::relase_date',
-      'uname::release',
-      'lscpu::flags',
-      'distribution::name',
-      'distribution::version',
-      'distribution::id',
-      'virt::is_guest',
-    ]
-  end
-
-  def fact_names
-    @fact_names ||= Hash[
-      interesting_facts.map do |fact|
-        [fact, FactoryBot.create(:fact_name, name: fact, type: 'Katello::RhsmFactName')]
-      end
-    ]
-  end
-
-  test 'generates a report for a single host' do
-    batch = Host.where(id: @host.id).in_batches.first
-    generator = create_generator(batch)
-
-    json_str = generator.render
-    actual = JSON.parse(json_str.join("\n"))
-
-    assert_equal 'slice_123', actual['report_slice_id']
-    assert_not_nil(actual_host = actual['hosts'].first)
-    assert_equal @host.name, actual_host['display_name']
-    assert_equal @host.fqdn, actual_host['fqdn']
-    assert_equal '1234', actual_host['account']
-    assert_equal 1, generator.hosts_count
-  end
-
-  test 'generates a report with satellite facts' do
-    Foreman.expects(:instance_id).twice.returns('satellite-id')
-    batch = Host.where(id: @host.id).in_batches.first
-    generator = create_generator(batch)
-
-    json_str = generator.render
-    actual = JSON.parse(json_str.join("\n"))
-
-    facts = actual['hosts'].first['facts'].first
-    assert_equal 'satellite', facts['namespace']
-    satellite_facts = facts['facts']
-    assert_equal 'satellite-id', satellite_facts['satellite_instance_id']
-    assert_equal @host.organization_id, satellite_facts['organization_id']
-
-    instance_id_tag = actual['hosts'].first['tags'].find { |tag| tag['namespace'] == 'satellite' && tag['key'] == 'satellite_instance_id' }
-    assert_not_nil instance_id_tag
-    assert_equal 'satellite-id', instance_id_tag['value']
-
-    org_id_tag = actual['hosts'].first['tags'].find { |tag| tag['namespace'] == 'satellite' && tag['key'] == 'organization_id' }
-    assert_not_nil org_id_tag
-    assert_equal @host.organization_id.to_s, org_id_tag['value']
-
-    version = satellite_facts['satellite_version']
-    if defined?(ForemanThemeSatellite)
-      assert_equal ForemanThemeSatellite::SATELLITE_VERSION, version
-    else
-      assert_nil version
-    end
-  end
-
-  test 'generates a report for a host with hypervisor' do
-    hypervisor_host = FactoryBot.create(
-      :host,
-      :with_subscription,
-      :with_content,
-      content_view: @host.content_view,
-      lifecycle_environment: @host.lifecycle_environment,
-      organization: @host.organization
-    )
-
-    @host.subscription_facet.hypervisor_host = hypervisor_host
-    @host.save!
-
-    batch = Host.where(id: @host.id).in_batches.first
-    generator = create_generator(batch)
-
-    json_str = generator.render
-    actual = JSON.parse(json_str.join("\n"))
-
-    assert_equal 'slice_123', actual['report_slice_id']
-    assert_not_nil(actual_host = actual['hosts'].first)
-    assert_equal @host.name, actual_host['display_name']
-    assert_equal @host.fqdn, actual_host['fqdn']
-    assert_not_nil(host_facts = actual_host['facts']&.first)
-    assert_equal 'satellite', host_facts['namespace']
-    assert_not_nil(fact_values = host_facts['facts'])
-    assert_equal hypervisor_host.name, fact_values['virtual_host_name']
-    assert_equal hypervisor_host.subscription_facet.uuid, fact_values['virtual_host_uuid']
-  end
-
-  test 'generates a report with system purpose' do
-    @host.subscription_facet.purpose_usage = 'test_usage'
-    @host.subscription_facet.purpose_role = 'test_role'
-    @host.subscription_facet.save!
-
-    batch = Host.where(id: @host.id).in_batches.first
-    generator = create_generator(batch)
-
-    json_str = generator.render
-    actual = JSON.parse(json_str.join("\n"))
-
-    assert_equal 'slice_123', actual['report_slice_id']
-    assert_not_nil(actual_host = actual['hosts'].first)
-    assert_equal @host.name, actual_host['display_name']
-    assert_equal @host.fqdn, actual_host['fqdn']
-    assert_not_nil(host_facts = actual_host['facts']&.first)
-    assert_equal 'satellite', host_facts['namespace']
-    assert_not_nil(fact_values = host_facts['facts'])
-    assert_equal 'test_usage', fact_values['system_purpose_usage']
-    assert_equal 'test_role', fact_values['system_purpose_role']
-  end
-
-  test 'generates a report for a golden ticket' do
-    batch = Host.where(id: @host.id).in_batches.first
-    generator = create_generator(batch) do |generator|
-      generator.stubs(:golden_ticket?).returns(true)
-    end
-
-    json_str = generator.render
-    actual = JSON.parse(json_str.join("\n"))
-
-    assert_equal 'slice_123', actual['report_slice_id']
-    assert_not_nil(actual_host = actual['hosts'].first)
-    assert_equal @host.name, actual_host['display_name']
-    assert_equal @host.fqdn, actual_host['fqdn']
-    assert_equal '1234', actual_host['account']
-    assert_equal 1, generator.hosts_count
-  end
-
-  test 'skips hosts without subscription' do
-    a_host = FactoryBot.create(
-      :host,
-      organization: @host.organization
-    )
-
-    # make a_host last
-    batch = Host.where(id: [@host.id, a_host.id]).order(:name).in_batches.first
-    generator = create_generator(batch)
-
-    json_str = generator.render
-    actual = JSON.parse(json_str.join("\n"))
-
-    assert_equal 'slice_123', actual['report_slice_id']
-    assert_not_nil(actual_host = actual['hosts'].first)
-    assert_equal @host.name, actual_host['display_name']
-    assert_equal @host.fqdn, actual_host['fqdn']
-    assert_equal '1234', actual_host['account']
-    assert_equal 1, generator.hosts_count
-  end
-
-  test 'shows system_memory_bytes in bytes' do
-    FactoryBot.create(:fact_value, fact_name: fact_names['memory::memtotal'], value: '1', host: @host)
-
-    batch = Host.where(id: @host.id).in_batches.first
-    generator = create_generator(batch)
-
-    json_str = generator.render
-    actual = JSON.parse(json_str.join("\n"))
-
-    assert_equal 'slice_123', actual['report_slice_id']
-    assert_not_nil(actual_host = actual['hosts'].first)
-    assert_not_nil(actual_profile = actual_host['system_profile'])
-    assert_equal 1024, actual_profile['system_memory_bytes']
-  end
-
-  test 'reports an account for hosts with multiple pools' do
-    first_pool = @host.organization.pools.first
-    second_pool = FactoryBot.create(:katello_pool, account_number: nil, cp_id: 2)
-    new_org = FactoryBot.create(:organization, pools: [first_pool, second_pool])
-    @host.organization = new_org
-    @host.save!
-
-    batch = Host.where(id: @host.id).in_batches.first
-    generator = create_generator(batch)
-
-    json_str = generator.render
-    actual = JSON.parse(json_str.join("\n"))
-
-    assert_equal 'slice_123', actual['report_slice_id']
-    assert_not_nil(actual_host = actual['hosts'].first)
-    assert_not_nil(actual_host['account'])
-    assert_not_empty(actual_host['account'])
-  end
-
-  test 'Generates os_release with version and id' do
-    FactoryBot.create(:fact_value, fact_name: fact_names['distribution::name'], value: 'Red Hat Test Linux', host: @host)
-    FactoryBot.create(:fact_value, fact_name: fact_names['distribution::version'], value: '7.1', host: @host)
-    FactoryBot.create(:fact_value, fact_name: fact_names['distribution::id'], value: 'TestId', host: @host)
-
-    batch = Host.where(id: @host.id).in_batches.first
-    generator = create_generator(batch)
-
-    json_str = generator.render
-    actual = JSON.parse(json_str.join("\n"))
-
-    assert_equal 'slice_123', actual['report_slice_id']
-    assert_not_nil(actual_host = actual['hosts'].first)
-    assert_not_nil(actual_profile = actual_host['system_profile'])
-    assert_equal 'Red Hat Test Linux 7.1 (TestId)', actual_profile['os_release']
-  end
-
-<<<<<<< HEAD
-  test 'sets infrastructure_type to "virtual" based on virt.is_guest fact' do
-    FactoryBot.create(:fact_value, fact_name: fact_names['virt::is_guest'], value: true, host: @host)
-
-    batch = Host.where(id: @host.id).in_batches.first
-    generator = ForemanInventoryUpload::Generators::Slice.new(batch, [], 'slice_123')
-
-    json_str = generator.render
-    actual = JSON.parse(json_str.join("\n"))
-
-    assert_equal 'slice_123', actual['report_slice_id']
-    assert_not_nil(actual_host = actual['hosts'].first)
-    assert_not_nil(actual_profile = actual_host['system_profile'])
-    assert_equal 'virtual', actual_profile['infrastructure_type']
-  end
-
-  test 'sets infrastructure_type to "physical" based on virt.is_guest fact' do
-    FactoryBot.create(:fact_value, fact_name: fact_names['virt::is_guest'], value: false, host: @host)
-
-    batch = Host.where(id: @host.id).in_batches.first
-    generator = ForemanInventoryUpload::Generators::Slice.new(batch, [], 'slice_123')
-
-    json_str = generator.render
-    actual = JSON.parse(json_str.join("\n"))
-
-    assert_equal 'slice_123', actual['report_slice_id']
-    assert_not_nil(actual_host = actual['hosts'].first)
-    assert_not_nil(actual_profile = actual_host['system_profile'])
-    assert_equal 'physical', actual_profile['infrastructure_type']
-=======
-  private
-
-  def create_generator(batch, name = 'slice_123')
-    generator = ForemanInventoryUpload::Generators::Slice.new(batch, [], name)
-    if block_given?
-      yield(generator)
-    else
-      generator.stubs(:golden_ticket?).returns(false)
-    end
-    generator
->>>>>>> Add support fo golden ticket
-  end
-end