wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-11 01:25:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Activate Websocket and add browser console logging

Browse Source
This commit is contained in:
Chi Vinh Le
2018-05-29 16:42:04 +02:00
parent b15a306c43
commit 3a84da9495
16 changed files with 80 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/cli-assets
+1 -1
View File
@@ -7,7 +7,7 @@
const util = require('./util');
const program = require('commander');
const parseDuration = require('ms');
const Table = require('cli-table');
const Table = require('cli-table2');
const AssetModel = require('../models/asset');
const CommentModel = require('../models/comment');
const AssetsService = require('../services/assets');
bin/cli-token
+1 -1
View File
@@ -8,7 +8,7 @@ const util = require('./util');
const program = require('commander');
const mongoose = require('../services/mongoose');
const TokensService = require('../services/tokens');
const Table = require('cli-table');
const Table = require('cli-table2');
// Register the shutdown criteria.
util.onshutdown([() => mongoose.disconnect()]);
bin/cli-users
+1 -1
View File
@@ -8,7 +8,7 @@ const util = require('./util');
const program = require('commander');
const inquirer = require('inquirer');
const { stripIndent } = require('common-tags');
const Table = require('cli-table');
const Table = require('cli-table2');
// Make things colorful!
require('colors');
client/coral-admin/src/routes/Moderation/graphql.js
-5
View File
@@ -298,11 +298,6 @@ export function handleCommentChange(
notificationShown = true;
};
console.log('root.me', root.me);
console.log('comment.status_history', comment.status_history);
debugger;
Object.keys(queueConfig).forEach(queue => {
// Comment should be placed in queue.
if (nextQueues.indexOf(queue) >= 0) {
package.json
+1 -1
View File
@@ -83,7 +83,7 @@
"brotli-webpack-plugin": "^0.5.0",
"bunyan": "^1.8.12",
"bunyan-debug-stream": "^1.0.8",
"cli-table": "^0.3.1",
"cli-table2": "^0.2.0",
"clipboard": "^1.7.1",
"colors": "^1.1.2",
"commander": "^2.11.0",
scripts/e2e.js
+2 -2
View File
@@ -5,7 +5,7 @@ process.env['NODE_ENV'] = 'test';
const browserstack = require('browserstack-local');
const { onshutdown, shutdown } = require('../bin/util');
const program = require('commander');
const Table = require('cli-table');
const Table = require('cli-table2');
const serve = require('../serve');
const childProcess = require('child_process');
const uuid = require('uuid').v4;
@@ -181,7 +181,7 @@ class E2E {
console.log('Dropping test database');
await mongoose.connection.dropDatabase();
console.log('Starting the server');
await serve();
await serve({ websockets: true });
if (this.browserstackEnabled) {
browserstack.localIdentifier = this.localIdentifier;
test/e2e/utils/SortedWindowHandler.js → test/e2e/helpers/SortedWindowHandler.js
View File
test/e2e/helpers/printBrowserLog.js
+37
View File
@@ -0,0 +1,37 @@
// Make things colorful!
require('colors');
const Table = require('cli-table2');
function getLevelColoried(level) {
switch (level) {
case 'WARNING':
return level.yellow;
case 'SEVERE':
return level.red;
default:
return level;
}
}
function printBrowserLog(client) {
return new Promise(resolve => {
client.getLog('browser', entries => {
if (entries.length) {
let table = new Table({
head: ['Level'.cyan, 'Message'.cyan],
wordWrap: true,
colWidths: [10, 80],
});
for (let entry of entries) {
table.push([getLevelColoried(entry.level), entry.message]);
}
console.log(table.toString());
}
resolve();
});
});
}
module.exports = printBrowserLog;
test/e2e/page_objects/embedStream.js
+1 -1
View File
@@ -1,5 +1,5 @@
const iframeId = 'coralStreamEmbed_iframe';
const SortedWindowHandler = require('../utils/SortedWindowHandler');
const SortedWindowHandler = require('../helpers/SortedWindowHandler');
module.exports = {
commands: [
test/e2e/specs/01_install.js
+4 -1
View File
@@ -1,3 +1,5 @@
const printBrowserLog = require('../helpers/printBrowserLog');
module.exports = {
'@tags': ['install'],
@@ -6,7 +8,8 @@ module.exports = {
client.resizeWindow(1600, 1200);
},
afterEach: (client, done) => {
afterEach: async (client, done) => {
await printBrowserLog(client);
if (client.currentTest.results.failed) {
throw new Error('Test Case failed, skipping all the rest');
}
test/e2e/specs/02_admin.js
+4 -1
View File
@@ -1,3 +1,5 @@
const printBrowserLog = require('../helpers/printBrowserLog');
module.exports = {
'@tags': ['admin', 'login'],
@@ -6,7 +8,8 @@ module.exports = {
client.resizeWindow(1024, 800);
},
afterEach: (client, done) => {
afterEach: async (client, done) => {
await printBrowserLog(client);
if (client.currentTest.results.failed) {
throw new Error('Test Case failed, skipping all the rest');
}
test/e2e/specs/03_embedStream.js
+3 -1
View File
@@ -1,3 +1,4 @@
const printBrowserLog = require('../helpers/printBrowserLog');
const commentBody = 'Embed Stream Test';
module.exports = {
@@ -8,7 +9,8 @@ module.exports = {
client.resizeWindow(1600, 1200);
},
afterEach: (client, done) => {
afterEach: async (client, done) => {
await printBrowserLog(client);
if (client.currentTest.results.failed) {
throw new Error('Test Case failed, skipping all the rest');
}
test/e2e/specs/04_userStatus.js
+4 -1
View File
@@ -1,10 +1,13 @@
const printBrowserLog = require('../helpers/printBrowserLog');
module.exports = {
before: client => {
client.setWindowPosition(0, 0);
client.resizeWindow(1600, 1200);
},
afterEach: (client, done) => {
afterEach: async (client, done) => {
await printBrowserLog(client);
if (client.currentTest.results.failed) {
throw new Error('Test Case failed, skipping all the rest');
}
test/e2e/specs/05_banUser.js
+6 -4
View File
@@ -1,3 +1,4 @@
const printBrowserLog = require('../helpers/printBrowserLog');
const commentBody = 'Ban User Test';
module.exports = {
@@ -6,7 +7,8 @@ module.exports = {
client.resizeWindow(1600, 1200);
},
afterEach: (client, done) => {
afterEach: async (client, done) => {
await printBrowserLog(client);
if (client.currentTest.results.failed) {
throw new Error('Test Case failed, skipping all the rest');
}
@@ -153,8 +155,8 @@ module.exports = {
'approve comment to restore karma': client => {
const moderate = client.page.admin().section.moderate;
moderate.click('@firstCommentApprove');
client.pause(1000000);
moderate.waitForElementNotPresent('@firstComment');
moderate
.click('@firstCommentApprove')
.waitForElementNotPresent('@firstComment');
},
};
test/e2e/specs/06_suspendUser.js
+3 -1
View File
@@ -1,3 +1,4 @@
const printBrowserLog = require('../helpers/printBrowserLog');
const commentBody = 'Suspend User Test';
module.exports = {
@@ -6,7 +7,8 @@ module.exports = {
client.resizeWindow(1600, 1200);
},
afterEach: (client, done) => {
afterEach: async (client, done) => {
await printBrowserLog(client);
if (client.currentTest.results.failed) {
throw new Error('Test Case failed, skipping all the rest');
}
yarn.lock
+12 -5
View File
@@ -2114,11 +2114,14 @@ cli-spinners@^0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-0.1.2.tgz#bb764d88e185fb9e1e6a2a1f19772318f605e31c"
cli-table@^0.3.1:
version "0.3.1"
resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.1.tgz#f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"
cli-table2@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/cli-table2/-/cli-table2-0.2.0.tgz#2d1ef7f218a0e786e214540562d4bd177fe32d97"
dependencies:
colors "1.0.3"
lodash "^3.10.1"
string-width "^1.0.1"
optionalDependencies:
colors "^1.1.2"
cli-truncate@^0.2.1:
version "0.2.1"
@@ -2248,7 +2251,7 @@ colors@0.5.x:
version "0.5.1"
resolved "https://registry.yarnpkg.com/colors/-/colors-0.5.1.tgz#7d0023eaeb154e8ee9fce75dcb923d0ed1667774"
colors@1.0.3, colors@1.0.x:
colors@1.0.x:
version "1.0.3"
resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
@@ -7039,6 +7042,10 @@ lodash.values@^4.3.0:
version "4.17.5"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
lodash@^3.10.1:
version "3.10.1"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
lodash@^4.0.0, lodash@^4.1.0, lodash@^4.2.0, lodash@^4.2.1:
version "4.17.4"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"