authentication-zero 2.11.2 → 2.12.0

data/lib/generators/authentication/templates/controllers/html/two_factor_authentication/totps_controller.rb.tt

@@ -1,24 +1,31 @@
 class TwoFactorAuthentication::TotpsController < ApplicationController
-  before_action :set_<%= singular_table_name %>
+  <%- if options.sudoable? -%>
+  before_action :require_sudo
+  <%- end -%>
+  before_action :set_user
   before_action :set_totp
 
   def new
-    @qr_code = RQRCode::QRCode.new(@totp.provisioning_uri(@<%= singular_table_name %>.email))
+    @qr_code = RQRCode::QRCode.new(@totp.provisioning_uri(@user.email))
   end
 
   def create
-    if !@<%= singular_table_name %>.authenticate(params[:current_password])
+    <%- unless options.sudoable? -%>
+    if !@user.authenticate(params[:current_password])
       redirect_to two_factor_authentication_totp_path, alert: "The password you entered is incorrect"
     elsif @totp.verify(params[:code], drift_behind: 15)
-      @<%= singular_table_name %>.update! otp_secret: params[:secret]
+    <%- else -%>
+    if @totp.verify(params[:code], drift_behind: 15)
+    <%- end -%>
+      @user.update! otp_secret: params[:secret]
       redirect_to root_path, notice: "2FA is enabled on your account"
     else
       redirect_to two_factor_authentication_totp_path, alert: "That code didn't work. Please try again"
     end
   end
 
-  def set_<%= singular_table_name %>
-    @<%= singular_table_name %> = Current.<%= singular_table_name %>
+  def set_user
+    @user = Current.user
   end
 
   def set_totp

data/lib/generators/authentication/templates/erb/authentications/events/{index.html.erb → index.html.erb.tt}

@@ -1,33 +1,33 @@
 <h1>Activity Log</h1>
 
 <div id="sessions">
-  <% @events.each do |event| %>
-    <div id="<%= dom_id event %>">
+  <%% @events.each do |event| %>
+    <div id="<%%= dom_id event %>">
       <p>
         <strong>User Agent:</strong>
-        <%= event.user_agent %>
+        <%%= event.user_agent %>
       </p>
 
       <p>
         <strong>Action:</strong>
-        <%= event.action %>
+        <%%= event.action %>
       </p>
 
       <p>
         <strong>Ip Address:</strong>
-        <%= event.ip_address %>
+        <%%= event.ip_address %>
       </p>
 
       <p>
         <strong>Created at:</strong>
-        <%= event.created_at %>
+        <%%= event.created_at %>
       </p>
     </div>
-  <% end %>
+  <%% end %>
 </div>
 
 <br>
 
 <div>
-  <%= link_to "Back", root_path %>
+  <%%= link_to "Back", root_path %>
 </div>

data/lib/generators/authentication/templates/erb/identity/emails/edit.html.erb.tt

@@ -1,6 +1,6 @@
 <p style="color: red"><%%= alert %></p>
 
-<%% if Current.<%= singular_table_name %>.verified? %>
+<%% if Current.user.verified? %>
   <h1>Change your email</h1>
 <%% else %>
   <h1>Verify your email</h1>
@@ -9,22 +9,24 @@
 <%% end %>
 
 <%%= form_with(url: identity_email_path, method: :patch) do |form| %>
-  <%% if @<%= singular_table_name %>.errors.any? %>
+  <%% if @user.errors.any? %>
     <div style="color: red">
-      <h2><%%= pluralize(@<%= singular_table_name %>.errors.count, "error") %> prohibited this <%= singular_table_name %> from being saved:</h2>
+      <h2><%%= pluralize(@user.errors.count, "error") %> prohibited this user from being saved:</h2>
 
       <ul>
-        <%% @<%= singular_table_name %>.errors.each do |error| %>
+        <%% @user.errors.each do |error| %>
           <li><%%= error.full_message %></li>
         <%% end %>
       </ul>
     </div>
   <%% end %>
 
