[test/functional] move shared services into test/common

snide · May 16, 2017 · cde74a5 · cde74a5
1 parent 0ea2646
commit cde74a5
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 10 deletions.
diff --git a/test/common/config.js b/test/common/config.js
@@ -0,0 +1,15 @@
+import {
+  KibanaServerProvider,
+  EsProvider,
+  EsArchiverProvider,
+} from './services';
+
+export default function () {
+  return {
+    services: {
+      kibanaServer: KibanaServerProvider,
+      es: EsProvider,
+      esArchiver: EsArchiverProvider,
+    }
+  };
+}
diff --git a/test/functional/services/es.js → test/common/services/es.js b/test/functional/services/es.js → test/common/services/es.js
diff --git a/test/functional/services/es_archiver.js → test/common/services/es_archiver.js b/test/functional/services/es_archiver.js → test/common/services/es_archiver.js
diff --git a/test/common/services/index.js b/test/common/services/index.js
@@ -0,0 +1,3 @@
+export { KibanaServerProvider } from './kibana_server';
+export { EsProvider } from './es';
+export { EsArchiverProvider } from './es_archiver';
diff --git a/...unctional/services/kibana_server/index.js → test/common/services/kibana_server/index.js b/...unctional/services/kibana_server/index.js → test/common/services/kibana_server/index.js
diff --git a/...l/services/kibana_server/kibana_server.js → ...n/services/kibana_server/kibana_server.js b/...l/services/kibana_server/kibana_server.js → ...n/services/kibana_server/kibana_server.js
diff --git a/...nctional/services/kibana_server/status.js → test/common/services/kibana_server/status.js b/...nctional/services/kibana_server/status.js → test/common/services/kibana_server/status.js
diff --git a/...nal/services/kibana_server/ui_settings.js → ...mon/services/kibana_server/ui_settings.js b/...nal/services/kibana_server/ui_settings.js → ...mon/services/kibana_server/ui_settings.js
diff --git a/...ctional/services/kibana_server/version.js → .../common/services/kibana_server/version.js b/...ctional/services/kibana_server/version.js → .../common/services/kibana_server/version.js
diff --git a/test/functional/config.js b/test/functional/config.js
@@ -20,16 +20,15 @@ import {
   FindProvider,
   RetryProvider,
   TestSubjectsProvider,
-  KibanaServerProvider,
-  EsProvider,
-  EsArchiverProvider,
   DocTableProvider,
   ScreenshotsProvider,
 } from './services';
 
 import { servers, apps } from '../server_config';
 
-export default function () {
+export default async function ({ readConfigFile }) {
+  const commonConfig = await readConfigFile(require.resolve('../common/config'));
+
   return {
     testFiles: [
       resolve(__dirname, './apps/console/index.js'),
@@ -56,13 +55,13 @@ export default function () {
       gettingStarted: GettingStartedPageProvider,
     },
     services: {
-      kibanaServer: KibanaServerProvider,
+      es: commonConfig.get('services.es'),
+      esArchiver: commonConfig.get('services.esArchiver'),
+      kibanaServer: commonConfig.get('services.kibanaServer'),
       remote: RemoteProvider,
       find: FindProvider,
       retry: RetryProvider,
       testSubjects: TestSubjectsProvider,
-      es: EsProvider,
-      esArchiver: EsArchiverProvider,
       docTable: DocTableProvider,
       screenshots: ScreenshotsProvider,
     },

diff --git a/test/functional/services/index.js b/test/functional/services/index.js
@@ -2,8 +2,5 @@ export { RetryProvider } from './retry';
 export { FindProvider } from './find';
 export { TestSubjectsProvider } from './test_subjects';
 export { RemoteProvider } from './remote';
-export { KibanaServerProvider } from './kibana_server';
-export { EsProvider } from './es';
-export { EsArchiverProvider } from './es_archiver';
 export { DocTableProvider } from './doc_table';
 export { ScreenshotsProvider } from './screenshots';