From f7ba0946be27ea716358818d1a760dd23236a4ce Mon Sep 17 00:00:00 2001 From: James Allen Date: Tue, 29 Nov 2016 15:09:11 +0000 Subject: [PATCH] More acceptance test fixes --- services/document-updater/Gruntfile.coffee | 18 +++++++++--------- .../coffee/SettingADocumentTests.coffee | 3 ++- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/services/document-updater/Gruntfile.coffee b/services/document-updater/Gruntfile.coffee index 042fe32ce2..2e0e12dd66 100644 --- a/services/document-updater/Gruntfile.coffee +++ b/services/document-updater/Gruntfile.coffee @@ -1,13 +1,4 @@ module.exports = (grunt) -> - grunt.loadNpmTasks 'grunt-contrib-coffee' - grunt.loadNpmTasks 'grunt-contrib-clean' - grunt.loadNpmTasks 'grunt-mocha-test' - grunt.loadNpmTasks 'grunt-available-tasks' - grunt.loadNpmTasks 'grunt-execute' - grunt.loadNpmTasks 'grunt-bunyan' - grunt.loadNpmTasks 'grunt-forever' - grunt.loadNpmTasks 'grunt-shell' - grunt.initConfig forever: app: @@ -107,6 +98,15 @@ module.exports = (grunt) -> "help" ] + grunt.loadNpmTasks 'grunt-contrib-coffee' + grunt.loadNpmTasks 'grunt-contrib-clean' + grunt.loadNpmTasks 'grunt-mocha-test' + grunt.loadNpmTasks 'grunt-available-tasks' + grunt.loadNpmTasks 'grunt-execute' + grunt.loadNpmTasks 'grunt-bunyan' + grunt.loadNpmTasks 'grunt-forever' + grunt.loadNpmTasks 'grunt-shell' + grunt.registerTask 'help', 'Display this help list', 'availabletasks' grunt.registerTask 'compile:server', 'Compile the server side coffee script', ['clean:app', 'coffee:app', 'coffee:app_dir'] diff --git a/services/document-updater/test/acceptance/coffee/SettingADocumentTests.coffee b/services/document-updater/test/acceptance/coffee/SettingADocumentTests.coffee index 0d05e30982..243b3db234 100644 --- a/services/document-updater/test/acceptance/coffee/SettingADocumentTests.coffee +++ b/services/document-updater/test/acceptance/coffee/SettingADocumentTests.coffee @@ -3,7 +3,8 @@ chai = require("chai") chai.should() expect = require("chai").expect {db, ObjectId} = require "../../../app/js/mongojs" -rclient = require("redis").createClient() +Settings = require('settings-sharelatex') +rclient = require("redis-sharelatex").createClient(Settings.redis.web) MockTrackChangesApi = require "./helpers/MockTrackChangesApi" MockWebApi = require "./helpers/MockWebApi"