Merge branch 'master' into gg-EnterEndEditingTitle

apache · Jul 15, 2017 · 80ce199 · 80ce199
2 parents 39a9f77 + e834154
commit 80ce199
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/superset/views/core.py b/superset/views/core.py
@@ -1374,7 +1374,7 @@ def testconn(self):
                 .get('connect_args', {}))
             engine = create_engine(uri, connect_args=connect_args)
             engine.connect()
-            return json.dumps(engine.table_names(), indent=4)
+            return json_success(json.dumps(engine.table_names(), indent=4))
         except Exception as e:
             logging.exception(e)
             return json_error_response((

diff --git a/tests/core_tests.py b/tests/core_tests.py
@@ -284,6 +284,7 @@ def test_testconn(self):
         })
         response = self.client.post('/superset/testconn', data=data, content_type='application/json')
         assert response.status_code == 200
+        assert response.headers['Content-Type'] == 'application/json'
 
         # validate that the endpoint works with the decrypted sqlalchemy uri
         data = json.dumps({
@@ -292,6 +293,7 @@ def test_testconn(self):
         })
         response = self.client.post('/superset/testconn', data=data, content_type='application/json')
         assert response.status_code == 200
+        assert response.headers['Content-Type'] == 'application/json'
 
     def test_databaseview_edit(self, username='admin'):
         # validate that sending a password-masked uri does not over-write the decrypted uri