summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWinnie Hellmann <winnie@gitlab.com>2019-04-25 11:48:16 +0200
committerWinnie Hellmann <winnie@gitlab.com>2019-05-02 23:11:18 +0200
commit1542904541494fdb4ffec29c5ca83c0eac9b8c97 (patch)
tree7cfe8a1b1f2dd262ec28c731b086a0c2763515bf
parent78edcc2678d2914f50e20d44ec0e50f2aab0a727 (diff)
downloadgitlab-ce-1542904541494fdb4ffec29c5ca83c0eac9b8c97.tar.gz
Generate EE frontend fixtures into ee/ directory
(cherry picked from commit d4ce3c720ecb52f2a9153133bbd47fa358c5d7b6)
-rw-r--r--spec/support/helpers/javascript_fixtures_helpers.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/support/helpers/javascript_fixtures_helpers.rb b/spec/support/helpers/javascript_fixtures_helpers.rb
index 9cae8f934db..494398dc4de 100644
--- a/spec/support/helpers/javascript_fixtures_helpers.rb
+++ b/spec/support/helpers/javascript_fixtures_helpers.rb
@@ -15,7 +15,7 @@ module JavaScriptFixturesHelpers
end
def fixture_root_path
- 'spec/javascripts/fixtures'
+ (Gitlab.ee? ? 'ee/' : '') + 'spec/javascripts/fixtures'
end
# Public: Removes all fixture files from given directory