Merge branch 'trunk' of github.com:reactioncommerce/admin-core into t…

…runk

jest.config.js

@@ -3,9 +3,9 @@ const config = require("./package/config/jest.config");
 module.exports = {
   ...config,
   setupFiles: [
-    "<rootDir>/package/config/test-polyfills.js"
+    "<rootDir>/package/scripts/testPolyfills.js"
   ],
   setupFilesAfterEnv: [
-    "<rootDir>/package/src/test-utils/setupTests.js"
+    "<rootDir>/package/scripts/setupTests.js"
   ]
 };

package/bin/build-plugin

@@ -13,7 +13,6 @@ cp -r bin dist
 cp -r config dist
 cp -r scripts dist
 cp -r src/graphql dist
-cp -r src/test-utils dist
 cp package.json dist
 cp README.md dist
 cp LICENSE dist

package/config/babel.config.js

@@ -73,7 +73,7 @@ module.exports = function (api) {
   ];
 
   let ignore;
-  if (process.env.NODE_ENV === "production") {
+  if (process.env.BABEL_ENV === "production") {
     ignore = [
       "**/*.test.js",
       "__snapshots__",

package/config/jest.config.js

@@ -9,17 +9,18 @@ module.exports = {
     "graphql"
   ],
   setupFiles: [
-    "<rootDir>/node_modules/@reactioncommerce/admin-core/config/test-polyfills.js"
+    "<rootDir>/node_modules/@reactioncommerce/admin-core/scripts/testPolyfills.js"
   ],
   setupFilesAfterEnv: [
-    "<rootDir>/node_modules/@reactioncommerce/admin-core/test-utils/setupTests.js"
+    "<rootDir>/node_modules/@reactioncommerce/admin-core/scripts/setupTests.js"
   ],
   testPathIgnorePatterns: [
     "<rootDir>/config/",
     "<rootDir>/reports/",
     "<rootDir>/bin/",
     "<rootDir>/dist/",
-    "<rootDir>/node_modules/"
+    "<rootDir>/node_modules/",
+    "<rootDir>/package/dist/"
   ],
   transform: {
     "\\.(gql|graphql)$": "@jagi/jest-transform-graphql",

package/scripts/setupTests.js

@@ -0,0 +1,9 @@
+// Add async/await features
+// eslint-disable-next-line node/no-extraneous-require
+require("regenerator-runtime/runtime");
+
+// add some helpful assertions
+require("@testing-library/jest-dom/extend-expect");
+
+// Polyfill fetch
+require("unfetch/polyfill");

package/src/lib/core/routes.js

@@ -36,7 +36,7 @@ export function registerRoute(route) {
  * @returns {undefined}
  */
 export function registerSetting(route) {
-  routes.push({
+  registerRoute({
     ...route,
     path: `/settings/${route.name}`,
     href: `/settings/${route.name || route.href || route.path}`,

package/src/lib/core/routes.test.js

@@ -0,0 +1,47 @@
+/* eslint-disable react/no-multi-comp */
+/* eslint-disable react/display-name */
+import React from "react";
+import { registerRoute, registerSetting, routes, defaultRouteGroups } from "./routes";
+
+beforeEach(() => {
+  // Clear the routes array for each test
+  routes.splice(0, routes.length);
+});
+
+test("should register a route", () => {
+  registerRoute({
+    navigationItemLabel: "Test",
+    path: "/test",
+    MainComponent: () => (<span>Test Component</span>)
+  });
+
+  expect(routes.length).toEqual(1);
+  expect(routes[0].navigationItemLabel).toEqual("Test");
+  expect(typeof routes[0].MainComponent).toEqual("function");
+  expect(routes[0]).toEqual({
+    priority: expect.any(Number),
+    navigationItemLabel: "Test",
+    path: "/test",
+    MainComponent: expect.any(Function)
+  });
+});
+
+test("should register a setting route", () => {
+  registerSetting({
+    name: "test-setting",
+    navigationItemLabel: "Test Setting",
+    MainComponent: () => (<span>Test Component</span>)
+  });
+
+  expect(routes.length).toEqual(1);
+
+  expect(routes[0]).toEqual({
+    priority: expect.any(Number),
+    name: "test-setting",
+    group: defaultRouteGroups.settings,
+    navigationItemLabel: "Test Setting",
+    path: "/settings/test-setting",
+    href: "/settings/test-setting",
+    MainComponent: expect.any(Function)
+  });
+});

package/src/lib/graphql/initApollo.js

@@ -1,7 +1,5 @@
 import { ApolloClient } from "apollo-client";
 import { ApolloLink } from "apollo-link";
-// Polyfill fetch
-import "unfetch/polyfill";
 import { HttpLink } from "apollo-link-http";
 import { InMemoryCache } from "apollo-cache-inmemory";