Improve QA scenarios contexts & descriptions consistency

Signed-off-by: Rémy Coutable <remy@rymai.me>

24 files changed, 673 insertions, 631 deletions

diff --git a/qa/qa/scenario/test/instance.rb b/qa/qa/scenario/test/instance.rb
index e41c742376a..a2d503cc015 100644
--- a/qa/qa/scenario/test/instance.rb
+++ b/qa/qa/scenario/test/instance.rb
@@ -31,7 +31,7 @@ module QA
               if rspec_options.any?
                 rspec_options
               else
-                ['--tag', self.class.focus.join(','), '--', ::File.expand_path('../../specs/features', __dir__)]
+                ['--', ::File.expand_path('../../specs/features', __dir__)]
               end
           end
         end
diff --git a/qa/qa/specs/features/api/1_manage/users_spec.rb b/qa/qa/specs/features/api/1_manage/users_spec.rb
index 3d25cca1e59..3e3c9e859aa 100644
--- a/qa/qa/specs/features/api/1_manage/users_spec.rb
+++ b/qa/qa/specs/features/api/1_manage/users_spec.rb
@@ -1,19 +1,21 @@
+# frozen_string_literal: true
+
 module QA
-  describe 'API users' do
-    before(:context) do
-      @api_client = Runtime::API::Client.new(:gitlab)
-    end
+  context :manage do
+    describe 'Users API' do
+      before(:context) do
+        @api_client = Runtime::API::Client.new(:gitlab)
+      end
 
-    context 'when authenticated' do
       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
diff --git a/qa/qa/specs/features/browser_ui/1_manage/login/log_into_gitlab_via_ldap_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/login/log_into_gitlab_via_ldap_spec.rb
index de6111eea64..c9958917be9 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/login/log_into_gitlab_via_ldap_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/login/log_into_gitlab_via_ldap_spec.rb
@@ -1,18 +1,22 @@
+# frozen_string_literal: true
+
 module QA
-  describe 'LDAP user login', :orchestrated, :ldap do
-    before do
-      Runtime::Env.user_type = 'ldap'
-    end
+  context :manage, :orchestrated, :ldap do
+    describe 'LDAP login' do
+      before do
+        Runtime::Env.user_type = 'ldap'
+      end
 
-    it 'user logs in using LDAP credentials' do
-      Runtime::Browser.visit(:gitlab, Page::Main::Login)
-      Page::Main::Login.act { sign_in_using_credentials }
+      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
+        # 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
diff --git a/qa/qa/specs/features/browser_ui/1_manage/login/log_into_mattermost_via_gitlab_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/login/log_into_mattermost_via_gitlab_spec.rb
index 27f7d4c245f..6eda2c750d4 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/login/log_into_mattermost_via_gitlab_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/login/log_into_mattermost_via_gitlab_spec.rb
@@ -1,14 +1,18 @@
+# frozen_string_literal: true
+
 module QA
-  describe 'logging in to Mattermost', :orchestrated, :mattermost do
-    it 'can use gitlab oauth' do
-      Runtime::Browser.visit(:gitlab, Page::Main::Login) do
-        Page::Main::Login.act { sign_in_using_credentials }
+  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 }
+          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)/)
+            Page::Mattermost::Main.perform do |page|
+              expect(page).to have_content(/(Welcome to: Mattermost|Logout GitLab Mattermost)/)
+            end
           end
         end
       end
diff --git a/qa/qa/specs/features/browser_ui/1_manage/project/create_project_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/project/create_project_spec.rb
index 5e19e490778..bb1f3ab26d1 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/project/create_project_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/project/create_project_spec.rb
@@ -1,22 +1,26 @@
+# frozen_string_literal: true
+
 module QA
-  describe 'create a new project', :smoke do
-    it 'user creates a new project' do
-      Runtime::Browser.visit(:gitlab, Page::Main::Login)
-      Page::Main::Login.act { sign_in_using_credentials }
+  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
+        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(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(
+          /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')
+        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
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 57695d2c726..2ef8de61441 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
@@ -1,106 +1,110 @@
+# frozen_string_literal: true
+
 module QA
-  describe 'user imports a GitHub repo', :orchestrated, :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'
+  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
-    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
+      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
+        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 }
+      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
+        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::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 }
+        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
+        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_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')
+      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'
+        click_link 'This is a sample issue'
 
-      expect(page).to have_content('We should populate this project with issues, pull requests and wiki pages.')
+        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.')
+        # 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')
+        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
-    end
 
-    def verify_merge_requests_import
-      Page::Menu::Side.act { click_merge_requests }
-      expect(page).to have_content('Improve README.md')
+      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'
+        click_link 'Improve README.md'
 
-      expect(page).to have_content('This improves the README file a bit.')
+        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.')
+        # 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.')
+        # 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!')
+        # 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')
+        Page::Issuable::Sidebar.perform do |issuable|
+          expect(issuable).to have_label('bug')
+          expect(issuable).to have_label('enhancement')
+        end
       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_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_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 }
+      def verify_wiki_import
+        Page::Menu::Side.act { click_wiki }
 
-      expect(page).to have_content('Welcome to the test-project wiki!')
+        expect(page).to have_content('Welcome to the test-project wiki!')
+      end
     end
   end
 end
diff --git a/qa/qa/specs/features/browser_ui/1_manage/project/view_project_activity_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/project/view_project_activity_spec.rb
index c7ce8dfdcc6..34bb6f1c197 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/project/view_project_activity_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/project/view_project_activity_spec.rb
@@ -1,20 +1,24 @@
+# frozen_string_literal: true
+
 module QA
-  describe 'activity page' do
-    it 'push creates an event in the activity page' do
-      Runtime::Browser.visit(:gitlab, Page::Main::Login)
-      Page::Main::Login.act { sign_in_using_credentials }
+  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
+        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::Menu::Side.act { go_to_activity }
 
