Item15148: fix release string and test

foswiki · Jun 21, 2022 · eff6629 · eff6629
1 parent f1b60a0
commit eff6629
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/UnitTestContrib/lib/Foswiki/Contrib/UnitTestContrib/DEPENDENCIES b/UnitTestContrib/lib/Foswiki/Contrib/UnitTestContrib/DEPENDENCIES
@@ -5,7 +5,7 @@ Encode,>=2.32,cpan,required, other versions may work, but 2.12 is known bad
 File::Remove,>=0,cpan,required, used to remove test fixtures
 Foswiki::Plugins::TestFixturePlugin,>=0,perl,optional, used for semi-automatic test cases (TestCases web)
 HTML::Parser,>=0,cpan,required
-HTML::Tidy5,>1.0,cpan,required
+HTML::Tidy5,>1.51,cpan,required
 HTML::TreeBuilder,>=0,cpan,required
 WWW::Selenium,>=0,cpan,optional, used for browser-in-the-loop tests
 Test::WWW::Selenium,>=0,cpan,optional, used for browser-in-the-loop tests
diff --git a/UnitTestContrib/test/unit/DependencyTests.pm b/UnitTestContrib/test/unit/DependencyTests.pm
@@ -79,8 +79,10 @@ sub test_check_foswiki_rev {
     $this->assert_equals( 1, $ok );
 
     # e.g. Foswiki version 17 Jun 2022 installed
-    $this->assert_matches( qr/^Foswiki version \d+ \w+ \d\d\d\d installed$/,
-        $message );
+    $this->assert_matches(
+qr/^Foswiki version \d+ \w+ \d\d\d\d ((Alpha|alpha|Beta|beta)\s)?installed$/,
+        $message
+    );
 
 }
 

diff --git a/core/lib/Foswiki.pm b/core/lib/Foswiki.pm
@@ -212,7 +212,7 @@ BEGIN {
     # DO NOT CHANGE THE FORMAT OF $VERSION.
     # Use $RELEASE for a descriptive version.
     use version 0.77; $VERSION = version->declare('v2.1.999_001');
-    $RELEASE = 'Foswiki-2.2.0 Alpha';
+    $RELEASE = '21 Jun 2022 Alpha';
 
     # Default handlers for different %TAGS%
     # Where an entry is set as 'undef', the tag will be demand-loaded