diff options
author | Matija Čupić <matteeyah@gmail.com> | 2017-12-06 01:38:53 +0100 |
---|---|---|
committer | Matija Čupić <matteeyah@gmail.com> | 2017-12-06 01:38:53 +0100 |
commit | 8675ad6f346270aabafa57f094617306504fe766 (patch) | |
tree | 63f4a9ed3c4b27b6a27508f1009e09c225cbb55c /spec/features/merge_requests/mini_pipeline_graph_spec.rb | |
parent | ce210c4a735a31c4c3b07d2d0ba46be2091d1b0d (diff) | |
parent | 0ef16b272002013bbdb44517e62f0a1d15046cf5 (diff) | |
download | gitlab-ce-8675ad6f346270aabafa57f094617306504fe766.tar.gz |
Merge branch 'list-multiple-clusters' into multiple-clusters-single-list
Diffstat (limited to 'spec/features/merge_requests/mini_pipeline_graph_spec.rb')
-rw-r--r-- | spec/features/merge_requests/mini_pipeline_graph_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/merge_requests/mini_pipeline_graph_spec.rb b/spec/features/merge_requests/mini_pipeline_graph_spec.rb index bac56270362..93c5e945453 100644 --- a/spec/features/merge_requests/mini_pipeline_graph_spec.rb +++ b/spec/features/merge_requests/mini_pipeline_graph_spec.rb @@ -28,14 +28,14 @@ feature 'Mini Pipeline Graph', :js do let(:artifacts_file2) { fixture_file_upload(Rails.root + 'spec/fixtures/dk.png', 'image/png') } before do - create(:ci_build, pipeline: pipeline, artifacts_file: artifacts_file1) + create(:ci_build, pipeline: pipeline, legacy_artifacts_file: artifacts_file1) create(:ci_build, pipeline: pipeline, when: 'manual') end it 'avoids repeated database queries' do before = ActiveRecord::QueryRecorder.new { visit_merge_request(:json) } - create(:ci_build, pipeline: pipeline, artifacts_file: artifacts_file2) + create(:ci_build, pipeline: pipeline, legacy_artifacts_file: artifacts_file2) create(:ci_build, pipeline: pipeline, when: 'manual') after = ActiveRecord::QueryRecorder.new { visit_merge_request(:json) } |