mirror of
https://github.com/jashkenas/backbone.git
synced 2026-01-23 05:48:10 -05:00
resolving merge conflict, removing old test.
This commit is contained in:
@@ -101,6 +101,9 @@ $(document).ready(function() {
|
||||
attrs = { 'foo': 1, 'bar': 2, 'baz': 3, 'id': 0 };
|
||||
a = new Backbone.Model(attrs);
|
||||
ok(!a.isNew(), "any defined ID is legal, including zero");
|
||||
ok( new Backbone.Model({ }).isNew(), "is true when there is no id");
|
||||
ok(!new Backbone.Model({ 'id': 2 }).isNew(), "is false for a positive integer");
|
||||
ok(!new Backbone.Model({ 'id': -5 }).isNew(), "is false for a negative integer");
|
||||
});
|
||||
|
||||
test("Model: get", function() {
|
||||
|
||||
@@ -113,13 +113,4 @@ $(document).ready(function() {
|
||||
}, 10);
|
||||
});
|
||||
|
||||
asyncTest("Router: routes (hashbang)", 2, function() {
|
||||
window.location.hash = '!search/news';
|
||||
setTimeout(function() {
|
||||
equals(router.query, 'news');
|
||||
equals(router.page, undefined);
|
||||
start();
|
||||
}, 10);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user