resolving merge conflict, removing old test.

This commit is contained in:
Jeremy Ashkenas
2011-07-05 09:42:15 -04:00
2 changed files with 3 additions and 9 deletions

View File

@@ -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() {

View File

@@ -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);
});
});