oh, and spamassassin too

[git.ikiwiki.info.git] / t / relativity.t

diff --git a/t/relativity.t b/t/relativity.t
index 3fd55375a2aa1908ffd3734fb7a1994c6d3ac5e4..0b8b6eb4b76f411ddf0adf7c1b55e0d91ed322ba 100755 (executable)
--- a/t/relativity.t
+++ b/t/relativity.t
@@ -381,7 +381,7 @@ sub test_site5_w3mmode {
        my $redirect = run_cgi(goto => 1, PATH_INFO => '/ikiwiki.cgi',
                SCRIPT_NAME => '/cgi-bin/ikiwiki-w3m.cgi');
        like($redirect, qr{^Content-type: text/plain\r?\n}m);
        my $redirect = run_cgi(goto => 1, PATH_INFO => '/ikiwiki.cgi',
                SCRIPT_NAME => '/cgi-bin/ikiwiki-w3m.cgi');
        like($redirect, qr{^Content-type: text/plain\r?\n}m);

-       like($redirect, qr{^W3m-control: GOTO \Q$pwd\E/t/tmp/out/a/b/c/\r?\n}m);
+       like($redirect, qr{^W3m-control: GOTO (?:file://)?\Q$pwd\E/t/tmp/out/a/b/c/\r?\n}m);

 }
 
 sub test_site6_behind_reverse_proxy {
 }
 
 sub test_site6_behind_reverse_proxy {


@@ -403,10 +403,7 @@ sub test_site6_behind_reverse_proxy {
        like($bits{cgihref}, qr{^(?:(?:https:)?//example.com)?/cgi-bin/ikiwiki.cgi$});
        like($bits{basehref}, qr{^(?:(?:https:)?//example\.com)?/wiki/$});
        like($bits{stylehref}, qr{^(?:(?:https:)?//example.com)?/wiki/style.css$});
        like($bits{cgihref}, qr{^(?:(?:https:)?//example.com)?/cgi-bin/ikiwiki.cgi$});
        like($bits{basehref}, qr{^(?:(?:https:)?//example\.com)?/wiki/$});
        like($bits{stylehref}, qr{^(?:(?:https:)?//example.com)?/wiki/style.css$});

-       TODO: {
-       local $TODO = "https://ikiwiki.info/bugs/cgi_redirecting_to_non-https_URL/";

        check_goto(qr{^https://example\.com/wiki/a/b/c/$}, HTTP_HOST => 'localhost');
        check_goto(qr{^https://example\.com/wiki/a/b/c/$}, HTTP_HOST => 'localhost');

-       }

 
        # previewing a page
        %bits = parse_cgi_content(run_cgi(is_preview => 1, HTTP_HOST => 'localhost'));
 
        # previewing a page
        %bits = parse_cgi_content(run_cgi(is_preview => 1, HTTP_HOST => 'localhost'));