Merge branch '49800-reorganize-qa-scenarios' into 'master'

Resolve "Consider reorganizing the QA scenarios"

Closes #49800

See merge request gitlab-org/gitlab-ce!20931

qa/qa/scenario/template.rb

@@ -21,14 +21,18 @@ module QA
       def perform(address, *rspec_options)
         Runtime::Scenario.define(:gitlab_address, address)
+        ##
+        # Perform before hooks, which are different for CE and EE
+        #
+        Runtime::Release.perform_before_hooks
+
         Specs::Runner.perform do |specs|
           specs.tty = true
-          specs.tags = self.class.focus
           specs.options =
             if rspec_options.any?
               rspec_options
             else
-              ::File.expand_path('../specs/features', __dir__)
+              ['--tag', self.class.focus.join(','), '--', ::File.expand_path('../specs/features', __dir__)]
             end
         end
       end

qa/qa/scenario/test/instance.rb

@@ -20,13 +20,18 @@ module QA
         def self.do_perform(address, *rspec_options)
           Runtime::Scenario.define(:gitlab_address, address)
+          ##
+          # Perform before hooks, which are different for CE and EE
+          #
+          Runtime::Release.perform_before_hooks
+
           Specs::Runner.perform do |specs|
             specs.tty = true
             specs.options =
               if rspec_options.any?
                 rspec_options
               else
-                ::File.expand_path('../../specs/features', __dir__)
+                ['--', ::File.expand_path('../../specs/features', __dir__)]
               end
           end
         end

qa/qa/specs/features/api/users_spec.rb → qa/qa/specs/features/api/1_manage/users_spec.rb

+# frozen_string_literal: true
+
 module QA
-  describe 'API users' do
-    before(:context) do
-      @api_client = Runtime::API::Client.new(:gitlab)
-    end
-    context 'when authenticated' do
+  context :manage do
+    describe 'Users API' do
+      before(:context) do
+        @api_client = Runtime::API::Client.new(:gitlab)
+      end
       let(:request) { Runtime::API::Request.new(@api_client, '/users') }
-      it 'get list of users' do
+      it 'GET /users' do
         get request.url
         expect_status(200)
       end
-      it 'submit request with a valid user name' do
+      it 'GET /users/:username with a valid username' do
         get request.url, { params: { username: Runtime::User.username } }
         expect_status(200)
@@ -22,20 +24,12 @@ module QA
         )
       end
-      it 'submit request with an invalid user name' do
+      it 'GET /users/:username with an invalid username' do
         get request.url, { params: { username: SecureRandom.hex(10) } }
         expect_status(200)
         expect(json_body).to eq([])
       end
     end
-
-    it 'submit request with an invalid token' do
-      request = Runtime::API::Request.new(@api_client, '/users', private_token: 'invalid')
-
-      get request.url
-
-      expect_status(401)
-    end
   end
 end

qa/qa/specs/features/browser_ui/1_manage/login/log_in_spec.rb

+module QA
+  context :manage, :smoke do
+    describe 'basic user login' do
+      it 'user logs in using basic credentials' do
+        Runtime::Browser.visit(:gitlab, Page::Main::Login)
+        Page::Main::Login.act { sign_in_using_credentials }
+
+        # TODO, since `Signed in successfully` message was removed
+        # this is the only way to tell if user is signed in correctly.
+        #
+        Page::Menu::Main.perform do |menu|
+          expect(menu).to have_personal_area
+        end
+      end
+    end
+  end
+end

qa/qa/specs/features/browser_ui/1_manage/login/log_into_gitlab_via_ldap_spec.rb

+# frozen_string_literal: true
+
+module QA
+  context :manage, :orchestrated, :ldap do
+    describe 'LDAP login' do
+      before do
+        Runtime::Env.user_type = 'ldap'
+      end
+
+      it 'user logs into GitLab using LDAP credentials' do
+        Runtime::Browser.visit(:gitlab, Page::Main::Login)
+        Page::Main::Login.act { sign_in_using_credentials }
+
+        # TODO, since `Signed in successfully` message was removed
+        # this is the only way to tell if user is signed in correctly.
+        #
+        Page::Menu::Main.perform do |menu|
+          expect(menu).to have_personal_area
+        end
+      end
+    end
+  end
+end

