Merge branch 'master' of github.com:michael-lazar/flask-gopher

michael-lazar · Jan 19, 2019 · d4a056b · d4a056b
2 parents 08fa636 + 2210728
commit d4a056b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,10 +3,9 @@ sudo: required
 dist: xenial
 
 env:
-  - FLASK=1.0
-  - FLASK=0.12
   - FLASK=0.11
-  - FLASK=0.10
+  - FLASK=0.12
+  - FLASK=1.0
 
 python:
   - 3.4

diff --git a/setup.py b/setup.py
@@ -28,7 +28,7 @@ def long_description():
     include_package_data=True,
     platforms='any',
     install_requires=[
-        'Flask',
+        'Flask>=0.11',
         # pyfiglet v0.8.0 removes a bunch of fonts due to licensing issues :(
         'pyfiglet<=0.7.6',
         'tabulate',

diff --git a/tests/test_flask_gopher.py b/tests/test_flask_gopher.py
@@ -88,7 +88,7 @@ def external_menu_url():
 
         @app.route('/query')
         def query():
-            return 'query: ' + json.dumps(dict(request.args))
+            return 'query: ' + json.dumps(dict(request.args.items()))
 
         @app.route('/search')
         def search():
@@ -180,7 +180,7 @@ def test_query_string(self):
         resp = self.send_data(b'/query\r\n')
         self.assertEqual(resp, b'query: {}')
         resp = self.send_data(b'/query?city=Grand%20Rapids\r\n')
-        self.assertEqual(resp, b'query: {"city": ["Grand Rapids"]}')
+        self.assertEqual(resp, b'query: {"city": "Grand Rapids"}')
 
     def test_search(self):
         """