Test

.eslintrc.js

@@ -398,7 +398,7 @@ module.exports = {
         'import/no-extraneous-dependencies': [
           'error',
           {
-            packageDir: resolve(__dirname, 'x-pack/package.json'),
+            packageDir: './x-pack/',
           },
         ],
       },
@@ -417,7 +417,7 @@ module.exports = {
           {
             devDependencies: true,
             peerDependencies: true,
-            packageDir: resolve(__dirname, 'x-pack/package.json'),
+            packageDir: './x-pack/',
           },
         ],
       },
@@ -429,7 +429,7 @@ module.exports = {
         'import/no-extraneous-dependencies': [
           'error',
           {
-            packageDir: resolve(__dirname, 'x-pack/package.json'),
+            packageDir: './x-pack/',
           },
         ],
         'import/no-unresolved': [

NOTICE.txt

@@ -185,25 +185,3 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
----
-This product uses "radioactive button" styles that were published on
-https://zurb.com/playground/radioactive-buttons under an "MIT" License.
-
-Copyright (c) ZURB
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in the
-Software without restriction, including without limitation the rights to use, copy,
-modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
-and to permit persons to whom the Software is furnished to do so, subject to the
-following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-

package.json

@@ -201,15 +201,16 @@
     "yauzl": "2.7.0"
   },
   "devDependencies": {
-    "@babel/parser": "7.0.0-beta.52",
-    "@babel/types": "7.0.0-beta.31",
+    "@babel/parser": "^7.1.0",
+    "@babel/types": "^7.0.0",
     "@elastic/eslint-config-kibana": "link:packages/eslint-config-kibana",
     "@elastic/eslint-plugin-kibana-custom": "link:packages/eslint-plugin-kibana-custom",
     "@kbn/es": "link:packages/kbn-es",
     "@kbn/eslint-import-resolver-kibana": "link:packages/kbn-eslint-import-resolver-kibana",
     "@kbn/eslint-plugin-license-header": "link:packages/kbn-eslint-plugin-license-header",
     "@kbn/plugin-generator": "link:packages/kbn-plugin-generator",
     "@kbn/test": "link:packages/kbn-test",
+    "@octokit/rest": "^15.10.0",
     "@types/angular": "^1.6.45",
     "@types/babel-core": "^6.25.5",
     "@types/bluebird": "^3.1.1",
@@ -248,7 +249,7 @@
     "@types/type-detect": "^4.0.1",
     "@types/uuid": "^3.4.4",
     "angular-mocks": "1.4.7",
-    "babel-eslint": "8.1.2",
+    "babel-eslint": "^9.0.0",
     "babel-jest": "^23.4.2",
     "backport": "4.4.1",
     "chai": "3.5.0",
@@ -261,7 +262,7 @@
     "enzyme": "3.2.0",
     "enzyme-adapter-react-16": "^1.1.1",
     "enzyme-to-json": "3.3.1",
-    "eslint": "4.14.0",
+    "eslint": "^5.6.0",
     "eslint-config-prettier": "^2.9.0",
     "eslint-plugin-babel": "4.1.2",
     "eslint-plugin-import": "2.8.0",
@@ -294,7 +295,6 @@
     "jest-cli": "^23.5.0",
     "jest-raw-loader": "^1.0.1",
     "jimp": "0.2.28",
-    "jsdom": "9.9.1",
     "json5": "^1.0.1",
     "karma": "1.7.0",
     "karma-chrome-launcher": "2.1.1",

packages/eslint-config-kibana/jest.js

@@ -7,7 +7,7 @@ module.exports = {
       ],
 
       env: {
-        'jest/globals': true,
+        'jest': true,
       },
 
       rules: {

packages/eslint-config-kibana/package.json

@@ -15,8 +15,8 @@
   },
   "homepage": "https://github.com/elastic/eslint-config-kibana#readme",
   "peerDependencies": {
-    "babel-eslint": "^8.0.0",
-    "eslint": "^4.1.0",
+    "babel-eslint": "^9.0.0",
+    "eslint": "^5.6.0",
     "eslint-plugin-babel": "^4.1.1",
     "eslint-plugin-import": "^2.6.0",
     "eslint-plugin-jest": "^21.22.0",

packages/kbn-eslint-plugin-license-header/package.json

@@ -4,8 +4,8 @@
   "private": true,
   "license": "Apache-2.0",
   "peerDependencies": {
-    "eslint": ">=4.0.0",
-    "babel-eslint": "^8.2.1"
+    "eslint": "^5.6.0",
+    "babel-eslint": "^9.0.0"
   },
   "dependencies": {
     "dedent": "^0.7.0"

packages/kbn-plugin-generator/sao_template/template/index.js

@@ -12,16 +12,16 @@ export default function (kibana) {
         title: '<%= startCase(name) %>',
         description: '<%= description %>',
         main: 'plugins/<%= snakeCase(name) %>/app',
-        <%_ if (generateScss) { -%>
-        styleSheetPath: require('path').resolve(__dirname, 'public/app.scss'),
-        <%_ } -%>
       },
       <%_ } -%>
       <%_ if (generateHack) { -%>
       hacks: [
         'plugins/<%= snakeCase(name) %>/hack'
       ]
       <%_ } -%>
+      <%_ if (generateScss) { -%>
+      styleSheetPaths: require('path').resolve(__dirname, 'public/app.scss'),
+      <%_ } -%>
     },
 
     config(Joi) {

packages/kbn-plugin-generator/sao_template/template/package.json

@@ -20,8 +20,8 @@
     "@elastic/eslint-config-kibana": "link:../../kibana/packages/eslint-config-kibana",
     "@elastic/eslint-import-resolver-kibana": "link:../../kibana/packages/kbn-eslint-import-resolver-kibana",
     "@kbn/plugin-helpers": "link:../../kibana/packages/kbn-plugin-helpers",
-    "babel-eslint": "^8.0.2",
-    "eslint": "^4.11.0",
+    "babel-eslint": "^9.0.0",
+    "eslint": "^5.6.0",
     "eslint-plugin-babel": "^4.1.1",
     "eslint-plugin-import": "^2.3.0",
     "eslint-plugin-jest": "^21.22.0",

packages/kbn-test/src/es/es_test_cluster.js

@@ -26,6 +26,7 @@ import { esTestConfig } from './es_test_config';
 import { rmrfSync } from './rmrf_sync';
 import { KIBANA_ROOT } from '../';
 import elasticsearch from 'elasticsearch';
+const path = require('path');
 
 export function createEsTestCluster(options = {}) {
   const {
@@ -61,10 +62,17 @@ export function createEsTestCluster(options = {}) {
     }
 
     async start(esArgs = []) {
-      const { installPath } =
-        esFrom === 'source'
-          ? await cluster.installSource(config)
-          : await cluster.installSnapshot(config);
+      let installPath;
+
+      if (esFrom === 'source') {
+        installPath = (await cluster.installSource(config)).installPath;
+      } else if (esFrom === 'snapshot') {
+        installPath = (await cluster.installSnapshot(config)).installPath;
+      } else if (path.isAbsolute(esFrom)) {
+        installPath = esFrom;
+      } else {
+        throw new Error(`unknown option esFrom "${esFrom}"`);
+      }
 
       await cluster.start(installPath, {
         esArgs: [

packages/kbn-test/src/functional_tests/cli/start_servers/__snapshots__/args.test.js.snap

@@ -9,14 +9,14 @@ Usage:
   node scripts/functional_tests_server [options] [-- --<other args>]
 
 Options:
-  --help                         Display this menu and exit. 
-  --config <file>                Pass in a config 
-  --esFrom <snapshot|source>     Build Elasticsearch from source or run from snapshot. Default: snapshot
-  --kibana-install-dir <dir>     Run Kibana from existing install directory instead of from source. 
-  --verbose                      Log everything. 
-  --debug                        Run in debug mode. 
-  --quiet                        Only log errors. 
-  --silent                       Log nothing."
+  --help                           Display this menu and exit. 
+  --config <file>                  Pass in a config 
+  --esFrom <snapshot|source|path>  Build Elasticsearch from source, snapshot or path to existing install dir. Default: snapshot
+  --kibana-install-dir <dir>       Run Kibana from existing install directory instead of from source. 
+  --verbose                        Log everything. 
+  --debug                          Run in debug mode. 
+  --quiet                          Only log errors. 
+  --silent                         Log nothing."
 `;
 
 exports[`process options for start servers CLI accepts debug option 1`] = `
@@ -26,6 +26,7 @@ Object {
   ],
   "createLogger": [Function],
   "debug": true,
+  "esFrom": "snapshot",
   "extraKbnOpts": undefined,
 }
 `;
@@ -36,6 +37,7 @@ Object {
     "foo",
   ],
   "createLogger": [Function],
+  "esFrom": "snapshot",
   "extraKbnOpts": undefined,
 }
 `;
@@ -49,6 +51,7 @@ Object {
     "foo",
   ],
   "createLogger": [Function],
+  "esFrom": "snapshot",
   "extraKbnOpts": Object {
     "server.foo": "bar",
   },
@@ -61,6 +64,7 @@ Object {
     "foo",
   ],
   "createLogger": [Function],
+  "esFrom": "snapshot",
   "extraKbnOpts": undefined,
   "quiet": true,
 }
@@ -72,6 +76,7 @@ Object {
     "foo",
   ],
   "createLogger": [Function],
+  "esFrom": "snapshot",
   "extraKbnOpts": undefined,
   "silent": true,
 }
@@ -94,6 +99,7 @@ Object {
     "foo",
   ],
   "createLogger": [Function],
+  "esFrom": "snapshot",
   "extraKbnOpts": undefined,
   "installDir": "foo",
 }
@@ -105,6 +111,7 @@ Object {
     "foo",
   ],
   "createLogger": [Function],
+  "esFrom": "snapshot",
   "extraKbnOpts": undefined,
   "verbose": true,
 }

packages/kbn-test/src/functional_tests/cli/start_servers/__snapshots__/cli.test.js.snap

@@ -40,11 +40,4 @@ exports[`start servers CLI options rejects invalid options even if valid options
 functional_tests_server: invalid option [grep]
     ...stack trace...
 "
-`;
-
-exports[`start servers CLI options rejects non-enum value for esFrom 1`] = `
-"
-functional_tests_server: invalid argument [butter] to option [esFrom]
-    ...stack trace...
-"
-`;
+`;

packages/kbn-test/src/functional_tests/cli/start_servers/args.js

@@ -27,9 +27,8 @@ const options = {
     desc: 'Pass in a config',
   },
   esFrom: {
-    arg: '<snapshot|source>',
-    choices: ['snapshot', 'source'],
-    desc: 'Build Elasticsearch from source or run from snapshot.',
+    arg: '<snapshot|source|path>',
+    desc: 'Build Elasticsearch from source, snapshot or path to existing install dir.',
     default: 'snapshot',
   },
   'kibana-install-dir': {
@@ -54,7 +53,7 @@ export function displayHelp() {
       };
     })
     .map(option => {
-      return `--${option.usage.padEnd(28)} ${option.desc} ${option.default}`;
+      return `--${option.usage.padEnd(30)} ${option.desc} ${option.default}`;
     })
     .join(`\n      `);
 
@@ -80,6 +79,10 @@ export function processOptions(userOptions, defaultConfigPath) {
     throw new Error(`functional_tests_server: config is required`);
   }
 
+  if (!userOptions.esFrom) {
+    userOptions.esFrom = 'snapshot';
+  }
+
   if (userOptions['kibana-install-dir']) {
     userOptions.installDir = userOptions['kibana-install-dir'];
     delete userOptions['kibana-install-dir'];

packages/kbn-test/src/functional_tests/cli/start_servers/args.test.js

@@ -65,12 +65,6 @@ describe('process options for start servers CLI', () => {
     expect(options).toMatchSnapshot();
   });
 
-  it('rejects non-enum value for esFrom', () => {
-    expect(() => {
-      processOptions({ esFrom: 'butter' }, ['foo']);
-    }).toThrow('functional_tests_server: invalid argument [butter] to option [esFrom]');
-  });
-
   it('accepts debug option', () => {
     const options = processOptions({ debug: true }, ['foo']);
     expect(options).toMatchSnapshot();

packages/kbn-test/src/functional_tests/cli/start_servers/cli.test.js

@@ -126,15 +126,6 @@ describe('start servers CLI', () => {
       expect(exitMock).not.toHaveBeenCalled();
     });
 
-    it('rejects non-enum value for esFrom', async () => {
-      global.process.argv.push('--esFrom', 'butter');
-
-      await startServersCli('foo');
-
-      expect(exitMock).toHaveBeenCalledWith(1);
-      checkMockConsoleLogSnapshot(logMock);
-    });
-
     it('accepts debug option', async () => {
       global.process.argv.push('--debug');
 

src/core/public/utils/index.ts

@@ -18,3 +18,4 @@
  */
 
 export { modifyUrl } from './modify_url';
+export { shareWeakReplay } from './share_weak_replay';