Skip to content

Commit

Permalink
Merge branch 'master' of yuisource.corp.yahoo.com:yui3
Browse files Browse the repository at this point in the history
  • Loading branch information
sdesai committed Jun 15, 2011
2 parents 55466d5 + 37558d4 commit 2d7dc32
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/app/tests/app-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ controllerSuite.add(new Y.Test.Case({
}]
});

this.wait(60);
this.wait(1000);
},

'initializer should not dispatch to the current route if `dispatchOnInit` is not true': function () {
Expand All @@ -104,7 +104,7 @@ controllerSuite.add(new Y.Test.Case({

this.wait(function () {
Assert.areSame(0, calls);
}, 60);
}, 100);
},

'when `dispatchOnInit` is true, hash URLs should be upgraded to HTML5 URLs in HTML5 browsers': function () {
Expand Down Expand Up @@ -156,7 +156,7 @@ controllerSuite.add(new Y.Test.Case({
}
});

this.wait(200);
this.wait(1000);
},

'`ready` event should set e.dispatched to true if called after dispatch': function () {
Expand All @@ -176,7 +176,7 @@ controllerSuite.add(new Y.Test.Case({
}
});

this.wait(200);
this.wait(1000);
}
}));

Expand Down Expand Up @@ -266,7 +266,7 @@ controllerSuite.add(new Y.Test.Case({

controller.replace('/replace');

this.wait(200);
this.wait(1000);
},

'save() should create a new history entry': function () {
Expand All @@ -282,7 +282,7 @@ controllerSuite.add(new Y.Test.Case({

controller.save('/save');

this.wait(200);
this.wait(1000);
},

'_joinURL() should normalize / separators': function () {
Expand Down

0 comments on commit 2d7dc32

Please sign in to comment.