diff options
author | Eric Wong (Contractor, The Linux Foundation) <e@80x24.org> | 2018-03-29 09:57:47 +0000 |
---|---|---|
committer | Eric Wong (Contractor, The Linux Foundation) <e@80x24.org> | 2018-03-29 09:59:59 +0000 |
commit | 8f9e9ae77525418a4d916d80297c66c4c854b16e (patch) | |
tree | 068ff0d286de0ea5fd23065ad87293a50a7c05de /t | |
parent | d8e714970bbdf130568e17c114e747b5c3464d19 (diff) | |
download | public-inbox-8f9e9ae77525418a4d916d80297c66c4c854b16e.tar.gz |
By using the "primary" Message-ID in WwwAttach, we can avoid conflicts in the links we use for downloading attachments.
Diffstat (limited to 't')
-rw-r--r-- | t/psgi_v2.t | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/t/psgi_v2.t b/t/psgi_v2.t index 11b2c794..31c4178b 100644 --- a/t/psgi_v2.t +++ b/t/psgi_v2.t @@ -171,6 +171,42 @@ test_psgi(sub { $www->call(@_) }, sub { is($res->code, 200, 'got info refs for dumb clones'); $res = $cb->(GET('/v2test/info/refs')); is($res->code, 404, 'unpartitioned git URL fails'); + + # ensure conflicted attachments can be resolved + foreach my $body (qw(old new)) { + my $parts = [ + PublicInbox::MIME->create( + attributes => { content_type => 'text/plain' }, + body => 'blah', + ), + PublicInbox::MIME->create( + attributes => { + filename => 'attach.txt', + content_type => 'text/plain', + }, + body => $body + ) + ]; + $mime = PublicInbox::MIME->create( + parts => $parts, + header_str => [ From => 'root@z', + 'Message-ID' => '<a@dup>', + Subject => 'hi'] + ); + ok($im->add($mime), "added attachment $body"); + } + $im->done; + $config->each_inbox(sub { $_[0]->search->reopen }); + $res = $cb->(GET('/v2test/a@dup/')); + my @links = ($res->content =~ m!"\.\./([^/]+/2-attach\.txt)\"!g); + is(scalar(@links), 2, 'both attachment links exist'); + isnt($links[0], $links[1], 'attachment links are different'); + { + my $old = $cb->(GET('/v2test/' . $links[0])); + my $new = $cb->(GET('/v2test/' . $links[1])); + is($old->content, 'old', 'got expected old content'); + is($new->content, 'new', 'got expected new content'); + } }); done_testing(); |