mirrors/BitwiseCmd
1
0
Fork 0
mirror of https://github.com/BorysLevytskyi/BitwiseCmd.git synced 2025-12-20 11:42:39 +01:00
Code Issues Projects Releases Wiki Activity

Flatten promises chain in test assertion method

Browse Source
This commit is contained in:
Borys Levytskyi
2015-04-13 12:40:19 +03:00
parent 73f9ed5a44
commit 321a06d0ff
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/e2e/spec.js
View File

@@ -1,7 +1,7 @@
browser.ignoreSynchronization = true; browser.ignoreSynchronization = true;
var By = protractor.By; var By = protractor.By;
var driver = browser.driver; var driver = browser.driver;
var appUrl = browser.params.appUrl || 'http://localhost:63342/BitwiseCmd/src/'; var appUrl = browser.params.appUrl || 'http://localhost:63342/BitwiseCmd/src/#clear';
var Key = protractor.Key; var Key = protractor.Key;
describe('launch of application', function() { describe('launch of application', function() {
@@ -107,12 +107,11 @@ describe('launch of application', function() {
}).then(function(hrefUrl) { }).then(function(hrefUrl) {
return driver.get(hrefUrl); return driver.get(hrefUrl);
}).then(function() { }).then(function() {
console.log('s1');
return driver.findElements(By.css('.result')); return driver.findElements(By.css('.result'));
}).then(function(list) { }).then(function(list) {
expect(list.length).toBeGreaterThan(0); expect(list.length).toBeGreaterThan(0);
return assertExpressionResult(list[0], expected); return assertExpressionResult(list[0], expected);
}).then(function(){console.log('s3')}); });
}); });
@@ -125,7 +124,7 @@ describe('launch of application', function() {
return assertExpressionResult(driver, [{ label: '1', bin:'00000001', other: '0x1'}]) return assertExpressionResult(driver, [{ label: '1', bin:'00000001', other: '0x1'}])
}) })
.then(function() { return sendCommand('clear')}) .then(function() { return sendCommand('clear')})
.then(function() { return sendCommand('em')}) // .then(function() { return sendCommand('em')})
.then(assertNoErrors) .then(assertNoErrors)
.then(function() { return sendCommand('1 3')}) .then(function() { return sendCommand('1 3')})
.then(function() { .then(function() {
@@ -168,21 +167,20 @@ function assertSingleRowResult(row, label, bin, other) {
return row.findElement(by.css('.label')).then(function (tbLabel) { return row.findElement(by.css('.label')).then(function (tbLabel) {
expect(tbLabel.getText()).toBe(label); expect(tbLabel.getText()).toBe(label);
}).then(function () { }).then(function () {
return row.findElement(by.css('.bin')).then(function (tdBin) { return row.findElement(by.css('.bin'));
}).then(function (tdBin) {
expect(tdBin.getText()).toBe(bin); expect(tdBin.getText()).toBe(bin);
})
}).then(function () { }).then(function () {
return row.findElement(by.css('.other')).then(function (tdOther) { return row.findElement(by.css('.other'));
}).then(function (tdOther) {
expect(tdOther.getText()).toBe(other); expect(tdOther.getText()).toBe(other);
})
}); });
} }
function assertOperation(op, expected) { function assertOperation(op, expected) {
return driver.get(appUrl).then(function() { return driver.get(appUrl).then(function() {
return sendCommand('clear') return sendCommand(op)
.then(function() { return sendCommand(op)})
.then(assertNoErrors) .then(assertNoErrors)
.then(function() { .then(function() {
return assertExpressionResult(driver, expected) return assertExpressionResult(driver, expected)