Skip to content

T
todomvc
Commit e515a1ec authored by Colin Eberhardt's avatar Colin Eberhardt
Browse files
Options

Tests that check the full list of todo items are no longer order dependant 

In order to reduce the number of failures for implementations that prepend rather than append items, the tests that check the full list of todo items are no longer order dependant. There is now a single test that checks this requirement:

'should append new items to the bottom of the list'
parent e36fff78
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 40 deletions
browser-tests/package.json
View file @ e515a1ec
......@@ -8,6 +8,7 @@
"selenium-webdriver": "2.37.0",
"optimist" : "0.6.0",
"grunt-simple-mocha": "~0.4.0",
"mocha-known-issues-reporter" : "git://github.com/ColinEberhardt/mocha-known-issues-reporter.git#v0.0.0"
"mocha-known-issues-reporter" : "git://github.com/ColinEberhardt/mocha-known-issues-reporter.git#v0.0.0",
"q" : "1.0.0"
}
}
browser-tests/page.js
View file @ e515a1ec
......@@ -74,6 +74,10 @@ module.exports = function Page(browser) {
return browser.findElements(webdriver.By.xpath('//ul[@id="filters"]//a'));
};
this.getItemLabels = function () {
return browser.findElements(webdriver.By.xpath('//ul[@id="todo-list"]/li//label'));
};
// ----------------- page actions
this.clickMarkAllCompletedCheckBox = function () {
......
browser-tests/test.js
View file @ e515a1ec
......@@ -81,13 +81,10 @@ module.exports.todoMVCTest = function (frameworkName, baseUrl, speedMode, laxMod
test.describe('New Todo', function () {
test.it('should allow me to add todo items', function () {
page.enterItem(TODO_ITEM_ONE);
testOps.assertItemCount(1);
testOps.assertItemText(0, TODO_ITEM_ONE);
testOps.assertItems([TODO_ITEM_ONE]);
page.enterItem(TODO_ITEM_TWO);
testOps.assertItemCount(2);
testOps.assertItemText(1, TODO_ITEM_TWO);
testOps.assertItemText(0, TODO_ITEM_ONE);
testOps.assertItems([TODO_ITEM_ONE, TODO_ITEM_TWO]);
});
test.it('should clear text input field when an item is added', function () {
......@@ -95,6 +92,14 @@ module.exports.todoMVCTest = function (frameworkName, baseUrl, speedMode, laxMod
testOps.assertItemInputFieldText('');
});
test.it('should append new items to the bottom of the list', function () {
createStandardItems();
testOps.assertItemCount(3);
testOps.assertItemText(0, TODO_ITEM_ONE);
testOps.assertItemText(1, TODO_ITEM_TWO);
testOps.assertItemText(2, TODO_ITEM_THREE);
});
test.it('should trim text input', function () {
page.enterItem(' ' + TODO_ITEM_ONE + ' ');
testOps.assertItemText(0, TODO_ITEM_ONE);
......@@ -176,9 +181,7 @@ module.exports.todoMVCTest = function (frameworkName, baseUrl, speedMode, laxMod
page.editItemAtIndex(1, 'buy some sausages' + webdriver.Key.ENTER);
testOps.assertItemText(0, TODO_ITEM_ONE);
testOps.assertItemText(1, 'buy some sausages');
testOps.assertItemText(2, TODO_ITEM_THREE);
testOps.assertItems([TODO_ITEM_ONE, 'buy some sausages', TODO_ITEM_THREE]);
});
test.it('should show the remove button on hover', function () {
......@@ -201,9 +204,7 @@ module.exports.todoMVCTest = function (frameworkName, baseUrl, speedMode, laxMod
page.editItemAtIndex(1, 'buy some sausages' + webdriver.Key.ENTER);
testOps.assertItemText(0, TODO_ITEM_ONE);
testOps.assertItemText(1, 'buy some sausages');
testOps.assertItemText(2, TODO_ITEM_THREE);
testOps.assertItems([TODO_ITEM_ONE, 'buy some sausages', TODO_ITEM_THREE]);
});
test.it('should save edits on blur', function () {
......@@ -215,9 +216,7 @@ module.exports.todoMVCTest = function (frameworkName, baseUrl, speedMode, laxMod
// click a toggle button so that the blur() event is fired
page.toggleItemAtIndex(0);
testOps.assertItemText(0, TODO_ITEM_ONE);
testOps.assertItemText(1, 'buy some sausages');
testOps.assertItemText(2, TODO_ITEM_THREE);
testOps.assertItems([TODO_ITEM_ONE, 'buy some sausages', TODO_ITEM_THREE]);
});
test.it('should trim entered text', function () {
......@@ -226,9 +225,7 @@ module.exports.todoMVCTest = function (frameworkName, baseUrl, speedMode, laxMod
page.editItemAtIndex(1, ' buy some sausages ' + webdriver.Key.ENTER);
testOps.assertItemText(0, TODO_ITEM_ONE);
testOps.assertItemText(1, 'buy some sausages');
testOps.assertItemText(2, TODO_ITEM_THREE);
testOps.assertItems([TODO_ITEM_ONE, 'buy some sausages', TODO_ITEM_THREE]);
});
test.it('should remove the item if an empty text string was entered', function () {
......@@ -237,9 +234,7 @@ module.exports.todoMVCTest = function (frameworkName, baseUrl, speedMode, laxMod
page.editItemAtIndex(1, webdriver.Key.ENTER);
testOps.assertItemCount(2);
testOps.assertItemText(0, TODO_ITEM_ONE);
testOps.assertItemText(1, TODO_ITEM_THREE);
testOps.assertItems([TODO_ITEM_ONE, TODO_ITEM_THREE]);
});
test.it('should cancel edits on escape', function () {
......@@ -248,10 +243,7 @@ module.exports.todoMVCTest = function (frameworkName, baseUrl, speedMode, laxMod
page.editItemAtIndex(1, 'foo' + webdriver.Key.ESCAPE);
testOps.assertItemCount(3);
testOps.assertItemText(0, TODO_ITEM_ONE);
testOps.assertItemText(1, TODO_ITEM_TWO);
testOps.assertItemText(2, TODO_ITEM_THREE);
testOps.assertItems([TODO_ITEM_ONE, TODO_ITEM_TWO, TODO_ITEM_THREE]);
});
});
......@@ -279,8 +271,7 @@ module.exports.todoMVCTest = function (frameworkName, baseUrl, speedMode, laxMod
page.toggleItemAtIndex(1);
page.clickClearCompleteButton();
testOps.assertItemCount(2);
testOps.assertItemText(1, TODO_ITEM_THREE);
testOps.assertItemText(0, TODO_ITEM_ONE);
testOps.assertItems([TODO_ITEM_ONE, TODO_ITEM_THREE]);
});
test.it('should be hidden when there are no items that are completed', function () {
......@@ -300,9 +291,7 @@ module.exports.todoMVCTest = function (frameworkName, baseUrl, speedMode, laxMod
page.toggleItemAtIndex(1);
function stateTest() {
testOps.assertItemCount(2);
testOps.assertItemText(1, TODO_ITEM_TWO);
testOps.assertItemText(0, TODO_ITEM_ONE);
testOps.assertItems([TODO_ITEM_ONE, TODO_ITEM_TWO]);
testOps.assertItemAtIndexIsCompleted(1);
testOps.assertItemAtIndexIsNotCompleted(0);
}
......@@ -325,9 +314,7 @@ module.exports.todoMVCTest = function (frameworkName, baseUrl, speedMode, laxMod
page.toggleItemAtIndex(1);
page.filterByActiveItems();
testOps.assertItemCount(2);
testOps.assertItemText(1, TODO_ITEM_THREE);
testOps.assertItemText(0, TODO_ITEM_ONE);
testOps.assertItems([TODO_ITEM_ONE, TODO_ITEM_THREE]);
});
test.it('should allow me to display completed items', function () {
......@@ -335,8 +322,7 @@ module.exports.todoMVCTest = function (frameworkName, baseUrl, speedMode, laxMod
page.toggleItemAtIndex(1);
page.filterByCompletedItems();
testOps.assertItemCount(1);
testOps.assertItemText(0, TODO_ITEM_TWO);
testOps.assertItems([TODO_ITEM_TWO]);
});
test.it('should allow me to display all items', function () {
......@@ -348,10 +334,7 @@ module.exports.todoMVCTest = function (frameworkName, baseUrl, speedMode, laxMod
page.filterByCompletedItems();
page.filterByAllItems();
testOps.assertItemCount(3);
testOps.assertItemText(0, TODO_ITEM_ONE);
testOps.assertItemText(1, TODO_ITEM_TWO);
testOps.assertItemText(2, TODO_ITEM_THREE);
testOps.assertItems([TODO_ITEM_ONE, TODO_ITEM_TWO, TODO_ITEM_THREE]);
});
test.it('should highlight the currently applied filter', function () {
......
browser-tests/testOperations.js
View file @ e515a1ec
'use strict';
var assert = require('assert');
var assert = require('assert'),
Q = require('q');
function TestOperations(page) {
......@@ -98,6 +99,26 @@ function TestOperations(page) {
});
};
// tests that the list contains the following items, independant of order
this.assertItems = function (textArray) {
page.getItemLabels().then(function (labels) {
assert.equal(textArray.length, labels.length);
// create an array of promises which check the presence of the
// label text within the 'textArray'
var tests = [];
for(var i=0;i<labels.length;i++) {
tests.push(labels[i].getText().then(function (text) {
var index = textArray.indexOf(text);
assert(index !== -1, 'A todo item with text \'' + text + '\' was not found');
// remove this item when found
textArray.splice(index, 1);
}));
}
// execute all the tests
return Q.all(tests);
});
};
this.assertItemCountText = function (textToAssert) {
page.getItemsCountElement().getText().then(function (text) {
assert.equal(textToAssert, text.trim());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7