test: Get all tests passing

.gitignore

@@ -383,10 +383,10 @@ Temporary Items
 docker-compose.yml
 .env
 dist
-packages/core/e2e/__data__/*
+e2e/__data__/*
 packages/core/assets
 packages/core/dist
-packages/core/*.sqlite
+packages/core/e2e/__data__/*.sqlite
 !packages/core/e2e/__data__/.gitkeep
 packages/core/test-emails
 packages/core/src/email/preview/output

package.json

@@ -9,14 +9,16 @@
     "generate-gql-types": "ts-node ./codegen/generate-graphql-types.ts",
     "generate-config-docs": "ts-node ./codegen/generate-config-docs.ts",
     "generate-api-docs": "ts-node ./codegen/generate-api-docs.ts --api=shop && ts-node ./codegen/generate-api-docs.ts --api=admin",
-    "test": "cd admin-ui && yarn test --watch=false --browsers=ChromeHeadlessCI --progress=false && cd ../server && yarn test && yarn test:e2e",
     "format": "prettier --write --html-whitespace-sensitivity ignore",
     "lint:server": "cd server && yarn lint --fix",
     "lint:admin-ui": "cd admin-ui && yarn lint --fix",
     "precommit": "lint-staged",
     "postcommit": "git update-index --again",
-    "prepush": "yarn test && cd admin-ui && yarn build --prod",
-    "dev-server": "ts-node packages/dev-server/index"
+    "prepush": "yarn test:all && cd admin-ui && yarn build --prod",
+    "dev-server": "ts-node packages/dev-server/index",
+    "test:all": "cd admin-ui && yarn test --watch=false --browsers=ChromeHeadlessCI --progress=false && cd ../server && yarn test && yarn test:e2e",
+    "test:server": "jest --config packages/core/jest.config.js",
+    "test:e2e": "jest --config packages/core/e2e/config/jest-e2e.json --runInBand"
   },
   "devDependencies": {
     "@types/graphql": "^14.0.5",
@@ -32,10 +34,12 @@
     "graphql-codegen-typescript-server": "^0.16.0",
     "graphql-tools": "^4.0.0",
     "husky": "^0.14.3",
+    "jest": "^24.5.0",
     "klaw-sync": "^6.0.0",
     "lerna": "^3.13.1",
     "lint-staged": "^7.2.0",
     "prettier": "^1.15.2",
+    "ts-jest": "^24.0.0",
     "ts-node": "^7.0.1",
     "tslint": "^5.11.0",
     "typescript": "^3.2.4"

packages/core/e2e/administrator.e2e-spec.ts

@@ -5,7 +5,7 @@ import {
     GET_ADMINISTRATOR,
     GET_ADMINISTRATORS,
     UPDATE_ADMINISTRATOR,
-} from '../../admin-ui/src/app/data/definitions/administrator-definitions';
+} from '../../../admin-ui/src/app/data/definitions/administrator-definitions';
 import {
     Administrator,
     CreateAdministrator,

packages/core/e2e/auth.e2e-spec.ts

@@ -5,13 +5,13 @@ import path from 'path';
 import {
     CREATE_ADMINISTRATOR,
     CREATE_ROLE,
-} from '../../admin-ui/src/app/data/definitions/administrator-definitions';
-import { ATTEMPT_LOGIN } from '../../admin-ui/src/app/data/definitions/auth-definitions';
+} from '../../../admin-ui/src/app/data/definitions/administrator-definitions';
+import { ATTEMPT_LOGIN } from '../../../admin-ui/src/app/data/definitions/auth-definitions';
 import {
     CREATE_PRODUCT,
     GET_PRODUCT_LIST,
     UPDATE_PRODUCT,
-} from '../../admin-ui/src/app/data/definitions/product-definitions';
+} from '../../../admin-ui/src/app/data/definitions/product-definitions';
 import {
     CreateAdministrator,
     CreateProductMutationArgs,

packages/core/e2e/collection.e2e-spec.ts

@@ -7,13 +7,13 @@ import {
     GET_COLLECTION,
     MOVE_COLLECTION,
     UPDATE_COLLECTION,
-} from '../../admin-ui/src/app/data/definitions/collection-definitions';
-import { FACET_VALUE_FRAGMENT } from '../../admin-ui/src/app/data/definitions/facet-definitions';
+} from '../../../admin-ui/src/app/data/definitions/collection-definitions';
+import { FACET_VALUE_FRAGMENT } from '../../../admin-ui/src/app/data/definitions/facet-definitions';
 import {
     GET_ASSET_LIST,
     UPDATE_PRODUCT,
     UPDATE_PRODUCT_VARIANTS,
-} from '../../admin-ui/src/app/data/definitions/product-definitions';
+} from '../../../admin-ui/src/app/data/definitions/product-definitions';
 import {
     Collection,
     ConfigArgType,

packages/core/e2e/config/jest-e2e.json

@@ -1,7 +1,7 @@
 {
   "moduleFileExtensions": ["js", "json", "ts"],
   "moduleNameMapper": {
-    "shared/(.*)": "<rootDir>/../../shared/$1.ts"
+    "shared/(.*)": "<rootDir>/../../../shared/$1.ts"
   },
   "rootDir": "../",
   "testRegex": ".e2e-spec.ts$",

packages/core/e2e/country.e2e-spec.ts

@@ -6,7 +6,7 @@ import {
     GET_COUNTRY,
     GET_COUNTRY_LIST,
     UPDATE_COUNTRY,
-} from '../../admin-ui/src/app/data/definitions/settings-definitions';
+} from '../../../admin-ui/src/app/data/definitions/settings-definitions';
 import {
     CreateCountry,
     DeletionResult,

packages/core/e2e/customer.e2e-spec.ts

@@ -7,7 +7,7 @@ import {
     GET_CUSTOMER_LIST,
     UPDATE_CUSTOMER,
     UPDATE_CUSTOMER_ADDRESS,
-} from '../../admin-ui/src/app/data/definitions/customer-definitions';
+} from '../../../admin-ui/src/app/data/definitions/customer-definitions';
 import {
     CreateCustomerAddress,
     DeletionResult,

packages/core/e2e/default-search-plugin.e2e-spec.ts

@@ -4,9 +4,9 @@ import path from 'path';
 import {
     CREATE_COLLECTION,
     UPDATE_COLLECTION,
-} from '../../admin-ui/src/app/data/definitions/collection-definitions';
-import { SEARCH_PRODUCTS, UPDATE_PRODUCT } from '../../admin-ui/src/app/data/definitions/product-definitions';
-import { UPDATE_TAX_RATE } from '../../admin-ui/src/app/data/definitions/settings-definitions';
+} from '../../../admin-ui/src/app/data/definitions/collection-definitions';
+import { SEARCH_PRODUCTS, UPDATE_PRODUCT } from '../../../admin-ui/src/app/data/definitions/product-definitions';
+import { UPDATE_TAX_RATE } from '../../../admin-ui/src/app/data/definitions/settings-definitions';
 import {
     ConfigArgType,
     CreateCollection,

packages/core/e2e/entity-id-strategy.e2e-spec.ts

@@ -1,7 +1,7 @@
 import gql from 'graphql-tag';
 import path from 'path';
 
-import { CREATE_FACET } from '../../admin-ui/src/app/data/definitions/facet-definitions';
+import { CREATE_FACET } from '../../../admin-ui/src/app/data/definitions/facet-definitions';
 import { CreateFacet, LanguageCode } from '../../../shared/generated-types';
 
 import { TEST_SETUP_TIMEOUT_MS } from './config/test-config';

packages/core/e2e/facet.e2e-spec.ts

@@ -8,13 +8,13 @@ import {
     GET_FACET_WITH_VALUES,
     UPDATE_FACET,
     UPDATE_FACET_VALUES,
-} from '../../admin-ui/src/app/data/definitions/facet-definitions';
+} from '../../../admin-ui/src/app/data/definitions/facet-definitions';
 import {
     GET_PRODUCT_LIST,
     GET_PRODUCT_WITH_VARIANTS,
     UPDATE_PRODUCT,
     UPDATE_PRODUCT_VARIANTS,
-} from '../../admin-ui/src/app/data/definitions/product-definitions';
+} from '../../../admin-ui/src/app/data/definitions/product-definitions';
 import {
     CreateFacet,
     CreateFacetValues,

packages/core/e2e/order.e2e-spec.ts

@@ -2,8 +2,8 @@
 import gql from 'graphql-tag';
 import path from 'path';
 
-import { GET_CUSTOMER_LIST } from '../../admin-ui/src/app/data/definitions/customer-definitions';
-import { GET_ORDER, GET_ORDERS_LIST } from '../../admin-ui/src/app/data/definitions/order-definitions';
+import { GET_CUSTOMER_LIST } from '../../../admin-ui/src/app/data/definitions/customer-definitions';
+import { GET_ORDER, GET_ORDERS_LIST } from '../../../admin-ui/src/app/data/definitions/order-definitions';
 import { GetCustomerList, GetOrder, GetOrderList } from '../../../shared/generated-types';
 
 import { TEST_SETUP_TIMEOUT_MS } from './config/test-config';

packages/core/e2e/product.e2e-spec.ts

@@ -11,7 +11,7 @@ import {
     REMOVE_OPTION_GROUP_FROM_PRODUCT,
     UPDATE_PRODUCT,
     UPDATE_PRODUCT_VARIANTS,
-} from '../../admin-ui/src/app/data/definitions/product-definitions';
+} from '../../../admin-ui/src/app/data/definitions/product-definitions';
 import {
     AddOptionGroupToProduct,
     CreateProduct,

packages/core/e2e/promotion.e2e-spec.ts

@@ -7,7 +7,7 @@ import {
     GET_PROMOTION,
     GET_PROMOTION_LIST,
     UPDATE_PROMOTION,
-} from '../../admin-ui/src/app/data/definitions/promotion-definitions';
+} from '../../../admin-ui/src/app/data/definitions/promotion-definitions';
 import {
     ConfigArgType,
     CreatePromotion,
@@ -18,7 +18,7 @@ import {
     Promotion,
     UpdatePromotion,
 } from '../../../shared/generated-types';
-import { pick } from '../../shared/pick';
+import { pick } from '../../../shared/pick';
 import { PromotionAction, PromotionOrderAction } from '../src/config/promotion/promotion-action';
 import { PromotionCondition } from '../src/config/promotion/promotion-condition';
 

packages/core/e2e/role.e2e-spec.ts

@@ -5,7 +5,7 @@ import {
     GET_ROLE,
     GET_ROLES,
     UPDATE_ROLE,
-} from '../../admin-ui/src/app/data/definitions/administrator-definitions';
+} from '../../../admin-ui/src/app/data/definitions/administrator-definitions';
 import { CreateRole, GetRole, GetRoles, Permission, Role, UpdateRole } from '../../../shared/generated-types';
 import { omit } from '../../../shared/omit';
 import { CUSTOMER_ROLE_CODE, SUPER_ADMIN_ROLE_CODE } from '../../../shared/shared-constants';

packages/core/e2e/shop-auth.e2e-spec.ts

@@ -6,9 +6,9 @@ import path from 'path';
 import {
     CREATE_ADMINISTRATOR,
     CREATE_ROLE,
-} from '../../admin-ui/src/app/data/definitions/administrator-definitions';
-import { GET_CUSTOMER } from '../../admin-ui/src/app/data/definitions/customer-definitions';
-import { RegisterCustomerInput } from '../../shared/generated-shop-types';
+} from '../../../admin-ui/src/app/data/definitions/administrator-definitions';
+import { GET_CUSTOMER } from '../../../admin-ui/src/app/data/definitions/customer-definitions';
+import { RegisterCustomerInput } from '../../../shared/generated-shop-types';
 import { CreateAdministrator, CreateRole, GetCustomer, Permission } from '../../../shared/generated-types';
 import { NoopEmailGenerator } from '../src/config/email/noop-email-generator';
 import { defaultEmailTypes } from '../src/email/default-email-types';
@@ -20,7 +20,7 @@ import { assertThrowsWithMessage } from './test-utils';
 
 let sendEmailFn: jest.Mock;
 const emailOptions = {
-    emailTemplatePath: 'src/email/templates',
+    emailTemplatePath: path.join(__dirname, '../src/email/templates'),
     emailTypes: defaultEmailTypes,
     generator: new NoopEmailGenerator(),
     transport: {

packages/core/e2e/shop-customer.e2e-spec.ts

@@ -2,16 +2,16 @@
 import gql from 'graphql-tag';
 import path from 'path';
 
-import { ATTEMPT_LOGIN } from '../../admin-ui/src/app/data/definitions/auth-definitions';
+import { ATTEMPT_LOGIN } from '../../../admin-ui/src/app/data/definitions/auth-definitions';
 import {
     CUSTOMER_FRAGMENT,
     GET_CUSTOMER,
-} from '../../admin-ui/src/app/data/definitions/customer-definitions';
+} from '../../../admin-ui/src/app/data/definitions/customer-definitions';
 import {
     CreateAddressInput,
     UpdateAddressInput,
     UpdateCustomerInput,
-} from '../../shared/generated-shop-types';
+} from '../../../shared/generated-shop-types';
 import { AttemptLogin, GetCustomer } from '../../../shared/generated-types';
 
 import { TEST_SETUP_TIMEOUT_MS } from './config/test-config';

packages/core/e2e/shop-order.e2e-spec.ts

@@ -5,11 +5,11 @@ import path from 'path';
 import {
     GET_CUSTOMER,
     GET_CUSTOMER_LIST,
-} from '../../admin-ui/src/app/data/definitions/customer-definitions';
+} from '../../../admin-ui/src/app/data/definitions/customer-definitions';
 import {
     GET_COUNTRY_LIST,
     UPDATE_COUNTRY,
-} from '../../admin-ui/src/app/data/definitions/settings-definitions';
+} from '../../../admin-ui/src/app/data/definitions/settings-definitions';
 import {
     CreateAddressInput,
     GetCountryList,

packages/core/e2e/zone.e2e-spec.ts

@@ -8,7 +8,7 @@ import {
     GET_ZONE,
     REMOVE_MEMBERS_FROM_ZONE,
     UPDATE_ZONE,
-} from '../../admin-ui/src/app/data/definitions/settings-definitions';
+} from '../../../admin-ui/src/app/data/definitions/settings-definitions';
 import {
     AddMembersToZone,
     CreateZone,

packages/core/jest.config.js

@@ -0,0 +1,21 @@
+module.exports = {
+    coverageDirectory: "coverage",
+    moduleFileExtensions: [
+        "js",
+        "json",
+        "ts",
+    ],
+    moduleNameMapper: {
+        "shared/(.*)": "<rootDir>/../../shared/$1.ts",
+    },
+    preset: "ts-jest",
+    rootDir: __dirname,
+    roots: [
+        "<rootDir>/src",
+        "<rootDir>/../../shared",
+        "<rootDir>../../mock-data",
+    ],
+    transform: {
+        "^.+\\.(t|j)s$": "ts-jest",
+    },
+};

packages/core/mock-data/mock-data.service.ts

@@ -1,8 +1,8 @@
 import faker from 'faker/locale/en_GB';
 import gql from 'graphql-tag';
 
-import { CREATE_CHANNEL } from '../../admin-ui/src/app/data/definitions/settings-definitions';
-import { CREATE_SHIPPING_METHOD } from '../../admin-ui/src/app/data/definitions/shipping-definitions';
+import { CREATE_CHANNEL } from '../../../admin-ui/src/app/data/definitions/settings-definitions';
+import { CREATE_SHIPPING_METHOD } from '../../../admin-ui/src/app/data/definitions/shipping-definitions';
 import {
     Channel,
     CreateAddressInput,

packages/core/mock-data/simple-graphql-client.ts

@@ -4,7 +4,7 @@ import gql from 'graphql-tag';
 import { print } from 'graphql/language/printer';
 import { Curl } from 'node-libcurl';
 
-import { CREATE_ASSETS } from '../../admin-ui/src/app/data/definitions/product-definitions';
+import { CREATE_ASSETS } from '../../../admin-ui/src/app/data/definitions/product-definitions';
 import { CreateAssets, ImportInfo } from '../../../shared/generated-types';
 import { SUPER_ADMIN_USER_IDENTIFIER, SUPER_ADMIN_USER_PASSWORD } from '../../../shared/shared-constants';
 import { getConfig } from '../src/config/config-helpers';

packages/core/package.json

@@ -18,11 +18,8 @@
   "license": "MIT",
   "scripts": {
     "lint": "tslint --project tsconfig.json -c tslint.json",
-    "test": "jest --runInBand",
-    "test:watch": "jest --watch",
-    "test:cov": "jest --coverage",
-    "test:e2e": "jest --config ./e2e/config/jest-e2e.json --runInBand",
-    "test:e2e:watch": "jest --config ./e2e/config/jest-e2e.json --watch --runInBand",
+    "test:e2e": "jest --config ../../e2e/config/jest-e2e.json --runInBand",
+    "test:e2e:watch": "jest --config ../../e2e/config/jest-e2e.json --watch --runInBand",
     "generate-email-preview": "node -r ts-node/register src/email/preview/generate-email-preview.ts",
     "build": "rimraf dist && tsc -p ./build/tsconfig.build.json && tsc -p ./build/tsconfig.cli.json && gulp -f ./build/gulpfile.ts build",
     "publish:alpha": "yarn build && npm publish --access public --tag alpha"
@@ -98,33 +95,11 @@
     "faker": "^4.1.0",
     "graphql-request": "^1.8.2",
     "gulp": "^4.0.0",
-    "jest": "^23.6.0",
     "node-libcurl": "^1.3.3",
     "opn": "^5.4.0",
     "pg": "^7.8.0",
     "rimraf": "^2.6.3",
     "sql.js": "^0.5.0",
-    "sqlite3": "^4.0.6",
-    "ts-jest": "~23.10.5"
-  },
-  "jest": {
-    "moduleFileExtensions": [
-      "js",
-      "json",
-      "ts"
-    ],
-    "moduleNameMapper": {
-      "shared/(.*)": "<rootDir>/../../shared/$1.ts"
-    },
-    "roots": [
-      "src",
-      "../../shared",
-      "mock-data"
-    ],
-    "transform": {
-      "^.+\\.(t|j)s$": "ts-jest"
-    },
-    "coverageDirectory": "../coverage",
-    "preset": "ts-jest"
+    "sqlite3": "^4.0.6"
   }
 }

packages/dev-server/package.json

@@ -3,6 +3,7 @@
   "version": "1.0.0",
   "main": "index.js",
   "license": "MIT",
+  "private": true,
   "scripts": {
     "populate": "node -r ts-node/register mock-data/populate-cli.ts",
     "start:dev": "nodemon --config nodemon-debug.json"