From a9f2c7aeaf34ed884083eabc0661046b9a889b06 Mon Sep 17 00:00:00 2001
From: Prapti <praptishrestha@gmail.com>
Date: Mon, 8 Jun 2020 17:17:21 -0700
Subject: [PATCH 1/4] Adding label for PR smoke tests

---
 e2e/cypress/integration/messaging/message_spec.js            | 2 +-
 .../integration/plugins/marketplace/marketplace_spec.js      | 1 +
 e2e/cypress/integration/search/search_user_post_spec.js      | 2 +-
 e2e/cypress/integration/system_console/cluster_spec.js       | 5 +++++
 e2e/cypress/integration/team_settings/create_a_team_spec.js  | 2 +-
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/e2e/cypress/integration/messaging/message_spec.js b/e2e/cypress/integration/messaging/message_spec.js
index ca9489aedd90..98fb1ae8039b 100644
--- a/e2e/cypress/integration/messaging/message_spec.js
+++ b/e2e/cypress/integration/messaging/message_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
+// Stage: @prod @smoke
 // Group: @messaging
 
 import users from '../../fixtures/users.json';
diff --git a/e2e/cypress/integration/plugins/marketplace/marketplace_spec.js b/e2e/cypress/integration/plugins/marketplace/marketplace_spec.js
index ec3edb89d7e6..320130371f11 100644
--- a/e2e/cypress/integration/plugins/marketplace/marketplace_spec.js
+++ b/e2e/cypress/integration/plugins/marketplace/marketplace_spec.js
@@ -7,6 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @smoke
 // Group: @plugin_marketplace @plugin
 
 import * as TIMEOUTS from '../../../fixtures/timeouts';
diff --git a/e2e/cypress/integration/search/search_user_post_spec.js b/e2e/cypress/integration/search/search_user_post_spec.js
index c1bf95a213d4..40afac28e9bc 100644
--- a/e2e/cypress/integration/search/search_user_post_spec.js
+++ b/e2e/cypress/integration/search/search_user_post_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
+// Stage: @prod @smoke
 // Group: @search
 
 import users from '../../fixtures/users.json';
diff --git a/e2e/cypress/integration/system_console/cluster_spec.js b/e2e/cypress/integration/system_console/cluster_spec.js
index 0434ada97335..0558af304933 100644
--- a/e2e/cypress/integration/system_console/cluster_spec.js
+++ b/e2e/cypress/integration/system_console/cluster_spec.js
@@ -1,5 +1,10 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
+// ***************************************************************
+// - [#] indicates a test step (e.g. # Go to a page)
+// - [*] indicates an assertion (e.g. * Check the title)
+// - Use element ID when selecting an element. Create one if none.
+// ***************************************************************
 
 // Group: @system_console
 
diff --git a/e2e/cypress/integration/team_settings/create_a_team_spec.js b/e2e/cypress/integration/team_settings/create_a_team_spec.js
index 843159c99349..231173cf7510 100644
--- a/e2e/cypress/integration/team_settings/create_a_team_spec.js
+++ b/e2e/cypress/integration/team_settings/create_a_team_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
+// Stage: @prod @smoke
 // Group: @team_settings
 
 import {getRandomId} from '../../utils';

From 146287e74d595d4fc27b52f036a750d86ee37b3f Mon Sep 17 00:00:00 2001
From: Prapti <praptishrestha@gmail.com>
Date: Mon, 8 Jun 2020 18:16:51 -0700
Subject: [PATCH 2/4] Removing marketplace tests and adding smoke group

---
 .../integration/accessibility/accessibility_sidebar_spec.js    | 2 +-
 e2e/cypress/integration/channel/add_users_to_channel_spec.js   | 2 +-
 e2e/cypress/integration/messaging/message_spec.js              | 2 +-
 .../onboarding/tutorial_navigation_and_links_spec.js           | 2 +-
 .../integration/plugins/marketplace/marketplace_spec.js        | 1 -
 e2e/cypress/integration/search/search_user_post_spec.js        | 2 +-
 e2e/cypress/integration/system_console/cluster_spec.js         | 3 ++-
 e2e/cypress/integration/team_settings/create_a_team_spec.js    | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/e2e/cypress/integration/accessibility/accessibility_sidebar_spec.js b/e2e/cypress/integration/accessibility/accessibility_sidebar_spec.js
