fix test plugin name in package.json and make sure to opt out of telemetry when the test finishes

jloleysens · jloleysens · commit fec95b6fa518 · 2021-05-25T11:26:53.000+02:00
diff --git a/test/plugin_functional/plugins/telemetry/package.json b/test/plugin_functional/plugins/telemetry/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "usage_collection_test_plugin",
+  "name": "telemetry_test_plugin",
   "version": "1.0.0",
-  "main": "target/test/plugin_functional/plugins/usage_collection",
+  "main": "target/test/plugin_functional/plugins/telemetry",
   "kibana": {
     "version": "kibana",
     "templateVersion": "1.0.0"
diff --git a/test/plugin_functional/plugins/telemetry/public/plugin.ts b/test/plugin_functional/plugins/telemetry/public/plugin.ts
@@ -19,6 +19,10 @@ export class TelemetryTestPlugin implements Plugin {
       await telemetry.telemetryService.setOptIn(true);
       return telemetry.telemetryService.canSendTelemetry();
     };
+
+    window._resetTelemetry = async () => {
+      await telemetry.telemetryService.setOptIn(false);
+    };
   }
   start() {}
 }
diff --git a/test/plugin_functional/plugins/telemetry/types.ts b/test/plugin_functional/plugins/telemetry/types.ts
@@ -9,6 +9,7 @@
 declare global {
   interface Window {
     _checkCanSendTelemetry: () => Promise<boolean>;
+    _resetTelemetry: () => Promise<void>;
   }
 }
 
diff --git a/test/plugin_functional/test_suites/telemetry/telemetry.ts b/test/plugin_functional/test_suites/telemetry/telemetry.ts
@@ -23,9 +23,16 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
       });
     };
 
-    after(async () => browser.removeLocalStorageItem(KBN_SCREENSHOT_MODE_ENABLED_KEY));
+    after(async () => {
+      await browser.removeLocalStorageItem(KBN_SCREENSHOT_MODE_ENABLED_KEY);
+      await browser.executeAsync<void>((cb) => {
+        ((window as unknown) as Record<string, () => Promise<boolean>>)
+          ._resetTelemetry()
+          .then(() => cb());
+      });
+    });
 
-    it('does not send telemetry when in screenshot mode', async () => {
+    it('detects that telemetry cannot be sent in screenshot mode', async () => {
       await PageObjects.common.navigateToApp('home');
       expect(await checkCanSendTelemetry()).to.be(true);
 

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,10 @@ export class TelemetryTestPlugin implements Plugin {`
`19`	`19`	`await telemetry.telemetryService.setOptIn(true);`
`20`	`20`	`return telemetry.telemetryService.canSendTelemetry();`
`21`	`21`	`};`
	`22`	`+`
	`23`	`+ window._resetTelemetry = async () => {`
	`24`	`+ await telemetry.telemetryService.setOptIn(false);`
	`25`	`+ };`
`22`	`26`	`}`
`23`	`27`	`start() {}`
`24`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`declare global {`
`10`	`10`	`interface Window {`
`11`	`11`	`_checkCanSendTelemetry: () => Promise<boolean>;`
	`12`	`+ _resetTelemetry: () => Promise<void>;`
`12`	`13`	`}`
`13`	`14`	`}`
`14`	`15`