user/dev discussion of public-inbox itself
 help / color / Atom feed
From: Eric Wong <e@yhbt.net>
To: meta@public-inbox.org
Subject: [PATCH 12/22] tests: move the majority of t/view.t into t/plack.t
Date: Sat, 25 Jan 2020 04:45:00 +0000
Message-ID: <20200125044510.13769-13-e@yhbt.net> (raw)
In-Reply-To: <20200125044510.13769-1-e@yhbt.net>

And some more into t/mid.t.  PublicInbox::View::msg_html may
change internally, so lets rely on the stable PSGI interface
to test it, rather than a test which reaches deep into the
internals.
---
 t/mid.t   |   8 ++-
 t/plack.t |  81 ++++++++++++++++++++-
 t/view.t  | 207 ++++++------------------------------------------------
 3 files changed, 106 insertions(+), 190 deletions(-)

diff --git a/t/mid.t b/t/mid.t
index ecac04de..7005101f 100644
--- a/t/mid.t
+++ b/t/mid.t
@@ -2,12 +2,18 @@
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use Test::More;
-use PublicInbox::MID qw(mid_escape mids references mids_for_index);
+use PublicInbox::MID qw(mid_escape mids references mids_for_index id_compress);
 
 is(mid_escape('foo!@(bar)'), 'foo!@(bar)');
 is(mid_escape('foo%!@(bar)'), 'foo%25!@(bar)');
 is(mid_escape('foo%!@(bar)'), 'foo%25!@(bar)');
 
