Skip to content

Commit

Permalink
Update dependencies (#18593)
Browse files Browse the repository at this point in the history
  • Loading branch information
rodrigok authored Aug 21, 2020
1 parent 09b825d commit abae419
Show file tree
Hide file tree
Showing 27 changed files with 8,749 additions and 6,510 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,9 @@ jobs:
MONGO_URL: mongodb://localhost:27017/rocketchat
MONGO_OPLOG_URL: mongodb://localhost:27017/local
run: |
for i in $(seq 1 5); do (docker exec mongo mongo rocketchat --eval 'db.dropDatabase()') && xvfb-run --auto-servernum npm run testci && s=0 && break || s=$? && sleep 1; done; (exit $s)
echo -e 'pcm.!default {\n type hw\n card 0\n}\n\nctl.!default {\n type hw\n card 0\n}' > ~/.asoundrc
Xvfb -screen 0 1024x768x24 :99 &
for i in $(seq 1 5); do (docker exec mongo mongo rocketchat --eval 'db.dropDatabase()') && npm run testci && s=0 && break || s=$? && sleep 1; done; (exit $s)
# notification:
# runs-on: ubuntu-latest
Expand Down
12 changes: 6 additions & 6 deletions .meteor/versions
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ accounts-github@1.4.3
accounts-google@1.3.3
accounts-meteor-developer@1.4.2
accounts-oauth@1.2.0
accounts-password@1.6.0
accounts-password@1.6.1
accounts-twitter@1.4.2
aldeed:simple-schema@1.5.4
allow-deny@1.1.0
Expand All @@ -27,8 +27,8 @@ dandv:caret-position@2.1.1
ddp@1.4.0
ddp-client@2.3.3
ddp-common@1.4.0
ddp-rate-limiter@1.0.7
ddp-server@2.3.1
ddp-rate-limiter@1.0.8
ddp-server@2.3.2
deepwell:bootstrap-datepicker2@1.3.0
deps@1.0.12
diff-sequence@1.1.1
Expand Down Expand Up @@ -79,7 +79,7 @@ meteor-base@1.4.0
meteor-developer-oauth@1.2.1
meteorhacks:inject-initial@1.0.4
meteorspark:util@0.2.0
minifier-css@1.5.0
minifier-css@1.5.2
minifier-js@2.6.0
minimongo@1.6.0
mizzao:timesync@0.3.4
Expand All @@ -97,7 +97,7 @@ mystor:device-detection@0.2.0
nimble:restivus@0.8.12
nooitaf:colors@1.1.2_1
npm-bcrypt@0.9.3
npm-mongo@3.7.0
npm-mongo@3.7.1
oauth@1.3.0
oauth1@1.3.0
oauth2@1.3.0
Expand Down Expand Up @@ -130,7 +130,7 @@ session@1.2.0
sha@1.0.9
shell-server@0.5.0
simple:json-routes@2.1.0
socket-stream-client@0.3.0
socket-stream-client@0.3.1
spacebars@1.0.15
spacebars-compiler@1.1.3
srp@1.1.0
Expand Down
1 change: 0 additions & 1 deletion app/authorization/client/views/permissions.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import { hasAllPermission } from '../hasPermission';
import { t } from '../../../utils/client';
import { SideNav } from '../../../ui-utils/client/lib/SideNav';
import { CONSTANTS, AuthorizationUtils } from '../../lib';

import { hasAtLeastOnePermission } from '..';

Template.permissions.helpers({
Expand Down
1 change: 0 additions & 1 deletion app/autotranslate/server/methods/getSupportedLanguages.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { Meteor } from 'meteor/meteor';
import { DDPRateLimiter } from 'meteor/ddp-rate-limiter';

import { hasPermission } from '../../../authorization';

import { TranslationProviderRegistry } from '..';

Meteor.methods({
Expand Down
1 change: 0 additions & 1 deletion app/autotranslate/server/methods/translateMessage.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { Meteor } from 'meteor/meteor';

import { Rooms } from '../../../models';

import { TranslationProviderRegistry } from '..';

Meteor.methods({
Expand Down
1 change: 0 additions & 1 deletion app/importer/server/methods/downloadPublicImportFile.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { Meteor } from 'meteor/meteor';
import { RocketChatImportFileInstance } from '../startup/store';
import { ProgressStep } from '../../lib/ImporterProgressStep';
import { hasPermission } from '../../../authorization';

import { Importers } from '..';

function downloadHttpFile(fileUrl, writeStream) {
Expand Down
1 change: 0 additions & 1 deletion app/importer/server/methods/getImportFileData.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { RocketChatImportFileInstance } from '../startup/store';
import { hasPermission } from '../../../authorization';
import { Imports } from '../../../models';
import { ProgressStep } from '../../lib/ImporterProgressStep';

import { Importers } from '..';

Meteor.methods({
Expand Down
1 change: 0 additions & 1 deletion app/importer/server/methods/getImportProgress.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { Meteor } from 'meteor/meteor';

import { hasPermission } from '../../../authorization';
import { Imports } from '../../../models';

import { Importers } from '..';


Expand Down
1 change: 0 additions & 1 deletion app/importer/server/methods/startImport.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { Meteor } from 'meteor/meteor';

import { hasPermission } from '../../../authorization';
import { Imports } from '../../../models';

import {
Importers,
Selection,
Expand Down
1 change: 0 additions & 1 deletion app/importer/server/methods/uploadImportFile.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { RocketChatFile } from '../../../file';
import { RocketChatImportFileInstance } from '../startup/store';
import { hasPermission } from '../../../authorization';
import { ProgressStep } from '../../lib/ImporterProgressStep';

import { Importers } from '..';

Meteor.methods({
Expand Down
1 change: 0 additions & 1 deletion app/models/server/models/Roles.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Base } from './_Base';

import * as Models from '..';


Expand Down
2 changes: 1 addition & 1 deletion app/models/server/raw/LivechatBusinessHours.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export class LivechatBusinessHoursRaw extends BaseRaw {
async insertOne(data: Omit<ILivechatBusinessHour, '_id'>): Promise<any> {
return this.col.insertOne({
_id: new ObjectId().toHexString(),
ts: new Date(),
...{ ts: new Date() },
...data,
});
}
Expand Down
2 changes: 1 addition & 1 deletion app/models/server/raw/LivechatDepartmentAgents.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export class LivechatDepartmentAgentsRaw extends BaseRaw {
return this.find(query, options);
}

findByDepartmentIds(departmentIds, options) {
findByDepartmentIds(departmentIds, options = {}) {
return this.find({ departmentId: { $in: departmentIds } }, options);
}
}
4 changes: 2 additions & 2 deletions app/models/server/raw/ServerEvents.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ export class ServerEventsRaw extends BaseRaw {
}

async findLastFailedAttemptByIp(ip: string): Promise<IServerEvent | null> {
return this.col.findOne({
return this.col.findOne<IServerEvent>({
ip,
t: IServerEventType.FAILED_LOGIN_ATTEMPT,
}, { sort: { ts: -1 } });
}

async findLastFailedAttemptByUsername(username: string): Promise<IServerEvent | null> {
return this.col.findOne({
return this.col.findOne<IServerEvent>({
'u.username': username,
t: IServerEventType.FAILED_LOGIN_ATTEMPT,
}, { sort: { ts: -1 } });
Expand Down
1 change: 0 additions & 1 deletion app/ui-utils/client/lib/RoomManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import { CachedChatRoom, ChatMessage, ChatSubscription, CachedChatSubscription }
import { CachedCollectionManager } from '../../../ui-cached-collection';
import { getConfig } from '../config';
import { ROOM_DATA_STREAM } from '../../../utils/stream/constants';

import { call } from '..';


Expand Down
2 changes: 1 addition & 1 deletion app/ui-utils/client/lib/SideNav.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export const SideNav = new class {
return false;
}

openFlex(callback) {
openFlex(callback = () => {}) {
if (!this.initiated) {
return this.openQueue.push({
config: this.getFlex(),
Expand Down
1 change: 0 additions & 1 deletion app/ui-utils/client/lib/openRoom.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import { settings } from '../../../settings';
import { callbacks } from '../../../callbacks';
import { roomTypes } from '../../../utils';
import { call, callMethod } from './callMethod';

import { RoomManager, fireGlobalEvent, RoomHistoryManager } from '..';

window.currentTracker = undefined;
Expand Down
1 change: 0 additions & 1 deletion app/webrtc/client/WebRTCClass.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import { Notifications } from '../../notifications';
import { settings } from '../../settings';
import { modal } from '../../ui-utils';
import { ChatSubscription } from '../../models';

import { WEB_RTC_EVENTS } from '..';

class WebRTCTransportClass extends EventEmitter {
Expand Down
14 changes: 7 additions & 7 deletions client/admin/info/InstancesSection.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ export function InstancesSection({ instances }) {
<DescriptionList key={i} title={<Subtitle>{t('Broadcast_Connected_Instances')}</Subtitle>}>
<DescriptionList.Entry label={t('Address')}>{address}</DescriptionList.Entry>
<DescriptionList.Entry label={t('Auth')}>{broadcastAuth ? 'true' : 'false'}</DescriptionList.Entry>
<DescriptionList.Entry label={<>{t('Current_Status')} > {t('Connected')}</>}>{currentStatus.connected ? 'true' : 'false'}</DescriptionList.Entry>
<DescriptionList.Entry label={<>{t('Current_Status')} > {t('Retry_Count')}</>}>{currentStatus.retryCount}</DescriptionList.Entry>
<DescriptionList.Entry label={<>{t('Current_Status')} > {t('Status')}</>}>{currentStatus.status}</DescriptionList.Entry>
<DescriptionList.Entry label={<>{t('Instance_Record')} > {t('ID')}</>}>{instanceRecord._id}</DescriptionList.Entry>
<DescriptionList.Entry label={<>{t('Instance_Record')} > {t('PID')}</>}>{instanceRecord.pid}</DescriptionList.Entry>
<DescriptionList.Entry label={<>{t('Instance_Record')} > {t('Created_at')}</>}>{formatDateAndTime(instanceRecord._createdAt)}</DescriptionList.Entry>
<DescriptionList.Entry label={<>{t('Instance_Record')} > {t('Updated_at')}</>}>{formatDateAndTime(instanceRecord._updatedAt)}</DescriptionList.Entry>
<DescriptionList.Entry label={<>{t('Current_Status')} &gt; {t('Connected')}</>}>{currentStatus.connected ? 'true' : 'false'}</DescriptionList.Entry>
<DescriptionList.Entry label={<>{t('Current_Status')} &gt; {t('Retry_Count')}</>}>{currentStatus.retryCount}</DescriptionList.Entry>
<DescriptionList.Entry label={<>{t('Current_Status')} &gt; {t('Status')}</>}>{currentStatus.status}</DescriptionList.Entry>
<DescriptionList.Entry label={<>{t('Instance_Record')} &gt; {t('ID')}</>}>{instanceRecord._id}</DescriptionList.Entry>
<DescriptionList.Entry label={<>{t('Instance_Record')} &gt; {t('PID')}</>}>{instanceRecord.pid}</DescriptionList.Entry>
<DescriptionList.Entry label={<>{t('Instance_Record')} &gt; {t('Created_at')}</>}>{formatDateAndTime(instanceRecord._createdAt)}</DescriptionList.Entry>
<DescriptionList.Entry label={<>{t('Instance_Record')} &gt; {t('Updated_at')}</>}>{formatDateAndTime(instanceRecord._updatedAt)}</DescriptionList.Entry>
</DescriptionList>,
)}
</>;
Expand Down
8 changes: 0 additions & 8 deletions mocha.opts

This file was deleted.

16 changes: 16 additions & 0 deletions mocha.opts.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
'use strict';

module.exports = {
require: [
'ts-node/register',
'babel-mocha-es6-compiler',
'babel-polyfill',
],
reporter: 'spec',
ui: 'bdd',
extension: 'js,ts',
spec: [
'app/**/*.tests.js',
'app/**/*.tests.ts',
],
};
8 changes: 0 additions & 8 deletions mocha_end_to_end.opts

This file was deleted.

18 changes: 18 additions & 0 deletions mocha_end_to_end.opts.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
'use strict';

module.exports = {
require: [
'babel-mocha-es6-compiler',
'babel-polyfill',
],
reporter: 'spec',
ui: 'bdd',
extension: 'js,ts',
timeout: 10000,
bail: true,
file: 'tests/end-to-end/teardown.js',
spec: [
'tests/end-to-end/api/*.js',
'tests/end-to-end/apps/*.js',
],
};
Loading

0 comments on commit abae419

Please sign in to comment.