fix merge conflicts

Author: RenzoMinelli

lib/devise/webauthn/helpers/credentials_helper.rb

@@ -58,15 +58,6 @@ def login_with_security_key_form_for(resource_or_resource_name, form_classes: ni
           end
         end
       end
-
-      private
-
-      def resource_human_palatable_identifier
-        authentication_keys = resource.class.authentication_keys
-        authentication_keys = authentication_keys.keys if authentication_keys.is_a?(Hash)
-
-        authentication_keys.filter_map { |authentication_key| resource.public_send(authentication_key) }.first
-      end
     end
   end
 end

spec/helpers/devise/webauthn/credentials_helper_spec.rb

@@ -48,7 +48,7 @@ def have_hidden_credential_field
 
   describe "#login_with_passkey_form_for" do
     it "renders a form with webauthn_get element and hidden credential field" do
-      html = helper.login_with_passkey_form_for(session_path: "/accounts/sign_in") do |form|
+      html = helper.login_with_passkey_form_for(:account) do |form|
         form.submit "Log in with passkeys"
       end
 
@@ -60,15 +60,15 @@ def have_hidden_credential_field
     end
 
     it "accepts form_classes option" do
-      html = helper.login_with_passkey_form_for(session_path: "/sign_in", form_classes: "passkey-form") do |form|
+      html = helper.login_with_passkey_form_for(:account, form_classes: "passkey-form") do |form|
         form.submit "Login"
       end
 
       expect(parse(html)).to have_css("form.passkey-form")
     end
 
     it "allows custom content in the block" do
-      html = helper.login_with_passkey_form_for(session_path: "/sign_in") do |form|
+      html = helper.login_with_passkey_form_for(:account) do |form|
         helper.content_tag(:div, class: "button-wrapper") do
           form.submit "Sign in", class: "btn-primary"
         end
@@ -104,7 +104,7 @@ def have_hidden_credential_field
 
   describe "#login_with_security_key_form_for" do
     it "renders a form with webauthn_get element" do
-      html = helper.login_with_security_key_form_for(resource: user) do |form|
+      html = helper.login_with_security_key_form_for(:account) do |form|
         form.submit "Use security key"
       end
 
@@ -116,15 +116,15 @@ def have_hidden_credential_field
     end
 
     it "accepts form_classes option" do
-      html = helper.login_with_security_key_form_for(resource: user, form_classes: "two-factor-form") do |form|
+      html = helper.login_with_security_key_form_for(:account, form_classes: "two-factor-form") do |form|
         form.submit "Verify"
       end
 
       expect(parse(html)).to have_css("form.two-factor-form")
     end
 
     it "allows custom content in the block" do
-      html = helper.login_with_security_key_form_for(resource: user) do |form|
+      html = helper.login_with_security_key_form_for(:account) do |form|
         helper.safe_join([helper.content_tag(:p, "Authenticate with your security key"), form.submit("Authenticate")])
       end