X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=test%2Fmultipart;h=1bcdfa254d788e888cd832d823641ca5fb4643d2;hp=42cbb7658f2afa66510d6ae873e9edb4f8895a79;hb=6ca7d73239091e8bff7cb05b145c6696d7b5d79a;hpb=916c2aa6247c6ef3d2a9c9c784cf4d3a5de263d0

diff --git a/test/multipart b/test/multipart
index 42cbb765..1bcdfa25 100755
--- a/test/multipart
+++ b/test/multipart
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 test_description="output of multipart message"
 . ./test-lib.sh
 
@@ -29,7 +29,7 @@ Message-ID: <87liy5ap01.fsf@yoom.home.cworth.org>
 MIME-Version: 1.0
 Content-Type: text/html
 
-<p>This is an imbeded message, with a single html part.</p>
+<p>This is an embedded message, with a single html part.</p>
 
 --=-=-=
 Content-Disposition: attachment; filename=attachment
@@ -63,7 +63,7 @@ output=$(notmuch show --format=text --part=0 'id:87liy5ap00.fsf@yoom.home.cworth
 test_expect_equal "$output" \
 "message{ id:87liy5ap00.fsf@yoom.home.cworth.org depth:0 match:1 filename:${MAIL_DIR}/multipart
 header{
-Carl Worth <cworth@cworth.org> (2001-01-05) (attachment inbox unread)
+Carl Worth <cworth@cworth.org> (2001-01-05) (attachment inbox signed unread)
 Subject: Multipart message
 From: Carl Worth <cworth@cworth.org>
 To: cworth@cworth.org
@@ -186,7 +186,7 @@ test_expect_success \
 test_begin_subtest "--format=json --part=0, full message"
 output=$(notmuch show --format=json --part=0 'id:87liy5ap00.fsf@yoom.home.cworth.org')
 test_expect_equal "$output" \
-'{"id": "87liy5ap00.fsf@yoom.home.cworth.org", "match": true, "filename": "'"${MAIL_DIR}/multipart"'", "timestamp": 978709437, "date_relative": "2001-01-05", "tags": ["attachment","inbox","unread"], "headers": {"Subject": "Multipart message", "From": "Carl Worth <cworth@cworth.org>", "To": "cworth@cworth.org", "Cc": "", "Bcc": "", "Date": "Tue, 05 Jan 2001 15:43:57 -0000"}, "body": [{"id": 1, "content-type": "multipart/signed", "content": [{"id": 2, "content-type": "multipart/mixed", "content": [{"id": 3, "content-type": "message/rfc822", "content": [{"id": 4, "content-type": "text/html"}]}, {"id": 5, "content-type": "text/plain", "filename": "attachment", "content": "This is a text attachment.\n"}, {"id": 6, "content-type": "text/plain", "content": "And this message is signed.\n\n-Carl\n"}]}, {"id": 7, "content-type": "application/pgp-signature"}]}]}'
+'{"id": "87liy5ap00.fsf@yoom.home.cworth.org", "match": true, "filename": "'"${MAIL_DIR}/multipart"'", "timestamp": 978709437, "date_relative": "2001-01-05", "tags": ["attachment","inbox","signed","unread"], "headers": {"Subject": "Multipart message", "From": "Carl Worth <cworth@cworth.org>", "To": "cworth@cworth.org", "Cc": "", "Bcc": "", "Date": "Tue, 05 Jan 2001 15:43:57 -0000"}, "body": [{"id": 1, "content-type": "multipart/signed", "content": [{"id": 2, "content-type": "multipart/mixed", "content": [{"id": 3, "content-type": "message/rfc822", "content": [{"id": 4, "content-type": "text/html"}]}, {"id": 5, "content-type": "text/plain", "filename": "attachment", "content": "This is a text attachment.\n"}, {"id": 6, "content-type": "text/plain", "content": "And this message is signed.\n\n-Carl\n"}]}, {"id": 7, "content-type": "application/pgp-signature"}]}]}'
 
 test_begin_subtest "--format=json --part=1, message body"
 output=$(notmuch show --format=json --part=1 'id:87liy5ap00.fsf@yoom.home.cworth.org')
@@ -238,7 +238,7 @@ test_expect_equal "$output" "$(cat "${MAIL_DIR}"/multipart)"
 test_begin_subtest "--format=raw --part=1, message body"
 output=$(notmuch show --format=raw --part=1 'id:87liy5ap00.fsf@yoom.home.cworth.org')
 test_expect_equal "$output" \
-'<p>This is an imbeded message, with a single html part.</p>
+'<p>This is an embedded message, with a single html part.</p>
 This is a text attachment.
 And this message is signed.
 
@@ -254,7 +254,7 @@ W6cAmQE4dcYrx/LPLtYLZm1jsGauE5hE
 test_begin_subtest "--format=raw --part=2, multipart/mixed"
 output=$(notmuch show --format=raw --part=2 'id:87liy5ap00.fsf@yoom.home.cworth.org')
 test_expect_equal "$output" \
-'<p>This is an imbeded message, with a single html part.</p>
+'<p>This is an embedded message, with a single html part.</p>
 This is a text attachment.
 And this message is signed.
 
@@ -263,12 +263,12 @@ And this message is signed.
 test_begin_subtest "--format=raw --part=3, rfc822 multipart"
 output=$(notmuch show --format=raw --part=3 'id:87liy5ap00.fsf@yoom.home.cworth.org')
 test_expect_equal "$output" \
-'<p>This is an imbeded message, with a single html part.</p>'
+'<p>This is an embedded message, with a single html part.</p>'
 
 test_begin_subtest "--format=raw --part=4, html part"
 output=$(notmuch show --format=raw --part=4 'id:87liy5ap00.fsf@yoom.home.cworth.org')
 test_expect_equal "$output" \
-'<p>This is an imbeded message, with a single html part.</p>'
+'<p>This is an embedded message, with a single html part.</p>'
 
 test_begin_subtest "--format=raw --part=5, inline attachment"
 output=$(notmuch show --format=raw --part=5 'id:87liy5ap00.fsf@yoom.home.cworth.org')
@@ -305,4 +305,24 @@ test_expect_success \
     "--format=mbox --part=1, incompatible, expect error" \
     "! notmuch show --format=mbox --part=1 'id:87liy5ap00.fsf@yoom.home.cworth.org'"
 
+test_begin_subtest "'notmuch reply' to a multipart message"
+output=$(notmuch reply 'id:87liy5ap00.fsf@yoom.home.cworth.org')
+test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
+Subject: Re: Multipart message
+To: Carl Worth <cworth@cworth.org>, cworth@cworth.org
+In-Reply-To: <87liy5ap00.fsf@yoom.home.cworth.org>
+References: <87liy5ap00.fsf@yoom.home.cworth.org>
+
+On Tue, 05 Jan 2001 15:43:57 -0000, Carl Worth <cworth@cworth.org> wrote:
+Non-text part: multipart/signed
+Non-text part: multipart/mixed
+Non-text part: message/rfc822
+Non-text part: text/html
+> This is a text attachment.
+> And this message is signed.
+> 
+> -Carl
+Non-text part: application/pgp-signature"
+
+
 test_done