[tests/browser] generate css before testsBundle, include css (elastic…

…#23794)
snide · Oct 4, 2018 · e2ec868 · e2ec868
1 parent 1f13ee6
commit e2ec868
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/src/core_plugins/tests_bundle/index.js b/src/core_plugins/tests_bundle/index.js
@@ -70,6 +70,7 @@ export default (kibana) => {
             }
 
             testGlobs.push(`${plugin.publicDir}/**/__tests__/**/*.js`);
+            testGlobs.push(`${plugin.publicDir}/**/*.css`);
           });
         } else {
           // add the modules from all of the apps
@@ -79,6 +80,7 @@ export default (kibana) => {
 
           for (const plugin of plugins) {
             testGlobs.push(`${plugin.publicDir}/**/__tests__/**/*.js`);
+            testGlobs.push(`${plugin.publicDir}/**/*.css`);
           }
         }
 

diff --git a/tasks/config/karma.js b/tasks/config/karma.js
@@ -71,11 +71,9 @@ module.exports = function (grunt) {
       // list of files / patterns to load in the browser
       files: [
         'http://localhost:5610/bundles/vendors.bundle.js',
-        'http://localhost:5610/bundles/commons.bundle.js',
         'http://localhost:5610/bundles/tests.bundle.js',
 
         'http://localhost:5610/bundles/vendors.style.css',
-        'http://localhost:5610/bundles/commons.style.css',
         'http://localhost:5610/bundles/tests.style.css'
       ],
 

diff --git a/tasks/config/run.js b/tasks/config/run.js
@@ -128,6 +128,13 @@ module.exports = function (grunt) {
         ...browserTestServerFlags,
       ]
     }),
+    browserSCSS: createKbnServerTask({
+      flags: [
+        ...browserTestServerFlags,
+        '--optimize',
+        '--optimize.enabled=false'
+      ]
+    }),
 
     // used by the test:coverage task
     //    runs the kibana server to serve the instrumented version of the browser test bundle

diff --git a/tasks/test.js b/tasks/test.js
@@ -33,15 +33,15 @@ module.exports = function (grunt) {
 
   grunt.registerTask('test:server', ['checkPlugins', 'run:mocha']);
 
-  grunt.registerTask('test:browser', ['checkPlugins', 'run:browserTestServer', 'karma:unit']);
+  grunt.registerTask('test:browser', ['checkPlugins', 'run:browserSCSS', 'run:browserTestServer', 'karma:unit']);
 
   grunt.registerTask('test:browser-ci', () => {
     const ciShardTasks = keys(grunt.config.get('karma'))
       .filter(key => key.startsWith('ciShard-'))
       .map(key => `karma:${key}`);
 
     grunt.log.ok(`Running UI tests in ${ciShardTasks.length} shards`);
-
+    grunt.task.run(['run:browserSCSS']);
     grunt.task.run(['run:browserTestServer', ...ciShardTasks]);
   });