L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-57619-master' of git://github.com/ankitagarwal/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2017-02-21 01:06:29 +01:00
parent ac1837e6d6 d58adec8de
commit 3cb7fc4f9a
2 changed files with 26 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/tests/behat/behat_deprecated.php
+1 -229
View File
@@ -41,235 +41,6 @@ use Behat\Mink\Exception\ElementNotFoundException as ElementNotFoundException,
*/
class behat_deprecated extends behat_base {
/**
* @Given /^I click on "(?P<element_string>(?:[^"]|\\")*)" "(?P<selector_string>(?:[^"]|\\")*)" in the "(?P<row_text_string>(?:[^"]|\\")*)" table row$/
* @deprecated since Moodle 2.7 MDL-42627 - please do not use this step any more.
*/
public function i_click_on_in_the_table_row($element, $selectortype, $tablerowtext) {
$alternative = 'I click on "' . $this->escape($element) . '" "' . $this->escape($selectortype) .
'" in the "' . $this->escape($tablerowtext) . '" "table_row"';
$this->deprecated_message($alternative, true);
}
/**
* @Given /^I go to notifications page$/
* @deprecated since Moodle 2.7 MDL-42731 - please do not use this step any more.
*/
public function i_go_to_notifications_page() {
$alternative = array(
'I expand "' . get_string('administrationsite') . '" node',
'I click on "' . get_string('notifications') . '" "link" in the "'.get_string('administration').'" "block"'
);
$this->deprecated_message($alternative, true);
}
/**
* @When /^I add "(?P<filename_string>(?:[^"]|\\")*)" file from recent files to "(?P<filepicker_field_string>(?:[^"]|\\")*)" filepicker$/
* @deprecated since Moodle 2.7 MDL-42174 - please do not use this step any more.
*/
public function i_add_file_from_recent_files_to_filepicker($filename, $filepickerelement) {
$reponame = get_string('pluginname', 'repository_recent');
$alternative = 'I add "' . $this->escape($filename) . '" file from "' .
$reponame . '" to "' . $this->escape($filepickerelement) . '" filemanager';
$this->deprecated_message($alternative, true);
}
/**
* @When /^I upload "(?P<filepath_string>(?:[^"]|\\")*)" file to "(?P<filepicker_field_string>(?:[^"]|\\")*)" filepicker$/
* @deprecated since Moodle 2.7 MDL-42174 - please do not use this step any more.
*/
public function i_upload_file_to_filepicker($filepath, $filepickerelement) {
$alternative = 'I upload "' . $this->escape($filepath) . '" file to "' .
$this->escape($filepickerelement) . '" filemanager';
$this->deprecated_message($alternative, true);
}
/**
* @Given /^I create "(?P<foldername_string>(?:[^"]|\\")*)" folder in "(?P<filepicker_field_string>(?:[^"]|\\")*)" filepicker$/
* @deprecated since Moodle 2.7 MDL-42174 - please do not use this step any more.
*/
public function i_create_folder_in_filepicker($foldername, $filepickerelement) {
$alternative = 'I create "' . $this->escape($foldername) .
'" folder in "' . $this->escape($filepickerelement) . '" filemanager';
$this->deprecated_message($alternative, true);
}
/**
* @Given /^I open "(?P<foldername_string>(?:[^"]|\\")*)" folder from "(?P<filepicker_field_string>(?:[^"]|\\")*)" filepicker$/
* @deprecated since Moodle 2.7 MDL-42174 - please do not use this step any more.
*/
public function i_open_folder_from_filepicker($foldername, $filepickerelement) {
$alternative = 'I open "' . $this->escape($foldername) . '" folder from "' .
$this->escape($filepickerelement) . '" filemanager';
$this->deprecated_message($alternative, true);
}
/**
* @Given /^I unzip "(?P<filename_string>(?:[^"]|\\")*)" file from "(?P<filepicker_field_string>(?:[^"]|\\")*)" filepicker$/
* @deprecated since Moodle 2.7 MDL-42174 - please do not use this step any more.
*/
public function i_unzip_file_from_filepicker($filename, $filepickerelement) {
$alternative = 'I unzip "' . $this->escape($filename) . '" file from "' .
$this->escape($filepickerelement) . '" filemanager';
$this->deprecated_message($alternative, true);
}
/**
* @Given /^I zip "(?P<filename_string>(?:[^"]|\\")*)" folder from "(?P<filepicker_field_string>(?:[^"]|\\")*)" filepicker$/
* @deprecated since Moodle 2.7 MDL-42174 - please do not use this step any more.
*/
public function i_zip_folder_from_filepicker($foldername, $filepickerelement) {
$alternative = 'I zip "' . $this->escape($foldername) . '" folder from "' .
$this->escape($filepickerelement) . '" filemanager';
$this->deprecated_message($alternative, true);
}
/**
* @Given /^I delete "(?P<file_or_folder_name_string>(?:[^"]|\\")*)" from "(?P<filepicker_field_string>(?:[^"]|\\")*)" filepicker$/
* @deprecated since Moodle 2.7 MDL-42174 - please do not use this step any more.
*/
public function i_delete_file_from_filepicker($name, $filepickerelement) {
$alternative = 'I delete "' . $this->escape($name) . '" from "' .
$this->escape($filepickerelement) . '" filemanager';
$this->deprecated_message($alternative, true);
}
/**
* @Given /^I send "(?P<message_contents_string>(?:[^"]|\\")*)" message to "(?P<username_string>(?:[^"]|\\")*)"$/
* @deprecated since Moodle 2.7 MDL-43584 - please do not use this step any more.
*/
public function i_send_message_to_user($messagecontent, $tousername) {
$alternative = 'I send "' . $this->escape($messagecontent) . '" message to "USER_FULL_NAME" user';
$this->deprecated_message($alternative, true);
}
/**
* @Given /^I add "(?P<user_username_string>(?:[^"]|\\")*)" user to "(?P<cohort_idnumber_string>(?:[^"]|\\")*)" cohort$/
* @deprecated since Moodle 2.7 MDL-43584 - please do not use this step any more.
*/
public function i_add_user_to_cohort($username, $cohortidnumber) {
$alternative = 'I add "USER_FIRST_NAME USER_LAST_NAME (USER_EMAIL)" user to "'
. $this->escape($cohortidnumber) . '" cohort members';
$this->deprecated_message($alternative, true);
}
/**
* @Given /^I add "(?P<username_string>(?:[^"]|\\")*)" user to "(?P<group_name_string>(?:[^"]|\\")*)" group$/
* @deprecated since Moodle 2.7 MDL-43584 - please do not use this step any more.
*/
public function i_add_user_to_group($username, $groupname) {
$alternative = 'I add "USER_FULL_NAME" user to "' . $this->escape($groupname) . '" group members';
$this->deprecated_message($alternative, true);
}
/**
* @When /^I fill in "(?P<field_string>(?:[^"]|\\")*)" with "(?P<value_string>(?:[^"]|\\")*)"$/
* @deprecated since Moodle 2.7 MDL-43738 - please do not use this step any more.
*/
public function fill_field($field, $value) {
$alternative = 'I set the field "' . $this->escape($field) . '" to "' . $this->escape($value) . '"';
$this->deprecated_message($alternative, true);
}
/**
* @When /^I select "(?P<option_string>(?:[^"]|\\")*)" from "(?P<select_string>(?:[^"]|\\")*)"$/
* @deprecated since Moodle 2.7 MDL-43738 - please do not use this step any more.
*/
public function select_option($option, $select) {
$alternative = 'I set the field "' . $this->escape($select) . '" to "' . $this->escape($option) . '"';
$this->deprecated_message($alternative, true);
}
/**
* @When /^I select "(?P<radio_button_string>(?:[^"]|\\")*)" radio button$/
* @deprecated since Moodle 2.7 MDL-43738 - please do not use this step any more.
*/
public function select_radio($radio) {
$alternative = 'I set the field "' . $this->escape($radio) . '" to "1"';
$this->deprecated_message($alternative, true);
}
/**
* @When /^I check "(?P<option_string>(?:[^"]|\\")*)"$/
* @deprecated since Moodle 2.7 MDL-43738 - please do not use this step any more.
*/
public function check_option($option) {
$alternative = 'I set the field "' . $this->escape($option) . '" to "1"';
$this->deprecated_message($alternative, true);
}
/**
* @When /^I uncheck "(?P<option_string>(?:[^"]|\\")*)"$/
* @deprecated since Moodle 2.7 MDL-43738 - please do not use this step any more.
*/
public function uncheck_option($option) {
$alternative = 'I set the field "' . $this->escape($option) . '" to ""';
$this->deprecated_message($alternative, true);
}
/**
* @Then /^the "(?P<field_string>(?:[^"]|\\")*)" field should match "(?P<value_string>(?:[^"]|\\")*)" value$/
* @deprecated since Moodle 2.7 MDL-43738 - please do not use this step any more.
*/
public function the_field_should_match_value($locator, $value) {
$alternative = 'the field "' . $this->escape($locator) . '" matches value "' . $this->escape($value) . '"';
$this->deprecated_message($alternative, true);
}
/**
* @Then /^the "(?P<checkbox_string>(?:[^"]|\\")*)" checkbox should be checked$/
* @deprecated since Moodle 2.7 MDL-43738 - please do not use this step any more.
*/
public function assert_checkbox_checked($checkbox) {
$alternative = 'the field "' . $this->escape($checkbox) . '" matches value "1"';
$this->deprecated_message($alternative, true);
}
/**
* @Then /^the "(?P<checkbox_string>(?:[^"]|\\")*)" checkbox should not be checked$/
* @deprecated since Moodle 2.7 MDL-43738 - please do not use this step any more.
*/
public function assert_checkbox_not_checked($checkbox) {
$alternative = 'the field "' . $this->escape($checkbox) . '" matches value ""';
$this->deprecated_message($alternative, true);
}
/**
* @Given /^I fill the moodle form with:$/
* @deprecated since Moodle 2.7 MDL-43738 - please do not use this step any more.
*/
public function i_fill_the_moodle_form_with(TableNode $data) {
$alternative = 'I set the following fields to these values:';
$this->deprecated_message($alternative, true);
}
/**
* @Then /^"(?P<element_string>(?:[^"]|\\")*)" "(?P<selector_string>[^"]*)" should exists$/
* @deprecated since Moodle 2.7 MDL-43236 - please do not use this step any more.
*/
public function should_exists($element, $selectortype) {
$alternative = '"' . $this->escape($element) . '" "' . $this->escape($selectortype) . '" should exist';
$this->deprecated_message($alternative, true);
}
/**
* @Then /^"(?P<element_string>(?:[^"]|\\")*)" "(?P<selector_string>[^"]*)" should not exists$/
* @deprecated since Moodle 2.7 MDL-43236 - please do not use this step any more.
*/
public function should_not_exists($element, $selectortype) {
$alternative = '"' . $this->escape($element) . '" "' . $this->escape($selectortype) . '" should not exist';
$this->deprecated_message($alternative, true);
}
/**
* @Given /^the following "(?P<element_string>(?:[^"]|\\")*)" exists:$/
* @deprecated since Moodle 2.7 MDL-43236 - please do not use this step any more.
*/
public function the_following_exists($elementname, TableNode $data) {
$alternative = 'the following "' . $this->escape($elementname) . '" exist:';
$this->deprecated_message($alternative, true);
}
/**
* Sets the specified value to the field.
*
@@ -291,6 +62,7 @@ class behat_deprecated extends behat_base {
* Click on a given link in the moodle-actionmenu that is currently open.
* @Given /^I follow "(?P<link_string>(?:[^"]|\\")*)" in the open menu$/
* @param string $linkstring the text (or id, etc.) of the link to click.
* @deprecated since Moodle 3.2 MDL-55839 - please do not use this step any more.
*/
public function i_follow_in_the_open_menu($linkstring) {
$alternative = 'I choose "' . $this->escape($linkstring) . '" from the open action menu';
lib/upgrade.txt
+25
View File
@@ -25,6 +25,31 @@ information provided here is intended especially for developers.
- file_storage::try_content_recovery - See MDL-46375 for more information
- file_storage::content_exists - See MDL-46375 for more information
- file_storage::deleted_file_cleanup - See MDL-46375 for more information
* Following behat steps have been removed from core:
- I click on "<element_string>" "<selector_string>" in the "<row_text_string>" table row
- I go to notifications page
- I add "<filename_string>" file from recent files to "<filepicker_field_string>" filepicker
- I upload "<filepath_string>" file to "<filepicker_field_string>" filepicker
- I create "<foldername_string>" folder in "<filepicker_field_string>" filepicker
- I open "<foldername_string>" folder from "<filepicker_field_string>" filepicker
- I unzip "<filename_string>" file from "<filepicker_field_string>" filepicker
- I zip "<filename_string>" folder from "<filepicker_field_string>" filepicker
- I delete "<file_or_folder_name_string>" from "<filepicker_field_string>" filepicker
- I send "<message_contents_string>" message to "<username_string>"
- I add "<user_username_string>" user to "<cohort_idnumber_string>" cohort
- I add "<username_string>" user to "<group_name_string>" group
- I fill in "<field_string>" with "<value_string>"
- I select "<option_string>" from "<select_string>"
- I select "<radio_button_string>" radio button
- I check "<option_string>"
- I uncheck "<option_string>"
- the "<field_string>" field should match "<value_string>" value
- the "<checkbox_string>" checkbox should be checked
- the "<checkbox_string>" checkbox should not be checked
- I fill the moodle form with:
- "<element_string>" "<selector_string>" should exists
- "<element_string>" "<selector_string>" should not exists
- the following "<element_string>" exists:
=== 3.2 ===