diff options
| author | Cesar G <prototech91@gmail.com> | 2014-06-14 16:31:20 -0700 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-06-14 16:31:20 -0700 |
| commit | b0ab83886e730fb9d31b3247ffb9ea4758cc1b1e (patch) | |
| tree | 1d23e62d4b118a1dc71c1469d92fcf7a9dffbbf3 /tests | |
| parent | 73718175673540fb8c5cfd07fe4e26761d7c3516 (diff) | |
| parent | 24bbd06d49a5d80fccfe37e98fd7786d4bda2807 (diff) | |
| download | forums-b0ab83886e730fb9d31b3247ffb9ea4758cc1b1e.tar forums-b0ab83886e730fb9d31b3247ffb9ea4758cc1b1e.tar.gz forums-b0ab83886e730fb9d31b3247ffb9ea4758cc1b1e.tar.bz2 forums-b0ab83886e730fb9d31b3247ffb9ea4758cc1b1e.tar.xz forums-b0ab83886e730fb9d31b3247ffb9ea4758cc1b1e.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: (25 commits)
[ticket/12613] Add distinction between top/bottom action-bar
[ticket/12613] Replaced topic-actions with action-bar
[ticket/12613] Remove responsive linklist from memberlist
[ticket/12613] Remove unnecessary checks and clean up CSS
[ticket/12613] role="navigation" not allowed on <ul>
[ticket/12613] Improved screen reader functionality
[ticket/12613] Removed unnecessary checks
[ticket/12613] Set fixed font-size
[ticket/12613] Slightly better icons
[ticket/12613] Typo and L_COLON
[ticket/12613] Small inconsistency fixes
[ticket/12613] Don't display page-jump if all pages are visible (6)
[ticket/12613] Fixes from comments (single quotes and typos)
[ticket/12613] Minor $bull; and <hr> fix
[ticket/12613] Pagination should never be in responsive linklist
[ticket/12613] Minor CSS fixes
[ticket/12613] Dropdown-visible page-jump icon, fix focus() timing
[ticket/12613] Renamed jump-to to page-jump to prevent confusion
[ticket/12613] Removed form in order to prevent nested forms
[ticket/12613] Fix functional test and post sorting bug
...
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/functional/paging_test.php | 4 | ||||
| -rw-r--r-- | tests/pagination/pagination_test.php | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/tests/functional/paging_test.php b/tests/functional/paging_test.php index 97ce822fdf..cfaf9104a8 100644 --- a/tests/functional/paging_test.php +++ b/tests/functional/paging_test.php @@ -30,12 +30,12 @@ class phpbb_functional_paging_test extends phpbb_functional_test_case $this->assertContains('post no4', $crawler->text()); $this->assertNotContains('post no16', $crawler->text()); - $next_link = $crawler->filter('#viewtopic > fieldset > a.arrow-right')->attr('href'); + $next_link = $crawler->filter('.pagination > ul > li.next > a')->attr('href'); $crawler = self::request('GET', $next_link); $this->assertNotContains('post no4', $crawler->text()); $this->assertContains('post no16', $crawler->text()); - $prev_link = $crawler->filter('#viewtopic > fieldset > a.arrow-left')->attr('href'); + $prev_link = $crawler->filter('.pagination > ul > li.previous > a')->attr('href'); $crawler = self::request('GET', $prev_link); $this->assertContains('post no4', $crawler->text()); $this->assertNotContains('post no16', $crawler->text()); diff --git a/tests/pagination/pagination_test.php b/tests/pagination/pagination_test.php index f253118253..ace8c1eed0 100644 --- a/tests/pagination/pagination_test.php +++ b/tests/pagination/pagination_test.php @@ -91,7 +91,6 @@ class phpbb_pagination_pagination_test extends phpbb_template_template_test_case :current:3:page.php?start=20 :else:4:page.php?start=30 :else:5:page.php?start=40 - :else:6:page.php?start=50 :ellipsis:9:page.php?start=80 :else:10:page.php?start=90 :next::page.php?start=30 @@ -142,7 +141,6 @@ class phpbb_pagination_pagination_test extends phpbb_template_template_test_case :current:3:test/page/3 :else:4:test/page/4 :else:5:test/page/5 - :else:6:test/page/6 :ellipsis:9:test/page/9 :else:10:test/page/10 :next::test/page/4 |