From 7e9c479f7de77702622631cff2628a9c8dcbc627 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 19 Nov 2020 08:27:35 +0000
Subject: Add latest changes from gitlab-org/gitlab@13-6-stable-ee

---
 .../merge_requests/user_exports_as_csv_spec.rb     | 31 ++++++++++++++++++++++
 .../merge_requests/user_filters_by_draft_spec.rb   | 31 ++++++++++++++++++++++
 .../user_filters_by_target_branch_spec.rb          | 10 +++++++
 3 files changed, 72 insertions(+)
 create mode 100644 spec/features/merge_requests/user_exports_as_csv_spec.rb
 create mode 100644 spec/features/merge_requests/user_filters_by_draft_spec.rb

(limited to 'spec/features/merge_requests')

diff --git a/spec/features/merge_requests/user_exports_as_csv_spec.rb b/spec/features/merge_requests/user_exports_as_csv_spec.rb
new file mode 100644
index 00000000000..a86ff9d7335
--- /dev/null
+++ b/spec/features/merge_requests/user_exports_as_csv_spec.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'Merge Requests > Exports as CSV', :js do
+  let!(:project) { create(:project, :public, :repository) }
+  let!(:user)    { project.creator }
+  let!(:open_mr) { create(:merge_request, title: 'Bugfix1', source_project: project, target_project: project, source_branch: 'bugfix1') }
+
+  before do
+    sign_in(user)
+    visit(project_merge_requests_path(project))
+  end
+
+  subject { page.find('.nav-controls') }
+
+  it { is_expected.to have_button('Export as CSV') }
+
+  context 'button is clicked' do
+    before do
+      click_button('Export as CSV')
+    end
+
+    it 'shows a success message' do
+      click_link('Export merge requests')
+
+      expect(page).to have_content 'Your CSV export has started.'
+      expect(page).to have_content "It will be emailed to #{user.email} when complete"
+    end
+  end
+end
diff --git a/spec/features/merge_requests/user_filters_by_draft_spec.rb b/spec/features/merge_requests/user_filters_by_draft_spec.rb
new file mode 100644
index 00000000000..de070805d96
--- /dev/null
+++ b/spec/features/merge_requests/user_filters_by_draft_spec.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'Merge Requests > User filters by draft', :js do
+  include FilteredSearchHelpers
+
+  let(:project) { create(:project, :public, :repository) }
+  let(:user)    { project.creator }
+
+  before do
+    create(:merge_request, title: 'Draft: Bugfix', source_project: project, target_project: project, source_branch: 'bugfix2')
+
+    sign_in(user)
+    visit project_merge_requests_path(project)
+  end
+
+  it 'filters results' do
+    input_filtered_search_keys('draft:=yes')
+
+    expect(page).to have_content('Draft: Bugfix')
+  end
+
+  it 'does not allow filtering by is not equal' do
+    find('#filtered-search-merge_requests').click
+
+    click_button 'Draft'
+
+    expect(page).not_to have_content('!=')
+  end
+end
diff --git a/spec/features/merge_requests/user_filters_by_target_branch_spec.rb b/spec/features/merge_requests/user_filters_by_target_branch_spec.rb
index 540d87eb969..1d9c80238f5 100644
--- a/spec/features/merge_requests/user_filters_by_target_branch_spec.rb
+++ b/spec/features/merge_requests/user_filters_by_target_branch_spec.rb
@@ -44,4 +44,14 @@ RSpec.describe 'Merge Requests > User filters by target branch', :js do
       expect(page).not_to have_content mr2.title
     end
   end
+
+  context 'filtering by target-branch:!=master' do
+    it 'applies the filter' do
+      input_filtered_search('target-branch:!=master')
+
+      expect(page).to have_issuable_counts(open: 1, closed: 0, all: 1)
+      expect(page).not_to have_content mr1.title
+      expect(page).to have_content mr2.title
+    end
+  end
 end
-- 
cgit v1.2.1