X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=test%2Femacs;h=75dec89c965e814a2c68e5fc352b5540564b2c4f;hp=97f46286c2260b70a5c067bf2dc0ceaa79c356b6;hb=7058ac2bbe426daeb6c0c7a6f65f4b0e14f8ceb2;hpb=3fe90a955e21bc6825e3d9b7ffaba31e1c3d0c8b

diff --git a/test/emacs b/test/emacs
index 97f46286..75dec89c 100755
--- a/test/emacs
+++ b/test/emacs
@@ -26,10 +26,10 @@ output=$(test_emacs '(notmuch-search "tag:inbox") (notmuch-test-wait) (message (
 expected=$(cat $EXPECTED/notmuch-search-tag-inbox)
 test_expect_equal "$output" "$expected"
 
-test_begin_subtest "Navigation of notmuch-hello to search results
-	[XXX: Need to decide the correct order of the search results]"
+test_begin_subtest "Navigation of notmuch-hello to search results"
 output=$(test_emacs '(notmuch-hello) (goto-char (point-min)) (re-search-forward "inbox") (widget-button-press (point)) (notmuch-test-wait) (message (buffer-string))' 2>&1)
-test_expect_equal_failure "$output" "$expected"
+expected=$(cat $EXPECTED/notmuch-hello-view-inbox)
+test_expect_equal "$output" "$expected"
 
 test_begin_subtest "Basic notmuch-show view in emacs"
 maildir_storage_thread=$(notmuch search --output=threads id:20091117190054.GU3165@dottiness.seas.harvard.edu)
@@ -97,10 +97,12 @@ This is a test that messages are sent via SMTP"
 test_begin_subtest "Verify that sent messages are saved/searchable (via FCC)"
 notmuch new > /dev/null
 output=$(notmuch search 'subject:"testing message sent via SMTP"' | notmuch_search_sanitize)
-test_expect_equal "$output" "thread:XXX   1974-03-29 [1/1] Notmuch Test Suite; Testing message sent via SMTP (inbox unread)"
+test_expect_equal "$output" "thread:XXX   1974-03-29 [1/1] Notmuch Test Suite; Testing message sent via SMTP (inbox)"
 
 test_begin_subtest "Reply within emacs"
-output=$(test_emacs '(notmuch-search "subject:\"testing message sent via SMTP\"") (notmuch-test-wait) (notmuch-search-reply-to-thread) (message (buffer-string))' 2>&1 | sed -e 's/^In-Reply-To: <.*>$/In-Reply-To: <XXX>/')
+# We sed away everything before the ^From in the output to avoid getting
+# confused by messages such as "Parsing /home/cworth/.mailrc... done"
+output=$(test_emacs '(notmuch-search "subject:\"testing message sent via SMTP\"") (notmuch-test-wait) (notmuch-search-reply-to-thread) (message (buffer-string))' 2>&1 | sed -ne '/^From/,$ p' | sed -e 's/^In-Reply-To: <.*>$/In-Reply-To: <XXX>/')
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
 To: user@example.com
 Subject: Re: Testing message sent via SMTP
@@ -110,4 +112,16 @@ Fcc: $(pwd)/mail/sent
 On Fri, 29 Mar 1974 10:00:00 -0000, Notmuch Test Suite <test_suite@notmuchmail.org> wrote:
 > This is a test that messages are sent via SMTP"
 
+test_begin_subtest "Save attachment from within emacs"
+echo "./attachment" | test_emacs '(notmuch-show "id:cf0c4d610911171136h1713aa59w9cf9aa31f052ad0a@mail.gmail.com") (notmuch-show-save-attachments)' > /dev/null 2>&1
+output=$(cat attachment)
+expected=$(cat $EXPECTED/attachment)
+test_expect_equal "$output" "$expected"
+
+test_begin_subtest "View raw message within emacs"
+expected=$(cat $EXPECTED/raw-message-cf0c4d-52ad0a)
+first_line=$(echo "$expected" | head -n1)
+output=$(test_emacs '(notmuch-show "id:cf0c4d610911171136h1713aa59w9cf9aa31f052ad0a@mail.gmail.com") (notmuch-show-view-raw-message) (message (buffer-string))' 2>&1 | sed -ne "/$first_line/,\$ p")
+test_expect_equal "$output" "$expected"
+
 test_done