Adding unit tests for cmd line

8 files changed, 25 insertions, 17 deletions

diff --git a/api/user.go b/api/user.go
index f4ebcaaf8..48f974dd5 100644
--- a/api/user.go
+++ b/api/user.go
@@ -925,7 +925,7 @@ func updateRoles(c *Context, w http.ResponseWriter, r *http.Request) {
 	}
 
 	new_roles := props["new_roles"]
-	if model.IsValidRoles(new_roles) {
+	if !model.IsValidRoles(new_roles) {
 		c.SetInvalidParam("updateRoles", "new_roles")
 		return
 	}
diff --git a/mattermost.go b/mattermost.go
index 54d08c243..950de2827 100644
--- a/mattermost.go
+++ b/mattermost.go
@@ -257,6 +257,12 @@ func cmdResetPassword() {
 			os.Exit(1)
 		}
 
+		if len(flagPassword) < 5 {
+			fmt.Fprintln(os.Stderr, "flag invalid argument needs to be more than 4 characters: -password")
+			flag.Usage()
+			os.Exit(1)
+		}
+
 		c := &api.Context{}
 		c.RequestId = model.NewId()
 		c.IpAddress = "cmd_line"
diff --git a/model/team_test.go b/model/team_test.go
index 0dec07559..82480633f 100644
--- a/model/team_test.go
+++ b/model/team_test.go
@@ -106,8 +106,8 @@ var tReservedDomains = []struct {
 }{
 	{"test-hello", true},
 	{"test", true},
-	{"admin", true},
-	{"Admin-punch", true},
+	//{"admin", true},
+	//{"Admin-punch", true},
 	{"spin-punch-admin", false},
 }
 
diff --git a/model/user_test.go b/model/user_test.go
index 32a6f9b78..190e5826e 100644
--- a/model/user_test.go
+++ b/model/user_test.go
@@ -199,6 +199,15 @@ func TestRoles(t *testing.T) {
 		t.Fatal()
 	}
 
-	//IsInRole
+	if IsValidRoles("junk") {
+		t.Fatal()
+	}
 
+	if IsInRole("system_admin junk", "admin") {
+		t.Fatal()
+	}
+
+	if !IsInRole("system_admin junk", "system_admin") {
+		t.Fatal()
+	}
 }
diff --git a/model/utils.go b/model/utils.go
index 17d1c6317..d12a6104e 100644
--- a/model/utils.go
+++ b/model/utils.go
@@ -151,7 +151,7 @@ func IsValidEmail(email string) bool {
 var reservedName = []string{
 	"www",
 	"web",
-	"admin",
+	//"admin",
 	"support",
 	"notify",
 	"test",
diff --git a/store/sql_team_store.go b/store/sql_team_store.go
index e9c205039..5351b98f3 100644
--- a/store/sql_team_store.go
+++ b/store/sql_team_store.go
@@ -35,10 +35,6 @@ func (s SqlTeamStore) CreateIndexesIfNotExists() {
 }
 
 func (s SqlTeamStore) Save(team *model.Team) StoreChannel {
-	return s.SaveWithValidate(team, true)
-}
-
-func (s SqlTeamStore) SaveWithValidate(team *model.Team, validate bool) StoreChannel {
 	storeChannel := make(StoreChannel)
 
 	go func() {
@@ -54,12 +50,10 @@ func (s SqlTeamStore) SaveWithValidate(team *model.Team, validate bool) StoreCha
 
 		team.PreSave()
 
-		if validate {
-			if result.Err = team.IsValid(); result.Err != nil {
-				storeChannel <- result
-				close(storeChannel)
-				return
-			}
+		if result.Err = team.IsValid(); result.Err != nil {
+			storeChannel <- result
+			close(storeChannel)
+			return
 		}
 
 		if err := s.GetMaster().Insert(team); err != nil {
diff --git a/store/store.go b/store/store.go
index 2770dfd16..271caa366 100644
--- a/store/store.go
+++ b/store/store.go
@@ -39,7 +39,6 @@ type Store interface {
 
 type TeamStore interface {
 	Save(team *model.Team) StoreChannel
-	SaveWithValidate(team *model.Team, validate bool) StoreChannel
 	Update(team *model.Team) StoreChannel
 	UpdateDisplayName(name string, teamId string) StoreChannel
 	Get(id string) StoreChannel
diff --git a/web/react/pages/admin_console.jsx b/web/react/pages/admin_console.jsx
index 67ed231c5..0e14d3ff8 100644
--- a/web/react/pages/admin_console.jsx
+++ b/web/react/pages/admin_console.jsx
@@ -2,7 +2,7 @@
 // See License.txt for license information.
 
 export function setupAdminConsolePage() {
-    console.log('setting up admin page');
+
 }
 
 global.window.setup_admin_console_page = setupAdminConsolePage;