External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-08 01:47:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

addresses PR issues

Browse Source
This commit is contained in:
Alex Corey
2019-04-15 13:31:44 -04:00
parent 178d519f6e
commit 2daf202e52
2 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
__tests__/pages/Organizations/screens/Organization/Organization.test.jsx
View File

@@ -1,15 +1,9 @@
import React from 'react'; import React from 'react';
import { mount } from 'enzyme'; import { mount } from 'enzyme';
<<<<<<< HEAD
import { MemoryRouter } from 'react-router-dom'; import { MemoryRouter } from 'react-router-dom';
import { I18nProvider } from '@lingui/react'; import { I18nProvider } from '@lingui/react';
import Organization from '../../../../../src/pages/Organizations/screens/Organization/Organization'; import Organization, { _Organization } from '../../../../../src/pages/Organizations/screens/Organization/Organization';
=======
import { MemoryRouter } from 'react-router-dom'; import { MemoryRouter } from 'react-router-dom';
import { I18nProvider } from '@lingui/react'; import { I18nProvider } from '@lingui/react';
import Organization, { _Organization } from '../../../../../src/pages/Organizations/screens/Organization/Organization'; import Organization, { _Organization } from '../../../../../src/pages/Organizations/screens/Organization/Organization';
>>>>>>> addresses PR issues
describe('<OrganizationView />', () => { describe('<OrganizationView />', () => {
test('initially renders succesfully', () => { test('initially renders succesfully', () => {

8
src/pages/Organizations/screens/Organization/Organization.jsx
View File

@@ -71,14 +71,11 @@ class Organization extends Component {
setBreadcrumb(data); setBreadcrumb(data);
this.setState({ organization: data, loading: false }); this.setState({ organization: data, loading: false });
} catch (error) { } catch (error) {
<<<<<<< HEAD
handleHttpError(error) || this.setState({ error: true, loading: false }); handleHttpError(error) || this.setState({ error: true, loading: false });
=======
this.setState({ error: true }); this.setState({ error: true });
} finally { } finally {
this.setState({ loading: false }); this.setState({ loading: false });
this.checkLocation(); this.checkLocation();
>>>>>>> addresses PR issues
} }
} }
@@ -226,10 +223,5 @@ class Organization extends Component {
); );
} }
} }
<<<<<<< HEAD
export default withNetwork(withRouter(Organization)); export default withNetwork(withRouter(Organization));
=======
export { Organization as _Organization }; export { Organization as _Organization };
export default withRouter(Organization);
>>>>>>> addresses PR issues