@ukhomeoffice/cop-react-form-renderer 2.8.4 → 2.10.0

package/dist/json/terminal.json

@@ -0,0 +1,81 @@
+{
+  "data": [
+    {
+      "id": 1,
+      "name": "Terminal 1",
+      "validfrom": "2019-01-01T00:01:00.000Z",
+      "validto": null,
+      "updatedby": null
+    },
+    {
+      "id": 2,
+      "name": "Terminal 2",
+      "validfrom": "2019-01-01T00:01:00.000Z",
+      "validto": null,
+      "updatedby": null
+    },
+    {
+      "id": 3,
+      "name": "Terminal 3",
+      "validfrom": "2019-01-01T00:01:00.000Z",
+      "validto": null,
+      "updatedby": null
+    },
+    {
+      "id": 4,
+      "name": "Terminal 4",
+      "validfrom": "2019-01-01T00:01:00.000Z",
+      "validto": null,
+      "updatedby": null
+    },
+    {
+      "id": 5,
+      "name": "Terminal 5",
+      "validfrom": "2019-01-01T00:01:00.000Z",
+      "validto": null,
+      "updatedby": null
+    },
+    {
+      "id": 6,
+      "name": "North Terminal",
+      "validfrom": "2019-01-01T00:01:00.000Z",
+      "validto": null,
+      "updatedby": null
+    },
+    {
+      "id": 7,
+      "name": "South Terminal",
+      "validfrom": "2019-01-01T00:01:00.000Z",
+      "validto": null,
+      "updatedby": null
+    },
+    {
+      "id": 8,
+      "name": "Eastern Docks",
+      "validfrom": "2019-01-01T00:01:00.000Z",
+      "validto": null,
+      "updatedby": null
+    },
+    {
+      "id": 9,
+      "name": "Western Docks",
+      "validfrom": "2019-01-01T00:01:00.000Z",
+      "validto": null,
+      "updatedby": null
+    },
+    {
+      "id": 10,
+      "name": "Tourist",
+      "validfrom": "2021-05-07T00:01:00.000Z",
+      "validto": null,
+      "updatedby": "Ben Milnes"
+    },
+    {
+      "id": 11,
+      "name": "Freight",
+      "validfrom": "2021-05-07T00:01:00.000Z",
+      "validto": null,
+      "updatedby": "Ben Milnes"
+    }
+  ]
+}

package/dist/models/CollectionLabels.js

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var CollectionLabels = {
+  add: 'Add another',
+  remove: 'Remove',
+  // eslint-disable-next-line no-template-curly-in-string
+  item: 'Item ${index}'
+};
+var _default = CollectionLabels;
+exports.default = _default;

package/dist/models/ComponentTypes.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var TYPE_AUTOCOMPLETE = 'autocomplete';
 var TYPE_CHECKBOXES = 'checkboxes';
+var TYPE_COLLECTION = 'collection';
 var TYPE_CONTAINER = 'container';
 var TYPE_DATE = 'date';
 var TYPE_EMAIL = 'email';
