Merge pull request #6881 from guerler/fix_selenium

Fix selenium test selectors for alert messages
galaxyproject · Oct 17, 2018 · af05cb4 · af05cb4
2 parents fbe9e97 + e5186a8
commit af05cb4
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/templates/user/info.mako b/templates/user/info.mako
@@ -18,24 +18,24 @@
             }
 
             function renderError(message) {
-                $(".donemessage").hide();
-                if ($(".errormessage").length === 1) {
-                    $(".errormessage").html(message);
+                $(".alert-info").hide();
+                if ($(".alert-danger").length === 1) {
+                    $(".alert-danger").html(message);
                 } else {
                     var div = document.createElement( "div" );
-                    div.className = "errormessage";
+                    div.className = "alert alert-danger";
                     div.innerHTML = message;
                     document.body.insertBefore( div, document.body.firstChild );
                 }
             }
 
             function renderDone(message) {
-                $(".errormessage").hide();
-                if ($(".donemessage").length === 1) {
-                    $(".donemessage").html(message);
+                $(".alert-danger").hide();
+                if ($(".alert-info").length === 1) {
+                    $(".alert-info").html(message);
                 } else {
                     var div = document.createElement( "div" );
-                    div.className = "donemessage";
+                    div.className = "alert alert-info";
                     div.innerHTML = message;
                     document.body.insertBefore( div, document.body.firstChild );
                 }

diff --git a/templates/user/register.mako b/templates/user/register.mako
@@ -79,12 +79,12 @@ def inherit(context):
             }
 
             function renderError(message) {
-                if (!$(".errormessage").size()) {
-                    $('<div/>').addClass('errormessage').insertBefore('#registrationForm');
+                if (!$(".alert-danger").size()) {
+                    $('<div/>').addClass('alert alert-danger').insertBefore('#registrationForm');
                 }
                 console.debug( $( '#registrationForm' ) );
-                console.debug( '.errormessage:', $( '.errormessage' ) );
-                $(".errormessage").html(message);
+                console.debug( '.alert-danger:', $( '.alert-danger' ) );
+                $(".alert-danger").html(message);
             }
 
             $("[name='password']").complexify({'minimumChars':6}, function(valid, complexity){

diff --git a/templates/webapps/galaxy/history/share.mako b/templates/webapps/galaxy/history/share.mako
@@ -52,7 +52,7 @@
                 %if send_to_err:
                     <div style="clear: both"></div>
                     <div class="form-row">
-                        <div class="errormessage">${send_to_err}</div>
+                        <div class="alert alert-danger">${send_to_err}</div>
                     </div>
                 %endif
                 <div style="clear: both"></div>
@@ -157,7 +157,7 @@
                     %if send_to_err:
                         <div style="clear: both"></div>
                         <div class="form-row">
-                            <div class="errormessage">${send_to_err}</div>
+                            <div class="alert alert-danger">${send_to_err}</div>
                         </div>
                     %endif
                     ## Needed for rebuilding dicts
@@ -223,7 +223,7 @@
                         ## cannot_change looks like: {historyX : [hda, hda], historyY : [hda] }
                         <div style="clear: both"></div>
                         <div class="form-row">
-                            <div class="errormessage">
+                            <div class="alert alert-danger">
                                 The following datasets cannot be shared with ${email} because you are not authorized to 
                                 change the permissions on them
                             </div>

diff --git a/test/galaxy_selenium/navigation.yml b/test/galaxy_selenium/navigation.yml
@@ -18,11 +18,11 @@ _:  # global stuff
 
   messages:
     selectors:
-      all: '[class*="message"]'
-      error: '.errormessage'
+      all: '[class*="alert"]'
+      error: '.alert-danger'
       warning: '.alert-warning'
-      done: '.donemessage'
-      info: '.infomessage'
+      done: '.alert-success'
+      info: '.alert-info'
       donelarge: '.donemessagelarge'
       infolarge: '.infomessagelarge'