diff --git a/lib/server-builder.js b/lib/server-builder.js index 26340c1e8..c527b48ee 100644 --- a/lib/server-builder.js +++ b/lib/server-builder.js @@ -72,7 +72,7 @@ class ServerBuilder { } getCommand () { - const cmd = system.isWindows() ? 'gradlew.bat' : './gradlew'; + const cmd = system.isWindows() ? 'gradlew.bat' : path.resolve(this.serverPath, 'gradlew'); const buildProperty = (key, value) => value ? `-P${key}=${value}` : null; let args = VERSION_KEYS .filter((key) => key !== GRADLE_VERSION_KEY) diff --git a/test/unit/server-builder-specs.js b/test/unit/server-builder-specs.js index 7ef5bb5fa..d059b7f02 100644 --- a/test/unit/server-builder-specs.js +++ b/test/unit/server-builder-specs.js @@ -12,11 +12,11 @@ chai.use(chaiAsPromised); describe('server-builder', function () { describe('getCommand', function () { - const expectedCmd = system.isWindows() ? 'gradlew.bat' : './gradlew'; + const expectedCmd = system.isWindows() ? 'gradlew.bat' : '/path/to/project/gradlew'; it('should not pass properties when no versions are specified', function () { const expected = {cmd: expectedCmd, args: ['app:assembleAndroidTest']}; - new ServerBuilder(log).getCommand().should.eql(expected); + new ServerBuilder(log, {serverPath: '/path/to/project'}).getCommand().should.eql(expected); }); it('should pass only specified versions as properties and pass them correctly', function () { @@ -26,7 +26,8 @@ describe('server-builder', function () { toolsVersions: { androidGradlePlugin: '1.2.3' } - } + }, + serverPath: '/path/to/project' }); serverBuilder.getCommand().should.eql(expected); }); @@ -41,7 +42,8 @@ describe('server-builder', function () { toolsVersions: { [unknownKey]: '1.2.3' } - } + }, + serverPath: '/path/to/project' }); serverBuilder.getCommand().should.eql(expected); }); @@ -53,7 +55,8 @@ describe('server-builder', function () { toolsVersions: { gradle_version: '1.2.3' } - } + }, + serverPath: '/path/to/project' }); serverBuilder.getCommand().should.eql(expected); });