diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-30 23:01:57 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-30 23:01:57 +0200 |
| commit | e8af120037b0098f35b25a461d11c4977dae4582 (patch) | |
| tree | c8b13394ce875cc7e9fd912aff2af3647b86269e /tests/functional | |
| parent | be8770532c8bda7b5d73075705518ac1bb5d3d37 (diff) | |
| parent | 9f87c497fe25611ddd2f6963ce38b7edad876de3 (diff) | |
| download | forums-e8af120037b0098f35b25a461d11c4977dae4582.tar forums-e8af120037b0098f35b25a461d11c4977dae4582.tar.gz forums-e8af120037b0098f35b25a461d11c4977dae4582.tar.bz2 forums-e8af120037b0098f35b25a461d11c4977dae4582.tar.xz forums-e8af120037b0098f35b25a461d11c4977dae4582.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/11467] Add user object to extension manager for tests
[ticket/11467] Add language variables to tests
[ticket/11467] Add language variables for extension exception messages
Diffstat (limited to 'tests/functional')
| -rw-r--r-- | tests/functional/extension_acp_test.php | 2 | ||||
| -rw-r--r-- | tests/functional/metadata_manager_test.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/functional/extension_acp_test.php b/tests/functional/extension_acp_test.php index 8f0f9c6700..b6dd5db708 100644 --- a/tests/functional/extension_acp_test.php +++ b/tests/functional/extension_acp_test.php @@ -180,7 +180,7 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case { // test2 is not available (error) $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=delete_data_pre&ext_name=test2&sid=' . $this->sid); - $this->assertContains('The required file does not exist', $crawler->filter('.errorbox')->text()); + $this->assertContains($this->lang('FILE_NOT_FOUND', ''), $crawler->filter('.errorbox')->text()); // foo is not disabled (redirect to list) $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=delete_data_pre&ext_name=vendor2%2Ffoo&sid=' . $this->sid); diff --git a/tests/functional/metadata_manager_test.php b/tests/functional/metadata_manager_test.php index 020e9cd142..080822d249 100644 --- a/tests/functional/metadata_manager_test.php +++ b/tests/functional/metadata_manager_test.php @@ -82,6 +82,6 @@ class phpbb_functional_metadata_manager_test extends phpbb_functional_test_case $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=details&ext_name=not%2Fexists&sid=' . $this->sid); // Error message because the files do not exist - $this->assertContains('The required file does not exist:', $crawler->filter('#main')->text()); + $this->assertContains($this->lang('FILE_NOT_FOUND', ''), $crawler->filter('#main')->text()); } } |