[ARVADOS] updated: bc25cf11db28299cfb3cce8d51e253c4d7b6b7c1

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/assets/javascripts/tab_panes.js  | 2 +-
 apps/workbench/test/integration/ajax_errors_test.rb | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

       via  bc25cf11db28299cfb3cce8d51e253c4d7b6b7c1 (commit)
      from  fed95824264369e705b9f148f857295644dae138 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit bc25cf11db28299cfb3cce8d51e253c4d7b6b7c1
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Mar 10 11:40:22 2015 -0400

    5105: Better assertion for tab-loading error display.

diff --git a/apps/workbench/app/assets/javascripts/tab_panes.js b/apps/workbench/app/assets/javascripts/tab_panes.js
index c67772d..0b38dbc 100644
--- a/apps/workbench/app/assets/javascripts/tab_panes.js
+++ b/apps/workbench/app/assets/javascripts/tab_panes.js
@@ -148,7 +148,7 @@ $(document).on('arv:pane:reload', '[data-pane-content-url]', function(e) {
                     replace(/</g, '<').
                     replace(/>/g, '>');
             }
-            $pane.html('<div><p>' +
+            $pane.html('<div class="pane-error-display"><p>' +
                       '<a href="#" class="btn btn-primary tab_reload">' +
                       '<i class="fa fa-fw fa-refresh"></i> ' +
                       'Reload tab</a></p><iframe style="width: 100%"></iframe></div>');
diff --git a/apps/workbench/test/integration/ajax_errors_test.rb b/apps/workbench/test/integration/ajax_errors_test.rb
index de2dfc7..f1c33fa 100644
--- a/apps/workbench/test/integration/ajax_errors_test.rb
+++ b/apps/workbench/test/integration/ajax_errors_test.rb
@@ -17,6 +17,7 @@ class AjaxErrorsTest < ActionDispatch::IntegrationTest
     assert_no_selector '.container-fluid .container-fluid'
     assert_no_text 'If you have never used'
     assert_text 'Reload tab'
+    assert_selector '.pane-error-display'
     page.driver.browser.switch_to.frame 0
     assert_text 'You are not logged in.'
   end
@@ -39,6 +40,7 @@ class AjaxErrorsTest < ActionDispatch::IntegrationTest
     assert_no_selector '.container-fluid .container-fluid'
     assert_no_text 'If you have never used'
     assert_text 'Reload tab'
+    assert_selector '.pane-error-display'
     page.driver.browser.switch_to.frame 0
     assert_text 'You are not logged in.'
   end

-----------------------------------------------------------------------


hooks/post-receive
--