mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-14 04:52:36 +02:00
Code Issues Projects Releases Wiki Activity

MDL-69588 core: Activity navigation fixes

Browse Source
This commit is contained in:
Jun Pataleta 2021-08-26 09:58:15 +08:00
parent 34f3d43397
commit b36bdd18d8
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mod/forum/tests/behat/behat_mod_forum.php
View File

@ -113,7 +113,7 @@ class behat_mod_forum extends behat_base {
*/
public function i_reply_post_from_forum_using_an_inpage_reply_with($postsubject, $forumname, TableNode $table) {
// Navigate to forum.
$this->execute("behat_navigation::go_to_breadcrumb_location", $this->escape($forumname));
$this->execute('behat_navigation::i_am_on_page_instance', [$this->escape($forumname), 'forum activity']);
$this->execute('behat_general::click_link', $this->escape($postsubject));
$this->execute('behat_general::click_link', get_string('reply', 'forum'));
@ -132,7 +132,7 @@ class behat_mod_forum extends behat_base {
*/
public function i_navigate_to_post_in_forum($postsubject, $forumname) {
// Navigate to forum discussion.
$this->execute("behat_navigation::go_to_breadcrumb_location", $this->escape($forumname));
$this->execute('behat_navigation::i_am_on_page_instance', [$this->escape($forumname), 'forum activity']);
$this->execute('behat_general::click_link', $this->escape($postsubject));
}
@ -493,7 +493,7 @@ class behat_mod_forum extends behat_base {
*/
protected function add_new_discussion_inline($forumname, TableNode $table, $buttonstr) {
// Navigate to forum.
$this->execute("behat_navigation::go_to_breadcrumb_location", $this->escape($forumname));
$this->execute('behat_navigation::i_am_on_page_instance', [$this->escape($forumname), 'forum activity']);
$this->execute('behat_general::click_link', $buttonstr);
$this->fill_new_discussion_form($table);
}

4
mod/workshop/tests/behat/behat_mod_workshop.php
View File

@ -52,7 +52,7 @@ class behat_mod_workshop extends behat_base {
$xpath = "//*[@class='userplan']/descendant::div[./span[contains(.,$phaseliteral)]]";
$continue = $this->escape(get_string('continue'));
$this->execute("behat_navigation::go_to_breadcrumb_location", $workshopname);
$this->execute('behat_navigation::i_am_on_page_instance', [$workshopname, 'workshop activity']);
$this->execute('behat_general::i_click_on_in_the',
array('a.action-icon', "css_element", $this->escape($xpath), "xpath_element")
@ -116,7 +116,7 @@ class behat_mod_workshop extends behat_base {
$assess = $this->escape(get_string('assess', 'workshop'));
$saveandclose = $this->escape(get_string('saveandclose', 'workshop'));
$this->execute("behat_navigation::go_to_breadcrumb_location", $workshopname);
$this->execute('behat_navigation::i_am_on_page_instance', [$workshopname, 'workshop activity']);
$this->execute('behat_general::i_click_on_in_the',
array($assess, "button", $xpath, "xpath_element")

4
report/competency/tests/behat/breakdown_by_activity.feature
View File

@ -41,9 +41,7 @@ Feature: See the competencies for an activity
And "Competency picker" "dialogue" should be visible
And I select "Test-Comp2" of the competency tree
And I click on "Add" "button" in the "Competency picker" "dialogue"
And I am on "Course 1" course homepage
And I follow "PageName1"
And I navigate to "Edit settings" in current page administration
And I am on the PageName1 "page activity editing" page
And I follow "Expand all"
And I set the field "Course competencies" to "Test-Comp1"
And I press "Save and return to course"