Item14138: Merge branch 'Release02x01'

foswiki · Aug 12, 2016 · 4d8fdd1 · 4d8fdd1
2 parents e5e0d17 + 889ac0c
commit 4d8fdd1
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/UnitTestContrib/test/unit/FormattingTests.pm b/UnitTestContrib/test/unit/FormattingTests.pm
@@ -1992,7 +1992,7 @@ sub _check_rendered_linktext {
     my $editpath      = Foswiki::Func::getScriptUrlPath( undef, undef, 'edit' );
     my $editpathregex = qr/^.*\Q$editpath\E\/([^"]*)/;
     my $viewpath      = Foswiki::Func::getScriptUrlPath( undef, undef, 'view' );
-    my $viewpathregex = qr/^.*\Q$viewpath\E\/([^"]*)/;
+    my $viewpathregex = qr/^.*href="\Q$viewpath\E\/([^"]*)/;
     my $html          = $this->{test_topicObject}->renderTML("[[$linktext]]");
     my $expectedAddress;
     my $expectedAddrObj;
@@ -2063,9 +2063,6 @@ sub test_sanity_link_tests {
 sub test_ampersand_querystring {
     my ($this) = shift;
 
-    $this->expect_failure( 'Test does\'t cater to ShortURL configurations',
-        using => 'ShortURLs' );
-
     $this->_check_rendered_linktext(
         "$this->{test_topic}?q=r&s=t",
         {