Commit 59c11526 authored by JC Brand's avatar JC Brand

Use latest releases and update test for travis

parent 9b3c6d1a
...@@ -921,7 +921,9 @@ ...@@ -921,7 +921,9 @@
"dev": true "dev": true
}, },
"backbone.overview": { "backbone.overview": {
"version": "git+https://github.com/jcbrand/Backbone.Overview.git#1c67a73be1f43cbb39fcd6b1b5d3cfc0ffdf2b5c", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/backbone.overview/-/backbone.overview-1.0.0.tgz",
"integrity": "sha512-K2tYL4vU74FrW7adYyf0gQ/tYZWy/ZpAEfbEtYCD5I2k7qNUBhEuysByJEUVir/sOyqRzqyKoqNCx3758foeig==",
"dev": true, "dev": true,
"requires": { "requires": {
"backbone": "1.3.3" "backbone": "1.3.3"
......
...@@ -37,8 +37,8 @@ ...@@ -37,8 +37,8 @@
"backbone": "1.3.3", "backbone": "1.3.3",
"backbone.browserStorage": "0.0.3", "backbone.browserStorage": "0.0.3",
"backbone.nativeview": "^0.3.3", "backbone.nativeview": "^0.3.3",
"backbone.overview": "git+https://github.com/jcbrand/Backbone.Overview.git", "backbone.overview": "1.0.0",
"backbone.vdomview": "git+https://github.com/jcbrand/backbone.vdomview.git", "backbone.vdomview": "1.0.0",
"bootstrap": "^3.3.7", "bootstrap": "^3.3.7",
"bourbon": "^4.3.2", "bourbon": "^4.3.2",
"clean-css-cli": "^4.0.10", "clean-css-cli": "^4.0.10",
......
...@@ -448,10 +448,12 @@ ...@@ -448,10 +448,12 @@
spyOn(window, 'confirm').and.returnValue(true); spyOn(window, 'confirm').and.returnValue(true);
$('#chatrooms dl.bookmarks dd:nth-child(2) a:nth-child(2)')[0].click(); $('#chatrooms dl.bookmarks dd:nth-child(2) a:nth-child(2)')[0].click();
expect(window.confirm).toHaveBeenCalled(); expect(window.confirm).toHaveBeenCalled();
expect($('#chatrooms dl.bookmarks dd a').text().trim()).toBe(
"1st Bookmark  Bookmark with a very very long name that will be shortened  The Play's the Thing") return test_utils.waitUntil(function () {
done(); return $('#chatrooms dl.bookmarks dd a').text().trim() ===
}); "1st Bookmark  Bookmark with a very very long name that will be shortened  The Play's the Thing";
}, 300)
}).then(done);
})); }));
it("remembers the toggle state of the bookmarks list", mock.initConverseWithPromises( it("remembers the toggle state of the bookmarks list", mock.initConverseWithPromises(
......
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