Upgrade protractor so that webdriver starts are working again

instana · May 3, 2019 · 6e02baa · 6e02baa
1 parent 671b4c2
commit 6e02baa
Show file tree

Hide file tree

Showing 7 changed files with 258 additions and 229 deletions.
diff --git a/lib/__mocks__/vars.js b/lib/__mocks__/vars.js
@@ -1,5 +1,6 @@
 export default {
   reportingUrl: 'http://eum.example.com',
   xhrTransmissionTimeout: 5432,
-  beaconBatchingTime: 0
+  beaconBatchingTime: 0,
+  secretPropertyKey: '__secret__'
 };
diff --git a/lib/hooks/XMLHttpRequest.js b/lib/hooks/XMLHttpRequest.js
@@ -113,19 +113,19 @@ export function instrumentXMLHttpRequest() {
     state.beacon = beacon;
 
     try {
-      const result = originalOpen.apply(this, arguments);
-      this.addEventListener('timeout', onTimeout);
-      this.addEventListener('error', onError);
-      this.addEventListener('abort', onAbort);
-      this.addEventListener('readystatechange', onReadystatechange);
+      const result = originalOpen.apply(xhr, arguments);
+      xhr.addEventListener('timeout', onTimeout);
+      xhr.addEventListener('error', onError);
+      xhr.addEventListener('abort', onAbort);
+      xhr.addEventListener('readystatechange', onReadystatechange);
       return result;
     } catch (e) {
       beacon['ts'] = now() - vars.referenceTimestamp;
       beacon['st'] = additionalStatuses.openError;
       beacon['e'] = e.message;
       addCommonBeaconProperties(beacon);
       sendBeacon(beacon);
-      this[vars.secretPropertyKey] = null;
+      xhr[vars.secretPropertyKey] = null;
       throw e;
     }
 

diff --git a/lib/vars.js b/lib/vars.js
@@ -214,7 +214,7 @@ const defaultVars: {
   highResTimestampReference: performance && performance.now ? performance.now() : 0,
   initializerExecutionTimestamp: now(),
   reportingUrl: null,
-  beaconBatchingTime: 0,
+  beaconBatchingTime: 500,
   apiKey: null,
   meta: {},
   ignoreUrls: [],

diff --git a/test/e2e/01_xhr/xhrAfterPageLoad.html b/test/e2e/01_xhr/xhrAfterPageLoad.html
@@ -4,14 +4,6 @@
   <meta charset="UTF-8">
   <title>xhr test</title>
 
-  <script type="text/javascript">
-(function() {
-var qtm = document.createElement('script'); qtm.type = 'text/javascript'; qtm.async = 1;
-qtm.src = 'https://cdn.quantummetric.com/qscripts/quantum-allbound.js';
-var d = document.getElementsByTagName('script')[0];
-!window.QuantumMetricAPI && d.parentNode.insertBefore(qtm, d);
-})();
-</script>
   <script src="/e2e/initializer.js"></script>
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css" integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous">

diff --git a/test/unit/transmission/__snapshots__/batched.test.js.snap b/test/unit/transmission/__snapshots__/batched.test.js.snap
@@ -166,6 +166,9 @@ Object {
   "imageRequests": Array [],
   "xhrRequests": Array [
     Object {
+      "__secret__": Object {
+        "ignored": true,
+      },
       "open": Array [
         "POST",
         "http://eum.example.com",
@@ -190,9 +193,6 @@ ts	123456789
 error	true",
       ],
       "timeout": 5432,
-      "undefined": Object {
-        "ignored": true,
-      },
     },
   ],
 }
@@ -204,6 +204,9 @@ Object {
   "imageRequests": Array [],
   "xhrRequests": Array [
     Object {
+      "__secret__": Object {
+        "ignored": true,
+      },
       "open": Array [
         "POST",
         "http://eum.example.com",
@@ -223,11 +226,11 @@ ts	123456789
 error	false",
       ],
       "timeout": 5432,
-      "undefined": Object {
-        "ignored": true,
-      },
     },
     Object {
+      "__secret__": Object {
+        "ignored": true,
+      },
       "open": Array [
         "POST",
         "http://eum.example.com",
@@ -247,9 +250,6 @@ ts	123456789
 error	true",
       ],
       "timeout": 5432,
-      "undefined": Object {
-        "ignored": true,
-      },
     },
   ],
 }
@@ -301,6 +301,9 @@ Object {
   "imageRequests": Array [],
   "xhrRequests": Array [
     Object {
+      "__secret__": Object {
+        "ignored": true,
+      },
       "open": Array [
         "POST",
         "http://eum.example.com",
@@ -317,9 +320,6 @@ Object {
         "page	cart",
       ],
       "timeout": 5432,
-      "undefined": Object {
-        "ignored": true,
-      },
     },
   ],
 }
@@ -331,6 +331,9 @@ Object {
   "imageRequests": Array [],
   "xhrRequests": Array [
     Object {
+      "__secret__": Object {
+        "ignored": true,
+      },
       "open": Array [
         "POST",
         "http://eum.example.com",
@@ -350,9 +353,6 @@ m_featureFlags	{\"developerMode\":false}
 longKey	aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
       ],
       "timeout": 5432,
-      "undefined": Object {
-        "ignored": true,
-      },
     },
   ],
 }
@@ -364,6 +364,9 @@ Object {
   "imageRequests": Array [],
   "xhrRequests": Array [
     Object {
+      "__secret__": Object {
+        "ignored": true,
+      },
       "open": Array [
         "POST",
         "http://eum.example.com",
@@ -383,11 +386,11 @@ ts	123456789
 error	false",
       ],
       "timeout": 5432,
-      "undefined": Object {
-        "ignored": true,
-      },
     },
     Object {
+      "__secret__": Object {
+        "ignored": true,
+      },
       "open": Array [
         "POST",
         "http://eum.example.com",
@@ -407,9 +410,6 @@ ts	123456789
 error	true",
       ],
       "timeout": 5432,
-      "undefined": Object {
-        "ignored": true,
-      },
     },
   ],
 }

diff --git a/test/unit/transmission/__snapshots__/formEncoded.test.js.snap b/test/unit/transmission/__snapshots__/formEncoded.test.js.snap
@@ -19,6 +19,9 @@ Object {
   "imageRequests": Array [],
   "xhrRequests": Array [
     Object {
+      "__secret__": Object {
+        "ignored": true,
+      },
       "open": Array [
         "POST",
         "http://eum.example.com",
@@ -35,9 +38,6 @@ Object {
         "page=cart&id=42&m_featureFlags=%7B%22developerMode%22%3Afalse%7D&longKey=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
       ],
       "timeout": 5432,
-      "undefined": Object {
-        "ignored": true,
-      },
     },
   ],
 }