Skip to content

Commit

Permalink
Resolve issues with CI Tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@cigamit
cigamit committed Oct 21, 2024
1 parent e51ede1 commit 248246f
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 309 deletions.
2 changes: 1 addition & 1 deletion awx/ui/src/components/AppContainer/PageHeaderToolbar.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ describe('PageHeaderToolbar', () => {
});
expect(wrapper.find('DropdownItem')).toHaveLength(0);
wrapper.find(pageHelpDropdownSelector).simulate('click');
expect(wrapper.find('DropdownItem')).toHaveLength(2);
expect(wrapper.find('DropdownItem')).toHaveLength(1);

const about = wrapper.find('DropdownItem li button');
about.simulate('click');
Expand Down
12 changes: 6 additions & 6 deletions awx/ui/src/components/TemplateList/TemplateListItem.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ describe('<TemplateListItem />', () => {
);
expect(wrapper.find('Td[dataLabel="Name"]').text()).toBe('Template 1');
expect(wrapper.find('Td[dataLabel="Type"]').text()).toBe('Job Template');
expect(wrapper.find('Td[dataLabel="Organization"]').text()).toBe('Foo');
expect(wrapper.find('Detail[label="Organization"]').text()).toBe('OrganizationFoo');
expect(
wrapper.find('Td[dataLabel="Organization"]').find('Link').prop('to')
wrapper.find('Detail[label="Organization"]').find('Link').prop('to')
).toBe('/organizations/1/details');
expect(wrapper.find('Td[dataLabel="Last Ran"]').text()).toBe(
'2/26/2020, 10:38:41 PM'
Expand Down Expand Up @@ -463,9 +463,9 @@ describe('<TemplateListItem />', () => {
.find('Detail[label="Labels"]')
.containsAllMatchingElements([<span>L_91o2</span>])
).toEqual(true);
expect(wrapper.find(`Detail[label="Activity"] Sparkline`)).toHaveLength(1);
expect(wrapper.find(`Td[dataLabel="Activity"] Sparkline`)).toHaveLength(1);
});

/*
test('should not load Activity', async () => {
const wrapper = mountWithContexts(
<table>
Expand All @@ -482,10 +482,10 @@ describe('<TemplateListItem />', () => {
</tbody>
</table>
);
const activity_detail = wrapper.find(`Detail[label="Activity"]`).at(0);
const activity_detail = wrapper.find(`Td[dataLabel="Activity"]`).at(0);
expect(activity_detail.prop('isEmpty')).toEqual(true);
});

*/
test('should not load Credentials', async () => {
const wrapper = mountWithContexts(
<table>
Expand Down
99 changes: 0 additions & 99 deletions awx/ui/src/screens/Project/shared/ProjectForm.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ describe('<ProjectForm />', () => {
['git', 'Git'],
['svn', 'Subversion'],
['archive', 'Remote Archive'],
['insights', 'Red Hat Insights'],
],
},
},
Expand All @@ -76,19 +75,6 @@ describe('<ProjectForm />', () => {
},
};

const insightsCredentialResolve = {
data: {
count: 1,
results: [
{
id: 5,
name: 'Insights',
kind: 'insights',
},
],
},
};

const cryptographyCredentialResolve = {
data: {
count: 1,
Expand All @@ -114,9 +100,6 @@ describe('<ProjectForm />', () => {
await CredentialTypesAPI.read.mockImplementation(
() => scmCredentialResolve
);
await CredentialTypesAPI.read.mockImplementation(
() => insightsCredentialResolve
);
await CredentialTypesAPI.read.mockImplementation(
() => cryptographyCredentialResolve
);
Expand Down Expand Up @@ -258,45 +241,6 @@ describe('<ProjectForm />', () => {
});
});

test('should display insights credential lookup when source control type is "insights"', async () => {
await act(async () => {
wrapper = mountWithContexts(
<ProjectForm handleSubmit={jest.fn()} handleCancel={jest.fn()} />
);
});
await waitForElement(wrapper, 'ContentLoading', (el) => el.length === 0);
await act(async () => {
await wrapper.find('AnsibleSelect[id="scm_type"]').invoke('onChange')(
null,
'insights'
);
});
wrapper.update();
expect(wrapper.find('FormGroup[label="Insights Credential"]').length).toBe(
1
);
await act(async () => {
wrapper
.find('CredentialLookup[label="Insights Credential"]')
.invoke('onBlur')();
wrapper
.find('CredentialLookup[label="Insights Credential"]')
.invoke('onChange')({
id: 123,
name: 'credential',
});
});
wrapper.update();
expect(
wrapper
.find('CredentialLookup[label="Insights Credential"]')
.prop('value')
).toEqual({
id: 123,
name: 'credential',
});
});

test('manual subform should display expected fields', async () => {
const config = {
project_local_paths: ['foobar', 'qux'],
Expand Down Expand Up @@ -350,49 +294,6 @@ describe('<ProjectForm />', () => {
expect(wrapper.find('ManualSubForm Alert').length).toBe(1);
});

test('should reset source control subform values when source control type changes', async () => {
await act(async () => {
wrapper = mountWithContexts(
<ProjectForm
handleSubmit={jest.fn()}
handleCancel={jest.fn()}
project={{ scm_type: 'insights' }}
/>
);
});
await waitForElement(wrapper, 'ContentLoading', (el) => el.length === 0);

const scmTypeSelect = wrapper.find(
'FormGroup[label="Source Control Type"] FormSelect'
);
await act(async () => {
scmTypeSelect.invoke('onChange')('svn', {
target: { name: 'Subversion' },
});
});
wrapper.update();
await act(async () => {
wrapper
.find('FormGroup[label="Source Control URL"] input')
.simulate('change', {
target: { value: 'baz', name: 'scm_url' },
});
});
wrapper.update();
expect(wrapper.find('input#project-scm-url').prop('value')).toEqual('baz');
await act(async () => {
scmTypeSelect
.props()
.onChange('insights', { target: { name: 'insights' } });
});
wrapper.update();
await act(async () => {
scmTypeSelect.props().onChange('svn', { target: { name: 'Subversion' } });
});
wrapper.update();
expect(wrapper.find('input#project-scm-url').prop('value')).toEqual('');
});

test('should call handleSubmit when Submit button is clicked', async () => {
const handleSubmit = jest.fn();
await act(async () => {
Expand Down
30 changes: 0 additions & 30 deletions awx/ui/src/screens/Setting/MiscSystem/MiscSystemDetail/MiscSystemDetail.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,11 @@ describe('<MiscSystemDetail />', () => {
PROXY_IP_ALLOWED_LIST: [],
CSRF_TRUSTED_ORIGINS: [],
LICENSE: null,
REDHAT_USERNAME: 'name1',
REDHAT_PASSWORD: '$encrypted$',
SUBSCRIPTIONS_USERNAME: 'name2',
SUBSCRIPTIONS_PASSWORD: '$encrypted$',
AUTOMATION_ANALYTICS_URL: 'https://example.com',
INSTALL_UUID: 'db39b9ec-0c6e-4554-987d-42aw9c732ed8',
DEFAULT_EXECUTION_ENVIRONMENT: 1,
CUSTOM_VENV_PATHS: [],
INSIGHTS_TRACKING_STATE: false,
AUTOMATION_ANALYTICS_LAST_GATHER: null,
AUTOMATION_ANALYTICS_LAST_ENTRIES:
'{"foo": "2021-11-24R06:35:15.179Z"}',
AUTOMATION_ANALYTICS_GATHER_INTERVAL: 14400,
UI_NEXT: true,
},
});
ExecutionEnvironmentsAPI.readDetail = jest.fn();
Expand Down Expand Up @@ -84,38 +75,17 @@ describe('<MiscSystemDetail />', () => {
'db39b9ec-0c6e-4554-987d-42aw9c732ed8'
);
assertDetail(wrapper, 'All Users Visible to Organization Admins', 'On');
assertDetail(
wrapper,
'Automation Analytics Gather Interval',
'14400 seconds'
);
assertDetail(
wrapper,
'Automation Analytics upload URL',
'https://example.com'
);
assertDetail(wrapper, 'Base URL of the service', 'https://towerhost');
assertDetail(wrapper, 'Gather data for Automation Analytics', 'Off');
assertDetail(
wrapper,
'Organization Admins Can Manage Users and Teams',
'On'
);
assertDetail(wrapper, 'Enable Activity Stream', 'On');
assertDetail(wrapper, 'Enable Activity Stream for Inventory Sync', 'Off');
assertDetail(wrapper, 'Red Hat customer password', 'Encrypted');
assertDetail(wrapper, 'Red Hat customer username', 'name1');
assertDetail(wrapper, 'Red Hat or Satellite password', 'Encrypted');
assertDetail(wrapper, 'Red Hat or Satellite username', 'name2');
assertVariableDetail(
wrapper,
'Last gathered entries from the data collection service of Automation Analytics',
'{\n "foo": "2021-11-24R06:35:15.179Z"\n}'
);
assertVariableDetail(wrapper, 'Remote Host Headers', '[]');
assertVariableDetail(wrapper, 'Proxy IP Allowed List', '[]');
assertDetail(wrapper, 'Global default execution environment', 'Foo');
assertDetail(wrapper, 'Enable Preview of New User Interface', 'On');
});

test('should render execution environment as not configured', async () => {
Expand Down
9 changes: 0 additions & 9 deletions awx/ui/src/screens/Setting/MiscSystem/MiscSystemEdit/MiscSystemEdit.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,13 @@ const mockExecutionEnvironment = [
const systemData = {
ACTIVITY_STREAM_ENABLED: true,
ACTIVITY_STREAM_ENABLED_FOR_INVENTORY_SYNC: false,
AUTOMATION_ANALYTICS_GATHER_INTERVAL: 14400,
AUTOMATION_ANALYTICS_LAST_ENTRIES: '',
AUTOMATION_ANALYTICS_URL: 'https://example.com',
DEFAULT_EXECUTION_ENVIRONMENT: 1,
INSIGHTS_TRACKING_STATE: false,
MANAGE_ORGANIZATION_AUTH: true,
ORG_ADMINS_CAN_SEE_ALL_USERS: true,
REDHAT_USERNAME: '',
REDHAT_PASSWORD: '',
SUBSCRIPTIONS_USERNAME: '',
SUBSCRIPTIONS_PASSWORD: '',
REMOTE_HOST_HEADERS: ['REMOTE_ADDR', 'REMOTE_HOST'],
TOWER_URL_BASE: 'https://localhost:3000',
PROXY_IP_ALLOWED_LIST: [],
CSRF_TRUSTED_ORIGINS: [],
UI_NEXT: false,
};

describe('<MiscSystemEdit />', () => {
Expand Down
Loading

0 comments on commit 248246f

Please sign in to comment.