-      Page::Project::Activity.act { go_to_push_events }
+        Page::Project::Activity.act { go_to_push_events }
 
-      expect(page).to have_content('pushed new branch master')
+        expect(page).to have_content('pushed new branch master')
+      end
     end
   end
 end
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 793e7db87cb..dd1be935220 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,18 +1,22 @@
+# frozen_string_literal: true
+
 module QA
-  describe 'creates issue', :smoke do
-    let(:issue_title) { 'issue title' }
+  context :plan, :smoke do
+    describe 'Issue creation' do
+      let(:issue_title) { 'issue title' }
 
-    it 'user creates issue' do
-      Runtime::Browser.visit(:gitlab, Page::Main::Login)
-      Page::Main::Login.act { sign_in_using_credentials }
+      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
+        Factory::Resource::Issue.fabricate! do |issue|
+          issue.title = issue_title
+        end
 
-      Page::Menu::Side.act { click_issues }
+        Page::Menu::Side.act { click_issues }
 
-      expect(page).to have_content(issue_title)
+        expect(page).to have_content(issue_title)
+      end
     end
   end
 end
diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_spec.rb
index 71e79956b85..bcf55a02a61 100644
--- a/qa/qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_spec.rb
@@ -1,31 +1,35 @@
-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/)
+# frozen_string_literal: true
 
-      Page::Issuable::Sidebar.perform do |sidebar|
-        expect(sidebar).to have_milestone(current_milestone.title)
+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
diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb
index 280978bb950..407a15800ab 100644
--- a/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb
@@ -1,21 +1,25 @@
+# frozen_string_literal: true
+
 module QA
-  describe 'Project fork' do
-    it 'can submit merge requests to upstream master' do
-      Runtime::Browser.visit(:gitlab, Page::Main::Login)
-      Page::Main::Login.act { sign_in_using_credentials }
+  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
+        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 }
+        Page::Menu::Main.perform { |main| main.sign_out }
+        Page::Main::Login.perform { |login| login.sign_in_using_credentials }
 
-      merge_request.visit!
+        merge_request.visit!
 
-      Page::MergeRequest::Show.perform { |show| show.merge! }
+        Page::MergeRequest::Show.perform { |show| show.merge! }
 
-      expect(page).to have_content('The changes were merged')
+        expect(page).to have_content('The changes were merged')
+      end
     end
   end
 end
diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb
index c36d28e4237..ddcbc94b1b1 100644
--- a/qa/qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb
@@ -1,38 +1,44 @@
-module QA
-  describe 'merge request rebase' do
-    it '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
+# frozen_string_literal: true
 
-      Factory::Repository::ProjectPush.fabricate! do |push|
-        push.project = project
-        push.file_name = "other.txt"
-        push.file_content = "New file added!"
-      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
+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
diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb
index 3ecc36a5ae1..b5b8855a35d 100644
--- a/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb
@@ -1,48 +1,52 @@
-module QA
-  describe 'merge request squash commits' do
-    it 'when squash commits is marked before merge'  do
-      Runtime::Browser.visit(:gitlab, Page::Main::Login)
-      Page::Main::Login.act { sign_in_using_credentials }
+# frozen_string_literal: true
 
-      project = Factory::Resource::Project.fabricate! do |project|
-        project.name = "squash-before-merge"
-      end
+module QA
+  context :create do
+    describe 'Merge request squashing' do
+      it 'user squashes commits while merging'  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 = "squash-before-merge"
+        end
 
-      merge_request = Factory::Resource::MergeRequest.fabricate! do |merge_request|
-        merge_request.project = project
-        merge_request.title = 'Squashing commits'
-      end
+        merge_request = Factory::Resource::MergeRequest.fabricate! do |merge_request|
+          merge_request.project = project
+          merge_request.title = 'Squashing commits'
+        end
 
-      Factory::Repository::ProjectPush.fabricate! do |push|
-        push.project = project
-        push.commit_message = 'to be squashed'
-        push.branch_name = merge_request.source_branch
-        push.new_branch = false
-        push.file_name = 'other.txt'
-        push.file_content = "Test with unicode characters ❤✓€❄"
-      end
+        Factory::Repository::ProjectPush.fabricate! do |push|
+          push.project = project
+          push.commit_message = 'to be squashed'
+          push.branch_name = merge_request.source_branch
+          push.new_branch = false
+          push.file_name = 'other.txt'
+          push.file_content = "Test with unicode characters ❤✓€❄"
+        end
 
-      merge_request.visit!
+        merge_request.visit!
 
-      expect(page).to have_text('to be squashed')
+        expect(page).to have_text('to be squashed')
 
-      Page::MergeRequest::Show.perform do |merge_request_page|
-        merge_request_page.mark_to_squash
-        merge_request_page.merge!
+        Page::MergeRequest::Show.perform do |merge_request_page|
+          merge_request_page.mark_to_squash
+          merge_request_page.merge!
 
-        merge_request.project.visit!
+          merge_request.project.visit!
 
-        Git::Repository.perform do |repository|
-          repository.uri = Page::Project::Show.act do
-            choose_repository_clone_http
-            repository_location.uri
-          end
+          Git::Repository.perform do |repository|
+            repository.uri = Page::Project::Show.act do
+              choose_repository_clone_http
+              repository_location.uri
+            end
 
-          repository.use_default_credentials
+            repository.use_default_credentials
 
-          repository.act { clone }
+            repository.act { clone }
 
