]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Fix a test-case that actually just repeated the previous one instead
authorSimon McVittie <smcv@debian.org>
Sun, 5 Oct 2014 14:48:13 +0000 (15:48 +0100)
committerSimon McVittie <smcv@debian.org>
Sun, 5 Oct 2014 14:49:20 +0000 (15:49 +0100)
t/relativity.t

index 0f7d014c578f416f5e6760b515da189ba991bf04..eb6cc448a7929a3b3e661686941d2a991580f045 100755 (executable)
@@ -243,12 +243,12 @@ run(["./t/tmp/ikiwiki.cgi"], \$in, \$content, init => sub {
        $ENV{SERVER_PORT} = '80';
        $ENV{SCRIPT_NAME} = '/ikiwiki.cgi';
        $ENV{HTTP_HOST} = 'staging.example.net';
        $ENV{SERVER_PORT} = '80';
        $ENV{SCRIPT_NAME} = '/ikiwiki.cgi';
        $ENV{HTTP_HOST} = 'staging.example.net';
-       $ENV{HTTPS} = 'on';
        $ENV{CONTENT_LENGTH} = length $in;
 });
        $ENV{CONTENT_LENGTH} = length $in;
 });
-like($bits{basehref}, qr{^http://static.example.com/$});
-like($bits{stylehref}, qr{^(?:(?:http:)?//static.example.com)?/style.css$});
-like($bits{tophref}, qr{^(?:http:)?//static.example.com/$});
+%bits = parse_cgi_content($content);
+like($bits{basehref}, qr{^http://static.example.com/a/b/c/$});
+like($bits{stylehref}, qr{^(?:(?:http:)?//static.example.com|\.\./\.\./\.\.)/style.css$});
+like($bits{tophref}, qr{^(?:(?:http:)?//static.example.com|\.\./\.\./\.\.)/$});
 TODO: {
 local $TODO = "use self-referential CGI URL?";
 like($bits{cgihref}, qr{^(?:(?:http:)?//staging.example.net)?/ikiwiki.cgi$});
 TODO: {
 local $TODO = "use self-referential CGI URL?";
 like($bits{cgihref}, qr{^(?:(?:http:)?//staging.example.net)?/ikiwiki.cgi$});