chore: share accounts/form with onboarding path

app/controllers/users/onboarding_controller.rb

@@ -17,7 +17,7 @@ class Users::OnboardingController < ApplicationController
   end
 
   def new
-    @account = current_user.build_personal_account
+    @account = current_user.build_personal_account(personal: true)
   end
 
   def create
@@ -38,4 +38,14 @@ def create
   def after_onboarding_path
     dashboard_path
   end
+
+  def form_submit_path
+    onboarding_path
+  end
+  helper_method :form_submit_path
+
+  def form_method
+    :post
+  end
+  helper_method :form_method
 end

app/views/accounts/_form.html.erb

@@ -1,5 +1,6 @@
 <%= simple_form_for(account, url: form_submit_path, method: form_method) do |f| %>
   <%= f.input :name, placeholder: (account.personal? ? t(".name.personal") : t(".name.team")), required: true, autofocus: true %>
+  <%#= f.input :custom_field %>
   <div class="mt-4 flex justify-between items-center">
     <%= f.button :submit, account.persisted? ? t(".button.save") : t(".button.create") %>
   </div>

app/views/users/onboarding/new.html.erb

@@ -6,13 +6,7 @@
     description: "Finish the registration by setting up your user profile."
   ) do %>
     <main class="flex flex-col gap-4 w-full max-w-2xl">
-      <%= simple_form_for(@account, url: onboarding_path) do |f| %>
-        <%= f.input :name, placeholder: "Enter your full name", required: true, autofocus: true %>
-
-        <div class="mt-4 flex justify-between items-center">
-          <%= f.button :submit, "Complete the setup" %>
-        </div>
-      <% end %>
+      <%= render "accounts/form", account: @account %>
     </main>
   <% end %>
 <% end %>

test/system/users/onboarding_test.rb

@@ -13,7 +13,8 @@ class OnboardingTest < ApplicationSystemTestCase
     assert_text I18n.t("devise.registrations.signed_up_but_unconfirmed")
 
     # This is a hack to confirm the email for the user
-    User.find_by(email: "[email protected]").update(confirmed_at: Time.now)
+    user = User.find_by(email: "[email protected]")
+    user.update(confirmed_at: Time.now)
 
     # Login in with the newly created user
     visit new_user_session_path
@@ -26,12 +27,12 @@ class OnboardingTest < ApplicationSystemTestCase
     assert_current_path onboarding_path
 
     # Fill the personal account setup form
-    fill_in "account[name]", with: "John Doe"
-    # fill_in "account[my_custom_field]", with: "My custom value"
+    fill_in_account_fields
 
     click_on "commit"
 
     # Should be redirected to dashboard after successfully signing up.
     assert_current_path dashboard_path
+    assert_equal "New name", user.reload.personal_account.name
   end
 end

test/test_helper.rb

@@ -11,8 +11,12 @@
 # Load migrations
 ActiveRecord::Schema.verbose = false
 
+# Shared helper for filling in account fields.
+# This helper is used in onboarding and accounts tests.
+# You can add more fields as needed.
 def fill_in_account_fields
   fill_in "account[name]", with: "New name"
+  # fill_in "account[custom_field]", with: "Custom data"
 end
 
 module ActiveSupport