From 65884bf2bd754343410a5b3d8b4eea2343dc42e9 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 9 Jun 2014 18:57:05 +0200 Subject: [ticket/11711] Reduce size of tests and also test topic titles PHPBB3-11711 --- tests/test_framework/phpbb_functional_test_case.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'tests/test_framework/phpbb_functional_test_case.php') diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index 182ffaaaf7..c0127c50c9 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -996,11 +996,16 @@ class phpbb_functional_test_case extends phpbb_test_case // Instead, I send it as a request with the submit button "post" set to true. $crawler = self::request('POST', $posting_url, $form_data); - if ($expected !== '') + if ($expected !== '' && isset($this->lang[$expected])) { $this->assertContainsLang($expected, $crawler->filter('html')->text()); return null; } + else if ($expected !== '') + { + $this->assertContains($expected, $crawler->filter('html')->text()); + return null; + } $url = $crawler->selectLink($form_data['subject'])->link()->getUri(); return array( -- cgit v1.2.1 From 5ee7f20f4ee110c2ae0b122e9efbd4fabf669581 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 10 Jun 2014 15:51:25 +0200 Subject: [ticket/11711] Improve coding and comments of character check PHPBB3-11711 --- tests/test_framework/phpbb_functional_test_case.php | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'tests/test_framework/phpbb_functional_test_case.php') diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index c0127c50c9..f2c2c8f181 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -996,16 +996,19 @@ class phpbb_functional_test_case extends phpbb_test_case // Instead, I send it as a request with the submit button "post" set to true. $crawler = self::request('POST', $posting_url, $form_data); - if ($expected !== '' && isset($this->lang[$expected])) + if ($expected !== '') { - $this->assertContainsLang($expected, $crawler->filter('html')->text()); - return null; - } - else if ($expected !== '') - { - $this->assertContains($expected, $crawler->filter('html')->text()); + if (isset($this->lang[$expected])) + { + $this->assertContainsLang($expected, $crawler->filter('html')->text()); + } + else + { + $this->assertContains($expected, $crawler->filter('html')->text()); + } return null; } + $url = $crawler->selectLink($form_data['subject'])->link()->getUri(); return array( -- cgit v1.2.1