Commit 32056fc7 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Merge branch 'fix-emojis-fixture-creating-ee-specific-file' into 'master'

Don't create EE-specific files when creating Emojis fixture files

See merge request gitlab-org/gitlab-ce!26011
parents 1a0a92c5 66dffba4
...@@ -9,6 +9,8 @@ describe 'Emojis (JavaScript fixtures)' do ...@@ -9,6 +9,8 @@ describe 'Emojis (JavaScript fixtures)' do
it 'emojis/emojis.json' do |example| it 'emojis/emojis.json' do |example|
JavaScriptFixturesHelpers::FIXTURE_PATHS.each do |fixture_path| JavaScriptFixturesHelpers::FIXTURE_PATHS.each do |fixture_path|
next unless File.directory?(fixture_path)
# Copying the emojis.json from the public folder # Copying the emojis.json from the public folder
fixture_file_name = File.expand_path('emojis/emojis.json', fixture_path) fixture_file_name = File.expand_path('emojis/emojis.json', fixture_path)
FileUtils.mkdir_p(File.dirname(fixture_file_name)) FileUtils.mkdir_p(File.dirname(fixture_file_name))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment