Update model_util.create_token; update tests

Author: acrellin

cesium_app/model_util.py

@@ -58,12 +58,13 @@ def insert_test_data():
         models.DBSession().commit()
 
 
-def create_token_user(bot_name, project_ids):
-    u = models.User(username=bot_name)
-    p = models.Project.query.filter(models.Project.id.in_(project_ids)).all()
-    u.projects.extend(p)
-    t = models.Token(user=u)
-    models.DBSession().add_all([u, t])
+def create_token(permissions, created_by_id, name):
+    t = models.Token(permissions=permissions, name=name)
+    u = models.User.query.get(created_by_id)
+    u.tokens.append(t)
+    t.created_by = u
+    models.DBSession().add(u)
+    models.DBSession().add(t)
     models.DBSession().commit()
     return t.id
 

cesium_app/tests/frontend/test_predict.py

@@ -11,7 +11,7 @@
 import json
 import subprocess
 import glob
-from cesium_app.model_util import create_token_user
+from cesium_app.model_util import create_token
 from baselayer.app.config import load_config
 
 
@@ -237,23 +237,24 @@ def test_download_prediction_csv_regr(driver, project, dataset, featureset,
 
 
 def test_predict_specific_ts_name(driver, project, dataset, featureset, model):
-    auth_token = create_token_user(uuid.uuid4(), [project.id])
+    user = project.users[0]
+    token = create_token([], user.id, str(uuid.uuid4()))
 
     ts_data = [[1, 2, 3, 4], [32.2, 53.3, 32.3, 32.52], [0.2, 0.3, 0.6, 0.3]]
     impute_kwargs = {'strategy': 'constant', 'value': None}
     data = {'datasetID': dataset.id,
             'ts_names': ['217801'],
-            'modelID': model.id,
-            'token': auth_token}
+            'modelID': model.id}
     response = driver.request(
         'POST', '{}/predictions'.format(driver.server_url),
-        json=data).json()
+        json=data, headers={'Authorization': f'token {token}'}).json()
     assert response['status'] == 'success'
 
     for i in range(10):
-        pred_info = driver.request('GET', '{}/predictions/{}'.format(
-            driver.server_url, response['data']['id']),
-                                   json={'token': auth_token}).json()
+        pred_info = driver.request(
+            'GET', '{}/predictions/{}'.format(
+                driver.server_url, response['data']['id']),
+            headers={'Authorization': f'token {token}'}).json()
         if pred_info['status'] == 'success' and pred_info['data']['finished']:
             break
         time.sleep(1)

cesium_app/tests/frontend/test_tooltips.py

@@ -11,23 +11,23 @@ def test_tab_tooltips(driver, project):
     hover = ActionChains(driver).move_to_element(
         driver.find_element_by_id('react-tabs-0'))
     hover.perform()
-    time.sleep(1)
+    time.sleep(1.5)
     assert driver.find_element_by_xpath(
         "//span[contains(text(),'Manage your projects')]"
     ).is_displayed()
 
     hover = ActionChains(driver).move_to_element(
         driver.find_element_by_id('react-tabs-2'))
     hover.perform()
-    time.sleep(1)
+    time.sleep(1.5)
     assert driver.find_element_by_xpath(
         "//span[contains(text(),'Upload your time-series data')]"
         ).is_displayed()
 
     hover = ActionChains(driver).move_to_element(
         driver.find_element_by_id('react-tabs-4'))
     hover.perform()
-    time.sleep(1)
+    time.sleep(1.5)
     assert driver.find_element_by_xpath(
         "//span[contains(text(),'Generate features from your time-series data')]"
     ).is_displayed()