+  <%- unless options.sudoable? -%>
   <div>
     <%%= form.label :current_password, style: "display: block" %>
     <%%= form.password_field :current_password, required: true, autofocus: true, autocomplete: "current-password" %>
   </div>
+  <%- end -%>  
 
   <div>
     <%%= form.label :email, "New email", style: "display: block" %>

data/lib/generators/authentication/templates/erb/identity/password_resets/edit.html.erb.tt

@@ -1,12 +1,12 @@
 <h1>Reset your password</h1>
 
 <%%= form_with(url: identity_password_reset_path, method: :patch) do |form| %>
-  <%% if @<%= singular_table_name %>.errors.any? %>
+  <%% if @user.errors.any? %>
     <div style="color: red">
-      <h2><%%= pluralize(@<%= singular_table_name %>.errors.count, "error") %> prohibited this <%= singular_table_name %> from being saved:</h2>
+      <h2><%%= pluralize(@user.errors.count, "error") %> prohibited this user from being saved:</h2>
 
       <ul>
-        <%% @<%= singular_table_name %>.errors.each do |error| %>
+        <%% @user.errors.each do |error| %>
           <li><%%= error.full_message %></li>
         <%% end %>
       </ul>

data/lib/generators/authentication/templates/erb/passwords/edit.html.erb.tt

@@ -3,12 +3,12 @@
 <h1>Change your password</h1>
 
 <%%= form_with(url: password_path, method: :patch) do |form| %>
-  <%% if @<%= singular_table_name %>.errors.any? %>
+  <%% if @user.errors.any? %>
     <div style="color: red">
-      <h2><%%= pluralize(@<%= singular_table_name %>.errors.count, "error") %> prohibited this <%= singular_table_name %> from being saved:</h2>
+      <h2><%%= pluralize(@user.errors.count, "error") %> prohibited this user from being saved:</h2>
 
       <ul>
-        <%% @<%= singular_table_name %>.errors.each do |error| %>
+        <%% @user.errors.each do |error| %>
           <li><%%= error.full_message %></li>
         <%% end %>
       </ul>

data/lib/generators/authentication/templates/erb/registrations/new.html.erb.tt

@@ -1,12 +1,12 @@
 <h1>Sign up</h1>
 
 <%%= form_with(url: sign_up_path) do |form| %>
-  <%% if @<%= singular_table_name %>.errors.any? %>
+  <%% if @user.errors.any? %>
     <div style="color: red">
-      <h2><%%= pluralize(@<%= singular_table_name %>.errors.count, "error") %> prohibited this <%= singular_table_name %> from being saved:</h2>
+      <h2><%%= pluralize(@user.errors.count, "error") %> prohibited this user from being saved:</h2>
 
       <ul>
-        <%% @<%= singular_table_name %>.errors.each do |error| %>
+        <%% @user.errors.each do |error| %>
           <li><%%= error.full_message %></li>
         <%% end %>
       </ul>

data/lib/generators/authentication/templates/erb/session_mailer/signed_in_notification.html.erb.tt

@@ -1,6 +1,6 @@
 <p>Hey there,</p>
 
-<p>A new device just signed in to your account (<%%= @session.<%= singular_table_name %>.email %>).</p>
+<p>A new device just signed in to your account (<%%= @session.user.email %>).</p>
 
 <p>
   <strong><%%= @session.user_agent %></strong>

data/lib/generators/authentication/templates/erb/session_mailer/signed_in_notification.text.erb.tt

@@ -1,6 +1,6 @@
 Hey there,
 
-A new device just signed in to your account (<%%= @session.<%= singular_table_name %>.email %>).
+A new device just signed in to your account (<%%= @session.user.email %>).
 
 <%%= @session.user_agent %>
 

data/lib/generators/authentication/templates/erb/sessions/new.html.erb.tt

@@ -18,11 +18,12 @@
     <%%= form.submit "Sign in" %>
   </div>
 <%% end %>
-<% if omniauthable? %>
+
+<%- if omniauthable? -%>
 <div>
   <%%= button_to "Sign in with OmniAuth", "/auth/developer", "data-turbo" => false %>
 </div>
-<% end -%>
+<%- end -%>
 
 <br>
 

