foreman_rh_cloud 0.9.5 → 2.0.4

data/test/unit/slice_generator_test.rb

@@ -17,8 +17,6 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     )
 
     @host.subscription_facet.pools << FactoryBot.create(:katello_pool, account_number: '1234', cp_id: 1)
-
-    ForemanInventoryUpload::Generators::Queries.instance_variable_set(:@fact_names, nil)
   end
 
   def interesting_facts
@@ -32,11 +30,9 @@ class ReportGeneratorTest < ActiveSupport::TestCase
       'dmi::bios::vendor',
       'dmi::bios::version',
       'dmi::bios::relase_date',
+      'distribution::name',
       'uname::release',
       'lscpu::flags',
-      'distribution::name',
-      'distribution::version',
-      'distribution::id',
     ]
   end
 
@@ -60,7 +56,6 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     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
@@ -83,7 +78,7 @@ class ReportGeneratorTest < ActiveSupport::TestCase
 
     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']
+    assert_equal @host.organization_id, org_id_tag['value']
 
     version = satellite_facts['satellite_version']
     if defined?(ForemanThemeSatellite)
@@ -163,7 +158,6 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     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
@@ -180,41 +174,4 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     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.subscription_facet.pools.first
-    second_pool = FactoryBot.create(:katello_pool, account_number: nil, cp_id: 2)
-    @host.subscription_facet.pools = []
-    @host.subscription_facet.save!
-    @host.subscription_facet.pools << first_pool
-    @host.subscription_facet.pools << second_pool
-
-    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_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 = 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 'Red Hat Test Linux 7.1 (TestId)', actual_profile['os_release']
-  end
 end

data/webpack/ForemanInventoryUpload/Components/AccountList/AccountList.fixtures.js

@@ -28,8 +28,6 @@ export const accountID = 'user@redhat.com';
 
 export const processStatusName = 'upload_report_status';
 
