From: <Gre...@nt...> - 2005-08-29 18:42:09
|
Author: GregAbbas Date: 2005-08-30 01:11:20 -0700 (Tue, 30 Aug 2005) New Revision: 6200 Modified: twiki/branches/DEVELOP/test/unit/StoreSmokeTests.pm Log: Item258: fix StoreSmokeTest for Merge3 Modified: twiki/branches/DEVELOP/test/unit/StoreSmokeTests.pm =================================================================== --- twiki/branches/DEVELOP/test/unit/StoreSmokeTests.pm 2005-08-30 08:06:35 UTC (rev 6199) +++ twiki/branches/DEVELOP/test/unit/StoreSmokeTests.pm 2005-08-30 08:11:20 UTC (rev 6200) @@ -288,8 +288,8 @@ my $text = <F>; close(F); $this->assert_matches(qr/version="1.3"/, $text); - $this->assert_matches(qr/<del>Changed<\/del><ins>Sausage<\/ins>/, $text); - $this->assert_matches(qr/<del>Lines<\/del><ins>Chips<\/ins>/, $text); + $this->assert_matches(qr/<div\s+class="twikiConflict">.+version\s+2.*<\/div>\s*Changed\nLines[\s.]+<div/, $text); + $this->assert_matches(qr/<div\s+class="twikiConflict">.+version\s+new.*<\/div>\s*Sausage\nChips[\s.]+<div/, $text); $this->assert_matches(qr/%META:TOPICINFO{author="$testUser2"/, $text); } |