address review suggestions

ivan-p-nikolov · Feb 5, 2020 · 7898cae · 7898cae
1 parent cdb4dfc
commit 7898cae
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 39 deletions.
diff --git a/packages/tc-ui/src/pages/delete/__tests__/e2e-delete-record.cyp.js b/packages/tc-ui/src/pages/delete/__tests__/e2e-delete-record.cyp.js
@@ -2,15 +2,15 @@ const {
 	code,
 	someString,
 	deleteConfirmText,
-} = require('../../../../../../cypress/fixtures/mainTypeData.json');
+} = require('../../../test-helpers/mainTypeData.json');
 const {
 	populateChildTypeFields,
 	visitEditPage,
 	visitMainTypePage,
 	pickChild,
 	save,
 	resetDb,
-} = require('../../../../../../cypress/test-helpers');
+} = require('../../../test-helpers');
 
 describe('End-to-end - delete record', () => {
 	beforeEach(() => {

diff --git a/packages/tc-ui/src/pages/edit/__tests__/e2e-edit-record.cyp.js b/packages/tc-ui/src/pages/edit/__tests__/e2e-edit-record.cyp.js
@@ -3,15 +3,15 @@ const {
 	anotherDocument,
 	someString,
 	someEnum,
-} = require('../../../../../../cypress/fixtures/mainTypeData.json');
+} = require('../../../test-helpers/mainTypeData.json');
 const {
 	populateMinimumViableFields,
 	populateChildTypeFields,
 	visitMainTypePage,
 	visitEditPage,
 	save,
 	resetDb,
-} = require('../../../../../../cypress/test-helpers');
+} = require('../../../test-helpers');
 
 describe('End-to-end - edit record', () => {
 	beforeEach(() => {

diff --git a/packages/tc-ui/src/pages/view/__tests__/e2e-view-complete-record.cyp.js b/packages/tc-ui/src/pages/view/__tests__/e2e-view-complete-record.cyp.js
@@ -8,13 +8,13 @@ const {
 	anotherString,
 	someUrl,
 	promptText,
-} = require('../../../../../../cypress/fixtures/mainTypeData.json');
+} = require('../../../test-helpers/mainTypeData.json');
 const {
 	populateMinimumViableFields,
 	populateNonMinimumViableFields,
 	save,
 	resetDb,
-} = require('../../../../../../cypress/test-helpers');
+} = require('../../../test-helpers');
 
 describe('End-to-end - record creation', () => {
 	beforeEach(() => {

diff --git a/packages/tc-ui/src/primitives/boolean/__tests__/e2e-record-boolean.cyp.js b/packages/tc-ui/src/primitives/boolean/__tests__/e2e-record-boolean.cyp.js
@@ -1,13 +1,10 @@
-const {
-	code,
-	someString,
-} = require('../../../../../../cypress/fixtures/mainTypeData.json');
+const { code, someString } = require('../../../test-helpers/mainTypeData.json');
 const {
 	populateMinimumViableFields,
 	visitEditPage,
 	save,
 	resetDb,
-} = require('../../../../../../cypress/test-helpers');
+} = require('../../../test-helpers/mainTypeData.json');
 
 describe('End-to-end - record Boolean type', () => {
 	beforeEach(() => {

diff --git a/packages/tc-ui/src/primitives/enum/__tests__/e2e-record-enum.cyp.js b/packages/tc-ui/src/primitives/enum/__tests__/e2e-record-enum.cyp.js
@@ -1,13 +1,10 @@
-const {
-	code,
-	someString,
-} = require('../../../../../../cypress/fixtures/mainTypeData.json');
+const { code, someString } = require('../../../test-helpers/mainTypeData.json');
 const {
 	populateMinimumViableFields,
 	visitEditPage,
 	save,
 	resetDb,
-} = require('../../../../../../cypress/test-helpers');
+} = require('../../../test-helpers');
 
 describe('End-to-end - record Enum type', () => {
 	beforeEach(() => {

diff --git a/packages/tc-ui/src/primitives/large-text/__tests__/e2e-record-large-text.cyp.js b/packages/tc-ui/src/primitives/large-text/__tests__/e2e-record-large-text.cyp.js
@@ -2,12 +2,12 @@ const {
 	code,
 	someString,
 	someDocument,
-} = require('../../../../../../cypress/fixtures/mainTypeData.json');
+} = require('../../../test-helpers/mainTypeData.json');
 const {
 	populateMinimumViableFields,
 	save,
 	resetDb,
-} = require('../../../../../../cypress/test-helpers');
+} = require('../../../test-helpers');
 
 describe('End-to-end - record LargeText type', () => {
 	it('can record large text', () => {

diff --git a/packages/tc-ui/src/primitives/multiple-choice/__tests__/e2e-record-multiple-choice.cyp.js b/packages/tc-ui/src/primitives/multiple-choice/__tests__/e2e-record-multiple-choice.cyp.js
@@ -1,13 +1,10 @@
-const {
-	code,
-	someString,
-} = require('../../../../../../cypress/fixtures/mainTypeData.json');
+const { code, someString } = require('../../../test-helpers/mainTypeData.json');
 const {
 	populateMinimumViableFields,
 	visitEditPage,
 	save,
 	resetDb,
-} = require('../../../../../../cypress/test-helpers');
+} = require('../../../test-helpers');
 
 describe('End-to-end - record multiple choice value', () => {
 	beforeEach(() => {

diff --git a/packages/tc-ui/src/primitives/number/__tests__/e2e-record-number.cyp.js b/packages/tc-ui/src/primitives/number/__tests__/e2e-record-number.cyp.js
@@ -2,12 +2,12 @@ const {
 	code,
 	someString,
 	someInteger,
-} = require('../../../../../../cypress/fixtures/mainTypeData.json');
+} = require('../../../test-helpers/mainTypeData.json');
 const {
 	populateMinimumViableFields,
 	save,
 	resetDb,
-} = require('../../../../../../cypress/test-helpers');
+} = require('../../../test-helpers');
 
 describe('End-to-end - record Number type', () => {
 	beforeEach(() => {

diff --git a/packages/tc-ui/src/primitives/relationship/__tests__/e2e-create-relationships.cyp.js b/packages/tc-ui/src/primitives/relationship/__tests__/e2e-create-relationships.cyp.js
@@ -1,6 +1,4 @@
-const {
-	code,
-} = require('../../../../../../cypress/fixtures/mainTypeData.json');
+const { code } = require('../../../test-helpers/mainTypeData.json');
 const {
 	populateMinimumViableFields,
 	populateParentTypeFields,
@@ -12,7 +10,7 @@ const {
 	visitMainTypePage,
 	save,
 	resetDb,
-} = require('../../../../../../cypress/test-helpers');
+} = require('../../../test-helpers');
 
 describe('End-to-end - relationship creation', () => {
 	beforeEach(() => {

diff --git a/packages/tc-ui/src/primitives/relationship/__tests__/e2e-delete-relationships.cyp.js b/packages/tc-ui/src/primitives/relationship/__tests__/e2e-delete-relationships.cyp.js
@@ -1,6 +1,4 @@
-const {
-	code,
-} = require('../../../../../../cypress/fixtures/mainTypeData.json');
+const { code } = require('../../../test-helpers/mainTypeData.json');
 const {
 	populateMinimumViableFields,
 	populateChildTypeFields,
@@ -10,7 +8,7 @@ const {
 	visitMainTypePage,
 	save,
 	resetDb,
-} = require('../../../../../../cypress/test-helpers');
+} = require('../../../test-helpers');
 
 describe('End-to-end - relationship deletion', () => {
 	beforeEach(() => {

diff --git a/packages/tc-ui/src/primitives/temporal/__tests__/e2e-record-temporal.cyp.js b/packages/tc-ui/src/primitives/temporal/__tests__/e2e-record-temporal.cyp.js
@@ -4,12 +4,12 @@ const {
 	someString,
 	someDatetime,
 	someDate,
-} = require('../../../../../../cypress/fixtures/mainTypeData.json');
+} = require('../../../test-helpers/mainTypeData.json');
 const {
 	populateMinimumViableFields,
 	save,
 	resetDb,
-} = require('../../../../../../cypress/test-helpers');
+} = require('../../../test-helpers');
 
 describe('End-to-end - record Temporal type', () => {
 	beforeEach(() => {

diff --git a/packages/tc-ui/src/primitives/text/__tests__/e2e-record-text.cyp.js b/packages/tc-ui/src/primitives/text/__tests__/e2e-record-text.cyp.js
@@ -2,12 +2,12 @@ const {
 	code,
 	someString,
 	anotherString,
-} = require('../../../../../../cypress/fixtures/mainTypeData.json');
+} = require('../../../test-helpers/mainTypeData.json');
 const {
 	populateMinimumViableFields,
 	save,
 	resetDb,
-} = require('../../../../../../cypress/test-helpers');
+} = require('../../../test-helpers');
 
 describe('End-to-end - record Text type', () => {
 	it('can record a text', () => {

diff --git a/cypress/test-helpers/index.js → packages/tc-ui/src/test-helpers/index.js b/cypress/test-helpers/index.js → packages/tc-ui/src/test-helpers/index.js
@@ -1,3 +1,4 @@
+/* eslint-disable no-undef */
 const {
 	code,
 	someDocument,
@@ -9,8 +10,8 @@ const {
 	someDate,
 	someDatetime,
 	someUrl,
-} = require('../fixtures/mainTypeData.json');
-const { dropFixtures } = require('../../test-helpers/test-fixtures');
+} = require('./mainTypeData.json');
+const { dropFixtures } = require('../../../../test-helpers/test-fixtures');
 
 const populateParentTypeFields = codeLabel => {
 	cy.visit(`/ParentType/create`);

diff --git a/cypress/fixtures/mainTypeData.json → .../tc-ui/src/test-helpers/mainTypeData.json b/cypress/fixtures/mainTypeData.json → .../tc-ui/src/test-helpers/mainTypeData.json