Skip to content

Commit

Permalink
Item9509: Restore stripping of nop|noautolink to View::_prepare, and add
Browse files Browse the repository at this point in the history 
unit tests to verify skin=text;contenttype=text/plain rendering

git-svn-id: http://svn.foswiki.org/trunk@8617 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
GeorgeClark authored and GeorgeClark committed Aug 20, 2010
1 parent 050e182 commit 87186f2
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 45 deletions.
95 changes: 50 additions & 45 deletions UnitTestContrib/test/unit/ViewScriptTests.pm
View file
Expand Up @@ -19,10 +19,10 @@ HERE

my $topic2 = <<'HERE';
----
WikiWord %BR%
MissingWikiWord %BR%
!ExclamationEscape <br />
<nop>NopEscape
%RED% <pre> adsf </pre> <verbatim> qwerty </verbatim
%RED% <pre> adsf </pre> <verbatim> qwerty </verbatim>
<p>A Paragraph </p>
#anchor
<a href="http://blah.com/">asdf</a>
Expand Down Expand Up @@ -185,41 +185,15 @@ sub set_up {
}

sub setup_view {
my ( $this, $web, $topic, $tmpl, $parm ) = @_;
my $query = new Unit::Request(
{
webName => [$web],
topicName => [$topic],
template => [$tmpl],
}
);
$query->path_info("/$web/$topic");
$query->method('POST');
$fatwilly = new Foswiki( $this->{test_user_login}, $query );
my ($text) = $this->capture(
sub {
no strict 'refs';
&$UI_FN($fatwilly);
use strict 'refs';
$Foswiki::engine->finalize( $fatwilly->{response},
$fatwilly->{request} );
}
);

$fatwilly->finish();
$text =~ s/\r//g;
$text =~ s/^.*?\n\n+//s; # remove CGI header
return $text;
}

sub setup_rawview {
my ( $this, $web, $topic, $tmpl, $raw ) = @_;
my ( $this, $web, $topic, $tmpl, $raw, $ctype, $skin ) = @_;
my $query = new Unit::Request(
{
webName => [$web],
topicName => [$topic],
template => [$tmpl],
raw => [$raw],
contenttype => [$ctype],
skin => [$skin],
}
);
$query->path_info("/$web/$topic");
Expand All @@ -235,10 +209,12 @@ sub setup_rawview {
}
);

my $editUrl = $fatwilly->getScriptUrl('0', 'edit', $this->{test_web}, '' );

$fatwilly->finish();
$text =~ s/\r//g;
$text =~ s/(^.*?\n\n+)//s; # remove CGI header
return ($text, $1);
return ($text, $1, $editUrl);
}

