diff options
| author | Phil Hughes <me@iamphill.com> | 2019-05-07 07:45:42 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-05-07 07:45:42 +0000 |
| commit | 06b06736eb314bf4144ae50400fbe9d8f8f3cae7 (patch) | |
| tree | e7db2052049b3cd9ed9a8c7d50616383ce58c5ef /spec/javascripts | |
| parent | 2cbfd5c58cfcfe43dbaee3e6734bdf5fff9105b9 (diff) | |
| parent | fbac16b2de4b715a85dfd2b79768079d12229bc1 (diff) | |
| download | gitlab-ce-06b06736eb314bf4144ae50400fbe9d8f8f3cae7.tar.gz | |
Merge branch 'winh-separate-frontend-fixtures' into 'master'
Generate EE-specific JavaScript fixtures into ee/ directory (CE-backport)
See merge request gitlab-org/gitlab-ce!28032
Diffstat (limited to 'spec/javascripts')
| -rw-r--r-- | spec/javascripts/fixtures/.gitignore | 2 | ||||
| -rw-r--r-- | spec/javascripts/test_constants.js | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/spec/javascripts/fixtures/.gitignore b/spec/javascripts/fixtures/.gitignore index 2507c8e7263..bed020f5b0a 100644 --- a/spec/javascripts/fixtures/.gitignore +++ b/spec/javascripts/fixtures/.gitignore @@ -1,3 +1,5 @@ *.html.raw *.html *.json +*.pdf +*.bmpr diff --git a/spec/javascripts/test_constants.js b/spec/javascripts/test_constants.js index 24b5512b053..77c206585fe 100644 --- a/spec/javascripts/test_constants.js +++ b/spec/javascripts/test_constants.js @@ -1,4 +1,6 @@ -export const FIXTURES_PATH = '/base/spec/javascripts/fixtures'; +export const FIXTURES_PATH = `/base/${ + process.env.IS_GITLAB_EE ? 'ee/' : '' +}spec/javascripts/fixtures`; export const TEST_HOST = 'http://test.host'; export const DUMMY_IMAGE_URL = `${FIXTURES_PATH}/static/images/one_white_pixel.png`; |