Skip to content

Commit

Permalink
Merge branch 'MDL-64982-master' of git://github.com/rezaies/moodle
Browse files Browse the repository at this point in the history
  • Loading branch information
snake committed Dec 7, 2020
2 parents de57802 + 77baa12 commit 972e098
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 31 deletions.
31 changes: 0 additions & 31 deletions lib/behat/classes/behat_session_interface.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,37 +37,6 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
interface behat_session_interface {
/**
* Small timeout.
*
* A reduced timeout for cases where self::TIMEOUT is too much
* and a simple $this->getSession()->getPage()->find() could not
* be enough.
*
* @deprecated since Moodle 3.7 MDL-64979 - please use get_reduced_timeout() instead
* @todo MDL-64982 This will be deleted in Moodle 3.11
* @see behat_base::get_reduced_timeout()
*/
const REDUCED_TIMEOUT = 2;

/**
* The timeout for each Behat step (load page, wait for an element to load...).
*
* @deprecated since Moodle 3.7 MDL-64979 - please use get_timeout() instead
* @todo MDL-64982 This will be deleted in Moodle 3.11
* @see behat_base::get_timeout()
*/
const TIMEOUT = 6;

/**
* And extended timeout for specific cases.
*
* @deprecated since Moodle 3.7 MDL-64979 - please use get_extended_timeout() instead
* @todo MDL-64982 This will be deleted in Moodle 3.11
* @see behat_base::get_extended_timeout()
*/
const EXTENDED_TIMEOUT = 10;

/**
* The JS code to check that the page is ready.
*
Expand Down
1 change: 1 addition & 0 deletions lib/upgrade.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ information provided here is intended especially for developers.
default the key is stored in moodledata but admins can configure a different, more secure
location in config.php if required. To get the best possible security for this feature, we
recommend enabling the Sodium PHP extension.
* Behat timeout constants behat_base::TIMEOUT, EXTENDED_TIMEOUT, and REDUCED_TIMEOUT, which were deprecated in 3.7, have been removed.

=== 3.10 ===
* PHPUnit has been upgraded to 8.5. That comes with a few changes:
Expand Down

0 comments on commit 972e098

Please sign in to comment.