Merge pull request #3275 from matthew-dean/fix-ci-promise

Adds Promise polyfill for PhantomJS under Node 9
less · Jul 8, 2018 · 8e814c7 · 8e814c7
2 parents e451cad + e95eed3
commit 8e814c7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1 +1,2 @@
-Gruntfile.js
+Gruntfile.js
+test/browser/vendor/*
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -292,7 +292,12 @@ module.exports = function (grunt) {
             options: {
                 keepRunner: true,
                 host: 'http://localhost:8081/',
-                vendor: ['test/browser/jasmine-jsreporter.js', 'test/browser/common.js', 'test/browser/less.js'],
+                vendor: [
+                    'test/browser/vendor/promise.js',
+                    'test/browser/jasmine-jsreporter.js',
+                    'test/browser/common.js',
+                    'test/browser/less.js'
+                ],
                 template: 'test/browser/test-runner-template.tmpl'
             },
             main: {

diff --git a/test/browser/vendor/promise.js b/test/browser/vendor/promise.js