yourlabs · jpic · Jan 29, 2019 · Jan 29, 2019 · Jan 29, 2019 · Jan 29, 2019
diff --git a/.travis.yml b/.travis.yml
@@ -1,16 +1,13 @@
-sudo: false
-language: python
-python:
-- '3.6'
+python: 3.7
+dist: xenial
+sudo: true
 env:
   matrix:
-  - TOXENV=py27-dj111
-  - TOXENV=py36-dj111
-  - TOXENV=py36-dj20
+  - TOXENV=py37-dj21
   - TOXENV=qa
 install:
 - pip install -U pip
-- pip install tox codecov
+- pip install codecov
 script:
 - tox
 after_success:

diff --git a/README.rst b/README.rst
@@ -16,6 +16,8 @@ itself and to make it reusable for other apps.
 
 It's pretty much the same as django-dbdiff, except this is for HTTP response.
 
+.. note:: v0.7 supports up to Django < 2.1
+
 Response state assertion
 ========================
 

diff --git a/responsediff/__init__.py b/responsediff/__init__.py
@@ -1 +1,2 @@
 """Basic HTTP response diff-ing for test purposes."""
+from .response import Response  # noqa
diff --git a/responsediff/response.py b/responsediff/response.py
@@ -3,6 +3,7 @@
 import inspect
 import json
 import os
+import re
 import subprocess
 import tempfile
 