+# n.b: this is probably invalid since we dropped CGI for PSGI:
+like(id_compress('foo%bar@wtf'), qr/\A[a-f0-9]{40}\z/,
+	"percent always converted to sha1 to workaround buggy httpds");
+
+is(id_compress('foobar-wtf'), 'foobar-wtf', 'regular ID not compressed');
+
 {
 	use Email::MIME;
 	my $mime = Email::MIME->create;
diff --git a/t/plack.t b/t/plack.t
index 443831a1..a9a053ed 100644
--- a/t/plack.t
+++ b/t/plack.t
@@ -40,6 +40,7 @@ Message-Id: <blah\@example.com>
 Subject: hihi
 Date: Fri, 02 Oct 1993 00:00:00 +0000
 
+> quoted text
 zzzzzz
 EOF
 	$im->add($mime);
@@ -48,6 +49,67 @@ EOF
 	like($rev, qr/\A[a-f0-9]{40}/, "good revision committed");
 	@ls = $git->qx(qw(ls-tree -r --name-only HEAD));
 	chomp @ls;
+
+	# multipart with two text bodies
+	my %attr_text = (attributes => { content_type => 'text/plain' });
+	my $parts = [
+		Email::MIME->create(%attr_text, body => 'hi'),
+		Email::MIME->create(%attr_text, body => 'bye')
+	];
+	$mime = Email::MIME->create(
+		header_str => [
+			From => 'a@example.com',
+			Subject => 'blargh',
+			'Message-ID' => '<multipart@example.com>',
+			'In-Reply-To' => '<irp@example.com>'
+		],
+		parts => $parts,
+	);
+	$im->add($mime);
+
+	# multipart with attached patch + filename
+	$parts = [ Email::MIME->create(%attr_text, body => 'hi, see attached'),
+		Email::MIME->create(
+			attributes => {
+					content_type => 'text/plain',
+					filename => "foo&.patch",
+			},
+			body => "--- a/file\n+++ b/file\n" .
+				"@@ -49, 7 +49,34 @@\n"
+			)
+	];
+	$mime = Email::MIME->create(
+		header_str => [
+			From => 'a@example.com',
+			Subject => '[PATCH] asdf',
+			'Message-ID' => '<patch@example.com>'
+		],
+		parts => $parts
+	);
+	$im->add($mime);
+
+	# multipart collapsed to single quoted-printable text/plain
+	$parts = [
+		Email::MIME->create(
+			attributes => {
+				content_type => 'text/plain',
+				encoding => 'quoted-printable'
+			},
+			body => 'hi = bye',
+		)
+	];
+	$mime = Email::MIME->create(
+		header_str => [
+			From => 'qp@example.com',
+			Subject => 'QP',
+			'Message-ID' => '<qp@example.com>',
+			],
+		parts => $parts,
+	);
+	like($mime->body_raw, qr/hi =3D bye=/, 'our test used QP correctly');
+	$im->add($mime);
+
+	$im->done;
 }
 
 test_psgi($app, sub {
@@ -134,8 +196,10 @@ test_psgi($app, sub {
 	my $path = '/blah@example.com/';
 	my $res = $cb->(GET($pfx . $path));
 	is(200, $res->code, "success for $path");
-	like($res->content, qr!<title>hihi - Me</title>!,
-		"HTML returned");
+	my $html = $res->content;
+	like($html, qr!<title>hihi - Me</title>!, 'HTML returned');
+	like($html, qr!<a\nhref="raw"!s, 'raw link present');
+	like($html, qr!&gt; quoted text!s, 'quoted text inline');
 
 	$path .= 'f/';
 	$res = $cb->(GET($pfx . $path));
@@ -143,6 +207,19 @@ test_psgi($app, sub {
 	my $location = $res->header('Location');
 	like($location, qr!/blah\@example\.com/\z!,
 		'/$MESSAGE_ID/f/ redirected to /$MESSAGE_ID/');
+
+	$res = $cb->(GET($pfx . '/multipart@example.com/'));
+	like($res->content,
+		qr/hi\n.*-- Attachment #2.*\nbye\n/s, 'multipart split');
+
+	$res = $cb->(GET($pfx . '/patch@example.com/'));
+	$html = $res->content;
+	like($html, qr!see attached!, 'original body');
+	like($html, qr!.*Attachment #2: foo&(?:amp|#38);\.patch --!,
+		'parts split with filename');
+
+	$res = $cb->(GET($pfx . '/qp@example.com/'));
+	like($res->content, qr/\bhi = bye\b/, "HTML output decoded QP");
 });
 
 test_psgi($app, sub {
diff --git a/t/view.t b/t/view.t
index 38c12fcc..462667f1 100644
--- a/t/view.t
+++ b/t/view.t
@@ -1,198 +1,31 @@
-# Copyright (C) 2013-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2013-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
-use warnings;
 use Test::More;
 use PublicInbox::TestCommon;
-use Email::MIME;
 require_mods('Plack::Util');
 use_ok 'PublicInbox::View';
-use_ok 'PublicInbox::Config';
 
-# FIXME: make this test less fragile
-my $ctx = {
-	env => { HTTP_HOST => 'example.com', 'psgi.url_scheme' => 'http' },
-	-inbox => Plack::Util::inline_object(
-		name => 'test',
-		over => sub { undef },
-		search => sub { undef },
-		base_url => sub { 'http://example.com/' },
-		cloneurl => sub {[]},
-		nntp_url => sub {[]},
-		max_git_epoch => sub { undef },
-		description => sub { '' }),
-	www => Plack::Util::inline_object(style => sub { '' }),
-};
-$ctx->{-inbox}->{-primary_address} = 'test@example.com';
+# this only tests View.pm internals which are subject to change,
+# see t/plack.t for tests against the PSGI interface.
 
-sub msg_html ($$) {
-	my ($ctx, $mime) = @_;
-
-	my $s = '';
-	my $r = PublicInbox::View::msg_html($ctx, $mime);
-	my $body = $r->[2];
-	while (defined(my $buf = $body->getline)) {
-		$s .= $buf;
-	}
-	$body->close;
-	$s;
-}
-
-# plain text
-{
-	my $body = <<EOF;
-So and so wrote:
-> keep this inline
-
-OK
-
-> Long and wordy reply goes here and it is split across multiple lines.
-> We generate links to a separate full page where quoted-text is inline.
-> This is
->
-> Currently 12 lines
-> See MAX_INLINE_QUOTED
-> See MAX_INLINE_QUOTED
-> See MAX_INLINE_QUOTED
-> See MAX_INLINE_QUOTED
-> See MAX_INLINE_QUOTED
-> See MAX_INLINE_QUOTED
-> See MAX_INLINE_QUOTED
-> See MAX_INLINE_QUOTED
-
-hello world
-EOF
-	my $s = Email::Simple->create(
-		header => [
-			From => 'a@example.com',
-			To => 'b@example.com',
-			'Content-Type' => 'text/plain',
-			'Message-ID' => '<hello@example.com>',
-			Subject => 'this is a subject',
-		],
-		body => $body,
-	)->as_string;
-	my $mime = Email::MIME->new($s);
-	my $html = msg_html($ctx, $mime);
-
-	# ghetto tests
-	like($html, qr!<a\nhref="raw"!s, "raw link present");
-	like($html, qr/hello world\b/, "body present");
-	like($html, qr/&gt; keep this inline/, "short quoted text is inline");
-}
-
-# multipart crap
-{
-	my $parts = [
-		Email::MIME->create(
-			attributes => { content_type => 'text/plain', },
-			body => 'hi',
-		),
-		Email::MIME->create(
-			attributes => { content_type => 'text/plain', },
-			body => 'bye',
-		)
-	];
-	my $mime = Email::MIME->create(
-		header_str => [
-			From => 'a@example.com',
-			Subject => 'blargh',
-			'Message-ID' => '<blah@example.com>',
-			'In-Reply-To' => '<irp@example.com>',
-			],
-		parts => $parts,
-	);
-
-	my $html = msg_html($ctx, $mime);
-	like($html, qr/hi\n.*-- Attachment #2.*\nbye\n/s, "multipart split");
-}
-
-# multipart email with attached patch
-{
-	my $parts = [
-		Email::MIME->create(
-			attributes => { content_type => 'text/plain', },
-			body => 'hi, see attached patch',
-		),
-		Email::MIME->create(
-			attributes => {
-				content_type => 'text/plain',
-				filename => "foo&.patch",
-			},
-			body => "--- a/file\n+++ b/file\n" .
-			        "@@ -49, 7 +49,34 @@\n",
-		),
-	];
-	my $mime = Email::MIME->create(
-		header_str => [
-			From => 'a@example.com',
-			Subject => '[PATCH] asdf',
-			'Message-ID' => '<patch@example.com>',
-			],
-		parts => $parts,
-	);
-
-	my $html = msg_html($ctx, $mime);
-	like($html, qr!.*Attachment #2: foo&(?:amp|#38);\.patch --!,
-		"parts split with filename");
-}
-
-# multipart collapsed to single quoted-printable text/plain
-{
-	my $parts = [
-		Email::MIME->create(
-			attributes => {
-				content_type => 'text/plain',
-				encoding => 'quoted-printable',
-			},
-			body => 'hi = bye',
-		)
-	];
-	my $mime = Email::MIME->create(
-		header_str => [
-			From => 'qp@example.com',
-			Subject => 'QP',
-			'Message-ID' => '<qp@example.com>',
-			],
-		parts => $parts,
-	);
-
-	my $orig = $mime->body_raw;
-	my $html = msg_html($ctx, $mime);
-	like($orig, qr/hi =3D bye=/, "our test used QP correctly");
-	like($html, qr/\bhi = bye\b/, "HTML output decoded QP");
-}
-
-{
-	use PublicInbox::MID qw/id_compress/;
-
-	# n.b: this is probably invalid since we dropped CGI for PSGI:
-	like(id_compress('foo%bar@wtf'), qr/\A[a-f0-9]{40}\z/,
-		"percent always converted to sha1 to workaround buggy httpds");
-
-	is(id_compress('foobar-wtf'), 'foobar-wtf',
-		'regular ID not compressed');
-}
-
-{
-	my $cols = PublicInbox::View::COLS();
-	my @addr;
-	until (length(join(', ', @addr)) > ($cols * 2)) {
-		push @addr, '"l, f" <a@a>';
-		my $n = int(rand(20)) + 1;
-		push @addr, ('x'x$n).'@x';
-	}
-	my $orig = join(', ', @addr);
-	my $res = PublicInbox::View::fold_addresses($orig.'');
-	isnt($res, $orig, 'folded result');
-	unlike($res, qr/l,\n\tf/s, '"last, first" no broken');
-	my @nospc = ($res, $orig);
-	s/\s+//g for @nospc;
-	is($nospc[0], $nospc[1], 'no addresses lost in translation');
-	my $tws = PublicInbox::View::fold_addresses($orig.' ');
-	# (Email::Simple drops leading whitespace, but not trailing)
-	$tws =~ s/ \z//;
-	is($tws, $res, 'not thrown off by trailing whitespace');
+my $cols = PublicInbox::View::COLS();
+my @addr;
+until (length(join(', ', @addr)) > ($cols * 2)) {
+	push @addr, '"l, f" <a@a>';
+	my $n = int(rand(20)) + 1;
+	push @addr, ('x'x$n).'@x';
 }
+my $orig = join(', ', @addr);
+my $res = PublicInbox::View::fold_addresses($orig.'');
+isnt($res, $orig, 'folded result');
+unlike($res, qr/l,\n\tf/s, '"last, first" no broken');
+my @nospc = ($res, $orig);
+s/\s+//g for @nospc;
+is($nospc[0], $nospc[1], 'no addresses lost in translation');
+my $tws = PublicInbox::View::fold_addresses($orig.' ');
+# (Email::Simple drops leading whitespace, but not trailing)
+$tws =~ s/ \z//;
+is($tws, $res, 'not thrown off by trailing whitespace');
 
 done_testing();

  parent reply index

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-25  4:44 [PATCH 00/22] HTML display cleanups, fixes, speedups Eric Wong
2020-01-25  4:44 ` [PATCH 01/22] www*stream: favor \&close instead of *close Eric Wong
2020-01-25  4:44 ` [PATCH 02/22] www: use "skel" terminology consistently Eric Wong
2020-01-25  4:44 ` [PATCH 03/22] view: improve readability around walk_thread Eric Wong
2020-01-25  4:44 ` [PATCH 04/22] searchview: keep $noop sub private to the package Eric Wong
2020-01-25  4:44 ` [PATCH 05/22] view: reduce parameters for html_footer Eric Wong
2020-01-25  4:44 ` [PATCH 06/22] view: thread_skel: drop constant tpfx parameter Eric Wong
2020-01-25  4:44 ` [PATCH 07/22] view: simplify duplicate Message-ID handling Eric Wong
2020-01-25  4:44 ` [PATCH 08/22] wwwstream: discard single-use $ctx fields after use Eric Wong
2020-01-25  4:44 ` [PATCH 09/22] view: start performing buffering into {obuf} Eric Wong
2020-01-25  4:44 ` [PATCH 10/22] t/plack.t: modernize and unindent Eric Wong
2020-01-25  4:44 ` [PATCH 11/22] init: use Import::run_die instead of system() Eric Wong
2020-01-25  4:45 ` Eric Wong [this message]
2020-01-25  4:45 ` [PATCH 13/22] xt/perf-msgview: switch to multipart_text_as_html Eric Wong
2020-01-25  4:45 ` [PATCH 14/22] view: inline and eliminate msg_html Eric Wong
2020-01-25  4:45 ` [PATCH 15/22] linkify: compile $LINK_RE once Eric Wong
2020-01-25  4:45 ` [PATCH 16/22] linkify: move to_html over from ViewDiff Eric Wong
2020-01-25  4:45 ` [PATCH 17/22] searchidx: skip filenames on "diff --git ..." Eric Wong
2020-01-25  4:45 ` [PATCH 18/22] searchidx: don't assume "a/" and "b/" as prefixes Eric Wong
2020-01-25  4:45 ` [PATCH 19/22] viewdiff: add "b=" param with non-standard diff prefix Eric Wong
2020-01-25  4:45 ` [PATCH 20/22] viewdiff: add "b=" param when missing "diff --git" line Eric Wong
2020-01-25  4:45 ` [PATCH 21/22] viewdiff: use autovivification for long_path hash Eric Wong
2020-01-25  4:45 ` [PATCH 22/22] viewdiff: rewrite and simplify Eric Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200125044510.13769-13-e@yhbt.net \
    --to=e@yhbt.net \
    --cc=meta@public-inbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

user/dev discussion of public-inbox itself

Archives are clonable:
	git clone --mirror http://public-inbox.org/meta
	git clone --mirror http://czquwvybam4bgbro.onion/meta
	git clone --mirror http://hjrcffqmbrq6wope.onion/meta
	git clone --mirror http://ou63pmih66umazou.onion/meta

Example config snippet for mirrors

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.mail.public-inbox.meta
	nntp://ou63pmih66umazou.onion/inbox.comp.mail.public-inbox.meta
	nntp://czquwvybam4bgbro.onion/inbox.comp.mail.public-inbox.meta
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.mail.public-inbox.meta
	nntp://news.gmane.io/gmane.mail.public-inbox.general

 note: .onion URLs require Tor: https://www.torproject.org/

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git