# This test verifies the rendering of the various raw views
Expand All @@ -247,49 +223,78 @@ sub test_render_raw {
my $text;
my $hdr;

($text, $hdr) = $this->setup_rawview( $this->{test_web}, 'TestTopic2', 'viewfour', 'text');
($text, $hdr) = $this->setup_view( $this->{test_web}, 'TestTopic2', 'viewfour', 'text');
$this->assert_equals( "$topic2", $text, "Unexpected output from raw=text" );
$this->assert_matches( qr#text/plain;#, $hdr, "raw=text should return text/plain - got $hdr");
$this->assert_matches( qr#^Content-Type: text/plain;#ms, $hdr, "raw=text should return text/plain - got $hdr");

($text, $hdr) = $this->setup_rawview( $this->{test_web}, 'TestTopic2', 'viewfour', 'all');
($text, $hdr) = $this->setup_view( $this->{test_web}, 'TestTopic2', 'viewfour', 'all');
$this->assert_matches( qr#$topic2meta$topic2#, $text, "Unexpected output from raw=all" );
$this->assert_matches( qr#text/plain;#, $hdr, "raw=all should return text/plain - got $hdr");
$this->assert_matches( qr#^Content-Type: text/plain;#ms, $hdr, "raw=all should return text/plain - got $hdr");

($text,$hdr) = $this->setup_rawview( $this->{test_web}, 'TestTopic2', 'viewfour', 'on');
($text,$hdr) = $this->setup_view( $this->{test_web}, 'TestTopic2', 'viewfour', 'on');
$this->assert_matches( qr#.*$topic2txtarea$topic2rawON.*#, $text, "Unexpected output from raw=on" );
$this->assert_matches( qr#text/html;#, $hdr, "raw=on should return text/html - got $hdr");
$this->assert_matches( qr#^Content-Type: text/html;#ms, $hdr, "raw=on should return text/html - got $hdr");

($text, $hdr) = $this->setup_rawview( $this->{test_web}, 'TestTopic2', 'viewfour', 'debug');
($text, $hdr) = $this->setup_view( $this->{test_web}, 'TestTopic2', 'viewfour', 'debug');
$this->assert_matches( qr#.*$topic2txtarea$topic2metaQ$topic2rawON.*#, $text, "Unexpected output from raw=debug" );
$this->assert_matches( qr#text/html;#, $hdr, "raw=debug should return text/html - got $hdr");
$this->assert_matches( qr#^Content-Type: text/html;#ms, $hdr, "raw=debug should return text/html - got $hdr");
}


# This test verifies the rendering of the text/plain
sub test_render_textplain {
my $this = shift;
my $text;
my $hdr;
my $editUrl;

($text, $hdr, $editUrl) = $this->setup_view( $this->{test_web}, 'TestTopic2', 'viewfour', '', 'text/plain', 'text');
$editUrl =~ s/WebHome/MissingWikiWord/;

my $topic2plain = <<HERE;
pretemplate<hr />
<span class="foswikiNewLink">MissingWikiWord<a href="$editUrl?topicparent=TemporaryViewScriptTestWebViewScript.TestTopic2" rel="nofollow" title="Create this topic">?</a></span> <br />
ExclamationEscape <br />
NopEscape
<font color="#ff0000"> <pre> adsf </pre> <pre> qwerty </pre>
<p>A Paragraph </p>
#anchor
<a href="http://blah.com/">asdf</a>
NotTOAutoLink
<hr />posttemplate
HERE
chomp $topic2plain;
$this->assert_matches( qr#^Content-Type: text/plain;#ms, $hdr, "contenttype=text/plain should return text/plain - got $hdr");
$this->assert_does_not_match( qr#<(noautolink|nop)>#, $text, "autolink or nop found in text skin" );
$this->assert_equals( "$topic2plain", $text, "Unexpected output from contentype=text/plain skin=text" );

}
# This test verifies the handling of preamble (the text following
# %STARTTEXT%) and postamble (the text between %TEXT% and %ENDTEXT%).
sub test_prepostamble {
my $this = shift;
my $text;

$text = $this->setup_view( $this->{test_web}, 'TestTopic1', 'viewone' );
($text) = $this->setup_view( $this->{test_web}, 'TestTopic1', 'viewone' );
$text =~ s/\n+$//s;
$this->assert_equals(
'pretemplatepreCONTENT
postposttemplate', $text
);

$text = $this->setup_view( $this->{test_web}, 'TestTopic1', 'viewtwo' );
($text) = $this->setup_view( $this->{test_web}, 'TestTopic1', 'viewtwo' );
$this->assert_equals(
'pretemplateCONTENT
postposttemplate', $text
);

$text = $this->setup_view( $this->{test_web}, 'TestTopic1', 'viewthree' );
($text) = $this->setup_view( $this->{test_web}, 'TestTopic1', 'viewthree' );
$this->assert_equals( 'pretemplatepreCONTENTposttemplate', $text );

$text = $this->setup_view( $this->{test_web}, 'TestTopic1', 'viewfour' );
($text) = $this->setup_view( $this->{test_web}, 'TestTopic1', 'viewfour' );
$this->assert_equals( 'pretemplateCONTENTposttemplate', $text );

$text = $this->setup_view( $this->{test_web}, 'TestTopic1', 'viewfive' );
($text) = $this->setup_view( $this->{test_web}, 'TestTopic1', 'viewfive' );
$this->assert_equals( 'pretemplateposttemplate', $text );
}

Expand Down
1 change: 1 addition & 0 deletions core/lib/Foswiki/UI/View.pm
View file
Expand Up @@ -398,6 +398,7 @@ sub _prepare {

$text = $topicObject->expandMacros($text);
$text = $topicObject->renderTML($text);
$text =~ s/( ?) *<\/?(nop|noautolink)\/?>\n?/$1/gois;

if ($minimalist) {
$text =~ s/<img [^>]*>//gi; # remove image tags
Expand Down

0 comments on commit 87186f2

Please sign in to comment.