Fix wrong message & Improve unit test (#2050)

lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/CheckUser.pm

@@ -9,7 +9,7 @@ use Lemonldap::NG::Portal::Main::Constants qw(
   PE_MALFORMEDUSER
 );
 
-our $VERSION = '2.0.7';
+our $VERSION = '2.0.8';
 
 extends qw(
   Lemonldap::NG::Portal::Main::Plugin
@@ -31,6 +31,7 @@ has ott => (
 );
 has idRule => ( is => 'rw', default => sub { 1 } );
 has sorted => ( is => 'rw', default => sub { 0 } );
+has merged => ( is => 'rw', default => '' );
 
 sub hAttr {
     $_[0]->{conf}->{checkUserHiddenAttributes} . ' '
@@ -56,6 +57,8 @@ sub init {
     $self->idRule($rule);
     $self->sorted( $self->conf->{impersonationRule}
           || $self->conf->{contextSwitchingRule} );
+    $self->merged( $self->conf->{impersonationMergeSSOgroups}
+          && $self->conf->{impersonationRule} ? 'Merged' : '' );
     return 1;
 }
 
@@ -97,20 +100,15 @@ sub display {
         MAIN_LOGO  => $self->conf->{portalMainLogo},
         SKIN       => $self->p->getSkin($req),
         LANGS      => $self->conf->{showLanguages},
-        MSG       => (
-            $self->{conf}->{impersonationMergeSSOgroups} ? 'checkUserMerged'
-            : 'checkUser'
-        ),
-        ALERTE => (
-            $self->{conf}->{impersonationMergeSSOgroups} ? 'alert-warning'
-            : 'alert-info'
-        ),
+        MSG        => 'checkUser' . $self->merged,
+        ALERTE     => ( $self->merged ? 'alert-warning' : 'alert-info' ),
         LOGIN      => $req->{userData}->{ $self->conf->{whatToTrace} },
         ATTRIBUTES => $array_attrs->[2],
         MACROS     => $array_attrs->[1],
         GROUPS     => $array_attrs->[0],
         TOKEN      => (
-            $self->ottRule->( $req, {} ) ? $self->ott->createToken()
+              $self->ottRule->( $req, {} )
+            ? $self->ott->createToken()
             : ''
         )
     };
@@ -241,10 +239,7 @@ sub check {
         $attrs       = {};
     }
     else {
-        $msg =
-          $self->{conf}->{impersonationMergeSSOgroups} eq 1
-          ? 'checkUserMerged'
-          : 'checkUser';
+        $msg = 'checkUser' . $self->merged;
         if ($compute) {
             $msg                          = 'checkUserComputeSession';
             $attrs->{authenticationLevel} = $authLevel;

lemonldap-ng-portal/t/67-CheckUser-with-token.t

@@ -21,6 +21,7 @@ my $client = LLNG::Manager::Test->new( {
             formTimeout                    => 120,
             checkUserDisplayPersistentInfo => 1,
             checkUserDisplayEmptyValues    => 1,
+            impersonationMergeSSOgroups    => 1,
         }
     }
 );

lemonldap-ng-portal/t/68-Impersonation-with-filtered-merge.t

@@ -101,8 +101,8 @@ count(1);
 
 ( $host, $url, $query ) =
   expectForm( $res, undef, '/checkuser', 'user', 'url' );
-ok( $res->[2]->[0] =~ m%<span trspan="checkUser">%, 'Found trspan="checkUser"' )
-  or explain( $res->[2]->[0], 'trspan="checkUser"' );
+ok( $res->[2]->[0] =~ m%<span trspan="checkUserMerged">%, 'Found trspan="checkUser"' )
+  or explain( $res->[2]->[0], 'trspan="checkUserMerged"' );
 ok(
     $res->[2]->[0] =~
 m%<div class="alert alert-success"><div class="text-center"><b><span trspan="allowed"></span></b></div></div>%,