From b2dd00dd5b83fc7e8b311a55f5a2536e4f3d45a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Espino?= <jespinog@gmail.com>
Date: Wed, 7 Mar 2018 20:04:18 +0000
Subject: Adding enterprise commands support (#8327)

---
 cmd/commands/user_test.go | 82 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 cmd/commands/user_test.go

(limited to 'cmd/commands/user_test.go')

diff --git a/cmd/commands/user_test.go b/cmd/commands/user_test.go
new file mode 100644
index 000000000..960ac3878
--- /dev/null
+++ b/cmd/commands/user_test.go
@@ -0,0 +1,82 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+package commands
+
+import (
+	"testing"
+
+	"github.com/mattermost/mattermost-server/api"
+	"github.com/mattermost/mattermost-server/cmd"
+	"github.com/mattermost/mattermost-server/model"
+)
+
+func TestCreateUserWithTeam(t *testing.T) {
+	th := api.Setup().InitSystemAdmin()
+	defer th.TearDown()
+
+	id := model.NewId()
+	email := "success+" + id + "@simulator.amazonses.com"
+	username := "name" + id
+
+	cmd.CheckCommand(t, "user", "create", "--email", email, "--password", "mypassword1", "--username", username)
+
+	cmd.CheckCommand(t, "team", "add", th.SystemAdminTeam.Id, email)
+
+	profiles := th.SystemAdminClient.Must(th.SystemAdminClient.GetProfilesInTeam(th.SystemAdminTeam.Id, 0, 1000, "")).Data.(map[string]*model.User)
+
+	found := false
+
+	for _, user := range profiles {
+		if user.Email == email {
+			found = true
+		}
+
+	}
+
+	if !found {
+		t.Fatal("Failed to create User")
+	}
+}
+
+func TestCreateUserWithoutTeam(t *testing.T) {
+	th := api.Setup()
+	defer th.TearDown()
+
+	id := model.NewId()
+	email := "success+" + id + "@simulator.amazonses.com"
+	username := "name" + id
+
+	cmd.CheckCommand(t, "user", "create", "--email", email, "--password", "mypassword1", "--username", username)
+
+	if result := <-th.App.Srv.Store.User().GetByEmail(email); result.Err != nil {
+		t.Fatal()
+	} else {
+		user := result.Data.(*model.User)
+		if user.Email != email {
+			t.Fatal()
+		}
+	}
+}
+
+func TestResetPassword(t *testing.T) {
+	th := api.Setup().InitBasic()
+	defer th.TearDown()
+
+	cmd.CheckCommand(t, "user", "password", th.BasicUser.Email, "password2")
+
+	th.BasicClient.Logout()
+	th.BasicUser.Password = "password2"
+	th.LoginBasic()
+}
+
+func TestMakeUserActiveAndInactive(t *testing.T) {
+	th := api.Setup().InitBasic()
+	defer th.TearDown()
+
+	// first inactivate the user
+	cmd.CheckCommand(t, "user", "deactivate", th.BasicUser.Email)
+
+	// activate the inactive user
+	cmd.CheckCommand(t, "user", "activate", th.BasicUser.Email)
+}
-- 
cgit v1.2.3-1-g7c22


From 81acb1a14b404941dcd79c3088f09ee310896690 Mon Sep 17 00:00:00 2001
From: Carlos Tadeu Panato Junior <ctadeu@gmail.com>
Date: Mon, 12 Mar 2018 12:40:44 +0100
Subject: [MM-9720] Platform command to change user email address (#8422)

---
 cmd/commands/user_test.go | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'cmd/commands/user_test.go')

diff --git a/cmd/commands/user_test.go b/cmd/commands/user_test.go
index 960ac3878..a1081c5d3 100644
--- a/cmd/commands/user_test.go
+++ b/cmd/commands/user_test.go
@@ -9,6 +9,7 @@ import (
 	"github.com/mattermost/mattermost-server/api"
 	"github.com/mattermost/mattermost-server/cmd"
 	"github.com/mattermost/mattermost-server/model"
+	"github.com/stretchr/testify/require"
 )
 
 func TestCreateUserWithTeam(t *testing.T) {
@@ -80,3 +81,30 @@ func TestMakeUserActiveAndInactive(t *testing.T) {
 	// activate the inactive user
 	cmd.CheckCommand(t, "user", "activate", th.BasicUser.Email)
 }
+
+func TestChangeUserEmail(t *testing.T) {
+	th := api.Setup().InitBasic()
+	defer th.TearDown()
+
+	newEmail := model.NewId() + "@mattermost-test.com"
+
+	cmd.CheckCommand(t, "user", "email", th.BasicUser.Username, newEmail)
+	if result := <-th.App.Srv.Store.User().GetByEmail(th.BasicUser.Email); result.Err == nil {
+		t.Fatal("should've updated to the new email")
+	}
+	if result := <-th.App.Srv.Store.User().GetByEmail(newEmail); result.Err != nil {
+		t.Fatal()
+	} else {
+		user := result.Data.(*model.User)
+		if user.Email != newEmail {
+			t.Fatal("should've updated to the new email")
+		}
+	}
+
+	// should fail because using an invalid email
+	require.Error(t, cmd.RunCommand(t, "user", "email", th.BasicUser.Username, "wrong$email.com"))
+
+	// should fail because user not found
+	require.Error(t, cmd.RunCommand(t, "user", "email", "invalidUser", newEmail))
+
+}
-- 
cgit v1.2.3-1-g7c22