diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-01-13 11:05:26 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-01-13 11:07:13 -0500 |
| commit | 8a643c8fcd15e23a3b97ddc03a161ce3c8451099 (patch) | |
| tree | 27f1d80ea5632994246b3001482080d681f614f8 | |
| parent | 60339e044b0909e31e385bcc687f6bdf60b049b2 (diff) | |
| download | gitlab-ce-8a643c8fcd15e23a3b97ddc03a161ce3c8451099.tar.gz | |
add phantomJS to karma config
| -rw-r--r-- | config/karma.config.js | 1 | ||||
| -rw-r--r-- | package.json | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/config/karma.config.js b/config/karma.config.js index 5c3d454addf..44229e2ee88 100644 --- a/config/karma.config.js +++ b/config/karma.config.js @@ -6,6 +6,7 @@ var ROOT_PATH = path.resolve(__dirname, '..'); module.exports = function(config) { config.set({ basePath: ROOT_PATH, + browsers: ['PhantomJS'], frameworks: ['jasmine'], files: [ { pattern: 'spec/javascripts/test_bundle.js', watched: false }, diff --git a/package.json b/package.json index 4ce08487c3d..fe48fa152c1 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,7 @@ "jasmine-jquery": "^2.1.1", "karma": "^1.3.0", "karma-jasmine": "^1.1.0", + "karma-phantomjs-launcher": "^1.0.2", "karma-sourcemap-loader": "^0.3.7", "karma-webpack": "^1.8.0" } |