-          expect(repository.commits.size).to eq 3
+            expect(repository.commits.size).to eq 3
+          end
         end
       end
     end
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/clone_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/clone_spec.rb
index 8b0613c5f78..b19bdd950fa 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/clone_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/clone_spec.rb
@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module QA
-  describe 'clone code from the repository' do
-    context 'with regular account over http' do
+  context :create do
+    describe 'Git clone over HTTP' do
       let(:location) do
         Page::Project::Show.act do
           choose_repository_clone_http
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/create_edit_delete_file_via_web_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/create_edit_delete_file_via_web_spec.rb
index 5659784cd5c..f18655442c1 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/create_edit_delete_file_via_web_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/create_edit_delete_file_via_web_spec.rb
@@ -1,54 +1,58 @@
-module QA
-  describe 'File Functionality', :core do
-    it 'lets a user create, edit and delete a file via WebUI' do
-      Runtime::Browser.visit(:gitlab, Page::Main::Login)
-      Page::Main::Login.act { sign_in_using_credentials }
-
-      # Create
-      file_name = 'QA Test - File name'
-      file_content = 'QA Test - File content'
-      commit_message_for_create = 'QA Test - Create new file'
-
-      Factory::Resource::File.fabricate! do |file|
-        file.name = file_name
-        file.content = file_content
-        file.commit_message = commit_message_for_create
-      end
-
-      expect(page).to have_content('The file has been successfully created.')
-      expect(page).to have_content(file_name)
-      expect(page).to have_content(file_content)
-      expect(page).to have_content(commit_message_for_create)
+# frozen_string_literal: true
 
-      # Edit
-      updated_file_content = 'QA Test - Updated file content'
-      commit_message_for_update = 'QA Test - Update file'
-
-      Page::File::Show.act { click_edit }
-
-      Page::File::Form.act do
-        remove_content
-        add_content(updated_file_content)
-        add_commit_message(commit_message_for_update)
-        commit_changes
-      end
-
-      expect(page).to have_content('Your changes have been successfully committed.')
-      expect(page).to have_content(updated_file_content)
-      expect(page).to have_content(commit_message_for_update)
-
-      # Delete
-      commit_message_for_delete = 'QA Test - Delete file'
-
-      Page::File::Show.act do
-        click_delete
-        add_commit_message(commit_message_for_delete)
-        click_delete_file
+module QA
+  context :create, :core do
+    describe 'Files management' do
+      it 'user creates, edits and deletes a file via the Web' do
+        Runtime::Browser.visit(:gitlab, Page::Main::Login)
+        Page::Main::Login.act { sign_in_using_credentials }
+
+        # Create
+        file_name = 'QA Test - File name'
+        file_content = 'QA Test - File content'
+        commit_message_for_create = 'QA Test - Create new file'
+
+        Factory::Resource::File.fabricate! do |file|
+          file.name = file_name
+          file.content = file_content
+          file.commit_message = commit_message_for_create
+        end
+
+        expect(page).to have_content('The file has been successfully created.')
+        expect(page).to have_content(file_name)
+        expect(page).to have_content(file_content)
+        expect(page).to have_content(commit_message_for_create)
+
+        # Edit
+        updated_file_content = 'QA Test - Updated file content'
+        commit_message_for_update = 'QA Test - Update file'
+
+        Page::File::Show.act { click_edit }
+
+        Page::File::Form.act do
+          remove_content
+          add_content(updated_file_content)
+          add_commit_message(commit_message_for_update)
+          commit_changes
+        end
+
+        expect(page).to have_content('Your changes have been successfully committed.')
+        expect(page).to have_content(updated_file_content)
+        expect(page).to have_content(commit_message_for_update)
+
+        # Delete
+        commit_message_for_delete = 'QA Test - Delete file'
+
+        Page::File::Show.act do
+          click_delete
+          add_commit_message(commit_message_for_delete)
+          click_delete_file
+        end
+
+        expect(page).to have_content('The file has been successfully deleted.')
+        expect(page).to have_content(commit_message_for_delete)
+        expect(page).to have_no_content(file_name)
       end
-
-      expect(page).to have_content('The file has been successfully deleted.')
-      expect(page).to have_content(commit_message_for_delete)
-      expect(page).to have_no_content(file_name)
     end
   end
 end
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_spec.rb
index 1e89942e932..40dfd138a1b 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_spec.rb
@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module QA
-  describe 'push code to repository' do
-    context 'with regular account over http' do
+  context :create do
+    describe 'Git push over HTTP' do
       it 'user pushes code to the repository'  do
         Runtime::Browser.visit(:gitlab, Page::Main::Login)
         Page::Main::Login.act { sign_in_using_credentials }
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/push_protected_branch_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/push_protected_branch_spec.rb
index aa23145478d..1d9cc33080d 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/push_protected_branch_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/push_protected_branch_spec.rb
@@ -1,65 +1,69 @@
+# frozen_string_literal: true
+
 module QA
-  describe 'branch protection support' do
-    let(:branch_name) { 'protected-branch' }
-    let(:commit_message) { 'Protected push commit message' }
-    let(:project) do
-      Factory::Resource::Project.fabricate! do |resource|
-        resource.name = 'protected-branch-project'
+  context :create do
+    describe 'Protected branch support' do
+      let(:branch_name) { 'protected-branch' }
+      let(:commit_message) { 'Protected push commit message' }
+      let(:project) do
+        Factory::Resource::Project.fabricate! do |resource|
+          resource.name = 'protected-branch-project'
+        end
       end
-    end
 
-    before do
-      Runtime::Browser.visit(:gitlab, Page::Main::Login)
-      Page::Main::Login.act { sign_in_using_credentials }
-    end
+      before do
+        Runtime::Browser.visit(:gitlab, Page::Main::Login)
+        Page::Main::Login.act { sign_in_using_credentials }
+      end
 
