Merge branch 'release/1.4.6'

Author: vmalloc

.gitignore

@@ -7,3 +7,4 @@ flycheck-*
 dist
 .env
 /.cache
+/.pytest_cache

.travis.yml

@@ -1,11 +1,11 @@
 language: python
+dist: xenial
 sudo: false
 python:
 - '2.7'
-- '3.3'
-- '3.4'
 - '3.5'
-- pypy
+- '3.6'
+- '3.7'
 install:
 - pip install virtualenv
 script:

flask_loopback/flask_loopback.py

@@ -77,6 +77,8 @@ def handle_request(self, session, url, request):
                     return e.response
 
             self._test_client.cookie_jar.clear()
+            for cookie in request._cookies:
+                self._test_client.cookie_jar.set_cookie(cookie)
             resp = self._test_client.open(path, **open_kwargs)
             returned = requests.Response()
             assert returned.url is None

tests/conftest.py

@@ -7,89 +7,113 @@
 from flask_loopback._compat import gzip_compress
 from urlobject import URLObject as URL
 
+_COOKIE_NAME = "__SOME_COOKIE_NAME__"
+_COOKIE_VALUE = "__SOME_COOKIE_VALUE__"
+
 
 @pytest.fixture
-def active_app(request, app, ssl_port, non_ssl_port, hostname):
+def active_app(
+    request, app, ssl_port, non_ssl_port, hostname
+):  # pylint: disable=redefined-outer-name
     app.activate_address((hostname, ssl_port), ssl=True)
     app.activate_address((hostname, non_ssl_port), ssl=False)
+
     @request.addfinalizer
-    def cleanup():
+    def cleanup():  # pylint: disable=unused-variable
         app.deactivate_address((hostname, ssl_port))
         app.deactivate_address((hostname, non_ssl_port))
 
+
 @pytest.fixture
 def app():
     returned = Flask(__name__)
 
     @returned.route("/echo", methods=["post"])
-    def echo():                 # pylint: disable=unused-variable
-        return jsonify({
-            "result": True,
-            })
+    def echo():  # pylint: disable=unused-variable
+        return jsonify({"result": True})
 
-    @returned.route('/request_vars')
-    def get_request_vars():     # pylint: disable=unused-variable
-        return jsonify(dict(
-            (name, getattr(request, name))
-            for name in ['host']))
+    @returned.route("/request_vars")
+    def get_request_vars():  # pylint: disable=unused-variable
+        return jsonify(dict((name, getattr(request, name)) for name in ["host"]))
 
-
-    @returned.route('/set_cookie')
-    def set_cookie():           # pylint: disable=unused-variable
+    @returned.route("/set_cookie")
+    def set_cookie():  # pylint: disable=unused-variable
         returned = jsonify({})
-        returned.set_cookie('x', value='y')
+        returned.set_cookie(_COOKIE_NAME, value=_COOKIE_VALUE)
         return returned
 
-    @returned.route('/assert_no_cookies')
-    def assert_no_cookies():    # pylint: disable=unused-variable
+    @returned.route("/assert_no_cookies")
+    def assert_no_cookies():  # pylint: disable=unused-variable
         assert not request.cookies
         return jsonify({"result": "ok"})
 
+    @returned.route("/assert_cookies")
+    def assert_cookies():  # pylint: disable=unused-variable
+        assert request.cookies[_COOKIE_NAME] == _COOKIE_VALUE
+        return jsonify({})
 
-    @returned.route('/set_cookie_on_after_request')
-    def set_cookie_on_after_request(): # pylint: disable=unused-variable
-        g.cookies.append(('x', 'y'))
+    @returned.route("/set_cookie_on_after_request")
+    def set_cookie_on_after_request():  # pylint: disable=unused-variable
+        g.cookies.append((_COOKIE_NAME, _COOKIE_VALUE))
         return jsonify({})
 
-    @returned.route('/stream_upload', methods=['POST'])
-    def stream_upload():        # pylint: disable=unused-variable
+    @returned.route("/stream_upload", methods=["POST"])
+    def stream_upload():  # pylint: disable=unused-variable
         return hashlib.sha512(request.stream.read()).hexdigest()
 
-    @returned.route('/compressed')
-    def compressed():        # pylint: disable=unused-variable
-        orig = 'uncompressed!'.encode('utf-8')
-        return Response(gzip_compress(orig), headers={'Content-Encoding': 'gzip'})
-
+    @returned.route("/compressed")
+    def compressed():  # pylint: disable=unused-variable
+        orig = "uncompressed!".encode("utf-8")
+        return Response(gzip_compress(orig), headers={"Content-Encoding": "gzip"})
 
     @returned.before_request
-    def before():
+    def before():  # pylint: disable=unused-variable
         g.cookies = []
 
     @returned.after_request
-    def after_request(response):
-        cookies = getattr(g, 'cookies', [])
+    def after_request(response):  # pylint: disable=unused-variable
+        cookies = getattr(g, "cookies", [])
         while cookies:
             response.set_cookie(*cookies.pop())
 
         return response
 
-
     return FlaskLoopback(returned)
 
+
 @pytest.fixture
 def ssl_port():
     return 10443
 
+
 @pytest.fixture
 def non_ssl_port():
     return 10080
 
+
 @pytest.fixture
 def hostname():
     return "some-nonexistant-hostname.localdomain"
 
+
 @pytest.fixture(params=[True, False])
-def url(request, hostname, ssl_port, non_ssl_port):
+def url(
+    request, hostname, ssl_port, non_ssl_port
+):  # pylint: disable=redefined-outer-name
     with_ssl = request.param
 
-    return URL('http{0}://{1}:{2}'.format('s' if with_ssl else '', hostname, ssl_port if with_ssl else non_ssl_port))
+    return URL(
+        "http{0}://{1}:{2}".format(
+            "s" if with_ssl else "", hostname, ssl_port if with_ssl else non_ssl_port
+        )
+    )
+
+
+@pytest.fixture
+def cookie_name():
+    return _COOKIE_NAME
+
+
+@pytest.fixture
+def cookie_value():
+    return _COOKIE_VALUE

tests/test_cookies.py

@@ -5,21 +5,27 @@
 
 @pytest.mark.parametrize('path', ['set_cookie', 'set_cookie_on_after_request'])
 @pytest.mark.parametrize('with_session', [True, False])
-def test_cookies(active_app, url, path, with_session):
+def test_cookies(active_app, url, path, with_session, cookie_name, cookie_value):
     url = url.add_path(path)
     if with_session:
         session = requests.Session()
         resp = session.get(url)
     else:
         resp = requests.get(url)
     resp.raise_for_status()
-    assert resp.cookies['x'] == 'y'
+    assert resp.cookies[cookie_name] == cookie_value
     if with_session:
-        assert session.cookies['x'] == 'y'
+        assert session.cookies[cookie_name] == cookie_value
 
 
 def test_client_forgets_cookies(active_app, url):
     resp = requests.get(url.add_path('set_cookie'))
     resp.raise_for_status()
 
     requests.get(url.add_path('assert_no_cookies')).raise_for_status()
+
+
+def test_client_session_remembers_cookies(active_app, url):
+    s = requests.Session()
+    s.get(url.add_path('set_cookie'))
+    s.get(url.add_path('assert_cookies')).raise_for_status()