Fix spelling of environment

5 files changed, 28 insertions, 28 deletions

diff --git a/api/auto_enviroment.go b/api/auto_enviroment.go
index c6453f5da..28026f361 100644
--- a/api/auto_enviroment.go
+++ b/api/auto_enviroment.go
@@ -10,42 +10,42 @@ import (
 	"time"
 )
 
-type TestEnviroment struct {
+type TestEnvironment struct {
 	Teams       []*model.Team
-	Enviroments []TeamEnviroment
+	Environments []TeamEnvironment
 }
 
-func CreateTestEnviromentWithTeams(client *model.Client, rangeTeams utils.Range, rangeChannels utils.Range, rangeUsers utils.Range, rangePosts utils.Range, fuzzy bool) (TestEnviroment, bool) {
+func CreateTestEnvironmentWithTeams(client *model.Client, rangeTeams utils.Range, rangeChannels utils.Range, rangeUsers utils.Range, rangePosts utils.Range, fuzzy bool) (TestEnvironment, bool) {
 	rand.Seed(time.Now().UTC().UnixNano())
 
 	teamCreator := NewAutoTeamCreator(client)
 	teamCreator.Fuzzy = fuzzy
 	teams, err := teamCreator.CreateTestTeams(rangeTeams)
 	if err != true {
-		return TestEnviroment{}, false
+		return TestEnvironment{}, false
 	}
 
-	enviroment := TestEnviroment{teams, make([]TeamEnviroment, len(teams))}
+	environment := TestEnvironment{teams, make([]TeamEnvironment, len(teams))}
 
 	for i, team := range teams {
 		userCreator := NewAutoUserCreator(client, team.Id)
 		userCreator.Fuzzy = fuzzy
 		randomUser, err := userCreator.createRandomUser()
 		if err != true {
-			return TestEnviroment{}, false
+			return TestEnvironment{}, false
 		}
 		client.LoginById(randomUser.Id, USER_PASSWORD)
-		teamEnviroment, err := CreateTestEnviromentInTeam(client, team.Id, rangeChannels, rangeUsers, rangePosts, fuzzy)
+		teamEnvironment, err := CreateTestEnvironmentInTeam(client, team.Id, rangeChannels, rangeUsers, rangePosts, fuzzy)
 		if err != true {
-			return TestEnviroment{}, false
+			return TestEnvironment{}, false
 		}
-		enviroment.Enviroments[i] = teamEnviroment
+		environment.Environments[i] = teamEnvironment
 	}
 
-	return enviroment, true
+	return environment, true
 }
 
-func CreateTestEnviromentInTeam(client *model.Client, teamID string, rangeChannels utils.Range, rangeUsers utils.Range, rangePosts utils.Range, fuzzy bool) (TeamEnviroment, bool) {
+func CreateTestEnvironmentInTeam(client *model.Client, teamID string, rangeChannels utils.Range, rangeUsers utils.Range, rangePosts utils.Range, fuzzy bool) (TeamEnvironment, bool) {
 	rand.Seed(time.Now().UTC().UnixNano())
 
 	// We need to create at least one user
@@ -57,7 +57,7 @@ func CreateTestEnviromentInTeam(client *model.Client, teamID string, rangeChanne
 	userCreator.Fuzzy = fuzzy
 	users, err := userCreator.CreateTestUsers(rangeUsers)
 	if err != true {
-		return TeamEnviroment{}, false
+		return TeamEnvironment{}, false
 	}
 	usernames := make([]string, len(users))
 	for i, user := range users {
@@ -77,7 +77,7 @@ func CreateTestEnviromentInTeam(client *model.Client, teamID string, rangeChanne
 	}
 
 	if err != true {
-		return TeamEnviroment{}, false
+		return TeamEnvironment{}, false
 	}
 	numPosts := utils.RandIntFromRange(rangePosts)
 	numImages := utils.RandIntFromRange(rangePosts) / 4
@@ -93,5 +93,5 @@ func CreateTestEnviromentInTeam(client *model.Client, teamID string, rangeChanne
 		}
 	}
 
-	return TeamEnviroment{users, channels}, true
+	return TeamEnvironment{users, channels}, true
 }
diff --git a/api/auto_teams.go b/api/auto_teams.go
index 6677ac9bf..082415d32 100644
--- a/api/auto_teams.go
+++ b/api/auto_teams.go
@@ -8,7 +8,7 @@ import (
 	"github.com/mattermost/platform/utils"
 )
 
-type TeamEnviroment struct {
+type TeamEnvironment struct {
 	Users    []*model.User
 	Channels []*model.Channel
 }
diff --git a/api/command.go b/api/command.go
index b2a4f4a0b..e22a05a5f 100644
--- a/api/command.go
+++ b/api/command.go
@@ -381,11 +381,11 @@ func loadTestSetupCommand(c *Context, command *model.Command) bool {
 
 		if doTeams {
 			if err := CreateBasicUser(client); err != nil {
-				l4g.Error("Failed to create testing enviroment")
+				l4g.Error("Failed to create testing environment")
 				return true
 			}
 			client.LoginByEmail(BTEST_TEAM_NAME, BTEST_USER_EMAIL, BTEST_USER_PASSWORD)
-			enviroment, err := CreateTestEnviromentWithTeams(
+			environment, err := CreateTestEnvironmentWithTeams(
 				client,
 				utils.Range{numTeams, numTeams},
 				utils.Range{numChannels, numChannels},
@@ -393,18 +393,18 @@ func loadTestSetupCommand(c *Context, command *model.Command) bool {
 				utils.Range{numPosts, numPosts},
 				doFuzz)
 			if err != true {
-				l4g.Error("Failed to create testing enviroment")
+				l4g.Error("Failed to create testing environment")
 				return true
 			} else {
-				l4g.Info("Testing enviroment created")
-				for i := 0; i < len(enviroment.Teams); i++ {
-					l4g.Info("Team Created: " + enviroment.Teams[i].Name)
-					l4g.Info("\t User to login: " + enviroment.Enviroments[i].Users[0].Email + ", " + USER_PASSWORD)
+				l4g.Info("Testing environment created")
+				for i := 0; i < len(environment.Teams); i++ {
+					l4g.Info("Team Created: " + environment.Teams[i].Name)
+					l4g.Info("\t User to login: " + environment.Environments[i].Users[0].Email + ", " + USER_PASSWORD)
 				}
 			}
 		} else {
 			client.MockSession(c.Session.Token)
-			CreateTestEnviromentInTeam(
+			CreateTestEnvironmentInTeam(
 				client,
 				c.Session.TeamId,
 				utils.Range{numChannels, numChannels},
@@ -416,7 +416,7 @@ func loadTestSetupCommand(c *Context, command *model.Command) bool {
 	} else if strings.Index(cmd, command.Command) == 0 {
 		command.AddSuggestion(&model.SuggestCommand{
 			Suggestion:  cmd,
-			Description: "Creates a testing enviroment in current team. [teams] [fuzz] <Num Channels> <Num Users> <NumPosts>"})
+			Description: "Creates a testing environment in current team. [teams] [fuzz] <Num Channels> <Num Users> <NumPosts>"})
 	}
 
 	return false
diff --git a/manualtesting/manual_testing.go b/manualtesting/manual_testing.go
index 3c2289626..ffdb578a4 100644
--- a/manualtesting/manual_testing.go
+++ b/manualtesting/manual_testing.go
@@ -16,7 +16,7 @@ import (
 	"time"
 )
 
-type TestEnviroment struct {
+type TestEnvironment struct {
 	Params        map[string][]string
 	Client        *model.Client
 	CreatedTeamId string
@@ -121,8 +121,8 @@ func manualTest(c *api.Context, w http.ResponseWriter, r *http.Request) {
 		http.Redirect(w, r, "/channels/town-square", http.StatusTemporaryRedirect)
 	}
 
-	// Setup test enviroment
-	env := TestEnviroment{
+	// Setup test environment
+	env := TestEnvironment{
 		Params:        params,
 		Client:        client,
 		CreatedTeamId: teamID,
diff --git a/manualtesting/test_autolink.go b/manualtesting/test_autolink.go
index e4d49659a..a13ec7a75 100644
--- a/manualtesting/test_autolink.go
+++ b/manualtesting/test_autolink.go
@@ -19,7 +19,7 @@ http://www.google.com.pk/url?sa=t&rct=j&q=&esrc=s&source=web&cd=4&cad=rja&uact=8
 https://medium.com/@slackhq/11-useful-tips-for-getting-the-most-of-slack-5dfb3d1af77
 `
 
-func testAutoLink(env TestEnviroment) *model.AppError {
+func testAutoLink(env TestEnvironment) *model.AppError {
 	l4g.Info("Manual Auto Link Test")
 	channelID, err := getChannelID(model.DEFAULT_CHANNEL, env.CreatedTeamId, env.CreatedUserId)
 	if err != true {