summaryrefslogtreecommitdiffstats
path: root/model/utils_test.go
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-07-21 10:47:46 -0800
committerCorey Hulen <corey@hulen.com>2015-07-21 10:47:46 -0800
commitbee26e3f2654ce7acce647818847480569236343 (patch)
treead9032009e18b78c3ffca6e9e48fc4467ddd282b /model/utils_test.go
parentdc250d77310e8b38b445bcaa4ae8f2d5df97cc1e (diff)
parentc6fb95912bb481791c1ca370a46a4da9c05d05ad (diff)
downloadchat-bee26e3f2654ce7acce647818847480569236343.tar.gz
chat-bee26e3f2654ce7acce647818847480569236343.tar.bz2
chat-bee26e3f2654ce7acce647818847480569236343.zip
Merge pull request #200 from mattermost/mm-1356
MM-1356 Changing team URLs from team.domain.com to domain.com/team
Diffstat (limited to 'model/utils_test.go')
-rw-r--r--model/utils_test.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/model/utils_test.go b/model/utils_test.go
index a9721042d..dbb448882 100644
--- a/model/utils_test.go
+++ b/model/utils_test.go
@@ -83,9 +83,9 @@ var domains = []struct {
{"test", true},
}
-func TestValidDomain(t *testing.T) {
+func TestValidTeamName(t *testing.T) {
for _, v := range domains {
- if IsValidDomain(v.value) != v.expected {
+ if IsValidTeamName(v.value) != v.expected {
t.Errorf("expect %v as %v", v.value, v.expected)
}
}
@@ -102,9 +102,9 @@ var tReservedDomains = []struct {
{"spin-punch-admin", false},
}
-func TestReservedDomain(t *testing.T) {
+func TestReservedTeamName(t *testing.T) {
for _, v := range tReservedDomains {
- if IsReservedDomain(v.value) != v.expected {
+ if IsReservedTeamName(v.value) != v.expected {
t.Errorf("expect %v as %v", v.value, v.expected)
}
}