Commit dd930fae authored by Luke Bennett's avatar Luke Bennett

Merge branch 'ce-10266-job-failed-173481892' into 'master'

Fix for mismatch in EE on FIXTURE_PATHS to FIXTURE_PATH

Closes gitlab-ee#10266

See merge request gitlab-org/gitlab-ce!25878
parents 85d76095 42df6c85
......@@ -8,9 +8,11 @@ describe 'Emojis (JavaScript fixtures)' do
end
it 'emojis/emojis.json' do |example|
# Copying the emojis.json from the public folder
fixture_file_name = File.expand_path('emojis/emojis.json', JavaScriptFixturesHelpers::FIXTURE_PATH)
FileUtils.mkdir_p(File.dirname(fixture_file_name))
FileUtils.cp(Rails.root.join('public/-/emojis/1/emojis.json'), fixture_file_name)
JavaScriptFixturesHelpers::FIXTURE_PATHS.each do |fixture_path|
# Copying the emojis.json from the public folder
fixture_file_name = File.expand_path('emojis/emojis.json', fixture_path)
FileUtils.mkdir_p(File.dirname(fixture_file_name))
FileUtils.cp(Rails.root.join('public/-/emojis/1/emojis.json'), fixture_file_name)
end
end
end
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