From 22afa57d339d6d6f6de6f3d37982be3584f1099f Mon Sep 17 00:00:00 2001 From: jmontoyaa Date: Wed, 4 Oct 2017 13:43:56 +0200 Subject: [PATCH] Fix tests --- main/mySpace/student.php | 31 +++++++++++-------------- main/mySpace/teachers.php | 27 ++++++++++----------- tests/behat/features/createUser.feature | 8 +++---- 3 files changed, 29 insertions(+), 37 deletions(-) diff --git a/main/mySpace/student.php b/main/mySpace/student.php index 2a584cd644..d98a9b2bc6 100755 --- a/main/mySpace/student.php +++ b/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()) { diff --git a/main/mySpace/teachers.php b/main/mySpace/teachers.php index 1baf68face..4ca7a86e83 100755 --- a/main/mySpace/teachers.php +++ b/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; } diff --git a/tests/behat/features/createUser.feature b/tests/behat/features/createUser.feature index b5eeeca3f1..ecbedcdf75 100644 --- a/tests/behat/features/createUser.feature +++ b/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