diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2019-03-12 09:03:28 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2019-03-12 09:03:28 +0000 |
| commit | 32056fc7b282d1fd14e62939e721c7935492ec8f (patch) | |
| tree | 4887a81c5e487adda246aceef4d4b8725b35c83a | |
| parent | 1a0a92c572663b76bee03c8fd8f60db8f25fdb9f (diff) | |
| parent | 66dffba45d3de6e59fdfa5bf6b525d098aa7b280 (diff) | |
| download | gitlab-ce-32056fc7b282d1fd14e62939e721c7935492ec8f.tar.gz | |
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
| -rw-r--r-- | spec/javascripts/fixtures/emojis.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/javascripts/fixtures/emojis.rb b/spec/javascripts/fixtures/emojis.rb index f5fb008c7b3..4dab697e5e2 100644 --- a/spec/javascripts/fixtures/emojis.rb +++ b/spec/javascripts/fixtures/emojis.rb @@ -9,6 +9,8 @@ describe 'Emojis (JavaScript fixtures)' do it 'emojis/emojis.json' do |example| JavaScriptFixturesHelpers::FIXTURE_PATHS.each do |fixture_path| + next unless File.directory?(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)) |