From 59c11526f24d53abeb1a0c6c1d4a4222a5d07551 Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Mon, 15 Jan 2018 21:24:08 +0100
Subject: [PATCH] Use latest releases and update test for travis

---
 package-lock.json |  4 +++-
 package.json      |  4 ++--
 spec/bookmarks.js | 10 ++++++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8dcc7477a..add525c32 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -921,7 +921,9 @@
       "dev": true
     },
     "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,
       "requires": {
         "backbone": "1.3.3"
diff --git a/package.json b/package.json
index 0984a77e4..6d41b182a 100644
--- a/package.json
+++ b/package.json
@@ -37,8 +37,8 @@
     "backbone": "1.3.3",
     "backbone.browserStorage": "0.0.3",
     "backbone.nativeview": "^0.3.3",
-    "backbone.overview": "git+https://github.com/jcbrand/Backbone.Overview.git",
-    "backbone.vdomview": "git+https://github.com/jcbrand/backbone.vdomview.git",
+    "backbone.overview": "1.0.0",
+    "backbone.vdomview": "1.0.0",
     "bootstrap": "^3.3.7",
     "bourbon": "^4.3.2",
     "clean-css-cli": "^4.0.10",
diff --git a/spec/bookmarks.js b/spec/bookmarks.js
index 69f550a9e..68a7e693c 100644
--- a/spec/bookmarks.js
+++ b/spec/bookmarks.js
@@ -448,10 +448,12 @@
                     spyOn(window, 'confirm').and.returnValue(true);
                     $('#chatrooms dl.bookmarks dd:nth-child(2) a:nth-child(2)')[0].click();
                     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&apos;s the Thing")
-                    done();
-                });
+
+                    return test_utils.waitUntil(function () {
+                        return $('#chatrooms dl.bookmarks dd a').text().trim() ===
+                            "1st Bookmark  Bookmark with a very very long name that will be shortened  The Play&apos;s the Thing";
+                    }, 300)
+                }).then(done);
             }));
 
             it("remembers the toggle state of the bookmarks list", mock.initConverseWithPromises(