HTML Content

X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/646bb79c8d61e0df67e3ccec76c7a9539155a6fb..d33eb0b4bee02478ab5250a4c4d2bfc608fde5e3:/test/mhfixmsg/test-mhfixmsg?ds=sidebyside diff --git a/test/mhfixmsg/test-mhfixmsg b/test/mhfixmsg/test-mhfixmsg index d3516175..cc69aea7 100755 --- a/test/mhfixmsg/test-mhfixmsg +++ b/test/mhfixmsg/test-mhfixmsg @@ -14,14 +14,15 @@ fi . "${srcdir}/test/post/test-post-common.sh" +#### Make sure that html-to-text conversion is what we expect. +require_locale en_US.utf-8 en_US.utf8 +LC_ALL=en_US.UTF-8; export LC_ALL + expected="$MH_TEST_DIR/test-mhfixmsg$$.expected" expected_err="$MH_TEST_DIR/test-mhfixmsg$$.expected_err" actual="$MH_TEST_DIR/test-mhfixmsg$$.actual" actual_err="$MH_TEST_DIR/test-mhfixmsg$$.actual_err" -#### Make sure that html-to-text conversion is what we expect. -LC_ALL=en_US.UTF-8; export LC_ALL - if grep mhfixmsg-format-text/html "${MH_TEST_DIR}/Mail/mhn.defaults" \ >/dev/null; then can_reformat_texthtml=1 @@ -56,6 +57,7 @@ Usage: mhfixmsg [+folder] [msgs] [switches] -outfile file -rmmproc program -normmproc + -[no]changecur -[no]verbose -version -help @@ -464,8 +466,7 @@ This is additional content before the first subpart of the multipart. ------- =_aaaaaaaaaa0 Content-Type: multipart/related; - type="multipart/alternative"; - boundary="subpart__1.1" + type="text/plain"; boundary="subpart__1.1" --subpart__1.1 Content-Type: text/plain; charset="iso-8859-1" @@ -514,8 +515,7 @@ This is additional content before the first subpart of the multipart. ------- =_aaaaaaaaaa0 Content-Type: multipart/related; - type="multipart/alternative"; - boundary="subpart__1.1" + type="text/plain"; boundary="subpart__1.1" --subpart__1.1 Content-Type: text/plain; charset="iso-8859-1" @@ -770,7 +770,7 @@ fi cat >"$expected" < @@ -792,24 +792,16 @@ run_test 'mhfixmsg last -outfile '"$actual"' -verbose' \ check "$expected" "$actual" -# check that text/plain part is added to lone text/html in multipart/related -prepare_space >"$expected" <`mhpath new` < -------=_nmh-multipart1-- - ------=_Part_90310_101292502.1 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit @@ -833,32 +823,7 @@ Your email client does not support HTML messages ------=_Part_90310_101292502.1-- EOF -cat >`mhpath new` < - - HTML Content - - - This is the real content. - - -------=_Part_90310_101292502.1 -Content-Type: text/plain; charset="us-ascii" -Content-Transfer-Encoding: 7bit - -Your email client does not support HTML messages -------=_Part_90310_101292502.1-- -EOF +cp -p `mhpath last` "$expected" if [ $can_reformat_texthtml -eq 1 ]; then #### lynx inserts multiple blank lines, so squeeze them. @@ -1064,6 +1029,58 @@ run_prog mhfixmsg last -replacetextplain -noreplacetextplain -outfile "$actual" check "$expected" "$actual" +# check removal of extraneous trailing semicolon from header parameter list +cat >"$expected" <`mhpath new` <"$MH_TEST_DIR/Mail/rmmproc" <<'EOF' mv "$1" "$1.backup"