diff options
| author | Saturnino Abril <saturnino.abril@gmail.com> | 2017-06-30 16:06:59 +0800 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2017-06-30 09:06:59 +0100 |
| commit | eea64f8049d90c5dcf14a739d640f5aa6a9c7add (patch) | |
| tree | fabaa232bad7f4ebddf30b073c37a5962029f7fd /app/import_test.go | |
| parent | fb57b3dd53eaca28a557ea7e334e9d7216ce6aab (diff) | |
| download | chat-eea64f8049d90c5dcf14a739d640f5aa6a9c7add.tar.gz chat-eea64f8049d90c5dcf14a739d640f5aa6a9c7add.tar.bz2 chat-eea64f8049d90c5dcf14a739d640f5aa6a9c7add.zip | |
[PLT-5864] Move teammate name display setting to the System Console (#6681)
* move teammate name display setting to the system console
* update all the likes of TeammateNameDisplay names
* fix gofmt error
* rebase and fix conflict
Diffstat (limited to 'app/import_test.go')
| -rw-r--r-- | app/import_test.go | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/app/import_test.go b/app/import_test.go index 365383bad..0a45cca03 100644 --- a/app/import_test.go +++ b/app/import_test.go @@ -1586,7 +1586,6 @@ func TestImportImportUser(t *testing.T) { Theme: ptrStr(`{"awayIndicator":"#DCBD4E","buttonBg":"#23A2FF","buttonColor":"#FFFFFF","centerChannelBg":"#ffffff","centerChannelColor":"#333333","codeTheme":"github","image":"/static/files/a4a388b38b32678e83823ef1b3e17766.png","linkColor":"#2389d7","mentionBj":"#2389d7","mentionColor":"#ffffff","mentionHighlightBg":"#fff2bb","mentionHighlightLink":"#2f81b7","newMessageSeparator":"#FF8800","onlineIndicator":"#7DBE00","sidebarBg":"#fafafa","sidebarHeaderBg":"#3481B9","sidebarHeaderTextColor":"#ffffff","sidebarText":"#333333","sidebarTextActiveBorder":"#378FD2","sidebarTextActiveColor":"#111111","sidebarTextHoverBg":"#e6f2fa","sidebarUnreadText":"#333333","type":"Mattermost"}`), SelectedFont: ptrStr("Roboto Slab"), UseMilitaryTime: ptrStr("true"), - NameFormat: ptrStr("nickname_full_name"), CollapsePreviews: ptrStr("true"), MessageDisplay: ptrStr("compact"), ChannelDisplayMode: ptrStr("centered"), @@ -1625,10 +1624,6 @@ func TestImportImportUser(t *testing.T) { t.Fatalf("Preference does not match.") } - if preference.Name == "name_format" && preference.Value != *data.NameFormat { - t.Fatalf("Preference does not match.") - } - if preference.Name == "collapse_previews" && preference.Value != *data.CollapsePreviews { t.Fatalf("Preference does not match.") } @@ -1650,7 +1645,6 @@ func TestImportImportUser(t *testing.T) { Theme: ptrStr(`{"awayIndicator":"#123456","buttonBg":"#23A2FF","buttonColor":"#FFFFFF","centerChannelBg":"#ffffff","centerChannelColor":"#333333","codeTheme":"github","image":"/static/files/a4a388b38b32678e83823ef1b3e17766.png","linkColor":"#2389d7","mentionBj":"#2389d7","mentionColor":"#ffffff","mentionHighlightBg":"#fff2bb","mentionHighlightLink":"#2f81b7","newMessageSeparator":"#FF8800","onlineIndicator":"#7DBE00","sidebarBg":"#fafafa","sidebarHeaderBg":"#3481B9","sidebarHeaderTextColor":"#ffffff","sidebarText":"#333333","sidebarTextActiveBorder":"#378FD2","sidebarTextActiveColor":"#111111","sidebarTextHoverBg":"#e6f2fa","sidebarUnreadText":"#333333","type":"Mattermost"}`), SelectedFont: ptrStr("Lato"), UseMilitaryTime: ptrStr("false"), - NameFormat: ptrStr("full_name"), CollapsePreviews: ptrStr("false"), MessageDisplay: ptrStr("clean"), ChannelDisplayMode: ptrStr("full"), @@ -1684,10 +1678,6 @@ func TestImportImportUser(t *testing.T) { t.Fatalf("Preference does not match.") } - if preference.Name == "name_format" && preference.Value != *data.NameFormat { - t.Fatalf("Preference does not match.") - } - if preference.Name == "collapse_previews" && preference.Value != *data.CollapsePreviews { t.Fatalf("Preference does not match.") } |