data/lib/generators/authentication/templates/erb/two_factor_authentication/totps/new.html.erb.tt

@@ -17,10 +17,12 @@
 <%%= form_with(url: two_factor_authentication_totp_path) do |form| %>
   <%%= form.hidden_field :secret, value: @totp.secret %>
 
+  <%- unless options.sudoable? -%>
   <div>
     <%%= form.label :current_password, style: "display: block" %>
     <%%= form.password_field :current_password, required: true, autofocus: true, autocomplete: "current-password" %>
   </div>
+  <%- end -%>
 
   <div>
     <%%= form.label :code, "After scanning with your camera, the app will generate a six-digit code. Enter it here:", style: "display: block" %>

data/lib/generators/authentication/templates/erb/{identity_mailer → user_mailer}/email_verify_confirmation.html.erb.tt

@@ -1,13 +1,13 @@
 <p>Hey there,</p>
 
-<p>This is to confirm that <%%= @<%= singular_table_name %>.email %> is the email you want to use on your account. If you ever lose your password, that's where we'll email a reset link.</p>
+<p>This is to confirm that <%%= @user.email %> is the email you want to use on your account. If you ever lose your password, that's where we'll email a reset link.</p>
 
 <p><strong>You must <%= code_verifiable? ? "put the code" : "hit the link" %> below to confirm that you received this email.</strong></p>
 
 <%- if code_verifiable? -%>
 <strong><%%= @user.verification_code.value %></strong>
 <%- else -%>
-<%%= link_to "Yes, use this email for my account", edit_identity_email_verification_url(token: @signed_id, email: @<%= singular_table_name %>.email) %>
+<%%= link_to "Yes, use this email for my account", edit_identity_email_verification_url(token: @signed_id, email: @user.email) %>
 <%- end -%>
 
 <hr>

data/lib/generators/authentication/templates/erb/{identity_mailer → user_mailer}/email_verify_confirmation.text.erb.tt

@@ -1,13 +1,13 @@
 Hey there,
 
-This is to confirm that <%%= @<%= singular_table_name %>.email %> is the email you want to use on your account. If you ever lose your password, that's where we'll email a reset link.
+This is to confirm that <%%= @user.email %> is the email you want to use on your account. If you ever lose your password, that's where we'll email a reset link.
 
 You must <%= code_verifiable? ? "put the code" : "hit the link" %> below to confirm that you received this email.
 
 <%- if code_verifiable? -%>
 <%%= @user.verification_code.value %>
 <%- else -%>
-[Yes, use this email for my account]<%%= edit_identity_email_verification_url(token: @signed_id, email: @<%= singular_table_name %>.email) %>
+[Yes, use this email for my account]<%%= edit_identity_email_verification_url(token: @signed_id, email: @user.email) %>
 <%- end -%>
 
 Have questions or need help? Just reply to this email and our support team will help you sort it out.

data/lib/generators/authentication/templates/erb/{identity_mailer → user_mailer}/password_reset_provision.html.erb.tt

@@ -1,6 +1,6 @@
 <p>Hey there,</p>
 
-<p>Can't remember your password for <strong><%%= @<%= singular_table_name %>.email %></strong>? That's OK, it happens. Just hit the link below to set a new one.</p>
+<p>Can't remember your password for <strong><%%= @user.email %></strong>? That's OK, it happens. Just hit the link below to set a new one.</p>
 
 <p><%%= link_to "Reset my password", edit_identity_password_reset_url(token: @signed_id) %></p>
 

data/lib/generators/authentication/templates/erb/{identity_mailer → user_mailer}/password_reset_provision.text.erb.tt

@@ -1,6 +1,6 @@
 Hey there,
 
-Can't remember your password for <%%= @<%= singular_table_name %>.email %>? That's OK, it happens. Just hit the link below to set a new one.
+Can't remember your password for <%%= @user.email %>? That's OK, it happens. Just hit the link below to set a new one.
 
 [Reset my password]<%%= edit_identity_password_reset_url(token: @signed_id) %>
 

