diff options
author | Nils Adermann <naderman@naderman.de> | 2014-08-10 14:00:09 +0200 |
---|---|---|
committer | Nils Adermann <naderman@naderman.de> | 2014-08-10 14:00:09 +0200 |
commit | f067aa92eb28e196d3bb5de6e9cd6015d627dcd5 (patch) | |
tree | 3ced1281bb8b49d5efc31ba912ec5c7f4b82c7ee | |
parent | bf25e317359a409d6082ea44f0bf22fcc37160d9 (diff) | |
parent | 252ddd71d032965989f4fd5062925334814bd162 (diff) | |
download | forums-f067aa92eb28e196d3bb5de6e9cd6015d627dcd5.tar forums-f067aa92eb28e196d3bb5de6e9cd6015d627dcd5.tar.gz forums-f067aa92eb28e196d3bb5de6e9cd6015d627dcd5.tar.bz2 forums-f067aa92eb28e196d3bb5de6e9cd6015d627dcd5.tar.xz forums-f067aa92eb28e196d3bb5de6e9cd6015d627dcd5.zip |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12950] Force the installer to use language=en
-rw-r--r-- | tests/test_framework/phpbb_functional_test_case.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index 6a33fd7711..38d93f9b2f 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -294,7 +294,7 @@ class phpbb_functional_test_case extends phpbb_test_case $parseURL = parse_url(self::$config['phpbb_functional_url']); - $crawler = self::request('GET', 'install/index.php?mode=install'); + $crawler = self::request('GET', 'install/index.php?mode=install&language=en'); self::assertContains('Welcome to Installation', $crawler->filter('#main')->text()); $form = $crawler->selectButton('submit')->form(); |