@@ -21,6 +22,7 @@ var TYPE_TIME = 'time';
 var ComponentTypes = {
   AUTOCOMPLETE: TYPE_AUTOCOMPLETE,
   CHECKBOXES: TYPE_CHECKBOXES,
+  COLLECTION: TYPE_COLLECTION,
   CONTAINER: TYPE_CONTAINER,
   DATE: TYPE_DATE,
   EMAIL: TYPE_EMAIL,

package/dist/models/index.js

@@ -3,6 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+Object.defineProperty(exports, "CollectionLabels", {
+  enumerable: true,
+  get: function get() {
+    return _CollectionLabels.default;
+  }
+});
 Object.defineProperty(exports, "ComponentTypes", {
   enumerable: true,
   get: function get() {
@@ -46,6 +52,8 @@ Object.defineProperty(exports, "TaskStates", {
   }
 });
 
+var _CollectionLabels = _interopRequireDefault(require("./CollectionLabels"));
+
 var _ComponentTypes = _interopRequireDefault(require("./ComponentTypes"));
 
 var _EventTypes = _interopRequireDefault(require("./EventTypes"));

package/dist/setupTests.js

@@ -0,0 +1,32 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.renderWithValidation = exports.renderDomWithValidation = exports.expectObjectLike = void 0;
+
+var _react = require("@testing-library/react");
+
+var _reactDom = require("react-dom");
+
+var _context = require("./context");
+
+var renderWithValidation = function renderWithValidation(ui, options) {
+  return (0, _react.render)( /*#__PURE__*/React.createElement(_context.ValidationContextProvider, null, ui), options);
+};
+
+exports.renderWithValidation = renderWithValidation;
+
+var renderDomWithValidation = function renderDomWithValidation(ui, container, callback) {
+  return (0, _reactDom.render)( /*#__PURE__*/React.createElement(_context.ValidationContextProvider, null, ui), container, callback);
+};
+
+exports.renderDomWithValidation = renderDomWithValidation;
+
+var expectObjectLike = function expectObjectLike(received, expected) {
+  Object.keys(expected).forEach(function (key) {
+    expect(received[key]).toEqual(expected[key]);
+  });
+};
+
+exports.expectObjectLike = expectObjectLike;

package/dist/utils/CheckYourAnswers/getCYARow.js

@@ -29,16 +29,30 @@ var getCYARow = function getCYARow(page, component, onAction) {
     value = page.formData[component.fieldId];
   }
 
+  setNestedValue(component, page);
   return {
     pageId: page.id,
     id: component.id,
     fieldId: component.fieldId,
+    full_path: component.full_path,
     key: component.label || component.cya_label,
+    required: component.required,
     component: _Component.default.editable(component) ? component : undefined,
     value: value || '',
     action: (0, _getCYAAction.default)(component.readonly, page, onAction)
   };
 };
 
+var setNestedValue = function setNestedValue(component, page) {
+  var _component$data, _component$data$optio;
+
+  (_component$data = component.data) === null || _component$data === void 0 ? void 0 : (_component$data$optio = _component$data.options) === null || _component$data$optio === void 0 ? void 0 : _component$data$optio.forEach(function (option, index) {
+    //check if option is selected and has nested component
+    if (page.formData[component.id] === option.value && option.nested) {
+      component.data.options[index].nested.value = page.formData[option.nested.id];
+    }
+  });
+};
+
 var _default = getCYARow;
 exports.default = _default;

package/dist/utils/CheckYourAnswers/getCYARow.test.js

@@ -1,19 +1,16 @@
 "use strict";
 
+var _setupTests = require("../../setupTests");
+
 var _getCYARow = _interopRequireDefault(require("./getCYARow"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-// Local imports
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 describe('utils', function () {
   describe('CheckYourAnswers', function () {
     describe('getCYARow', function () {
-      var expectObjectLike = function expectObjectLike(received, expected) {
-        Object.keys(expected).forEach(function (key) {
-          expect(received[key]).toEqual(expected[key]);
-        });
-      };
-
       it('should get an appropriate row for a readonly text component', function () {
         var PAGE = {
           id: 'page',
@@ -32,7 +29,7 @@ describe('utils', function () {
         var ON_ACTION = function ON_ACTION() {};
 
         var ROW = (0, _getCYARow.default)(PAGE, COMPONENT, ON_ACTION);
-        expectObjectLike(ROW, {
+        (0, _setupTests.expectObjectLike)(ROW, {
           pageId: PAGE.id,
           fieldId: COMPONENT.fieldId,
           key: COMPONENT.label,
@@ -110,7 +107,7 @@ describe('utils', function () {
         var ON_ACTION = function ON_ACTION() {};
 
         var ROW = (0, _getCYARow.default)(PAGE, COMPONENT, ON_ACTION);
-        expectObjectLike(ROW, {
+        (0, _setupTests.expectObjectLike)(ROW, {
           pageId: PAGE.id,
           fieldId: COMPONENT.fieldId,
           key: COMPONENT.cya_label,
@@ -137,17 +134,43 @@ describe('utils', function () {
         var ON_ACTION = function ON_ACTION() {};
 
         var ROW = (0, _getCYARow.default)(PAGE, COMPONENT, ON_ACTION);
-        expectObjectLike(ROW, {
+        (0, _setupTests.expectObjectLike)(ROW, {
           pageId: PAGE.id,
           fieldId: COMPONENT.fieldId,
           key: COMPONENT.label,
           component: COMPONENT,
           value: 'Bravo'
         });
-        expectObjectLike(ROW.action, {
+        (0, _setupTests.expectObjectLike)(ROW.action, {
           onAction: ON_ACTION
         });
       });
+      it('should update update any nested components with corresponding values from the stored formdata', function () {
+        var SELECTED_VALUE = 'selectedValue';
+        var NESTED_ID = 'nestedId';
+        var NESTED_VALUE = 'nestedValue';
+        var PAGE = {
+          id: 'page',
+          formData: _defineProperty({
+            a: SELECTED_VALUE
+          }, NESTED_ID, NESTED_VALUE),
+          cya_link: {}
+        };
+        var COMPONENT = {
+          type: 'radios',
+          id: 'a',
+          data: {
+            options: [{
+              value: SELECTED_VALUE,
+              nested: {
+                id: NESTED_ID
+              }
+            }]
+          }
+        };
+        var ROW = (0, _getCYARow.default)(PAGE, COMPONENT, function () {});
+        expect(ROW.component.data.options[0].nested.value).toEqual(NESTED_VALUE);
+      });
     });
   });
 });

package/dist/utils/CheckYourAnswers/getCYARowForGroup.js

@@ -69,6 +69,7 @@ var getCYARowForGroup = function getCYARowForGroup(page, group, rows, onAction)
     pageId: page.id,
     fieldId: group.id,
     key: group.label,
+    required: group.required,
     value: value,
     action: (0, _getCYAAction.default)(false, page, onAction)
   };

package/dist/utils/CheckYourAnswers/getCYARowsForCollection.js

@@ -0,0 +1,89 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _copReactComponents = require("@ukhomeoffice/cop-react-components");
+
+var _models = require("../../models");
+
+var _getCYARowsForContainer = _interopRequireDefault(require("./getCYARowsForContainer"));
+
+var _showComponentCYA = _interopRequireDefault(require("./showComponentCYA"));
+
+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; }
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+var getContainerForItem = function getContainerForItem(collection, item, labelCount, full_path) {
+  return {
+    id: item.id,
+    fieldId: item.id,
+    type: _models.ComponentTypes.CONTAINER,
+    required: collection.required,
+    full_path: full_path,
+    components: collection.item.map(function (component) {
+      return _objectSpread(_objectSpread({}, component), {}, {
+        label: _copReactComponents.Utils.interpolateString(component.label, _objectSpread(_objectSpread({}, item), {}, {
+          index: labelCount
+        })),
+        full_path: "".concat(full_path, ".").concat(component.fieldId)
+      });
+    })
+  };
+};
+
+var getTitleRowForItem = function getTitleRowForItem(collection, item, pageId, labelCount, full_path) {
+  var labels = _objectSpread(_objectSpread({}, _models.CollectionLabels), collection.labels);
+
+  if (labels.item) {
+    return {
+      pageId: pageId,
+      fieldId: collection.fieldId,
+      full_path: full_path,
+      key: _copReactComponents.Utils.interpolateString(labels.item, _objectSpread(_objectSpread({}, item), {}, {
+        index: labelCount
+      })),
+      type: 'title',
+      action: null
+    };
+  }
+
+  return null;
+};
+
+var getCYARowsForCollection = function getCYARowsForCollection(page, collection, items, onAction) {
+  if (Array.isArray(items) && (0, _showComponentCYA.default)(collection, page.formData)) {
+    return items.flatMap(function (item, index) {
+      var labelCount = (collection.countOffset || 0) + index + 1;
+      var full_path = "".concat(collection.full_path || collection.fieldId, "[").concat(index, "]");
+      var container = getContainerForItem(collection, item, labelCount, full_path);
+      return [getTitleRowForItem(collection, item, page.id, labelCount, full_path)].concat(_toConsumableArray((0, _getCYARowsForContainer.default)(page, container, item, onAction)));
+    }).filter(function (r) {
+      return !!r;
+    });
+  }
+
+  return [];
+};
+
+var _default = getCYARowsForCollection;
+exports.default = _default;

package/dist/utils/CheckYourAnswers/getCYARowsForCollection.test.js

@@ -0,0 +1,194 @@
+"use strict";
+
+var _models = require("../../models");
+
+var _setupTests = require("../../setupTests");
+
+var _getCYARowsForCollection = _interopRequireDefault(require("./getCYARowsForCollection"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+describe('utils.CheckYourAnswers.getCYARowsForCollection', function () {
+  it('should get no rows when there are no items', function () {
+    var FORM_DATA = undefined;
+    var PAGE = {
+      id: 'page',
+      formData: FORM_DATA,
+      cya_link: {}
+    };
+    var COMPONENT = {
+      type: 'text',
+      readonly: true,
+      id: 'a',
+      fieldId: 'a',
+      label: 'Alpha'
+    };
+    var COLLECTION = {
+      id: 'collection',
+      fieldId: 'collection',
+      type: _models.ComponentTypes.COLLECTION,
+      item: [COMPONENT]
+    };
+
+    var ON_ACTION = function ON_ACTION() {};
+
+    var ROWS = (0, _getCYARowsForCollection.default)(PAGE, COLLECTION, undefined, ON_ACTION);
+    expect(ROWS.length).toEqual(0);
+  });
+  it('should get an appropriate row for a collection with a single readonly text component', function () {
+    var FORM_DATA = {
+      collection: [{
+        a: 'Bravo'
+      }]
+    };
+    var PAGE = {
+      id: 'page',
+      formData: FORM_DATA,
+      cya_link: {}
+    };
+    var COMPONENT = {
+      type: 'text',
+      readonly: true,
+      id: 'a',
+      fieldId: 'a',
+      label: 'Alpha'
+    };
+    var COLLECTION = {
+      id: 'collection',
+      fieldId: 'collection',
+      type: _models.ComponentTypes.COLLECTION,
+      countOffset: 22,
+      item: [COMPONENT],
+      value: FORM_DATA.collection,
+      formData: FORM_DATA
+    };
+
+    var ON_ACTION = function ON_ACTION() {};
+
+    var ROWS = (0, _getCYARowsForCollection.default)(PAGE, COLLECTION, FORM_DATA.collection, ON_ACTION);
+    expect(ROWS.length).toEqual(2); // Item title row + component row
+
+    (0, _setupTests.expectObjectLike)(ROWS[0], {
+      pageId: PAGE.id,
+      fieldId: COLLECTION.fieldId,
+      full_path: "".concat(COLLECTION.fieldId, "[0]"),
+      key: 'Item 23',
+      // includes countOffset
+      type: 'title',
+      action: null
+    });
+    (0, _setupTests.expectObjectLike)(ROWS[1], {
+      pageId: PAGE.id,
+      fieldId: COMPONENT.fieldId,
+      full_path: "".concat(COLLECTION.fieldId, "[0].").concat(COMPONENT.fieldId),
+      key: COMPONENT.label,
+      action: null,
+      component: _objectSpread(_objectSpread({}, COMPONENT), {}, {
+        full_path: "".concat(COLLECTION.fieldId, "[0].").concat(COMPONENT.fieldId)
+      }),
+      value: 'Bravo'
+    });
+  });
+  it('should get an appropriate row for a collection with a single readonly text component where the item label is an empty string', function () {
+    var FORM_DATA = {
+      collection: [{
+        a: 'Bravo'
+      }]
+    };
+    var PAGE = {
+      id: 'page',
+      formData: FORM_DATA,
+      cya_link: {}
+    };
+    var COMPONENT = {
+      type: 'text',
+      readonly: true,
+      id: 'a',
+      fieldId: 'a',
+      label: 'Alpha'
+    };
+    var COLLECTION = {
+      id: 'collection',
+      fieldId: 'collection',
+      type: _models.ComponentTypes.COLLECTION,
+      labels: {
+        item: ''
+      },
+      countOffset: 22,
+      item: [COMPONENT],
+      value: FORM_DATA.collection,
+      formData: FORM_DATA
+    };
+
+    var ON_ACTION = function ON_ACTION() {};
+
+    var ROWS = (0, _getCYARowsForCollection.default)(PAGE, COLLECTION, FORM_DATA.collection, ON_ACTION);
+    expect(ROWS.length).toEqual(1); // Just the component row, no title row
+
+    (0, _setupTests.expectObjectLike)(ROWS[0], {
+      pageId: PAGE.id,
+      fieldId: COMPONENT.fieldId,
+      full_path: "".concat(COLLECTION.fieldId, "[0].").concat(COMPONENT.fieldId),
+      key: COMPONENT.label,
+      action: null,
+      component: _objectSpread(_objectSpread({}, COMPONENT), {}, {
+        full_path: "".concat(COLLECTION.fieldId, "[0].").concat(COMPONENT.fieldId)
+      }),
+      value: 'Bravo'
+    });
+  });
+  it('should interpolate a field label appropriately', function () {
+    var FORM_DATA = {
+      collection: [{
+        a: 'Bravo'
+      }]
+    };
+    var PAGE = {
+      id: 'page',
+      formData: FORM_DATA,
+      cya_link: {}
+    }; // eslint-disable-next-line no-template-curly-in-string
+
+    var COMPONENT = {
+      type: 'text',
+      readonly: true,
+      id: 'a',
+      fieldId: 'a',
+      label: 'Alpha ${index}'
+    };
+    var COLLECTION = {
+      id: 'collection',
+      fieldId: 'collection',
+      type: _models.ComponentTypes.COLLECTION,
+      item: [COMPONENT],
+      value: FORM_DATA.collection,
+      formData: FORM_DATA
+    };
+
+    var ON_ACTION = function ON_ACTION() {};
+
+    var ROWS = (0, _getCYARowsForCollection.default)(PAGE, COLLECTION, FORM_DATA.collection, ON_ACTION);
+    expect(ROWS.length).toEqual(2); // Title and item row.
+
+    (0, _setupTests.expectObjectLike)(ROWS[1], {
+      pageId: PAGE.id,
+      fieldId: COMPONENT.fieldId,
+      full_path: "".concat(COLLECTION.fieldId, "[0].").concat(COMPONENT.fieldId),
+      key: 'Alpha 1',
+      // no countOffset
+      action: null,
+      component: _objectSpread(_objectSpread({}, COMPONENT), {}, {
+        full_path: "".concat(COLLECTION.fieldId, "[0].").concat(COMPONENT.fieldId),
+        label: 'Alpha 1' // no countOffset
+
+      }),
+      value: 'Bravo'
+    });
+  });
+});

package/dist/utils/CheckYourAnswers/getCYARowsForContainer.test.js

@@ -2,18 +2,14 @@
 
 var _models = require("../../models");
 
+var _setupTests = require("../../setupTests");
+
 var _getCYARowsForContainer = _interopRequireDefault(require("./getCYARowsForContainer"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // Local imports
 describe('utils.CheckYourAnswers.getCYARowsForContainer', function () {
-  var expectObjectLike = function expectObjectLike(received, expected) {
-    Object.keys(expected).forEach(function (key) {
-      expect(received[key]).toEqual(expected[key]);
-    });
-  };
-
   it('should get an appropriate row for a container with a single readonly text component', function () {
     var FORM_DATA = {
       container: {
@@ -46,7 +42,7 @@ describe('utils.CheckYourAnswers.getCYARowsForContainer', function () {
     var ROWS = (0, _getCYARowsForContainer.default)(PAGE, CONTAINER, FORM_DATA.container, ON_ACTION);
     expect(ROWS.length).toEqual(1);
     ROWS.forEach(function (row, index) {
-      expectObjectLike(row, {
+      (0, _setupTests.expectObjectLike)(row, {
         pageId: PAGE.id,
         fieldId: CONTAINER.components[index].fieldId,
         key: CONTAINER.components[index].label,
@@ -94,14 +90,14 @@ describe('utils.CheckYourAnswers.getCYARowsForContainer', function () {
     var ROWS = (0, _getCYARowsForContainer.default)(PAGE, CONTAINER, FORM_DATA.container, ON_ACTION);
     expect(ROWS.length).toEqual(2);
     ROWS.forEach(function (row, index) {
-      expectObjectLike(row, {
+      (0, _setupTests.expectObjectLike)(row, {
         pageId: PAGE.id,
         fieldId: CONTAINER.components[index].fieldId,
         key: CONTAINER.components[index].label,
         component: CONTAINER.components[index],
         value: "".concat(CONTAINER.components[index].label, " Charlie")
       });
-      expectObjectLike(row.action, {
+      (0, _setupTests.expectObjectLike)(row.action, {
         onAction: ON_ACTION
       });
     });
@@ -148,14 +144,14 @@ describe('utils.CheckYourAnswers.getCYARowsForContainer', function () {
     var ROWS = (0, _getCYARowsForContainer.default)(PAGE, CONTAINER, FORM_DATA.container, ON_ACTION);
     expect(ROWS.length).toEqual(2);
     ROWS.forEach(function (row, index) {
-      expectObjectLike(row, {
+      (0, _setupTests.expectObjectLike)(row, {
         pageId: PAGE.id,
         fieldId: CONTAINER.components[index].fieldId,
         key: CONTAINER.components[index].label,
         component: CONTAINER.components[index],
         value: "".concat(CONTAINER.components[index].label, " Charlie")
       });
-      expectObjectLike(row.action, {
+      (0, _setupTests.expectObjectLike)(row.action, {
         onAction: ON_ACTION
       });
     });
@@ -202,7 +198,7 @@ describe('utils.CheckYourAnswers.getCYARowsForContainer', function () {
     var ROWS = (0, _getCYARowsForContainer.default)(PAGE, CONTAINER, FORM_DATA.container, ON_ACTION);
     expect(ROWS.length).toEqual(1);
     ROWS.forEach(function (row, index) {
-      expectObjectLike(row, {
+      (0, _setupTests.expectObjectLike)(row, {
         pageId: PAGE.id,
         fieldId: NESTED_CONTAINER.components[index].fieldId,
         key: NESTED_CONTAINER.components[index].label,
@@ -244,7 +240,7 @@ describe('utils.CheckYourAnswers.getCYARowsForContainer', function () {
     var ROWS = (0, _getCYARowsForContainer.default)(PAGE, CONTAINER, undefined, ON_ACTION);
     expect(ROWS.length).toEqual(1);
     ROWS.forEach(function (row, index) {
-      expectObjectLike(row, {
+      (0, _setupTests.expectObjectLike)(row, {
         pageId: PAGE.id,
         fieldId: NESTED_CONTAINER.components[index].fieldId,
         key: NESTED_CONTAINER.components[index].label,