diff --git a/services/clsi/app.coffee b/services/clsi/app.coffee index decbf43f30..c79eb92353 100644 --- a/services/clsi/app.coffee +++ b/services/clsi/app.coffee @@ -50,10 +50,11 @@ resCacher = body:{} setContentType:"application/json" -do runSmokeTest = -> - logger.log("running smoke tests") - smokeTest.run(require.resolve(__dirname + "/test/smoke/js/SmokeTests.js"))({}, resCacher) - setTimeout(runSmokeTest, 20 * 1000) +if Settings.smokeTest + do runSmokeTest = -> + logger.log("running smoke tests") + smokeTest.run(require.resolve(__dirname + "/test/smoke/js/SmokeTests.js"))({}, resCacher) + setTimeout(runSmokeTest, 20 * 1000) app.get "/health_check", (req, res)-> res.contentType(resCacher?.setContentType) diff --git a/services/clsi/config/settings.defaults.coffee b/services/clsi/config/settings.defaults.coffee index 8142a546b6..4169f27540 100644 --- a/services/clsi/config/settings.defaults.coffee +++ b/services/clsi/config/settings.defaults.coffee @@ -11,7 +11,6 @@ module.exports = dialect: "sqlite" storage: Path.resolve(__dirname + "/../db.sqlite") - path: compilesDir: Path.resolve(__dirname + "/../compiles") clsiCacheDir: Path.resolve(__dirname + "/../cache") @@ -36,5 +35,5 @@ module.exports = apis: clsi: url: "http://localhost:3013" - - + + smokeTest: false diff --git a/services/clsi/package.json b/services/clsi/package.json index 14a0bc9947..c2d4a669ac 100644 --- a/services/clsi/package.json +++ b/services/clsi/package.json @@ -1,7 +1,11 @@ { "name": "node-clsi", "description": "A Node.js implementation of the CLSI LaTeX web-API", - "version": "0.0.1-dev", + "version": "0.1.1", + "repository": { + "type": "git", + "url": "https://github.com/sharelatex/clsi-sharelatex.git" + }, "author": "James Allen ", "dependencies": { "async": "0.2.9", @@ -9,12 +13,12 @@ "mkdirp": "0.3.5", "mysql": "2.0.0-alpha7", "request": "~2.21.0", - "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#master", - "settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git#master", - "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#master", - "sequelize": "~2.0.0-beta.2", + "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.0.0", + "settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git#v1.0.0", + "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#v1.0.0", + "sequelize": "2.0.0-beta.2", "wrench": "~1.5.4", - "smoke-test-sharelatex": "git+https://github.com/sharelatex/smoke-test-sharelatex.git#master", + "smoke-test-sharelatex": "git+https://github.com/sharelatex/smoke-test-sharelatex.git#v1.0.0", "sqlite3": "~2.2.0", "express": "^4.2.0", "body-parser": "^1.2.0" diff --git a/services/clsi/test/acceptance/fixtures/examples/knitr/output.pdf b/services/clsi/test/acceptance/fixtures/examples/knitr/output.pdf index 365ce1af85..133becbe4b 100644 Binary files a/services/clsi/test/acceptance/fixtures/examples/knitr/output.pdf and b/services/clsi/test/acceptance/fixtures/examples/knitr/output.pdf differ