DEV: Correct merge conflicts for 9cfe3f9

Mystery-cyf · Jul 24, 2019 · c4ff66e · c4ff66e
1 parent 9cfe3f9
commit c4ff66e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs
@@ -134,9 +134,7 @@
             <td>{{authProvider.account.description}}</td>
             <td>
               {{#if authProvider.method.can_revoke}}
-                {{#conditional-loading-spinner condition=revoking size='small'}}
-                  {{d-button action=(action "revokeAccount") actionParam=authProvider.account title="user.associated_accounts.revoke" class="btn-danger no-text" icon="trash-alt" }}
-                {{/conditional-loading-spinner}}
+                {{d-button action=(action "revokeAccount") actionParam=authProvider.account title="user.associated_accounts.revoke" class="btn-danger no-text" icon="trash-alt" disabled=(get revoking authProvider.method.name) }}
               {{/if}}
             </td>
           {{else}}

diff --git a/spec/requests/omniauth_callbacks_controller_spec.rb b/spec/requests/omniauth_callbacks_controller_spec.rb
@@ -487,7 +487,7 @@ def enabled?
         expect(response.redirect_url).to start_with("http://test.localhost/associate/")
 
         expect(session[:current_user_id]).to eq(user.id)
-        expect(UserAssociatedAccount.count).to eq(0) # Reconnect has not yet happened
+        expect(UserAssociatedAccount.count).to eq(1) # Reconnect has not yet happened
       end
 
     end