Clear the flash_msg_div before displaying new flashes during login

https://bugzilla.redhat.com/show_bug.cgi?id=1516734
ManageIQ · Dec 5, 2017 · 661b95b · 661b95b
1 parent a8407dd
commit 661b95b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/app/assets/javascripts/miq_application.js b/app/assets/javascripts/miq_application.js
@@ -721,6 +721,7 @@ function miqAjaxAuth(url) {
     // TODO vanillaJsAPI.autorenew is called on (non-login) page load - when?
   })
   .then(null, function() {
+    clearFlash();
     add_flash(__('Incorrect username or password'), 'error', { id: 'auth_failed' });
 
     miqClearLoginFields();

diff --git a/app/assets/javascripts/miq_flash.js b/app/assets/javascripts/miq_flash.js
@@ -48,6 +48,10 @@ function add_flash(msg, level, options) {
   $('#flash_msg_div').append(textDiv).show();
 }
 
+function clearFlash() {
+  $('#flash_msg_div').empty();
+}
+
 function _miqFlashLoad() {
   return JSON.parse(sessionStorage.getItem('flash_msgs') || '[]');
 }

diff --git a/spec/javascripts/miq_flash_spec.js b/spec/javascripts/miq_flash_spec.js
@@ -0,0 +1,13 @@
+describe('miq_flash.js', function() {
+  describe('clearFlash', function() {
+    beforeEach(function() {
+      var html = '<html><head></head><body><div id="flash_msg_div">test</div></body></html>';
+      setFixtures(html);
+    });
+
+    it('clears the flash_msg_div', function() {
+      clearFlash();
+      expect($('#flash_msg_div').html()).toEqual('');
+    });
+  });
+});