Merge pull request #31 from urtzai/master

Fixed tests. Django (>=1.7, <=2.1), Python (>=2.7, <=3.6) compatibility tests passed
staticdev · Oct 9, 2018 · b4bf835 · b4bf835
2 parents 4399fb3 + a23b315
commit b4bf835
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 10 deletions.
diff --git a/.coverage b/.coverage
diff --git a/.travis.yml b/.travis.yml
@@ -5,12 +5,16 @@ python:
   - "3.3"
   - "3.4"
   - "3.5"
+  - "3.6"
 
 env:
   - DJANGO="Django>=1.7.0,<1.8.0"
   - DJANGO="Django>=1.8.0,<1.9.0"
   - DJANGO="Django>=1.9.0,<1.10.0"
   - DJANGO="Django>=1.10.0,<1.11.0"
+  - DJANGO="Django>=1.11.0,<2.0.0"
+  - DJANGO="Django>=2.0.0,<2.1.0"
+  - DJANGO="Django>=2.1.0,<2.2.0"
 
 install:
     - pip install -q $DJANGO
@@ -26,7 +30,33 @@ matrix:
   exclude:
     - python: "3.5"
       env: DJANGO="Django>=1.7.0,<1.8.0"
+    - python: "3.6"
+      env: DJANGO="Django>=1.7.0,<1.8.0"
+
+    - python: "3.6"
+      env: DJANGO="Django>=1.8.0,<1.9.0"
+
     - python: "3.3"
       env: DJANGO="Django>=1.9.0,<1.10.0"
+    - python: "3.6"
+      env: DJANGO="Django>=1.9.0,<1.10.0"
+
     - python: "3.3"
       env: DJANGO="Django>=1.10.0,<1.11.0"
+    - python: "3.6"
+      env: DJANGO="Django>=1.10.0,<1.11.0"
+
+    - python: "3.3"
+      env: DJANGO="Django>=1.11.0,<2.0.0"
+
+    - python: "2.7"
+      env: DJANGO="Django>=2.0.0,<2.1.0"
+    - python: "3.3"
+      env: DJANGO="Django>=2.0.0,<2.1.0"
+
+    - python: "2.7"
+      env: DJANGO="Django>=2.1.0,<2.2.0"
+    - python: "3.3"
+      env: DJANGO="Django>=2.1.0,<2.2.0"
+    - python: "3.4"
+      env: DJANGO="Django>=2.1.0,<2.2.0"
diff --git a/pagination_bootstrap/models.py b/pagination_bootstrap/models.py
diff --git a/pagination_bootstrap/tests.py b/pagination_bootstrap/tests.py
@@ -9,12 +9,14 @@
 from django.test import TestCase
 
 from .middleware import PaginationMiddleware
+
 from .paginator import (
     InfinitePaginator,
     InfinitePage,
     FinitePaginator,
     FinitePage,
 )
+
 from .templatetags.pagination_tags import paginate
 
 
@@ -81,22 +83,22 @@ class TestTemplatePaginateTags(TestCase):
     def test_render_range_by_two(self):
         t = Template("{% load pagination_tags %}{% autopaginate var 2 %}{% paginate %}")
         c = Context({'var': range(21), 'request': TestHttpRequest()})
