From f06a5f7cdf9e57a0d6960191b2fa7ea263d5e515 Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Sat, 15 Dec 2018 08:28:47 -0200 Subject: [PATCH] Move globals of test to a specific eslintrc file --- .eslintrc | 2 -- tests/.eslintrc | 12 ++++++++++++ tests/data/checks.js | 2 -- tests/end-to-end/api/00-miscellaneous.js | 5 ----- tests/end-to-end/api/01-users.js | 7 +------ tests/end-to-end/api/02-channels.js | 12 +----------- tests/end-to-end/api/03-groups.js | 8 +------- tests/end-to-end/api/04-direct-message.js | 9 +-------- tests/end-to-end/api/05-chat.js | 4 ---- .../end-to-end/api/06-outgoing-integrations.js | 8 +------- .../end-to-end/api/07-incoming-integrations.js | 2 -- tests/end-to-end/api/08-settings.js | 3 --- tests/end-to-end/api/09-rooms.js | 3 --- tests/end-to-end/api/10-subscriptions.js | 3 --- tests/end-to-end/api/11-graphql.js | 2 -- tests/end-to-end/api/11-permissions.js | 3 --- tests/end-to-end/api/12-emoji-custom.js | 3 --- tests/end-to-end/api/13-roles.js | 3 --- tests/end-to-end/api/14-assets.js | 4 ---- tests/end-to-end/ui/00-login.js | 3 --- tests/end-to-end/ui/01-register.js | 2 -- tests/end-to-end/ui/02-forgot-password.js | 2 -- tests/end-to-end/ui/03-user-creation.js | 3 --- tests/end-to-end/ui/04-main-elements-render.js | 3 --- tests/end-to-end/ui/05-channel-creation.js | 3 --- tests/end-to-end/ui/06-messaging.js | 3 --- tests/end-to-end/ui/07-emoji.js | 3 --- tests/end-to-end/ui/08-resolutions.js | 3 --- tests/end-to-end/ui/09-channel.js | 3 --- tests/end-to-end/ui/10-user-preferences.js | 3 --- tests/end-to-end/ui/11-admin.js | 3 --- tests/end-to-end/ui/12-settings.js | 17 ----------------- tests/end-to-end/ui/13-permissions.js | 3 --- tests/end-to-end/ui/14-message-popup.js | 3 --- tests/pageobjects/setup-wizard.page.js | 2 -- 35 files changed, 17 insertions(+), 137 deletions(-) create mode 100644 tests/.eslintrc diff --git a/.eslintrc b/.eslintrc index 2502be847468..56a3b69015df 100644 --- a/.eslintrc +++ b/.eslintrc @@ -6,7 +6,6 @@ "AccountBox" : false, "Apps" : false, "Assets" : false, - "browser" : false, "ChatMessage" : false, "ChatMessages" : false, "ChatRoom" : false, @@ -25,7 +24,6 @@ "Settings" : false, "SideNav" : false, "t" : false, - "TimeSync" : false, "toastr" : false, "VideoRecorder" : false, "VRecDialog" : false diff --git a/tests/.eslintrc b/tests/.eslintrc new file mode 100644 index 000000000000..5aba5017dd17 --- /dev/null +++ b/tests/.eslintrc @@ -0,0 +1,12 @@ +{ + "env": { + "mocha": true + }, + "globals": { + "browser": false, + "expect": false, + "FlowRouter": false, + "Meteor": false, + "RocketChat": false + } +} diff --git a/tests/data/checks.js b/tests/data/checks.js index 3bcf03d46fe8..c3080d79eb7c 100644 --- a/tests/data/checks.js +++ b/tests/data/checks.js @@ -1,5 +1,3 @@ -/* globals Meteor */ - import loginPage from '../pageobjects/login.page'; import mainContent from '../pageobjects/main-content.page'; import sideNav from '../pageobjects/side-nav.page'; diff --git a/tests/end-to-end/api/00-miscellaneous.js b/tests/end-to-end/api/00-miscellaneous.js index 7ed3f9f5fc99..d91f11af9591 100644 --- a/tests/end-to-end/api/00-miscellaneous.js +++ b/tests/end-to-end/api/00-miscellaneous.js @@ -1,10 +1,5 @@ -/* eslint-env mocha */ -/* globals expect */ -/* eslint no-unused-vars: 0 */ - import { getCredentials, api, login, request, credentials } from '../../data/api-data.js'; import { adminEmail, adminUsername, adminPassword, password } from '../../data/user.js'; -import supertest from 'supertest'; describe('miscellaneous', function() { this.retries(0); diff --git a/tests/end-to-end/api/01-users.js b/tests/end-to-end/api/01-users.js index 1e46010f286d..7c8a12bd8b45 100644 --- a/tests/end-to-end/api/01-users.js +++ b/tests/end-to-end/api/01-users.js @@ -1,12 +1,7 @@ -/* eslint-env mocha */ -/* globals expect */ -/* eslint no-unused-vars: 0 */ - import crypto from 'crypto'; import { getCredentials, api, - login, request, credentials, apiEmail, @@ -989,7 +984,7 @@ describe('[Users]', function() { }); }); - describe('Testing if the returned token is valid:', (done) => { + describe('Testing if the returned token is valid:', () => { it('should return 200', (done) => request.post(api('users.createToken')) .set(credentials) .send({ username: user.username }) diff --git a/tests/end-to-end/api/02-channels.js b/tests/end-to-end/api/02-channels.js index 30fe33e61ff2..a2935cf6a5ba 100644 --- a/tests/end-to-end/api/02-channels.js +++ b/tests/end-to-end/api/02-channels.js @@ -1,22 +1,12 @@ -/* eslint-env mocha */ -/* globals expect */ -/* eslint no-unused-vars: 0 */ - import { getCredentials, api, - login, request, credentials, - apiEmail, - apiUsername, - targetUser, - log, apiPublicChannelName, channel, } from '../../data/api-data.js'; -import { adminEmail, password, adminUsername } from '../../data/user.js'; -import supertest from 'supertest'; +import { adminUsername } from '../../data/user.js'; function getRoomInfo(roomId) { return new Promise((resolve/* , reject*/) => { diff --git a/tests/end-to-end/api/03-groups.js b/tests/end-to-end/api/03-groups.js index b03ab6a638e1..182d9a0ccfd0 100644 --- a/tests/end-to-end/api/03-groups.js +++ b/tests/end-to-end/api/03-groups.js @@ -1,10 +1,4 @@ -/* eslint-env mocha */ -/* globals expect */ -/* eslint no-unused-vars: 0 */ - -import { getCredentials, api, login, request, credentials, group, log, apiPrivateChannelName } from '../../data/api-data.js'; -import { adminEmail, password } from '../../data/user.js'; -import supertest from 'supertest'; +import { getCredentials, api, request, credentials, group, apiPrivateChannelName } from '../../data/api-data.js'; import { adminUsername } from '../../data/user'; function getRoomInfo(roomId) { diff --git a/tests/end-to-end/api/04-direct-message.js b/tests/end-to-end/api/04-direct-message.js index f22b7f290215..3f840e232e7b 100644 --- a/tests/end-to-end/api/04-direct-message.js +++ b/tests/end-to-end/api/04-direct-message.js @@ -1,20 +1,13 @@ -/* eslint-env mocha */ -/* globals expect */ -/* eslint no-unused-vars: 0 */ - import { getCredentials, api, - login, request, credentials, directMessage, - log, apiUsername, apiEmail, } from '../../data/api-data.js'; -import { adminEmail, password } from '../../data/user.js'; -import supertest from 'supertest'; +import { password } from '../../data/user.js'; import { adminUsername } from '../../data/user'; describe('[Direct Messages]', function() { diff --git a/tests/end-to-end/api/05-chat.js b/tests/end-to-end/api/05-chat.js index ce06a76e6764..c13772f7e6ee 100644 --- a/tests/end-to-end/api/05-chat.js +++ b/tests/end-to-end/api/05-chat.js @@ -1,7 +1,3 @@ -/* eslint-env mocha */ -/* globals expect */ -/* eslint no-unused-vars: 0 */ - import { getCredentials, api, diff --git a/tests/end-to-end/api/06-outgoing-integrations.js b/tests/end-to-end/api/06-outgoing-integrations.js index eeefb8d2e7b3..42304bea9612 100644 --- a/tests/end-to-end/api/06-outgoing-integrations.js +++ b/tests/end-to-end/api/06-outgoing-integrations.js @@ -1,10 +1,4 @@ -/* eslint-env mocha */ -/* globals expect */ -/* eslint no-unused-vars: 0 */ - -import { getCredentials, api, login, request, credentials, integration, log } from '../../data/api-data.js'; -import { adminEmail, password } from '../../data/user.js'; -import supertest from 'supertest'; +import { api, request, credentials, integration } from '../../data/api-data.js'; describe('Outgoing Integrations', function() { this.retries(0); diff --git a/tests/end-to-end/api/07-incoming-integrations.js b/tests/end-to-end/api/07-incoming-integrations.js index 22ddffe1e3c9..fb48ad0dc8e9 100644 --- a/tests/end-to-end/api/07-incoming-integrations.js +++ b/tests/end-to-end/api/07-incoming-integrations.js @@ -1,5 +1,3 @@ -/* eslint-env mocha */ - import { getCredentials, api, request, credentials } from '../../data/api-data.js'; describe('Incoming Integrations', function() { diff --git a/tests/end-to-end/api/08-settings.js b/tests/end-to-end/api/08-settings.js index 740044c512ef..4d97ef5d0c68 100644 --- a/tests/end-to-end/api/08-settings.js +++ b/tests/end-to-end/api/08-settings.js @@ -1,6 +1,3 @@ -/* eslint-env mocha */ -/* globals expect */ - import { getCredentials, api, request, credentials } from '../../data/api-data.js'; describe('[Settings]', function() { diff --git a/tests/end-to-end/api/09-rooms.js b/tests/end-to-end/api/09-rooms.js index 92aee889dcf3..3f2d2ab4bce5 100644 --- a/tests/end-to-end/api/09-rooms.js +++ b/tests/end-to-end/api/09-rooms.js @@ -1,6 +1,3 @@ -/* eslint-env mocha */ -/* globals expect */ - import { getCredentials, api, request, credentials } from '../../data/api-data.js'; import { password } from '../../data/user'; import { closeRoom, createRoom } from '../../data/rooms.helper'; diff --git a/tests/end-to-end/api/10-subscriptions.js b/tests/end-to-end/api/10-subscriptions.js index c3e39dd0c4f1..a88a9305e942 100644 --- a/tests/end-to-end/api/10-subscriptions.js +++ b/tests/end-to-end/api/10-subscriptions.js @@ -1,6 +1,3 @@ -/* eslint-env mocha */ -/* globals expect */ - import { getCredentials, api, request, credentials } from '../../data/api-data.js'; describe('[Subscriptions]', function() { diff --git a/tests/end-to-end/api/11-graphql.js b/tests/end-to-end/api/11-graphql.js index d856f330c5db..c7cde8cf5604 100644 --- a/tests/end-to-end/api/11-graphql.js +++ b/tests/end-to-end/api/11-graphql.js @@ -1,5 +1,3 @@ -/* eslint-env mocha */ - const supertest = require('supertest'); const request = supertest('http://localhost:3000'); diff --git a/tests/end-to-end/api/11-permissions.js b/tests/end-to-end/api/11-permissions.js index 176f22b92dd9..20b19d7efc86 100644 --- a/tests/end-to-end/api/11-permissions.js +++ b/tests/end-to-end/api/11-permissions.js @@ -1,6 +1,3 @@ -/* eslint-env mocha */ -/* globals expect */ - import { getCredentials, api, request, credentials } from '../../data/api-data.js'; describe('[Permissions]', function() { diff --git a/tests/end-to-end/api/12-emoji-custom.js b/tests/end-to-end/api/12-emoji-custom.js index 0b21c4b8a379..1223324a5b35 100644 --- a/tests/end-to-end/api/12-emoji-custom.js +++ b/tests/end-to-end/api/12-emoji-custom.js @@ -1,6 +1,3 @@ -/* eslint-env mocha */ -/* globals expect */ - import { getCredentials, api, request, credentials } from '../../data/api-data.js'; describe('[EmojiCustom]', function() { diff --git a/tests/end-to-end/api/13-roles.js b/tests/end-to-end/api/13-roles.js index 3c8fd7076fac..06e4fb5c2969 100644 --- a/tests/end-to-end/api/13-roles.js +++ b/tests/end-to-end/api/13-roles.js @@ -1,6 +1,3 @@ -/* eslint-env mocha */ -/* globals expect */ - import { getCredentials, api, diff --git a/tests/end-to-end/api/14-assets.js b/tests/end-to-end/api/14-assets.js index c24f489b7487..3334ab3f42e1 100644 --- a/tests/end-to-end/api/14-assets.js +++ b/tests/end-to-end/api/14-assets.js @@ -1,7 +1,3 @@ -/* eslint-env mocha */ -/* globals expect */ -/* eslint no-unused-vars: 0 */ - import { getCredentials, api, diff --git a/tests/end-to-end/ui/00-login.js b/tests/end-to-end/ui/00-login.js index cd720b6a1f83..3511f01e9d5d 100644 --- a/tests/end-to-end/ui/00-login.js +++ b/tests/end-to-end/ui/00-login.js @@ -1,6 +1,3 @@ -/* eslint-env mocha */ -/* globals Meteor, FlowRouter */ - import loginPage from '../../pageobjects/login.page'; import setupWizard from '../../pageobjects/setup-wizard.page'; diff --git a/tests/end-to-end/ui/01-register.js b/tests/end-to-end/ui/01-register.js index 0312c30f66af..d9936655e2a5 100644 --- a/tests/end-to-end/ui/01-register.js +++ b/tests/end-to-end/ui/01-register.js @@ -1,5 +1,3 @@ -/* eslint-env mocha */ - import loginPage from '../../pageobjects/login.page'; describe('[Register]', () => { diff --git a/tests/end-to-end/ui/02-forgot-password.js b/tests/end-to-end/ui/02-forgot-password.js index e3093143ae8d..95afd3175ea1 100644 --- a/tests/end-to-end/ui/02-forgot-password.js +++ b/tests/end-to-end/ui/02-forgot-password.js @@ -1,5 +1,3 @@ -/* eslint-env mocha */ - import loginPage from '../../pageobjects/login.page'; describe('[Forgot Password]', () => { diff --git a/tests/end-to-end/ui/03-user-creation.js b/tests/end-to-end/ui/03-user-creation.js index cc2318790a49..8ad2f644f998 100644 --- a/tests/end-to-end/ui/03-user-creation.js +++ b/tests/end-to-end/ui/03-user-creation.js @@ -1,6 +1,3 @@ -/* eslint-env mocha */ -/* eslint-disable func-names, prefer-arrow-callback */ - import loginPage from '../../pageobjects/login.page'; import mainContent from '../../pageobjects/main-content.page'; diff --git a/tests/end-to-end/ui/04-main-elements-render.js b/tests/end-to-end/ui/04-main-elements-render.js index 6a1a236d86b9..c587ab8becbb 100644 --- a/tests/end-to-end/ui/04-main-elements-render.js +++ b/tests/end-to-end/ui/04-main-elements-render.js @@ -1,6 +1,3 @@ -/* eslint-env mocha */ -/* eslint-disable func-names, prefer-arrow-callback */ - import flexTab from '../../pageobjects/flex-tab.page'; import mainContent from '../../pageobjects/main-content.page'; import sideNav from '../../pageobjects/side-nav.page'; diff --git a/tests/end-to-end/ui/05-channel-creation.js b/tests/end-to-end/ui/05-channel-creation.js index 6597118a1be3..cd150f0e2ef7 100644 --- a/tests/end-to-end/ui/05-channel-creation.js +++ b/tests/end-to-end/ui/05-channel-creation.js @@ -1,6 +1,3 @@ -/* eslint-env mocha */ -/* eslint-disable func-names, prefer-arrow-callback */ - import sideNav from '../../pageobjects/side-nav.page'; import { publicChannelName, privateChannelName } from '../../data/channel.js'; import { targetUser } from '../../data/interactions.js'; diff --git a/tests/end-to-end/ui/06-messaging.js b/tests/end-to-end/ui/06-messaging.js index 5eaeb11e209f..941755bccd8a 100644 --- a/tests/end-to-end/ui/06-messaging.js +++ b/tests/end-to-end/ui/06-messaging.js @@ -1,6 +1,3 @@ -/* eslint-env mocha */ -/* eslint-disable func-names, prefer-arrow-callback */ - import mainContent from '../../pageobjects/main-content.page'; import sideNav from '../../pageobjects/side-nav.page'; import Global from '../../pageobjects/global'; diff --git a/tests/end-to-end/ui/07-emoji.js b/tests/end-to-end/ui/07-emoji.js index 68079171882d..a6025d34fc6d 100644 --- a/tests/end-to-end/ui/07-emoji.js +++ b/tests/end-to-end/ui/07-emoji.js @@ -1,6 +1,3 @@ -/* eslint-env mocha */ -/* eslint-disable func-names, prefer-arrow-callback */ - import mainContent from '../../pageobjects/main-content.page'; import sideNav from '../../pageobjects/side-nav.page'; diff --git a/tests/end-to-end/ui/08-resolutions.js b/tests/end-to-end/ui/08-resolutions.js index 0a3801c25dc8..1bf01c7ea65f 100644 --- a/tests/end-to-end/ui/08-resolutions.js +++ b/tests/end-to-end/ui/08-resolutions.js @@ -1,6 +1,3 @@ -/* eslint-env mocha */ -/* eslint-disable func-names, prefer-arrow-callback */ - import Global from '../../pageobjects/global'; import mainContent from '../../pageobjects/main-content.page'; import sideNav from '../../pageobjects/side-nav.page'; diff --git a/tests/end-to-end/ui/09-channel.js b/tests/end-to-end/ui/09-channel.js index ae9e6e02371a..ea9ffd4561d2 100644 --- a/tests/end-to-end/ui/09-channel.js +++ b/tests/end-to-end/ui/09-channel.js @@ -1,6 +1,3 @@ -/* eslint-env mocha */ -/* eslint-disable func-names, prefer-arrow-callback */ - import flexTab from '../../pageobjects/flex-tab.page'; import mainContent from '../../pageobjects/main-content.page'; import sideNav from '../../pageobjects/side-nav.page'; diff --git a/tests/end-to-end/ui/10-user-preferences.js b/tests/end-to-end/ui/10-user-preferences.js index b7e6ca55efb6..acdf4db47311 100644 --- a/tests/end-to-end/ui/10-user-preferences.js +++ b/tests/end-to-end/ui/10-user-preferences.js @@ -1,6 +1,3 @@ -/* eslint-env mocha */ -/* eslint-disable func-names, prefer-arrow-callback */ - import flexTab from '../../pageobjects/flex-tab.page'; import mainContent from '../../pageobjects/main-content.page'; import sideNav from '../../pageobjects/side-nav.page'; diff --git a/tests/end-to-end/ui/11-admin.js b/tests/end-to-end/ui/11-admin.js index 65577d2f7c33..4fe4746b9f6e 100644 --- a/tests/end-to-end/ui/11-admin.js +++ b/tests/end-to-end/ui/11-admin.js @@ -1,6 +1,3 @@ -/* eslint-env mocha */ -/* eslint-disable func-names, prefer-arrow-callback */ - import sideNav from '../../pageobjects/side-nav.page'; import flexTab from '../../pageobjects/flex-tab.page'; import admin from '../../pageobjects/administration.page'; diff --git a/tests/end-to-end/ui/12-settings.js b/tests/end-to-end/ui/12-settings.js index 852792d2667b..1301e3c681bd 100644 --- a/tests/end-to-end/ui/12-settings.js +++ b/tests/end-to-end/ui/12-settings.js @@ -1,7 +1,3 @@ -/* eslint-env mocha */ -/* globals expect */ -/* eslint no-unused-vars: 0 */ - import loginPage from '../../pageobjects/login.page'; import supertest from 'supertest'; const request = supertest('http://localhost:3000'); @@ -14,7 +10,6 @@ import admin from '../../pageobjects/administration.page'; // test data imports import { checkIfUserIsValid, checkIfUserIsAdmin } from '../../data/checks'; -import { targetUser, imgURL } from '../../data/interactions.js'; import { adminUsername, adminEmail, adminPassword, username, email, password, reason } from '../../data/user.js'; @@ -22,14 +17,6 @@ function api(path) { return prefix + path; } -function log(res) { - console.log(res.req.path); - console.log({ - body: res.body, - headers: res.headers, - }); -} - const credentials = { ['X-Auth-Token']: undefined, ['X-User-Id']: undefined, @@ -40,10 +27,6 @@ const login = { password: adminPassword, }; -const settingValue = { - value : undefined, -}; - describe('[Api Settings Change]', () => { before((done) => { checkIfUserIsValid(username, email, password); diff --git a/tests/end-to-end/ui/13-permissions.js b/tests/end-to-end/ui/13-permissions.js index f73f01d61911..1b5f49ba501b 100644 --- a/tests/end-to-end/ui/13-permissions.js +++ b/tests/end-to-end/ui/13-permissions.js @@ -1,6 +1,3 @@ -/* eslint-env mocha */ -/* eslint-disable func-names, prefer-arrow-callback */ - import sideNav from '../../pageobjects/side-nav.page'; import flexTab from '../../pageobjects/flex-tab.page'; import admin from '../../pageobjects/administration.page'; diff --git a/tests/end-to-end/ui/14-message-popup.js b/tests/end-to-end/ui/14-message-popup.js index 5958d647916d..1b2267936bd1 100644 --- a/tests/end-to-end/ui/14-message-popup.js +++ b/tests/end-to-end/ui/14-message-popup.js @@ -1,6 +1,3 @@ -/* eslint-env mocha */ -/* globals Meteor */ - import { adminEmail, adminPassword } from '../../data/user.js'; import { diff --git a/tests/pageobjects/setup-wizard.page.js b/tests/pageobjects/setup-wizard.page.js index 2002fa3a4385..d037d138a45e 100644 --- a/tests/pageobjects/setup-wizard.page.js +++ b/tests/pageobjects/setup-wizard.page.js @@ -1,5 +1,3 @@ -/* globals Meteor */ - import Page from './Page'; import { adminEmail, adminPassword } from '../data/user';