Skip to content

Commit 78dad60

Browse files
authored
Merge pull request #82 from adamniedzielski/fix/pass-env-to-cordova-build-task
Pass environment to cordova-build task
2 parents 59bc6c0 + efd4744 commit 78dad60

File tree

2 files changed

+24
-9
lines changed

2 files changed

+24
-9
lines changed

lib/commands/build.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ module.exports = {
5454
return hook.run('beforeBuild')
5555
.then(emberBuild.run(options.environment))
5656
.then(link.run())
57-
.then(cordovaBuild.run(platform))
57+
.then(cordovaBuild.run(platform, options.environment))
5858
.then(hook.run('afterBuild'));
5959
}
6060
};

node-tests/unit/commands/build-test.js

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ describe('Build Command', () => {
3535
}
3636

3737
context('when locationType is hash', () => {
38-
let tasks, buildEnv, cordovaPlatform;
38+
let tasks, emberBuildEnv, cordovaBuildEnv, cordovaPlatform;
3939

4040
beforeEach(() => {
4141
tasks = mockTasks();
@@ -50,18 +50,23 @@ describe('Build Command', () => {
5050
});
5151

5252
td.replace(EmberBldTask.prototype, 'run', (_buildEnv) => {
53-
buildEnv = _buildEnv;
53+
emberBuildEnv = _buildEnv;
5454

5555
tasks.push('ember-build');
5656
return Promise.resolve();
5757
});
5858

59-
td.replace(CdvBuildTask.prototype, 'run', (_cordovaPlatform) => {
60-
cordovaPlatform = _cordovaPlatform;
59+
td.replace(
60+
CdvBuildTask.prototype,
61+
'run',
62+
(_cordovaPlatform, _buildEnv) => {
63+
cordovaPlatform = _cordovaPlatform;
64+
cordovaBuildEnv = _buildEnv;
6165

62-
tasks.push('cordova-build');
63-
return Promise.resolve();
64-
});
66+
tasks.push('cordova-build');
67+
return Promise.resolve();
68+
}
69+
);
6570

6671
td.replace(LinkTask.prototype, 'run', () => {
6772
tasks.push('link');
@@ -95,7 +100,7 @@ describe('Build Command', () => {
95100
environment: passedEnv
96101
});
97102

98-
expect(buildEnv).to.equal(passedEnv);
103+
expect(emberBuildEnv).to.equal(passedEnv);
99104
});
100105

101106
it('passes platform to cordova build task', () => {
@@ -107,6 +112,16 @@ describe('Build Command', () => {
107112

108113
expect(cordovaPlatform).to.equal(passedPlatform);
109114
});
115+
116+
it('passes env to cordova build task', () => {
117+
let passedEnv = 'production';
118+
119+
runBuild({
120+
environment: passedEnv
121+
});
122+
123+
expect(cordovaBuildEnv).to.equal(passedEnv);
124+
});
110125
});
111126

112127
context('when locationType is not hash', () => {

0 commit comments

Comments
 (0)