summaryrefslogtreecommitdiffstats
path: root/app/file_test.go
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-10-04 11:42:38 -0400
committerGitHub <noreply@github.com>2017-10-04 11:42:38 -0400
commitfadd9514f6e71590aba781a7035e1de4150137b0 (patch)
treea265d44f377281abd56baf31fe878e08f90f7d4b /app/file_test.go
parentfa80cb10a8ad047f9504c49ed2671d31650d1878 (diff)
downloadchat-fadd9514f6e71590aba781a7035e1de4150137b0.tar.gz
chat-fadd9514f6e71590aba781a7035e1de4150137b0.tar.bz2
chat-fadd9514f6e71590aba781a7035e1de4150137b0.zip
PLT-7718 Patch for files (#7564)
* Patch for files * Fix merge * Fix tests * Fix another test
Diffstat (limited to 'app/file_test.go')
-rw-r--r--app/file_test.go14
1 files changed, 14 insertions, 0 deletions
diff --git a/app/file_test.go b/app/file_test.go
index 62511ceea..f3141fa18 100644
--- a/app/file_test.go
+++ b/app/file_test.go
@@ -85,4 +85,18 @@ func TestDoUploadFile(t *testing.T) {
if info3.Path != fmt.Sprintf("20080305/teams/%v/channels/%v/users/%v/%v/%v", teamId, channelId, userId, info3.Id, filename) {
t.Fatal("stored file at incorrect path", info3.Path)
}
+
+ info4, err := th.App.DoUploadFile(time.Date(2009, 3, 5, 1, 2, 3, 4, time.Local), "../../"+teamId, "../../"+channelId, "../../"+userId, "../../"+filename, data)
+ if err != nil {
+ t.Fatal(err)
+ } else {
+ defer func() {
+ <-th.App.Srv.Store.FileInfo().PermanentDelete(info3.Id)
+ utils.RemoveFile(info3.Path)
+ }()
+ }
+
+ if info4.Path != fmt.Sprintf("20090305/teams/%v/channels/%v/users/%v/%v/%v", teamId, channelId, userId, info4.Id, filename) {
+ t.Fatal("stored file at incorrect path", info4.Path)
+ }
}