data/lib/generators/authentication/templates/mailers/session_mailer.rb.tt

@@ -1,6 +1,6 @@
 class SessionMailer < ApplicationMailer
   def signed_in_notification
     @session = params[:session]
-    mail to: @session.<%= singular_table_name %>.email, subject: "New sign-in to your account"
+    mail to: @session.user.email, subject: "New sign-in to your account"
   end
 end

data/lib/generators/authentication/templates/mailers/user_mailer.rb.tt

@@ -0,0 +1,19 @@
+class UserMailer < ApplicationMailer
+  def password_reset_provision
+    @user = params[:user]
+    @signed_id = @user.signed_id(purpose: :password_reset, expires_in: 20.minutes)
+
+    mail to: @user.email, subject: "Reset your password"
+  end
+
+  def email_verify_confirmation
+    @user = params[:user]
+    <%- if code_verifiable? -%>
+    @user.verification_code.value = rand.to_s[2..7]
+    <%- else -%>
+    @signed_id = @user.signed_id(purpose: @user.email, expires_in: 2.days)
+    <%- end -%>
+
+    mail to: @user.email, subject: "Verify your email"
+  end
+end

data/lib/generators/authentication/templates/migrations/create_events_migration.rb.tt

@@ -1,7 +1,7 @@
 class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>]
   def change
     create_table :events do |t|
-      t.references :<%= singular_table_name %>, null: false, foreign_key: true
+      t.references :user, null: false, foreign_key: true
       t.string :action, null: false
       t.string :user_agent
       t.string :ip_address

data/lib/generators/authentication/templates/migrations/create_sessions_migration.rb.tt

@@ -1,7 +1,7 @@
 class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>]
   def change
     create_table :sessions do |t|
-      t.references :<%= singular_table_name %>, null: false, foreign_key: true
+      t.references :user, null: false, foreign_key: true
       t.string :user_agent
       t.string :ip_address
 

data/lib/generators/authentication/templates/migrations/{create_table_migration.rb.tt → create_users_migration.rb.tt}

@@ -1,6 +1,6 @@
 class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>]
   def change
-    create_table :<%= table_name %> do |t|
+    create_table :users do |t|
       t.string :email,           null: false
       t.string :password_digest, null: false
 
@@ -16,9 +16,9 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
       t.timestamps
     end
 
-    add_index :<%= table_name %>, :email, unique: true
+    add_index :users, :email, unique: true
     <%- if omniauthable? -%>
-    add_index :<%= table_name %>, [:provider, :uid], unique: true
+    add_index :users, [:provider, :uid], unique: true
     <%- end -%>
   end
 end

data/lib/generators/authentication/templates/models/current.rb.tt

@@ -1,8 +1,8 @@
 class Current < ActiveSupport::CurrentAttributes
-  attribute :session, :<%= singular_table_name %>
+  attribute :session, :user
   attribute :user_agent, :ip_address
 
   def session=(session)
-    super; self.<%= singular_table_name %> = session.<%= singular_table_name %>
+    super; self.user = session.user
   end
 end

data/lib/generators/authentication/templates/models/event.rb.tt

@@ -1,5 +1,5 @@
 class Event < ApplicationRecord
-  belongs_to :<%= singular_table_name %>
+  belongs_to :user
 
   before_create do
     self.user_agent = Current.user_agent

data/lib/generators/authentication/templates/models/session.rb.tt

@@ -1,5 +1,5 @@
 class Session < ApplicationRecord
-  belongs_to :<%= singular_table_name %>
+  belongs_to :user
   <%- if options.sudoable? %>
   kredis_flag :sudo, expires_in: 30.minutes
   <%- end -%>
@@ -19,11 +19,11 @@ class Session < ApplicationRecord
   end
   <%- if options.trackable? %>
   after_create do
-    <%= singular_table_name %>.events.create! action: "signed_in"
+    user.events.create! action: "signed_in"
   end
 
   after_destroy do
-    <%= singular_table_name %>.events.create! action: "signed_out"
+    user.events.create! action: "signed_out"
   end
   <%- end -%>
 end

