summaryrefslogtreecommitdiffstats
path: root/cmd/platform/user.go
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2017-04-15 13:45:22 -0400
committerChristopher Speller <crspeller@gmail.com>2017-04-15 13:45:22 -0400
commit461a0b3b7c14cd59cb53eb66f419c965ab3bdd24 (patch)
tree88eea69d8963214fa43e8bf1a9989f2ab3d1c521 /cmd/platform/user.go
parent24667e3e5423dc939770d0b4bf06ed2f42b4a445 (diff)
downloadchat-461a0b3b7c14cd59cb53eb66f419c965ab3bdd24.tar.gz
chat-461a0b3b7c14cd59cb53eb66f419c965ab3bdd24.tar.bz2
chat-461a0b3b7c14cd59cb53eb66f419c965ab3bdd24.zip
PLT-6113 Added initial unit tests for cmd package (#6086)
* Fixed app.CreateUser not using the provided locale * Added initial unit tests for cmd package * Disabled unit tests while we move to 'go build'
Diffstat (limited to 'cmd/platform/user.go')
-rw-r--r--cmd/platform/user.go32
1 files changed, 21 insertions, 11 deletions
diff --git a/cmd/platform/user.go b/cmd/platform/user.go
index f306d17b3..dc0aa0f71 100644
--- a/cmd/platform/user.go
+++ b/cmd/platform/user.go
@@ -170,22 +170,26 @@ func userActivateCmdF(cmd *cobra.Command, args []string) error {
func changeUsersActiveStatus(userArgs []string, active bool) {
users := getUsersFromUserArgs(userArgs)
for i, user := range users {
- changeUserActiveStatus(user, userArgs[i], active)
+ err := changeUserActiveStatus(user, userArgs[i], active)
+
+ if err != nil {
+ CommandPrintErrorln(err.Error())
+ }
}
}
-func changeUserActiveStatus(user *model.User, userArg string, activate bool) {
+func changeUserActiveStatus(user *model.User, userArg string, activate bool) error {
if user == nil {
- CommandPrintErrorln("Can't find user '" + userArg + "'")
- return
+ return fmt.Errorf("Can't find user '%v'", userArg)
}
if user.IsLDAPUser() {
- CommandPrintErrorln(utils.T("api.user.update_active.no_deactivate_ldap.app_error"))
- return
+ return errors.New(utils.T("api.user.update_active.no_deactivate_ldap.app_error"))
}
if _, err := app.UpdateActive(user, activate); err != nil {
- CommandPrintErrorln("Unable to change activation status of user: " + userArg)
+ return fmt.Errorf("Unable to change activation status of user: %v", userArg)
}
+
+ return nil
}
func userDeactivateCmdF(cmd *cobra.Command, args []string) error {
@@ -258,20 +262,26 @@ func userInviteCmdF(cmd *cobra.Command, args []string) error {
teams := getTeamsFromTeamArgs(args[1:])
for i, team := range teams {
- inviteUser(email, team, args[i+1])
+ err := inviteUser(email, team, args[i+1])
+
+ if err != nil {
+ CommandPrintErrorln(err.Error())
+ }
}
return nil
}
-func inviteUser(email string, team *model.Team, teamArg string) {
+func inviteUser(email string, team *model.Team, teamArg string) error {
invites := []string{email}
if team == nil {
- CommandPrintErrorln("Can't find team '" + teamArg + "'")
- return
+ return fmt.Errorf("Can't find team '%v'", teamArg)
}
+
app.SendInviteEmails(team, "Administrator", invites, *utils.Cfg.ServiceSettings.SiteURL)
CommandPrettyPrintln("Invites may or may not have been sent.")
+
+ return nil
}
func resetUserPasswordCmdF(cmd *cobra.Command, args []string) error {