Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/commands/user/bootstrap.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ def call
user.auth_tokens.create!
AwardBadgeJob.perform_later(user, :member)
Metric::Queue.(:sign_up, user.created_at, user:)
User::VerifyEmail.defer(user)

link_courses!
end
Expand Down
34 changes: 0 additions & 34 deletions app/commands/user/verify_email.rb

This file was deleted.

9 changes: 0 additions & 9 deletions app/models/user.rb
Original file line number Diff line number Diff line change
Expand Up @@ -174,10 +174,6 @@ class User < ApplicationRecord
after_confirmation if confirmed?
end

after_update_commit do
reverify_email! if previous_changes.key?('email')
end

# If we don't know about this record, maybe the
# user's data record has it instead?
def method_missing(name, *args)
Expand Down Expand Up @@ -339,11 +335,6 @@ def send_devise_notification(notification, *args)
devise_mailer.send(notification, self, *args).deliver_later
end

def reverify_email!
email_status_unverified!
User::VerifyEmail.defer(self)
end

memoize
def bought_course?
course_enrollments.paid.exists?
Expand Down
7 changes: 0 additions & 7 deletions test/commands/user/bootstrap_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,6 @@ class User::BootstrapTest < ActiveSupport::TestCase
assert_equal user, metric.user
end

test "email verified for new user" do
user = create :user

User::VerifyEmail.expects(:defer).with(user).once
User::Bootstrap.(user)
end

test "becomes attendee and subscribes to onboarding emails if paid email" do
enrollment = create :course_enrollment, :coding_fundamentals, :paid
user = create :user, email: enrollment.email
Expand Down
54 changes: 0 additions & 54 deletions test/commands/user/verify_email_test.rb

This file was deleted.

22 changes: 9 additions & 13 deletions test/models/user_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -409,16 +409,6 @@ class UserTest < ActiveSupport::TestCase
assert_equal :insider, user.flair
end

test "email verified when email changes" do
user = create :user

User::VerifyEmail.expects(:defer).with(user).once

user.email = 'test@example.org'
user.skip_reconfirmation!
user.save!
end

test "asset may receive email by default" do
user = create :user
assert user.may_receive_emails?
Expand All @@ -434,12 +424,18 @@ class UserTest < ActiveSupport::TestCase
refute user.may_receive_emails?
end

test "refute may receive email for invalid email" do
user = create :user, disabled_at: Time.current
user.email_status_invalid!
test "refute may receive email for invalid email status" do
user = create :user
user.data.update!(email_status: :invalid)
refute user.may_receive_emails?
end

test "assert may receive email for unverified email status" do
user = create :user
user.data.update!(email_status: :unverified)
assert user.may_receive_emails?
end

test "refute may receive email for ghost user" do
user = create :user, :ghost
refute user.may_receive_emails?
Expand Down
Loading