qa/qa/specs/features/browser_ui/1_manage/login/log_into_mattermost_via_gitlab_spec.rb

+# frozen_string_literal: true
+
+module QA
+  context :manage, :orchestrated, :mattermost do
+    describe 'Mattermost login' do
+      it 'user logs into Mattermost using GitLab OAuth' do
+        Runtime::Browser.visit(:gitlab, Page::Main::Login) do
+          Page::Main::Login.act { sign_in_using_credentials }
+
+          Runtime::Browser.visit(:mattermost, Page::Mattermost::Login) do
+            Page::Mattermost::Login.act { sign_in_using_oauth }
+
+            Page::Mattermost::Main.perform do |page|
+              expect(page).to have_content(/(Welcome to: Mattermost|Logout GitLab Mattermost)/)
+            end
+          end
+        end
+      end
+    end
+  end
+end

qa/qa/specs/features/browser_ui/1_manage/project/create_project_spec.rb

+# frozen_string_literal: true
+
+module QA
+  context :manage, :smoke do
+    describe 'Project creation' do
+      it 'user creates a new project' do
+        Runtime::Browser.visit(:gitlab, Page::Main::Login)
+        Page::Main::Login.act { sign_in_using_credentials }
+
+        created_project = Factory::Resource::Project.fabricate! do |project|
+          project.name = 'awesome-project'
+          project.description = 'create awesome project test'
+        end
+
+        expect(created_project.name).to match /^awesome-project-\h{16}$/
+
+        expect(page).to have_content(
+          /Project \S?awesome-project\S+ was successfully created/
+        )
+
+        expect(page).to have_content('create awesome project test')
+        expect(page).to have_content('The repository for this project is empty')
+      end
+    end
+  end
+end

qa/qa/specs/features/browser_ui/1_manage/project/import_github_repo_spec.rb

