From 983a0bba5d2a042c4a3bbb22432ec192c7501d82 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 20 Apr 2020 18:38:24 +0000
Subject: Add latest changes from gitlab-org/gitlab@12-10-stable-ee

---
 .../merge_request/user_resolves_wip_mr_spec.rb     | 48 ++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 spec/features/merge_request/user_resolves_wip_mr_spec.rb

(limited to 'spec/features/merge_request')

diff --git a/spec/features/merge_request/user_resolves_wip_mr_spec.rb b/spec/features/merge_request/user_resolves_wip_mr_spec.rb
new file mode 100644
index 00000000000..93ef0801791
--- /dev/null
+++ b/spec/features/merge_request/user_resolves_wip_mr_spec.rb
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'Merge request > User resolves Work in Progress', :js do
+  let(:project) { create(:project, :public, :repository) }
+  let(:user) { project.creator }
+  let(:merge_request) do
+    create(:merge_request_with_diffs, source_project: project,
+                                      author: user,
+                                      title: 'WIP: Bug NS-04',
+                                      merge_params: { force_remove_source_branch: '1' })
+  end
+  let(:pipeline) do
+    create(:ci_pipeline, project: project,
+                         sha: merge_request.diff_head_sha,
+                         ref: merge_request.source_branch,
+                         head_pipeline_of: merge_request)
+  end
+
+  before do
+    project.add_maintainer(user)
+  end
+
+  context 'when there is active pipeline for merge request' do
+    before do
+      create(:ci_build, pipeline: pipeline)
+      sign_in(user)
+      visit project_merge_request_path(project, merge_request)
+      wait_for_requests
+    end
+
+    it 'retains merge request data after clicking Resolve WIP status' do
+      expect(page.find('.ci-widget-content')).to have_content("Pipeline ##{pipeline.id}")
+      expect(page).to have_content "This is a Work in Progress"
+
+      click_button('Resolve WIP status')
+
+      wait_for_requests
+
+      # If we don't disable the wait here, the test will wait until the
+      # merge request widget refreshes, which masks missing elements
+      # that should already be present.
+      expect(page.find('.ci-widget-content', wait: 0)).to have_content("Pipeline ##{pipeline.id}")
+      expect(page).not_to have_content('This is a Work in Progress')
+    end
+  end
+end
-- 
cgit v1.2.1