index 0279a6c1c54c..08e12a6e0508 100644
--- a/e2e/cypress/integration/accessibility/accessibility_sidebar_spec.js
+++ b/e2e/cypress/integration/accessibility/accessibility_sidebar_spec.js
@@ -8,7 +8,7 @@
 // ***************************************************************
 
 // Stage: @prod @smoke
-// Group: @accessibility
+// Group: @accessibility @smoke
 
 import * as TIMEOUTS from '../../fixtures/timeouts';
 import users from '../../fixtures/users.json';
diff --git a/e2e/cypress/integration/channel/add_users_to_channel_spec.js b/e2e/cypress/integration/channel/add_users_to_channel_spec.js
index dfe06871c520..9894ed6127aa 100644
--- a/e2e/cypress/integration/channel/add_users_to_channel_spec.js
+++ b/e2e/cypress/integration/channel/add_users_to_channel_spec.js
@@ -8,7 +8,7 @@
 // ***************************************************************
 
 // Stage: @prod @smoke
-// Group: @channel @channel_settings
+// Group: @channel @channel_settings @smoke
 
 function verifyMentionedUserAndProfilePopover(postId) {
     cy.get(`#post_${postId}`).find('.mention-link').each(($el) => {
diff --git a/e2e/cypress/integration/messaging/message_spec.js b/e2e/cypress/integration/messaging/message_spec.js
index 98fb1ae8039b..b060be71b2f3 100644
--- a/e2e/cypress/integration/messaging/message_spec.js
+++ b/e2e/cypress/integration/messaging/message_spec.js
@@ -8,7 +8,7 @@
 // ***************************************************************
 
 // Stage: @prod @smoke
-// Group: @messaging
+// Group: @messaging @smoke
 
 import users from '../../fixtures/users.json';
 
diff --git a/e2e/cypress/integration/onboarding/tutorial_navigation_and_links_spec.js b/e2e/cypress/integration/onboarding/tutorial_navigation_and_links_spec.js
index d33e69c08419..2b301cd2f951 100755
--- a/e2e/cypress/integration/onboarding/tutorial_navigation_and_links_spec.js
+++ b/e2e/cypress/integration/onboarding/tutorial_navigation_and_links_spec.js
@@ -8,7 +8,7 @@
 // ***************************************************************
 
 // Stage: @prod @smoke
-// Group: @onboarding
+// Group: @onboarding @smoke
 
 const appDownloadLink = 'https://about.mattermost.com/downloads/';
 
diff --git a/e2e/cypress/integration/plugins/marketplace/marketplace_spec.js b/e2e/cypress/integration/plugins/marketplace/marketplace_spec.js
index 320130371f11..ec3edb89d7e6 100644
--- a/e2e/cypress/integration/plugins/marketplace/marketplace_spec.js
+++ b/e2e/cypress/integration/plugins/marketplace/marketplace_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @smoke
 // Group: @plugin_marketplace @plugin
 
 import * as TIMEOUTS from '../../../fixtures/timeouts';
diff --git a/e2e/cypress/integration/search/search_user_post_spec.js b/e2e/cypress/integration/search/search_user_post_spec.js
index 40afac28e9bc..cd83e7ffa4fe 100644
--- a/e2e/cypress/integration/search/search_user_post_spec.js
+++ b/e2e/cypress/integration/search/search_user_post_spec.js
@@ -8,7 +8,7 @@
 // ***************************************************************
 
 // Stage: @prod @smoke
-// Group: @search
+// Group: @search @smoke
 
 import users from '../../fixtures/users.json';
 
diff --git a/e2e/cypress/integration/system_console/cluster_spec.js b/e2e/cypress/integration/system_console/cluster_spec.js
index 0558af304933..763c1a4fc59c 100644
--- a/e2e/cypress/integration/system_console/cluster_spec.js
+++ b/e2e/cypress/integration/system_console/cluster_spec.js
@@ -6,7 +6,8 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Group: @system_console
+// Stage: @smoke
+// Group: @system_console @smoke
 
 describe('Cluster', () => {
     before(() => {
diff --git a/e2e/cypress/integration/team_settings/create_a_team_spec.js b/e2e/cypress/integration/team_settings/create_a_team_spec.js
index 231173cf7510..fedd273ec91f 100644
--- a/e2e/cypress/integration/team_settings/create_a_team_spec.js
+++ b/e2e/cypress/integration/team_settings/create_a_team_spec.js
@@ -8,7 +8,7 @@
 // ***************************************************************
 
 // Stage: @prod @smoke
-// Group: @team_settings
+// Group: @team_settings @smoke
 
 import {getRandomId} from '../../utils';
 

From f107260a31d1840fb2b3705c7bebee77363f47d2 Mon Sep 17 00:00:00 2001
From: Prapti <praptishrestha@gmail.com>
Date: Tue, 9 Jun 2020 18:30:40 -0700
Subject: [PATCH 3/4] Removing unused '@smoke' tag from test specs

---
 .../accessibility/accessibility_account_settings_spec.js       | 2 +-
 .../integration/accessibility/accessibility_sidebar_spec.js    | 2 +-
 .../account_settings/display/code_theme_colors_spec.js         | 2 +-
 .../account_settings/general/main_menu_stays_open_spec.js      | 2 +-
 .../account_settings/sidebar/channel_switcher_ui_spec.js       | 2 +-
 e2e/cypress/integration/channel/add_users_to_channel_spec.js   | 2 +-
 .../integration/channel_sidebar/channel_sidebar_spec.js        | 2 +-
 e2e/cypress/integration/commands/leave_channel_spec.js         | 2 +-
 .../integration/email/mention_email_notification_spec.js       | 2 +-
 e2e/cypress/integration/emoji/recently_used_emoji_spec.js      | 2 +-
 .../enterprise/guest_accounts/guest_invitation_ui_spec.js      | 2 +-
 .../guest_accounts/system_console_guest_access_ui_spec.js      | 2 +-
 .../integration/enterprise/ldap_group/channel_modes_spec.js    | 2 +-
 e2e/cypress/integration/enterprise/saml/saml_metadata_spec.js  | 2 +-
 .../enterprise/system_console/ui_and_api/notifications_spec.js | 2 +-
 .../integration/interactive_dialog/simple_dialog_spec.js       | 2 +-
 e2e/cypress/integration/interactive_menu/basic_options_spec.js | 2 +-
 e2e/cypress/integration/markdown/markdown_text_spec.js         | 2 +-
 .../integration/messaging/channel_users_interactions_spec.js   | 2 +-
 e2e/cypress/integration/messaging/collapsed_message_spec.js    | 2 +-
 e2e/cypress/integration/messaging/emoji_size_spec.js           | 2 +-
 e2e/cypress/integration/messaging/emoji_to_markdown_spec.js    | 2 +-
 .../integration/messaging/invalid_emojis_as_text_spec.js       | 2 +-
 .../messaging/markdown_quotation_paragraphs_spec.js            | 2 +-
 e2e/cypress/integration/messaging/message_bullets_spec.js      | 2 +-
 .../integration/messaging/message_deleted_on_reply_spec.js     | 2 +-
 e2e/cypress/integration/messaging/message_deletion_spec.js     | 2 +-
 .../integration/messaging/message_in_another_language_spec.js  | 2 +-
 e2e/cypress/integration/messaging/message_shortlinking_spec.js | 2 +-
 e2e/cypress/integration/messaging/message_spec.js              | 2 +-
 .../integration/messaging/mobile_profile_popover_spec.js       | 2 +-
 e2e/cypress/integration/messaging/quick_send_spec.js           | 2 +-
 .../messaging/receive_message_on_socket_reconnect_spec.js      | 2 +-
 .../integration/messaging/remove_last_post_in_channel_spec.js  | 2 +-
 e2e/cypress/integration/messaging/typing_on_middle_spec.js     | 2 +-
 .../onboarding/tutorial_navigation_and_links_spec.js           | 2 +-
 e2e/cypress/integration/search/search_group_message_spec.js    | 2 +-
 e2e/cypress/integration/search/search_user_post_spec.js        | 2 +-
 .../integration/search_date_filter/negative_filter_spec.js     | 2 +-
 e2e/cypress/integration/signin_authentication/login_spec.js    | 2 +-
 e2e/cypress/integration/system_console/cluster_spec.js         | 3 +--
 e2e/cypress/integration/system_console/demoted_user_spec.js    | 2 +-
 e2e/cypress/integration/system_console/inactive_users_spec.js  | 2 +-
 .../system_console/lock_teammate_name_display_spec.js          | 2 +-
 e2e/cypress/integration/team_settings/create_a_team_spec.js    | 2 +-
 45 files changed, 45 insertions(+), 46 deletions(-)

diff --git a/e2e/cypress/integration/accessibility/accessibility_account_settings_spec.js b/e2e/cypress/integration/accessibility/accessibility_account_settings_spec.js
index a7c0e58e724a..bc458f28c5af 100644
--- a/e2e/cypress/integration/accessibility/accessibility_account_settings_spec.js
+++ b/e2e/cypress/integration/accessibility/accessibility_account_settings_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @accessibility
 
 import * as TIMEOUTS from '../../fixtures/timeouts';
diff --git a/e2e/cypress/integration/accessibility/accessibility_sidebar_spec.js b/e2e/cypress/integration/accessibility/accessibility_sidebar_spec.js
index 08e12a6e0508..329bad82144b 100644
--- a/e2e/cypress/integration/accessibility/accessibility_sidebar_spec.js
+++ b/e2e/cypress/integration/accessibility/accessibility_sidebar_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @accessibility @smoke
 
 import * as TIMEOUTS from '../../fixtures/timeouts';
diff --git a/e2e/cypress/integration/account_settings/display/code_theme_colors_spec.js b/e2e/cypress/integration/account_settings/display/code_theme_colors_spec.js
index cc410258c6a2..f1572d26f761 100644
--- a/e2e/cypress/integration/account_settings/display/code_theme_colors_spec.js
+++ b/e2e/cypress/integration/account_settings/display/code_theme_colors_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @account_setting
 
 const THEMES = [{name: 'github', backgroundColor: 'rgb(248, 248, 248)', color: 'rgb(51, 51, 51)'},
diff --git a/e2e/cypress/integration/account_settings/general/main_menu_stays_open_spec.js b/e2e/cypress/integration/account_settings/general/main_menu_stays_open_spec.js
index 884ba3518913..1aceb04212c1 100644
--- a/e2e/cypress/integration/account_settings/general/main_menu_stays_open_spec.js
+++ b/e2e/cypress/integration/account_settings/general/main_menu_stays_open_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @account_setting
 
 import * as TIMEOUTS from '../../../fixtures/timeouts';
diff --git a/e2e/cypress/integration/account_settings/sidebar/channel_switcher_ui_spec.js b/e2e/cypress/integration/account_settings/sidebar/channel_switcher_ui_spec.js
index 67b17074a111..535c20eba3a4 100644
--- a/e2e/cypress/integration/account_settings/sidebar/channel_switcher_ui_spec.js
+++ b/e2e/cypress/integration/account_settings/sidebar/channel_switcher_ui_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @account_setting
 
 describe('Account Settings > Sidebar > Channel Switcher', () => {
diff --git a/e2e/cypress/integration/channel/add_users_to_channel_spec.js b/e2e/cypress/integration/channel/add_users_to_channel_spec.js
index 9894ed6127aa..2a0afc120456 100644
--- a/e2e/cypress/integration/channel/add_users_to_channel_spec.js
+++ b/e2e/cypress/integration/channel/add_users_to_channel_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @channel @channel_settings @smoke
 
 function verifyMentionedUserAndProfilePopover(postId) {
diff --git a/e2e/cypress/integration/channel_sidebar/channel_sidebar_spec.js b/e2e/cypress/integration/channel_sidebar/channel_sidebar_spec.js
index 78d72dfc2061..7a12fe2a81d1 100644
--- a/e2e/cypress/integration/channel_sidebar/channel_sidebar_spec.js
+++ b/e2e/cypress/integration/channel_sidebar/channel_sidebar_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @channel_sidebar
 
 import users from '../../fixtures/users';
diff --git a/e2e/cypress/integration/commands/leave_channel_spec.js b/e2e/cypress/integration/commands/leave_channel_spec.js
index 46b92f0ef034..266f338bb8a8 100644
--- a/e2e/cypress/integration/commands/leave_channel_spec.js
+++ b/e2e/cypress/integration/commands/leave_channel_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @commands
 
 describe('Leave Channel Command', () => {
diff --git a/e2e/cypress/integration/email/mention_email_notification_spec.js b/e2e/cypress/integration/email/mention_email_notification_spec.js
index c85ce8c700da..3819cd9614b2 100644
--- a/e2e/cypress/integration/email/mention_email_notification_spec.js
+++ b/e2e/cypress/integration/email/mention_email_notification_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @notification
 
 import users from '../../fixtures/users.json';
diff --git a/e2e/cypress/integration/emoji/recently_used_emoji_spec.js b/e2e/cypress/integration/emoji/recently_used_emoji_spec.js
index fd545f973921..b06bf8c8db57 100644
--- a/e2e/cypress/integration/emoji/recently_used_emoji_spec.js
+++ b/e2e/cypress/integration/emoji/recently_used_emoji_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @emoji
 
 import * as TIMEOUTS from '../../fixtures/timeouts';
diff --git a/e2e/cypress/integration/enterprise/guest_accounts/guest_invitation_ui_spec.js b/e2e/cypress/integration/enterprise/guest_accounts/guest_invitation_ui_spec.js
index 34b26c2cd378..31031e95935f 100644
--- a/e2e/cypress/integration/enterprise/guest_accounts/guest_invitation_ui_spec.js
+++ b/e2e/cypress/integration/enterprise/guest_accounts/guest_invitation_ui_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @guest_account
 
 /**
diff --git a/e2e/cypress/integration/enterprise/guest_accounts/system_console_guest_access_ui_spec.js b/e2e/cypress/integration/enterprise/guest_accounts/system_console_guest_access_ui_spec.js
index 2b236915d50e..e81a4cc534dd 100644
--- a/e2e/cypress/integration/enterprise/guest_accounts/system_console_guest_access_ui_spec.js
+++ b/e2e/cypress/integration/enterprise/guest_accounts/system_console_guest_access_ui_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @guest_account
 
 /**
diff --git a/e2e/cypress/integration/enterprise/ldap_group/channel_modes_spec.js b/e2e/cypress/integration/enterprise/ldap_group/channel_modes_spec.js
index 4a8a322f29d4..bc19440ef70e 100644
--- a/e2e/cypress/integration/enterprise/ldap_group/channel_modes_spec.js
+++ b/e2e/cypress/integration/enterprise/ldap_group/channel_modes_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @enterprise @ldap_group
 
 describe('Test channel public/private toggle', () => {
diff --git a/e2e/cypress/integration/enterprise/saml/saml_metadata_spec.js b/e2e/cypress/integration/enterprise/saml/saml_metadata_spec.js
index 738f144d35f4..3617db55f1d1 100644
--- a/e2e/cypress/integration/enterprise/saml/saml_metadata_spec.js
+++ b/e2e/cypress/integration/enterprise/saml/saml_metadata_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @enterprise @saml
 
 /**
diff --git a/e2e/cypress/integration/enterprise/system_console/ui_and_api/notifications_spec.js b/e2e/cypress/integration/enterprise/system_console/ui_and_api/notifications_spec.js
index 67d1fd329dac..cf4054b0b311 100644
--- a/e2e/cypress/integration/enterprise/system_console/ui_and_api/notifications_spec.js
+++ b/e2e/cypress/integration/enterprise/system_console/ui_and_api/notifications_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @enterprise @system_console
 
 describe('System Console', () => {
diff --git a/e2e/cypress/integration/interactive_dialog/simple_dialog_spec.js b/e2e/cypress/integration/interactive_dialog/simple_dialog_spec.js
index d08bb4568194..58d3646b9573 100644
--- a/e2e/cypress/integration/interactive_dialog/simple_dialog_spec.js
+++ b/e2e/cypress/integration/interactive_dialog/simple_dialog_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @interactive_dialog
 
 /**
diff --git a/e2e/cypress/integration/interactive_menu/basic_options_spec.js b/e2e/cypress/integration/interactive_menu/basic_options_spec.js
index f6df3aa64416..fd6e80de1627 100644
--- a/e2e/cypress/integration/interactive_menu/basic_options_spec.js
+++ b/e2e/cypress/integration/interactive_menu/basic_options_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @interactive_menu
 
 /**
diff --git a/e2e/cypress/integration/markdown/markdown_text_spec.js b/e2e/cypress/integration/markdown/markdown_text_spec.js
index 1c71fdca0b08..977e07fdf07d 100644
--- a/e2e/cypress/integration/markdown/markdown_text_spec.js
+++ b/e2e/cypress/integration/markdown/markdown_text_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @markdown
 
 import * as TIMEOUTS from '../../fixtures/timeouts';
diff --git a/e2e/cypress/integration/messaging/channel_users_interactions_spec.js b/e2e/cypress/integration/messaging/channel_users_interactions_spec.js
index 3eec064f6669..997eaaa7da36 100644
--- a/e2e/cypress/integration/messaging/channel_users_interactions_spec.js
+++ b/e2e/cypress/integration/messaging/channel_users_interactions_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @messaging
 
 import users from '../../fixtures/users.json';
diff --git a/e2e/cypress/integration/messaging/collapsed_message_spec.js b/e2e/cypress/integration/messaging/collapsed_message_spec.js
index c4bc95b4b5a0..2a847f7ef066 100644
--- a/e2e/cypress/integration/messaging/collapsed_message_spec.js
+++ b/e2e/cypress/integration/messaging/collapsed_message_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @messaging
 
 function verifyCollapsedPost() {
diff --git a/e2e/cypress/integration/messaging/emoji_size_spec.js b/e2e/cypress/integration/messaging/emoji_size_spec.js
index aa9950f277c7..6cd267e9e542 100644
--- a/e2e/cypress/integration/messaging/emoji_size_spec.js
+++ b/e2e/cypress/integration/messaging/emoji_size_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @messaging
 
 /**
diff --git a/e2e/cypress/integration/messaging/emoji_to_markdown_spec.js b/e2e/cypress/integration/messaging/emoji_to_markdown_spec.js
index 4fec92daa1f7..85222861ad0e 100644
--- a/e2e/cypress/integration/messaging/emoji_to_markdown_spec.js
+++ b/e2e/cypress/integration/messaging/emoji_to_markdown_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @messaging
 
 function createMessages(message, aliases) {
diff --git a/e2e/cypress/integration/messaging/invalid_emojis_as_text_spec.js b/e2e/cypress/integration/messaging/invalid_emojis_as_text_spec.js
index 72d3ec2689c7..bb3bff517f43 100644
--- a/e2e/cypress/integration/messaging/invalid_emojis_as_text_spec.js
+++ b/e2e/cypress/integration/messaging/invalid_emojis_as_text_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @messaging @emoji
 
 describe('Messaging', () => {
diff --git a/e2e/cypress/integration/messaging/markdown_quotation_paragraphs_spec.js b/e2e/cypress/integration/messaging/markdown_quotation_paragraphs_spec.js
index b5605b6d6b28..cc2571bf2c5d 100644
--- a/e2e/cypress/integration/messaging/markdown_quotation_paragraphs_spec.js
+++ b/e2e/cypress/integration/messaging/markdown_quotation_paragraphs_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @messaging @markdown
 
 describe('Messaging', () => {
diff --git a/e2e/cypress/integration/messaging/message_bullets_spec.js b/e2e/cypress/integration/messaging/message_bullets_spec.js
index fb5e4ab9b520..80bb5b9e4ea0 100644
--- a/e2e/cypress/integration/messaging/message_bullets_spec.js
+++ b/e2e/cypress/integration/messaging/message_bullets_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @messaging
 
 describe('Message', () => {
diff --git a/e2e/cypress/integration/messaging/message_deleted_on_reply_spec.js b/e2e/cypress/integration/messaging/message_deleted_on_reply_spec.js
index d5f97d13c3a6..7f1d8293bd96 100644
--- a/e2e/cypress/integration/messaging/message_deleted_on_reply_spec.js
+++ b/e2e/cypress/integration/messaging/message_deleted_on_reply_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @messaging
 
 import * as TIMEOUTS from '../../fixtures/timeouts';
diff --git a/e2e/cypress/integration/messaging/message_deletion_spec.js b/e2e/cypress/integration/messaging/message_deletion_spec.js
index be0008d73524..8606d3404ac2 100644
--- a/e2e/cypress/integration/messaging/message_deletion_spec.js
+++ b/e2e/cypress/integration/messaging/message_deletion_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @messaging
 
 describe('Message deletion', () => {
diff --git a/e2e/cypress/integration/messaging/message_in_another_language_spec.js b/e2e/cypress/integration/messaging/message_in_another_language_spec.js
index 9d4da035de79..5e289176b2dd 100644
--- a/e2e/cypress/integration/messaging/message_in_another_language_spec.js
+++ b/e2e/cypress/integration/messaging/message_in_another_language_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @messaging
 
 describe('Messaging', () => {
diff --git a/e2e/cypress/integration/messaging/message_shortlinking_spec.js b/e2e/cypress/integration/messaging/message_shortlinking_spec.js
index 9d9f6f316c78..d2a921043206 100644
--- a/e2e/cypress/integration/messaging/message_shortlinking_spec.js
+++ b/e2e/cypress/integration/messaging/message_shortlinking_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @messaging
 
 describe('Message', () => {
diff --git a/e2e/cypress/integration/messaging/message_spec.js b/e2e/cypress/integration/messaging/message_spec.js
index b060be71b2f3..ac3e94c6b34e 100644
--- a/e2e/cypress/integration/messaging/message_spec.js
+++ b/e2e/cypress/integration/messaging/message_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @messaging @smoke
 
 import users from '../../fixtures/users.json';
diff --git a/e2e/cypress/integration/messaging/mobile_profile_popover_spec.js b/e2e/cypress/integration/messaging/mobile_profile_popover_spec.js
index d8e4baf2890a..f35515011630 100644
--- a/e2e/cypress/integration/messaging/mobile_profile_popover_spec.js
+++ b/e2e/cypress/integration/messaging/mobile_profile_popover_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @messaging
 
 import * as TIMEOUTS from '../../fixtures/timeouts';
diff --git a/e2e/cypress/integration/messaging/quick_send_spec.js b/e2e/cypress/integration/messaging/quick_send_spec.js
index 30050ef245aa..670e0bd3bbac 100644
--- a/e2e/cypress/integration/messaging/quick_send_spec.js
+++ b/e2e/cypress/integration/messaging/quick_send_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @messaging
 
 import * as TIMEOUTS from '../../fixtures/timeouts';
diff --git a/e2e/cypress/integration/messaging/receive_message_on_socket_reconnect_spec.js b/e2e/cypress/integration/messaging/receive_message_on_socket_reconnect_spec.js
index 83d1fc891c4f..781b0d511f78 100644
--- a/e2e/cypress/integration/messaging/receive_message_on_socket_reconnect_spec.js
+++ b/e2e/cypress/integration/messaging/receive_message_on_socket_reconnect_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @messaging
 
 import * as TIMEOUTS from '../../fixtures/timeouts';
diff --git a/e2e/cypress/integration/messaging/remove_last_post_in_channel_spec.js b/e2e/cypress/integration/messaging/remove_last_post_in_channel_spec.js
index 4fcc213ad501..15d87e8b5ea9 100644
--- a/e2e/cypress/integration/messaging/remove_last_post_in_channel_spec.js
+++ b/e2e/cypress/integration/messaging/remove_last_post_in_channel_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @messaging
 
 import * as TIMEOUTS from '../../fixtures/timeouts';
diff --git a/e2e/cypress/integration/messaging/typing_on_middle_spec.js b/e2e/cypress/integration/messaging/typing_on_middle_spec.js
index c10b065b2ec6..31cff9628755 100644
--- a/e2e/cypress/integration/messaging/typing_on_middle_spec.js
+++ b/e2e/cypress/integration/messaging/typing_on_middle_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @messaging
 
 import * as TIMEOUTS from '../../fixtures/timeouts';
diff --git a/e2e/cypress/integration/onboarding/tutorial_navigation_and_links_spec.js b/e2e/cypress/integration/onboarding/tutorial_navigation_and_links_spec.js
index 2b301cd2f951..0790df6f352f 100755
--- a/e2e/cypress/integration/onboarding/tutorial_navigation_and_links_spec.js
+++ b/e2e/cypress/integration/onboarding/tutorial_navigation_and_links_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @onboarding @smoke
 
 const appDownloadLink = 'https://about.mattermost.com/downloads/';
diff --git a/e2e/cypress/integration/search/search_group_message_spec.js b/e2e/cypress/integration/search/search_group_message_spec.js
index 45b6a07977bf..9c31c82464c1 100644
--- a/e2e/cypress/integration/search/search_group_message_spec.js
+++ b/e2e/cypress/integration/search/search_group_message_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @search
 
 const groupMembers = ['aaron.peterson', 'aaron.ward', 'samuel.tucker'];
diff --git a/e2e/cypress/integration/search/search_user_post_spec.js b/e2e/cypress/integration/search/search_user_post_spec.js
index cd83e7ffa4fe..e3d4983066c8 100644
--- a/e2e/cypress/integration/search/search_user_post_spec.js
+++ b/e2e/cypress/integration/search/search_user_post_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @search @smoke
 
 import users from '../../fixtures/users.json';
diff --git a/e2e/cypress/integration/search_date_filter/negative_filter_spec.js b/e2e/cypress/integration/search_date_filter/negative_filter_spec.js
index 182f7dcd67da..5faa1e804293 100644
--- a/e2e/cypress/integration/search_date_filter/negative_filter_spec.js
+++ b/e2e/cypress/integration/search_date_filter/negative_filter_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @search_date_filter
 
 import * as TIMEOUTS from '../../fixtures/timeouts';
diff --git a/e2e/cypress/integration/signin_authentication/login_spec.js b/e2e/cypress/integration/signin_authentication/login_spec.js
index e93bb8c6495d..a05e4fc5d1de 100644
--- a/e2e/cypress/integration/signin_authentication/login_spec.js
+++ b/e2e/cypress/integration/signin_authentication/login_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @signin_authentication
 
 import users from '../../fixtures/users.json';
diff --git a/e2e/cypress/integration/system_console/cluster_spec.js b/e2e/cypress/integration/system_console/cluster_spec.js
index 763c1a4fc59c..0558af304933 100644
--- a/e2e/cypress/integration/system_console/cluster_spec.js
+++ b/e2e/cypress/integration/system_console/cluster_spec.js
@@ -6,8 +6,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @smoke
-// Group: @system_console @smoke
+// Group: @system_console
 
 describe('Cluster', () => {
     before(() => {
diff --git a/e2e/cypress/integration/system_console/demoted_user_spec.js b/e2e/cypress/integration/system_console/demoted_user_spec.js
index 0c2b83458077..c7c8a532cfff 100644
--- a/e2e/cypress/integration/system_console/demoted_user_spec.js
+++ b/e2e/cypress/integration/system_console/demoted_user_spec.js
@@ -8,7 +8,7 @@
 // ***************************************************************
 
 // Stage: @prod
-// Group: @system_console
+// Group: @system_console @smoke
 
 import users from '../../fixtures/users.json';
 import * as TIMEOUTS from '../../fixtures/timeouts';
diff --git a/e2e/cypress/integration/system_console/inactive_users_spec.js b/e2e/cypress/integration/system_console/inactive_users_spec.js
index 4894a36058e6..800b2395901a 100644
--- a/e2e/cypress/integration/system_console/inactive_users_spec.js
+++ b/e2e/cypress/integration/system_console/inactive_users_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @system_console
 
 /**
diff --git a/e2e/cypress/integration/system_console/lock_teammate_name_display_spec.js b/e2e/cypress/integration/system_console/lock_teammate_name_display_spec.js
index 2993f9aaf0b5..a05d739eabc9 100644
--- a/e2e/cypress/integration/system_console/lock_teammate_name_display_spec.js
+++ b/e2e/cypress/integration/system_console/lock_teammate_name_display_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @system_console
 
 describe('System Console', () => {
diff --git a/e2e/cypress/integration/team_settings/create_a_team_spec.js b/e2e/cypress/integration/team_settings/create_a_team_spec.js
index fedd273ec91f..c245131d5c94 100644
--- a/e2e/cypress/integration/team_settings/create_a_team_spec.js
+++ b/e2e/cypress/integration/team_settings/create_a_team_spec.js
@@ -7,7 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod @smoke
+// Stage: @prod
 // Group: @team_settings @smoke
 
 import {getRandomId} from '../../utils';

From aebc2792d21c07459a4d8b403fa698fa7ad48e69 Mon Sep 17 00:00:00 2001
From: Prapti <praptishrestha@gmail.com>
Date: Tue, 9 Jun 2020 18:56:45 -0700
Subject: [PATCH 4/4] Changing the example in run_tests from '@smoke' to '@dev'
 to avoid confusion in running tests with that tag inside the 'stage' suite

---
 e2e/run_tests.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e2e/run_tests.js b/e2e/run_tests.js
index 0022dc3ccfd9..00fd9c63352e 100644
--- a/e2e/run_tests.js
+++ b/e2e/run_tests.js
@@ -12,7 +12,7 @@
  * Options:
  *   --stage=[stage]
  *      Selects spec files with matching stage. It can be of multiple values separated by comma.
- *      E.g. "--stage='@prod,@smoke'" will select files with either @prod or @smoke.
+ *      E.g. "--stage='@prod,@dev'" will select files with either @prod or @dev.
  *   --group=[group]
  *      Selects spec files with matching group. It can be of multiple values separated by comma.
  *      E.g. "--group='@channel,@messaging'" will select files with either @channel or @messaging.