aboutsummaryrefslogtreecommitdiffstats
path: root/tests/functional/feed_test.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-07-04 13:32:10 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-07-04 13:32:10 +0200
commit4558262e2aaf31b4583a87622e97a46ead11537c (patch)
tree88a589e5f9b3b45139c32718c1caf12a5e3b1374 /tests/functional/feed_test.php
parent4b49b3dcf3bc369eaced5790b95914254ab7d932 (diff)
parent86e21a9b261d6239487c626b7e9c9f462ceab611 (diff)
downloadforums-4558262e2aaf31b4583a87622e97a46ead11537c.tar
forums-4558262e2aaf31b4583a87622e97a46ead11537c.tar.gz
forums-4558262e2aaf31b4583a87622e97a46ead11537c.tar.bz2
forums-4558262e2aaf31b4583a87622e97a46ead11537c.tar.xz
forums-4558262e2aaf31b4583a87622e97a46ead11537c.zip
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: [ticket/12013] Fix functional tests and sniffer issue. [ticket/12013] Clear the jumpbox. [ticket/12013] Add moderator tools icon. [ticket/12013] Remove obsolete jumpbox and quickmod CSS. [ticket/12013] Prevent the dropdown scrollbar from overlapping the content. [ticket/12013] Update to use the new .button class. [ticket/12013] Add missing class to place the buttons on the rightside. [ticket/12013] Use the correct variable for the forum id. [ticket/12013] Use DEFINE instead of Twig's set. [ticket/12013] Use path helper. [ticket/12013] Use new dropdown for quickmod tools and jumpbox.
Diffstat (limited to 'tests/functional/feed_test.php')
-rw-r--r--tests/functional/feed_test.php6
1 files changed, 1 insertions, 5 deletions
diff --git a/tests/functional/feed_test.php b/tests/functional/feed_test.php
index a474ecf27f..7aa2d0da7d 100644
--- a/tests/functional/feed_test.php
+++ b/tests/functional/feed_test.php
@@ -619,12 +619,8 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case
),
));
- $crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Feeds #1 - Topic #2']}&sid={$this->sid}");
-
$this->add_lang('posting');
- $form = $crawler->selectButton('Go')->eq(2)->form();
- $form['action']->select('delete_topic');
- $crawler = self::submit($form);
+ $crawler = $this->get_quickmod_page($this->data['topics']['Feeds #1 - Topic #2'], 'DELETE_TOPIC');
$this->assertContainsLang('DELETE_PERMANENTLY', $crawler->text());
$this->add_lang('mcp');