IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-08-26 21:27:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflicts

Browse Source
This commit is contained in:
Harrison Healey
2017-10-13 12:51:20 -04:00
parent 0c46db2b0b
commit faf2013378
2 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/team_test.go
+2 -8
View File
@@ -57,7 +57,6 @@ func TestCreateTeam(t *testing.T) {
func TestCreateTeamSanitization(t *testing.T) {
th := Setup().InitBasic().InitSystemAdmin()
defer th.TearDown()
// Non-admin users can create a team, but they become a team admin by doing so
@@ -291,7 +290,6 @@ func TestGetAllTeams(t *testing.T) {
func TestGetAllTeamsSanitization(t *testing.T) {
th := Setup().InitBasic().InitSystemAdmin()
defer th.TearDown()
var team *model.Team
if res, err := th.BasicClient.CreateTeam(&model.Team{
@@ -403,7 +401,6 @@ func TestGetAllTeamListings(t *testing.T) {
func TestGetAllTeamListingsSanitization(t *testing.T) {
th := Setup().InitBasic().InitSystemAdmin()
defer th.TearDown()
var team *model.Team
if res, err := th.BasicClient.CreateTeam(&model.Team{
@@ -644,7 +641,6 @@ func TestUpdateTeamDisplayName(t *testing.T) {
func TestUpdateTeamSanitization(t *testing.T) {
th := Setup().InitBasic().InitSystemAdmin()
defer th.TearDown()
var team *model.Team
if res, err := th.BasicClient.CreateTeam(&model.Team{
@@ -747,7 +743,6 @@ func TestGetMyTeam(t *testing.T) {
func TestGetMyTeamSanitization(t *testing.T) {
th := Setup().InitBasic().InitSystemAdmin()
defer th.TearDown()
var team *model.Team
if res, err := th.BasicClient.CreateTeam(&model.Team{
@@ -763,7 +758,7 @@ func TestGetMyTeamSanitization(t *testing.T) {
}
t.Run("team user", func(t *testing.T) {
th.LinkUserToTeam(th.BasicUser2, team)
LinkUserToTeam(th.BasicUser2, team)
client := th.CreateClient()
client.Must(client.Login(th.BasicUser2.Email, th.BasicUser2.Password))
@@ -1154,7 +1149,6 @@ func TestGetTeamByName(t *testing.T) {
func TestGetTeamByNameSanitization(t *testing.T) {
th := Setup().InitBasic().InitSystemAdmin()
defer th.TearDown()
var team *model.Team
if res, err := th.BasicClient.CreateTeam(&model.Team{
@@ -1170,7 +1164,7 @@ func TestGetTeamByNameSanitization(t *testing.T) {
}
t.Run("team user", func(t *testing.T) {
th.LinkUserToTeam(th.BasicUser2, team)
LinkUserToTeam(th.BasicUser2, team)
client := th.CreateClient()
client.Must(client.Login(th.BasicUser2.Email, th.BasicUser2.Password))
api4/team_test.go
+13 -13
View File
@@ -84,7 +84,7 @@ func TestCreateTeam(t *testing.T) {
func TestCreateTeamSanitization(t *testing.T) {
th := Setup().InitBasic().InitSystemAdmin()
defer th.TearDown()
defer TearDown()
// Non-admin users can create a team, but they become a team admin by doing so
@@ -174,7 +174,7 @@ func TestGetTeam(t *testing.T) {
func TestGetTeamSanitization(t *testing.T) {
th := Setup().InitBasic().InitSystemAdmin()
defer th.TearDown()
defer TearDown()
team, resp := th.Client.CreateTeam(&model.Team{
DisplayName: t.Name() + "_1",
@@ -186,7 +186,7 @@ func TestGetTeamSanitization(t *testing.T) {
CheckNoError(t, resp)
t.Run("team user", func(t *testing.T) {
th.LinkUserToTeam(th.BasicUser2, team)
LinkUserToTeam(th.BasicUser2, team)
client := th.CreateClient()
th.LoginBasic2WithClient(client)
@@ -355,7 +355,7 @@ func TestUpdateTeam(t *testing.T) {
func TestUpdateTeamSanitization(t *testing.T) {
th := Setup().InitBasic().InitSystemAdmin()
defer th.TearDown()
defer TearDown()
team, resp := th.Client.CreateTeam(&model.Team{
DisplayName: t.Name() + "_1",
@@ -459,7 +459,7 @@ func TestPatchTeam(t *testing.T) {
func TestPatchTeamSanitization(t *testing.T) {
th := Setup().InitBasic().InitSystemAdmin()
defer th.TearDown()
defer TearDown()
team, resp := th.Client.CreateTeam(&model.Team{
DisplayName: t.Name() + "_1",
@@ -628,7 +628,7 @@ func TestGetAllTeams(t *testing.T) {
func TestGetAllTeamsSanitization(t *testing.T) {
th := Setup().InitBasic().InitSystemAdmin()
defer th.TearDown()
defer TearDown()
team, resp := th.Client.CreateTeam(&model.Team{
DisplayName: t.Name() + "_1",
@@ -743,7 +743,7 @@ func TestGetTeamByName(t *testing.T) {
func TestGetTeamByNameSanitization(t *testing.T) {
th := Setup().InitBasic().InitSystemAdmin()
defer th.TearDown()
defer TearDown()
team, resp := th.Client.CreateTeam(&model.Team{
DisplayName: t.Name() + "_1",
@@ -755,7 +755,7 @@ func TestGetTeamByNameSanitization(t *testing.T) {
CheckNoError(t, resp)
t.Run("team user", func(t *testing.T) {
th.LinkUserToTeam(th.BasicUser2, team)
LinkUserToTeam(th.BasicUser2, team)
client := th.CreateClient()
th.LoginBasic2WithClient(client)
@@ -874,7 +874,7 @@ func TestSearchAllTeams(t *testing.T) {
func TestSearchAllTeamsSanitization(t *testing.T) {
th := Setup().InitBasic().InitSystemAdmin()
defer th.TearDown()
defer TearDown()
team, resp := th.Client.CreateTeam(&model.Team{
DisplayName: t.Name() + "_1",
@@ -909,7 +909,7 @@ func TestSearchAllTeamsSanitization(t *testing.T) {
})
t.Run("team user", func(t *testing.T) {
th.LinkUserToTeam(th.BasicUser2, team)
LinkUserToTeam(th.BasicUser2, team)
client := th.CreateClient()
th.LoginBasic2WithClient(client)
@@ -996,7 +996,7 @@ func TestGetTeamsForUser(t *testing.T) {
func TestGetTeamsForUserSanitization(t *testing.T) {
th := Setup().InitBasic().InitSystemAdmin()
defer th.TearDown()
defer TearDown()
team, resp := th.Client.CreateTeam(&model.Team{
DisplayName: t.Name() + "_1",
@@ -1016,8 +1016,8 @@ func TestGetTeamsForUserSanitization(t *testing.T) {
CheckNoError(t, resp)
t.Run("team user", func(t *testing.T) {
th.LinkUserToTeam(th.BasicUser2, team)
th.LinkUserToTeam(th.BasicUser2, team2)
LinkUserToTeam(th.BasicUser2, team)
LinkUserToTeam(th.BasicUser2, team2)
client := th.CreateClient()
th.LoginBasic2WithClient(client)