kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Browse source 
Fix for mismatch in EE on FIXTURE_PATHS to FIXTURE_PATH

Closes gitlab-ee#10266

See merge request gitlab-org/gitlab-ce!25878
This commit is contained in:
Luke Bennett 2019-03-07 18:37:36 +00:00
commit dd930faea6
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
spec/javascripts/fixtures/emojis.rb
View file

@ -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