Add latest changes from gitlab-org/gitlab@12-10-stable-ee

2 files changed, 40 insertions, 8 deletions

diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/export_as_csv_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/export_as_csv_spec.rb
new file mode 100644
index 00000000000..3727aae2270
--- /dev/null
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/export_as_csv_spec.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'securerandom'
+
+module QA
+  context 'Plan', :reliable do
+    describe 'Issues list' do
+      let(:project) do
+        Resource::Project.fabricate_via_api! do |project|
+          project.name = 'project-to-test-export-issues-as-csv'
+        end
+      end
+
+      before do
+        Flow::Login.sign_in
+
+        2.times do
+          Resource::Issue.fabricate_via_api! do |issue|
+            issue.project = project
+          end
+        end
+
+        project.visit!
+        Page::Project::Menu.perform(&:click_issues)
+      end
+
+      it 'successfully exports issues list as CSV' do
+        Page::Project::Issue::Index.perform do |index|
+          index.click_export_as_csv_button
+
+          expect(index.export_issues_modal).to have_content('2 issues selected')
+
+          index.click_export_issues_button
+
+          expect(index).to have_content(/Your CSV export has started. It will be emailed to (\S+) when complete./)
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/specs/features/browser_ui/4_verify/ci_variable/add_remove_ci_variable_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/ci_variable/add_remove_ci_variable_spec.rb
index f7a6c8411db..f05634bc3c8 100644
--- a/qa/qa/specs/features/browser_ui/4_verify/ci_variable/add_remove_ci_variable_spec.rb
+++ b/qa/qa/specs/features/browser_ui/4_verify/ci_variable/add_remove_ci_variable_spec.rb
@@ -10,14 +10,6 @@ module QA
         end
       end
 
-      before(:all) do
-        Runtime::Feature.enable_and_verify('new_variables_ui')
-      end
-
-      after(:all) do
-        Runtime::Feature.remove('new_variables_ui')
-      end
-
       before do
         Flow::Login.sign_in
         add_ci_variable