Rename using_password? to already_using_password?

Except on the User drop for liquid templates

Author: jlledom

app/controllers/provider/admin/user/personal_details_controller.rb

@@ -30,7 +30,7 @@ def user_params
   end
 
   def current_password_verification
-    return true unless current_user.using_password?
+    return true unless current_user.already_using_password?
 
     unless current_user.authenticated?(user_params[:current_password])
       flash.now[:danger] = t('.wrong')

app/controllers/provider/passwords_controller.rb

@@ -7,7 +7,7 @@ class Provider::PasswordsController < FrontendController
   before_action :passwords_allowed?
 
   def new
-    return redirect_back_or_to(root_path), danger: t('.has_password') if current_user.using_password?
+    return redirect_back_or_to(root_path), danger: t('.has_password') if current_user.already_using_password?
 
     reset_session_password_token
     token = current_user.generate_lost_password_token

app/lib/authentication/by_password.rb

@@ -78,12 +78,12 @@ def update_password(new_password, new_password_confirmation)
       save
     end
 
-    def using_password?
+    def already_using_password?
       password_digest_in_database.present?
     end
 
     def can_set_password?
-      account.password_login_allowed? && !using_password?
+      account.password_login_allowed? && !already_using_password?
     end
 
     def special_fields

app/views/provider/admin/user/personal_details/edit.html.slim

@@ -18,7 +18,7 @@ div class="pf-c-card"
                                 required: false,
                                 input_html: { value: '', type: 'password', required: false }
 
-      - if current_user.using_password?
+      - if current_user.already_using_password?
         = form.inputs "Provide your current password and update your personal details" do
           = form.input :current_password, as: :patternfly_input,
                                           required: true,

lib/developer_portal/app/controllers/developer_portal/admin/account/personal_details_controller.rb

@@ -50,7 +50,7 @@ def user_params
   end
 
   def verify_current_password
-    return unless current_user.using_password?
+    return unless current_user.already_using_password?
     return if current_user.authenticated?(user_params[:current_password])
 
     resource.errors.add(:current_password, t('activerecord.errors.models.user.current_password_incorrect'))

lib/developer_portal/lib/liquid/drops/user.rb

@@ -93,7 +93,7 @@ def invitation
 
       desc "Returns true if user signed up with password"
       def using_password?
-        @user.using_password?
+        @user.already_using_password?
       end
 
       desc %{

test/functional/partners/providers_controller_test.rb

@@ -94,7 +94,7 @@ def provider_params
     user = assigns(:user)
     assert user.valid?
     assert_nil user.password_digest, 'User should have no password when not provided'
-    assert_not user.using_password?, 'User should not be using password'
+    assert_not user.already_using_password?, 'User should not be using password'
 
     body = JSON.parse(response.body)
     assert_equal true, body['success']

test/functional/partners/users_controller_test.rb

@@ -62,7 +62,7 @@ def setup
 
     assert user.valid?
     assert_nil user.password_digest, 'User should have no password when not provided'
-    assert_not user.using_password?, 'User should not be using password'
+    assert_not user.already_using_password?, 'User should not be using password'
     assert_equal "sso-id", user.open_id
 
     body = JSON.parse(response.body)

test/unit/authentication/by_password_test.rb

@@ -275,20 +275,20 @@ class UsingPasswordTest < MethodsTest
 
       test 'returns true when password is persisted in database' do
         assert @user.password_digest_in_database.present?
-        assert @user.using_password?
+        assert @user.already_using_password?
       end
 
       test 'returns false when password_digest is nil in database' do
         @user.update_column(:password_digest, nil)
 
-        assert_not @user.using_password?
+        assert_not @user.already_using_password?
       end
 
       test 'returns false when password is set but not yet persisted' do
         new_user = @buyer.users.build(username: 'newuser', email: 'new@example.com', password: 'testpassword', password_confirmation: 'testpassword')
 
         assert new_user.password_digest.present?
-        assert_not new_user.using_password?
+        assert_not new_user.already_using_password?
       end
     end
   end