3 files changed, 18 insertions, 4 deletions
diff --git a/users/app/assets/javascripts/users.js b/users/app/assets/javascripts/users.js
index 9d1a0f0..aaeba6e 100644
--- a/users/app/assets/javascripts/users.js
+++ b/users/app/assets/javascripts/users.js
@@ -28,12 +28,22 @@
     var form = submitEvent.target;
     var token = form.dataset.token;
     var url = form.action;
-    return $.ajax({
+    var req = $.ajax({
       url: url,
       type: 'PUT',
       headers: { Authorization: 'Token token="' + token + '"' },
       data: $(form).serialize()
     });
+    req.done( function() {
+      $(form).find('input[type="submit"]').button('reset');
+    });
+  };
+
+  markAsSubmitted = function(submitEvent) {
+    var form = submitEvent.target;
+    $(form).addClass('submitted')
+    // bootstrap loading state:
+    $(form).find('input[type="submit"]').button('loading');
   };
 
   //
@@ -86,6 +96,7 @@
   //
 
   $(document).ready(function() {
+    $('form').submit(markAsSubmitted);
     $('#new_user').submit(prevent_default);
     $('#new_user').submit(srp.signup);
     $('#new_session').submit(prevent_default);
diff --git a/users/app/views/users/_edit.html.haml b/users/app/views/users/_edit.html.haml
index ae3f32d..9d2473b 100644
--- a/users/app/views/users/_edit.html.haml
+++ b/users/app/views/users/_edit.html.haml
@@ -35,7 +35,7 @@
   = f.input :public_key, :as => :text, :hint => t(:use_ascii_key), :input_html => {:class => "full-width", :rows => 4}
   .control-group
     .controls
-      = f.submit t(:save), :class => 'btn'
+      = f.submit t(:save), :class => 'btn', :data => {"loading-text" => "Saving..."}
 
 -#
 -# DESTROY ACCOUNT
diff --git a/users/test/integration/browser/account_test.rb b/users/test/integration/browser/account_test.rb
index 3434557..1deda45 100644
--- a/users/test/integration/browser/account_test.rb
+++ b/users/test/integration/browser/account_test.rb
@@ -52,8 +52,11 @@ class AccountTest < BrowserIntegrationTest
       fill_in 'Public key', with: pgp_key
       click_on 'Save'
     end
-    debugger
-    assert user = User.find_by_login(username)
+    page.assert_selector 'input[value="Saving..."]'
+    # at some point we're done:
+    page.assert_no_selector 'input[value="Saving..."]'
+    assert page.has_field? 'Public key', with: pgp_key
+    user = User.find_by_login(username)
     assert_equal pgp_key, user.public_key
     user.account.destroy
   end