Add latest changes from gitlab-org/gitlab@master

3 files changed, 48 insertions, 40 deletions

diff --git a/qa/qa.rb b/qa/qa.rb
index 1d1ac2e2749..1cf6d7b79f7 100644
--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -156,6 +156,7 @@ module QA
         autoload :Mattermost, 'qa/scenario/test/integration/mattermost'
         autoload :ObjectStorage, 'qa/scenario/test/integration/object_storage'
         autoload :SMTP, 'qa/scenario/test/integration/smtp'
+        autoload :SSHTunnel, 'qa/scenario/test/integration/ssh_tunnel'
       end
 
       module Sanity
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb
index 42c53c275df..de6b24e8477 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module QA
-  RSpec.describe 'Plan' do
+  RSpec.describe 'Plan', :smoke do
     describe 'Issue creation' do
       let(:closed_issue) { Resource::Issue.fabricate_via_api! }
 
@@ -9,7 +9,7 @@ module QA
         Flow::Login.sign_in
       end
 
-      it 'creates an issue', :smoke, :reliable, testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1167' do
+      it 'creates an issue', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1167' do
         issue = Resource::Issue.fabricate_via_browser_ui!
 
         Page::Project::Menu.perform(&:click_issues)
@@ -19,7 +19,7 @@ module QA
         end
       end
 
-      it 'closes an issue', :smoke, testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1085' do
+      it 'closes an issue', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1085' do
         closed_issue.visit!
 
         Page::Project::Issue::Show.perform do |issue_page|
@@ -38,7 +38,7 @@ module QA
         end
       end
 
-      context 'when using attachments in comments', :smoke, :object_storage do
+      context 'when using attachments in comments', :object_storage do
         let(:gif_file_name) { 'banana_sample.gif' }
         let(:file_to_attach) do
           File.absolute_path(File.join('qa', 'fixtures', 'designs', gif_file_name))
@@ -56,42 +56,6 @@ module QA
           end
         end
       end
-
-      context 'when using custom issue templates' do
-        let(:template_name) { 'custom_issue_template'}
-        let(:template_content) { 'This is a custom issue template test' }
-
-        let(:template_project) do
-          Resource::Project.fabricate_via_api! do |project|
-            project.name = "custom-issue-template-project-#{SecureRandom.hex(8)}"
-            project.initialize_with_readme = true
-          end
-        end
-
-        before do
-          Resource::Repository::Commit.fabricate_via_api! do |commit|
-            commit.project = template_project
-            commit.commit_message = 'Add custom issue template'
-            commit.add_files([
-              {
-                file_path: ".gitlab/issue_templates/#{template_name}.md",
-                content: template_content
-              }
-            ])
-          end
-        end
-
-        it 'creates an issue via custom template', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1229' do
-          Resource::Issue.fabricate_via_browser_ui! do |issue|
-            issue.project = template_project
-            issue.template = template_name
-          end
-
-          Page::Project::Issue::Show.perform do |issue_page|
-            expect(issue_page).to have_content(template_content)
-          end
-        end
-      end
     end
   end
 end
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/custom_issue_template_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/custom_issue_template_spec.rb
new file mode 100644
index 00000000000..5f5fe161e71
--- /dev/null
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/custom_issue_template_spec.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module QA
+  RSpec.describe 'Plan' do
+    describe 'Custom issue templates' do
+      let(:template_name) { 'custom_issue_template'}
+      let(:template_content) { 'This is a custom issue template test' }
+
+      let(:template_project) do
+        Resource::Project.fabricate_via_api! do |project|
+          project.name = "custom-issue-template-project"
+          project.initialize_with_readme = true
+        end
+      end
+
+      before do
+        Flow::Login.sign_in
+
+        Resource::Repository::Commit.fabricate_via_api! do |commit|
+          commit.project = template_project
+          commit.commit_message = 'Add custom issue template'
+          commit.add_files([
+            {
+              file_path: ".gitlab/issue_templates/#{template_name}.md",
+              content: template_content
+            }
+          ])
+        end
+      end
+
+      it 'creates an issue via custom template', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1229' do
+        Resource::Issue.fabricate_via_browser_ui! do |issue|
+          issue.project = template_project
+          issue.template = template_name
+        end
+
+        Page::Project::Issue::Show.perform do |issue_page|
+          expect(issue_page).to have_content(template_content)
+        end
+      end
+    end
+  end
+end