Move globals of test to a specific eslintrc file (#12959)

RocketChat · Dec 17, 2018 · 5b3ca5d · 5b3ca5d
1 parent d1b6211
commit 5b3ca5d
Show file tree

Hide file tree

Showing 35 changed files with 17 additions and 137 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -6,7 +6,6 @@
 		"AccountBox"                  : false,
 		"Apps"                        : false,
 		"Assets"                      : false,
-		"browser"                     : false,
 		"ChatMessage"                 : false,
 		"ChatMessages"                : false,
 		"ChatRoom"                    : false,
@@ -24,7 +23,6 @@
 		"Settings"                    : false,
 		"SideNav"                     : false,
 		"t"                           : false,
-		"TimeSync"                    : false,
 		"VideoRecorder"               : false,
 		"VRecDialog"                  : false
 	}

diff --git a/tests/.eslintrc 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,22 +10,13 @@ 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';
 
 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
@@ -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
@@ -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
@@ -1,5 +1,3 @@
-/* globals Meteor */
-
 import Page from './Page';
 import { adminEmail, adminPassword } from '../data/user';