@ukhomeoffice/cop-react-form-renderer 2.9.1 → 2.10.2

package/dist/components/FormComponent/helpers/index.js

@@ -0,0 +1,15 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "getComponentError", {
+  enumerable: true,
+  get: function get() {
+    return _getComponentError.default;
+  }
+});
+
+var _getComponentError = _interopRequireDefault(require("./getComponentError"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/dist/components/FormPage/FormPage.js

@@ -13,6 +13,8 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _hooks = require("../../hooks");
+
 var _utils = _interopRequireDefault(require("../../utils"));
 
 var _FormComponent = _interopRequireDefault(require("../FormComponent"));
@@ -60,10 +62,8 @@ var FormPage = function FormPage(_ref) {
       patch = _useState2[0],
       setPatch = _useState2[1];
 
-  var _useState3 = (0, _react.useState)([]),
-      _useState4 = _slicedToArray(_useState3, 2),
-      errors = _useState4[0],
-      setErrors = _useState4[1];
+  var _useValidation = (0, _hooks.useValidation)(),
+      errors = _useValidation.errors;
   /**
    * Handle the state of the data directly within the page.
    * This is so that the overall form data isn't affected until such
@@ -79,16 +79,12 @@ var FormPage = function FormPage(_ref) {
     });
   };
 
-  var onError = function onError(errors) {
-    setErrors(errors);
-  };
-
   var classes = _utils.default.classBuilder(classBlock, classModifiers, className);
 
   return /*#__PURE__*/_react.default.createElement("div", {
     className: classes('page'),
     key: page.id
-  }, page.title && /*#__PURE__*/_react.default.createElement(_copReactComponents.LargeHeading, null, page.title), errors && errors.length > 0 && /*#__PURE__*/_react.default.createElement(_copReactComponents.ErrorSummary, {
+  }, page.title && /*#__PURE__*/_react.default.createElement(_copReactComponents.LargeHeading, null, page.title), (errors === null || errors === void 0 ? void 0 : errors.length) > 0 && /*#__PURE__*/_react.default.createElement(_copReactComponents.ErrorSummary, {
     errors: errors
   }), page.components.filter(function (c) {
     return _utils.default.Component.show(c, page.formData);
@@ -97,13 +93,13 @@ var FormPage = function FormPage(_ref) {
       key: index,
       component: component,
       onChange: onPageChange,
-      value: page.formData[component.fieldId] || '',
+      value: page.formData[component.fieldId],
       formData: page.formData
     });
   }), /*#__PURE__*/_react.default.createElement(_PageActions.default, {
     actions: page.actions,
     onAction: function onAction(action) {
-      return _onAction(action, patch, onError);
+      return _onAction(action, patch);
     }
   }));
 };

package/dist/components/FormPage/FormPage.test.js

@@ -8,6 +8,8 @@ var _react2 = _interopRequireDefault(require("react"));
 
 var _models = require("../../models");
 
+var _setupTests = require("../../setupTests");
+
 var _ActionButton = require("../PageActions/ActionButton");
 
 var _FormPage = _interopRequireWildcard(require("./FormPage"));
@@ -22,7 +24,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
-describe('components', function () {
+describe('components.FormPage', function () {
   describe('FormPage', function () {
     var TEXT = {
       id: 'text',
@@ -58,16 +60,16 @@ describe('components', function () {
       ON_ACTION_CALLS.length = 0;
     });
     it('should render a submit page correctly', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-      var _render, container, page, heading, formGroup, label, hint, input, buttonGroup, button;
+      var _renderWithValidation, container, page, heading, formGroup, label, hint, input, buttonGroup, button;
 
       return regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              _render = (0, _react.render)( /*#__PURE__*/_react2.default.createElement(_FormPage.default, {
+              _renderWithValidation = (0, _setupTests.renderWithValidation)( /*#__PURE__*/_react2.default.createElement(_FormPage.default, {
                 page: PAGE,
                 onAction: ON_ACTION
-              })), container = _render.container;
+              })), container = _renderWithValidation.container;
               page = container.childNodes[0];
               expect(page.tagName).toEqual('DIV');
               expect(page.classList).toContain("".concat(_FormPage.DEFAULT_CLASS, "__page"));
@@ -107,16 +109,16 @@ describe('components', function () {
       }, _callee);
     })));
     it('should handle a page change appropriately', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
-      var _render2, container, page, input, NEW_VALUE, EVENT;
+      var _renderWithValidation2, container, page, input, NEW_VALUE, EVENT;
 
       return regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
-              _render2 = (0, _react.render)( /*#__PURE__*/_react2.default.createElement(_FormPage.default, {
+              _renderWithValidation2 = (0, _setupTests.renderWithValidation)( /*#__PURE__*/_react2.default.createElement(_FormPage.default, {
                 page: PAGE,
                 onAction: ON_ACTION
-              })), container = _render2.container;
+              })), container = _renderWithValidation2.container;
               page = container.childNodes[0];
               expect(page.tagName).toEqual('DIV'); // Change the input.
 
@@ -142,16 +144,16 @@ describe('components', function () {
       }, _callee2);
     })));
     it('should handle a page action appropriately', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
-      var _render3, container, page, input, NEW_VALUE, CHANGE_EVENT, button;
+      var _renderWithValidation3, container, page, input, NEW_VALUE, CHANGE_EVENT, button;
 
       return regeneratorRuntime.wrap(function _callee3$(_context3) {
         while (1) {
           switch (_context3.prev = _context3.next) {
             case 0:
-              _render3 = (0, _react.render)( /*#__PURE__*/_react2.default.createElement(_FormPage.default, {
+              _renderWithValidation3 = (0, _setupTests.renderWithValidation)( /*#__PURE__*/_react2.default.createElement(_FormPage.default, {
                 page: PAGE,
                 onAction: ON_ACTION
-              })), container = _render3.container;
+              })), container = _renderWithValidation3.container;
               page = container.childNodes[0]; // Change the input.
 
               input = page.childNodes[1].childNodes[2];
@@ -185,71 +187,5 @@ describe('components', function () {
         }
       }, _callee3);
     })));
-    it('should display errors appropriately', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4() {
-      var ERRORS, THROW_ERROR_ON_ACTION, _render4, container, page, input, NEW_VALUE, CHANGE_EVENT, button, errorSummary, errorList, error, errorLink;
-
-      return regeneratorRuntime.wrap(function _callee4$(_context4) {
-        while (1) {
-          switch (_context4.prev = _context4.next) {
-            case 0:
-              ERRORS = [{
-                id: TEXT.id,
-                error: 'Invalid value'
-              }];
-
-              THROW_ERROR_ON_ACTION = function THROW_ERROR_ON_ACTION(action, patch, onError) {
-                ON_ACTION_CALLS.push({
-                  action: action,
-                  patch: patch,
-                  onError: onError
-                });
-                onError(ERRORS);
-              };
-
-              _render4 = (0, _react.render)( /*#__PURE__*/_react2.default.createElement(_FormPage.default, {
-                page: PAGE,
-                onAction: THROW_ERROR_ON_ACTION
-              })), container = _render4.container;
-              page = container.childNodes[0]; // Change the input.
-
-              input = page.childNodes[1].childNodes[2];
-              NEW_VALUE = "".concat(VALUE, ".");
-              CHANGE_EVENT = {
-                target: {
-                  name: TEXT.fieldId,
-                  value: NEW_VALUE
-                }
-              };
-
-              _react.fireEvent.change(input, CHANGE_EVENT); // Then click the action button, which should call the onError callback method.
-
-
-              button = page.childNodes[2].childNodes[0];
-
-              _react.fireEvent.click(button, {}); // And confirm the page error is now displayed.
-
-
-              errorSummary = page.childNodes[1];
-              expect(errorSummary.tagName).toEqual('DIV');
-              expect(errorSummary.id).toEqual('error-summary');
-              expect(errorSummary.classList).toContain('govuk-error-summary');
-              errorList = errorSummary.childNodes[1].childNodes[0];
-              expect(errorList.tagName).toEqual('UL');
-              expect(errorList.classList).toContain('govuk-error-summary__list');
-              expect(errorList.childNodes.length).toEqual(ERRORS.length);
-              error = errorList.childNodes[0];
-              expect(error.tagName).toEqual('LI');
-              errorLink = error.childNodes[0];
-              expect(errorLink.tagName).toEqual('A');
-              expect(errorLink.textContent).toEqual(ERRORS[0].error);
-              expect(errorLink.getAttribute('href')).toEqual("#".concat(ERRORS[0].id));
-
-            case 24:
-            case "end":
-              return _context4.stop();
-          }
-        }
-      }, _callee4);
-    })));
   });
 });

