fix test

nyaruka · Jul 18, 2017 · 49f180f · 49f180f
1 parent 082128f
commit 49f180f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/backends/rapidpro/backend_test.go b/backends/rapidpro/backend_test.go
@@ -334,7 +334,6 @@ func (ts *MsgTestSuite) TestWriteAttachment() {
 	err := ts.b.WriteMsg(msg)
 	ts.NoError(err)
 	ts.True(strings.HasPrefix(msg.Attachments()[0], "text/plain"))
-	ts.True(strings.HasSuffix(msg.Attachments()[0], ".txt"), "Attachment: %s", msg.Attachments()[0])
 
 	// use an extension for our attachment instead
 	msg = ts.b.NewIncomingMsg(knChannel, urn, "jpg attachment").(*DBMsg)

diff --git a/backends/rapidpro/msg.go b/backends/rapidpro/msg.go
@@ -215,11 +215,13 @@ func downloadMediaToS3(b *backend, msgUUID courier.MsgUUID, mediaURL string) (st
 	// we still don't know our mime type, use our content header instead
 	if mimeType == "" {
 		mimeType, _, _ = mime.ParseMediaType(resp.Header.Get("Content-Type"))
-		extensions, err := mime.ExtensionsByType(mimeType)
-		if extensions == nil || err != nil {
-			extension = ""
-		} else {
-			extension = extensions[0][1:]
+		if extension == "" {
+			extensions, err := mime.ExtensionsByType(mimeType)
+			if extensions == nil || err != nil {
+				extension = ""
+			} else {
+				extension = extensions[0][1:]
+			}
 		}
 	}