Changeset 1949 for branches/release-35/t/65-ssi.t

Timestamp:

04/17/08 13:11:31 (20 months ago)

Author:

takayama

Message:

Fixed BugId:75137
* Changed to using cache_key for include cache directory

Files:

• branches/release-35/t/65-ssi.t (modified) (7 diffs)

branches/release-35/t/65-ssi.t

@@ -20 +20 @@
 
 my $blog = MT->model('blog')->load(1);
+$blog->include_cache(1);
 
 my $include = MT->model('template')->new;
@@ -43 +44 @@
 $tmpl = MT->model('template')->new;
 $tmpl->blog_id($blog->id);
-$tmpl->text(q(hi <mt:include module="Included Template" key="woot" ttl="1000"> bye));
+$tmpl->text(q(hi <mt:include module="Included Template" cache_key="woot" ttl="1000"> bye));
 
 $ctx = MT::Template::Context->new;
@@ -59 +60 @@
 $tmpl = MT->model('template')->new;
 $tmpl->blog_id($blog->id);
-$tmpl->text(q(hi <mt:include module="Included Template" key="woot" ttl="1000"> bye));
+$tmpl->text(q(hi <mt:include module="Included Template" cache_key="woot" ttl="1000"> bye));
 
 $ctx = MT::Template::Context->new;
@@ -75 +76 @@
 $tmpl = MT->model('template')->new;
 $tmpl->blog_id($blog->id);
-$tmpl->text(q(hi <mt:include module="Included Template" key="woot" ttl="1000" ssi="1"> bye));
+$tmpl->text(q(hi <mt:include module="Included Template" cache_key="woot" ttl="1000" ssi="1"> bye));
 
 $ctx = MT::Template::Context->new;
@@ -82 +83 @@
 
 ok(defined $out, 'test template built');
-my $sitepath = $blog->site_path;
-like($out, qr(\Ahi <!--#include file="${sitepath}includes_c/woo/woot.html" --> bye\z)ms,
+my $site_url = $blog->site_url;
+$site_url =~ s{ \A \w+ :// [^/]+ }{}xms;
+$site_url =~ s{ / \z }{}xms;
+like($out, qr(\Ahi <!--#include virtual="${site_url}/includes_c/woot/included_template.html" --> bye\z)ms,
     'test template included template by ssi');
 
@@ -89 +92 @@
 $tmpl = MT->model('template')->new;
 $tmpl->blog_id($blog->id);
-$tmpl->text(q(hi <mt:include module="Included Template" key="w" ttl="1000" ssi="1"> bye));
+$tmpl->text(q(hi <mt:include module="Included Template" cache_key="w" ttl="1000" ssi="1"> bye));
 
 $ctx = MT::Template::Context->new;
@@ -96 +99 @@
 
 ok(defined $out, 'test template built');
-$sitepath = $blog->site_path;
-like($out, qr(\Ahi <!--#include file="${sitepath}includes_c/w/w.html" --> bye\z)ms,
+$site_url = $blog->site_url;
+$site_url =~ s{ \A \w+ :// [^/]+ }{}xms;
+$site_url =~ s{ / \z }{}xms;
+like($out, qr(\Ahi <!--#include virtual="${site_url}/includes_c/w/included_template.html" --> bye\z)ms,
     'test template included template by ssi');