External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-17 19:20:05 -03:30
Code Issues Packages Projects Releases Wiki Activity

rename onX methods to handleX

Browse Source
This commit is contained in:
Keith Grant
2019-03-25 15:40:20 -04:00
parent f3a6da20f6
commit 02cd188c2f
4 changed files with 84 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
__tests__/pages/Organizations/screens/Organization/OrganizationEdit.test.jsx
View File

@@ -75,7 +75,7 @@ describe('<OrganizationEdit />', () => {
expect(wrapper.state().form.instanceGroups.value).toEqual(mockInstanceGroups);
});
test('onLookupSave successfully sets instanceGroups state', () => {
test('changing instance group successfully sets instanceGroups state', () => {
const wrapper = mount(
<MemoryRouter>
<I18nProvider>
@@ -88,7 +88,10 @@ describe('<OrganizationEdit />', () => {
</MemoryRouter>
).find('OrganizationEdit');
wrapper.instance().onLookupSave([
const lookup = wrapper.find('InstanceGroupsLookup');
expect(lookup.length).toBe(1);
lookup.prop('onChange')([
{
id: 1,
name: 'foo'
@@ -102,9 +105,8 @@ describe('<OrganizationEdit />', () => {
]);
});
test('calls "onFieldChange" when input values change', () => {
// const api = new APIClient();
const spy = jest.spyOn(OrganizationEdit.WrappedComponent.prototype, 'onFieldChange');
test('calls "handleFieldChange" when input values change', () => {
const spy = jest.spyOn(OrganizationEdit.WrappedComponent.prototype, 'handleFieldChange');
const wrapper = mount(
<MemoryRouter>
<I18nProvider>
@@ -118,8 +120,8 @@ describe('<OrganizationEdit />', () => {
).find('OrganizationEdit');
expect(spy).not.toHaveBeenCalled();
wrapper.instance().onFieldChange('foo', { target: { name: 'name' } });
wrapper.instance().onFieldChange('bar', { target: { name: 'description' } });
wrapper.instance().handleFieldChange('foo', { target: { name: 'name' } });
wrapper.instance().handleFieldChange('bar', { target: { name: 'description' } });
expect(spy).toHaveBeenCalledTimes(2);
});
@@ -148,8 +150,8 @@ describe('<OrganizationEdit />', () => {
expect(wrapper.find('FormSelectOption')).toHaveLength(2);
});
test('calls onSubmit when Save button is clicked', () => {
const spy = jest.spyOn(OrganizationEdit.WrappedComponent.prototype, 'onSubmit');
test('calls handleSubmit when Save button is clicked', () => {
const spy = jest.spyOn(OrganizationEdit.WrappedComponent.prototype, 'handleSubmit');
const wrapper = mount(
<MemoryRouter>
<I18nProvider>
@@ -170,7 +172,7 @@ describe('<OrganizationEdit />', () => {
expect(spy).toBeCalled();
});
test('onSubmit associates and disassociates instance groups', async () => {
test('handleSubmit associates and disassociates instance groups', async () => {
const mockInstanceGroups = [
{ name: 'One', id: 1 },
{ name: 'Two', id: 2 }
@@ -204,12 +206,12 @@ describe('<OrganizationEdit />', () => {
await wrapper.instance().componentDidMount();
wrapper.instance().onLookupSave([
wrapper.find('InstanceGroupsLookup').prop('onChange')([
{ name: 'One', id: 1 },
{ name: 'Three', id: 3 }
], 'instanceGroups');
await wrapper.instance().onSubmit();
await wrapper.instance().handleSubmit();
expect(api.updateOrganizationDetails).toHaveBeenCalledWith(1, mockDataForm);
expect(api.associateInstanceGroup).toHaveBeenCalledWith('/api/v2/organizations/1/instance_groups', 3);
expect(api.associateInstanceGroup).not.toHaveBeenCalledWith('/api/v2/organizations/1/instance_groups', 1);
@@ -220,8 +222,8 @@ describe('<OrganizationEdit />', () => {
expect(api.disassociate).not.toHaveBeenCalledWith('/api/v2/organizations/1/instance_groups', 3);
});
test('calls "onCancel" when Cancel button is clicked', () => {
const spy = jest.spyOn(OrganizationEdit.WrappedComponent.prototype, 'onCancel');
test('calls "handleCancel" when Cancel button is clicked', () => {
const spy = jest.spyOn(OrganizationEdit.WrappedComponent.prototype, 'handleCancel');
const wrapper = mount(
<MemoryRouter>
<I18nProvider>

31
__tests__/pages/Organizations/screens/OrganizationAdd.test.jsx
View File

@@ -28,8 +28,8 @@ describe('<OrganizationAdd />', () => {
);
});
test('calls "onFieldChange" when input values change', () => {
const spy = jest.spyOn(OrganizationAdd.WrappedComponent.prototype, 'onFieldChange');
test('calls "handleFieldChange" when input values change', () => {
const spy = jest.spyOn(OrganizationAdd.WrappedComponent.prototype, 'handleFieldChange');
const wrapper = mount(
<MemoryRouter>
<I18nProvider>
@@ -47,8 +47,8 @@ describe('<OrganizationAdd />', () => {
expect(spy).toHaveBeenCalledTimes(2);
});
test('calls "onSubmit" when Save button is clicked', () => {
const spy = jest.spyOn(OrganizationAdd.WrappedComponent.prototype, 'onSubmit');
test('calls "handleSubmit" when Save button is clicked', () => {
const spy = jest.spyOn(OrganizationAdd.WrappedComponent.prototype, 'handleSubmit');
const wrapper = mount(
<MemoryRouter>
<I18nProvider>
@@ -65,8 +65,8 @@ describe('<OrganizationAdd />', () => {
expect(spy).toBeCalled();
});
test('calls "onCancel" when Cancel button is clicked', () => {
const spy = jest.spyOn(OrganizationAdd.WrappedComponent.prototype, 'onCancel');
test('calls "handleCancel" when Cancel button is clicked', () => {
const spy = jest.spyOn(OrganizationAdd.WrappedComponent.prototype, 'handleCancel');
const wrapper = mount(
<MemoryRouter>
<I18nProvider>
@@ -83,7 +83,7 @@ describe('<OrganizationAdd />', () => {
expect(spy).toBeCalled();
});
test('calls "onCancel" when close button (x) is clicked', () => {
test('calls "handleCancel" when close button (x) is clicked', () => {
const wrapper = mount(
<MemoryRouter initialEntries={['/organizations/add']} initialIndex={0}>
<I18nProvider>
@@ -104,7 +104,7 @@ describe('<OrganizationAdd />', () => {
});
test('Successful form submission triggers redirect', (done) => {
const onSuccess = jest.spyOn(OrganizationAdd.WrappedComponent.prototype, 'onSuccess');
const handleSuccess = jest.spyOn(OrganizationAdd.WrappedComponent.prototype, 'handleSuccess');
const mockedResp = { data: { id: 1, related: { instance_groups: '/bar' } } };
api.createOrganization = jest.fn().mockResolvedValue(mockedResp); api.associateInstanceGroup = jest.fn().mockResolvedValue('done');
const wrapper = mount(
@@ -117,12 +117,12 @@ describe('<OrganizationAdd />', () => {
wrapper.find('input#add-org-form-name').simulate('change', { target: { value: 'foo' } });
wrapper.find('button[aria-label="Save"]').prop('onClick')();
setImmediate(() => {
expect(onSuccess).toHaveBeenCalled();
expect(handleSuccess).toHaveBeenCalled();
done();
});
});
test('onLookupSave successfully sets instanceGroups state', () => {
test('changing instance groups successfully sets instanceGroups state', () => {
const wrapper = mount(
<MemoryRouter>
<I18nProvider>
@@ -130,7 +130,8 @@ describe('<OrganizationAdd />', () => {
</I18nProvider>
</MemoryRouter>
).find('OrganizationAdd');
wrapper.instance().onLookupSave([
wrapper.find('InstanceGroupsLookup').prop('onChange')([
{
id: 1,
name: 'foo'
@@ -144,7 +145,7 @@ describe('<OrganizationAdd />', () => {
]);
});
test('onFieldChange successfully sets custom_virtualenv state', () => {
test('handleFieldChange successfully sets custom_virtualenv state', () => {
const wrapper = mount(
<MemoryRouter>
<I18nProvider>
@@ -152,11 +153,11 @@ describe('<OrganizationAdd />', () => {
</I18nProvider>
</MemoryRouter>
).find('OrganizationAdd');
wrapper.instance().onFieldChange('fooBar', { target: { name: 'custom_virtualenv' } });
wrapper.instance().handleFieldChange('fooBar', { target: { name: 'custom_virtualenv' } });
expect(wrapper.state('custom_virtualenv')).toBe('fooBar');
});
test('onSubmit posts instance groups from selectedInstanceGroups', async () => {
test('handleSubmit posts instance groups from selectedInstanceGroups', async () => {
api.createOrganization = jest.fn().mockResolvedValue({
data: {
id: 1,
@@ -181,7 +182,7 @@ describe('<OrganizationAdd />', () => {
name: 'foo'
}]
});
await wrapper.instance().onSubmit();
await wrapper.instance().handleSubmit();
expect(api.createOrganization).toHaveBeenCalledWith({
custom_virtualenv: '',
description: '',