Commit a7329c1d authored by Xavier Guimard's avatar Xavier Guimard

Verify Mouse version with Apache (#1452)

parent 5bfdeb6b
......@@ -13,11 +13,8 @@ use Lemonldap::NG::Common::Apache::Session;
# Workaround for another ModPerl/Mouse issue...
BEGIN {
require Mouse;
my $v = $Mouse::VERSION;
$v =~ s/^v//;
if ( $v =~ /^2\.(?:1|2|3|4)/
and $INC{'Lemonldap/NG/Handler/Apache2/Main.pm'} )
{
my $v = sprintf( "%d.%03d%03d", ( $Mouse::VERSION =~ /(\d+)/g ) );
if ( $v < 2.005001 and $Lemonldap::NG::Handler::Apache2::Main::VERSION ) {
require Moose;
Moose->import();
}
......
......@@ -8,11 +8,8 @@ use Lemonldap::NG::Common::Safelib; #link protected safe Safe object
# Workaround for another ModPerl/Mouse issue...
BEGIN {
require Mouse;
my $v = $Mouse::VERSION;
$v =~ s/^v//;
if ( $v =~ /^2\.(?:1|2|3|4)/
and $INC{'Lemonldap/NG/Handler/Apache2/Main.pm'} )
{
my $v = sprintf( "%d.%03d%03d", ( $Mouse::VERSION =~ /(\d+)/g ) );
if ( $v < 2.005001 and $Lemonldap::NG::Handler::Apache2::Main::VERSION ) {
require Moose;
Moose->import();
}
......
......@@ -15,7 +15,7 @@ SKIP: {
my $client = LLNG::Manager::Test->new(
{
ini => {
logLevel => 'debug',
logLevel => 'error',
totp2fSelfRegistration => 1,
totp2fActivation => 1,
loginHistoryEnabled => 1,
......@@ -120,7 +120,6 @@ SKIP: {
'Post code'
);
expectOK($res);
$id = expectCookie($res);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment