From da60ef6ab34d67d7f54946a1dc4920a8e6a96c3a 2014-08-27 20:51:49
From: MinRK <benjaminrk@gmail.com>
Date: 2014-08-27 20:51:49
Subject: [PATCH] minor fixes in dashboard tests

events and regular expressions weren't quite right, which could cause occasional test failures.

---

diff --git a/IPython/html/tests/tree/dashboard_nav.js b/IPython/html/tests/tree/dashboard_nav.js
index 6d046ae..d390afb 100644
--- a/IPython/html/tests/tree/dashboard_nav.js
+++ b/IPython/html/tests/tree/dashboard_nav.js
@@ -6,19 +6,20 @@ casper.get_list_items = function () {
             return {
                 link: $(this).attr('href'),
                 label: $(this).find('.item_name').text()
-            }
+            };
         }));
     });
-}
+};
 
 casper.test_items = function (baseUrl) {
     casper.then(function () {
         var items = casper.get_list_items();
         casper.each(items, function (self, item) {
-            if (!item.label.match('.ipynb$')) {
+            if (!item.label.match(/\.ipynb$/)) {
                 var followed_url = baseUrl+item.link;
-                if (!followed_url.match('/\.\.$')) {
+                if (!followed_url.match(/\/\.\.$/)) {
                     casper.thenOpen(followed_url, function () {
+                        this.waitFor(this.page_loaded);
                         casper.wait_for_dashboard();
                         // getCurrentUrl is with host, and url-decoded,
                         // but item.link is without host, and url-encoded
@@ -31,10 +32,10 @@ casper.test_items = function (baseUrl) {
             }
         });
     });
-}
+};
 
 casper.dashboard_test(function () {
     baseUrl = this.get_notebook_server();
     casper.test_items(baseUrl);
-})
+});