From c918028d14beac7343040460ed9fa947e6fd148e Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Fri, 20 May 2016 12:46:14 +0100 Subject: [PATCH] removed clsi priorty url --- .../Features/Compile/ClsiManager.coffee | 7 ++----- services/web/config/settings.defaults.coffee | 2 -- .../coffee/Compile/ClsiManagerTests.coffee | 20 ------------------- 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/services/web/app/coffee/Features/Compile/ClsiManager.coffee b/services/web/app/coffee/Features/Compile/ClsiManager.coffee index 3285026cfa..ef347a17e0 100755 --- a/services/web/app/coffee/Features/Compile/ClsiManager.coffee +++ b/services/web/app/coffee/Features/Compile/ClsiManager.coffee @@ -53,13 +53,10 @@ module.exports = ClsiManager = _getCompilerUrl: (compileGroup) -> - if compileGroup == "priority" - return Settings.apis.clsi_priority.url - else - return Settings.apis.clsi.url + return Settings.apis.clsi.url _postToClsi: (project_id, req, compileGroup, callback = (error, response) ->) -> - compilerUrl = @_getCompilerUrl(compileGroup) + compilerUrl = Settings.apis.clsi.url opts = url: "#{compilerUrl}/project/#{project_id}/compile" json: req diff --git a/services/web/config/settings.defaults.coffee b/services/web/config/settings.defaults.coffee index 026c451d0c..beb933e4c9 100644 --- a/services/web/config/settings.defaults.coffee +++ b/services/web/config/settings.defaults.coffee @@ -88,8 +88,6 @@ module.exports = url: "http://localhost:3009" clsi: url: "http://localhost:3013" - clsi_priority: - url: "http://localhost:3013" templates: url: "http://localhost:3007" githubSync: diff --git a/services/web/test/UnitTests/coffee/Compile/ClsiManagerTests.coffee b/services/web/test/UnitTests/coffee/Compile/ClsiManagerTests.coffee index 89f312441d..9889bcb87b 100644 --- a/services/web/test/UnitTests/coffee/Compile/ClsiManagerTests.coffee +++ b/services/web/test/UnitTests/coffee/Compile/ClsiManagerTests.coffee @@ -101,14 +101,6 @@ describe "ClsiManager", -> it "should call the callback", -> @callback.called.should.equal true - describe "with the priority compileGroup", -> - beforeEach -> - @ClsiManager.deleteAuxFiles @project_id, {compileGroup: "priority"}, @callback - - it "should call the delete method in the CLSI", -> - @ClsiManager._makeRequest - .calledWith(@project_id, { method:"DELETE", url:"#{@settings.apis.clsi_priority.url}/project/#{@project_id}"}) - .should.equal true describe "_buildRequest", -> beforeEach -> @@ -264,18 +256,6 @@ describe "ClsiManager", -> it "should call the callback with the body and the error", -> @callback.calledWith(new Error("CLSI returned non-success code: 500"), @body).should.equal true - describe "when the compiler is priority", -> - beforeEach -> - @ClsiManager._makeRequest = sinon.stub() - @ClsiManager._postToClsi @project_id, @req, "priority", @callback - - it "should use the clsi_priority url", -> - url = "#{@settings.apis.clsi_priority.url}/project/#{@project_id}/compile" - @ClsiManager._makeRequest.calledWith(@project_id, { - method: "POST", - url: url - json: @req - }).should.equal true describe "wordCount", -> beforeEach ->