fix test after rebase of org teams update

This commit is contained in:
John Mitchell
2019-04-11 11:06:39 -04:00
parent 344713f938
commit abc3733449
2 changed files with 26 additions and 22 deletions

View File

@@ -2,18 +2,11 @@ import React from 'react';
import { mount } from 'enzyme';
import { MemoryRouter } from 'react-router-dom';
import { I18nProvider } from '@lingui/react';
<<<<<<< HEAD
import { ConfigContext } from '../../../../src/context';
import OrganizationForm from '../../../../src/pages/Organizations/components/OrganizationForm';
import { sleep } from '../../../testUtils';
=======
import { ConfigProvider } from '../../../../src/contexts/Config';
import { NetworkProvider } from '../../../../src/contexts/Network';
import OrganizationForm, { _OrganizationForm } from '../../../../src/pages/Organizations/components/OrganizationForm';
const sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms));
>>>>>>> fix unit tests for network handling
describe('<OrganizationForm />', () => {
let api;
let networkProviderValue;