-        self.assertEqual(t.render(c), u'\n\n\n<ul class="pagination">\n\n  <li class="disabled"><a href="#" onclick="javascript: return false;">&laquo;</a></li>\n\n\n  \n    \n  <li class="active"><a href="#" onclick="javascript: return false;">1</a></li>\n    \n  \n\n  \n    \n  <li><a href="?page=2">2</a></li>\n    \n  \n\n  \n    \n  <li><a href="?page=3">3</a></li>\n    \n  \n\n  \n    \n  <li><a href="?page=4">4</a></li>\n    \n  \n\n  \n  <li class="disabled"><a href="#" onclick="javascript: return false;">...</a></li>\n  \n\n  \n    \n  <li><a href="?page=8">8</a></li>\n    \n  \n\n  \n    \n  <li><a href="?page=9">9</a></li>\n    \n  \n\n  \n    \n  <li><a href="?page=10">10</a></li>\n    \n  \n\n  \n    \n  <li><a href="?page=11">11</a></li>\n    \n  \n\n\n  <li><a href="?page=2">&raquo;</a></li>\n\n</ul>\n\n')
+        self.assertEqual(t.render(c), u'\n\n\n<nav aria-label="Page pagination">\n  <ul class="pagination">\n  \n    <li class="page-item disabled"><a class="page-link" href="#" onclick="javascript: return false;">&laquo;</a></li>\n  \n  \n    \n      \n    <li class="page-item active"><a class="page-link" href="#" onclick="javascript: return false;">1</a></li>\n      \n    \n  \n    \n      \n    <li class="page-item"><a class="page-link" href="?page=2">2</a></li>\n      \n    \n  \n    \n      \n    <li class="page-item"><a class="page-link" href="?page=3">3</a></li>\n      \n    \n  \n    \n      \n    <li class="page-item"><a class="page-link" href="?page=4">4</a></li>\n      \n    \n  \n    \n    <li class="page-item disabled"><a class="page-link" href="#" onclick="javascript: return false;">...</a></li>\n    \n  \n    \n      \n    <li class="page-item"><a class="page-link" href="?page=8">8</a></li>\n      \n    \n  \n    \n      \n    <li class="page-item"><a class="page-link" href="?page=9">9</a></li>\n      \n    \n  \n    \n      \n    <li class="page-item"><a class="page-link" href="?page=10">10</a></li>\n      \n    \n  \n    \n      \n    <li class="page-item"><a class="page-link" href="?page=11">11</a></li>\n      \n    \n  \n  \n    <li class="page-item"><a class="page-link" href="?page=2">&raquo;</a></li>\n  \n  </ul>\n  \n</nav>\n')
 
     def test_render_range_by_one(self):
         t = Template("{% load pagination_tags %}{% autopaginate var %}{% paginate %}")
         c = Context({'var': range(21), 'request': TestHttpRequest()})
-        self.assertEqual(t.render(c), u'\n\n\n<ul class="pagination">\n\n  <li class="disabled"><a href="#" onclick="javascript: return false;">&laquo;</a></li>\n\n\n  \n    \n  <li class="active"><a href="#" onclick="javascript: return false;">1</a></li>\n    \n  \n\n  \n    \n  <li><a href="?page=2">2</a></li>\n    \n  \n\n\n  <li><a href="?page=2">&raquo;</a></li>\n\n</ul>\n\n')
+        self.assertEqual(t.render(c), u'\n\n\n<nav aria-label="Page pagination">\n  <ul class="pagination">\n  \n    <li class="page-item disabled"><a class="page-link" href="#" onclick="javascript: return false;">&laquo;</a></li>\n  \n  \n    \n      \n    <li class="page-item active"><a class="page-link" href="#" onclick="javascript: return false;">1</a></li>\n      \n    \n  \n    \n      \n    <li class="page-item"><a class="page-link" href="?page=2">2</a></li>\n      \n    \n  \n  \n    <li class="page-item"><a class="page-link" href="?page=2">&raquo;</a></li>\n  \n  </ul>\n  \n</nav>\n')
 
     def test_render_range_by_twenty(self):
         t = Template("{% load pagination_tags %}{% autopaginate var 20 %}{% paginate %}")
         c = Context({'var': range(21), 'request': TestHttpRequest()})
