diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-06-11 12:59:25 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-06-11 12:59:25 +0300 |
| commit | 7d3bbeeb31731907456e8c4d5640e52e58a921fb (patch) | |
| tree | e6495c453cf449b8aa87845ec818798405323b9f /spec/features/merge_request | |
| parent | a4f37e1834dbd755981b0ce19617e99b4ea43bb7 (diff) | |
| parent | b38c75b3dc2dc655377a1b4070cb6f5242594dbe (diff) | |
Merge branch 'rs-update-rspec' into 'master'
Update rspec to 3.7
See merge request gitlab-org/gitlab-ce!19449
Diffstat (limited to 'spec/features/merge_request')
| -rw-r--r-- | spec/features/merge_request/user_sees_mini_pipeline_graph_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/merge_request/user_sees_mini_pipeline_graph_spec.rb b/spec/features/merge_request/user_sees_mini_pipeline_graph_spec.rb index fd1629746ef..d3104b448e0 100644 --- a/spec/features/merge_request/user_sees_mini_pipeline_graph_spec.rb +++ b/spec/features/merge_request/user_sees_mini_pipeline_graph_spec.rb @@ -23,8 +23,8 @@ describe 'Merge request < User sees mini pipeline graph', :js do end context 'as json' do - let(:artifacts_file1) { fixture_file_upload(Rails.root.join('spec/fixtures/banana_sample.gif'), 'image/gif') } - let(:artifacts_file2) { fixture_file_upload(Rails.root.join('spec/fixtures/dk.png'), 'image/png') } + let(:artifacts_file1) { fixture_file_upload(File.join('spec/fixtures/banana_sample.gif'), 'image/gif') } + let(:artifacts_file2) { fixture_file_upload(File.join('spec/fixtures/dk.png'), 'image/png') } before do create(:ci_build, :success, :trace_artifact, pipeline: pipeline, legacy_artifacts_file: artifacts_file1) |