From 68de7ea71050fa4621fc50e7269b86848f26de56 Mon Sep 17 00:00:00 2001
From: pgayvallet <pierre.gayvallet@elastic.co>
Date: Thu, 3 Sep 2020 09:11:02 +0200
Subject: [PATCH] remove legacyMode leftovers

---
 src/core/public/chrome/ui/header/header.test.tsx   |  1 -
 .../__snapshots__/rendering_service.test.ts.snap   |  5 -----
 src/core/server/rendering/rendering_service.tsx    |  1 -
 src/core/server/rendering/types.ts                 |  1 -
 .../test_suites/core_plugins/applications.ts       | 11 -----------
 .../test_suites/core_plugins/rendering.ts          | 14 +++-----------
 6 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/src/core/public/chrome/ui/header/header.test.tsx b/src/core/public/chrome/ui/header/header.test.tsx
index b847e5581d98e..04eb256f30f37 100644
--- a/src/core/public/chrome/ui/header/header.test.tsx
+++ b/src/core/public/chrome/ui/header/header.test.tsx
@@ -50,7 +50,6 @@ function mockProps() {
     forceAppSwitcherNavigation$: new BehaviorSubject(false),
     helpExtension$: new BehaviorSubject(undefined),
     helpSupportUrl$: new BehaviorSubject(''),
-    legacyMode: false,
     navControlsLeft$: new BehaviorSubject([]),
     navControlsRight$: new BehaviorSubject([]),
     basePath: http.basePath,
diff --git a/src/core/server/rendering/__snapshots__/rendering_service.test.ts.snap b/src/core/server/rendering/__snapshots__/rendering_service.test.ts.snap
index 5ff5d69f96f70..ab828a1780425 100644
--- a/src/core/server/rendering/__snapshots__/rendering_service.test.ts.snap
+++ b/src/core/server/rendering/__snapshots__/rendering_service.test.ts.snap
@@ -46,7 +46,6 @@ Object {
     },
     "version": Any<String>,
   },
-  "legacyMode": false,
   "serverBasePath": "/mock-server-basepath",
   "uiPlugins": Array [],
   "vars": Object {},
@@ -100,7 +99,6 @@ Object {
     },
     "version": Any<String>,
   },
-  "legacyMode": false,
   "serverBasePath": "/mock-server-basepath",
   "uiPlugins": Array [],
   "vars": Object {},
@@ -158,7 +156,6 @@ Object {
     },
     "version": Any<String>,
   },
-  "legacyMode": false,
   "serverBasePath": "/mock-server-basepath",
   "uiPlugins": Array [],
   "vars": Object {},
@@ -212,7 +209,6 @@ Object {
     },
     "version": Any<String>,
   },
-  "legacyMode": false,
   "serverBasePath": "/mock-server-basepath",
   "uiPlugins": Array [],
   "vars": Object {},
@@ -266,7 +262,6 @@ Object {
     },
     "version": Any<String>,
   },
-  "legacyMode": false,
   "serverBasePath": "/mock-server-basepath",
   "uiPlugins": Array [],
   "vars": Object {},
diff --git a/src/core/server/rendering/rendering_service.tsx b/src/core/server/rendering/rendering_service.tsx
index e7ee0b16fce08..7761c89044f6f 100644
--- a/src/core/server/rendering/rendering_service.tsx
+++ b/src/core/server/rendering/rendering_service.tsx
@@ -82,7 +82,6 @@ export class RenderingService implements CoreService<InternalRenderingServiceSet
             basePath,
             serverBasePath,
             env,
-            legacyMode: false,
             anonymousStatusPage: status.isStatusPageAnonymous(),
             i18n: {
               translationsUrl: `${basePath}/translations/${i18n.getLocale()}.json`,
diff --git a/src/core/server/rendering/types.ts b/src/core/server/rendering/types.ts
index d41c308ac66a4..fb68921ca8636 100644
--- a/src/core/server/rendering/types.ts
+++ b/src/core/server/rendering/types.ts
@@ -45,7 +45,6 @@ export interface RenderingMetadata {
       mode: EnvironmentMode;
       packageInfo: PackageInfo;
     };
-    legacyMode: boolean;
     anonymousStatusPage: boolean;
     i18n: {
       translationsUrl: string;
diff --git a/test/plugin_functional/test_suites/core_plugins/applications.ts b/test/plugin_functional/test_suites/core_plugins/applications.ts
index 9ecef65f5f09a..4c72c091a2bee 100644
--- a/test/plugin_functional/test_suites/core_plugins/applications.ts
+++ b/test/plugin_functional/test_suites/core_plugins/applications.ts
@@ -145,16 +145,5 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
       const windowHeight = (await browser.getWindowSize()).height;
       expect(wrapperHeight).to.be.below(windowHeight);
     });
-
-    // Not sure if we need this test or not. If yes, we need to find another legacy app
-    it.skip('can navigate from NP apps to legacy apps', async () => {
-      await appsMenu.clickLink('Stack Management');
-      await testSubjects.existOrFail('managementNav');
-    });
-
-    it('can navigate from legacy apps to NP apps', async () => {
-      await appsMenu.clickLink('Foo');
-      await testSubjects.existOrFail('fooAppHome');
-    });
   });
 }
diff --git a/test/plugin_functional/test_suites/core_plugins/rendering.ts b/test/plugin_functional/test_suites/core_plugins/rendering.ts
index 5b83d2d565411..9931a3fabcd8d 100644
--- a/test/plugin_functional/test_suites/core_plugins/rendering.ts
+++ b/test/plugin_functional/test_suites/core_plugins/rendering.ts
@@ -51,11 +51,7 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
       window.__RENDERING_SESSION__.push(window.location.pathname);
     });
   };
-  const getLegacyMode = () =>
-    browser.execute(() => {
-      return JSON.parse(document.querySelector('kbn-injected-metadata')!.getAttribute('data')!)
-        .legacyMode;
-    });
+
   const getUserSettings = () =>
     browser.execute(() => {
       return JSON.parse(document.querySelector('kbn-injected-metadata')!.getAttribute('data')!)
@@ -73,13 +69,11 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
     it('renders "core" application', async () => {
       await navigateTo('/render/core');
 
-      const [loadingMessage, legacyMode, userSettings] = await Promise.all([
+      const [loadingMessage, userSettings] = await Promise.all([
         findLoadingMessage(),
-        getLegacyMode(),
         getUserSettings(),
       ]);
 
-      expect(legacyMode).to.be(false);
       expect(userSettings).to.not.be.empty();
 
       await find.waitForElementStale(loadingMessage);
@@ -90,13 +84,11 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
     it('renders "core" application without user settings', async () => {
       await navigateTo('/render/core?includeUserSettings=false');
 
-      const [loadingMessage, legacyMode, userSettings] = await Promise.all([
+      const [loadingMessage, userSettings] = await Promise.all([
         findLoadingMessage(),
-        getLegacyMode(),
         getUserSettings(),
       ]);
 
-      expect(legacyMode).to.be(false);
       expect(userSettings).to.be.empty();
 
       await find.waitForElementStale(loadingMessage);