Fix tests after the removal of memberships

app/controllers/users/email_addresses/confirmations_controller.rb

@@ -2,24 +2,24 @@ class Users::EmailAddresses::ConfirmationsController < ApplicationController
   disallow_account_scope
   allow_unauthenticated_access
 
-  before_action :set_membership
+  before_action :set_user
   rate_limit to: 5, within: 1.hour, only: :create
 
   def show
   end
 
   def create
-    membership = Membership.change_email_address_using_token(token)
+    user = User.change_email_address_using_token(token)
 
     terminate_session if Current.session
-    start_new_session_for membership.reload.identity
+    start_new_session_for user.reload.identity
 
-    redirect_to edit_user_url(script_name: "/#{@membership.tenant}", id: @membership.user)
+    redirect_to edit_user_url(script_name: user.account.slug, id: user)
   end
 
   private
-    def set_membership
-      @membership = Membership.find(params[:membership_id])
+    def set_user
+      @user = User.find(params[:user_id])
     end
 
     def token

app/controllers/users/email_addresses_controller.rb

@@ -3,7 +3,7 @@ class Users::EmailAddressesController < ApplicationController
 
   layout "public"
 
-  before_action :set_membership
+  before_action :set_user
   rate_limit to: 5, within: 1.hour, only: :create
 
   def new
@@ -12,17 +12,17 @@ class Users::EmailAddressesController < ApplicationController
   def create
     identity = Identity.find_by_email_address(new_email_address)
 
-    if identity&.memberships&.exists?(tenant: @membership.tenant)
+    if identity&.users&.exists?(account: @user.account)
       flash[:alert] = "You already have a user in this account with that email address"
-      redirect_to new_email_address_path
+      redirect_to new_user_email_address_path(@user)
     else
-      @membership.send_email_address_change_confirmation(new_email_address)
+      @user.send_email_address_change_confirmation(new_email_address)
     end
   end
 
   private
-    def set_membership
-      @membership = Current.identity.memberships.find(params[:membership_id])
+    def set_user
+      @user = Current.identity.users.find(params[:user_id])
     end
 
     def new_email_address