From 7da315acbaa92a6931d321b527580ca4119a1bd5 Mon Sep 17 00:00:00 2001 From: Rish Date: Tue, 28 Apr 2020 23:29:56 +0530 Subject: [PATCH] Switched to recommended absolute test-utils path setup refs https://github.com/TryGhost/members.js/issues/5 Switched to using absolute path for default test-utils setup file as relative imports become too messy when we keep tests for a component next to it. This setup allows using absolute path for common test-utils file which is used in almost all tests for initial setup. --- ghost/portal/.env | 1 + ghost/portal/src/components/pages/AccountHomePage.test.js | 6 ++---- ghost/portal/src/components/pages/SigninPage.test.js | 2 +- ghost/portal/src/components/pages/SignupPage.test.js | 2 +- ghost/portal/src/utils/{tests.js => test-utils.js} | 0 5 files changed, 5 insertions(+), 6 deletions(-) create mode 100644 ghost/portal/.env rename ghost/portal/src/utils/{tests.js => test-utils.js} (100%) diff --git a/ghost/portal/.env b/ghost/portal/.env new file mode 100644 index 0000000000..1aca48c39f --- /dev/null +++ b/ghost/portal/.env @@ -0,0 +1 @@ +NODE_PATH=src/utils \ No newline at end of file diff --git a/ghost/portal/src/components/pages/AccountHomePage.test.js b/ghost/portal/src/components/pages/AccountHomePage.test.js index ace8323406..4e9547f744 100644 --- a/ghost/portal/src/components/pages/AccountHomePage.test.js +++ b/ghost/portal/src/components/pages/AccountHomePage.test.js @@ -1,14 +1,12 @@ import React from 'react'; -import {render, fireEvent} from '../../utils/tests'; +import {render, fireEvent} from 'test-utils'; import AccountHomePage from './AccountHomePage'; -import {member} from '../../utils/fixtures'; const setup = (overrides) => { - const freeMember = member.free; const {mockOnActionFn, ...utils} = render( ); - const memberEmail = utils.getByText(freeMember.email); + const memberEmail = utils.getByText('member@example.com'); const logoutButton = utils.queryByRole('button', {name: 'Log out'}); return { memberEmail, diff --git a/ghost/portal/src/components/pages/SigninPage.test.js b/ghost/portal/src/components/pages/SigninPage.test.js index 9e890105d4..183d16aa1c 100644 --- a/ghost/portal/src/components/pages/SigninPage.test.js +++ b/ghost/portal/src/components/pages/SigninPage.test.js @@ -1,5 +1,5 @@ import React from 'react'; -import {render, fireEvent} from '../../utils/tests'; +import {render, fireEvent} from 'test-utils'; import SigninPage from './SigninPage'; const setup = (overrides) => { diff --git a/ghost/portal/src/components/pages/SignupPage.test.js b/ghost/portal/src/components/pages/SignupPage.test.js index 854ef17ef0..c1fa0314f7 100644 --- a/ghost/portal/src/components/pages/SignupPage.test.js +++ b/ghost/portal/src/components/pages/SignupPage.test.js @@ -1,6 +1,6 @@ import React from 'react'; import SignupPage from './SignupPage'; -import {render, fireEvent} from '../../utils/tests'; +import {render, fireEvent} from 'test-utils'; const setup = (overrides) => { const {mockOnActionFn, ...utils} = render( diff --git a/ghost/portal/src/utils/tests.js b/ghost/portal/src/utils/test-utils.js similarity index 100% rename from ghost/portal/src/utils/tests.js rename to ghost/portal/src/utils/test-utils.js