Merge branch 'MDL-55713-master-3' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Oct 2016 22:34:01 +0000 (00:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Oct 2016 22:34:01 +0000 (00:34 +0200)
1  2 
lib/behat/classes/behat_config_util.php

@@@ -1312,11 -1272,6 +1324,11 @@@ class behat_config_util 
          $this->themesuitecontexts[$theme] = $themesuitecontexts;
          $this->themecontexts[$theme] = $themecontexts;
  
 -        return array(array_keys($themecontexts), $themesuitecontexts);
 +        $retval = array(
 +            'contexts' => $themecontexts,
 +            'suitecontexts' => $themesuitecontexts,
 +        );
 +
 +        return $retval;
      }
- }
+ }