From 12bcd28a7b1f242aaf2b276366c0b263c8467c30 Mon Sep 17 00:00:00 2001 From: George Clark Date: Mon, 15 May 2017 20:40:16 -0400 Subject: [PATCH 1/2] Item13883: Preparing for release. --- .../lib/Foswiki/Contrib/ModPerlEngineContrib.pm | 4 ++-- core/data/System/ReleaseHistory.txt | 6 +++--- core/data/System/ReleaseNotes02x01.txt | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ModPerlEngineContrib/lib/Foswiki/Contrib/ModPerlEngineContrib.pm b/ModPerlEngineContrib/lib/Foswiki/Contrib/ModPerlEngineContrib.pm index 764bef55de..3ee647ac57 100644 --- a/ModPerlEngineContrib/lib/Foswiki/Contrib/ModPerlEngineContrib.pm +++ b/ModPerlEngineContrib/lib/Foswiki/Contrib/ModPerlEngineContrib.pm @@ -23,8 +23,8 @@ use strict; use vars qw( $VERSION $RELEASE $SHORTDESCRIPTION ); -$VERSION = '1.05'; -$RELEASE = '30 Apr 2017'; +$VERSION = '1.06'; +$RELEASE = '15 May 2017'; $SHORTDESCRIPTION = 'Permits Foswiki to be executed under mod_perl'; 1; diff --git a/core/data/System/ReleaseHistory.txt b/core/data/System/ReleaseHistory.txt index 01e1fec4ff..e805129aeb 100644 --- a/core/data/System/ReleaseHistory.txt +++ b/core/data/System/ReleaseHistory.txt @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="ProjectContributor" date="1494553358" format="1.1" version="1"}% +%META:TOPICINFO{author="ProjectContributor" date="1494895208" format="1.1" version="1"}% %META:TOPICPARENT{name="AdminDocumentationCategory"}% History of Foswiki %STARTINCLUDE% @@ -7,9 +7,9 @@ History of Foswiki ---+ Appendix A: Foswiki Development Time-line %TOC% ----++ Foswiki Release 2.1.4-RC2 - 13 May 2017 +---++ Foswiki Release 2.1.4-RC2 - 15 May 2017 -Foswiki 2.1.4-RC2 was built on 13 May 2017. It is a release that contains 24 fixes. +Foswiki 2.1.4-RC2 was built on 13 May 2017. It is a release that contains 25 fixes. ---++ Foswiki Release 2.1.4-RC1 - 4 May 2017 diff --git a/core/data/System/ReleaseNotes02x01.txt b/core/data/System/ReleaseNotes02x01.txt index 4632b1745b..81a9a8c0f2 100644 --- a/core/data/System/ReleaseNotes02x01.txt +++ b/core/data/System/ReleaseNotes02x01.txt @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="ProjectContributor" date="1494884408" format="1.1" version="1"}% +%META:TOPICINFO{author="ProjectContributor" date="1494895208" format="1.1" version="1"}% %META:TOPICPARENT{name="ReleaseHistory"}% ---+!! Foswiki Release 2.1.4-RC2 @@ -55,7 +55,7 @@ Foswiki is released under the GNU General Public License. * Foswiki 2.1.1 was built on 30 Apr 2016. It is a release that contains 36 fixes and 21 enhancements. * Foswiki 2.1.2 was built on 2 May 2016. It is a release that contains 1 fix. * Foswiki 2.1.3 was built on 12 Feb 2017. It is a release that contains 68 fixes and 21 enhancements. - * Foswiki 2.1.4-RC2 was built on 13 May 2017. It is a release that contains 24 fixes. + * Foswiki 2.1.4-RC2 was built on 15 May 2017. It is a release that contains 25 fixes. ---++ Pre-installed Extensions From 438d0fc97d220c5a92ffc936c602421cd424eb86 Mon Sep 17 00:00:00 2001 From: George Clark Date: Mon, 15 May 2017 21:51:53 -0400 Subject: [PATCH 2/2] Item14234: Fix unit tests for ERP Also renamed HTML.pm to ERP_HTML.pm. It was not possible to run individual tests with that module name. --- .../EditRowPlugin/{HTML.pm => ERP_HTML.pm} | 46 +++++++++++-------- .../unit/EditRowPlugin/EditRowPluginSuite.pm | 2 +- 2 files changed, 28 insertions(+), 20 deletions(-) rename EditRowPlugin/test/unit/EditRowPlugin/{HTML.pm => ERP_HTML.pm} (82%) diff --git a/EditRowPlugin/test/unit/EditRowPlugin/HTML.pm b/EditRowPlugin/test/unit/EditRowPlugin/ERP_HTML.pm similarity index 82% rename from EditRowPlugin/test/unit/EditRowPlugin/HTML.pm rename to EditRowPlugin/test/unit/EditRowPlugin/ERP_HTML.pm index 0604b65250..df0fe96868 100644 --- a/EditRowPlugin/test/unit/EditRowPlugin/HTML.pm +++ b/EditRowPlugin/test/unit/EditRowPlugin/ERP_HTML.pm @@ -1,5 +1,5 @@ # See bottom of file for license and copyright information -package HTML; +package ERP_HTML; use strict; use warnings; @@ -223,16 +223,21 @@ INPUT # erp_table => "TABLE_0" ); my $expected = < - +
+ + + + - + | #REF0# | - - + + + +| +
EXPECTED $this->assert_html_equals( $expected, $in ); @@ -285,18 +290,21 @@ INPUT ); Foswiki::Plugins::EditRowPlugin::postRenderingHandler($in); my $expected = < - +
+ + + + - + | #REF0# | - - - + + + + + +| +
EXPECTED $this->assert_html_equals( $expected, $in ); diff --git a/EditRowPlugin/test/unit/EditRowPlugin/EditRowPluginSuite.pm b/EditRowPlugin/test/unit/EditRowPlugin/EditRowPluginSuite.pm index d24a0ced10..30156a08b9 100644 --- a/EditRowPlugin/test/unit/EditRowPlugin/EditRowPluginSuite.pm +++ b/EditRowPlugin/test/unit/EditRowPlugin/EditRowPluginSuite.pm @@ -6,6 +6,6 @@ use warnings; use Unit::TestSuite; our @ISA = 'Unit::TestSuite'; -sub include_tests { return ( 'Parser', 'HTML', 'Rest' ) } +sub include_tests { return ( 'Parser', 'ERP_HTML', 'Rest' ) } 1;