Merge branch 'wip-mdl-45769' of https://github.com/rajeshtaneja/moodle

composer.json

@@ -8,6 +8,6 @@
     "require-dev": {
         "phpunit/phpunit": "3.7.*",
         "phpunit/dbUnit": "1.2.*",
-        "moodlehq/behat-extension": "1.28.3"
+        "moodlehq/behat-extension": "1.28.4"
     }
 }

grade/grading/tests/behat/behat_grading.php

@@ -138,8 +138,8 @@ class behat_grading extends behat_base {
         // Should work with both templates and own forms.
         $literaltemplate = $this->getSession()->getSelectorsHandler()->xpathLiteral(get_string('templatepick', 'grading'));
         $literalownform = $this->getSession()->getSelectorsHandler()->xpathLiteral(get_string('templatepickownform', 'grading'));
-        $usetemplatexpath = "//a[./descendant::div[text()=$literaltemplate]]|" .
-            "//a[./descendant::div[text()=$literalownform]]";
+        $usetemplatexpath = "/a[./descendant::div[text()=$literaltemplate]]|" .
+            "/a[./descendant::div[text()=$literalownform]]";
 
         return array(
             new Given('I go to "' . $this->escape($activityname) . '" advanced grading page'),

lib/editor/tinymce/tests/behat/edit_available_icons.feature

@@ -9,8 +9,7 @@ Feature: Add or remove items from the TinyMCE editor toolbar
       | fullname | shortname | category |
       | Course 1 | C1 | 0 |
     And I log in as "admin"
-    And I follow "Admin User"
-    And I follow "Edit profile"
+    And I navigate to "Edit profile" node in "My profile settings"
     And I set the field "Text editor" to "TinyMCE HTML editor"
     And I press "Update profile"
     And I follow "Home"