From 7503ba9ab3d5c2b9229678b26a4eb07c7e67e13e Mon Sep 17 00:00:00 2001 From: David Jay Date: Wed, 30 Nov 2016 16:27:03 -0500 Subject: [PATCH] Moving settings to mocks. --- tests/e2e/mocks.js | 4 ++++ tests/e2e/tests/EmbedStreamTests.js | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/e2e/mocks.js b/tests/e2e/mocks.js index de8272e4d..a4f430cd5 100644 --- a/tests/e2e/mocks.js +++ b/tests/e2e/mocks.js @@ -2,6 +2,7 @@ const Comments = require('../../models/comment'); const Users = require('../../models/user'); const Actions = require('../../models/action'); const Assets = require('../../models/asset'); +const Settings = require('../../models/setting'); const globals = require('./globals'); /* Create an array of comments */ @@ -19,3 +20,6 @@ module.exports.users = (users) => Users.createLocalUsers(users); /* Create an array of actions */ module.exports.actions = (actions) => Actions.create(actions); + +/* Update a setting */ +module.exports.settings = (setting) => Settings.init().then(() => Settings.updateSettings(setting)); diff --git a/tests/e2e/tests/EmbedStreamTests.js b/tests/e2e/tests/EmbedStreamTests.js index 83b920802..6c97297d7 100644 --- a/tests/e2e/tests/EmbedStreamTests.js +++ b/tests/e2e/tests/EmbedStreamTests.js @@ -16,7 +16,7 @@ module.exports = { }, 'User registers and posts a comment with premod off': client => { client.perform((client, done) => { - client.page.embedStream().setConfig({moderation: 'post'}, client.globals.baseUrl) + mocks.settings({moderation: 'pre'}) .then(() => { //Load Page client.resizeWindow(1200, 800) @@ -52,7 +52,7 @@ module.exports = { }, 'User posts a comment with premod on': client => { client.perform((client, done) => { - client.page.embedStream().setConfig({moderation: 'pre'}, client.globals.baseUrl) + mocks.settings({moderation: 'pre'}) .then(() => { //Load Page client.url(client.globals.baseUrl) @@ -73,7 +73,7 @@ module.exports = { }, 'User replies to a comment with premod off': client => { client.perform((client, done) => { - client.page.embedStream().setConfig({moderation: 'post'}, client.globals.baseUrl) + mocks.settings({moderation: 'pre'}) .then(() => { //Load Page client.resizeWindow(1200, 800) @@ -96,7 +96,7 @@ module.exports = { }, 'User replies to a comment with premod on': client => { client.perform((client, done) => { - client.page.embedStream().setConfig({moderation: 'pre'}, client.globals.baseUrl) + mocks.settings({moderation: 'pre'}) // Add a mock user .then(() => mocks.users([{ displayName: 'Baby Blue',