From a24189dd716e0e3578e4931d601296e287a2cc82 Mon Sep 17 00:00:00 2001
From: Jacob Daniel Franklin <Jacob.D.Franklin@aexp.com>
Date: Wed, 7 Jul 2021 17:15:37 -0700
Subject: [PATCH 1/4] test(Scenarios): make tests more extensible

---
 .../app/components/Scenarios.spec.jsx         | 47 ++++++++++++-------
 .../__snapshots__/Scenarios.spec.jsx.snap     |  1 +
 2 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/packages/parrot-devtools/__tests__/app/components/Scenarios.spec.jsx b/packages/parrot-devtools/__tests__/app/components/Scenarios.spec.jsx
index f752ebc4..19a9187e 100644
--- a/packages/parrot-devtools/__tests__/app/components/Scenarios.spec.jsx
+++ b/packages/parrot-devtools/__tests__/app/components/Scenarios.spec.jsx
@@ -19,6 +19,17 @@ import { shallow } from 'enzyme';
 
 import ScenariosMiddleware from '../../../src/app/components/Scenarios';
 
+const scenario = 'api-fetch';
+const setScenario = jest.fn(() => Promise.resolve());
+const scenariosData = {
+  scenario,
+  setScenario,
+  loading: false,
+  filteredScenarios: [{ name: scenario }, { name: 'scenario-2' }],
+  loadScenarios: jest.fn(() => Promise.resolve()),
+};
+const mockProps = { scenariosData };
+
 describe('Scenarios', () => {
   beforeEach(() => {
     jest.clearAllMocks();
@@ -26,20 +37,7 @@ describe('Scenarios', () => {
 
   describe('ScenariosMiddleware', () => {
     it('should render scenarios middleware component', () => {
-      const scenario = 'api-fetch';
-      const setScenario = jest.fn(() => Promise.resolve());
-
-      const result = shallow(
-        <ScenariosMiddleware
-          scenariosData={{
-            scenario,
-            setScenario,
-            loading: false,
-            filteredScenarios: [{ name: scenario }, { name: 'scenario-2' }],
-            loadScenarios: jest.fn(() => Promise.resolve()),
-          }}
-        />
-      );
+      const result = shallow(<ScenariosMiddleware {...mockProps} />);
 
       expect(result).toMatchSnapshot();
 
@@ -47,19 +45,32 @@ describe('Scenarios', () => {
         .find('button')
         .first()
         .simulate('click');
+
       expect(setScenario).toHaveBeenCalledWith(scenario);
     });
 
     it('should loading state', () => {
-      const result = shallow(<ScenariosMiddleware scenariosData={{ loading: true }} />);
+      const props = {
+        scenariosData: {
+          ...scenariosData,
+          loading: true,
+        },
+      };
+      const result = shallow(<ScenariosMiddleware {...props} />);
 
       expect(result).toMatchSnapshot();
     });
 
     it('should inform the user of failure', () => {
-      const result = shallow(
-        <ScenariosMiddleware scenariosData={{ loading: false, scenario: '', scenarios: [] }} />
-      );
+      const props = {
+        scenariosData: {
+          ...scenariosData,
+          loading: false,
+          scenario: '',
+          scenarios: [],
+        },
+      };
+      const result = shallow(<ScenariosMiddleware {...props} />);
 
       expect(result).toMatchSnapshot();
     });
diff --git a/packages/parrot-devtools/__tests__/app/components/__snapshots__/Scenarios.spec.jsx.snap b/packages/parrot-devtools/__tests__/app/components/__snapshots__/Scenarios.spec.jsx.snap
index 73538a5c..ee089ea8 100644
--- a/packages/parrot-devtools/__tests__/app/components/__snapshots__/Scenarios.spec.jsx.snap
+++ b/packages/parrot-devtools/__tests__/app/components/__snapshots__/Scenarios.spec.jsx.snap
@@ -21,6 +21,7 @@ exports[`Scenarios ScenariosMiddleware should inform the user of failure 1`] = `
         Try 
       </span>
       <button
+        onClick={[MockFunction]}
         type="button"
       >
         refreshing

From 46b1ed2471206662243ae0180b91cd74a23824b4 Mon Sep 17 00:00:00 2001
From: Jacob Daniel Franklin <Jacob.D.Franklin@aexp.com>
Date: Thu, 8 Jul 2021 09:26:16 -0700
Subject: [PATCH 2/4] refactor(Scenarios): make prop-types more explicit

---
 packages/parrot-devtools/src/app/components/Scenarios.jsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/parrot-devtools/src/app/components/Scenarios.jsx b/packages/parrot-devtools/src/app/components/Scenarios.jsx
index 31620e83..85951fe3 100644
--- a/packages/parrot-devtools/src/app/components/Scenarios.jsx
+++ b/packages/parrot-devtools/src/app/components/Scenarios.jsx
@@ -73,7 +73,11 @@ function ScenariosMiddleware({ scenariosData }) {
 ScenariosMiddleware.propTypes = {
   scenariosData: PropTypes.shape({
     loading: PropTypes.bool,
-    filteredScenarios: PropTypes.array,
+    filteredScenarios: PropTypes.arrayOf(
+      PropTypes.shape({
+        name: PropTypes.string.isRequired,
+      })
+    ),
     scenario: PropTypes.string,
     setScenario: PropTypes.func,
     loadScenarios: PropTypes.func,

From 8032326c2b2ac5dd8214f30d08502c135dc943a7 Mon Sep 17 00:00:00 2001
From: Jacob Daniel Franklin <Jacob.D.Franklin@aexp.com>
Date: Thu, 8 Jul 2021 16:18:01 -0700
Subject: [PATCH 3/4] fix(matchMock): ensure param type is array

---
 .../parrot-core/__tests__/utils/matchMock.spec.js  | 14 ++++++++++++++
 packages/parrot-core/src/utils/matchMock.js        |  9 +++++++++
 2 files changed, 23 insertions(+)

diff --git a/packages/parrot-core/__tests__/utils/matchMock.spec.js b/packages/parrot-core/__tests__/utils/matchMock.spec.js
index 89d5a7f3..3889390a 100644
--- a/packages/parrot-core/__tests__/utils/matchMock.spec.js
+++ b/packages/parrot-core/__tests__/utils/matchMock.spec.js
@@ -48,4 +48,18 @@ describe('matchMock', () => {
     const req = { path: '/squawk', headers: 'ahoy', 'Keep-Alive': 'timeout=5' };
     expect(matchMock(req, {}, mocks)).toEqual(mocks[0]);
   });
+
+  it('throws when mocks is not an array', () => {
+    const mocks = {};
+    expect(() => matchMock({}, {}, mocks)).toThrow(
+      'mocks is not an array as expected. What was passed: [object Object]'
+    );
+  });
+
+  it('throws when mocks is an empty array', () => {
+    const mocks = [];
+    expect(() => matchMock({}, {}, mocks)).toThrow(
+      'mocks is empty, and likely none are defined for the current scenario.'
+    );
+  });
 });
diff --git a/packages/parrot-core/src/utils/matchMock.js b/packages/parrot-core/src/utils/matchMock.js
index 0bf73108..2f426478 100644
--- a/packages/parrot-core/src/utils/matchMock.js
+++ b/packages/parrot-core/src/utils/matchMock.js
@@ -35,6 +35,15 @@ function match(normalizedRequest) {
 
 export default function matchMock(normalizedRequest, platformRequest, mocks) {
   let matchedMock;
+
+  if (!Array.isArray(mocks)) {
+    throw new TypeError(`mocks is not an array as expected. What was passed: ${mocks}`);
+  }
+
+  if (mocks.length === 0) {
+    throw new TypeError('mocks is empty, and likely none are defined for the current scenario.');
+  }
+
   for (let index = 0; index < mocks.length; index += 1) {
     const mock = mocks[index];
     if (typeof mock === 'function') {

From eb9232baa3c1f790668791953675c63430f1b87c Mon Sep 17 00:00:00 2001
From: Jacob Daniel Franklin <Jacob.D.Franklin@aexp.com>
Date: Fri, 9 Jul 2021 09:58:14 -0700
Subject: [PATCH 4/4] chore(package): add Jacob Franklin to contributors

---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d79b166c..934be6ba 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,8 @@
   "contributors": [
     "Jack Cross <jack.cross1@aexp.com>",
     "Nathan Force <nathan.a.force@aexp.com>",
-    "Jason Schapiro"
+    "Jason Schapiro",
+    "Jacob Franklin <jacob.d.franklin@aexp.com>"
   ],
   "scripts": {
     "postinstall": "lerna bootstrap",