Explorar o código

removed priority url from proxy to clsi

Henry Oswald %!s(int64=10) %!d(string=hai) anos
pai
achega
14cbf4f1c8

+ 1 - 4
services/web/app/coffee/Features/Compile/CompileController.coffee

@@ -115,10 +115,7 @@ module.exports = CompileController =
 			if err?
 			if err?
 				logger.err err:err, "error getting cookie jar for clsi request"
 				logger.err err:err, "error getting cookie jar for clsi request"
 				return callback(err)
 				return callback(err)
-			if limits.compileGroup == "priority"
-				compilerUrl = Settings.apis.clsi_priority.url
-			else
-				compilerUrl = Settings.apis.clsi.url
+			compilerUrl = Settings.apis.clsi.url
 			url = "#{compilerUrl}#{url}"
 			url = "#{compilerUrl}#{url}"
 			logger.log url: url, "proxying to CLSI"
 			logger.log url: url, "proxying to CLSI"
 			oneMinute = 60 * 1000
 			oneMinute = 60 * 1000

+ 0 - 42
services/web/test/UnitTests/coffee/Compile/CompileControllerTests.coffee

@@ -206,16 +206,6 @@ describe "CompileController", ->
 					@CompileManager.getProjectCompileLimits = sinon.stub().callsArgWith(1, null, {compileGroup: "priority"})
 					@CompileManager.getProjectCompileLimits = sinon.stub().callsArgWith(1, null, {compileGroup: "priority"})
 					@CompileController.proxyToClsi(@project_id, @url = "/test", @req, @res, @next)
 					@CompileController.proxyToClsi(@project_id, @url = "/test", @req, @res, @next)
 
 
-				it "should proxy to the priority url if the user has the feature", ()->
-					@request
-						.calledWith(
-							jar:@jar
-							method: @req.method
-							url: "#{@settings.apis.clsi_priority.url}#{@url}",
-							timeout: 60 * 1000
-						)
-						.should.equal true
-
 			describe "user with standard priority via query string", ->
 			describe "user with standard priority via query string", ->
 				beforeEach ->
 				beforeEach ->
 					@req.query = {compileGroup: 'standard'}
 					@req.query = {compileGroup: 'standard'}
@@ -239,20 +229,6 @@ describe "CompileController", ->
 				it "should bind an error handle to the request proxy", ->
 				it "should bind an error handle to the request proxy", ->
 					@proxy.on.calledWith("error").should.equal true
 					@proxy.on.calledWith("error").should.equal true
 
 
-			describe "user with priority compile via query string", ->
-				beforeEach ->
-					@req.query = {compileGroup: 'priority'}
-					@CompileController.proxyToClsi(@project_id, @url = "/test", @req, @res, @next)
-
-				it "should proxy to the priority url if the user has the feature", ()->
-					@request
-						.calledWith(
-							jar:@jar
-							method: @req.method
-							url: "#{@settings.apis.clsi_priority.url}#{@url}",
-							timeout: 60 * 1000
-						)
-						.should.equal true
 
 
 			describe "user with non-existent priority via query string", ->
 			describe "user with non-existent priority via query string", ->
 				beforeEach ->
 				beforeEach ->
@@ -316,25 +292,7 @@ describe "CompileController", ->
 				it "should bind an error handle to the request proxy", ->
 				it "should bind an error handle to the request proxy", ->
 					@proxy.on.calledWith("error").should.equal true
 					@proxy.on.calledWith("error").should.equal true
 
 
-			describe "user with priority compile", ->
-				beforeEach ->
-					@CompileManager.getProjectCompileLimits = sinon.stub().callsArgWith(1, null, {compileGroup: "priority"})
-					@CompileController.proxyToClsi(@project_id, @url = "/test", @req, @res, @next)
 
 
-				it "should proxy to the priority url if the user has the feature", ()->
-					@request
-						.calledWith(
-							jar:@jar
-							method: @req.method
-							url: "#{@settings.apis.clsi_priority.url}#{@url}",
-							timeout: 60 * 1000
-							headers: {
-								'Range': '123-456'
-								'If-Range': 'abcdef'
-								'If-Modified-Since': 'Mon, 15 Dec 2014 15:23:56 GMT'
-							}
-						)
-						.should.equal true
 
 
 			describe "user with build parameter via query string", ->
 			describe "user with build parameter via query string", ->
 				beforeEach ->
 				beforeEach ->