Merge branch 'MDL-53632-master' of git://github.com/FMCorz/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 26 Apr 2016 03:29:51 +0000 (11:29 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 26 Apr 2016 03:29:51 +0000 (11:29 +0800)
1  2 
admin/tool/lp/lib.php
admin/tool/lp/tests/behat/framework_crud.feature
competency/tests/api_test.php

Simple merge
@@@ -87,10 -87,10 +87,10 @@@ Scenario: Edit a framework with compete
        | Plan Science-5 | Comp1 |
        | Plan Science-5 | Comp2 |
      And the following lp "usercompetencies" exist:
 -      | user | competency | 
 +      | user | competency |
        | admin | Comp1 |
        | admin | Comp2 |
-     And I follow "Competency Frameworks"
+     And I follow "Competency frameworks"
      And I should see "Science Year-5"
      And I click on "Edit" of edit menu in the "Science Year-5" row
      And the field "Name" matches value "Science Year-5 "
Simple merge