Fix karma path to production tests. Remove optional test from Travis …

…config.
ishucr7 · Aug 8, 2016 · 47c7fba · 47c7fba
1 parent b94b131
commit 47c7fba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -29,7 +29,8 @@ env:
     - RUN_E2E_TESTS_MISC=true
     - RUN_E2E_TESTS_I18N=true
     - RUN_BACKEND_TESTS=true REPORT_BACKEND_COVERAGE=false
-    - RUN_BACKEND_TESTS=true REPORT_BACKEND_COVERAGE=true
+    # TODO(sll): Reinstate this when we can get it to run in reasonable time.
+    # - RUN_BACKEND_TESTS=true REPORT_BACKEND_COVERAGE=true
     - RUN_LINT=true
     - RUN_FRONTEND_TESTS=true
     - RUN_PERFORMANCE_TESTS=true
@@ -40,10 +41,7 @@ env:
     - RUN_E2E_TESTS_MISC_PROD=true
     - RUN_E2E_TESTS_I18N_PROD=true
 matrix:
-  allow_failures:
-  # The backend tests, with coverage, take too long to run, so we make this
-  # optional.
-  - env: RUN_BACKEND_TESTS=true REPORT_BACKEND_COVERAGE=true
+  allow_failures: []
   fast_finish: true
 
 notifications:

diff --git a/core/tests/karma.conf.js b/core/tests/karma.conf.js
@@ -2,7 +2,7 @@ var argv = require('yargs').argv;
 var isMinificationNeeded = (argv.minify === 'True');
 var generatedJs = 'third_party/generated/js/third_party.js';
 if (isMinificationNeeded) {
-  generatedJs = 'third_party/generated/prod/js/third_party.min.js';
+  generatedJs = 'third_party/generated/js/third_party.min.js';
 };
 
 module.exports = function(config) {