moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 17:06:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'wip-mdl-55329' of https://github.com/rajeshtaneja/moodle

Browse source
This commit is contained in:
Andrew Nicols 2016-08-09 14:26:09 +08:00
commit 8173c3ef7f
4 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/tests/behat/behat_deprecated.php
View file

@ -28,7 +28,8 @@
require_once(__DIR__ . '/../../../lib/behat/behat_base.php'); require_once(__DIR__ . '/../../../lib/behat/behat_base.php');
use Behat\Mink\Exception\ElementNotFoundException as ElementNotFoundException, use Behat\Mink\Exception\ElementNotFoundException as ElementNotFoundException,
Behat\Gherkin\Node\TableNode as TableNode; Behat\Gherkin\Node\TableNode as TableNode,
Behat\Gherkin\Node\PyStringNode as PyStringNode,
/** /**
* Deprecated behat step definitions. * Deprecated behat step definitions.
@ -269,6 +270,22 @@ class behat_deprecated extends behat_base {
$this->deprecated_message($alternative, true); $this->deprecated_message($alternative, true);
} }
/**
* Sets the specified value to the field.
*
* @Given /^I set the field "(?P<field_string>(?:[^"]|\\")*)" to multiline$/
* @throws ElementNotFoundException Thrown by behat_base::find
* @param string $field
* @param PyStringNode $value
* @deprecated since Moodle 3.2 MDL-55406 - please do not use this step any more.
*/
public function i_set_the_field_to_multiline($field, PyStringNode $value) {
$alternative = 'I set the field "' . $this->escape($field) . '" to multiline:';
$this->deprecated_message($alternative);
$this->execute('behat_forms::i_set_the_field_to_multiline', array($field, $value));
}
/** /**
* Throws an exception if $CFG->behat_usedeprecated is not allowed. * Throws an exception if $CFG->behat_usedeprecated is not allowed.

2
lib/tests/behat/behat_forms.php
View file

@ -221,7 +221,7 @@ class behat_forms extends behat_base {
/** /**
* Sets the specified value to the field. * Sets the specified value to the field.
* *
* @Given /^I set the field "(?P<field_string>(?:[^"]|\\")*)" to multiline$/ * @Given /^I set the field "(?P<field_string>(?:[^"]|\\")*)" to multiline:$/
* @throws ElementNotFoundException Thrown by behat_base::find * @throws ElementNotFoundException Thrown by behat_base::find
* @param string $field * @param string $field
* @param PyStringNode $value * @param PyStringNode $value

1
lib/upgrade.txt
View file

@ -51,6 +51,7 @@ information provided here is intended especially for developers.
* Added down arrow: $OUTPUT->darrow. * Added down arrow: $OUTPUT->darrow.
* All file_packer implementations now accept an additional parameter to allow a simple boolean return value instead of * All file_packer implementations now accept an additional parameter to allow a simple boolean return value instead of
an array of individual file statuses. an array of individual file statuses.
* "I set the field "field_string" to multiline:" now end with colon (:), as PyStrings is supposed to end with ":"
=== 3.1 === === 3.1 ===

4
mod/data/tests/behat/required_entries.feature
View file

@ -36,7 +36,7 @@ Feature: Users can be required to specify certain fields when adding entries to
| Field name | Required Two-Option Checkbox | | Field name | Required Two-Option Checkbox |
| Field description | Required Two-Option Checkbox | | Field description | Required Two-Option Checkbox |
| Required | yes | | Required | yes |
And I set the field "Options" to multiline And I set the field "Options" to multiline:
""" """
RTOC Option 1 RTOC Option 1
RTOC Option 2 RTOC Option 2
@ -83,7 +83,7 @@ Feature: Users can be required to specify certain fields when adding entries to
| Field name | Required Two-Option Multimenu | | Field name | Required Two-Option Multimenu |
| Field description | Required Two-Option Multimenu | | Field description | Required Two-Option Multimenu |
| Required | yes | | Required | yes |
And I set the field "Options" to multiline And I set the field "Options" to multiline:
""" """
Option 1 Option 1
Option 2 Option 2