move cypress folder into new e2e folder

mattermost · saturninoabril · Jul 3, 2019 · Jul 2, 2019 · Jul 2, 2019 · Jul 3, 2019
commit f748f069e1d3a49aa5e67cec58f23b410237297f
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -81,8 +81,11 @@
  }
  },
  {
- "files": ["tests/e2e/**"],
+ "files": ["e2e/**"],
  "rules": {
+ "func-names": 0,
+ "import/no-unresolved": 0,
+ "max-nested-callbacks": 0,
  "no-unused-expressions": 0
  }
  }

diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,7 @@ mattermost-webapp.iml
 .vscode/
 
 # disable folders generated by Cypress
-cypress/screenshots
-cypress/videos
-results
+e2e/node_modules
+e2e/cypress/screenshots
+e2e/cypress/videos
+e2e/results
diff --git a/cypress.json → e2e/cypress.json b/cypress.json → e2e/cypress.json
@@ -9,8 +9,5 @@
  "reporterOptions": {
  "mochaFile": "results/results-[hash].xml",
  "toConsole": false
- },
- "env": {
- "RETRIES": 2
  }
 }
diff --git a/cypress/fixtures/long_text_post.txt → e2e/cypress/fixtures/long_text_post.txt b/cypress/fixtures/long_text_post.txt → e2e/cypress/fixtures/long_text_post.txt
diff --git a/...ess/fixtures/markdown/markdown_basic.html → ...ess/fixtures/markdown/markdown_basic.html b/...ess/fixtures/markdown/markdown_basic.html → ...ess/fixtures/markdown/markdown_basic.html
diff --git a/cypress/fixtures/markdown/markdown_basic.md → ...press/fixtures/markdown/markdown_basic.md b/cypress/fixtures/markdown/markdown_basic.md → ...press/fixtures/markdown/markdown_basic.md
diff --git a/...res/markdown/markdown_block_quotes_1.html → ...res/markdown/markdown_block_quotes_1.html b/...res/markdown/markdown_block_quotes_1.html → ...res/markdown/markdown_block_quotes_1.html
diff --git a/...tures/markdown/markdown_block_quotes_1.md → ...tures/markdown/markdown_block_quotes_1.md b/...tures/markdown/markdown_block_quotes_1.md → ...tures/markdown/markdown_block_quotes_1.md
diff --git a/...tures/markdown/markdown_block_quotes_2.md → ...tures/markdown/markdown_block_quotes_2.md b/...tures/markdown/markdown_block_quotes_2.md → ...tures/markdown/markdown_block_quotes_2.md
diff --git a/...es/markdown/markdown_carriage_return.html → ...es/markdown/markdown_carriage_return.html b/...es/markdown/markdown_carriage_return.html → ...es/markdown/markdown_carriage_return.html
diff --git a/...ures/markdown/markdown_carriage_return.md → ...ures/markdown/markdown_carriage_return.md b/...ures/markdown/markdown_carriage_return.md → ...ures/markdown/markdown_carriage_return.md
diff --git a/...n/markdown_carriage_return_two_lines.html → ...n/markdown_carriage_return_two_lines.html b/...n/markdown_carriage_return_two_lines.html → ...n/markdown_carriage_return_two_lines.html
diff --git a/...own/markdown_carriage_return_two_lines.md → ...own/markdown_carriage_return_two_lines.md b/...own/markdown_carriage_return_two_lines.md → ...own/markdown_carriage_return_two_lines.md
diff --git a/...ixtures/markdown/markdown_code_block.html → ...ixtures/markdown/markdown_code_block.html b/...ixtures/markdown/markdown_code_block.html → ...ixtures/markdown/markdown_code_block.html
diff --git a/.../fixtures/markdown/markdown_code_block.md → .../fixtures/markdown/markdown_code_block.md b/.../fixtures/markdown/markdown_code_block.md → .../fixtures/markdown/markdown_code_block.md
diff --git a/.../markdown/markdown_escape_characters.html → .../markdown/markdown_escape_characters.html b/.../markdown/markdown_escape_characters.html → .../markdown/markdown_escape_characters.html
diff --git a/...es/markdown/markdown_escape_characters.md → ...es/markdown/markdown_escape_characters.md b/...es/markdown/markdown_escape_characters.md → ...es/markdown/markdown_escape_characters.md
diff --git a/.../fixtures/markdown/markdown_headings.html → .../fixtures/markdown/markdown_headings.html b/.../fixtures/markdown/markdown_headings.html → .../fixtures/markdown/markdown_headings.html
diff --git a/...ss/fixtures/markdown/markdown_headings.md → ...ss/fixtures/markdown/markdown_headings.md b/...ss/fixtures/markdown/markdown_headings.md → ...ss/fixtures/markdown/markdown_headings.md
diff --git a/...xtures/markdown/markdown_inline_code.html → ...xtures/markdown/markdown_inline_code.html b/...xtures/markdown/markdown_inline_code.html → ...xtures/markdown/markdown_inline_code.html
diff --git a/...fixtures/markdown/markdown_inline_code.md → ...fixtures/markdown/markdown_inline_code.md b/...fixtures/markdown/markdown_inline_code.md → ...fixtures/markdown/markdown_inline_code.md
diff --git a/...ures/markdown/markdown_inline_images_1.md → ...ures/markdown/markdown_inline_images_1.md b/...ures/markdown/markdown_inline_images_1.md → ...ures/markdown/markdown_inline_images_1.md
diff --git a/...ures/markdown/markdown_inline_images_2.md → ...ures/markdown/markdown_inline_images_2.md b/...ures/markdown/markdown_inline_images_2.md → ...ures/markdown/markdown_inline_images_2.md
diff --git a/...ures/markdown/markdown_inline_images_3.md → ...ures/markdown/markdown_inline_images_3.md b/...ures/markdown/markdown_inline_images_3.md → ...ures/markdown/markdown_inline_images_3.md
diff --git a/...ures/markdown/markdown_inline_images_4.md → ...ures/markdown/markdown_inline_images_4.md b/...ures/markdown/markdown_inline_images_4.md → ...ures/markdown/markdown_inline_images_4.md
diff --git a/...ures/markdown/markdown_inline_images_5.md → ...ures/markdown/markdown_inline_images_5.md b/...ures/markdown/markdown_inline_images_5.md → ...ures/markdown/markdown_inline_images_5.md
diff --git a/...ess/fixtures/markdown/markdown_lines.html → ...ess/fixtures/markdown/markdown_lines.html b/...ess/fixtures/markdown/markdown_lines.html → ...ess/fixtures/markdown/markdown_lines.html
diff --git a/cypress/fixtures/markdown/markdown_lines.md → ...press/fixtures/markdown/markdown_lines.md b/cypress/fixtures/markdown/markdown_lines.md → ...press/fixtures/markdown/markdown_lines.md
diff --git a/...tures/markdown/markdown_not_autolink.html → ...tures/markdown/markdown_not_autolink.html b/...tures/markdown/markdown_not_autolink.html → ...tures/markdown/markdown_not_autolink.html
diff --git a/...ixtures/markdown/markdown_not_autolink.md → ...ixtures/markdown/markdown_not_autolink.md b/...ixtures/markdown/markdown_not_autolink.md → ...ixtures/markdown/markdown_not_autolink.md
diff --git a/.../markdown/markdown_not_in_code_block.html → .../markdown/markdown_not_in_code_block.html b/.../markdown/markdown_not_in_code_block.html → .../markdown/markdown_not_in_code_block.html
diff --git a/...es/markdown/markdown_not_in_code_block.md → ...es/markdown/markdown_not_in_code_block.md b/...es/markdown/markdown_not_in_code_block.md → ...es/markdown/markdown_not_in_code_block.md
diff --git a/...ixtures/markdown/markdown_text_style.html → ...ixtures/markdown/markdown_text_style.html b/...ixtures/markdown/markdown_text_style.html → ...ixtures/markdown/markdown_text_style.html
diff --git a/.../fixtures/markdown/markdown_text_style.md → .../fixtures/markdown/markdown_text_style.md b/.../fixtures/markdown/markdown_text_style.md → .../fixtures/markdown/markdown_text_style.md
diff --git a/cypress/fixtures/mattermost-icon.png → e2e/cypress/fixtures/mattermost-icon.png b/cypress/fixtures/mattermost-icon.png → e2e/cypress/fixtures/mattermost-icon.png
diff --git a/cypress/fixtures/theme.json → e2e/cypress/fixtures/theme.json b/cypress/fixtures/theme.json → e2e/cypress/fixtures/theme.json
diff --git a/cypress/fixtures/timeouts.js → e2e/cypress/fixtures/timeouts.js b/cypress/fixtures/timeouts.js → e2e/cypress/fixtures/timeouts.js
diff --git a/cypress/fixtures/users.json → e2e/cypress/fixtures/users.json b/cypress/fixtures/users.json → e2e/cypress/fixtures/users.json
diff --git a/...ings/display/channel_display_mode_spec.js → ...ings/display/channel_display_mode_spec.js b/...ings/display/channel_display_mode_spec.js → ...ings/display/channel_display_mode_spec.js
diff --git a/...ettings/display/code_theme_colors_spec.js → ...ettings/display/code_theme_colors_spec.js b/...ettings/display/code_theme_colors_spec.js → ...ettings/display/code_theme_colors_spec.js
@@ -7,8 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-/*eslint max-nested-callbacks: ["error", 3]*/
-
 const THEMES = [{name: 'github', backgroundColor: 'rgb(248, 248, 248)', color: 'rgb(51, 51, 51)'},
  {name: 'monokai', backgroundColor: 'rgb(39, 40, 34)', color: 'rgb(221, 221, 221)'},
  {name: 'solarized-light', backgroundColor: 'rgb(253, 246, 227)', color: 'rgb(101, 123, 131)'},

diff --git a/...ings/display/message_display_mode_spec.js → ...ings/display/message_display_mode_spec.js b/...ings/display/message_display_mode_spec.js → ...ings/display/message_display_mode_spec.js
@@ -7,8 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-/*eslint max-nested-callbacks: ["error", 3]*/
-
 describe('Account Settings > Display > Message Display', () => {
  before(() => {
  // # Change message display setting to compact

diff --git a/...tion/account_settings/general/nickname.js → ...tion/account_settings/general/nickname.js b/...tion/account_settings/general/nickname.js → ...tion/account_settings/general/nickname.js
diff --git a/...settings/sidebar/channel_switcher_spec.js → ...settings/sidebar/channel_switcher_spec.js b/...settings/sidebar/channel_switcher_spec.js → ...settings/sidebar/channel_switcher_spec.js
@@ -10,8 +10,6 @@ import * as TIMEOUTS from '../../../fixtures/timeouts';
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-/* eslint max-nested-callbacks: ["error", 4] */
-
 let testChannel;
 const channelDisplayName = `Channel Switcher ${getRandomInt(9999).toString()}`;
 

diff --git a/...olor/custom_colors_sidebar_styles_spec.js → ...olor/custom_colors_sidebar_styles_spec.js b/...olor/custom_colors_sidebar_styles_spec.js → ...olor/custom_colors_sidebar_styles_spec.js
@@ -5,9 +5,7 @@
 // - [#] indicates a test step (e.g. 1. Go to a page)
 // - [*] indicates an assertion (e.g. * Check the title)
 // - Use element ID when selecting an element. Create one if none.
-// **************************************************************
-
-/* eslint max-nested-callbacks: ["error", 4] */
+// ***************************************************************
 
 const testCases = [
  {key: 0, name: 'Sidebar BG', inputTarget: '.hue-horizontal', inputColor: ['background-color', 'rgb(20, 191, 188)'], content: '"sidebarBg":"#14bfbc"'},

diff --git a/...tegration/at_mentions/at_mentions_spec.js → ...tegration/at_mentions/at_mentions_spec.js b/...tegration/at_mentions/at_mentions_spec.js → ...tegration/at_mentions/at_mentions_spec.js
@@ -7,9 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-/*eslint max-nested-callbacks: ["error", 4]*/
-/*eslint-disable func-names*/
-
 function setNotificationSettings(desiredSettings = {first: true, username: true, shouts: true, custom: true, customText: '@'}) {
  // Navigate to settings modal
  cy.toAccountSettingsModal(null, true);

diff --git a/...l/autocomplete_shown_each_channel_spec.js → ...l/autocomplete_shown_each_channel_spec.js b/...l/autocomplete_shown_each_channel_spec.js → ...l/autocomplete_shown_each_channel_spec.js
diff --git a/...egration/channel/channel_settings_spec.js → ...egration/channel/channel_settings_spec.js b/...egration/channel/channel_settings_spec.js → ...egration/channel/channel_settings_spec.js
@@ -8,7 +8,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-/* eslint-disable max-nested-callbacks */
 describe('Channel Settings', () => {
  before(() => {
  // # Go to Main Channel View with "user-1"

diff --git a/...gration/channel/collapsed_message_spec.js → ...gration/channel/collapsed_message_spec.js b/...gration/channel/collapsed_message_spec.js → ...gration/channel/collapsed_message_spec.js
@@ -7,8 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-/* eslint max-nested-callbacks: ["error", 5] */
-
 function verifyCollapsedPost() {
  // * Verify show more button
  cy.get('#showMoreButton').scrollIntoView().should('be.visible').and('have.text', 'Show More');

diff --git a/.../integration/channel/edit_message_spec.js → .../integration/channel/edit_message_spec.js b/.../integration/channel/edit_message_spec.js → .../integration/channel/edit_message_spec.js
@@ -7,8 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-/* eslint max-nested-callbacks: ["error", 5] */
-
 import * as TIMEOUTS from '../../fixtures/timeouts';
 
 describe('Edit Message', () => {

diff --git a/cypress/integration/channel/header_spec.js → ...ypress/integration/channel/header_spec.js b/cypress/integration/channel/header_spec.js → ...ypress/integration/channel/header_spec.js
@@ -7,8 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-/* eslint max-nested-callbacks: ["error", 3] */
-
 import * as TIMEOUTS from '../../fixtures/timeouts';
 
 describe('Header', () => {

diff --git a/...tegration/channel/message_bullets_spec.js → ...tegration/channel/message_bullets_spec.js b/...tegration/channel/message_bullets_spec.js → ...tegration/channel/message_bullets_spec.js
@@ -7,8 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-/*eslint max-nested-callbacks: ["error", 4]*/
-
 describe('Message', () => {
  it('M13326 Text in bullet points is the same size as text above and below it', () => {
  // # Login and navigate to the app

diff --git a/...egration/channel/message_deletion_spec.js → ...egration/channel/message_deletion_spec.js b/...egration/channel/message_deletion_spec.js → ...egration/channel/message_deletion_spec.js
@@ -7,8 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-/* eslint max-nested-callbacks: ["error", 5] */
-
 describe('Message deletion', () => {
  before(() => {
  // # Go to Main Channel View with "user-1"

diff --git a/...integration/channel/message_draft_spec.js → ...integration/channel/message_draft_spec.js b/...integration/channel/message_draft_spec.js → ...integration/channel/message_draft_spec.js
@@ -7,8 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-/*eslint max-nested-callbacks: ["error", 4]*/
-
 let testTeam;
 
 describe('Message Draft', () => {

diff --git a/...message_draft_then_switch_channel_spec.js → ...message_draft_then_switch_channel_spec.js b/...message_draft_then_switch_channel_spec.js → ...message_draft_then_switch_channel_spec.js
@@ -7,8 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-/*eslint max-nested-callbacks: ["error", 4]*/
-
 import * as TIMEOUTS from '../../fixtures/timeouts';
 
 let testTeam;

diff --git a/...th_attachment_then_switch_channel_spec.js → ...th_attachment_then_switch_channel_spec.js b/...th_attachment_then_switch_channel_spec.js → ...th_attachment_then_switch_channel_spec.js
@@ -7,8 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-/* eslint max-nested-callbacks: ["error", 5] */
-
 describe('Message Draft with attachment and Switch Channels', () => {
  before(() => {
  // # Login and go to /

diff --git a/...message_edit_post_with_attachment_spec.js → ...message_edit_post_with_attachment_spec.js b/...message_edit_post_with_attachment_spec.js → ...message_edit_post_with_attachment_spec.js
@@ -7,8 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-/* eslint max-nested-callbacks: ["error", 4] */
-
 import * as TIMEOUTS from '../../fixtures/timeouts';
 
 describe('MM-13697 Edit Post with attachment', () => {

diff --git a/...ation/channel/message_emoji_jumbo_spec.js → ...ation/channel/message_emoji_jumbo_spec.js b/...ation/channel/message_emoji_jumbo_spec.js → ...ation/channel/message_emoji_jumbo_spec.js
@@ -7,8 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-/*eslint max-nested-callbacks: ["error", 4]*/
-
 const normalSize = '21px';
 const jumboSize = '32px';
 

diff --git a/...egration/channel/message_reaction_spec.js → ...egration/channel/message_reaction_spec.js b/...egration/channel/message_reaction_spec.js → ...egration/channel/message_reaction_spec.js
@@ -7,8 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-/*eslint max-nested-callbacks: ["error", 3]*/
-
 describe("Click another user's emoji reaction to add it", () => {
  it("M15113 - Click another user's emoji reaction to add it", () => {
  // # Login as "user-1" and go to /

diff --git a/cypress/integration/channel/message_spec.js → ...press/integration/channel/message_spec.js b/cypress/integration/channel/message_spec.js → ...press/integration/channel/message_spec.js
@@ -7,8 +7,6 @@
 // Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-/*eslint max-nested-callbacks: ["error", 3]*/
-
 import users from '../../fixtures/users.json';
 
 const sysadmin = users.sysadmin;

diff --git a/...n/channel/mobile_message_deletion_spec.js → ...n/channel/mobile_message_deletion_spec.js b/...n/channel/mobile_message_deletion_spec.js → ...n/channel/mobile_message_deletion_spec.js
@@ -10,8 +10,6 @@ import * as TIMEOUTS from '../../fixtures/timeouts';
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-/* eslint max-nested-callbacks: ["error", 4] */
-
 describe('Delete Parent Message', () => {
  before(() => {
  // # Go to Main Channel View with "user-1"

diff --git a/...ntegration/channel/system_message_spec.js → ...ntegration/channel/system_message_spec.js b/...ntegration/channel/system_message_spec.js → ...ntegration/channel/system_message_spec.js
@@ -7,8 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-/* eslint max-nested-callbacks: ["error", 4] */
-
 // helper function to count the lines in a block of text by wrapping each word in a span and finding where the text breaks the line
 function getLines(e) {
  const $cont = Cypress.$(e);

diff --git a/.../email/mention_email_notification_spec.js → .../email/mention_email_notification_spec.js b/.../email/mention_email_notification_spec.js → .../email/mention_email_notification_spec.js
@@ -7,8 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-/* eslint max-nested-callbacks: ["error", 4] */
-
 import users from '../../fixtures/users.json';
 import * as TIMEOUTS from '../../fixtures/timeouts';
 

diff --git a/...gration/emoji/recently_used_emoji_spec.js → ...gration/emoji/recently_used_emoji_spec.js b/...gration/emoji/recently_used_emoji_spec.js → ...gration/emoji/recently_used_emoji_spec.js
@@ -7,8 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-/* eslint max-nested-callbacks: ["error", 3] */
-
 import * as TIMEOUTS from '../../fixtures/timeouts';
 
 describe('Recent Emoji', () => {

diff --git a/...gration/integrations/integrations_spec.js → ...gration/integrations/integrations_spec.js b/...gration/integrations/integrations_spec.js → ...gration/integrations/integrations_spec.js
@@ -7,8 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-/* eslint max-nested-callbacks: ["error", 5] */
-
 import {getRandomInt} from '../../utils';
 
 describe('Integrations page', () => {

diff --git a/cypress/integration/login/login_spec.js → e2e/cypress/integration/login/login_spec.js b/cypress/integration/login/login_spec.js → e2e/cypress/integration/login/login_spec.js
@@ -7,8 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-/* eslint max-nested-callbacks: ["error", 4] */
-
 let config;
 
 describe('Login page', () => {

diff --git a/cypress/integration/login/signup_spec.js → e2e/cypress/integration/login/signup_spec.js b/cypress/integration/login/signup_spec.js → e2e/cypress/integration/login/signup_spec.js
@@ -7,8 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-/* eslint max-nested-callbacks: ["error", 4] */
-
 let config;
 
 describe('Signup Email page', () => {

diff --git a/...s/integration/login/subpath_login_spec.js → ...s/integration/login/subpath_login_spec.js b/...s/integration/login/subpath_login_spec.js → ...s/integration/login/subpath_login_spec.js
@@ -7,8 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-/* eslint max-nested-callbacks: ["error", 4] */
-
 describe('Cookie with Subpath', () => {
  before(() => {
  // # Logout to remove whitelisted cookies

diff --git a/...tegration/markdown/markdown_image_spec.js → ...tegration/markdown/markdown_image_spec.js b/...tegration/markdown/markdown_image_spec.js → ...tegration/markdown/markdown_image_spec.js
@@ -7,8 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-/* eslint max-nested-callbacks: ["error", 4] */
-
 import * as TIMEOUTS from '../../fixtures/timeouts';
 
 describe('Markdown', () => {

diff --git a/...ntegration/markdown/markdown_text_spec.js → ...ntegration/markdown/markdown_text_spec.js b/...ntegration/markdown/markdown_text_spec.js → ...ntegration/markdown/markdown_text_spec.js
@@ -7,8 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-/* eslint max-nested-callbacks: ["error", 4] */
-
 import * as TIMEOUTS from '../../fixtures/timeouts';
 
 const testCases = [

diff --git a/.../integration/messaging/emoji_size_spec.js → .../integration/messaging/emoji_size_spec.js b/.../integration/messaging/emoji_size_spec.js → .../integration/messaging/emoji_size_spec.js
@@ -7,8 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-/*eslint max-nested-callbacks: ["error", 5]*/
-
 function checkEmojiSize(message, emojis) {
  emojis.forEach((emoji) => {
  cy.get(message).
@@ -63,4 +61,4 @@ describe('Messaging', () => {
  // * Verify emoji size
  checkEmojiSize('@spacesMessage', emojis);
  });
-});
+});
diff --git a/...rding/email/existing_email_adress_spec.js → ...rding/email/existing_email_adress_spec.js b/...rding/email/existing_email_adress_spec.js → ...rding/email/existing_email_adress_spec.js
diff --git a/...ssaging/message_pinning_unpinning_spec.js → ...ssaging/message_pinning_unpinning_spec.js b/...ssaging/message_pinning_unpinning_spec.js → ...ssaging/message_pinning_unpinning_spec.js
@@ -7,8 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-/*eslint max-nested-callbacks: ["error", 5]*/
-
 const pinnedPosts = [];
 
 /**

diff --git a/.../multi_team/existing_channel_name_spec.js → .../multi_team/existing_channel_name_spec.js b/.../multi_team/existing_channel_name_spec.js → .../multi_team/existing_channel_name_spec.js
@@ -7,8 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-/*eslint max-nested-callbacks: ["error", 3]*/
-
 /**
 * Creates a channel with existing name and verify that error is shown
 * @param {String} channelTypeID - ID of public or private channel to create

diff --git a/...tegration/post_header/post_header_spec.js → ...tegration/post_header/post_header_spec.js b/...tegration/post_header/post_header_spec.js → ...tegration/post_header/post_header_spec.js
@@ -8,8 +8,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-/* eslint max-nested-callbacks: ["error", 3] */
-
 describe('Post Header', () => {
  before(() => {
  // # Go to Main Channel View with "user-1"

diff --git a/...ss/integration/search/date_filter_spec.js → ...ss/integration/search/date_filter_spec.js b/...ss/integration/search/date_filter_spec.js → ...ss/integration/search/date_filter_spec.js
@@ -7,9 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-/* eslint max-nested-callbacks: ["error", 5] */
-/* eslint-disable func-names */
-
 import users from '../../fixtures/users.json';
 
 function searchAndValidate(query, expectedResults = []) {

diff --git a/...integration/search/post_search_display.js → ...integration/search/post_search_display.js b/...integration/search/post_search_display.js → ...integration/search/post_search_display.js
@@ -7,8 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-/*eslint max-nested-callbacks: ["error", 3]*/
-
 describe('Post search display', () => {
  it('S14252 After clearing search query, search options display', () => {
  // # Login and navigate to the app

diff --git a/...ation/search/results_post_comment_spec.js → ...ation/search/results_post_comment_spec.js b/...ation/search/results_post_comment_spec.js → ...ation/search/results_post_comment_spec.js
@@ -7,8 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-/*eslint max-nested-callbacks: ["error", 3]*/
-
 describe('Search', () => {
  it('S14548 Search results Right-Hand-Side: Post a comment', () => {
  // # Login and navigate to the app

diff --git a/...ss/integration/search/search_user_post.js → ...ss/integration/search/search_user_post.js b/...ss/integration/search/search_user_post.js → ...ss/integration/search/search_user_post.js
@@ -7,8 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-/*eslint max-nested-callbacks: ["error", 3]*/
-
 import users from '../../fixtures/users.json';
 
 /**

diff --git a/...in_authentication/forgot_password_spec.js → ...in_authentication/forgot_password_spec.js b/...in_authentication/forgot_password_spec.js → ...in_authentication/forgot_password_spec.js
@@ -7,8 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-/*eslint max-nested-callbacks: ["error", 5]*/
-
 import {reUrl} from '../../utils';
 
 const feedbackEmail = '[email protected]';

diff --git a/...ation/system_console/demoted_user_spec.js → ...ation/system_console/demoted_user_spec.js b/...ation/system_console/demoted_user_spec.js → ...ation/system_console/demoted_user_spec.js
@@ -7,9 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-/*eslint max-nested-callbacks: ["error", 5]*/
-/*eslint-disable func-names*/
-
 import users from '../../fixtures/users.json';
 import * as TIMEOUTS from '../../fixtures/timeouts';
 

diff --git a/...ss/integration/team/create_a_team_spec.js → ...ss/integration/team/create_a_team_spec.js b/...ss/integration/team/create_a_team_spec.js → ...ss/integration/team/create_a_team_spec.js
diff --git a/...gration/team/teammates_pagination_spec.js → ...gration/team/teammates_pagination_spec.js b/...gration/team/teammates_pagination_spec.js → ...gration/team/teammates_pagination_spec.js
@@ -7,8 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-/* eslint max-nested-callbacks: ["error", 7] */
-
 describe('Teams Suite', () => {
  it('TS14868 Team Admin can use Next button to page through list in Manage Members', () => {
  cy.apiLogin('user-1');