+# frozen_string_literal: true
+
+module QA
+  context :manage, :orchestrated, :github do
+    describe 'Project import from GitHub' do
+      let(:imported_project) do
+        Factory::Resource::ProjectImportedFromGithub.fabricate! do |project|
+          project.name = 'imported-project'
+          project.personal_access_token = Runtime::Env.github_access_token
+          project.github_repository_path = 'gitlab-qa/test-project'
+        end
+      end
+
+      after do
+        # We need to delete the imported project because it's impossible to import
+        # the same GitHub project twice for a given user.
+        api_client = Runtime::API::Client.new(:gitlab)
+        delete_project_request = Runtime::API::Request.new(api_client, "/projects/#{CGI.escape("#{Runtime::Namespace.path}/#{imported_project.name}")}")
+        delete delete_project_request.url
+
+        expect_status(202)
+      end
+
+      it 'user imports a GitHub repo' do
+        Runtime::Browser.visit(:gitlab, Page::Main::Login)
+        Page::Main::Login.act { sign_in_using_credentials }
+
+        imported_project # import the project
+
+        Page::Menu::Main.act { go_to_projects }
+        Page::Dashboard::Projects.perform do |dashboard|
+          dashboard.go_to_project(imported_project.name)
+        end
+
+        Page::Project::Show.act { wait_for_import }
+
+        verify_repository_import
+        verify_issues_import
+        verify_merge_requests_import
+        verify_labels_import
+        verify_milestones_import
+        verify_wiki_import
+      end
+
+      def verify_repository_import
+        expect(page).to have_content('This test project is used for automated GitHub import by GitLab QA.')
+        expect(page).to have_content(imported_project.name)
+      end
+
+      def verify_issues_import
+        Page::Menu::Side.act { click_issues }
+        expect(page).to have_content('This is a sample issue')
+
+        click_link 'This is a sample issue'
+
+        expect(page).to have_content('We should populate this project with issues, pull requests and wiki pages.')
+
+        # Comments
+        expect(page).to have_content('This is a comment from @rymai.')
+
+        Page::Issuable::Sidebar.perform do |issuable|
+          expect(issuable).to have_label('enhancement')
+          expect(issuable).to have_label('help wanted')
+          expect(issuable).to have_label('good first issue')
+        end
+      end
+
+      def verify_merge_requests_import
+        Page::Menu::Side.act { click_merge_requests }
+        expect(page).to have_content('Improve README.md')
+
+        click_link 'Improve README.md'
+
+        expect(page).to have_content('This improves the README file a bit.')
+
+        # Review comment are not supported yet
+        expect(page).not_to have_content('Really nice change.')
+
+        # Comments
+        expect(page).to have_content('Nice work! This is a comment from @rymai.')
+
+        # Diff comments
+        expect(page).to have_content('[Review comment] I like that!')
+        expect(page).to have_content('[Review comment] Nice blank line.')
+        expect(page).to have_content('[Single diff comment] Much better without this line!')
+
+        Page::Issuable::Sidebar.perform do |issuable|
+          expect(issuable).to have_label('bug')
+          expect(issuable).to have_label('enhancement')
+        end
+      end
+
+      def verify_labels_import
+        # TODO: Waiting on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19228
+        # to build upon it.
+      end
+
+      def verify_milestones_import
+        # TODO: Waiting on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18727
+        # to build upon it.
+      end
+
+      def verify_wiki_import
+        Page::Menu::Side.act { click_wiki }
+
+        expect(page).to have_content('Welcome to the test-project wiki!')
+      end
+    end
+  end
+end

qa/qa/specs/features/browser_ui/1_manage/project/view_project_activity_spec.rb

+# frozen_string_literal: true
+
+module QA
+  context :manage do
+    describe 'Project activity' do
+      it 'user creates an event in the activity page upon Git push' do
+        Runtime::Browser.visit(:gitlab, Page::Main::Login)
+        Page::Main::Login.act { sign_in_using_credentials }
+
+        Factory::Repository::ProjectPush.fabricate! do |push|
+          push.file_name = 'README.md'
+          push.file_content = '# This is a test project'
+          push.commit_message = 'Add README.md'
+        end
+
+        Page::Menu::Side.act { go_to_activity }
+
+        Page::Project::Activity.act { go_to_push_events }
+
+        expect(page).to have_content('pushed new branch master')
+      end
+    end
+  end
+end

qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb

+# frozen_string_literal: true
+
+module QA
+  context :plan, :smoke do
+    describe 'Issue creation' do
+      let(:issue_title) { 'issue title' }
+
+      it 'user creates an issue' do
+        Runtime::Browser.visit(:gitlab, Page::Main::Login)
+        Page::Main::Login.act { sign_in_using_credentials }
+
+        Factory::Resource::Issue.fabricate! do |issue|
+          issue.title = issue_title
+        end
+
+        Page::Menu::Side.act { click_issues }
+
+        expect(page).to have_content(issue_title)
+      end
+    end
+  end
+end

qa/qa/specs/features/merge_request/create_spec.rb → qa/qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_spec.rb

-module QA
-  describe 'creates a merge request with milestone' do
-    it 'user creates a new merge request'  do
-      Runtime::Browser.visit(:gitlab, Page::Main::Login)
-      Page::Main::Login.act { sign_in_using_credentials }
-
-      current_project = Factory::Resource::Project.fabricate! do |project|
-        project.name = 'project-with-merge-request-and-milestone'
-      end
-
-      current_milestone = Factory::Resource::ProjectMilestone.fabricate! do |milestone|
-        milestone.title = 'unique-milestone'
-        milestone.project = current_project
-      end
-
-      Factory::Resource::MergeRequest.fabricate! do |merge_request|
-        merge_request.title = 'This is a merge request with a milestone'
-        merge_request.description = 'Great feature with milestone'
-        merge_request.project = current_project
-        merge_request.milestone = current_milestone
-      end
-
-      expect(page).to have_content('This is a merge request with a milestone')
-      expect(page).to have_content('Great feature with milestone')
-      expect(page).to have_content(/Opened [\w\s]+ ago/)
-      Page::Issuable::Sidebar.perform do |sidebar|
-        expect(sidebar).to have_milestone(current_milestone.title)
+# frozen_string_literal: true
+module QA
+  context :create do
+    describe 'Merge request creation' do
+      it 'user creates a new merge request'  do
+        Runtime::Browser.visit(:gitlab, Page::Main::Login)
+        Page::Main::Login.act { sign_in_using_credentials }
+
+        current_project = Factory::Resource::Project.fabricate! do |project|
+          project.name = 'project-with-merge-request-and-milestone'
+        end
+
+        current_milestone = Factory::Resource::ProjectMilestone.fabricate! do |milestone|
+          milestone.title = 'unique-milestone'
+          milestone.project = current_project
+        end
+
+        Factory::Resource::MergeRequest.fabricate! do |merge_request|
+          merge_request.title = 'This is a merge request with a milestone'
+          merge_request.description = 'Great feature with milestone'
+          merge_request.project = current_project
+          merge_request.milestone = current_milestone
+        end
+
+        expect(page).to have_content('This is a merge request with a milestone')
+        expect(page).to have_content('Great feature with milestone')
+        expect(page).to have_content(/Opened [\w\s]+ ago/)
+
+        Page::Issuable::Sidebar.perform do |sidebar|
+          expect(sidebar).to have_milestone(current_milestone.title)
+        end
       end
     end
   end

qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb

+# frozen_string_literal: true
+
+module QA
+  context :create do
+    describe 'Merge request creation from fork' do
+      it 'user forks a project, submits a merge request and maintainer merges it' do
+        Runtime::Browser.visit(:gitlab, Page::Main::Login)
+        Page::Main::Login.act { sign_in_using_credentials }
+
+        merge_request = Factory::Resource::MergeRequestFromFork.fabricate! do |merge_request|
+          merge_request.fork_branch = 'feature-branch'
+        end
+
+        Page::Menu::Main.perform { |main| main.sign_out }
+        Page::Main::Login.perform { |login| login.sign_in_using_credentials }
+
+        merge_request.visit!
+
+        Page::MergeRequest::Show.perform { |show| show.merge! }
+
+        expect(page).to have_content('The changes were merged')
+      end
+    end
+  end
+end

qa/qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb

+# frozen_string_literal: true
+
+module QA
+  context :create do
+    describe 'Merge request rebasing' do
+      it 'user rebases source branch of merge request'  do
+        Runtime::Browser.visit(:gitlab, Page::Main::Login)
+        Page::Main::Login.act { sign_in_using_credentials }
+
+        project = Factory::Resource::Project.fabricate! do |project|
+          project.name = "only-fast-forward"
+        end
+
+        Page::Menu::Side.act { go_to_settings }
+        Page::Project::Settings::MergeRequest.act { enable_ff_only }
+
+        merge_request = Factory::Resource::MergeRequest.fabricate! do |merge_request|
+          merge_request.project = project
+          merge_request.title = 'Needs rebasing'
+        end
+
+        Factory::Repository::ProjectPush.fabricate! do |push|
+          push.project = project
+          push.file_name = "other.txt"
+          push.file_content = "New file added!"
+          push.branch_name = "master"
+          push.new_branch = false
+        end
+
+        merge_request.visit!
+
+        Page::MergeRequest::Show.perform do |merge_request|
+          expect(merge_request).to have_content('Needs rebasing')
+          expect(merge_request).not_to be_fast_forward_possible
+          expect(merge_request).not_to have_merge_button
+
+          merge_request.rebase!
+
+          expect(merge_request).to have_merge_button
+          expect(merge_request.fast_forward_possible?).to be_truthy
+        end
+      end
+    end
+  end
+end