data/lib/generators/authentication/templates/models/{model.rb.tt → user.rb.tt}

@@ -1,4 +1,4 @@
-class <%= class_name %> < ApplicationRecord
+class User < ApplicationRecord
   has_secure_password
 
   has_many :sessions, dependent: :destroy
@@ -31,7 +31,7 @@ class <%= class_name %> < ApplicationRecord
   end
 
   after_save_commit if: :email_previously_changed? do
-    IdentityMailer.with(user: self).email_verify_confirmation.deliver_later
+    UserMailer.with(user: self).email_verify_confirmation.deliver_later
   end
   <%- if options.trackable? %>
   after_save_commit if: :email_previously_changed? do

data/lib/generators/authentication/templates/test_unit/application_system_test_case.rb.tt

@@ -3,13 +3,13 @@ require "test_helper"
 class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
   driven_by :selenium, using: :chrome, screen_size: [1400, 1400]
 
-  def sign_in_as(<%= singular_table_name %>)
+  def sign_in_as(user)
     visit sign_in_url
-    fill_in :email, with: <%= singular_table_name %>.email
+    fill_in :email, with: user.email
     fill_in :password, with: "Secret1*3*5*"
     click_on "Sign in"
 
     assert_current_path root_url
-    <%= singular_table_name %>
+    user
   end
 end

data/lib/generators/authentication/templates/test_unit/controllers/api/identity/email_verifications_controller_test.rb.tt

@@ -2,11 +2,11 @@ require "test_helper"
 
 class Identity::EmailVerificationsControllerTest < ActionDispatch::IntegrationTest
   setup do
-    @<%= singular_table_name %>, @token = sign_in_as(<%= table_name %>(:lazaro_nixon))
-    @sid = @<%= singular_table_name %>.signed_id(purpose: @<%= singular_table_name %>.email, expires_in: 20.minutes)
-    @sid_exp = @<%= singular_table_name %>.signed_id(purpose: @<%= singular_table_name %>.email, expires_in: 0.minutes)
+    @user, @token = sign_in_as(users(:lazaro_nixon))
+    @sid = @user.signed_id(purpose: @user.email, expires_in: 20.minutes)
+    @sid_exp = @user.signed_id(purpose: @user.email, expires_in: 0.minutes)
 
-    @<%= singular_table_name %>.update! verified: false
+    @user.update! verified: false
   end
 
   def default_headers
@@ -14,7 +14,7 @@ class Identity::EmailVerificationsControllerTest < ActionDispatch::IntegrationTe
   end
 
   test "should send a verification email" do
-    assert_enqueued_email_with IdentityMailer, :email_verify_confirmation, args: { <%= singular_table_name %>: @<%= singular_table_name %> } do
+    assert_enqueued_email_with UserMailer, :email_verify_confirmation, args: { user: @user } do
       post identity_email_verification_url, headers: default_headers
     end
 
@@ -22,21 +22,21 @@ class Identity::EmailVerificationsControllerTest < ActionDispatch::IntegrationTe
   end
 
   test "should verify email" do
-    get edit_identity_email_verification_url, params: { token: @sid, email: @<%= singular_table_name %>.email }, headers: default_headers
+    get edit_identity_email_verification_url, params: { token: @sid, email: @user.email }, headers: default_headers
     assert_response :no_content
   end
 
   test "should not verify email with expired token" do
-    get edit_identity_email_verification_url, params: { token: @sid_exp, email: @<%= singular_table_name %>.email }, headers: default_headers
+    get edit_identity_email_verification_url, params: { token: @sid_exp, email: @user.email }, headers: default_headers
 
     assert_response :bad_request
     assert_equal "That email verification link is invalid", response.parsed_body["error"]
   end
 
   test "should not verify email with previous token" do
-    @<%= singular_table_name %>.update! email: "other_email@hey.com"
+    @user.update! email: "other_email@hey.com"
 
-    get edit_identity_email_verification_url, params: { token: @sid, email: @<%= singular_table_name %>.email_previously_was }, headers: default_headers
+    get edit_identity_email_verification_url, params: { token: @sid, email: @user.email_previously_was }, headers: default_headers
 
     assert_response :bad_request
     assert_equal "That email verification link is invalid", response.parsed_body["error"]

