diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-03 15:06:28 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-04-03 15:06:28 +0200 |
| commit | b567c0a9e2cdb82348853aca2ea3f2e8856f8e16 (patch) | |
| tree | ccb5794e200854cdc259d64adf36896d94caa681 /tests | |
| parent | 5a3d4109bbad42367d363b616e5a705ee01388e9 (diff) | |
| parent | c674de6a32b89c6b8647907dd7036e5c1ad5184b (diff) | |
| download | forums-b567c0a9e2cdb82348853aca2ea3f2e8856f8e16.tar forums-b567c0a9e2cdb82348853aca2ea3f2e8856f8e16.tar.gz forums-b567c0a9e2cdb82348853aca2ea3f2e8856f8e16.tar.bz2 forums-b567c0a9e2cdb82348853aca2ea3f2e8856f8e16.tar.xz forums-b567c0a9e2cdb82348853aca2ea3f2e8856f8e16.zip | |
Merge remote-tracking branch 'vsephpbb/ticket/12043' into develop-ascraeus
* vsephpbb/ticket/12043:
[ticket/12043] Fix order of disabled extensions in unit tests
[ticket/12043] Correct try/catch exceptions for invalid extensions
[ticket/12043] Sort Extensions by Display Name in ACP Extension mananger
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/functional/extension_acp_test.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/functional/extension_acp_test.php b/tests/functional/extension_acp_test.php index 1d79043eae..5f02158e20 100644 --- a/tests/functional/extension_acp_test.php +++ b/tests/functional/extension_acp_test.php @@ -85,14 +85,14 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case $this->assertContains('phpBB Foo Extension', $crawler->filter('.ext_enabled')->eq(0)->text()); $this->assertContainsLang('EXTENSION_DISABLE', $crawler->filter('.ext_enabled')->eq(0)->text()); - $this->assertContains('phpBB Moo Extension', $crawler->filter('.ext_disabled')->eq(1)->text()); - $this->assertContainsLang('DETAILS', $crawler->filter('.ext_disabled')->eq(1)->text()); - $this->assertContainsLang('EXTENSION_ENABLE', $crawler->filter('.ext_disabled')->eq(1)->text()); - $this->assertContainsLang('EXTENSION_DELETE_DATA', $crawler->filter('.ext_disabled')->eq(1)->text()); + $this->assertContains('phpBB Moo Extension', $crawler->filter('.ext_disabled')->eq(2)->text()); + $this->assertContainsLang('DETAILS', $crawler->filter('.ext_disabled')->eq(2)->text()); + $this->assertContainsLang('EXTENSION_ENABLE', $crawler->filter('.ext_disabled')->eq(2)->text()); + $this->assertContainsLang('EXTENSION_DELETE_DATA', $crawler->filter('.ext_disabled')->eq(2)->text()); $this->assertContains('The “vendor/test2” extension is not valid.', $crawler->filter('.ext_disabled')->eq(0)->text()); - $this->assertContains('The “vendor/test3” extension is not valid.', $crawler->filter('.ext_disabled')->eq(2)->text()); + $this->assertContains('The “vendor/test3” extension is not valid.', $crawler->filter('.ext_disabled')->eq(1)->text()); $this->assertContains('phpBB Bar Extension', $crawler->filter('.ext_disabled')->eq(3)->text()); $this->assertContainsLang('DETAILS', $crawler->filter('.ext_disabled')->eq(3)->text()); |