Ver código fonte

Merge pull request #471 from sharelatex/as-karma-css

Serve CSS when running karma tests
Alasdair Smith 8 anos atrás
pai
commit
8ff1492962
1 arquivos alterados com 6 adições e 2 exclusões
  1. 6 2
      services/web/karma.conf.js

+ 6 - 2
services/web/karma.conf.js

@@ -18,6 +18,7 @@ module.exports = function (config) {
       'public/js/libs/angular-1.6.4.min.js',
       'public/js/libs/angular-1.6.4.min.js',
       'public/js/libs/angular-mocks.js',
       'public/js/libs/angular-mocks.js',
       'public/js/libs/jquery-1.11.1.min.js',
       'public/js/libs/jquery-1.11.1.min.js',
+      'public/js/libs/underscore-1.3.3.js',
       // Set up requirejs
       // Set up requirejs
       'test/unit_frontend/js/test-main.js',
       'test/unit_frontend/js/test-main.js',
       // Include source & test files, but don't "include" them as requirejs
       // Include source & test files, but don't "include" them as requirejs
@@ -26,7 +27,10 @@ module.exports = function (config) {
       { pattern: 'test/unit_frontend/js/**/*.js', included: false },
       { pattern: 'test/unit_frontend/js/**/*.js', included: false },
       // Include ES test files
       // Include ES test files
       'test/unit_frontend/es/**/*.js',
       'test/unit_frontend/es/**/*.js',
-      'modules/**/test/unit_frontend/es/**/*.js'
+      'modules/**/test/unit_frontend/es/**/*.js',
+      // Include CSS (there is some in js/libs dir)
+      'public/stylesheets/**/*.css',
+      'public/js/libs/**/*.css'
     ],
     ],
     middleware: ['fake-img'],
     middleware: ['fake-img'],
     preprocessors: {
     preprocessors: {
@@ -74,4 +78,4 @@ function fakeImgMiddlewareFactory () {
     }
     }
     next()
     next()
   }
   }
-}
+}