Commit 2ea32f90 authored by Colin Eberhardt's avatar Colin Eberhardt

Reverted commented out code

That'll teach me to look more closely at my diffs ;-)
parent f6514a85
......@@ -8,7 +8,7 @@ var testSuite = require('./test.js'),
var list = fs.readdirSync("../architecture-examples/")
.map(function(folderName) { return { name : folderName, path : "architecture-examples/" + folderName} });
/*list = list.concat(fs.readdirSync("../labs/architecture-examples/")
list = list.concat(fs.readdirSync("../labs/architecture-examples/")
.map(function(folderName) { return { name : folderName, path: "labs/architecture-examples/" + folderName} }));
list = list.concat(fs.readdirSync("../labs/dependency-examples/")
......@@ -16,8 +16,8 @@ list = list.concat(fs.readdirSync("../labs/dependency-examples/")
list = list.concat(fs.readdirSync("../dependency-examples/")
.map(function(folderName) { return { name : folderName, path: "dependency-examples/" + folderName} }));
*/
// apps that are not hosted at the root of their folder need to b ehandled explicitly
// apps that are not hosted at the root of their folder need to be handled explicitly
var exceptions = [
{ name : "chaplin-brunch", path : "labs/dependency-examples/chaplin-brunch/public" }
];
......@@ -30,7 +30,7 @@ list = list.map(function(framework) {
list = list.filter(function(framework) { return frameworkNamePattern.test(framework.name); });
// if a specific framework has been named, just run this one
if (argv.framework) {
if (argv.framework) {
list = list.filter(function(framework) { return framework.name === argv.framework});
}
......
......@@ -84,7 +84,6 @@ exports.todoMVCTest = function(frameworkName, baseUrl, speedMode, laxMode) {
testOps.assertItemText(0, TODO_ITEM_ONE);
page.enterItem(TODO_ITEM_TWO);
browser.sleep(1000);
testOps.assertItemCount(2);
testOps.assertItemText(1, TODO_ITEM_TWO);
testOps.assertItemText(0, TODO_ITEM_ONE);
......@@ -149,13 +148,12 @@ exports.todoMVCTest = function(frameworkName, baseUrl, speedMode, laxMode) {
page.enterItem(TODO_ITEM_TWO);
page.toggleItemAtIndex(0);
browser.sleep(1000);
// testOps.assertItemAtIndexIsCompleted(0);
testOps.assertItemAtIndexIsCompleted(0);
testOps.assertItemAtIndexIsNotCompleted(1);
// page.toggleItemAtIndex(1);
// testOps.assertItemAtIndexIsCompleted(0);
// testOps.assertItemAtIndexIsCompleted(1);
page.toggleItemAtIndex(1);
testOps.assertItemAtIndexIsCompleted(0);
testOps.assertItemAtIndexIsCompleted(1);
});
test.it('should allow me to un-mark items as complete', function () {
......@@ -327,8 +325,8 @@ exports.todoMVCTest = function(frameworkName, baseUrl, speedMode, laxMode) {
page.filterByActiveItems();
testOps.assertItemCount(2);
// testOps.assertItemText(1, TODO_ITEM_THREE);
//testOps.assertItemText(0, TODO_ITEM_ONE);
testOps.assertItemText(1, TODO_ITEM_THREE);
testOps.assertItemText(0, TODO_ITEM_ONE);
});
test.it('should allow me to display completed items', function () {
......
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