Fix tests

main/mySpace/student.php

@@ -150,32 +150,29 @@ function get_users($from, $limit, $column, $direction)
             $avg_student_progress = null;
         }
 
+        $urlDetails = $url."?student=$student_id";
+        if (isset($_GET['id_coach']) && intval($_GET['id_coach']) != 0) {
+            $urlDetails = $url."?student=$student_id&id_coach=$coach_id&id_session=$sessionId";
+        }
+
         $row = array();
         if ($is_western_name_order) {
-            $row[] = $student_data['firstname'];
-            $row[] = $student_data['lastname'];
+            $row[] = Display::url($student_data['firstname'], $urlDetails);
+            $row[] = Display::url($student_data['lastname'], $urlDetails);
         } else {
-            $row[] = $student_data['lastname'];
-            $row[] = $student_data['firstname'];
+            $row[] = Display::url($student_data['lastname'], $urlDetails);
+            $row[] = Display::url($student_data['firstname'], $urlDetails);
         }
         $string_date = Tracking::get_last_connection_date($student_id, true);
         $first_date = Tracking::get_first_connection_date($student_id);
         $row[] = $first_date;
         $row[] = $string_date;
 
-        if (isset($_GET['id_coach']) && intval($_GET['id_coach']) != 0) {
-            $detailsLink = Display::url(
-                Display::return_icon('2rightarrow.png', get_lang('Details').' '.$student_data['username']),
-                $url."?student=$student_id&id_coach=$coach_id&id_session=$sessionId",
-                ['id' => 'details_'.$student_data['username']]
-            );
-        } else {
-            $detailsLink = Display::url(
-                Display::return_icon('2rightarrow.png', get_lang('Details').' '.$student_data['username']),
-                $url."?student=$student_id",
-                ['id' => 'details_'.$student_data['username']]
-            );
-        }
+        $detailsLink = Display::url(
+            Display::return_icon('2rightarrow.png', get_lang('Details').' '.$student_data['username']),
+            $urlDetails,
+            ['id' => 'details_'.$student_data['username']]
+        );
 
         $lostPasswordLink = '';
         if (api_is_drh() || api_is_platform_admin()) {

main/mySpace/teachers.php

@@ -148,10 +148,15 @@ function get_users($from, $limit, $column, $direction)
             $avg_student_progress = null;
         }
 
+        $urlDetails = $url."?student=$student_id&origin=teacher_details";
+        if (isset($_GET['id_coach']) && intval($_GET['id_coach']) != 0) {
+            $urlDetails = $url."?student=$student_id&id_coach=$coach_id&id_session=$sessionId";
+        }
+
         $row = array();
         if ($is_western_name_order) {
-            $row[] = $student_data['firstname'];
-            $row[] = $student_data['lastname'];
+            $row[] = Display::url($student_data['firstname'], $urlDetails);
+            $row[] = Display::url($student_data['lastname'], $urlDetails);
         } else {
             $row[] = $student_data['lastname'];
             $row[] = $student_data['firstname'];
@@ -161,19 +166,11 @@ function get_users($from, $limit, $column, $direction)
         $row[] = $first_date;
         $row[] = $string_date;
 
-        if (isset($_GET['id_coach']) && intval($_GET['id_coach']) != 0) {
-            $detailsLink = Display::url(
-                Display::return_icon('2rightarrow.png', get_lang('Details').' '.$student_data['username']).' ',
-                $url."?student=$student_id&id_coach=$coach_id&id_session=$sessionId",
-                ['id' => 'details_'.$student_data['username']]
-            );
-        } else {
-            $detailsLink = Display::url(
-                Display::return_icon('2rightarrow.png', get_lang('Details').' '.$student_data['username']).' ',
-                $url."?student=$student_id&origin=teacher_details",
-                ['id' => 'details_'.$student_data['username']]
-            );
-        }
+        $detailsLink = Display::url(
+            Display::return_icon('2rightarrow.png', get_lang('Details').' '.$student_data['username']),
+            $urlDetails,
+            ['id' => 'details_'.$student_data['username']]
+        );
         $row[] = $detailsLink;
         $all_datas[] = $row;
     }

tests/behat/features/createUser.feature

@@ -74,7 +74,7 @@ Feature: Users management as admin
     And I fill in select bootstrap static input "#status_select" select "5"
     And I press "submit"
     Then I should see "The user has been added"
-#
+
   Scenario: HRM follows teacher
     Given I am a platform administrator
     And I am on "/main/admin/user_list.php?keyword=hrm&submit=&_qf__search_simple="
@@ -101,8 +101,7 @@ Feature: Users management as admin
     Given I am logged as "hrm"
     And I am on "/main/mySpace/teachers.php"
     Then I should see "teacher lastname"
-    And wait for the page to be loaded
-    When I follow "details_teacher"
+    Then I follow "teacher lastname"
     And wait for the page to be loaded
     And I follow "Login as"
     And wait for the page to be loaded
@@ -112,8 +111,7 @@ Feature: Users management as admin
     Given I am logged as "hrm"
     And I am on "/main/mySpace/student.php"
     Then I should see "student lastname"
-    And wait for the page to be loaded
-    When I follow "details_student"
+    Then I follow "student lastname"
     And wait for the page to be loaded
     And I follow "Login as"
     And wait for the page to be loaded