data/lib/generators/authentication/templates/test_unit/controllers/api/identity/emails_controller_test.rb.tt

@@ -2,7 +2,7 @@ require "test_helper"
 
 class Identity::EmailsControllerTest < ActionDispatch::IntegrationTest
   setup do
-    @<%= singular_table_name %>, @token = sign_in_as(<%= table_name %>(:lazaro_nixon))
+    @user, @token = sign_in_as(users(:lazaro_nixon))
   end
 
   def default_headers

data/lib/generators/authentication/templates/test_unit/controllers/api/identity/password_resets_controller_test.rb.tt

@@ -2,14 +2,14 @@ require "test_helper"
 
 class Identity::PasswordResetsControllerTest < ActionDispatch::IntegrationTest
   setup do
-    @<%= singular_table_name %> = <%= table_name %>(:lazaro_nixon)
-    @sid = @<%= singular_table_name %>.signed_id(purpose: :password_reset, expires_in: 20.minutes)
-    @sid_exp = @<%= singular_table_name %>.signed_id(purpose: :password_reset, expires_in: 0.minutes)
+    @user = users(:lazaro_nixon)
+    @sid = @user.signed_id(purpose: :password_reset, expires_in: 20.minutes)
+    @sid_exp = @user.signed_id(purpose: :password_reset, expires_in: 0.minutes)
   end
 
   test "should send a password reset email" do
-    assert_enqueued_email_with IdentityMailer, :password_reset_provision, args: { <%= singular_table_name %>: @<%= singular_table_name %> } do
-      post identity_password_reset_url, params: { email: @<%= singular_table_name %>.email }
+    assert_enqueued_email_with UserMailer, :password_reset_provision, args: { user: @user } do
+      post identity_password_reset_url, params: { email: @user.email }
     end
 
     assert_response :no_content
@@ -25,10 +25,10 @@ class Identity::PasswordResetsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "should not send a password reset email to a unverified email" do
-    @<%= singular_table_name %>.update! verified: false
+    @user.update! verified: false
 
     assert_no_enqueued_emails do
-      post identity_password_reset_url, params: { email: @<%= singular_table_name %>.email }
+      post identity_password_reset_url, params: { email: @user.email }
     end
 
     assert_response :not_found

data/lib/generators/authentication/templates/test_unit/controllers/api/passwords_controller_test.rb.tt

@@ -2,7 +2,7 @@ require "test_helper"
 
 class PasswordsControllerTest < ActionDispatch::IntegrationTest
   setup do
-    @<%= singular_table_name %>, @token = sign_in_as(<%= table_name %>(:lazaro_nixon))
+    @user, @token = sign_in_as(users(:lazaro_nixon))
   end
 
   def default_headers

data/lib/generators/authentication/templates/test_unit/controllers/api/registrations_controller_test.rb.tt

@@ -2,7 +2,7 @@ require "test_helper"
 
 class RegistrationsControllerTest < ActionDispatch::IntegrationTest
   test "should sign up" do
-    assert_difference("<%= class_name %>.count") do
+    assert_difference("User.count") do
       post sign_up_url, params: { email: "lazaronixon@hey.com", password: "Secret1*3*5*", password_confirmation: "Secret1*3*5*" }
     end
 

data/lib/generators/authentication/templates/test_unit/controllers/api/sessions_controller_test.rb.tt

@@ -2,7 +2,7 @@ require "test_helper"
 
 class SessionsControllerTest < ActionDispatch::IntegrationTest
   setup do
-    @<%= singular_table_name %>, @token = sign_in_as(<%= table_name %>(:lazaro_nixon))
+    @user, @token = sign_in_as(users(:lazaro_nixon))
   end
 
   def default_headers
@@ -15,24 +15,24 @@ class SessionsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "should show session" do
-    get session_url(@<%= singular_table_name %>.sessions.last), headers: default_headers
+    get session_url(@user.sessions.last), headers: default_headers
     assert_response :success
   end
 
   test "should sign in" do
