Explicitly tag :core and :mattermost scenarios

It's adding additional potentially confusing behaviour to derive test
tagging from the file path, as it's not immediately apparent where that
lives when considering the tests in isolation.  Instead, just explicitly
tag.

* Remove the tagging of examples based on :file_path
* Explicitly tags scenarios as :core, or :mattermost

6 files changed, 7 insertions, 15 deletions

diff --git a/qa/qa/specs/config.rb b/qa/qa/specs/config.rb
index 09dcd3d3a23..7d873199d3b 100644
--- a/qa/qa/specs/config.rb
+++ b/qa/qa/specs/config.rb
@@ -33,14 +33,6 @@ module QA
             mocks.verify_partial_doubles = true
           end
 
-          config.define_derived_metadata(file_path: %r{/specs/features/(?!mattermost/)}) do |metadata|
-            metadata[:core] = true
-          end
-
-          config.define_derived_metadata(file_path: %r{/specs/features/mattermost/}) do |metadata|
-            metadata[:mattermost] = true
-          end
-
           config.order = :random
           Kernel.srand config.seed
           config.formatter = :documentation
diff --git a/qa/qa/specs/features/login/standard_spec.rb b/qa/qa/specs/features/login/standard_spec.rb
index 8e1ae6efa47..d674ecc8fa8 100644
--- a/qa/qa/specs/features/login/standard_spec.rb
+++ b/qa/qa/specs/features/login/standard_spec.rb
@@ -1,6 +1,6 @@
 module QA
   feature 'standard root login' do
-    scenario 'user logs in using credentials' do
+    scenario 'user logs in using credentials', :core do
       Page::Main::Entry.act { sign_in_using_credentials }
 
       # TODO, since `Signed in successfully` message was removed
diff --git a/qa/qa/specs/features/mattermost/group_create_spec.rb b/qa/qa/specs/features/mattermost/group_create_spec.rb
index f05eee2337b..965775d4846 100644
--- a/qa/qa/specs/features/mattermost/group_create_spec.rb
+++ b/qa/qa/specs/features/mattermost/group_create_spec.rb
@@ -1,6 +1,6 @@
 module QA
   feature 'create a new group' do
-    scenario 'creating a group with a mattermost team' do
+    scenario 'creating a group with a mattermost team', :mattermost do
       Page::Main::Entry.act { sign_in_using_credentials }
       Page::Main::Menu.act { go_to_groups }
 
diff --git a/qa/qa/specs/features/project/create_spec.rb b/qa/qa/specs/features/project/create_spec.rb
index 610492b9717..1328fe42be4 100644
--- a/qa/qa/specs/features/project/create_spec.rb
+++ b/qa/qa/specs/features/project/create_spec.rb
@@ -1,6 +1,6 @@
 module QA
   feature 'create a new project' do
-    scenario 'user creates a new project' do
+    scenario 'user creates a new project', :core do
       Page::Main::Entry.act { sign_in_using_credentials }
 
       Scenario::Gitlab::Project::Create.perform do |project|
diff --git a/qa/qa/specs/features/repository/clone_spec.rb b/qa/qa/specs/features/repository/clone_spec.rb
index 521bd955857..1c7202d3035 100644
--- a/qa/qa/specs/features/repository/clone_spec.rb
+++ b/qa/qa/specs/features/repository/clone_spec.rb
@@ -1,6 +1,6 @@
 module QA
   feature 'clone code from the repository' do
-    context 'with regular account over http' do
+    context 'with regular account over http', :core do
       given(:location) do
         Page::Project::Show.act do
           choose_repository_clone_http
@@ -30,7 +30,7 @@ module QA
         end
       end
 
-      scenario 'user performs a deep clone' do
+      scenario 'user performs a deep clone', :core do
         Git::Repository.perform do |repository|
           repository.location = location
           repository.use_default_credentials
@@ -41,7 +41,7 @@ module QA
         end
       end
 
-      scenario 'user performs a shallow clone' do
+      scenario 'user performs a shallow clone', :core do
         Git::Repository.perform do |repository|
           repository.location = location
           repository.use_default_credentials
diff --git a/qa/qa/specs/features/repository/push_spec.rb b/qa/qa/specs/features/repository/push_spec.rb
index 5fe45d63d37..c21068dc6cd 100644
--- a/qa/qa/specs/features/repository/push_spec.rb
+++ b/qa/qa/specs/features/repository/push_spec.rb
@@ -1,7 +1,7 @@
 module QA
   feature 'push code to repository' do
     context 'with regular account over http' do
-      scenario 'user pushes code to the repository' do
+      scenario 'user pushes code to the repository', :core do
         Page::Main::Entry.act { sign_in_using_credentials }
 
         Scenario::Gitlab::Project::Create.perform do |scenario|