opolka/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Activity

Update opolka/ScoDoc from ScoDoc/ScoDoc #2

Merged
opolka merged 1272 commits from ScoDoc/ScoDoc:master into master 2024-05-27 09:11:04 +02:00
Conversation 0 Commits 1272 Files Changed 656 +28 -14
3 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e415a5255e - Show all commits

2
app/models/evaluations.py
View File

@ -184,7 +184,7 @@ class Evaluation(db.Model):
# ScoDoc7 output_formators # ScoDoc7 output_formators
e_dict["evaluation_id"] = self.id e_dict["evaluation_id"] = self.id
e_dict["date_debut"] = self.date_debut.isoformat() if self.date_debut else None e_dict["date_debut"] = self.date_debut.isoformat() if self.date_debut else None
e_dict["date_fin"] = self.date_debut.isoformat() if self.date_fin else None e_dict["date_fin"] = self.date_fin.isoformat() if self.date_fin else None
e_dict["numero"] = self.numero or 0 e_dict["numero"] = self.numero or 0
e_dict["poids"] = self.get_ue_poids_dict() # { ue_id : poids } e_dict["poids"] = self.get_ue_poids_dict() # { ue_id : poids }

2
sco_version.py
View File

@ -1,7 +1,7 @@
# -*- mode: python -*- # -*- mode: python -*-
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
SCOVERSION = "9.6.80" SCOVERSION = "9.6.81"
SCONAME = "ScoDoc" SCONAME = "ScoDoc"

32
tests/api/setup_test_api.py
View File

@ -15,8 +15,18 @@ Utilisation :
""" """
import os import os
import requests import requests
from dotenv import load_dotenv
import pytest try:
from dotenv import load_dotenv
except ModuleNotFoundError:
print("\nWarning: dotenv not installed, ignoring .env")
print("You may install it using:\npip install python-dotenv\n")
load_dotenv = None
try:
import pytest
except ModuleNotFoundError:
print("pytest not installed\n")
pytest = None
# --- Lecture configuration (variables d'env ou .env) # --- Lecture configuration (variables d'env ou .env)
try: try:
@ -24,9 +34,11 @@ try:
except NameError: except NameError:
BASEDIR = "/opt/scodoc/tests/api" BASEDIR = "/opt/scodoc/tests/api"
load_dotenv(os.path.join(BASEDIR, ".env")) if load_dotenv:
load_dotenv(os.path.join(BASEDIR, ".env"))
CHECK_CERTIFICATE = bool(os.environ.get("CHECK_CERTIFICATE", False)) CHECK_CERTIFICATE = bool(os.environ.get("CHECK_CERTIFICATE", False))
SCODOC_URL = os.environ["SCODOC_URL"] or "http://localhost:5000" SCODOC_URL = os.environ.get("SCODOC_URL") or "http://localhost:5000"
API_URL = SCODOC_URL + "/ScoDoc/api" API_URL = SCODOC_URL + "/ScoDoc/api"
API_USER = os.environ.get("API_USER", "test") API_USER = os.environ.get("API_USER", "test")
API_PASSWORD = os.environ.get("API_PASSWORD", os.environ.get("API_PASSWD", "test")) API_PASSWORD = os.environ.get("API_PASSWORD", os.environ.get("API_PASSWD", "test"))
@ -36,6 +48,7 @@ DEPT_ACRONYM = "TAPI"
SCO_TEST_API_TIMEOUT = 5 SCO_TEST_API_TIMEOUT = 5
print(f"SCODOC_URL={SCODOC_URL}") print(f"SCODOC_URL={SCODOC_URL}")
print(f"API URL={API_URL}") print(f"API URL={API_URL}")
print(f"API_USER={API_USER}")
class APIError(Exception): class APIError(Exception):
@ -53,14 +66,15 @@ def get_auth_headers(user, password) -> dict:
return {"Authorization": f"Bearer {token}"} return {"Authorization": f"Bearer {token}"}
@pytest.fixture if pytest:
def api_headers() -> dict:
@pytest.fixture
def api_headers() -> dict:
"""Jeton, utilisateur API ordinaire""" """Jeton, utilisateur API ordinaire"""
return get_auth_headers(API_USER, API_PASSWORD) return get_auth_headers(API_USER, API_PASSWORD)
@pytest.fixture
@pytest.fixture def api_admin_headers() -> dict:
def api_admin_headers() -> dict:
"""Jeton, utilisateur API SuperAdmin""" """Jeton, utilisateur API SuperAdmin"""
return get_auth_headers(API_USER_ADMIN, API_PASSWORD_ADMIN) return get_auth_headers(API_USER_ADMIN, API_PASSWORD_ADMIN)