package/dist/components/FormRenderer/FormRenderer.js

@@ -13,6 +13,8 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _context = require("../../context");
+
 var _hooks2 = require("../../hooks");
 
 var _models = require("../../models");
@@ -57,24 +59,57 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var DEFAULT_CLASS = 'hods-form';
-exports.DEFAULT_CLASS = DEFAULT_CLASS;
-
 var FormRenderer = function FormRenderer(_ref) {
   var title = _ref.title,
       type = _ref.type,
       components = _ref.components,
-      _pages = _ref.pages,
-      _hub = _ref.hub,
+      pages = _ref.pages,
+      hub = _ref.hub,
       cya = _ref.cya,
-      _data = _ref.data,
-      _hooks = _ref.hooks,
+      data = _ref.data,
+      hooks = _ref.hooks,
       classBlock = _ref.classBlock,
       classModifiers = _ref.classModifiers,
       className = _ref.className,
       hide_title = _ref.hide_title,
       summaryListClassModifiers = _ref.summaryListClassModifiers,
       noChangeAction = _ref.noChangeAction;
+  return /*#__PURE__*/_react.default.createElement(_context.ValidationContextProvider, null, /*#__PURE__*/_react.default.createElement(InternalFormRenderer, {
+    title: title,
+    type: type,
+    components: components,
+    pages: pages,
+    hub: hub,
+    cya: cya,
+    data: data,
+    hooks: hooks,
+    classBlock: classBlock,
+    classModifiers: classModifiers,
+    className: className,
+    hide_title: hide_title,
+    summaryListClassModifiers: summaryListClassModifiers,
+    noChangeAction: noChangeAction
+  }));
+};
+
+var DEFAULT_CLASS = 'hods-form';
+exports.DEFAULT_CLASS = DEFAULT_CLASS;
+
+var InternalFormRenderer = function InternalFormRenderer(_ref2) {
+  var title = _ref2.title,
+      type = _ref2.type,
+      components = _ref2.components,
+      _pages = _ref2.pages,
+      _hub = _ref2.hub,
+      cya = _ref2.cya,
+      _data = _ref2.data,
+      _hooks = _ref2.hooks,
+      classBlock = _ref2.classBlock,
+      classModifiers = _ref2.classModifiers,
+      className = _ref2.className,
+      hide_title = _ref2.hide_title,
+      summaryListClassModifiers = _ref2.summaryListClassModifiers,
+      noChangeAction = _ref2.noChangeAction;
 
   // Set up the initial states.
   var _useState = (0, _react.useState)({}),
@@ -82,35 +117,40 @@ var FormRenderer = function FormRenderer(_ref) {
       data = _useState2[0],
       setData = _useState2[1];
 
-  var _useState3 = (0, _react.useState)([]),
+  var _useState3 = (0, _react.useState)(),
       _useState4 = _slicedToArray(_useState3, 2),
-      pages = _useState4[0],
-      setPages = _useState4[1];
+      submitted = _useState4[0],
+      setSubmitted = _useState4[1];
 
-  var _useState5 = (0, _react.useState)(undefined),
+  var _useState5 = (0, _react.useState)([]),
       _useState6 = _slicedToArray(_useState5, 2),
-      hub = _useState6[0],
-      setHub = _useState6[1];
+      pages = _useState6[0],
+      setPages = _useState6[1];
 
-  var _useState7 = (0, _react.useState)(_helpers.default.getNextPageId(type, _pages)),
+  var _useState7 = (0, _react.useState)(undefined),
       _useState8 = _slicedToArray(_useState7, 2),
-      pageId = _useState8[0],
-      setPageId = _useState8[1];
+      hub = _useState8[0],
+      setHub = _useState8[1];
 
-  var _useState9 = (0, _react.useState)(_helpers.default.getFormState(pageId, pages, hub)),
+  var _useState9 = (0, _react.useState)(_helpers.default.getNextPageId(type, _pages)),
       _useState10 = _slicedToArray(_useState9, 2),
-      formState = _useState10[0],
-      setFormState = _useState10[1];
+      pageId = _useState10[0],
+      setPageId = _useState10[1];
 
-  var _useState11 = (0, _react.useState)({}),
+  var _useState11 = (0, _react.useState)(_helpers.default.getFormState(pageId, pages, hub)),
       _useState12 = _slicedToArray(_useState11, 2),
-      currentTask = _useState12[0],
-      setCurrentTask = _useState12[1];
+      formState = _useState12[0],
+      setFormState = _useState12[1];
 
   var _useState13 = (0, _react.useState)({}),
       _useState14 = _slicedToArray(_useState13, 2),
-      hubDetails = _useState14[0],
-      setHubDetails = _useState14[1]; // Set up hooks.
+      currentTask = _useState14[0],
+      setCurrentTask = _useState14[1];
+
+  var _useState15 = (0, _react.useState)({}),
+      _useState16 = _slicedToArray(_useState15, 2),
+      hubDetails = _useState16[0],
+      setHubDetails = _useState16[1]; // Set up hooks.
 
 
   var _useHooks = (0, _hooks2.useHooks)(),
@@ -123,7 +163,13 @@ var FormRenderer = function FormRenderer(_ref) {
         addHook(key, _hooks[key]);
       });
     }
