From ffd505860aac5e4e8f2060f9a2c08d7dbe8d87db Mon Sep 17 00:00:00 2001 From: Philipp Muens Date: Mon, 5 Aug 2019 12:41:02 +0200 Subject: [PATCH] Separate regression test --- .../package/lib/packageService.test.js | 30 +++++++++++++++++-- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/lib/plugins/package/lib/packageService.test.js b/lib/plugins/package/lib/packageService.test.js index 6a7f9d575..59672b9f9 100644 --- a/lib/plugins/package/lib/packageService.test.js +++ b/lib/plugins/package/lib/packageService.test.js @@ -25,7 +25,7 @@ describe('#packageService()', () => { packagePlugin.serverless.cli = new serverless.classes.CLI(); packagePlugin.serverless.service.functions = { first: { - handler: 'foo/bar//foo\\bar\\\\foo', + handler: 'foo', }, }; packagePlugin.serverless.service.provider = { runtime: 'nodejs:8.10' }; @@ -346,7 +346,7 @@ describe('#packageService()', () => { expect(resolveFilePathsFromPatternsStub).to.be.calledOnce, expect(zipFilesStub).to.be.calledOnce, expect(zipFilesStub).to.have.been.calledWithExactly(files, zipFileName, undefined, [ - path.normalize(serverless.service.functions[0].handler), + 'foo', ]), ]) ); @@ -367,8 +367,32 @@ describe('#packageService()', () => { expect(getIncludesStub).to.be.calledOnce, expect(resolveFilePathsFromPatternsStub).to.be.calledOnce, expect(zipFilesStub).to.be.calledOnce, + expect(zipFilesStub).to.have.been.calledWithExactly(files, zipFileName, undefined, []), + ]) + ); + } + ); + + (process.platfrom === 'win32' ? it : it.skip)( + 'should normalize the handler path for go runtimes on win32', + () => { + serverless.service.functions.first.handler = 'foo/bar//foo\\bar\\\\foo'; + serverless.service.provider.runtime = 'go1.x'; + + const servicePath = 'test'; + const zipFileName = `${serverless.service.service}.zip`; + + serverless.config.servicePath = servicePath; + + return expect(packagePlugin.packageService()).to.be.fulfilled.then(() => + BbPromise.all([ + expect(getExcludesStub).to.be.calledOnce, + expect(getIncludesStub).to.be.calledOnce, + expect(serverless.service.functions.first), + expect(resolveFilePathsFromPatternsStub).to.be.calledOnce, + expect(zipFilesStub).to.be.calledOnce, expect(zipFilesStub).to.have.been.calledWithExactly(files, zipFileName, undefined, [ - path.normalize(serverless.service.functions[0].handler), + path.normalize(serverless.service.functions.first.handler), ]), ]) );