mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
Refactor SessionController#create, reduce complexity.
Don't compromise readablity
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
Fabricator(:email_log,) do
|
||||
Fabricator(:email_log) do
|
||||
user
|
||||
to_address { sequence(:address) { |i| "blah#{i}@example.com" } }
|
||||
email_type :invite
|
||||
|
||||
@@ -21,4 +21,26 @@ describe EmailLog do
|
||||
|
||||
end
|
||||
|
||||
describe ".last_sent_email_address" do
|
||||
let(:user) { Fabricate(:user) }
|
||||
|
||||
context "when user's email exist in the logs" do
|
||||
before do
|
||||
user.email_logs.create(email_type: 'signup', to_address: user.email)
|
||||
user.email_logs.create(email_type: 'blah', to_address: user.email)
|
||||
user.reload
|
||||
end
|
||||
|
||||
it "the user's last email from the log" do
|
||||
expect(user.email_logs.last_sent_email_address).to eq(user.email)
|
||||
end
|
||||
end
|
||||
|
||||
context "when user's email does not exist email logs" do
|
||||
it "returns nil" do
|
||||
expect(user.email_logs.last_sent_email_address).to be_nil
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
@@ -885,4 +885,25 @@ describe User do
|
||||
|
||||
end
|
||||
|
||||
describe "#find_email" do
|
||||
|
||||
let(:user) { Fabricate(:user, email: "bob@example.com") }
|
||||
|
||||
context "when email is exists in the email logs" do
|
||||
before { user.stubs(:last_sent_email_address).returns("bob@lastemail.com") }
|
||||
|
||||
it "returns email from the logs" do
|
||||
expect(user.find_email).to eq("bob@lastemail.com")
|
||||
end
|
||||
end
|
||||
|
||||
context "when email does not exist in the email logs" do
|
||||
before { user.stubs(:last_sent_email_address).returns(nil) }
|
||||
|
||||
it "fetches the user's email" do
|
||||
expect(user.find_email).to eq(user.email)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user