github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-01-27 14:51:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

move texliveImageNameOveride further down request so it works for

Browse source 
compile tests
This commit is contained in:
Henry Oswald 2018-07-13 11:52:49 +01:00
parent c8d3c39bea
commit 846c2b1e28
3 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
services/clsi/app/coffee/RequestParser.coffee
View file

@ -69,10 +69,6 @@ module.exports = RequestParser =
sanitizedRootResourcePath = RequestParser._sanitizePath(rootResourcePath) sanitizedRootResourcePath = RequestParser._sanitizePath(rootResourcePath)
response.rootResourcePath = RequestParser._checkPath(sanitizedRootResourcePath) response.rootResourcePath = RequestParser._checkPath(sanitizedRootResourcePath)
if settings.texliveImageNameOveride? and compile.options?.imageName?
tag = compile.options.imageName.split(":")[1]
response.imageName = "#{settings.texliveImageNameOveride}:#{tag}"
for resource in response.resources for resource in response.resources
if resource.path == originalRootResourcePath if resource.path == originalRootResourcePath
resource.path = sanitizedRootResourcePath resource.path = sanitizedRootResourcePath

10
services/clsi/test/unit/coffee/DockerRunnerTests.coffee
View file

@ -135,6 +135,16 @@ describe "DockerRunner", ->
@DockerRunner._getContainerOptions @DockerRunner._getContainerOptions
.calledWith(@command_with_dir, @defaultImage, @volumes, @timeout) .calledWith(@command_with_dir, @defaultImage, @volumes, @timeout)
.should.equal true .should.equal true
describe "with image override", ->
beforeEach ->
@Settings.texliveImageNameOveride = "overrideimage/here"
@DockerRunner._runAndWaitForContainer = sinon.stub().callsArgWith(3, null, @output = "mock-output")
@DockerRunner.run @project_id, @command, @directory, @image, @timeout, @env, @callback
it "should use the override and keep the tag", ->
image = @DockerRunner._getContainerOptions.args[0][1]
image.should.equal "overrideimage/here:2016.2"
describe "_runAndWaitForContainer", -> describe "_runAndWaitForContainer", ->
beforeEach -> beforeEach ->

8
services/clsi/test/unit/coffee/RequestParserTests.coffee
View file

@ -66,14 +66,6 @@ describe "RequestParser", ->
it "should set the imageName", -> it "should set the imageName", ->
@data.imageName.should.equal "basicImageName/here:2017-1" @data.imageName.should.equal "basicImageName/here:2017-1"
describe "with texliveImageNameOveride set", ->
beforeEach ->
@settings.texliveImageNameOveride = "usethisoveride/overhere"
@RequestParser.parse @validRequest, (error, @data) =>
it "should override the image path", ->
@data.imageName.should.equal "usethisoveride/overhere:2017-1"
describe "without a timeout specified", -> describe "without a timeout specified", ->
beforeEach -> beforeEach ->
delete @validRequest.compile.options.timeout delete @validRequest.compile.options.timeout