Merge pull request RocketChat#237 from assistify/feature/linting-erro…

…r-fix

fix all linting errors plus 2 bug fixes in tests

.scripts/dockerfile

@@ -1,4 +1,4 @@
-FROM assisitfy/smarti:0.6.1
+FROM assisitfy/smarti:0.7.0-BETA
 USER root
 ADD [\
     "https://repo1.maven.org/maven2/edu/stanford/nlp/stanford-corenlp/3.8.0/stanford-corenlp-3.8.0.jar", \

.scripts/seperateTesting.sh

@@ -2,11 +2,11 @@
 tmpPath=tests/end-to-end/temporary_staged_test
 rm -rf $tmpPath
 mkdir -p $tmpPath
-[ -z "$num" ] && num=1
-for file in tests/end-to-end/ui/*.js; do
+[ -z "$retry_test" ] && retry_test=1
+for file in tests/end-to-end/api/*.js; do
 
   failed=1
-  for i in `seq 1 $num`; do
+  for i in `seq 1 $retry_test`; do
     echo '-------------- '$i' try ---------------'
     set -x
     cp $file $tmpPath

.scripts/smarti.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-docker pull assisitfy/smarti:0.6.1
+docker pull assisitfy/smarti:0.7.0-BETA
 
 #docker run -d --net=host assisitfy/smarti:0.6.1
 

packages/assistify-ai/server/hooks/sendMessageToKnowledgeAdapter.js

@@ -29,10 +29,10 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room) {
 		return;
 	}
 
-	SystemLogger.debug(`Send message ${message._id} to knowledgeAdapter (Meteor.defer()`);
+	SystemLogger.debug(`Send message ${ message._id } to knowledgeAdapter (Meteor.defer()`);
 	Meteor.defer(() => {
 		try {
-			SystemLogger.debug(`Calling onMessage(${message._id});`);
+			SystemLogger.debug(`Calling onMessage(${ message._id });`);
 			knowledgeAdapter.onMessage(message);
 		} catch (e) {
 			SystemLogger.error('Error using knowledge provider ->', e);

packages/assistify-ai/server/lib/AiApiAdapter.js

@@ -1,3 +1,5 @@
+/* globals _ */
+
 export class ApiAiAdapter {
 	constructor(adapterProps) {
 		this.properties = adapterProps;

packages/assistify-ai/server/lib/SmartiAdapter.js

@@ -41,7 +41,7 @@ export class SmartiAdapter {
 				}, {
 					rid: message.rid,
 					knowledgeProvider: 'smarti',
-					conversationId: conversationId,
+					conversationId,
 					ts: message.ts
 				}, {
 					upsert: true
@@ -86,7 +86,7 @@ export class SmartiAdapter {
 		}
 
 		if (conversationId) {
-			SystemLogger.debug(`Conversation ${conversationId} found for channel ${message.rid}`);
+			SystemLogger.debug(`Conversation ${ conversationId } found for channel ${ message.rid }`);
 			// add message to conversation
 			SmartiProxy.propagateToSmarti(verbs.post, `conversation/${ conversationId }/message`, requestBodyMessage);
 		} else {

packages/assistify-help-request/client/views/creationDialog/AssistifyCreateExpertise.js

@@ -1,3 +1,4 @@
+/* globals _ */
 /* globals AutoComplete, Deps */
 import {RocketChat} from 'meteor/rocketchat:lib';
 import {FlowRouter} from 'meteor/kadira:flow-router';

packages/assistify-help-request/client/views/creationDialog/AssistifyCreateRequest.js

@@ -1,4 +1,5 @@
 /* globals TAPi18n, AutoComplete */
+/* globals _ */
 import {RocketChat} from 'meteor/rocketchat:lib';
 import {FlowRouter} from 'meteor/kadira:flow-router';
 import {ReactiveVar} from 'meteor/reactive-var';

packages/assistify-help-request/client/views/sideNav/listRequestsFlex.js

@@ -1,4 +1,5 @@
-
+/* globals _ */
+/* globals s */
 function __guard__(value, transform) {
 	return (typeof value !== 'undefined' && value !== null) ? transform(value) : undefined;
 }

packages/assistify-help-request/server/methods/requestsList.js

@@ -1,3 +1,4 @@
+/* globals _ */
 Meteor.methods({
 	//adapted copy of server/methods/channelsList.js
 	requestsList(filter, channelType, limit, sort) {

packages/assistify-help-request/server/models/LivechatExternalMessage.js

@@ -1,3 +1,4 @@
+/* globals _ */
 /**
  * Created by OliverJaegle on 01.08.2016.
  */

packages/assistify-help-request/server/models/Rooms.js

@@ -1,3 +1,4 @@
+/* globals _ */
 /**
  * Created by OliverJaegle on 01.08.2016.
  */

packages/assistify-help-request/server/models/Users.js

@@ -1,3 +1,4 @@
+/* globals s */
 /**
  * Created by OliverJaegle on 01.08.2016.
  * Expose features of the users-collection which are not exposed by default

packages/meteor-accounts-saml/saml_utils.js

@@ -1,4 +1,5 @@
 /* globals SAML:true */
+/*eslint complexity: ["error", 40]*/
 
 import zlib from 'zlib';
 import xml2js from 'xml2js';

packages/rocketchat-custom-oauth/server/custom_oauth_server.js

@@ -1,4 +1,5 @@
 /*globals OAuth*/
+/*eslint complexity: ["error", 40]*/
 import _ from 'underscore';
 
 const logger = new Logger('CustomOAuth');

packages/rocketchat-lib/client/views/SimpleRoomCreateDialog.js

@@ -1,4 +1,5 @@
 /* globals TAPi18n, AutoComplete */
+/* globals _ */
 import {RocketChat} from 'meteor/rocketchat:lib';
 import {FlowRouter} from 'meteor/kadira:flow-router';
 import {ReactiveVar} from 'meteor/reactive-var';

packages/rocketchat-lib/server/functions/saveUser.js

@@ -1,4 +1,5 @@
 /* globals Gravatar */
+/*eslint complexity: ["error", 50]*/
 import _ from 'underscore';
 import s from 'underscore.string';
 

packages/rocketchat-lib/server/functions/settings.js

@@ -1,3 +1,4 @@
+/*eslint complexity: ["error", 40]*/
 import _ from 'underscore';
 
 const blockedSettings = {};

packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js

@@ -1,4 +1,5 @@
 /* globals Push */
+/*eslint complexity: ["error", 40]*/
 import _ from 'underscore';
 import s from 'underscore.string';
 import moment from 'moment';

packages/rocketchat-lib/server/models/Rooms.js

@@ -1,3 +1,4 @@
+/* globals RocketChat, SystemLogger */
 import _ from 'underscore';
 import s from 'underscore.string';
 

packages/rocketchat-slackbridge/server/slackbridge.js

@@ -1,4 +1,5 @@
 /* globals logger */
+/*eslint complexity: ["error", 50]*/
 import _ from 'underscore';
 import util from 'util';
 import url from 'url';

server/publications/room.js

@@ -1,3 +1,4 @@
+/* globals RocketChat, SystemLogger */
 import _ from 'underscore';
 
 const fields = {

tests/end-to-end/api/06-outgoing-integrations.js

@@ -9,6 +9,8 @@ import supertest from 'supertest';
 describe('Outgoing Integrations', function() {
 	this.retries(0);
 
+	before(done => getCredentials(done));
+
 	it('/integrations.create', (done) => {
 		request.post(api('integrations.create'))
 			.set(credentials)

tests/end-to-end/api/08-custom-roomtypes.js → tests/end-to-end/api/11-custom-roomtypes.js

@@ -1,3 +1,4 @@
+/* eslint-env mocha */
 import supertest from 'supertest';
 import {adminUsername, adminPassword} from '../../data/user.js';
 export const rcrequest = supertest.agent('http://localhost:3000');
@@ -21,7 +22,7 @@ describe('[Custom Room Types]', function() {
 			.end(function(err, res) {
 				authToken = res.body.data.authToken;
 				userId = res.body.data.userId;
-				expect(res.status).to.be.equal(200);
+				res.status.should.be.equal(200);
 				process.env.METEOR_TOKEN = authToken;
 				done();
 			});
@@ -55,10 +56,9 @@ describe('[Custom Room Types]', function() {
 				retry: 5
 			},
 
-			function(error, userInfo) {
+			function(error) {
 				if (error) {
-					console.log(`ERROR:  ${ error }`);
-					expect(0).to.equal(1);
+					throw new Error(`ERROR:  ${ error }`);
 				} else {
 					// console.log(userInfo);
 					ddpClient.call(
@@ -113,10 +113,9 @@ describe('[Custom Room Types]', function() {
 				retry: 5
 			},
 
-			function(error, userInfo) {
+			function(error) {
 				if (error) {
-					console.log(`ERROR:  ${ error }`);
-					expect(0).to.equal(1);
+					throw new Error(`ERROR:  ${ error }`);
 				} else {
 					// console.log(userInfo);
 					ddpClient.call(
@@ -175,10 +174,9 @@ describe('[Custom Room Types]', function() {
 				retry: 5
 			},
 
-			function(error, userInfo) {
+			function(error) {
 				if (error) {
-					console.log(`ERROR:  ${ error }`);
-					expect(0).to.equal(1);
+					throw new Error(`ERROR:  ${ error }`);
 				} else {
 					// console.log(userInfo);
 					ddpClient.call(
@@ -188,16 +186,16 @@ describe('[Custom Room Types]', function() {
 							// console.log('GetRooms, result: ' + result);
 							for (const i in result) {
 								// console.log(result[i]);
-								if (result[i].t == 'test' && result[i].name == 'NewTestRoom') {
+								if (result[i].t === 'test' && result[i].name === 'NewTestRoom') {
 									console.log('found test room');
-									expect(result[i]._id).to.be.equal(roomid);
+									result[i]._id.should.be.equal(roomid);
 								}
 							}
 							if (typeof err !== 'undefined') {
 								console.log('error happend: ');
 								console.log(err);
 							}
-							expect(roomid).to.not.equal(undefined);
+							roomid.should.not.equal(undefined);
 						},
 						function() { // callback which fires when server has finished
 							// console.log('GetRooms - Function was finished');  // sending any updated documents as a result of
@@ -238,10 +236,9 @@ describe('[Custom Room Types]', function() {
 				retry: 5
 			},
 
-			function(error, userInfo) {
+			function(error) {
 				if (error) {
-					console.log(`ERROR:  ${ error }`);
-					expect(0).to.equal(1);
+					throw new Error(`ERROR:  ${ error }`);
 				} else {
 					// console.log(userInfo);
 					ddpClient.call(
@@ -250,7 +247,7 @@ describe('[Custom Room Types]', function() {
 						function(err, result) { // callback which returns the method call results
 							// console.log('EraseRoom, result: ');
 							if (typeof result !== 'undefined') {
-								expect(result).to.be.equal(1);
+								result.should.be.equal(1);
 								// console.log(result);
 							}
 							if (typeof err !== 'undefined') {
@@ -297,10 +294,9 @@ describe('[Custom Room Types]', function() {
 				retry: 5
 			},
 
-			function(error, userInfo) {
+			function(error) {
 				if (error) {
-					console.log(`ERROR:  ${ error }`);
-					expect(0).to.equal(1);
+					throw new Error(`ERROR:  ${ error }`);
 				} else {
 					// console.log(userInfo);
 					ddpClient.call(
@@ -310,18 +306,20 @@ describe('[Custom Room Types]', function() {
 							// console.log('GetRooms, result: ' + result);
 							for (const i in result) {
 								// console.log(result[i]);
-								if (result[i].t == 'test' && result[i].name == 'NewTestRoom') {
+								if (result[i].t === 'test' && result[i].name === 'NewTestRoom') {
 									console.log('found test room');
-									expect(result[i]._id).to.be.equal(roomid);
+									result[i]._id.should.be.equal(roomid);
+								} else if (result[i].t !== 'd') {
+									result[i].t.should.not.equal('test');
+									result[i].name.should.not.equal('NewTestRoom');
 								}
-								expect(result[i].t).to.not.equal('test');
-								expect(result[i].name).to.not.equal('NewTestRoom');
+
 							}
 							if (typeof err !== 'undefined') {
 								console.log('error happend: ');
 								console.log(err);
 							}
-							expect(roomid).to.not.equal(undefined);
+							roomid.should.not.equal(undefined);
 						},
 						function() { // callback which fires when server has finished
 							// console.log('GetRooms - Function was finished');  // sending any updated documents as a result of

tests/end-to-end/ui/14-global-announcement.js

@@ -1,3 +1,4 @@
+/* eslint-env mocha */
 import supertest from 'supertest';
 import {adminUsername, adminEmail, adminPassword} from '../../data/user.js';
 import loginPage from '../../pageobjects/login.page';
@@ -22,7 +23,7 @@ describe('[Rocket.Chat Global Announcement Tests]', function() {
 			.end(function(err, res) {
 				authToken = res.body.data.authToken;
 				userId = res.body.data.userId;
-				expect(res.status).to.be.equal(200);
+				res.status.should.be.equal(200);
 				done();
 			});
 	});

tests/end-to-end/ui/15-settings-based-permissions.js

@@ -1,3 +1,4 @@
+/* eslint-env mocha */
 import { adminUsername, adminEmail, adminPassword, username, email, password } from '../../data/user.js';
 import admin from '../../pageobjects/administration.page';
 import { checkIfUserIsValid, checkIfUserIsAdmin } from '../../data/checks';
@@ -30,7 +31,7 @@ describe('[Rocket.Chat Settings based permissions]', function() {
 				manageSettingsPerm.click();
 				console.log('Value was unchecked', manageSettingsPerm.isSelected());
 			}
-			expect(manageSettingsPerm.isSelected()).to.equal(true);
+			manageSettingsPerm.isSelected().should.equal(true);
 			done();
 		});
 
@@ -42,7 +43,7 @@ describe('[Rocket.Chat Settings based permissions]', function() {
 				layoutTitelPerm.click();
 				console.log('Value was unchecked, now:', layoutTitelPerm.isSelected());
 			}
-			expect(layoutTitelPerm.isSelected()).to.equal(true);
+			layoutTitelPerm.isSelected().should.equal(true);
 			done();
 		});
 
@@ -72,16 +73,6 @@ describe('[Rocket.Chat Settings based permissions]', function() {
 			browser.pause(2000);
 			console.log('New Titel value:', layoutTitelSetting.getValue());
 			saveSettings.click();
-
-			// layoutTitelSetting.setValue('');
-			// browser.pause(2000);
-			// console.log('New Titel value:', layoutTitelSetting.getValue() );
-			// saveSettings.click();
-			//
-			// layoutTitelSetting.setValue(newTitle);
-			// browser.pause(2000);
-			// console.log('New Titel value:', layoutTitelSetting.getValue() );
-			// saveSettings.click();
 			done();
 		});
 	});
@@ -111,12 +102,12 @@ describe('[Rocket.Chat Settings based permissions]', function() {
 			admin.rolesPermissionGrid.waitForVisible(5000);
 
 			manageSettingsPerm.click();
-			expect(manageSettingsPerm.isSelected()).to.equal(false);
+			manageSettingsPerm.isSelected().should.equal(false);
 
 			expandSBP.click();
 
 			layoutTitelPerm.click();
-			expect(layoutTitelPerm.isSelected()).to.equal(false);
+			layoutTitelPerm.isSelected().should.equal(false);
 			done();
 		});