Skip to content

Commit

Permalink
Rename Mixins::SaveUserName to ValidateUser
Browse files Browse the repository at this point in the history
  • Loading branch information
akadusei committed Jul 28, 2024
1 parent 7a30c3f commit 36ed96b
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 24 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,10 @@ private class SaveUser < User::SaveOperation
}.to_json)
end

include Mixins::SaveUserName
include Mixins::ValidateUser
end

describe Mixins::SaveUserName do
it "saves first and last names" do
first_name = "Kofi"
last_name = "Amoako"

SaveUser.create(params(
first_name: first_name,
last_name: last_name
)) do |_, user|
user.should be_a(User)

user.try do |user| # ameba:disable Lint/ShadowingOuterLocalVar
user.first_name.should eq(first_name)
user.last_name.should eq(last_name)
end
end
end

describe Mixins::ValidateUser do
it "requires first name" do
SaveUser.create(params(last_name: "Nkrumah")) do |operation, _|
operation.saved?.should be_false
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module Mixins::SaveUserName
module Mixins::ValidateUser
macro included
before_save do
validate_first_name_required
Expand Down
2 changes: 1 addition & 1 deletion src/operations/register_current_user.cr
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ class RegisterCurrentUser < User::SaveOperation
set_level
end

include Mixins::SaveUserName
include Mixins::ValidateUser
include Mixins::ValidateNotPwned
include Shield::SendWelcomeEmail

Expand Down
2 changes: 1 addition & 1 deletion src/operations/register_user.cr
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ class RegisterUser < User::SaveOperation
validate_required level
end

include Mixins::ValidateUser
include Mixins::ValidateNotPwned
include Mixins::SaveUserName
end
2 changes: 1 addition & 1 deletion src/operations/update_current_user.cr
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
class UpdateCurrentUser < User::SaveOperation
permit_columns :first_name, :last_name

include Mixins::ValidateUser
include Mixins::ValidateNotPwned
include Mixins::SaveUserName
end
2 changes: 1 addition & 1 deletion src/operations/update_user.cr
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ class UpdateUser < User::SaveOperation
reset_level
end

include Mixins::ValidateUser
include Mixins::ValidateNotPwned
include Mixins::SaveUserName

# Ensure current admin cannot change their own level,
# lest they get locked out
Expand Down

0 comments on commit 36ed96b

Please sign in to comment.