-export const autoUploadEnabled = true;
-
 export const props = {
   accounts,
   fetchAccountsStatus: noop,

data/webpack/ForemanInventoryUpload/Components/AccountList/AccountList.stories.js

@@ -1,18 +1,9 @@
 import React from 'react';
-import { storiesOf } from '@storybook/react';
-import { withKnobs } from '@storybook/addon-knobs';
-import { Provider } from 'react-redux';
-import configureStore from '../../../stories/configureStore';
 import AccountList from './AccountList';
 
-const store = configureStore();
+export default {
+  title: 'AccountList',
+  component: AccountList,
+};
 
-storiesOf('Account list', module)
-  .addDecorator(withKnobs)
-  .add('Account list', () => (
-    <div style={{ margin: '20px' }}>
-      <Provider store={store}>
-        <AccountList />
-      </Provider>
-    </div>
-  ));
+export const Basic = () => <AccountList />;

data/webpack/ForemanInventoryUpload/Components/AccountList/AccountListActions.js

@@ -10,13 +10,12 @@ import {
 export const fetchAccountsStatus = () => async dispatch => {
   try {
     const {
-      data: { accounts, autoUploadEnabled },
+      data: { accounts },
     } = await API.get('accounts');
     dispatch({
       type: INVENTORY_ACCOUNT_STATUS_POLLING,
       payload: {
         accounts,
-        autoUploadEnabled,
       },
     });
   } catch (error) {

data/webpack/ForemanInventoryUpload/Components/AccountList/AccountListReducer.js

@@ -5,7 +5,6 @@ import {
   INVENTORY_ACCOUNT_STATUS_POLLING_START,
   INVENTORY_PROCESS_RESTART,
 } from './AccountListConstants';
-import { AUTO_UPLOAD_TOGGLE } from '../AutoUploadSwitcher/AutoUploadSwitcherConstants';
 
 const initialState = Immutable({
   accounts: {},
@@ -21,7 +20,6 @@ export default (state = initialState, action) => {
       accounts,
       accountID,
       processStatusName,
-      autoUploadEnabled,
     } = {},
   } = action;
 
@@ -30,7 +28,6 @@ export default (state = initialState, action) => {
       return state.merge({
         ...state,
         accounts,
-        autoUploadEnabled,
         error: null,
       });
     case INVENTORY_ACCOUNT_STATUS_POLLING_ERROR:
@@ -52,11 +49,6 @@ export default (state = initialState, action) => {
           [processStatusName]: 'Restarting...',
         },
       });
-    case AUTO_UPLOAD_TOGGLE:
-      return state.merge({
-        ...state,
-        autoUploadEnabled,
-      });
     default:
       return state;
   }

data/webpack/ForemanInventoryUpload/Components/AccountList/AccountListSelectors.js

@@ -6,5 +6,3 @@ export const selectAccounts = state => selectAccountsList(state).accounts;
 export const selectPollingProcessID = state =>
   selectAccountsList(state).pollingProcessID;
 export const selectError = state => selectAccountsList(state).error;
-export const selectAutoUploadEnabled = state =>
-  selectAccountsList(state).autoUploadEnabled;

data/webpack/ForemanInventoryUpload/Components/AccountList/Components/EmptyState/__tests__/EmptyState.test.js

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import EmptyState from '../EmptyState';
 

data/webpack/ForemanInventoryUpload/Components/AccountList/Components/ErrorState/__tests__/ErrorState.test.js

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import ErrorState from '../ErrorState';
 

data/webpack/ForemanInventoryUpload/Components/AccountList/Components/ListItem/__tests__/ListItem.test.js

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import ListItem from '../ListItem';
 import { props } from '../ListItem.fixtures';

data/webpack/ForemanInventoryUpload/Components/AccountList/Components/ListItemStatus/__tests__/ListItemStatus.test.js

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import ListItemStatus from '../ListItemStatus';
 import { props } from '../ListItemStatus.fixtures';

data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/AccountList.test.js

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import AccountList from '../AccountList';
 import { props } from '../AccountList.fixtures';

data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/AccountListActions.test.js

@@ -1,4 +1,4 @@
-import { testActionSnapshotWithFixtures } from 'react-redux-test-utils';
+import { testActionSnapshotWithFixtures } from '@theforeman/test';
 import {
   fetchAccountsStatus,
   startAccountStatusPolling,

data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/AccountListIntegration.test.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { IntegrationTestHelper } from 'react-redux-test-utils';
+import { IntegrationTestHelper } from '@theforeman/test';
 
 import AccountList from '../index';
 import reducers from '../../../ForemanInventoryUploadReducers';

data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/AccountListReducer.test.js

@@ -1,4 +1,4 @@
-import { testReducerSnapshotWithFixtures } from 'react-redux-test-utils';
+import { testReducerSnapshotWithFixtures } from '@theforeman/test';
 
 import {
   INVENTORY_ACCOUNT_STATUS_POLLING,
@@ -14,9 +14,7 @@ import {
   pollingProcessID,
   accountID,
   processStatusName,
-  autoUploadEnabled,
 } from '../AccountList.fixtures';
-import { AUTO_UPLOAD_TOGGLE } from '../../AutoUploadSwitcher/AutoUploadSwitcherConstants';
 
 const fixtures = {
   'should return the initial state': {},
@@ -25,7 +23,6 @@ const fixtures = {
       type: INVENTORY_ACCOUNT_STATUS_POLLING,
       payload: {
         accounts,
-        autoUploadEnabled,
       },
     },
   },
@@ -57,14 +54,6 @@ const fixtures = {
       },
     },
   },
-  'should handle AUTO_UPLOAD_TOGGLE': {
-    action: {
-      type: AUTO_UPLOAD_TOGGLE,
-      payload: {
-        autoUploadEnabled,
-      },
-    },
-  },
 };
 
 describe('AccountList reducer', () =>

data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/AccountListSelectors.test.js

@@ -1,22 +1,16 @@
-import { testSelectorsSnapshotWithFixtures } from 'react-redux-test-utils';
+import { testSelectorsSnapshotWithFixtures } from '@theforeman/test';
 import {
   selectAccountsList,
   selectAccounts,
   selectPollingProcessID,
-  selectAutoUploadEnabled,
 } from '../AccountListSelectors';
-import {
-  pollingProcessID,
-  accounts,
-  autoUploadEnabled,
-} from '../AccountList.fixtures';
+import { pollingProcessID, accounts } from '../AccountList.fixtures';
 
 const state = {
   ForemanInventoryUpload: {
     accountsList: {
       accounts,
       pollingProcessID,
-      autoUploadEnabled,
     },
   },
 };
@@ -26,8 +20,6 @@ const fixtures = {
   'should return AccountList accounts': () => selectAccounts(state),
   'should return AccountList pollingProcessID': () =>
     selectPollingProcessID(state),
-  'should return AccountList autoUploadEnabled': () =>
-    selectAutoUploadEnabled(state),
 };
 
 describe('AccountList selectors', () =>

data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/__snapshots__/AccountListReducer.test.js.snap

@@ -1,14 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`AccountList reducer should handle AUTO_UPLOAD_TOGGLE 1`] = `
-Object {
-  "accounts": Object {},
-  "autoUploadEnabled": true,
-  "error": null,
-  "pollingProcessID": 0,
-}
-`;
-
 exports[`AccountList reducer should handle INVENTORY_ACCOUNT_STATUS_POLLING 1`] = `
 Object {
   "accounts": Object {
@@ -28,7 +19,6 @@ Object {
       "upload_report_status": "success",
     },
   },
-  "autoUploadEnabled": true,
   "error": null,
   "pollingProcessID": 0,
 }

data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/__snapshots__/AccountListSelectors.test.js.snap

@@ -1,5 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`AccountList selectors should return AccountList pollingProcessID 1`] = `0`;
+
 exports[`AccountList selectors should return AccountList accounts 1`] = `
 Object {
   "Account1": Object {
@@ -20,10 +22,6 @@ Object {
 }
 `;
 
-exports[`AccountList selectors should return AccountList autoUploadEnabled 1`] = `true`;
-
-exports[`AccountList selectors should return AccountList pollingProcessID 1`] = `0`;
-
 exports[`AccountList selectors should return AccountsList 1`] = `
 Object {
   "accounts": Object {
@@ -43,7 +41,6 @@ Object {
       "upload_report_status": "success",
     },
   },
-  "autoUploadEnabled": true,
   "pollingProcessID": 0,
 }
 `;

data/webpack/ForemanInventoryUpload/Components/Dashboard/Dashboard.fixtures.js

@@ -8,16 +8,20 @@ export const completed = 25;
 
 export const error = 'some-error';
 
+export const generating = {
+  logs,
+  completed,
+};
+
+export const uploading = {
+  logs,
+  completed,
+  files,
+};
+
 export const inventory = {
-  generating: {
-    logs,
-    completed,
-  },
-  uploading: {
-    logs,
-    completed,
-    files,
-  },
+  generating,
+  uploading,
 };
 
 export const accountID = 'some-account-ID';

data/webpack/ForemanInventoryUpload/Components/Dashboard/Dashboard.stories.js

@@ -1,19 +1,9 @@
 import React from 'react';
-import { storiesOf } from '@storybook/react';
-import { withKnobs } from '@storybook/addon-knobs';
-import { Provider } from 'react-redux';
-import configureStore from '../../../stories/configureStore';
 import Dashboard from './index';
-import { generating, uploading } from './Dashboard.fixtures';
 
-const store = configureStore();
+export default {
+  title: 'Dashboard',
+  component: Dashboard,
+};
 
-storiesOf('Dashboard', module)
-  .addDecorator(withKnobs)
-  .add('Dashboard', () => (
-    <div style={{ margin: '20px' }}>
-      <Provider store={store}>
-        <Dashboard generating={generating} uploading={uploading} />
-      </Provider>
-    </div>
-  ));
+export const Basic = () => <Dashboard />;

data/webpack/ForemanInventoryUpload/Components/Dashboard/__tests__/Dashboard.test.js

@@ -1,6 +1,5 @@
 import React from 'react';
-import { shallow } from 'enzyme';
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { shallow, testComponentSnapshotsWithFixtures } from '@theforeman/test';
 import Dashboard from '../Dashboard';
 import { props } from '../Dashboard.fixtures';
 

data/webpack/ForemanInventoryUpload/Components/Dashboard/__tests__/DashboardActions.test.js

@@ -1,4 +1,4 @@
-import { testActionSnapshotWithFixtures } from 'react-redux-test-utils';
+import { testActionSnapshotWithFixtures } from '@theforeman/test';
 import API from 'foremanReact/API';
 import {
   startPolling,
@@ -36,4 +36,17 @@ const fixtures = {
     runWithGetState({ activeTab: 'reports' }, toggleFullScreen, accountID),
 };
 
-describe('Dashboard actions', () => testActionSnapshotWithFixtures(fixtures));
+describe('Dashboard actions', () => {
+  const { location } = window;
+
+  beforeAll(() => {
+    delete window.location;
+    window.location = { href: jest.fn() };
+  });
+
+  afterAll(() => {
+    window.location = location;
+  });
+
+  return testActionSnapshotWithFixtures(fixtures);
+});

data/webpack/ForemanInventoryUpload/Components/Dashboard/__tests__/DashboardIntegration.test.js

@@ -1,8 +1,7 @@
 import React from 'react';
-import { IntegrationTestHelper } from 'react-redux-test-utils';
+import { IntegrationTestHelper } from '@theforeman/test';
 
-import Dashboard from '../Dashboard';
-import reducers from '../../../ForemanInventoryUploadReducers';
+import Dashboard, { reducers } from '../index';
 import { accountID } from '../Dashboard.fixtures';
 
 describe('Dashboard integration test', () => {