← Back to branch summary

~ubuntu-branches/ubuntu/trusty/moodle/trusty

« back to all changes in this revision

Viewing changes to lib/behat/classes/behat_config_manager.php

  • Committer: Package Import Robot
  • Author(s): Thijs Kinkhorst
  • Date: 2014-01-21 13:40:52 UTC
  • mfrom: (1.1.13)
  • Revision ID: package-import@ubuntu.com-20140121134052-ym2qvsp2cd9vq0p6
Tags: 2.5.4-1
http://bugs.debian.org/735312
* New upstream release, fixing security issues:
  - MSA-14-0001 Config passwords visibility issue [CVE-2014-0008]
  - MSA-14-0002 Group constraints lacking in "login as" [CVE-2014-0009]
  - MSA-14-0003 CSRF vulnerability in profile fields [CVE-2014-0010]
* Move /var/lib/moodle directory into package.
* Revert back to bundled yui3. Unfortunately, version in Debian and
  of upstream are not compatible (closes: #735312).

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/behat/classes/behat_config_manager.php
173
173
        // We require here when we are sure behat dependencies are available.
174
174
        require_once($CFG->dirroot . '/vendor/autoload.php');
175
175
 
 
176
        // It is possible that it has no value.
 
177
        if (empty($CFG->behat_wwwroot)) {
 
178
            $CFG->behat_wwwroot = behat_get_wwwroot();
 
179
        }
 
180
 
176
181
        $basedir = $CFG->dirroot . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'behat';
177
182
        $config = array(
178
183
            'default' => array(
190
195
                        'selenium2' => null
191
196
                    ),
192
197
                    'Moodle\BehatExtension\Extension' => array(
 
198
                        'formatters' => array(
 
199
                            'moodle_progress' => 'Moodle\BehatExtension\Formatter\MoodleProgressFormatter'
 
200
                        ),
193
201
                        'features' => $features,
194
202
                        'steps_definitions' => $stepsdefinitions
195
203
                    )
196
204
                ),
197
205
                'formatter' => array(
198
 
                    'name' => 'progress'
 
206
                    'name' => 'moodle_progress'
199
207
                )
200
208
            )
201
209
        );