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-65707-master' of git://github.com/lameze/moodle

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2019-07-02 16:40:02 +02:00
commit b56dad81b7
3 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
calendar/lib.php
View file

@ -3505,7 +3505,7 @@ function calendar_output_fragment_event_form($args) {
$eventtypes = calendar_get_allowed_event_types($courseid); $eventtypes = calendar_get_allowed_event_types($courseid);
// If the user is on course context and is allowed to add course events set the event type default to course. // If the user is on course context and is allowed to add course events set the event type default to course.
if ($courseid != SITEID && !empty($eventtypes['course'])) { if (!empty($courseid) && !empty($eventtypes['course'])) {
$data['eventtype'] = 'course'; $data['eventtype'] = 'course';
$data['courseid'] = $courseid; $data['courseid'] = $courseid;
$data['groupcourseid'] = $courseid; $data['groupcourseid'] = $courseid;

12
calendar/tests/behat/behat_calendar.php
View file

@ -124,4 +124,16 @@ class behat_calendar extends behat_base {
$this->getSession()->visit($this->locate_path('/calendar/view.php?view=month&course=1&time='.$time)); $this->getSession()->visit($this->locate_path('/calendar/view.php?view=month&course=1&time='.$time));
} }
/**
* Navigate to site calendar.
*
* @Given /^I am viewing site calendar$/
* @throws coding_exception
* @return void
*/
public function i_am_viewing_site_calendar() {
$url = new moodle_url('/calendar/view.php', ['view' => 'month']);
$this->getSession()->visit($this->locate_path($url->out_as_local_url(false)));
}
} }

11
calendar/tests/behat/calendar.feature
View file

@ -177,3 +177,14 @@ Feature: Perform basic calendar functionality
And I set the field "Type of event" to "Course" And I set the field "Type of event" to "Course"
When I click on "Save" "button" When I click on "Save" "button"
And I should see "Select a course" in the "Course" "form_row" And I should see "Select a course" in the "Course" "form_row"
@javascript
Scenario: Default event type selection in the event form
Given I log in as "teacher1"
When I am viewing site calendar
And I click on "New event" "button"
Then the field "Type of event" matches value "User"
And I am on "Course 1" course homepage
And I follow "This month"
When I click on "New event" "button"
Then the field "Type of event" matches value "Course"