Chore: Re-enable session tests on local after removal of mongo-unit (#23263)

Co-authored-by: Diego Sampaio <chinello@gmail.com>
pull/23150/head^2
Kevin Aleman 4 years ago committed by GitHub
parent 15b5b1ac98
commit d40c8e76fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      .husky/pre-push
  2. 6
      app/models/server/models/Sessions.tests.js
  3. 9
      server/startup/serverRunning.js

@ -1,2 +1,2 @@
meteor npm run lint && \
meteor npm run testunit -- --exclude app/models/server/models/Sessions.tests.js
meteor npm run testunit

@ -239,7 +239,7 @@ const DATA = {
lastActivityAt: new Date('2019-05-03T02:59:59.999Z'),
}],
sessions_dates,
}; // require('./fixtures/testData.json')
};
describe('Sessions Aggregates', () => {
let db;
@ -251,7 +251,7 @@ describe('Sessions Aggregates', () => {
const version = '5.0.0';
console.log(`Starting mongo version ${ version }`);
mongod = await MongoMemoryServer.create({ binary: { version } });
process.env.MONGO_URL = mongod.getUri();
process.env.MONGO_URL = await mongod.getUri();
});
after(async () => {
@ -261,7 +261,7 @@ describe('Sessions Aggregates', () => {
before(async () => {
console.log(`Connecting to mongo at ${ process.env.MONGO_URL }`);
const client = await MongoClient.connect(process.env.MONGO_URL, { useUnifiedTopology: true });
const client = await MongoClient.connect(process.env.MONGO_URL, { useUnifiedTopology: true, useNewUrlParser: true });
db = client.db('test');
after(() => {

@ -9,8 +9,7 @@ import { settings } from '../../app/settings/server';
import { Info, getMongoInfo } from '../../app/utils/server';
import { Users } from '../../app/models/server';
import { sendMessagesToAdmins } from '../lib/sendMessagesToAdmins';
import { showErrorBox, showSuccessBox } from '../lib/logger/showBox';
import { SystemLogger } from '../lib/logger/system';
import { showErrorBox, showWarningBox, showSuccessBox } from '../lib/logger/showBox';
const exitIfNotBypassed = (ignore, errorCode = 1) => {
if (typeof ignore === 'string' && ['yes', 'true'].includes(ignore.toLowerCase())) {
@ -64,8 +63,7 @@ Meteor.startup(function() {
if (!semver.satisfies(semver.coerce(mongoVersion), '>=3.6.0')) {
msg += ['', '', 'YOUR CURRENT MONGODB VERSION IS NOT SUPPORTED,', 'PLEASE UPGRADE TO VERSION 3.6 OR LATER'].join('\n');
SystemLogger.error_box(msg, 'SERVER ERROR');
showErrorBox('SERVER ERROR', msg);
exitIfNotBypassed(process.env.BYPASS_MONGO_VALIDATION);
}
@ -75,8 +73,7 @@ Meteor.startup(function() {
// Deprecation
if (!semver.satisfies(semver.coerce(mongoVersion), '>=4.2.0')) {
msg = [`YOUR CURRENT MONGODB VERSION (${ mongoVersion }) IS DEPRECATED.`, 'IT WILL NOT BE SUPPORTED ON ROCKET.CHAT VERSION 5.0.0 AND GREATER,', 'PLEASE UPGRADE MONGODB TO VERSION 4.2 OR GREATER'].join('\n');
SystemLogger.deprecation_box(msg, 'DEPRECATION');
showWarningBox('DEPRECATION', msg);
const id = `mongodbDeprecation_${ mongoVersion.replace(/[^0-9]/g, '_') }`;
const title = 'MongoDB_Deprecated';

Loading…
Cancel
Save