-    post sign_in_url, params: { email: @<%= singular_table_name %>.email, password: "Secret1*3*5*" }
+    post sign_in_url, params: { email: @user.email, password: "Secret1*3*5*" }
 
-    assert_enqueued_email_with SessionMailer, :signed_in_notification, args: { session: @<%= singular_table_name %>.sessions.last }
+    assert_enqueued_email_with SessionMailer, :signed_in_notification, args: { session: @user.sessions.last }
     assert_response :created
   end
 
   test "should not sign in with wrong credentials" do
-    post sign_in_url, params: { email: @<%= singular_table_name %>.email, password: "SecretWrong1*3" }
+    post sign_in_url, params: { email: @user.email, password: "SecretWrong1*3" }
     assert_response :unauthorized
   end
 
   test "should sign out" do
-    delete session_url(@<%= singular_table_name %>.sessions.last), headers: default_headers
+    delete session_url(@user.sessions.last), headers: default_headers
     assert_response :no_content
   end
 end

data/lib/generators/authentication/templates/test_unit/controllers/html/identity/email_verifications_controller_test.rb.tt

@@ -2,15 +2,15 @@ require "test_helper"
 
 class Identity::EmailVerificationsControllerTest < ActionDispatch::IntegrationTest
   setup do
-    @<%= singular_table_name %> = sign_in_as(<%= table_name %>(:lazaro_nixon))
-    @sid = @<%= singular_table_name %>.signed_id(purpose: @<%= singular_table_name %>.email, expires_in: 20.minutes)
-    @sid_exp = @<%= singular_table_name %>.signed_id(purpose: @<%= singular_table_name %>.email, expires_in: 0.minutes)
+    @user = sign_in_as(users(:lazaro_nixon))
+    @sid = @user.signed_id(purpose: @user.email, expires_in: 20.minutes)
+    @sid_exp = @user.signed_id(purpose: @user.email, expires_in: 0.minutes)
 
-    @<%= singular_table_name %>.update! verified: false
+    @user.update! verified: false
   end
 
   test "should send a verification email" do
-    assert_enqueued_email_with IdentityMailer, :email_verify_confirmation, args: { <%= singular_table_name %>: @<%= singular_table_name %> } do
+    assert_enqueued_email_with UserMailer, :email_verify_confirmation, args: { user: @user } do
       post identity_email_verification_url
     end
 
@@ -18,21 +18,21 @@ class Identity::EmailVerificationsControllerTest < ActionDispatch::IntegrationTe
   end
 
   test "should verify email" do
-    get edit_identity_email_verification_url(token: @sid, email: @<%= singular_table_name %>.email)
+    get edit_identity_email_verification_url(token: @sid, email: @user.email)
     assert_redirected_to root_url
   end
 
   test "should not verify email with expired token" do
-    get edit_identity_email_verification_url(token: @sid_exp, email: @<%= singular_table_name %>.email)
+    get edit_identity_email_verification_url(token: @sid_exp, email: @user.email)
 
     assert_redirected_to edit_identity_email_url
     assert_equal "That email verification link is invalid", flash[:alert]
   end
 
   test "should not verify email with previous token" do
-    @<%= singular_table_name %>.update! email: "other_email@hey.com"
+    @user.update! email: "other_email@hey.com"
 
-    get edit_identity_email_verification_url(token: @sid, email: @<%= singular_table_name %>.email_previously_was)
+    get edit_identity_email_verification_url(token: @sid, email: @user.email_previously_was)
 
     assert_redirected_to edit_identity_email_url
     assert_equal "That email verification link is invalid", flash[:alert]

data/lib/generators/authentication/templates/test_unit/controllers/html/identity/emails_controller_test.rb.tt

@@ -2,7 +2,7 @@ require "test_helper"
 
 class Identity::EmailsControllerTest < ActionDispatch::IntegrationTest
   setup do
-    @<%= singular_table_name %> = sign_in_as(<%= table_name %>(:lazaro_nixon))
+    @user = sign_in_as(users(:lazaro_nixon))
   end
 
   test "should get edit" do