-        self.assertEqual(t.render(c), u'\n\n\n<ul class="pagination">\n\n  <li class="disabled"><a href="#" onclick="javascript: return false;">&laquo;</a></li>\n\n\n  \n    \n  <li class="active"><a href="#" onclick="javascript: return false;">1</a></li>\n    \n  \n\n  \n    \n  <li><a href="?page=2">2</a></li>\n    \n  \n\n\n  <li><a href="?page=2">&raquo;</a></li>\n\n</ul>\n\n')
+        self.assertEqual(t.render(c), u'\n\n\n<nav aria-label="Page pagination">\n  <ul class="pagination">\n  \n    <li class="page-item disabled"><a class="page-link" href="#" onclick="javascript: return false;">&laquo;</a></li>\n  \n  \n    \n      \n    <li class="page-item active"><a class="page-link" href="#" onclick="javascript: return false;">1</a></li>\n      \n    \n  \n    \n      \n    <li class="page-item"><a class="page-link" href="?page=2">2</a></li>\n      \n    \n  \n  \n    <li class="page-item"><a class="page-link" href="?page=2">&raquo;</a></li>\n  \n  </ul>\n  \n</nav>\n')
 
     def test_render_range_by_var(self):
         t = Template("{% load pagination_tags %}{% autopaginate var by %}{% paginate %}")
         c = Context({'var': range(21), 'by': 20, 'request': TestHttpRequest()})
-        self.assertEqual(t.render(c), u'\n\n\n<ul class="pagination">\n\n  <li class="disabled"><a href="#" onclick="javascript: return false;">&laquo;</a></li>\n\n\n  \n    \n  <li class="active"><a href="#" onclick="javascript: return false;">1</a></li>\n    \n  \n\n  \n    \n  <li><a href="?page=2">2</a></li>\n    \n  \n\n\n  <li><a href="?page=2">&raquo;</a></li>\n\n</ul>\n\n')
+        self.assertEqual(t.render(c), u'\n\n\n<nav aria-label="Page pagination">\n  <ul class="pagination">\n  \n    <li class="page-item disabled"><a class="page-link" href="#" onclick="javascript: return false;">&laquo;</a></li>\n  \n  \n    \n      \n    <li class="page-item active"><a class="page-link" href="#" onclick="javascript: return false;">1</a></li>\n      \n    \n  \n    \n      \n    <li class="page-item"><a class="page-link" href="?page=2">2</a></li>\n      \n    \n  \n  \n    <li class="page-item"><a class="page-link" href="?page=2">&raquo;</a></li>\n  \n  </ul>\n  \n</nav>\n')
 
     def test_render_range_by_var_as_name(self):
         t = Template("{% load pagination_tags %}{% autopaginate var by as foo %}{{ foo }}")

diff --git a/pagination_bootstrap/views.py b/pagination_bootstrap/views.py
diff --git a/runtests.py b/runtests.py
@@ -19,7 +19,7 @@
             }
         },
         USE_TZ=True,
-        ROOT_URLCONF='{0}.tests'.format(APP_NAME),
+        #ROOT_URLCONF='{0}.tests'.format(APP_NAME),
         MIDDLEWARE_CLASSES=(
             'pagination_bootstrap.middleware.PaginationMiddleware',
         ),
@@ -49,7 +49,7 @@
             }
         },
         USE_TZ=True,
-        ROOT_URLCONF='{0}.tests'.format(APP_NAME),
+        #ROOT_URLCONF='{0}.tests'.format(APP_NAME),
         MIDDLEWARE=[
             'pagination_bootstrap.middleware.PaginationMiddleware',
         ],

diff --git a/tox.ini b/tox.ini
@@ -1,7 +1,11 @@
 [tox]
 envlist =
-    py{27,33,34}-dj{17,18},
+    py{27,33,34}-dj{17}
+    py{27,33,34,35}-dj{18}
     py{27,34,35}-dj{19,110}
+    py{27,34,35,36}-dj{19,111}
+    py{34,35,36,37}-dj{200}
+    py{35,36,37}-dj{201}
 
 [testenv]
 basepython =
@@ -14,6 +18,9 @@ deps =
     dj18: Django>=1.8,<1.9
     dj19: Django>=1.9,<1.10
     dj110: Django>=1.10,<1.11
+    dj111: Django>=1.11,<2.0
+    dj200: Django>=2.0,<2.1
+    dj210: Django>=2.1,<2.2
     coverage
     selenium<4.0
     sqlparse