-    after do
-      # We need to clear localStorage because we're using it for the dropdown,
-      # and capybara doesn't do this for us.
-      # https://github.com/teamcapybara/capybara/issues/1702
-      Capybara.execute_script 'localStorage.clear()'
-    end
+      after do
+        # We need to clear localStorage because we're using it for the dropdown,
+        # and capybara doesn't do this for us.
+        # https://github.com/teamcapybara/capybara/issues/1702
+        Capybara.execute_script 'localStorage.clear()'
+      end
 
-    context 'when developers and maintainers are allowed to push to a protected branch' do
-      it 'user with push rights successfully pushes to the protected branch' do
-        create_protected_branch(allow_to_push: true)
+      context 'when developers and maintainers are allowed to push to a protected branch' do
+        it 'user with push rights successfully pushes to the protected branch' do
+          create_protected_branch(allow_to_push: true)
 
-        push = push_new_file(branch_name)
+          push = push_new_file(branch_name)
 
-        expect(push.output).to match(/remote: To create a merge request for protected-branch, visit/)
+          expect(push.output).to match(/remote: To create a merge request for protected-branch, visit/)
+        end
       end
-    end
 
-    context 'when developers and maintainers are not allowed to push to a protected branch' do
-      it 'user without push rights fails to push to the protected branch' do
-        create_protected_branch(allow_to_push: false)
+      context 'when developers and maintainers are not allowed to push to a protected branch' do
+        it 'user without push rights fails to push to the protected branch' do
+          create_protected_branch(allow_to_push: false)
 
-        push = push_new_file(branch_name)
+          push = push_new_file(branch_name)
 
-        expect(push.output)
+          expect(push.output)
           .to match(/remote\: GitLab\: You are not allowed to push code to protected branches on this project/)
