mirror of
https://github.com/ansible/awx.git
synced 2026-03-23 11:55:04 -02:30
Removes code from serializer in favor to api call of Project.readDetails
Adds necessary tests.
This commit is contained in:
@@ -26,6 +26,7 @@ const jobTemplateData = {
|
|||||||
allow_simultaneous: false,
|
allow_simultaneous: false,
|
||||||
use_fact_cache: false,
|
use_fact_cache: false,
|
||||||
host_config_key: '',
|
host_config_key: '',
|
||||||
|
scm_branch: '',
|
||||||
};
|
};
|
||||||
|
|
||||||
describe('<JobTemplateAdd />', () => {
|
describe('<JobTemplateAdd />', () => {
|
||||||
|
|||||||
@@ -196,12 +196,7 @@ class JobTemplateDetail extends Component {
|
|||||||
) : (
|
) : (
|
||||||
renderMissingDataDetail(i18n._(t`Project`))
|
renderMissingDataDetail(i18n._(t`Project`))
|
||||||
)}
|
)}
|
||||||
{template.scm_branch && (
|
<Detail label={i18n._(t`SCM Branch`)} value={template.scm_branch} />
|
||||||
<Detail
|
|
||||||
label={i18n._(t`SCM Branch`)}
|
|
||||||
value={template.scm_branch}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
<Detail label={i18n._(t`Playbook`)} value={playbook} />
|
<Detail label={i18n._(t`Playbook`)} value={playbook} />
|
||||||
<Detail label={i18n._(t`Forks`)} value={forks || '0'} />
|
<Detail label={i18n._(t`Forks`)} value={forks || '0'} />
|
||||||
<Detail label={i18n._(t`Limit`)} value={limit} />
|
<Detail label={i18n._(t`Limit`)} value={limit} />
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ const mockJobTemplate = {
|
|||||||
allow_simultaneous: false,
|
allow_simultaneous: false,
|
||||||
use_fact_cache: false,
|
use_fact_cache: false,
|
||||||
host_config_key: '',
|
host_config_key: '',
|
||||||
|
scm_branch: '',
|
||||||
summary_fields: {
|
summary_fields: {
|
||||||
user_capabilities: {
|
user_capabilities: {
|
||||||
edit: true,
|
edit: true,
|
||||||
|
|||||||
@@ -139,7 +139,7 @@ class JobTemplateForm extends Component {
|
|||||||
handleProjectUpdate(project) {
|
handleProjectUpdate(project) {
|
||||||
const { setFieldValue } = this.props;
|
const { setFieldValue } = this.props;
|
||||||
setFieldValue('project', project.id);
|
setFieldValue('project', project.id);
|
||||||
setFieldValue('playbook', undefined);
|
setFieldValue('playbook', 0);
|
||||||
setFieldValue('scm_branch', '');
|
setFieldValue('scm_branch', '');
|
||||||
this.setState({ project });
|
this.setState({ project });
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,7 +27,6 @@ describe('<JobTemplateForm />', () => {
|
|||||||
project: {
|
project: {
|
||||||
id: 3,
|
id: 3,
|
||||||
name: 'qux',
|
name: 'qux',
|
||||||
allow_override: true,
|
|
||||||
},
|
},
|
||||||
labels: { results: [{ name: 'Sushi', id: 1 }, { name: 'Major', id: 2 }] },
|
labels: { results: [{ name: 'Sushi', id: 1 }, { name: 'Major', id: 2 }] },
|
||||||
credentials: [
|
credentials: [
|
||||||
@@ -133,7 +132,6 @@ describe('<JobTemplateForm />', () => {
|
|||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
await waitForElement(wrapper, 'EmptyStateBody', el => el.length === 0);
|
await waitForElement(wrapper, 'EmptyStateBody', el => el.length === 0);
|
||||||
await act(async () => {
|
await act(async () => {
|
||||||
wrapper.find('input#template-name').simulate('change', {
|
wrapper.find('input#template-name').simulate('change', {
|
||||||
@@ -154,15 +152,25 @@ describe('<JobTemplateForm />', () => {
|
|||||||
name: 'project',
|
name: 'project',
|
||||||
allow_override: true,
|
allow_override: true,
|
||||||
});
|
});
|
||||||
|
});
|
||||||
|
wrapper.update();
|
||||||
|
await act(async () => {
|
||||||
|
wrapper.find('input#scm_branch').simulate('change', {
|
||||||
|
target: { value: 'devel', name: 'scm_branch' },
|
||||||
|
});
|
||||||
wrapper.find('AnsibleSelect[name="playbook"]').simulate('change', {
|
wrapper.find('AnsibleSelect[name="playbook"]').simulate('change', {
|
||||||
target: { value: 'new baz type', name: 'playbook' },
|
target: { value: 'new baz type', name: 'playbook' },
|
||||||
});
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
await act(async () => {
|
||||||
wrapper
|
wrapper
|
||||||
.find('CredentialChip')
|
.find('CredentialChip')
|
||||||
.at(0)
|
.at(0)
|
||||||
.prop('onClick')();
|
.prop('onClick')();
|
||||||
});
|
});
|
||||||
wrapper.update();
|
wrapper.update();
|
||||||
|
|
||||||
expect(wrapper.find('input#template-name').prop('value')).toEqual(
|
expect(wrapper.find('input#template-name').prop('value')).toEqual(
|
||||||
'new foo'
|
'new foo'
|
||||||
);
|
);
|
||||||
@@ -179,7 +187,9 @@ describe('<JobTemplateForm />', () => {
|
|||||||
expect(wrapper.find('ProjectLookup').prop('value')).toEqual({
|
expect(wrapper.find('ProjectLookup').prop('value')).toEqual({
|
||||||
id: 4,
|
id: 4,
|
||||||
name: 'project',
|
name: 'project',
|
||||||
|
allow_override: true,
|
||||||
});
|
});
|
||||||
|
expect(wrapper.find('input#scm_branch').prop('value')).toEqual('devel');
|
||||||
expect(
|
expect(
|
||||||
wrapper.find('AnsibleSelect[name="playbook"]').prop('value')
|
wrapper.find('AnsibleSelect[name="playbook"]').prop('value')
|
||||||
).toEqual('new baz type');
|
).toEqual('new baz type');
|
||||||
|
|||||||
Reference in New Issue
Block a user