@@ -79,8 +80,22 @@ def __init__(self, path):
         """
         self.path = path
 
-    def assertNoDiff(self, response, selector=None):  # noqa
+    def assertNoDiff(self, response, selector=None, replace=None):  # noqa
         """Backward compatibility method for pre-assertWebsiteSame versions."""
+        if not replace:
+            replace = []
+
+        replace += [
+            ('<[^<]*csrfmiddlewaretoken[^>]*>', '{% csrf_token %}'),
+        ]
+
+        for pattern in replace:
+            response.content = re.sub(
+                pattern[0],
+                pattern[1],
+                response.content.decode('utf8')
+            ).encode('utf8')
+
         diffs, created = self.make_diff(response, selector=selector)
 
         if created or diffs:

diff --git a/responsediff/tests/project/settings.py b/responsediff/tests/project/settings.py
@@ -39,16 +39,15 @@
     'django.contrib.staticfiles',
 )
 
-MIDDLEWARE_CLASSES = (
+MIDDLEWARE = [  # django 2
+    'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
-    'django.middleware.security.SecurityMiddleware',
-)
+]
 
 ROOT_URLCONF = 'responsediff.tests.project.urls'
 

diff --git a/responsediff/tests/project/urls.py b/responsediff/tests/project/urls.py
@@ -1 +1,6 @@
-urlpatterns = []
+from django.contrib import admin
+from django.urls import path
+
+urlpatterns = [
+    path('admin/', admin.site.urls),
+]
diff --git a/responsediff/tests/response_fixtures/MixinTest.test_assertNoDiff.content b/responsediff/tests/response_fixtures/MixinTest.test_assertNoDiff.content
@@ -1 +1,88 @@
-<h1>Not Found</h1><p>The requested URL /admin/ was not found on this server.</p>
+<!DOCTYPE html>
+
+<html lang="en-us" >
+<head>
+<title>Log in | Django site admin</title>
+<link rel="stylesheet" type="text/css" href="/static/admin/css/base.css">
+<link rel="stylesheet" type="text/css" href="/static/admin/css/login.css">
+
+
+
+
+
+    <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <link rel="stylesheet" type="text/css" href="/static/admin/css/responsive.css">
+
+
+<meta name="robots" content="NONE,NOARCHIVE">
+</head>
+
+
+<body class=" login"
+  data-admin-utc-offset="0">
+
+<!-- Container -->
+<div id="container">
+
+
+    <!-- Header -->
+    <div id="header">
+        <div id="branding">
+
+<h1 id="site-name"><a href="/admin/">Django administration</a></h1>
+
+        </div>
+
+
+    </div>
+    <!-- END Header -->
+
+
+
+
+
+
+
+    <!-- Content -->
+    <div id="content" class="colM">
+
+
+
+
+
+
+
+<div id="content-main">
+
+
+
+<form action="/admin/login/" method="post" id="login-form">{% csrf_token %}
+  <div class="form-row">
+
+    <label class="required" for="id_username">Username:</label> <input type="text" name="username" autofocus required id="id_username">
+  </div>
+  <div class="form-row">
+
+    <label class="required" for="id_password">Password:</label> <input type="password" name="password" required id="id_password">
+    <input type="hidden" name="next" value="/admin/">
+  </div>
+
+
+  <div class="submit-row">
+    <label>&nbsp;</label><input type="submit" value="Log in">
+  </div>
+</form>
+
+</div>
+
+
+        <br class="clear">
+    </div>
+    <!-- END Content -->
+
+    <div id="footer"></div>
+</div>
+<!-- END Container -->
+
+</body>
+</html>
diff --git a/responsediff/tests/response_fixtures/MixinTest.test_assertNoDiff.metadata b/responsediff/tests/response_fixtures/MixinTest.test_assertNoDiff.metadata
@@ -1,3 +1,3 @@
 {
-    "status_code": 404
+    "status_code": 200
 }
diff --git a/responsediff/tests/response_fixtures/MixinTest.test_assertNoDiffSelector.content b/responsediff/tests/response_fixtures/MixinTest.test_assertNoDiffSelector.content
@@ -1,3 +1 @@
-<h1>Not Found</h1>
----
-<p>The requested URL /admin/ was not found on this server.</p>
+<h1 id="site-name"><a href="/admin/">Django administration</a></h1>
diff --git a/responsediff/tests/response_fixtures/MixinTest.test_assertNoDiffSelector.metadata b/responsediff/tests/response_fixtures/MixinTest.test_assertNoDiffSelector.metadata
@@ -1,3 +1,3 @@
 {
-    "status_code": 404
+    "status_code": 200
 }
diff --git a/responsediff/tests/responses/test_response.content b/responsediff/tests/responses/test_response.content
@@ -0,0 +1,88 @@
+<!DOCTYPE html>
+
+<html lang="en-us" >
+<head>
+<title>Log in | Django site admin</title>
+<link rel="stylesheet" type="text/css" href="/static/admin/css/base.css">
+<link rel="stylesheet" type="text/css" href="/static/admin/css/login.css">
+
+
+
+
+
+    <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <link rel="stylesheet" type="text/css" href="/static/admin/css/responsive.css">
+
+
+<meta name="robots" content="NONE,NOARCHIVE">
+</head>
+
+
+<body class=" login"
+  data-admin-utc-offset="0">
+
+<!-- Container -->
+<div id="container">
+
+
+    <!-- Header -->
+    <div id="header">
+        <div id="branding">
+
+<h1 id="site-name"><a href="/admin/">Django administration</a></h1>
+
+        </div>
+
+
+    </div>
+    <!-- END Header -->
+
+
+
+
+
+
+
+    <!-- Content -->
+    <div id="content" class="colM">
+
+
+
+
+
+
+
+<div id="content-main">
+
+
+
+<form action="/admin/login/" method="post" id="login-form">{% csrf_token %}
+  <div class="form-row">
+
+    <label class="required" for="id_username">Username:</label> <input type="text" name="username" autofocus required id="id_username">
+  </div>
+  <div class="form-row">
+
+    <label class="required" for="id_password">Password:</label> <input type="password" name="password" required id="id_password">
+    <input type="hidden" name="next" value="/admin/">
+  </div>
+
+
+  <div class="submit-row">
+    <label>&nbsp;</label><input type="submit" value="Log in">
+  </div>
+</form>
+
+</div>
+
+
+        <br class="clear">
+    </div>
+    <!-- END Content -->
+
+    <div id="footer"></div>
+</div>
+<!-- END Container -->
+
+</body>
+</html>
diff --git a/responsediff/tests/responses/test_response.metadata b/responsediff/tests/responses/test_response.metadata
@@ -0,0 +1,3 @@
+{
+    "status_code": 200
+}
diff --git a/responsediff/tests/test_mixin.py b/responsediff/tests/test_mixin.py
@@ -32,10 +32,13 @@ def get_client(self, fixtures):
         return client
 
     def test_assertNoDiff(self):  # noqa
-        self.assertResponseDiffEmpty(test.Client().get('/admin/'))
+        self.assertResponseDiffEmpty(test.Client().get('/admin/login/'))
 
     def test_assertNoDiffSelector(self):  # noqa
-        self.assertResponseDiffEmpty(test.Client().get('/admin/'), 'h1, p')
+        self.assertResponseDiffEmpty(
+            test.Client().get('/admin/login/'),
+            'h1, p'
+        )
 
     def test_assertNoDiffSelector_non_ascii(self):  # noqa
         response = test.Client().get('/admin/')

diff --git a/responsediff/tests/test_response.py b/responsediff/tests/test_response.py
@@ -0,0 +1,7 @@
+from responsediff import Response
+
+
+def test_response(client):
+    """Check that csrf_token was replaced and that the thing works."""
+    res = client.get('/admin/login/')
+    Response('responsediff/tests/responses/test_response').assertNoDiff(res)
diff --git a/responsediff/tests/test_responsediff.py b/responsediff/tests/test_responsediff.py
@@ -32,7 +32,7 @@ def test_path(self):
         assert Response.for_test(self).path == expected
 
     def test_story(self):
-        result = test.Client().get('/admin/')
+        result = test.Client().get('/adminfoo/')
         expected = Response.for_test(self)
 
         if os.path.exists(expected.content_path):  # pragma: no cover
@@ -71,7 +71,7 @@ def test_story(self):
 @@ -1 +1 @@
 -bla
 \ No newline at end of file
-+<h1>Not Found</h1><p>The requested URL /admin/ was not found on this server.</p>
++<h1>Not Found</h1><p>The requested URL /adminfoo/ was not found on this server.</p>
 \ No newline at end of file
 '''.lstrip()
 

diff --git a/responses/test_response.content b/responses/test_response.content
@@ -0,0 +1 @@
+<h1>Not Found</h1><p>The requested resource was not found on this server.</p>
diff --git a/responses/test_response.metadata b/responses/test_response.metadata
@@ -0,0 +1,3 @@
+{
+    "status_code": 404
+}
diff --git a/setup.py b/setup.py
@@ -12,7 +12,7 @@ def read(fname):
 
 setup(
     name='django-responsediff',
-    version='0.7.11',
+    version='0.8.0',
     description='HTTP response diffing against fixtures for testing',
     author='James Pic',
     author_email='jamespic@gmail.com',

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,36,py}-dj{111,20}
+envlist = py{37,py}-dj{21}
 
 [testenv]
 usedevelop = true
@@ -21,12 +21,11 @@ deps =
     pytest-cov
     mock
     coverage
-    dj111: Django>=1.11,<2.0
-    dj20: Django>=2.0,<2.1
+    dj21: Django>=2.1,<2.2
 setenv =
     PIP_ALLOW_EXTERNAL=true
     DJANGO_SETTINGS_MODULE=responsediff.tests.project.settings
-passenv = TEST_* DBDIFF_*
+passenv = TEST_* DBDIFF_* FIXTURE_*
 
 [testenv:qa]
 basepython = python2.7
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		"""Basic HTTP response diff-ing for test purposes."""
		from .response import Response # noqa
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<h1>Not Found</h1><p>The requested resource was not found on this server.</p>