Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

MM-16704 Move cypress folder into new e2e folder #3044

Merged
merged 3 commits into from
Jul 3, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
7 changes: 4 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 0 additions & 3 deletions cypress.json → e2e/cypress.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,5 @@
"reporterOptions": {
"mochaFile": "results/results-[hash].xml",
"toConsole": false
},
"env": {
"RETRIES": 2
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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)'},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()}`;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"'},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 /
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 /
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down Expand Up @@ -63,4 +61,4 @@ describe('Messaging', () => {
// * Verify emoji size
checkEmojiSize('@spacesMessage', emojis);
});
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
// - Use element ID when selecting an element. Create one if none.
// ***************************************************************

/*eslint max-nested-callbacks: ["error", 5]*/

const pinnedPosts = [];

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
Loading