Этот коммит содержится в:
Jesús Espino
2018-03-29 16:04:54 +02:00
коммит произвёл Harrison Healey
родитель eb48292a3a
Коммит 014a3b6a60
28 изменённых файлов: 44 добавлений и 44 удалений

Просмотреть файл

@@ -19,7 +19,7 @@ func TestCheckIfRolesGrantPermission(t *testing.T) {
shouldGrant bool
}{
{[]string{model.SYSTEM_ADMIN_ROLE_ID}, model.PERMISSION_MANAGE_SYSTEM.Id, true},
{[]string{model.SYSTEM_ADMIN_ROLE_ID}, "non-existant-permission", false},
{[]string{model.SYSTEM_ADMIN_ROLE_ID}, "non-existent-permission", false},
{[]string{model.CHANNEL_USER_ROLE_ID}, model.PERMISSION_READ_CHANNEL.Id, true},
{[]string{model.CHANNEL_USER_ROLE_ID}, model.PERMISSION_MANAGE_SYSTEM.Id, false},
{[]string{model.SYSTEM_ADMIN_ROLE_ID, model.CHANNEL_USER_ROLE_ID}, model.PERMISSION_MANAGE_SYSTEM.Id, true},

Просмотреть файл

@@ -252,7 +252,7 @@ func (a *App) WaitForChannelMembership(channelId string, userId string) {
return
}
// If we recieved a error but it wasn't a missing channel member then return
// If we received a error but it wasn't a missing channel member then return
if result.Err.Id != store.MISSING_CHANNEL_MEMBER_ERROR {
return
}

Просмотреть файл

@@ -204,7 +204,7 @@ func (me *LoadTestProvider) SetupCommand(a *App, args *model.CommandArgs, messag
doFuzz)
}
return &model.CommandResponse{Text: "Created enviroment", ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL}
return &model.CommandResponse{Text: "Created environment", ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL}
}
func (me *LoadTestProvider) UsersCommand(a *App, args *model.CommandArgs, message string) *model.CommandResponse {

Просмотреть файл

@@ -79,7 +79,7 @@ func TestDiagnostics(t *testing.T) {
t.Fail()
}
case <-time.After(time.Second * 1):
t.Fatal("Did not recieve ID message")
t.Fatal("Did not receive ID message")
}
t.Run("Send", func(t *testing.T) {
@@ -94,7 +94,7 @@ func TestDiagnostics(t *testing.T) {
t.Fail()
}
case <-time.After(time.Second * 1):
t.Fatal("Did not recieve diagnostic")
t.Fatal("Did not receive diagnostic")
}
})
@@ -163,7 +163,7 @@ func TestDiagnostics(t *testing.T) {
case <-data:
t.Fatal("Should not send diagnostics when they are disabled")
case <-time.After(time.Second * 1):
// Did not recieve diagnostics
// Did not receive diagnostics
}
})
}

Просмотреть файл

@@ -1338,11 +1338,11 @@ func TestImportImportChannel(t *testing.T) {
t.Fatalf("Failed to get channel count.")
}
// Do a valid channel in apply mode with a nonexistant team.
// Do a valid channel in apply mode with a non-existent team.
data.Name = ptrStr("channelname")
data.Team = ptrStr(model.NewId())
if err := th.App.ImportChannel(&data, false); err == nil {
t.Fatalf("Expected error due to non-existant team (apply mode).")
t.Fatalf("Expected error due to non-existent team (apply mode).")
}
// Check that no more channels are in the DB.
@@ -2501,7 +2501,7 @@ func TestImportImportDirectChannel(t *testing.T) {
model.NewId(),
}
if err := th.App.ImportDirectChannel(&data, true); err != nil {
t.Fatalf("Expected success as cannot validate existance of channel members in dry run mode.")
t.Fatalf("Expected success as cannot validate existence of channel members in dry run mode.")
}
// Check that no more channels are in the DB.
@@ -2515,7 +2515,7 @@ func TestImportImportDirectChannel(t *testing.T) {
model.NewId(),
}
if err := th.App.ImportDirectChannel(&data, true); err != nil {
t.Fatalf("Expected success as cannot validate existance of channel members in dry run mode.")
t.Fatalf("Expected success as cannot validate existence of channel members in dry run mode.")
}
// Check that no more channels are in the DB.