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

Merge branch '71992-master-fix-behat-tests-on-https' of https://github.com/DSI-Universite-Rennes2/moodle

Browse source
This commit is contained in:
Víctor Déniz 2021-08-11 14:32:20 +01:00
commit 5f0690f5db
2 changed files with 82 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/behat/lib.php
View file

@ -400,7 +400,9 @@ function behat_update_vars_for_process() {
function behat_is_requested_url($url) {
$parsedurl = parse_url($url . '/');
$parsedurl['port'] = isset($parsedurl['port']) ? $parsedurl['port'] : 80;
if (!isset($parsedurl['port'])) {
$parsedurl['port'] = ($parsedurl['scheme'] === 'https') ? 443 : 80;
}
$parsedurl['path'] = rtrim($parsedurl['path'], '/');
// Removing the port.

79
lib/tests/behat_lib_test.php Normal file
View file

@ -0,0 +1,79 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Unit tests for parts of /lib/behat/lib.php.
*
* @package core
* @category test
* @copyright 2021 Université Rennes 2 {@link https://www.univ-rennes2.fr}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
/**
* Unit tests for parts of /lib/behat/lib.php.
*
* @package core
* @category test
* @copyright 2021 Université Rennes 2 {@link https://www.univ-rennes2.fr}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class behat_lib_test extends advanced_testcase {
/**
* Tests for behat_is_requested_url() function.
*
* @dataProvider url_provider
*
* @param string $url URL used with behat_is_requested_url() function.
* @param bool $expectedvalue Expected value returned by behat_is_requested_url() function.
* @param array $environment Values to override $_SERVER global variable.
*/
public function test_behat_is_requested_url($url, $expectedvalue, $environment) {
// Save $_SERVER variable.
$server = $_SERVER;
// Setup $_SERVER variable for test.
list($_SERVER['HTTP_HOST'], $_SERVER['SERVER_PORT'], $_SERVER['SCRIPT_NAME']) = $environment;
// Test behat_is_requested_url() function.
$this->assertSame($expectedvalue, behat_is_requested_url($url));
// Restore $_SERVER variable.
$_SERVER = $server;
}
/**
* Data provider for test_behat_is_requested_url.
*
* @return array Array of values to test behat_is_requested_url() function.
*/
public function url_provider() {
return [
// Tests for common ports.
['http://behat.moodle.org', true, ['behat.moodle.org', 80, '']],
['https://behat.moodle.org', true, ['behat.moodle.org', 443, '']],
// Test for custom port.
['http://behat.moodle.org:8080', true, ['behat.moodle.org', 8080, '']],
// Test for url with path.
['http://behat.moodle.org/behat', true, ['behat.moodle.org', 80, '/behat']],
// Test for url that does not match with environment.
['http://behat.moodle.org', false, ['moodle.org', 80, '']],
];
}
}