diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-12 16:45:30 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-04-12 16:45:30 +0200 |
| commit | cbc1c4bf3186944750ae5075b6f9c225318ab31e (patch) | |
| tree | ab90c66e8486dadf999e2eb2bb4c05a024491f1c | |
| parent | 1efb0a8488f866e6f791bbf85439aa9b031c83ba (diff) | |
| parent | 5124920d22be22d8961cdee5b4716e6111ea37bb (diff) | |
| download | forums-cbc1c4bf3186944750ae5075b6f9c225318ab31e.tar forums-cbc1c4bf3186944750ae5075b6f9c225318ab31e.tar.gz forums-cbc1c4bf3186944750ae5075b6f9c225318ab31e.tar.bz2 forums-cbc1c4bf3186944750ae5075b6f9c225318ab31e.tar.xz forums-cbc1c4bf3186944750ae5075b6f9c225318ab31e.zip | |
Merge remote-tracking branch 'marc/ticket/12398' into develop-ascraeus
* marc/ticket/12398:
[ticket/12398] Use return of submit_post in softdelete and download tests
[ticket/12398] Use submit_post return in prune_shadow_topic_test
| -rw-r--r-- | tests/functional/download_test.php | 2 | ||||
| -rw-r--r-- | tests/functional/prune_shadow_topic_test.php | 2 | ||||
| -rw-r--r-- | tests/functional/softdelete_test.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/functional/download_test.php b/tests/functional/download_test.php index 24366992d5..087250157d 100644 --- a/tests/functional/download_test.php +++ b/tests/functional/download_test.php @@ -57,7 +57,7 @@ class phpbb_functional_download_test extends phpbb_functional_test_case $crawler = self::request('GET', "viewtopic.php?t={$post2['topic_id']}&sid={$this->sid}"); $this->assertContains('Re: Download Topic #1-#2', $crawler->filter('html')->text()); - $this->data['posts']['Re: Download Topic #1-#2'] = (int) $this->get_parameter_from_link($crawler->filter('.post')->eq(1)->selectLink($this->lang('POST', '', ''))->link()->getUri(), 'p'); + $this->data['posts']['Re: Download Topic #1-#2'] = (int) $post2['post_id']; } public function test_download_accessible() diff --git a/tests/functional/prune_shadow_topic_test.php b/tests/functional/prune_shadow_topic_test.php index 901cedb389..a9fd2457bb 100644 --- a/tests/functional/prune_shadow_topic_test.php +++ b/tests/functional/prune_shadow_topic_test.php @@ -76,7 +76,7 @@ class phpbb_functional_prune_shadow_topic_test extends phpbb_functional_test_cas $crawler = self::request('GET', "viewtopic.php?t={$post2['topic_id']}&sid={$this->sid}"); $this->assertContains('Re: Prune Shadow #1-#2', $crawler->filter('html')->text()); - $this->data['posts']['Re: Prune Shadow #1-#2'] = (int) $this->get_parameter_from_link($crawler->filter('.post')->eq(1)->selectLink($this->lang('POST', '', ''))->link()->getUri(), 'p'); + $this->data['posts']['Re: Prune Shadow #1-#2'] = (int) $post2['post_id']; $this->assert_forum_details($this->data['forums']['Prune Shadow'], array( 'forum_posts_approved' => 2, diff --git a/tests/functional/softdelete_test.php b/tests/functional/softdelete_test.php index bd4d34cf99..dbea67db93 100644 --- a/tests/functional/softdelete_test.php +++ b/tests/functional/softdelete_test.php @@ -83,7 +83,7 @@ class phpbb_functional_softdelete_test extends phpbb_functional_test_case $crawler = self::request('GET', "viewtopic.php?t={$post2['topic_id']}&sid={$this->sid}"); $this->assertContains('Re: Soft Delete Topic #1-#2', $crawler->filter('html')->text()); - $this->data['posts']['Re: Soft Delete Topic #1-#2'] = (int) $this->get_parameter_from_link($crawler->filter('.post')->eq(1)->selectLink($this->lang('POST', '', ''))->link()->getUri(), 'p'); + $this->data['posts']['Re: Soft Delete Topic #1-#2'] = (int) $post2['post_id']; $this->assert_forum_details($this->data['forums']['Soft Delete #1'], array( 'forum_posts_approved' => 2, |