diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-06-09 22:57:27 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-06-09 22:57:27 +0200 |
| commit | 771cbb2b3a8d025dc1b9453227efdb726399d9d1 (patch) | |
| tree | abe1bcdb610a7ea0c0aa03a56b494f1a661ec3d4 /tests/functional | |
| parent | b6232aa9b213fbf62f5ce351bc79220daf243cc6 (diff) | |
| parent | 7c4bd8cc76e9a0511b54752e88f18c3ee4be2ec6 (diff) | |
| download | forums-771cbb2b3a8d025dc1b9453227efdb726399d9d1.tar forums-771cbb2b3a8d025dc1b9453227efdb726399d9d1.tar.gz forums-771cbb2b3a8d025dc1b9453227efdb726399d9d1.tar.bz2 forums-771cbb2b3a8d025dc1b9453227efdb726399d9d1.tar.xz forums-771cbb2b3a8d025dc1b9453227efdb726399d9d1.zip | |
Merge pull request #2434 from Nicofuma/ticket/8610
[ticket/8610] Merging topics does not handle bookmarks correctly
* Nicofuma/ticket/8610:
[ticket/8610] Use css selector instead of xPath
[ticket/8610] Add functional test when two topics are merged
[ticket/8610] Throw an error when the dest topic isn't set
[ticket/8610] Fix bookmarks when merging all the posts of a topic
[ticket/8610] Merging topics does not handle bookmarks correctly
Diffstat (limited to 'tests/functional')
| -rw-r--r-- | tests/functional/visibility_softdelete_test.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/functional/visibility_softdelete_test.php b/tests/functional/visibility_softdelete_test.php index bc722ea043..5b5f09905c 100644 --- a/tests/functional/visibility_softdelete_test.php +++ b/tests/functional/visibility_softdelete_test.php @@ -595,8 +595,15 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_ 'forum_last_post_id' => $this->data['posts']['Soft Delete Topic #1'], ), 'before merging #1'); + $this->add_lang('viewtopic'); $crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #2']}&sid={$this->sid}"); + $bookmark_tag = $crawler->filter('a.bookmark-link'); + $this->assertContainsLang('BOOKMARK_TOPIC', $bookmark_tag->text()); + $bookmark_link = $bookmark_tag->attr('href'); + $crawler_bookmark = self::request('GET', $bookmark_link); + $this->assertContainsLang('BOOKMARK_ADDED', $crawler_bookmark->text()); + $this->add_lang('mcp'); $form = $crawler->selectButton('Go')->eq(1)->form(); $form['action']->select('merge_topic'); @@ -613,6 +620,7 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_ $crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}"); $this->assertContains('Soft Delete Topic #1', $crawler->filter('h2')->text()); $this->assertContainsLang('POST_DELETED_ACTION', $crawler->filter('body')->text()); + $this->assertContainsLang('BOOKMARK_TOPIC_REMOVE', $crawler->filter('body')->text()); $this->assert_forum_details($this->data['forums']['Soft Delete #1'], array( 'forum_posts_approved' => 1, |