Merge branch 'master' into upgrade-cypress-version

docs/developer/architecture/code-exploration.asciidoc

@@ -524,9 +524,9 @@ WARNING: Missing README.
 See Configuring security in Kibana.
 
 
-- {kib-repo}blob/{branch}/x-pack/plugins/security_solution[securitySolution]
+- {kib-repo}blob/{branch}/x-pack/plugins/security_solution/README.md[securitySolution]
 
-WARNING: Missing README.
+Welcome to the Kibana Security Solution plugin! This README will go over getting started with development and testing.
 
 
 - {kib-repo}blob/{branch}/x-pack/plugins/snapshot_restore/README.md[snapshotRestore]

docs/developer/contributing/development-tests.asciidoc

@@ -26,8 +26,6 @@ root)
 |Functional
 |`test/*integration/**/config.js` `test/*functional/**/config.js` `test/accessibility/config.js`
 |`yarn test:ftr:server --config test/[directory]/config.js``yarn test:ftr:runner --config test/[directory]/config.js --grep=regexp`
-
-|Karma |`src/**/public/__tests__/*.js` |`yarn test:karma:debug`
 |===
 
 For X-Pack tests located in `x-pack/` see

docs/developer/contributing/development-unit-tests.asciidoc

@@ -95,38 +95,6 @@ to proceed in this mode.
 node scripts/mocha --debug <file>
 ----
 
-With `yarn test:karma`, you can run only the browser tests. Coverage
-reports are available for browser tests by running
-`yarn test:coverage`. You can find the results under the `coverage/`
-directory that will be created upon completion.
-
-[source,bash]
-----
-yarn test:karma
-----
-
-Using `yarn test:karma:debug` initializes an environment for debugging
-the browser tests. Includes an dedicated instance of the {kib} server
-for building the test bundle, and a karma server. When running this task
-the build is optimized for the first time and then a karma-owned
-instance of the browser is opened. Click the "`debug`" button to open a
-new tab that executes the unit tests.
-
-[source,bash]
-----
-yarn test:karma:debug
-----
-
-In the screenshot below, you’ll notice the URL is
-`localhost:9876/debug.html`. You can append a `grep` query parameter
-to this URL and set it to a string value which will be used to exclude
-tests which don’t match. For example, if you changed the URL to
-`localhost:9876/debug.html?query=my test` and then refreshed the
-browser, you’d only see tests run which contain "`my test`" in the test
-description.
-
-image:http://i.imgur.com/DwHxgfq.png[Browser test debugging]
-
 [discrete]
 === Unit Testing Plugins
 
@@ -141,5 +109,4 @@ command from your plugin:
 [source,bash]
 ----
 yarn test:mocha
-yarn test:karma:debug # remove the debug flag to run them once and close
 ----

package.json

@@ -41,8 +41,6 @@
     "kbn": "node scripts/kbn",
     "es": "node scripts/es",
     "test": "grunt test",
-    "test:karma": "grunt test:karma",
-    "test:karma:debug": "grunt test:karmaDebug",
     "test:jest": "node scripts/jest",
     "test:jest_integration": "node scripts/jest_integration",
     "test:mocha": "node scripts/mocha",
@@ -447,7 +445,6 @@
     "grunt-available-tasks": "^0.6.3",
     "grunt-cli": "^1.2.0",
     "grunt-contrib-watch": "^1.1.0",
-    "grunt-karma": "^3.0.2",
     "grunt-peg": "^2.0.1",
     "grunt-run": "0.8.1",
     "gulp-babel": "^8.0.0",
@@ -465,14 +462,6 @@
     "jest-raw-loader": "^1.0.1",
     "jimp": "^0.9.6",
     "json5": "^1.0.1",
-    "karma": "5.0.2",
-    "karma-chrome-launcher": "2.2.0",
-    "karma-coverage": "1.1.2",
-    "karma-firefox-launcher": "1.1.0",
-    "karma-ie-launcher": "1.0.0",
-    "karma-junit-reporter": "1.2.0",
-    "karma-mocha": "2.0.0",
-    "karma-safari-launcher": "1.0.0",
     "license-checker": "^16.0.0",
     "listr": "^0.14.1",
     "load-grunt-config": "^3.0.1",

