moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 09:26:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-60779-master' of git://github.com/junpataleta/moodle

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2017-11-11 13:03:54 +01:00
commit d334aea208
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
calendar/tests/externallib_test.php
View file

@ -2266,7 +2266,7 @@ class core_calendar_externallib_testcase extends externallib_advanced_testcase {
// Admin can load the course.
$data = external_api::clean_returnvalue(
core_calendar_external::get_calendar_monthly_view_returns(),
core_calendar_external::get_calendar_monthly_view($timestart->format('n'), $timestart->format('Y'),
core_calendar_external::get_calendar_monthly_view($timestart->format('Y'), $timestart->format('n'),
$course->id, null, false)
);
$this->assertEquals($data['courseid'], $course->id);
@ -2274,7 +2274,7 @@ class core_calendar_externallib_testcase extends externallib_advanced_testcase {
$this->setUser($user1);
$data = external_api::clean_returnvalue(
core_calendar_external::get_calendar_monthly_view_returns(),
core_calendar_external::get_calendar_monthly_view($timestart->format('n'), $timestart->format('Y'),
core_calendar_external::get_calendar_monthly_view($timestart->format('Y'), $timestart->format('n'),
$course->id, null, false)
);
$this->assertEquals($data['courseid'], $course->id);
@ -2283,7 +2283,7 @@ class core_calendar_externallib_testcase extends externallib_advanced_testcase {
$this->expectException('require_login_exception');
$data = external_api::clean_returnvalue(
core_calendar_external::get_calendar_monthly_view_returns(),
core_calendar_external::get_calendar_monthly_view($timestart->format('n'), $timestart->format('Y'),
core_calendar_external::get_calendar_monthly_view($timestart->format('Y'), $timestart->format('n'),
$course->id, null, false)
);
}
@ -2310,7 +2310,7 @@ class core_calendar_externallib_testcase extends externallib_advanced_testcase {
// Admin can load the course.
$data = external_api::clean_returnvalue(
core_calendar_external::get_calendar_day_view_returns(),
core_calendar_external::get_calendar_day_view($timestart->format('n'), $timestart->format('Y'),
core_calendar_external::get_calendar_day_view($timestart->format('Y'), $timestart->format('n'),
$timestart->format('j'), $course->id, null)
);
$this->assertEquals($data['courseid'], $course->id);
@ -2318,7 +2318,7 @@ class core_calendar_externallib_testcase extends externallib_advanced_testcase {
$this->setUser($user1);
$data = external_api::clean_returnvalue(
core_calendar_external::get_calendar_day_view_returns(),
core_calendar_external::get_calendar_day_view($timestart->format('n'), $timestart->format('Y'),
core_calendar_external::get_calendar_day_view($timestart->format('Y'), $timestart->format('n'),
$timestart->format('j'), $course->id, null)
);
$this->assertEquals($data['courseid'], $course->id);
@ -2327,7 +2327,7 @@ class core_calendar_externallib_testcase extends externallib_advanced_testcase {
$this->expectException('require_login_exception');
$data = external_api::clean_returnvalue(
core_calendar_external::get_calendar_day_view_returns(),
core_calendar_external::get_calendar_day_view($timestart->format('n'), $timestart->format('Y'),
core_calendar_external::get_calendar_day_view($timestart->format('Y'), $timestart->format('n'),
$timestart->format('j'), $course->id, null)
);
}