WIP on libraries upgrade

2018-07-12 15:23:57 +02:00
parent 49075cbc60
commit 549cf0a3e8
29 changed files with 177 additions and 148 deletions
--- a/tests/test_api/test_project_merging.py
+++ b/tests/test_api/test_project_merging.py
@@ -31,8 +31,8 @@ class ProjectMergerTest(AbstractPillarTest):
        with self.app.app_context():
            merging.merge_project(self.pid_from, self.pid_to)

-        db_file = self.get(f'/api/files/{fid}').json()
-        db_node = self.get(f'/api/nodes/{nid}').json()
+        db_file = self.get(f'/api/files/{fid}').get_json()
+        db_node = self.get(f'/api/nodes/{nid}').get_json()

        self.assertEqual(db_file['project'], str(self.pid_to))
        self.assertEqual(db_node['project'], str(self.pid_to))