packages/kbn-eslint-import-resolver-kibana/lib/get_webpack_config.js

@@ -28,13 +28,9 @@ exports.getWebpackConfig = function (kibanaPath, projectRoot, config) {
   const alias = {
     // Kibana defaults https://github.com/elastic/kibana/blob/6998f074542e8c7b32955db159d15661aca253d7/src/legacy/ui/ui_bundler_env.js#L30-L36
     ui: fromKibana('src/legacy/ui/public'),
-    test_harness: fromKibana('src/test_harness/public'),
 
     // Dev defaults for test bundle https://github.com/elastic/kibana/blob/6998f074542e8c7b32955db159d15661aca253d7/src/core_plugins/tests_bundle/index.js#L73-L78
     ng_mock$: fromKibana('src/test_utils/public/ng_mock'),
-    'angular-mocks$': fromKibana(
-      'src/legacy/core_plugins/tests_bundle/webpackShims/angular-mocks.js'
-    ),
     fixtures: fromKibana('src/fixtures'),
     test_utils: fromKibana('src/test_utils/public'),
   };

packages/kbn-plugin-generator/README.md

@@ -71,10 +71,6 @@ Generated plugins receive a handful of scripts that can be used during developme
 
     Build a distributable archive of your plugin.
 
-  - `yarn test:karma`
-
-    Run the browser tests in a real web browser.
-
   - `yarn test:mocha`
 
     Run the server tests using mocha.

packages/kbn-plugin-helpers/README.md

@@ -30,7 +30,6 @@ $ plugin-helpers help
     start                       Start kibana and have it include this plugin
     build [options] [files...]  Build a distributable archive
     test                        Run the server and browser tests
-    test:karma [options]      Run the browser tests in a real web browser
     test:mocha [files...]      Run the server tests using mocha
 
   Options:

packages/kbn-plugin-helpers/src/cli.ts

@@ -62,25 +62,6 @@ program
     }))
   );
 
-program
-  .command('test')
-  .description('Run the server and browser tests')
-  .on('--help', docs('test/all'))
-  .action(createCommanderAction('testAll'));
-
-program
-  .command('test:karma')
-  .description('Run the browser tests in a real web browser')
-  .option('--dev', 'Enable dev mode, keeps the test server running')
-  .option('-p, --plugins <plugin-ids>', "Manually specify which plugins' test bundles to run")
-  .on('--help', docs('test/karma'))
-  .action(
-    createCommanderAction('testKarma', (command) => ({
-      dev: Boolean(command.dev),
-      plugins: command.plugins,
-    }))
-  );
-
 program
   .command('test:mocha [files...]')
   .description('Run the server tests using mocha')

packages/kbn-plugin-helpers/src/lib/tasks.ts

@@ -19,23 +19,17 @@
 
 import { buildTask } from '../tasks/build';
 import { startTask } from '../tasks/start';
-import { testAllTask } from '../tasks/test/all';
-import { testKarmaTask } from '../tasks/test/karma';
 import { testMochaTask } from '../tasks/test/mocha';
 
 // define a tasks interface that we can extend in the tests
 export interface Tasks {
   build: typeof buildTask;
   start: typeof startTask;
-  testAll: typeof testAllTask;
-  testKarma: typeof testKarmaTask;
   testMocha: typeof testMochaTask;
 }
 
 export const tasks: Tasks = {
   build: buildTask,
   start: startTask,
-  testAll: testAllTask,
-  testKarma: testKarmaTask,
   testMocha: testMochaTask,
 };

packages/kbn-test/src/failed_tests_reporter/__fixtures__/index.ts

@@ -21,6 +21,5 @@ const Fs = jest.requireActual('fs');
 
 export const FTR_REPORT = Fs.readFileSync(require.resolve('./ftr_report.xml'), 'utf8');
 export const JEST_REPORT = Fs.readFileSync(require.resolve('./jest_report.xml'), 'utf8');
-export const KARMA_REPORT = Fs.readFileSync(require.resolve('./karma_report.xml'), 'utf8');
 export const MOCHA_REPORT = Fs.readFileSync(require.resolve('./mocha_report.xml'), 'utf8');
 export const CYPRESS_REPORT = Fs.readFileSync(require.resolve('./cypress_report.xml'), 'utf8');