1 files changed, 71 insertions, 43 deletions
diff --git a/qa/qa/specs/features/browser_ui/1_manage/project/import_github_repo_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/project/import_github_repo_spec.rb
index 6ac11fea7e1..15563e3aa2a 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/project/import_github_repo_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/project/import_github_repo_spec.rb
@@ -4,61 +4,89 @@ module QA
   # Spec uses real github.com, which means outage of github can actually block deployment
   # Keep spec in reliable bucket but don't run in blocking pipelines
   RSpec.describe 'Manage', :github, :reliable, :skip_live_env, :requires_admin, product_group: :import do
-    describe 'Project import' do
-      let(:github_repo) { 'gitlab-qa-github/import-test' }
-      let(:api_client) { Runtime::API::Client.as_admin }
-      let(:group) { Resource::Group.fabricate_via_api! { |resource| resource.api_client = api_client } }
-      let(:user) do
-        Resource::User.fabricate_via_api! do |resource|
-          resource.api_client = api_client
-          resource.hard_delete_on_api_removal = true
+    describe 'GitHub import' do
+      context 'when imported via UI' do
+        let(:github_repo) { 'gitlab-qa-github/import-test' }
+        let(:api_client) { Runtime::API::Client.as_admin }
+        let(:group) { Resource::Group.fabricate_via_api! { |resource| resource.api_client = api_client } }
+        let(:user) do
+          Resource::User.fabricate_via_api! do |resource|
+            resource.api_client = api_client
+            resource.hard_delete_on_api_removal = true
+          end
         end
-      end
 
-      let(:imported_project) do
-        Resource::ProjectImportedFromGithub.init do |project|
-          project.import = true
-          project.group = group
-          project.github_personal_access_token = Runtime::Env.github_access_token
-          project.github_repository_path = github_repo
-          project.api_client = api_client
+        let(:imported_project) do
+          Resource::ProjectImportedFromGithub.init do |project|
+            project.import = true
+            project.group = group
+            project.github_personal_access_token = Runtime::Env.github_access_token
+            project.github_repository_path = github_repo
+            project.api_client = api_client
+          end
         end
-      end
 
-      before do
-        group.add_member(user, Resource::Members::AccessLevel::MAINTAINER)
-
-        Flow::Login.sign_in(as: user)
-        Page::Main::Menu.perform(&:go_to_create_project)
-        Page::Project::New.perform do |project_page|
-          project_page.click_import_project
-          project_page.click_github_link
+        let(:imported_issue) do
+          Resource::Issue.init do |resource|
+            resource.project = imported_project
+            resource.iid = imported_project.issues.first[:iid]
+            resource.api_client = api_client
+          end.reload!
         end
-      end
 
-      after do
-        user.remove_via_api!
-      end
+        let(:imported_issue_events) do
+          imported_issue.label_events.map { |e| { name: "#{e[:action]}_label", label: e.dig(:label, :name) } }
+        end
 
-      it 'imports a GitHub repo', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347877' do
-        Page::Project::Import::Github.perform do |import_page|
-          import_page.add_personal_access_token(Runtime::Env.github_access_token)
-          import_page.import!(github_repo, group.full_path, imported_project.name)
+        before do
+          group.add_member(user, Resource::Members::AccessLevel::MAINTAINER)
 
-          aggregate_failures do
-            expect(import_page).to have_imported_project(github_repo, wait: 240)
-            # validate button is present instead of navigating to avoid dealing with multiple tabs
-            # which makes the test more complicated
-            expect(import_page).to have_go_to_project_button(github_repo)
+          Flow::Login.sign_in(as: user)
+          Page::Main::Menu.perform(&:go_to_create_project)
+          Page::Project::New.perform do |project_page|
+            project_page.click_import_project
+            project_page.click_github_link
           end
         end
 
-        imported_project.reload!.visit!
-        Page::Project::Show.perform do |project|
-          aggregate_failures do
-            expect(project).to have_content(imported_project.name)
-            expect(project).to have_content('Project for github import test')
+        after do
+          user.remove_via_api!
+        end
+
+        it 'imports a project', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347877' do
+          Page::Project::Import::Github.perform do |import_page|
+            import_page.add_personal_access_token(Runtime::Env.github_access_token)
+
+            import_page.select_advanced_option(:single_endpoint_issue_events_import)
+            import_page.select_advanced_option(:single_endpoint_notes_import)
+            import_page.select_advanced_option(:attachments_import)
+
+            import_page.import!(github_repo, group.full_path, imported_project.name)
+
+            aggregate_failures do
+              expect(import_page).to have_imported_project(github_repo, wait: 240)
+              # validate button is present instead of navigating to avoid dealing with multiple tabs
+              # which makes the test more complicated
+              expect(import_page).to have_go_to_project_button(github_repo)
+            end
+          end
+
+          imported_project.reload!.visit!
+          Page::Project::Show.perform do |project|
+            aggregate_failures do
+              expect(project).to have_content(imported_project.name)
+              expect(project).to have_content('Project for github import test')
+            end
           end
+
+          # Validate :single_endpoint_issue_events_import option was triggered correctly and imported the events
+          expect(imported_issue_events).to match_array(
+            [
+              { name: "add_label", label: "question" },
+              { name: "add_label", label: "good first issue" },
+              { name: "add_label", label: "help wanted" }
+            ]
+          )
         end
       end
     end