bugfix getallapps

backend/app/tests/conftest.py

@@ -70,7 +70,7 @@ def password():
     return "password"
 
 @pytest.fixture(scope="session")
-def user(password,test_tenant_id):
+def user(test_db,password,test_tenant_id):
     user = models.User(
         email = "user@test.com",
         first_name = "user",
@@ -80,10 +80,13 @@ def user(password,test_tenant_id):
         is_superuser = False,
         tenantid = test_tenant_id
     )
-    return user
+    test_db.add(user)
+    test_db.commit()
+    test_db.refresh(user)
+    return user.__dict__
 
 @pytest.fixture(scope="session")
-def admin(password,test_tenant_id):
+def admin(test_db,password,test_tenant_id):
     user = models.User(
         email = "admin@test.com",
         first_name = "admin",
@@ -93,22 +96,25 @@ def admin(password,test_tenant_id):
         is_superuser = True,
         tenantid =test_tenant_id
     )
-    return user
-
-@pytest.fixture(scope="session")
-def login_user(test_db,test_client,user,password):
     test_db.add(user)
     test_db.commit()
     test_db.refresh(user)
-    response = test_client.post("/api/token", data={"username": user.email, "password":password })
+    return user.__dict__
+
+@pytest.fixture(scope="session")
+def login_user(test_db,test_client,user,password):
+    # test_db.add(user)
+    # test_db.commit()
+    #test_db.refresh(user)
+    response = test_client.post("/api/token", data={"username": user["email"], "password":password })
     return response.json()["access_token"]
 
 @pytest.fixture(scope="session")
 def login_admin(test_db,test_client,admin,password):
-    test_db.add(admin)
-    test_db.commit()
-    test_db.refresh(admin)
-    response = test_client.post("/api/token", data={"username": admin.email, "password":password })
+    # test_db.add(admin)
+    # test_db.commit()
+    #test_db.refresh(admin)
+    response = test_client.post("/api/token", data={"username": admin["email"], "password":password })
     return response.json()["access_token"]
 
 @pytest.fixture(scope="session")

backend/app/tests/test_user.py

@@ -1,4 +1,5 @@
 
+import logging
 def test_users_list(test_client,login_user):
 
     response = test_client.get("/api/v1/users", headers={"Authorization": "Bearer " + login_user})
@@ -12,7 +13,7 @@ def test_users_list_for_admin(test_client,login_admin):
     assert response.status_code == 200
     data = response.json()
     assert "data" in data
-    assert len(data["data"]) == 3  
+    assert len(data["data"]) == 3 
 
 def test_user_create(test_client,login_user):
     user_data = {
@@ -24,8 +25,9 @@ def test_user_create(test_client,login_user):
         "is_superuser": False
     }
     response = test_client.post("/api/v1/users", json=user_data, headers={"Authorization": "Bearer " + login_user})
-    assert response.status_code == 200
     data = response.json()
+    logging.error(data)
+    assert response.status_code == 200
     assert "data" in data
     assert data["data"] is not None
     assert data["data"]["id"] > 0
@@ -59,8 +61,9 @@ def test_admin_create_for_admin(test_client,login_admin):
         "is_superuser": True
     }
     response = test_client.post("/api/v1/users", json=user_data, headers={"Authorization": "Bearer " + login_admin})
-    assert response.status_code == 200
     data = response.json()
+    logging.error(data)
+    assert response.status_code == 200
     assert "data" in data
     assert data["data"] is not None
     assert data["data"]["id"] > 0
@@ -70,22 +73,23 @@ def test_admin_create_for_admin(test_client,login_admin):
     assert data["data"]["is_active"] == user_data["is_active"] 
     assert data["data"]["is_superuser"] == user_data["is_superuser"] 
 
-def test_user_details(test_client, login_user_id, login_user,user):
+def test_user_details(test_client,login_user_id, login_user,user):
     id = login_user_id
     response = test_client.get("/api/v1/users/"+ str(id), headers={"Authorization": "Bearer " + login_user})
-    assert response.status_code == 200
     data = response.json()
-    assert data["data"]["email"] ==user.email
-    assert data["data"]["first_name"] == user.first_name
-    assert data["data"]["last_name"] == user.last_name
-    assert data["data"]["is_active"] == user.is_active
-    assert data["data"]["is_superuser"] == user.is_superuser
+    logging.error(data)
+    assert response.status_code == 200
+    assert data["data"]["email"] == user["email"]
+    assert data["data"]["first_name"] == user["first_name"]
+    assert data["data"]["last_name"] == user["last_name"]
+    assert data["data"]["is_active"] == user["is_active"]
+    assert data["data"]["is_superuser"] == user["is_superuser"]
     assert data["data"]["id"] == id
 
 def test_user_edit(test_client, login_user_id,login_user,user):
     id = login_user_id
     user_data = {
-        "email": user.email,
+        "email": user["email"],
         "first_name": "Updated",
         "last_name": "test",
         "is_active": True,
@@ -95,10 +99,10 @@ def test_user_edit(test_client, login_user_id,login_user,user):
 
     assert response.status_code == 200
     data = response.json()
-    assert data["data"]["email"] == user.email
+    assert data["data"]["email"] == user["email"]
     assert data["data"]["first_name"] == user_data["first_name"] 
     assert data["data"]["last_name"] == user_data["last_name"] 
-    assert data["data"]["is_active"] == user.is_active
+    assert data["data"]["is_active"] == user["is_active"]
     assert data["data"]["id"] == id
 
 def test_user_delete(test_client, login_user):

backend/app/tests/test_user_kintone.py

@@ -0,0 +1,9 @@
+import logging
+def test_get_allapps(test_client,test_domain,login_user):
+    response = test_client.get("/api/v1/allapps", headers={"Authorization": "Bearer " + login_user})
+    data = response.json()
+    logging.error(data)
+    assert response.status_code == 200
+    assert "apps" in data
+    assert data["apps"] is not None
+    assert len(data["apps"]) > 0