-  }, [_hooks, addHook]); // Setup data.
+  }, [_hooks, addHook]); // Set up the useValidation hook.
+
+  var _useValidation = (0, _hooks2.useValidation)(),
+      addErrors = _useValidation.addErrors,
+      clearErrors = _useValidation.clearErrors,
+      validate = _useValidation.validate; // Setup data.
+
 
   (0, _react.useEffect)(function () {
     if (components && _pages && _data) {
@@ -160,7 +206,16 @@ var FormRenderer = function FormRenderer(_ref) {
   }, [hooks]);
   (0, _react.useEffect)(function () {
     setHubDetails(_hub);
-  }, [_hub]); // Update task list pages with form data and update states
+  }, [_hub]); // Calling setData directly within the hooks.onSubmit success handler
+  // resulted in a sychronisation error. Handling it in a useEffect appears
+  // to be the way to deal with this... and it certainly seems to work.
+
+  (0, _react.useEffect)(function () {
+    if (submitted !== null && submitted !== void 0 && submitted.data) {
+      setData(submitted.data);
+      setSubmitted(undefined);
+    }
+  }, [submitted, setData, setSubmitted]); // Update task list pages with form data and update states
 
   (0, _react.useEffect)(function () {
     var pages = currentTask.fullPages;
@@ -190,15 +245,16 @@ var FormRenderer = function FormRenderer(_ref) {
   }, [currentTask.fullPages, data, hubDetails === null || hubDetails === void 0 ? void 0 : hubDetails.sections]);
 
   var onPageChange = function onPageChange(newPageId) {
+    clearErrors();
     setPageId(newPageId);
     hooks.onPageChange(newPageId);
   }; // Handle actions from pages.
 
 
-  var onPageAction = function onPageAction(action, patch, onError) {
+  var onPageAction = function onPageAction(action, patch) {
     // Check to see whether the action is able to proceed, which in
     // in the case of a submission will validate the fields in the page.
-    if (_helpers.default.canActionProceed(action, formState.page, onError)) {
+    if (_helpers.default.canActionProceed(action, formState.page, validate.page)) {
       if (action.type === _models.PageAction.TYPES.NAVIGATE) {
         _handlers.default.navigate(action, pageId, onPageChange);
       } else {
@@ -216,7 +272,9 @@ var FormRenderer = function FormRenderer(_ref) {
 
         var pageUpdate = function pageUpdate(next) {
           return onPageChange(_helpers.default.getNextPageId(type, pages, pageId, action, next));
-        };
+        }; // const navigablePages = currentTask?.fullPages || pages;
+        // let pageUpdate = (next) => onPageChange(helpers.getNextPageId(type, navigablePages, pageId, action, next));
+
 
         if (action.type === _models.PageAction.TYPES.SAVE_AND_NAVIGATE) {
           pageUpdate = function pageUpdate() {
@@ -226,15 +284,16 @@ var FormRenderer = function FormRenderer(_ref) {
 
 
         hooks.onSubmit(action.type, submissionData, function (response) {
-          // The backend response may well contain data we need so apply it.
-          setData(function (prev) {
-            var next = _objectSpread(_objectSpread({}, prev), response);
+          // The backend response may well contain data we need so apply it...
+          // ... but this needs to happen in a useEffect, not right away.
+          var sData = _objectSpread(_objectSpread({}, submissionData), response);
 
-            pageUpdate(next);
-            return next;
+          setSubmitted({
+            data: sData
           });
+          pageUpdate(sData);
         }, function (errors) {
-          _handlers.default.submissionError(errors, onError);
+          _handlers.default.submissionError(errors, addErrors);
         });
       }
     }
@@ -266,11 +325,11 @@ var FormRenderer = function FormRenderer(_ref) {
   }; // Handle actions from "Check your answers".
 
 
-  var onCYAAction = function onCYAAction(action, onError) {
+  var onCYAAction = function onCYAAction(action) {
     // Check to see whether the action is able to proceed, which in
     // in the case of a submission will validate the fields in the page.
     if (action.type === _models.PageAction.TYPES.SUBMIT) {
-      if (_helpers.default.canCYASubmit(pages, onError)) {
+      if (_helpers.default.canCYASubmit(pages, validate.pages)) {
         // Submit.
         var submissionData = _utils.default.Format.form({
           pages: pages,
@@ -283,13 +342,13 @@ var FormRenderer = function FormRenderer(_ref) {
         hooks.onSubmit(action.type, submissionData, function () {
           return hooks.onFormComplete();
         }, function (errors) {
-          return _handlers.default.submissionError(errors, onError);
+          return _handlers.default.submissionError(errors, addErrors);
         });
       }
     }
 
     if (action.type === _models.PageAction.TYPES.SAVE_AND_CONTINUE && hub === _models.HubFormats.TASK) {
-      if (_helpers.default.canCYASubmit(currentTask.fullPages, onError)) {
+      if (_helpers.default.canCYASubmit(currentTask.fullPages, validate.pages)) {
         var _submissionData = _utils.default.Format.form({
           pages: pages,
           components: components
@@ -300,13 +359,13 @@ var FormRenderer = function FormRenderer(_ref) {
         hooks.onSubmit(action.type, _submissionData, function () {
           return onPageChange(_models.FormPages.HUB);
         }, function (errors) {
-          return _handlers.default.submissionError(errors, onError);
+          return _handlers.default.submissionError(errors, addErrors);
         });
       }
     }
 
     if (action.type === _models.PageAction.TYPES.SAVE_AND_RETURN) {
-      if (_helpers.default.canCYASubmit(currentTask.fullPages, onError)) {
+      if (_helpers.default.canCYASubmit(currentTask.fullPages, validate.pages)) {
         var _submissionData2 = _utils.default.Format.form({
           pages: pages,
           components: components
@@ -321,7 +380,7 @@ var FormRenderer = function FormRenderer(_ref) {
             onPageChange(_models.FormPages.HUB);
           }
         }, function (errors) {
-          return _handlers.default.submissionError(errors, onError);
+          return _handlers.default.submissionError(errors, addErrors);
         });
       }
     }
@@ -354,7 +413,7 @@ var FormRenderer = function FormRenderer(_ref) {
   }));
 };
 
-FormRenderer.propTypes = {
+FormRenderer.propTypes = InternalFormRenderer.propTypes = {
   title: _propTypes.default.string,
 
   /** See <a href="/?path=/docs/f-json--page#formtypes">FormTypes</a>. */
@@ -377,7 +436,7 @@ FormRenderer.propTypes = {
   summaryListClassModifiers: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.arrayOf(_propTypes.default.string)]),
   noChangeAction: _propTypes.default.bool
 };
-FormRenderer.defaultProps = {
+FormRenderer.defaultProps = InternalFormRenderer.defaultProps = {
   type: _models.FormTypes.HUB,
   components: [],
   pages: [],

package/dist/components/FormRenderer/helpers/canActionProceed.js

@@ -5,27 +5,18 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _utils = _interopRequireDefault(require("../../../utils"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-// Local imports
-
 /**
  * Assesses whether the action can proceed when navigating, submitting, etc.
  * Presently, this will validate a page when submitting and, only if the page is
  * valid will it proceed. If it's simple navigation, it simply returns true.
  * @param {object} action The action object we're assessing.
  * @param {object} page The page configuration object this action relates to.
- * @param {Function} onError A function to call with any validation errors.
+ * @param {Function} pageValidator A function to validate the page.
  * @returns A boolean where `true` means the action can proceed and `false` means it cannot.
  */
-var canActionProceed = function canActionProceed(action, page, onError) {
+var canActionProceed = function canActionProceed(action, page, pageValidator) {
   if (action.validate) {
-    var errors = _utils.default.Validate.page(page);
-
-    onError(errors);
-    return errors.length === 0;
+    return pageValidator(page).length === 0;
   }
 
   return true;

package/dist/components/FormRenderer/helpers/canActionProceed.test.js

@@ -1,73 +1,49 @@
 "use strict";
 
+var _Validate = _interopRequireDefault(require("../../../utils/Validate"));
+
 var _canActionProceed = _interopRequireDefault(require("./canActionProceed"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-describe('components', function () {
-  describe('FormRenderer', function () {
-    describe('helpers', function () {
-      describe('canActionProceed', function () {
-        it('should return true when the action does not require validation', function () {
-          var ACTION = {
-            validate: false
-          };
-          expect((0, _canActionProceed.default)(ACTION, {}, function () {})).toBeTruthy();
-        });
-        it('should return true when the page is valid', function () {
-          var ACTION = {
-            validate: true
-          };
-          var PAGE = {
-            components: [{
-              id: 'a',
-              fieldId: 'a',
-              label: 'Alpha',
-              required: true
-            }],
-            formData: {
-              a: 'Bravo'
-            }
-          };
-          expect((0, _canActionProceed.default)(ACTION, PAGE, function () {})).toBeTruthy();
-        });
-        it('should return false when the page is invalid and should have called the onErrors method appropriately', function () {
-          var ACTION = {
-            validate: true
-          };
-          var PAGE = {
-            components: [{
-              id: 'a',
-              fieldId: 'a',
-              label: 'Alpha',
-              required: true
-            }],
-            formData: {}
-          };
-          var ERRORS = [];
-
-          var ON_ERROR = function ON_ERROR(errors) {
-            ERRORS.push.apply(ERRORS, _toConsumableArray(errors));
-          };
-
-          expect((0, _canActionProceed.default)(ACTION, PAGE, ON_ERROR)).toBeFalsy();
-          expect(ERRORS.length).toEqual(1);
-          expect(ERRORS[0].id).toEqual('a');
-          expect(ERRORS[0].error).toEqual('Alpha is required');
-        });
-      });
-    });
+// Local imports
+describe('components.FormRenderer.helpers.canActionProceed', function () {
+  it('should return true when the action does not require validation', function () {
+    var ACTION = {
+      validate: false
+    };
+    expect((0, _canActionProceed.default)(ACTION, {}, _Validate.default.page)).toBeTruthy();
+  });
+  it('should return true when the page is valid', function () {
+    var ACTION = {
+      validate: true
+    };
+    var PAGE = {
+      components: [{
+        id: 'a',
+        fieldId: 'a',
+        label: 'Alpha',
+        required: true
+      }],
+      formData: {
+        a: 'Bravo'
+      }
+    };
+    expect((0, _canActionProceed.default)(ACTION, PAGE, _Validate.default.page)).toBeTruthy();
+  });
+  it('should return false when the page is invalid', function () {
+    var ACTION = {
+      validate: true
+    };
+    var PAGE = {
+      components: [{
+        id: 'a',
+        fieldId: 'a',
+        label: 'Alpha',
+        required: true
+      }],
+      formData: {}
+    };
+    expect((0, _canActionProceed.default)(ACTION, PAGE, _Validate.default.page)).toBeFalsy();
   });
 });