diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-06-06 17:21:01 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-06-06 17:21:01 -0500 |
| commit | 6bc775a75bdb4d4984eba10fba253c4cc75542d1 (patch) | |
| tree | e9a254aa34b872d99244d09e715a8b3371382ec7 /tests/functional/extension_acp_test.php | |
| parent | b4b1704a9b2f2c6e7770f478e27c5c408772f3ff (diff) | |
| parent | 1d7c80b91210337845ae33267131bb82473b9a9f (diff) | |
| download | forums-6bc775a75bdb4d4984eba10fba253c4cc75542d1.tar forums-6bc775a75bdb4d4984eba10fba253c4cc75542d1.tar.gz forums-6bc775a75bdb4d4984eba10fba253c4cc75542d1.tar.bz2 forums-6bc775a75bdb4d4984eba10fba253c4cc75542d1.tar.xz forums-6bc775a75bdb4d4984eba10fba253c4cc75542d1.zip | |
Merge remote-tracking branch 'remotes/nickv/ticket/11568-develop' into develop
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11568-develop: (21 commits)
[ticket/11568] Split status code and html debug assertion into two methods
[ticket/11568] Add comma at end of array key-value couple
[ticket/11568] Invert logic for asserting the response
[ticket/11568] Use static calls for static methods
[ticket/develop/11568] Remove unneccessary second call with wrong arguments
[ticket/11568] Remove unused method
[ticket/11568] Only assert string when doctype is there at all
[ticket/develop/11568] Fix some more tests in 3.1
[ticket/develop/11568] Remove php extension parameter
[ticket/develop/11568] Remove unneccessary calls to assert_response_success()
[ticket/develop/11568] Do not directly access $client from tests
[ticket/11568] Add method to get page content
[ticket/11568] Allow different status codes
[ticket/11568] Trim the output to allow Tabs before INCLUDE overall_header
[ticket/11568] Fix common_groups_test.php form handling
[ticket/11568] Make CookieJar static aswell
[ticket/11568] Remove manual calls to assert_response_success()
[ticket/11568] Only use a static version of the client
[ticket/11568] Any output before the doc type means there was an error
[ticket/11568] Set client manually so we can increase the cURL timeout
...
Diffstat (limited to 'tests/functional/extension_acp_test.php')
| -rw-r--r-- | tests/functional/extension_acp_test.php | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/functional/extension_acp_test.php b/tests/functional/extension_acp_test.php index 1b406e5042..9badab8ced 100644 --- a/tests/functional/extension_acp_test.php +++ b/tests/functional/extension_acp_test.php @@ -109,7 +109,7 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case public function test_list() { - $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid); + $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid); $this->assertCount(1, $crawler->filter('.ext_enabled')); $this->assertCount(5, $crawler->filter('.ext_disabled')); @@ -131,7 +131,7 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case public function test_details() { - $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=details&ext_name=foo&sid=' . $this->sid); + $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=details&ext_name=foo&sid=' . $this->sid); $validation = array( 'DISPLAY_NAME' => 'phpBB Foo Extension', @@ -174,46 +174,46 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case public function test_enable_pre() { // Foo is already enabled (redirect to list) - $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable_pre&ext_name=foo&sid=' . $this->sid); + $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable_pre&ext_name=foo&sid=' . $this->sid); $this->assertContainsLang('EXTENSION_NAME', $crawler->filter('html')->text()); $this->assertContainsLang('EXTENSION_OPTIONS', $crawler->filter('html')->text()); $this->assertContainsLang('EXTENSION_ACTIONS', $crawler->filter('html')->text()); - $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable_pre&ext_name=vendor%2Fmoo&sid=' . $this->sid); + $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable_pre&ext_name=vendor%2Fmoo&sid=' . $this->sid); $this->assertContainsLang('ENABLE_CONFIRM', $crawler->filter('html')->text()); } public function test_disable_pre() { // Moo is not enabled (redirect to list) - $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=disable_pre&ext_name=vendor%2Fmoo&sid=' . $this->sid); + $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=disable_pre&ext_name=vendor%2Fmoo&sid=' . $this->sid); $this->assertContainsLang('EXTENSION_NAME', $crawler->filter('html')->text()); $this->assertContainsLang('EXTENSION_OPTIONS', $crawler->filter('html')->text()); $this->assertContainsLang('EXTENSION_ACTIONS', $crawler->filter('html')->text()); - $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=disable_pre&ext_name=foo&sid=' . $this->sid); + $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=disable_pre&ext_name=foo&sid=' . $this->sid); $this->assertContainsLang('DISABLE_CONFIRM', $crawler->filter('html')->text()); } public function test_purge_pre() { // test2 is not available (error) - $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=purge_pre&ext_name=test2&sid=' . $this->sid); + $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=purge_pre&ext_name=test2&sid=' . $this->sid); $this->assertContains('The required file does not exist', $crawler->filter('html')->text()); - $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=purge_pre&ext_name=foo&sid=' . $this->sid); + $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=purge_pre&ext_name=foo&sid=' . $this->sid); $this->assertContainsLang('PURGE_CONFIRM', $crawler->filter('html')->text()); } public function test_actions() { - $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable&ext_name=vendor%2Fmoo&sid=' . $this->sid); + $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable&ext_name=vendor%2Fmoo&sid=' . $this->sid); $this->assertContainsLang('ENABLE_SUCCESS', $crawler->filter('html')->text()); - $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=disable&ext_name=vendor%2Fmoo&sid=' . $this->sid); + $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=disable&ext_name=vendor%2Fmoo&sid=' . $this->sid); $this->assertContainsLang('DISABLE_SUCCESS', $crawler->filter('html')->text()); - $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=purge&ext_name=vendor%2Fmoo&sid=' . $this->sid); + $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=purge&ext_name=vendor%2Fmoo&sid=' . $this->sid); $this->assertContainsLang('PURGE_SUCCESS', $crawler->filter('html')->text()); } }
\ No newline at end of file |