Skip to content

Commit

Permalink
Merge branch 'MDL-48741_28' of git://github.com/stronk7/moodle into M…
Browse files Browse the repository at this point in the history
…OODLE_28_STABLE
  • Loading branch information
andrewnicols committed Jan 20, 2015
2 parents 24b7c67 + 7e5840e commit 0542213
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -8,6 +8,6 @@
"require-dev": {
"phpunit/phpunit": "3.7.*",
"phpunit/dbUnit": "1.2.*",
"moodlehq/behat-extension": "1.28.6"
"moodlehq/behat-extension": "1.28.7"
}
}
3 changes: 2 additions & 1 deletion lib/behat/classes/behat_config_manager.php
Expand Up @@ -221,7 +221,8 @@ protected static function get_config_file_contents($features, $stepsdefinitions)
),
'Moodle\BehatExtension\Extension' => array(
'formatters' => array(
'moodle_progress' => 'Moodle\BehatExtension\Formatter\MoodleProgressFormatter'
'moodle_progress' => 'Moodle\BehatExtension\Formatter\MoodleProgressFormatter',
'moodle_list' => 'Moodle\BehatExtension\Formatter\MoodleListFormatter'
),
'features' => $features,
'steps_definitions' => $stepsdefinitions
Expand Down

0 comments on commit 0542213

Please sign in to comment.