summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWinnie Hellmann <winnie@gitlab.com>2019-04-25 14:11:01 +0200
committerWinnie Hellmann <winnie@gitlab.com>2019-04-30 12:40:42 +0200
commit96ad838433829e5432595ace85993f141cf4291a (patch)
treeda7341f58aba6cc13633e99909f77f2c8fb3c89b
parentee5768493b8b4434eda1904ced1a103653cbf4d4 (diff)
downloadgitlab-ce-96ad838433829e5432595ace85993f141cf4291a.tar.gz
Use FIXTURES_PATH in balsamiq_viewer_integration_spec.js
-rw-r--r--config/karma.config.js2
-rw-r--r--spec/javascripts/blob/balsamiq/balsamiq_viewer_integration_spec.js4
2 files changed, 4 insertions, 2 deletions
diff --git a/config/karma.config.js b/config/karma.config.js
index 7e1e89f3c10..1c0951c06fa 100644
--- a/config/karma.config.js
+++ b/config/karma.config.js
@@ -110,7 +110,7 @@ module.exports = function(config) {
frameworks: ['jasmine'],
files: [
{ pattern: 'spec/javascripts/test_bundle.js', watched: false },
- { pattern: 'spec/javascripts/fixtures/**/*@(.json|.html|.png)', included: false },
+ { pattern: `spec/javascripts/fixtures/**/*@(.json|.html|.png|.bmpr)`, included: false },
],
preprocessors: {
'spec/javascripts/**/*.js': ['webpack', 'sourcemap'],
diff --git a/spec/javascripts/blob/balsamiq/balsamiq_viewer_integration_spec.js b/spec/javascripts/blob/balsamiq/balsamiq_viewer_integration_spec.js
index 68b4f261617..33210794ba1 100644
--- a/spec/javascripts/blob/balsamiq/balsamiq_viewer_integration_spec.js
+++ b/spec/javascripts/blob/balsamiq/balsamiq_viewer_integration_spec.js
@@ -1,5 +1,7 @@
import BalsamiqViewer from '~/blob/balsamiq/balsamiq_viewer';
-import bmprPath from '../../fixtures/blob/balsamiq/test.bmpr';
+import { FIXTURES_PATH } from 'spec/test_constants';
+
+const bmprPath = `${FIXTURES_PATH}/blob/balsamiq/test.bmpr`;
describe('Balsamiq integration spec', () => {
let container;