Add tests for validation

whole-tale · Sep 10, 2018 · bb308a6 · bb308a6
1 parent c17050b
commit bb308a6
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 2 deletions.
diff --git a/plugin_tests/tale_test.py b/plugin_tests/tale_test.py
@@ -9,14 +9,16 @@
 
 
 SCRIPTDIRS_NAME = None
+DATADIRS_NAME = None
 
 
 def setUpModule():
     base.enabledPlugins.append('wholetale')
     base.startServer()
 
-    global SCRIPTDIRS_NAME
-    from girder.plugins.wholetale.constants import SCRIPTDIRS_NAME
+    global SCRIPTDIRS_NAME, DATADIRS_NAME
+    from girder.plugins.wholetale.constants import \
+        SCRIPTDIRS_NAME, DATADIRS_NAME
 
 
 def tearDownModule():
@@ -449,6 +451,55 @@ def testTaleNarrative(self):
             user=self.admin)
         self.assertStatusOk(resp)
 
+    def testTaleValidation(self):
+        resp = self.request(
+            path='/resource/lookup', method='GET', user=self.user,
+            params={'path': '/user/{login}/Home'.format(**self.user)})
+        home_dir = resp.json
+        resp = self.request(
+            path='/folder', method='POST', user=self.user, params={
+                'name': 'validate_my_narrative', 'parentId': home_dir['_id']
+            })
+        sub_home_dir = resp.json
+        Item().createItem('notebook.ipynb', self.user, sub_home_dir)
+
+        resp = self.request(
+            path='/resource/lookup', method='GET', user=self.user,
+            params={'path': '/user/{login}/Data'.format(**self.user)})
+        data_dir = resp.json
+        resp = self.request(
+            path='/folder', method='POST', user=self.user, params={
+                'name': 'my_fake_data', 'parentId': data_dir['_id']
+            })
+        sub_data_dir = resp.json
+        Item().createItem('data.dat', self.user, sub_data_dir)
+
+        # Mock old format
+        tale = {
+            "config": None,
+            "creatorId": self.user['_id'],
+            "description": "Fake Tale",
+            "folderId": data_dir['_id'],
+            "imageId": "5873dcdbaec030000144d233",
+            "public": True,
+            "published": False,
+            "title": "Fake Unvalidated Tale"
+        }
+        tale = self.model('tale', 'wholetale').save(tale)  # get's id
+        tale = self.model('tale', 'wholetale').save(tale)  # migrate to new format
+
+        path = os.path.join(
+            '/collection', DATADIRS_NAME, DATADIRS_NAME, str(tale['_id']))
+        resp = self.request(
+            path='/resource/lookup', method='GET', user=self.user,
+            params={'path': path})
+        self.assertStatusOk(resp)
+        new_data_dir = resp.json
+        self.assertEqual(str(tale['folderId']), str(new_data_dir['_id']))
+        self.assertEqual(tale['involatileData'],
+                         [{'id': str(data_dir['_id']), 'type': 'folder'}])
+        self.model('tale', 'wholetale').remove(tale)
+
     def tearDown(self):
         self.model('user').remove(self.user)
         self.model('user').remove(self.admin)

diff --git a/server/models/tale.py b/server/models/tale.py
@@ -45,6 +45,10 @@ def initialize(self):
     def validate(self, tale):
         if 'iframe' not in tale:
             tale['iframe'] = False
+
+        if '_id' not in tale:
+            return tale
+
         if tale.get('format', 0) < 2:
             data_folder = getOrCreateRootFolder(DATADIRS_NAME)
             try: