summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-10-24 14:19:43 +0900
committerShinya Maeda <shinya@gitlab.com>2018-10-24 14:19:43 +0900
commit913d0df805ab6f6fb530bb4306075f62dfacf453 (patch)
tree7d63b9bf8bedd700338e59520bdb659ec2b43add
parentb9955c39fc10fc8bb5d7c675fa3e64ebb3d83b40 (diff)
downloadgitlab-ce-concurrent-test-reports-parsing.tar.gz
-rw-r--r--spec/features/merge_request/user_sees_merge_widget_spec.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/spec/features/merge_request/user_sees_merge_widget_spec.rb b/spec/features/merge_request/user_sees_merge_widget_spec.rb
index f15129759de..07032c496e2 100644
--- a/spec/features/merge_request/user_sees_merge_widget_spec.rb
+++ b/spec/features/merge_request/user_sees_merge_widget_spec.rb
@@ -3,6 +3,7 @@ require 'rails_helper'
describe 'Merge request > User sees merge widget', :js do
include ProjectForksHelper
include TestReportsHelper
+ include ReactiveCachingHelpers
let(:project) { create(:project, :repository) }
let(:project_only_mwps) { create(:project, :repository, only_allow_merge_if_pipeline_succeeds: true) }
@@ -355,6 +356,10 @@ describe 'Merge request > User sees merge widget', :js do
end
context 'when result has already been parsed' do
+ before do
+ synchronous_reactive_cache(head_pipeline)
+ end
+
context 'when JUnit xml is correctly formatted' do
let!(:job_artifact) { create(:ci_job_artifact, :junit, job: build, project: project) }