From ba5810506fd777691d879a06491e10c4e28d8a3b Mon Sep 17 00:00:00 2001 From: ivaosthu Date: Mon, 12 Dec 2016 17:09:44 +0100 Subject: [PATCH] Fix failing tests --- lib/db/strategy-store.js | 6 +++--- test/e2e/helpers/test-helper.js | 8 ++++---- test/e2e/strategy-api.test.js | 3 +++ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/lib/db/strategy-store.js b/lib/db/strategy-store.js index ca6ad9c2b3..ac13132932 100644 --- a/lib/db/strategy-store.js +++ b/lib/db/strategy-store.js @@ -3,7 +3,7 @@ const { STRATEGY_CREATED, STRATEGY_DELETED } = require('../event-type'); const logger = require('../logger'); const NotFoundError = require('../error/notfound-error'); -const STRATEGY_COLUMNS = ['name', 'description', 'parameters_template']; +const STRATEGY_COLUMNS = ['name', 'description', 'parameters']; const TABLE = 'strategies'; class StrategyStore { @@ -44,7 +44,7 @@ class StrategyStore { return { name: row.name, description: row.description, - parametersTemplate: row.parameters_template, + parameters: row.parameters, }; } @@ -52,7 +52,7 @@ class StrategyStore { return { name: data.name, description: data.description, - parameters_template: data.parametersTemplate // eslint-disable-line + parameters: JSON.stringify(data.parameters), }; } diff --git a/test/e2e/helpers/test-helper.js b/test/e2e/helpers/test-helper.js index 958e49ddb3..d84b5b1075 100644 --- a/test/e2e/helpers/test-helper.js +++ b/test/e2e/helpers/test-helper.js @@ -48,14 +48,14 @@ function createStrategies (stores) { { name: 'default', description: 'Default on or off Strategy.', - parametersTemplate: {}, + parameters: [], }, { name: 'usersWithEmail', description: 'Active for users defined in the comma-separated emails-parameter.', - parametersTemplate: { - emails: 'String', - }, + parameters: [ + { name: 'emails', type: 'string' }, + ], }, ].map(strategy => stores.strategyStore._createStrategy(strategy)); } diff --git a/test/e2e/strategy-api.test.js b/test/e2e/strategy-api.test.js index 9eee739d32..40aa3deb0e 100644 --- a/test/e2e/strategy-api.test.js +++ b/test/e2e/strategy-api.test.js @@ -14,6 +14,9 @@ test.serial('gets all strategies', async (t) => { .get('/api/strategies') .expect('Content-Type', /json/) .expect(200) + .expect((res) => { + t.true(res.body.strategies.length === 2, 'expected to have two strategies'); + }) .then(destroy); });