Better filtering

compulim · compulim · commit e8ebe07d8a54 · 2019-10-29T09:20:20.000-07:00
diff --git a/__tests__/setup/conditions/actionDispatched.js b/__tests__/setup/conditions/actionDispatched.js
@@ -1,21 +1,24 @@
 import { Condition } from 'selenium-webdriver';
 
 export default function actionDispatched(predicateOrType) {
+  const message =
+    typeof predicateOrType === 'string' ? `action "${predicateOrType}" to dispatch` : 'action to dispatch';
+
   if (typeof predicateOrType === 'string') {
     const expectedType = predicateOrType;
 
     predicateOrType = ({ type }) => type === expectedType;
   }
 
-  return new Condition('Action to dispatch', async driver => {
+  return new Condition(message, async driver => {
     const actions = await driver.executeScript(() =>
       JSON.parse(
         JSON.stringify(
           window.WebChatTest.actions.map(action => {
-            // Filter out payload on DIRECT_LINE/CONNECT* because the content is not stringifiable
+            // Filter out payload on DIRECT_LINE/* because some content is not stringifiable
 
-            if (/^DIRECT_LINE\/CONNECT/.test(action.type) && action.payload && action.payload.directLine) {
-              action.payload.directLine = {};
+            if (/^DIRECT_LINE\//.test(action.type) && action.payload && action.payload.directLine) {
+              return simpleUpdateIn(action, ['payload', 'directLine'], () => ({}));
             }
 
             return action;
diff --git a/__tests__/setup/web/index.html b/__tests__/setup/web/index.html
@@ -49,6 +49,7 @@
     </style>
     <script src="https://tdurnford.github.io/BotFramework-Offline-MockBot/index.js"></script>
     <script src="https://unpkg.com/event-target-shim@5.0.1/dist/event-target-shim.umd.js"></script>
+    <script src="https://unpkg.com/simple-update-in"></script>
     <script src="/createProduceConsumeBroker.js"></script>
     <script src="/mockWebSpeech.js"></script>
   </head>
