Merge branch 'MDL-37873_master' of git://github.com/dmonllao/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 12 Feb 2013 06:48:40 +0000 (14:48 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 12 Feb 2013 06:48:40 +0000 (14:48 +0800)
Conflicts:
course/tests/behat/add_activities.feature

1  2 
course/tests/behat/add_activities.feature

@@@ -25,6 -25,8 +25,7 @@@ Feature: Add activities to course
        | Introduction | Test database description |
        | Required entries | 9 |
        | Comments | Yes |
 -      | ID number | ASD123 |
+     And I turn editing mode off
      Then I should not see "Adding a new"
      And I follow "Test name"
      And I follow "Edit settings"