-        expect(push.output)
+          expect(push.output)
           .to match(/\[remote rejected\] #{branch_name} -> #{branch_name} \(pre-receive hook declined\)/)
+        end
       end
-    end
 
-    def create_protected_branch(allow_to_push:)
-      Factory::Resource::Branch.fabricate! do |resource|
-        resource.branch_name = branch_name
-        resource.project = project
-        resource.allow_to_push = allow_to_push
-        resource.protected = true
+      def create_protected_branch(allow_to_push:)
+        Factory::Resource::Branch.fabricate! do |resource|
+          resource.branch_name = branch_name
+          resource.project = project
+          resource.allow_to_push = allow_to_push
+          resource.protected = true
+        end
       end
-    end
 
-    def push_new_file(branch)
-      Factory::Repository::ProjectPush.fabricate! do |resource|
-        resource.project = project
-        resource.file_name = 'new_file.md'
-        resource.file_content = '# This is a new file'
-        resource.commit_message = 'Add new_file.md'
-        resource.branch_name = branch_name
-        resource.new_branch = false
+      def push_new_file(branch)
+        Factory::Repository::ProjectPush.fabricate! do |resource|
+          resource.project = project
+          resource.file_name = 'new_file.md'
+          resource.file_content = '# This is a new file'
+          resource.commit_message = 'Add new_file.md'
+          resource.branch_name = branch_name
+          resource.new_branch = false
+        end
       end
     end
   end
diff --git a/qa/qa/specs/features/browser_ui/3_create/wiki/create_edit_clone_push_wiki_spec.rb b/qa/qa/specs/features/browser_ui/3_create/wiki/create_edit_clone_push_wiki_spec.rb
index 9af2dbd1264..8009b9e8609 100644
--- a/qa/qa/specs/features/browser_ui/3_create/wiki/create_edit_clone_push_wiki_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/wiki/create_edit_clone_push_wiki_spec.rb
@@ -1,45 +1,49 @@
-module QA
-  describe 'Wiki Functionality' do
-    def login
-      Runtime::Browser.visit(:gitlab, Page::Main::Login)
-      Page::Main::Login.act { sign_in_using_credentials }
-    end
+# frozen_string_literal: true
 
-    def validate_content(content)
-      expect(page).to have_content('Wiki was successfully updated')
-      expect(page).to have_content(/#{content}/)
-    end
+module QA
+  context :create do
+    describe 'Wiki management' do
+      def login
+        Runtime::Browser.visit(:gitlab, Page::Main::Login)
+        Page::Main::Login.act { sign_in_using_credentials }
+      end
 
-    before do
-      login
-    end
+      def validate_content(content)
+        expect(page).to have_content('Wiki was successfully updated')
+        expect(page).to have_content(/#{content}/)
+      end
 
-    it 'User creates, edits, clones, and pushes to the wiki' do
-      wiki = Factory::Resource::Wiki.fabricate! do |resource|
-        resource.title = 'Home'
-        resource.content = '# My First Wiki Content'
-        resource.message = 'Update home'
+      before do
+        login
       end
 
-      validate_content('My First Wiki Content')
+      it 'user creates, edits, clones, and pushes to the wiki' do
+        wiki = Factory::Resource::Wiki.fabricate! do |resource|
+          resource.title = 'Home'
+          resource.content = '# My First Wiki Content'
+          resource.message = 'Update home'
+        end
 
-      Page::Project::Wiki::Edit.act { go_to_edit_page }
-      Page::Project::Wiki::New.perform do |page|
-        page.set_content("My Second Wiki Content")
-        page.save_changes
-      end
+        validate_content('My First Wiki Content')
 
-      validate_content('My Second Wiki Content')
+        Page::Project::Wiki::Edit.act { go_to_edit_page }
+        Page::Project::Wiki::New.perform do |page|
+          page.set_content("My Second Wiki Content")
+          page.save_changes
+        end
 
-      Factory::Repository::WikiPush.fabricate! do |push|
-        push.wiki = wiki
-        push.file_name = 'Home.md'
-        push.file_content = '# My Third Wiki Content'
-        push.commit_message = 'Update Home.md'
-      end
-      Page::Menu::Side.act { click_wiki }
+        validate_content('My Second Wiki Content')
 
-      expect(page).to have_content('My Third Wiki Content')
+        Factory::Repository::WikiPush.fabricate! do |push|
+          push.wiki = wiki
+          push.file_name = 'Home.md'
+          push.file_content = '# My Third Wiki Content'
+          push.commit_message = 'Update Home.md'
+        end
+        Page::Menu::Side.act { click_wiki }
+
+        expect(page).to have_content('My Third Wiki Content')
+      end
     end
   end
 end
diff --git a/qa/qa/specs/features/browser_ui/4_verify/pipeline/create_and_process_pipeline_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/pipeline/create_and_process_pipeline_spec.rb
index 6c6b4e80626..cdfe9b90e15 100644
--- a/qa/qa/specs/features/browser_ui/4_verify/pipeline/create_and_process_pipeline_spec.rb
+++ b/qa/qa/specs/features/browser_ui/4_verify/pipeline/create_and_process_pipeline_spec.rb
@@ -1,101 +1,86 @@
-module QA
-  describe 'CI/CD Pipelines', :orchestrated, :docker do
-    let(:executor) { "qa-runner-#{Time.now.to_i}" }
-
-    after do
-      Service::Runner.new(executor).remove!
-    end
+# frozen_string_literal: true
 
-    it 'user registers a new specific runner' do
-      Runtime::Browser.visit(:gitlab, Page::Main::Login)
-      Page::Main::Login.act { sign_in_using_credentials }
+module QA
+  context :verify, :orchestrated, :docker do
+    describe 'Pipeline creation and processing' do
+      let(:executor) { "qa-runner-#{Time.now.to_i}" }
 
-      Factory::Resource::Runner.fabricate! do |runner|
-        runner.name = executor
+      after do
+        Service::Runner.new(executor).remove!
       end
 
-      Page::Project::Settings::CICD.perform do |settings|
-        sleep 5 # Runner should register within 5 seconds
-        settings.refresh
+      it 'users creates a pipeline which gets processed' do
+        Runtime::Browser.visit(:gitlab, Page::Main::Login)
+        Page::Main::Login.act { sign_in_using_credentials }
 
-        settings.expand_runners_settings do |page|
-          expect(page).to have_content(executor)
-          expect(page).to have_online_runner
+        project = Factory::Resource::Project.fabricate! do |project|
+          project.name = 'project-with-pipelines'
+          project.description = 'Project with CI/CD Pipelines.'
         end
-      end
-    end
-
-    it 'users creates a new pipeline' 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 = 'project-with-pipelines'
-        project.description = 'Project with CI/CD Pipelines.'
-      end
-
-      Factory::Resource::Runner.fabricate! do |runner|
-        runner.project = project
-        runner.name = executor
-        runner.tags = %w[qa test]
-      end
+        Factory::Resource::Runner.fabricate! do |runner|
+          runner.project = project
+          runner.name = executor
+          runner.tags = %w[qa test]
+        end
 
-      Factory::Repository::ProjectPush.fabricate! do |push|
-        push.project = project
-        push.file_name = '.gitlab-ci.yml'
-        push.commit_message = 'Add .gitlab-ci.yml'
-        push.file_content = <<~EOF
-          test-success:
-            tags:
-              - qa
-              - test
-            script: echo 'OK'
-
-          test-failure:
-            tags:
-              - qa
-              - test
-            script:
-              - echo 'FAILURE'
-              - exit 1
-
-          test-tags:
-            tags:
-              - qa
-              - docker
-            script: echo 'NOOP'
-
-          test-artifacts:
-            tags:
-              - qa
-              - test
-            script: mkdir my-artifacts; echo "CONTENTS" > my-artifacts/artifact.txt
-            artifacts:
-              paths:
+        Factory::Repository::ProjectPush.fabricate! do |push|
+          push.project = project
+          push.file_name = '.gitlab-ci.yml'
+          push.commit_message = 'Add .gitlab-ci.yml'
+          push.file_content = <<~EOF
+            test-success:
+              tags:
+                - qa
+                - test
+              script: echo 'OK'
+
+            test-failure:
+              tags:
+                - qa
+                - test
+              script:
+                - echo 'FAILURE'
+                - exit 1
+
+            test-tags:
+              tags:
+                - qa
+                - docker
+              script: echo 'NOOP'
+
+            test-artifacts:
+              tags:
+                - qa
+                - test
+              script: mkdir my-artifacts; echo "CONTENTS" > my-artifacts/artifact.txt
+              artifacts:
+                paths:
                 - my-artifacts/
-        EOF
-      end
+          EOF
+        end
 
-      Page::Project::Show.act { wait_for_push }
+        Page::Project::Show.act { wait_for_push }
 
-      expect(page).to have_content('Add .gitlab-ci.yml')
+        expect(page).to have_content('Add .gitlab-ci.yml')
 
-      Page::Menu::Side.act { click_ci_cd_pipelines }
+        Page::Menu::Side.act { click_ci_cd_pipelines }
 
-      expect(page).to have_content('All 1')
-      expect(page).to have_content('Add .gitlab-ci.yml')
+        expect(page).to have_content('All 1')
+        expect(page).to have_content('Add .gitlab-ci.yml')
 
-      puts 'Waiting for the runner to process the pipeline'
-      sleep 15 # Runner should process all jobs within 15 seconds.
+        puts 'Waiting for the runner to process the pipeline'
+        sleep 15 # Runner should process all jobs within 15 seconds.
 
-      Page::Project::Pipeline::Index.act { go_to_latest_pipeline }
+        Page::Project::Pipeline::Index.act { go_to_latest_pipeline }
 
-      Page::Project::Pipeline::Show.perform do |pipeline|
-        expect(pipeline).to be_running
-        expect(pipeline).to have_build('test-success', status: :success)
-        expect(pipeline).to have_build('test-failure', status: :failed)
-        expect(pipeline).to have_build('test-tags', status: :pending)
-        expect(pipeline).to have_build('test-artifacts', status: :success)
+        Page::Project::Pipeline::Show.perform do |pipeline|
+          expect(pipeline).to be_running
+          expect(pipeline).to have_build('test-success', status: :success)
+          expect(pipeline).to have_build('test-failure', status: :failed)
+          expect(pipeline).to have_build('test-tags', status: :pending)
+          expect(pipeline).to have_build('test-artifacts', status: :success)
+        end
       end
     end
   end
diff --git a/qa/qa/specs/features/browser_ui/4_verify/secret_variable/add_secret_variable_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/secret_variable/add_secret_variable_spec.rb
index 04d9fe488e2..08a87df5837 100644
--- a/qa/qa/specs/features/browser_ui/4_verify/secret_variable/add_secret_variable_spec.rb
+++ b/qa/qa/specs/features/browser_ui/4_verify/secret_variable/add_secret_variable_spec.rb
@@ -1,22 +1,26 @@
+# frozen_string_literal: true
+
 module QA
-  describe 'secret variables support' do
-    it 'user adds a secret variable' do
-      Runtime::Browser.visit(:gitlab, Page::Main::Login)
-      Page::Main::Login.act { sign_in_using_credentials }
+  context :verify do
+    describe 'Secret variable support' do
+      it 'user adds a secret variable' do
+        Runtime::Browser.visit(:gitlab, Page::Main::Login)
+        Page::Main::Login.act { sign_in_using_credentials }
 
-      Factory::Resource::SecretVariable.fabricate! do |resource|
-        resource.key = 'VARIABLE_KEY'
-        resource.value = 'some secret variable'
-      end
+        Factory::Resource::SecretVariable.fabricate! do |resource|
+          resource.key = 'VARIABLE_KEY'
+          resource.value = 'some secret variable'
+        end
 
-      Page::Project::Settings::CICD.perform do |settings|
-        settings.expand_secret_variables do |page|
-          expect(page).to have_field(with: 'VARIABLE_KEY')
-          expect(page).not_to have_field(with: 'some secret variable')
+        Page::Project::Settings::CICD.perform do |settings|
+          settings.expand_secret_variables do |page|
+            expect(page).to have_field(with: 'VARIABLE_KEY')
+            expect(page).not_to have_field(with: 'some secret variable')
 
-          page.reveal_variables
+            page.reveal_variables
 
-          expect(page).to have_field(with: 'some secret variable')
+            expect(page).to have_field(with: 'some secret variable')
+          end
         end
       end
     end
diff --git a/qa/qa/specs/features/browser_ui/6_release/deploy_key/add_deploy_key_spec.rb b/qa/qa/specs/features/browser_ui/6_release/deploy_key/add_deploy_key_spec.rb
index 24f9f4c77f8..17dfa887434 100644
--- a/qa/qa/specs/features/browser_ui/6_release/deploy_key/add_deploy_key_spec.rb
+++ b/qa/qa/specs/features/browser_ui/6_release/deploy_key/add_deploy_key_spec.rb
@@ -1,19 +1,23 @@
+# frozen_string_literal: true
+
 module QA
-  describe 'deploy keys support' do
-    it 'user adds a deploy key' do
-      Runtime::Browser.visit(:gitlab, Page::Main::Login)
-      Page::Main::Login.act { sign_in_using_credentials }
+  context :release do
+    describe 'Deploy key creation' do
+      it 'user adds a deploy key' do
+        Runtime::Browser.visit(:gitlab, Page::Main::Login)
+        Page::Main::Login.act { sign_in_using_credentials }
 
-      key = Runtime::Key::RSA.new
-      deploy_key_title = 'deploy key title'
-      deploy_key_value = key.public_key
+        key = Runtime::Key::RSA.new
+        deploy_key_title = 'deploy key title'
+        deploy_key_value = key.public_key
 
-      deploy_key = Factory::Resource::DeployKey.fabricate! do |resource|
-        resource.title = deploy_key_title
-        resource.key = deploy_key_value
-      end
+        deploy_key = Factory::Resource::DeployKey.fabricate! do |resource|
+          resource.title = deploy_key_title
+          resource.key = deploy_key_value
+        end
 
-      expect(deploy_key.fingerprint).to eq(key.fingerprint)
+        expect(deploy_key.fingerprint).to eq(key.fingerprint)
+      end
     end
   end
 end
diff --git a/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb b/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb
index 1d099508c24..8352d13b06d 100644
--- a/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb
+++ b/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb
@@ -1,64 +1,67 @@
+# frozen_string_literal: true
+
 require 'digest/sha1'
 
 module QA
-  describe 'cloning code using a deploy key', :docker do
-    def login
-      Runtime::Browser.visit(:gitlab, Page::Main::Login)
-      Page::Main::Login.act { sign_in_using_credentials }
-    end
+  context :release, :docker do
+    describe 'Git clone using a deploy key' do
+      def login
+        Runtime::Browser.visit(:gitlab, Page::Main::Login)
+        Page::Main::Login.act { sign_in_using_credentials }
+      end
 
-    before(:all) do
-      login
+      before(:all) do
+        login
 
-      @runner_name = "qa-runner-#{Time.now.to_i}"
+        @runner_name = "qa-runner-#{Time.now.to_i}"
 
-      @project = Factory::Resource::Project.fabricate! do |resource|
-        resource.name = 'deploy-key-clone-project'
-      end
+        @project = Factory::Resource::Project.fabricate! do |resource|
+          resource.name = 'deploy-key-clone-project'
+        end
 
-      @repository_location = @project.repository_ssh_location
+        @repository_location = @project.repository_ssh_location
 
-      Factory::Resource::Runner.fabricate! do |resource|
-        resource.project = @project
-        resource.name = @runner_name
-        resource.tags = %w[qa docker]
-        resource.image = 'gitlab/gitlab-runner:ubuntu'
-      end
+        Factory::Resource::Runner.fabricate! do |resource|
+          resource.project = @project
+          resource.name = @runner_name
+          resource.tags = %w[qa docker]
+          resource.image = 'gitlab/gitlab-runner:ubuntu'
+        end
 
-      Page::Menu::Main.act { sign_out }
-    end
+        Page::Menu::Main.act { sign_out }
+      end
 
-    after(:all) do
-      Service::Runner.new(@runner_name).remove!
-    end
+      after(:all) do
+        Service::Runner.new(@runner_name).remove!
+      end
 
-    keys = [
-      [Runtime::Key::RSA, 8192],
-      [Runtime::Key::ECDSA, 521],
-      [Runtime::Key::ED25519]
-    ]
+      keys = [
+        [Runtime::Key::RSA, 8192],
+        [Runtime::Key::ECDSA, 521],
+        [Runtime::Key::ED25519]
+      ]
 
-    keys.each do |(key_class, bits)|
-      it "user sets up a deploy key with #{key_class}(#{bits}) to clone code using pipelines" do
-        key = key_class.new(*bits)
+      keys.each do |(key_class, bits)|
+        it "user sets up a deploy key with #{key_class}(#{bits}) to clone code using pipelines" do
+          key = key_class.new(*bits)
 
-        login
+          login
 
-        Factory::Resource::DeployKey.fabricate! do |resource|
-          resource.project = @project
-          resource.title = "deploy key #{key.name}(#{key.bits})"
-          resource.key = key.public_key
-        end
+          Factory::Resource::DeployKey.fabricate! do |resource|
+            resource.project = @project
+            resource.title = "deploy key #{key.name}(#{key.bits})"
+            resource.key = key.public_key
+          end
 
-        deploy_key_name = "DEPLOY_KEY_#{key.name}_#{key.bits}"
+          deploy_key_name = "DEPLOY_KEY_#{key.name}_#{key.bits}"
 
-        Factory::Resource::SecretVariable.fabricate! do |resource|
-          resource.project = @project
-          resource.key = deploy_key_name
-          resource.value = key.private_key
-        end
+          Factory::Resource::SecretVariable.fabricate! do |resource|
+            resource.project = @project
+            resource.key = deploy_key_name
+            resource.value = key.private_key
+          end
 
-        gitlab_ci = <<~YAML
+          gitlab_ci = <<~YAML
           cat-config:
             script:
               - mkdir -p ~/.ssh
@@ -73,31 +76,32 @@ module QA
             tags:
               - qa
               - docker
-        YAML
+          YAML
+
+          Factory::Repository::ProjectPush.fabricate! do |resource|
+            resource.project = @project
+            resource.file_name = '.gitlab-ci.yml'
+            resource.commit_message = 'Add .gitlab-ci.yml'
+            resource.file_content = gitlab_ci
+            resource.branch_name = deploy_key_name
+            resource.new_branch = true
+          end
 
-        Factory::Repository::ProjectPush.fabricate! do |resource|
-          resource.project = @project
-          resource.file_name = '.gitlab-ci.yml'
-          resource.commit_message = 'Add .gitlab-ci.yml'
-          resource.file_content = gitlab_ci
-          resource.branch_name = deploy_key_name
-          resource.new_branch = true
-        end
+          sha1sum = Digest::SHA1.hexdigest(gitlab_ci)
 
-        sha1sum = Digest::SHA1.hexdigest(gitlab_ci)
+          Page::Project::Show.act { wait_for_push }
+          Page::Menu::Side.act { click_ci_cd_pipelines }
+          Page::Project::Pipeline::Index.act { go_to_latest_pipeline }
+          Page::Project::Pipeline::Show.act { go_to_first_job }
 
-        Page::Project::Show.act { wait_for_push }
-        Page::Menu::Side.act { click_ci_cd_pipelines }
-        Page::Project::Pipeline::Index.act { go_to_latest_pipeline }
-        Page::Project::Pipeline::Show.act { go_to_first_job }
+          Page::Project::Job::Show.perform do |job|
+            job.wait(reload: false) do
+              job.completed? && !job.trace_loading?
+            end
 
-        Page::Project::Job::Show.perform do |job|
-          job.wait(reload: false) do
-            job.completed? && !job.trace_loading?
+            expect(job.passed?).to be_truthy, "Job status did not become \"passed\"."
+            expect(job.output).to include(sha1sum)
           end
-
-          expect(job.passed?).to be_truthy, "Job status did not become \"passed\"."
-          expect(job.output).to include(sha1sum)
         end
       end
     end
diff --git a/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb b/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb
index 248669b6046..dd24e8ffba5 100644
--- a/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb
+++ b/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb
@@ -1,63 +1,67 @@
+# frozen_string_literal: true
+
 require 'pathname'
 
 module QA
-  describe 'Auto Devops', :orchestrated, :kubernetes do
-    after do
-      @cluster&.remove!
-    end
+  context :configure, :orchestrated, :kubernetes do
+    describe 'Auto DevOps support' do
+      after do
+        @cluster&.remove!
+      end
 
-    it 'user creates a new project and runs auto devops' do
-      Runtime::Browser.visit(:gitlab, Page::Main::Login)
-      Page::Main::Login.act { sign_in_using_credentials }
+      it 'user creates a new project and runs auto devops' do
+        Runtime::Browser.visit(:gitlab, Page::Main::Login)
+        Page::Main::Login.act { sign_in_using_credentials }
 
-      project = Factory::Resource::Project.fabricate! do |p|
-        p.name = 'project-with-autodevops'
-        p.description = 'Project with Auto Devops'
-      end
+        project = Factory::Resource::Project.fabricate! do |p|
+          p.name = 'project-with-autodevops'
+          p.description = 'Project with Auto Devops'
+        end
 
-      # Disable code_quality check in Auto DevOps pipeline as it takes
-      # too long and times out the test
-      Factory::Resource::SecretVariable.fabricate! do |resource|
-        resource.key = 'CODE_QUALITY_DISABLED'
-        resource.value = '1'
-      end
+        # Disable code_quality check in Auto DevOps pipeline as it takes
+        # too long and times out the test
+        Factory::Resource::SecretVariable.fabricate! do |resource|
+          resource.key = 'CODE_QUALITY_DISABLED'
+          resource.value = '1'
+        end
 
-      # Create Auto Devops compatible repo
-      Factory::Repository::ProjectPush.fabricate! do |push|
-        push.project = project
-        push.directory = Pathname
-          .new(__dir__)
-          .join('../../../fixtures/auto_devops_rack')
-        push.commit_message = 'Create Auto DevOps compatible rack application'
-      end
+        # Create Auto Devops compatible repo
+        Factory::Repository::ProjectPush.fabricate! do |push|
+          push.project = project
+          push.directory = Pathname
+            .new(__dir__)
+            .join('../../../fixtures/auto_devops_rack')
+          push.commit_message = 'Create Auto DevOps compatible rack application'
+        end
 
-      Page::Project::Show.act { wait_for_push }
+        Page::Project::Show.act { wait_for_push }
 
-      # Create and connect K8s cluster
-      @cluster = Service::KubernetesCluster.new.create!
-      kubernetes_cluster = Factory::Resource::KubernetesCluster.fabricate! do |cluster|
-        cluster.project = project
-        cluster.cluster = @cluster
-        cluster.install_helm_tiller = true
-        cluster.install_ingress = true
-        cluster.install_prometheus = true
-        cluster.install_runner = true
-      end
+        # Create and connect K8s cluster
+        @cluster = Service::KubernetesCluster.new.create!
+        kubernetes_cluster = Factory::Resource::KubernetesCluster.fabricate! do |cluster|
+          cluster.project = project
+          cluster.cluster = @cluster
+          cluster.install_helm_tiller = true
+          cluster.install_ingress = true
+          cluster.install_prometheus = true
+          cluster.install_runner = true
+        end
 
-      project.visit!
-      Page::Menu::Side.act { click_ci_cd_settings }
-      Page::Project::Settings::CICD.perform do |p|
-        p.enable_auto_devops_with_domain("#{kubernetes_cluster.ingress_ip}.nip.io")
-      end
+        project.visit!
+        Page::Menu::Side.act { click_ci_cd_settings }
+        Page::Project::Settings::CICD.perform do |p|
+          p.enable_auto_devops_with_domain("#{kubernetes_cluster.ingress_ip}.nip.io")
+        end
 
-      project.visit!
-      Page::Menu::Side.act { click_ci_cd_pipelines }
-      Page::Project::Pipeline::Index.act { go_to_latest_pipeline }
+        project.visit!
+        Page::Menu::Side.act { click_ci_cd_pipelines }
+        Page::Project::Pipeline::Index.act { go_to_latest_pipeline }
 
-      Page::Project::Pipeline::Show.perform do |pipeline|
-        expect(pipeline).to have_build('build', status: :success, wait: 600)
-        expect(pipeline).to have_build('test', status: :success, wait: 600)
-        expect(pipeline).to have_build('production', status: :success, wait: 1200)
+        Page::Project::Pipeline::Show.perform do |pipeline|
+          expect(pipeline).to have_build('build', status: :success, wait: 600)
+          expect(pipeline).to have_build('test', status: :success, wait: 600)
+          expect(pipeline).to have_build('production', status: :success, wait: 1200)
+        end
       end
     end
   end
diff --git a/qa/qa/specs/features/browser_ui/7_configure/mattermost/create_group_with_mattermost_team_spec.rb b/qa/qa/specs/features/browser_ui/7_configure/mattermost/create_group_with_mattermost_team_spec.rb
index 097e1713aef..6ffdc55538a 100644
--- a/qa/qa/specs/features/browser_ui/7_configure/mattermost/create_group_with_mattermost_team_spec.rb
+++ b/qa/qa/specs/features/browser_ui/7_configure/mattermost/create_group_with_mattermost_team_spec.rb
@@ -1,16 +1,20 @@
+# frozen_string_literal: true
+
 module QA
-  describe 'create a new group', :orchestrated, :mattermost do
-    it 'creating a group with a mattermost team' do
-      Runtime::Browser.visit(:gitlab, Page::Main::Login)
-      Page::Main::Login.act { sign_in_using_credentials }
-      Page::Menu::Main.act { go_to_groups }
+  context :configure, :orchestrated, :mattermost do
+    describe 'Mattermost support' do
+      it 'user creates a group with a mattermost team' do
+        Runtime::Browser.visit(:gitlab, Page::Main::Login)
+        Page::Main::Login.act { sign_in_using_credentials }
+        Page::Menu::Main.act { go_to_groups }
 
-      Page::Dashboard::Groups.perform do |page|
-        page.go_to_new_group
+        Page::Dashboard::Groups.perform do |page|
+          page.go_to_new_group
 
-        expect(page).to have_content(
-          /Create a Mattermost team for this group/
-        )
+          expect(page).to have_content(
+            /Create a Mattermost team for this group/
+          )
+        end
       end
     end
   end
diff --git a/qa/qa/specs/features/login/basic_spec.rb b/qa/qa/specs/features/login/basic_spec.rb
deleted file mode 100644
index f866466c7bf..00000000000
--- a/qa/qa/specs/features/login/basic_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-module QA
-  describe 'basic user login', :smoke 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