Skip to content

Commit 40a0549

Browse files
committed
debugging
1 parent d650428 commit 40a0549

File tree

1 file changed

+63
-39
lines changed

1 file changed

+63
-39
lines changed

tests/e2e/e2e_workflow.spec.js

Lines changed: 63 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ var conf = require('ember-cli/tests/helpers/conf');
99
var sh = require('shelljs');
1010
var treeKill = require('tree-kill');
1111
var child_process = require('child_process');
12-
var Promise = require('ember-cli/lib/ext/promise');
13-
var execPromise = Promise.denodeify(child_process.exec);
1412
var ng = require('../helpers/ng');
1513
var root = path.join(process.cwd(), 'tmp');
1614

@@ -127,26 +125,52 @@ describe('Basic end-to-end Workflow', function () {
127125
function executor(resolve, reject) {
128126
var serveFailedMsg = 'ng serve command failed';
129127
var e2eFailedMsg = 'ng serve command failed';
130-
var child = child_process.exec('ng serve');
128+
var child = child_process.exec(`${ngBin} serve`);
129+
var startedProtractor = false;
131130
ngServePid = child.pid;
132131

133132
child.stdout.on('data', (data) => {
134-
if (/^Build successful/.test(data)) {
135-
resolve(execPromise('ng e2e').catch(() => Promise.reject(e2eFailedMsg)));
133+
// console.log(`stdout: ##${data}##`);
134+
if (/^Build successful/.test(data) && !startedProtractor) {
135+
startedProtractor = true;
136+
child_process.exec(`${ngBin} e2e`, (error, stdout, stderr) => {
137+
console.log(`e2e stdout: ###${stdout}###`);
138+
console.log(`e2e stderr: ###${stderr}###`);
139+
if (error !== null) {
140+
console.log(`e2e exec error: ###${error}###`);
141+
reject(e2eFailedMsg)
142+
} else {
143+
resolve();
144+
}
145+
});
146+
// resolve(execPromise(`${ngBin} e2e`).then((succ) => {
147+
// console.log(`e2e success: ##${succ}##`);
148+
// }).catch((err) => {
149+
// console.log(`e2e err: ##${err}##`);
150+
// Promise.reject(e2eFailedMsg)
151+
// }));
136152
} else if (/ failed with:/.test(data)) {
137153
reject(serveFailedMsg);
138154
}
139155
});
140156

141-
child.stderr.on('data', () => reject(serveFailedMsg));
142-
child.on('close', (code) => code === 0 ? resolve() : reject(serveFailedMsg));
157+
child.stderr.on('data', () => {
158+
// console.log(`stderr: ##${data}##`);
159+
reject(serveFailedMsg);
160+
});
161+
child.on('close', (code) => {
162+
// console.log(`close: ##${code}##`);
163+
code === 0 ? resolve() : reject(serveFailedMsg)
164+
});
143165
}
144166

145167
return new Promise(executor)
146168
.then(() => {
169+
console.log(`###resolve###`);
147170
if (ngServePid) treeKill(ngServePid);
148171
})
149172
.catch((msg) => {
173+
console.log(`###reject###`);
150174
if (ngServePid) treeKill(ngServePid);
151175
throw new Error(msg);
152176
});
@@ -411,36 +435,36 @@ describe('Basic end-to-end Workflow', function () {
411435
});
412436
});
413437

414-
it('Serve and run e2e tests after final build', function () {
415-
this.timeout(420000);
416-
417-
var ngServePid;
418-
419-
function executor(resolve, reject) {
420-
var serveFailedMsg = 'ng serve command failed';
421-
var e2eFailedMsg = 'ng serve command failed';
422-
var child = child_process.exec(`${ngBin} serve`);
423-
ngServePid = child.pid;
424-
425-
child.stdout.on('data', (data) => {
426-
if (/^Build successful/.test(data)) {
427-
resolve(execPromise(`${ngBin} e2e`).catch(() => Promise.reject(e2eFailedMsg)));
428-
} else if (/ failed with:/.test(data)) {
429-
reject(serveFailedMsg);
430-
}
431-
});
432-
433-
child.stderr.on('data', () => reject(serveFailedMsg));
434-
child.on('close', (code) => code === 0 ? resolve() : reject(serveFailedMsg));
435-
}
436-
437-
return new Promise(executor)
438-
.then(() => {
439-
if (ngServePid) treeKill(ngServePid);
440-
})
441-
.catch((msg) => {
442-
if (ngServePid) treeKill(ngServePid);
443-
throw new Error(msg);
444-
});
445-
});
438+
// it('Serve and run e2e tests after final build', function () {
439+
// this.timeout(420000);
440+
441+
// var ngServePid;
442+
443+
// function executor(resolve, reject) {
444+
// var serveFailedMsg = 'ng serve command failed';
445+
// var e2eFailedMsg = 'ng serve command failed';
446+
// var child = child_process.exec(`${ngBin} serve`);
447+
// ngServePid = child.pid;
448+
449+
// child.stdout.on('data', (data) => {
450+
// if (/^Build successful/.test(data)) {
451+
// resolve(execPromise(`${ngBin} e2e`).catch(() => Promise.reject(e2eFailedMsg)));
452+
// } else if (/ failed with:/.test(data)) {
453+
// reject(serveFailedMsg);
454+
// }
455+
// });
456+
457+
// child.stderr.on('data', () => reject(serveFailedMsg));
458+
// child.on('close', (code) => code === 0 ? resolve() : reject(serveFailedMsg));
459+
// }
460+
461+
// return new Promise(executor)
462+
// .then(() => {
463+
// if (ngServePid) treeKill(ngServePid);
464+
// })
465+
// .catch((msg) => {
466+
// if (ngServePid) treeKill(ngServePid);
467+
// throw new Error(msg);
468+
// });
469+
// });
446470
});

0 commit comments

Comments
 (0)