Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
75085f240c | |||
2c781dec6c | |||
ecfa344904 |
@ -1,13 +0,0 @@
|
||||
# SPDX-FileCopyrightText: WTF Kooperative eG <https://wtf-eg.de/>
|
||||
#
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
*
|
||||
!Pipfile
|
||||
!Pipfile.lock
|
||||
!data/
|
||||
!ki/
|
||||
!LICENSES/
|
||||
!migrations/
|
||||
!app.py
|
||||
!run_prod.py
|
38
.drone.yml
38
.drone.yml
@ -15,28 +15,15 @@ trigger:
|
||||
|
||||
steps:
|
||||
- name: install-lint-test
|
||||
image: python:3.9.21-alpine@sha256:f2f6a5627a879693b8c23e04df0b1a6aae3e09c165fa2a08f5c64b2b54c58d3c
|
||||
env:
|
||||
PYROOT: '/pyroot'
|
||||
PYTHONUSERBASE: '/pyroot'
|
||||
image: git.wtf-eg.de/kompetenzinventar/builder:1.0.2
|
||||
commands:
|
||||
- apk add --no-cache gcc g++ musl-dev python3-dev
|
||||
- pip3 install pipenv
|
||||
- pipenv verify
|
||||
- pipenv install --dev
|
||||
- pipenv run flake8
|
||||
- pipenv run reuse lint
|
||||
- SQLALCHEMY_DATABASE_URI=sqlite:// pipenv run python -m unittest discover ki
|
||||
- name: docker-dry-run
|
||||
image: plugins/docker:20.18.6@sha256:59c993e3c4e6c097a0e2d274419aac0d7d8e929773f0ba1af44078e54389834f
|
||||
settings:
|
||||
registry: git.wtf-eg.de
|
||||
repo: git.wtf-eg.de/kompetenzinventar/backend
|
||||
target: ki-backend
|
||||
dry_run: true
|
||||
when:
|
||||
event:
|
||||
- pull_request
|
||||
- pipenv run python -m unittest discover ki
|
||||
|
||||
image_pull_secrets:
|
||||
- dockerconfig
|
||||
|
||||
---
|
||||
kind: pipeline
|
||||
@ -54,7 +41,7 @@ depends_on:
|
||||
|
||||
steps:
|
||||
- name: docker-publish
|
||||
image: plugins/docker:20.18.6@sha256:59c993e3c4e6c097a0e2d274419aac0d7d8e929773f0ba1af44078e54389834f
|
||||
image: plugins/docker
|
||||
settings:
|
||||
registry: git.wtf-eg.de
|
||||
repo: git.wtf-eg.de/kompetenzinventar/backend
|
||||
@ -81,7 +68,7 @@ depends_on:
|
||||
|
||||
steps:
|
||||
- name: deploy-dev
|
||||
image: appleboy/drone-ssh:1.7.5@sha256:995677e073454912f26d4c0fdd2f9df2e1f5a30d6603d3f2ece667311b6babb3
|
||||
image: appleboy/drone-ssh
|
||||
settings:
|
||||
host:
|
||||
- dev01.wtf-eg.net
|
||||
@ -104,19 +91,14 @@ trigger:
|
||||
|
||||
steps:
|
||||
- name: install-lint-test
|
||||
image: python:3.9.21-alpine@sha256:f2f6a5627a879693b8c23e04df0b1a6aae3e09c165fa2a08f5c64b2b54c58d3c
|
||||
env:
|
||||
PYROOT: '/pyroot'
|
||||
PYTHONUSERBASE: '/pyroot'
|
||||
image: git.wtf-eg.de/kompetenzinventar/builder:1.0.2
|
||||
commands:
|
||||
- apk add --no-cache gcc g++ musl-dev python3-dev
|
||||
- pip3 install pipenv
|
||||
- pipenv install --dev
|
||||
- pipenv run flake8
|
||||
- pipenv run reuse lint
|
||||
- SQLALCHEMY_DATABASE_URI=sqlite:// pipenv run python -m unittest discover ki
|
||||
- pipenv run python -m unittest discover ki
|
||||
- name: docker-publish
|
||||
image: plugins/docker:20.18.6@sha256:59c993e3c4e6c097a0e2d274419aac0d7d8e929773f0ba1af44078e54389834f
|
||||
image: plugins/docker
|
||||
settings:
|
||||
registry: git.wtf-eg.de
|
||||
repo: git.wtf-eg.de/kompetenzinventar/backend
|
||||
|
@ -1 +0,0 @@
|
||||
3.9.21
|
12
.reuse/dep5
Normal file
12
.reuse/dep5
Normal file
@ -0,0 +1,12 @@
|
||||
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
|
||||
Upstream-Name: Kompetenzinventar
|
||||
Upstream-Contact: Michael Weimann <mail@michael-weimann.eu>
|
||||
Source: https://git.wtf-eg.de/kompetenzinventar/ki-backend
|
||||
|
||||
Files: data/imgs/flags/*
|
||||
Copyright: 2013 Panayiotis Lipiridis <https://flagicons.lipis.dev/>
|
||||
License: MIT
|
||||
|
||||
Files: Pipfile.lock migrations/*
|
||||
Copyright: WTF Kooperative eG <https://wtf-eg.de/>
|
||||
License: AGPL-3.0-or-later
|
17
Dockerfile
17
Dockerfile
@ -2,17 +2,7 @@
|
||||
#
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
FROM python:3.9.21-alpine@sha256:f2f6a5627a879693b8c23e04df0b1a6aae3e09c165fa2a08f5c64b2b54c58d3c AS builder
|
||||
|
||||
ENV PYROOT=/pyroot
|
||||
ENV PYTHONUSERBASE=$PYROOT
|
||||
|
||||
RUN apk add --no-cache \
|
||||
gcc \
|
||||
g++ \
|
||||
musl-dev \
|
||||
python3-dev && \
|
||||
pip3 install pipenv
|
||||
FROM git.wtf-eg.de/kompetenzinventar/builder:1.0.2 as builder
|
||||
|
||||
COPY Pipfile* ./
|
||||
|
||||
@ -20,10 +10,7 @@ RUN PIP_USER=1 PIP_IGNORE_INSTALLED=1 pipenv install --system --deploy --ignore-
|
||||
RUN pip3 uninstall --yes pipenv
|
||||
|
||||
|
||||
FROM python:3.9.21-alpine@sha256:f2f6a5627a879693b8c23e04df0b1a6aae3e09c165fa2a08f5c64b2b54c58d3c AS ki-backend
|
||||
|
||||
ENV PYROOT=/pyroot
|
||||
ENV PYTHONUSERBASE=$PYROOT
|
||||
FROM git.wtf-eg.de/kompetenzinventar/base:1.0.2 as ki-backend
|
||||
|
||||
# Install six explicitly. Otherwise Python complains about it missing.
|
||||
RUN pip3 install six
|
||||
|
34
Pipfile
34
Pipfile
@ -8,26 +8,26 @@ verify_ssl = true
|
||||
name = "pypi"
|
||||
|
||||
[packages]
|
||||
flask = "==2.3.3"
|
||||
python-dotenv = "==1.0.1"
|
||||
flask-migrate = "==4.0.7"
|
||||
flask-sqlalchemy = "==3.1.1"
|
||||
sqlalchemy = "==2.0.36"
|
||||
waitress = "==2.1.2"
|
||||
pyyaml = "==6.0.2"
|
||||
flask-cors = "==5.0.0"
|
||||
ldap3 = "==2.9.1"
|
||||
pymysql = "==1.1.1"
|
||||
werkzeug = "==2.3.8"
|
||||
flask = "~=3.0.0"
|
||||
python-dotenv = "~=0.17.1"
|
||||
flask-migrate = "~=4.0.5"
|
||||
flask-sqlalchemy = "~=3.1.1"
|
||||
sqlalchemy = "~=2.0.25"
|
||||
waitress = "~=2.1.2"
|
||||
pyyaml = "~=6.0.1"
|
||||
flask-cors = "~=4.0.0"
|
||||
ldap3 = "~=2.9.1"
|
||||
pymysql = "~=1.1.0"
|
||||
werkzeug = "~=3.0.1"
|
||||
|
||||
[dev-packages]
|
||||
flake8 = "==7.1.1"
|
||||
yapf = "==0.40.2"
|
||||
pre-commit = "==2.21.0"
|
||||
reuse = "==4.0.3"
|
||||
flake8 = "~=3.9.2"
|
||||
yapf = "~=0.40.2"
|
||||
pre-commit = "~=2.13.0"
|
||||
reuse = "~=0.13.0"
|
||||
|
||||
[requires]
|
||||
python_version = "3.9"
|
||||
python_version = "3.11"
|
||||
|
||||
[scripts]
|
||||
clean = "rm data/ki.sqlite"
|
||||
clean = "rm storage/ki.sqlite"
|
||||
|
1047
Pipfile.lock
generated
1047
Pipfile.lock
generated
File diff suppressed because it is too large
Load Diff
@ -39,7 +39,7 @@ Folgende Kanäle gibt es für die Kommunikation über das Kompetenzinventar:
|
||||
|
||||
### Abhängigkeiten
|
||||
|
||||
- Python 3.9
|
||||
- Python 3.8
|
||||
- [Pipenv](https://github.com/pypa/pipenv)
|
||||
|
||||
|
||||
|
24
REUSE.toml
24
REUSE.toml
@ -1,24 +0,0 @@
|
||||
# SPDX-FileCopyrightText: NONE
|
||||
# SPDX-License-Identifier: CC0-1.0
|
||||
|
||||
version = 1
|
||||
SPDX-PackageName = "Kompetenzinventar Backend"
|
||||
SPDX-PackageDownloadLocation = "https://git.wtf-eg.de/kompetenzinventar/ki-backend"
|
||||
|
||||
[[annotations]]
|
||||
path = "data/imgs/flags/**"
|
||||
precedence = "aggregate"
|
||||
SPDX-FileCopyrightText = "2013 Panayiotis Lipiridis <https://flagicons.lipis.dev/>"
|
||||
SPDX-License-Identifier = "MIT"
|
||||
|
||||
[[annotations]]
|
||||
path = ["Pipfile.lock", "migrations/**"]
|
||||
precedence = "aggregate"
|
||||
SPDX-FileCopyrightText = "WTF Kooperative eG <https://wtf-eg.de/>"
|
||||
SPDX-License-Identifier = "AGPL-3.0-or-later"
|
||||
|
||||
[[annotations]]
|
||||
path = ["renovate.json", ".python-version"]
|
||||
precedence = "aggregate"
|
||||
SPDX-FileCopyrightText = "WTF Kooperative eG <https://wtf-eg.de/>"
|
||||
SPDX-License-Identifier = "AGPL-3.0-or-later"
|
2
env.dev
2
env.dev
@ -2,7 +2,7 @@
|
||||
#
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
SQLALCHEMY_DATABASE_URI=sqlite:///storage/ki.sqlite
|
||||
SQLALCHEMY_DATABASE_URI=sqlite:///../storage/ki.sqlite
|
||||
|
||||
CORS_ORIGINS=*
|
||||
|
||||
|
3
.yapfignore → instance/storage/.gitignore
vendored
3
.yapfignore → instance/storage/.gitignore
vendored
@ -2,4 +2,5 @@
|
||||
#
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
migrations/*.py
|
||||
*
|
||||
!.gitignore
|
@ -88,73 +88,72 @@ def seed_user(auth_id,
|
||||
|
||||
|
||||
def seed(dev: bool):
|
||||
seed_contacttypes()
|
||||
|
||||
skill_seed_file_path = app.config["KI_DATA_DIR"] + "/seed_data/skills.csv"
|
||||
|
||||
app.logger.info("importing skills")
|
||||
|
||||
with open(skill_seed_file_path) as skills_file:
|
||||
skills_csv_reader = csv.DictReader(skills_file)
|
||||
|
||||
for skill in skills_csv_reader:
|
||||
id = int(skill["id"])
|
||||
db_skill = db.session.get(Skill, id)
|
||||
|
||||
if db_skill is None:
|
||||
db.session.add(Skill(id=int(skill["id"]), name=skill["name"]))
|
||||
|
||||
app.logger.info("importing languages")
|
||||
|
||||
iso_seed_file_path = app.config["KI_DATA_DIR"] + "/seed_data/iso_639_1.csv"
|
||||
|
||||
with open(iso_seed_file_path) as iso_file:
|
||||
iso_csv_reader = csv.DictReader(iso_file)
|
||||
|
||||
for iso in iso_csv_reader:
|
||||
id = iso["639-1"]
|
||||
db_language = db.session.get(Language, id)
|
||||
|
||||
if db_language is None:
|
||||
db.session.add(Language(id=iso["639-1"], name=iso["Sprache"]))
|
||||
|
||||
if dev:
|
||||
seed_user("klaus", visible=False)
|
||||
|
||||
for i in range(1, 20):
|
||||
seed_user(f"babsi{i}")
|
||||
|
||||
seed_user("peter",
|
||||
nickname="peternichtlustig",
|
||||
visible=False,
|
||||
pronouns="Herr Dr. Dr.",
|
||||
volunteerwork="Gartenverein",
|
||||
availability_status=True,
|
||||
availability_hours_per_week=42,
|
||||
availability_text="Immer",
|
||||
freetext="Ich mag Kaffee",
|
||||
skills=[(3, 3), (1, 5)],
|
||||
searchtopics=[3, 1],
|
||||
languages=[("de", 5), ("fr", 3)],
|
||||
address=("Peter Nichtlustig", "Waldweg", "23i", "Hinterhaus", "13337", "Bielefeld", "Deutschland"),
|
||||
contacts=[(4, "@peter:wtf-eg.de"), (1, "peter@wtf-eg.de")])
|
||||
|
||||
seed_user("dirtydieter",
|
||||
volunteerwork="Müll sammeln",
|
||||
availability_status=True,
|
||||
availability_hours_per_week=24,
|
||||
availability_text="Nur Nachts!",
|
||||
freetext="1001010010111!!!",
|
||||
skills=[(1, 5)],
|
||||
address=("Friedrich Witzig", "", "", "", "", "", ""))
|
||||
#all_skills = [(skill.id, 3) for skill in Skill.query.all()] # query causes problems
|
||||
#seed_user("jutta", languages=[("fr", 5)], skills=all_skills)
|
||||
|
||||
seed_user("giesela", skills=[(9, 3), (10, 5)])
|
||||
seed_user("bertha", visible=False, skills=[(11, 3), (10, 5)])
|
||||
seed_user("monique", languages=[("fr", 4)])
|
||||
print("seeding done")
|
||||
with app.app_context():
|
||||
seed_contacttypes()
|
||||
|
||||
skill_seed_file_path = app.config["KI_DATA_DIR"] + "/seed_data/skills.csv"
|
||||
|
||||
app.logger.info("importing skills")
|
||||
|
||||
with open(skill_seed_file_path) as skills_file:
|
||||
skills_csv_reader = csv.DictReader(skills_file)
|
||||
|
||||
for skill in skills_csv_reader:
|
||||
id = int(skill["id"])
|
||||
db_skill = db.session.get(Skill, id)
|
||||
|
||||
if db_skill is None:
|
||||
db.session.add(Skill(id=int(skill["id"]), name=skill["name"]))
|
||||
|
||||
app.logger.info("importing languages")
|
||||
|
||||
iso_seed_file_path = app.config["KI_DATA_DIR"] + "/seed_data/iso_639_1.csv"
|
||||
|
||||
with open(iso_seed_file_path) as iso_file:
|
||||
iso_csv_reader = csv.DictReader(iso_file)
|
||||
|
||||
for iso in iso_csv_reader:
|
||||
id = iso["639-1"]
|
||||
db_language = db.session.get(Language, id)
|
||||
|
||||
if db_language is None:
|
||||
db.session.add(Language(id=iso["639-1"], name=iso["Sprache"]))
|
||||
|
||||
if dev:
|
||||
seed_user("klaus", visible=False)
|
||||
|
||||
for i in range(1, 20):
|
||||
seed_user(f"babsi{i}")
|
||||
|
||||
seed_user("peter",
|
||||
nickname="peternichtlustig",
|
||||
visible=False,
|
||||
pronouns="Herr Dr. Dr.",
|
||||
volunteerwork="Gartenverein",
|
||||
availability_status=True,
|
||||
availability_hours_per_week=42,
|
||||
availability_text="Immer",
|
||||
freetext="Ich mag Kaffee",
|
||||
skills=[(3, 3), (1, 5)],
|
||||
searchtopics=[3, 1],
|
||||
languages=[("de", 5), ("fr", 3)],
|
||||
address=("Peter Nichtlustig", "Waldweg", "23i", "Hinterhaus", "13337", "Bielefeld",
|
||||
"Deutschland"),
|
||||
contacts=[(4, "@peter:wtf-eg.de"), (1, "peter@wtf-eg.de")])
|
||||
|
||||
seed_user("dirtydieter",
|
||||
volunteerwork="Müll sammeln",
|
||||
availability_status=True,
|
||||
availability_hours_per_week=24,
|
||||
availability_text="Nur Nachts!",
|
||||
freetext="1001010010111!!!",
|
||||
skills=[(1, 5)],
|
||||
address=("Friedrich Witzig", "", "", "", "", "", ""))
|
||||
|
||||
all_skills = [(skill.id, 3) for skill in Skill.query.all()]
|
||||
seed_user("jutta", languages=[("fr", 5)], skills=all_skills)
|
||||
|
||||
seed_user("giesela", skills=[(9, 3), (10, 5)])
|
||||
seed_user("bertha", visible=False, skills=[(11, 3), (10, 5)])
|
||||
seed_user("monique", languages=[("fr", 4)])
|
||||
|
||||
db.session.commit()
|
||||
db.session.commit() # also problematic
|
||||
print("commit done")
|
||||
|
@ -10,11 +10,14 @@ from app import app, db, migrate
|
||||
from ki.actions import seed
|
||||
from ki.models import Skill
|
||||
|
||||
from sqlalchemy import select
|
||||
|
||||
|
||||
class ApiTest(unittest.TestCase):
|
||||
maxDiff = None
|
||||
|
||||
def setUp(self):
|
||||
print("Running setup")
|
||||
app.debug = True
|
||||
app.config["KI_AUTH"] = "file"
|
||||
app.config["TESTING"] = True
|
||||
@ -22,20 +25,42 @@ class ApiTest(unittest.TestCase):
|
||||
|
||||
self.client = app.test_client()
|
||||
|
||||
with app.app_context():
|
||||
config = migrate.get_config()
|
||||
config = migrate.get_config()
|
||||
|
||||
with app.app_context():
|
||||
command.upgrade(config, "head")
|
||||
|
||||
seed(True)
|
||||
max_skill = Skill.query.order_by(Skill.id.desc()).first()
|
||||
self.max_skill_id = max_skill.id
|
||||
|
||||
#statement = select(Skill).order_by(Skill.id.desc())
|
||||
#print(statement)
|
||||
#skill_obj = db.session.scalars(statement).all()
|
||||
#print(skill_obj)
|
||||
#statement = select(Skill.id)
|
||||
#print(statement)
|
||||
|
||||
#max_skill = db.session.Skill().order_by(Skill.id.desc()).first()
|
||||
#max_skill = Skill.query.order_by(Skill.id.desc()).first() # TODO: problematic
|
||||
|
||||
with db.session.no_autoflush: # only works on first test run
|
||||
max_skill = db.session.query(Skill).order_by(Skill.id.desc()).first() # TODO: also problematic,
|
||||
|
||||
#skills = db.session.execute(db.select(Skill)).scalars()
|
||||
#print(max_skill)
|
||||
#max_skill = db.session.execute(db.select(Skill)
|
||||
## .order_by(Skill.id.desc())
|
||||
# ).scalar_one()
|
||||
print(max_skill)
|
||||
print("max_skill done")
|
||||
self.max_skill_id = max_skill.id
|
||||
|
||||
def tearDown(self):
|
||||
print("Running teardown")
|
||||
with app.app_context():
|
||||
db.drop_all()
|
||||
db.engine.dispose()
|
||||
|
||||
def login(self, username, password):
|
||||
#with app.app_context():
|
||||
login_data = {"username": username, "password": password}
|
||||
login_response = self.client.post("/users/login", data=json.dumps(login_data), content_type="application/json")
|
||||
|
||||
|
@ -8,37 +8,39 @@ from ki.test.ApiTest import ApiTest
|
||||
|
||||
|
||||
class TestContactTypesEndpoint(ApiTest):
|
||||
|
||||
def test_skills_options(self):
|
||||
print("test_skills_options")
|
||||
#with app.app_context():
|
||||
response = self.client.options("/contacttypes")
|
||||
self.assertEqual(response.status_code, 200)
|
||||
self.assertIn("Access-Control-Allow-Origin", response.headers)
|
||||
self.assertEqual(response.headers["Access-Control-Allow-Origin"], "*")
|
||||
|
||||
def test_get_contacttypes_unauthorised(self):
|
||||
response = self.client.get("/contacttypes?search=m")
|
||||
self.assertEqual(response.status_code, 401)
|
||||
# def test_get_contacttypes_unauthorised(self):
|
||||
# print("test_get_contacttypes_unauthorised")
|
||||
# response = self.client.get("/contacttypes?search=m")
|
||||
# self.assertEqual(response.status_code, 401)
|
||||
|
||||
def test_get_contacttypes(self):
|
||||
token = self.login("peter", "geheim")["token"]
|
||||
# def test_get_contacttypes(self):
|
||||
# token = self.login("peter", "geheim")["token"]
|
||||
|
||||
response = self.client.get("/contacttypes?search=m", headers={"Authorization": "Bearer " + token})
|
||||
self.assertEqual(response.status_code, 200)
|
||||
self.assertEqual(
|
||||
{
|
||||
"contacttypes": [{
|
||||
"id": 5,
|
||||
"name": "Mastodon"
|
||||
}, {
|
||||
"id": 4,
|
||||
"name": "Matrix"
|
||||
}, {
|
||||
"id": 2,
|
||||
"name": "Mobiltelefon"
|
||||
}]
|
||||
}, response.json)
|
||||
self.assertIn("Access-Control-Allow-Origin", response.headers)
|
||||
self.assertEqual(response.headers["Access-Control-Allow-Origin"], "*")
|
||||
# response = self.client.get("/contacttypes?search=m", headers={"Authorization": "Bearer " + token})
|
||||
# self.assertEqual(response.status_code, 200)
|
||||
# self.assertEqual(
|
||||
# {
|
||||
# "contacttypes": [{
|
||||
# "id": 5,
|
||||
# "name": "Mastodon"
|
||||
# }, {
|
||||
# "id": 4,
|
||||
# "name": "Matrix"
|
||||
# }, {
|
||||
# "id": 2,
|
||||
# "name": "Mobiltelefon"
|
||||
# }]
|
||||
# }, response.json)
|
||||
# self.assertIn("Access-Control-Allow-Origin", response.headers)
|
||||
# self.assertEqual(response.headers["Access-Control-Allow-Origin"], "*")
|
||||
|
||||
|
||||
if __name__ == "main":
|
||||
|
@ -8,7 +8,6 @@ from ki.test.ApiTest import ApiTest
|
||||
|
||||
|
||||
class TestFindProfilesEndpoint(ApiTest):
|
||||
|
||||
def test_find_profiles_options(self):
|
||||
response = self.client.options("/users/profiles")
|
||||
self.assertEqual(response.status_code, 200)
|
||||
|
@ -8,7 +8,6 @@ from ki.test.ApiTest import ApiTest
|
||||
|
||||
|
||||
class TestLanguagesEndpoint(ApiTest):
|
||||
|
||||
def test_skills_options(self):
|
||||
response = self.client.options("/languages")
|
||||
self.assertEqual(response.status_code, 200)
|
||||
@ -33,7 +32,6 @@ class TestLanguagesEndpoint(ApiTest):
|
||||
self.assertEqual(response.status_code, 200)
|
||||
self.assertIn("Content-Type", response.headers)
|
||||
self.assertEqual(response.headers["Content-Type"], "image/svg+xml; charset=utf-8")
|
||||
response.close()
|
||||
|
||||
|
||||
if __name__ == "main":
|
||||
|
@ -10,7 +10,6 @@ from ki.test.ApiTest import ApiTest
|
||||
|
||||
|
||||
class TestLoginEndpoint(ApiTest):
|
||||
|
||||
def test_login(self):
|
||||
response1_data = self.login("peter", "geheim")
|
||||
response2_data = self.login("peter", "geheim")
|
||||
|
@ -20,12 +20,11 @@ class TestProfileEndpoint(ApiTest):
|
||||
self.assertEqual(login_response.status_code, 200)
|
||||
self.assertIn("token", login_response.json)
|
||||
|
||||
with app.app_context():
|
||||
babsi = User.query.filter(User.auth_id == "babsi1").first()
|
||||
response = self.client.post(f"/users/{babsi.id}/profile",
|
||||
data=json.dumps({}),
|
||||
content_type="application/json",
|
||||
headers={"Authorization": "Bearer " + login_response.json["token"]})
|
||||
babsi = User.query.filter(User.auth_id == "babsi1").first()
|
||||
response = self.client.post(f"/users/{babsi.id}/profile",
|
||||
data=json.dumps({}),
|
||||
content_type="application/json",
|
||||
headers={"Authorization": "Bearer " + login_response.json["token"]})
|
||||
|
||||
self.assertEqual(response.status_code, 403)
|
||||
|
||||
@ -104,12 +103,11 @@ class TestProfileEndpoint(ApiTest):
|
||||
"level": 2
|
||||
}]
|
||||
}
|
||||
with app.app_context():
|
||||
peter = User.query.filter(User.auth_id == "peter").first()
|
||||
response = self.client.post(f"/users/{peter.id}/profile",
|
||||
data=json.dumps(data),
|
||||
content_type="application/json",
|
||||
headers={"Authorization": "Bearer " + token})
|
||||
peter = User.query.filter(User.auth_id == "peter").first()
|
||||
response = self.client.post(f"/users/{peter.id}/profile",
|
||||
data=json.dumps(data),
|
||||
content_type="application/json",
|
||||
headers={"Authorization": "Bearer " + token})
|
||||
|
||||
self.assertEqual(response.status_code, 200)
|
||||
with app.app_context():
|
||||
@ -187,9 +185,8 @@ class TestProfileEndpoint(ApiTest):
|
||||
def test_get_visible_proifle(self):
|
||||
token = self.login("peter", "geheim")["token"]
|
||||
|
||||
with app.app_context():
|
||||
babsi = User.query.filter(User.auth_id == "babsi1").first()
|
||||
response = self.client.get(f"/users/{babsi.id}/profile", headers={"Authorization": f"Bearer {token}"})
|
||||
babsi = User.query.filter(User.auth_id == "babsi1").first()
|
||||
response = self.client.get(f"/users/{babsi.id}/profile", headers={"Authorization": f"Bearer {token}"})
|
||||
|
||||
self.assertEqual(response.status_code, 200)
|
||||
|
||||
@ -200,11 +197,10 @@ class TestProfileEndpoint(ApiTest):
|
||||
self.assertEqual(login_response.status_code, 200)
|
||||
self.assertIn("token", login_response.json)
|
||||
|
||||
with app.app_context():
|
||||
peter = User.query.filter(User.auth_id == "peter").first()
|
||||
response = self.client.get(f"/users/{peter.id}/profile",
|
||||
headers={"Authorization": "Bearer " + login_response.json["token"]})
|
||||
profile_id = peter.profile.id
|
||||
peter = User.query.filter(User.auth_id == "peter").first()
|
||||
response = self.client.get(f"/users/{peter.id}/profile",
|
||||
headers={"Authorization": "Bearer " + login_response.json["token"]})
|
||||
profile_id = peter.profile.id
|
||||
self.assertEqual(response.status_code, 200)
|
||||
self.assertDictEqual(
|
||||
response.json, {
|
||||
|
@ -8,7 +8,6 @@ from ki.test.ApiTest import ApiTest
|
||||
|
||||
|
||||
class TestSkillsEndpoint(ApiTest):
|
||||
|
||||
def test_skills_options(self):
|
||||
response = self.client.options("/skills")
|
||||
self.assertEqual(response.status_code, 200)
|
||||
@ -41,14 +40,12 @@ class TestSkillsEndpoint(ApiTest):
|
||||
self.assertEqual(response.status_code, 200)
|
||||
self.assertIn("Content-Type", response.headers)
|
||||
self.assertEqual(response.headers["Content-Type"], "image/svg+xml; charset=utf-8")
|
||||
response.close()
|
||||
|
||||
def test_get_fallback_skill_icon(self):
|
||||
response = self.client.get("/skills/2/icon")
|
||||
self.assertEqual(response.status_code, 200)
|
||||
self.assertIn("Content-Type", response.headers)
|
||||
self.assertEqual(response.headers["Content-Type"], "image/svg+xml; charset=utf-8")
|
||||
response.close()
|
||||
|
||||
|
||||
if __name__ == "main":
|
||||
|
@ -1,18 +0,0 @@
|
||||
{
|
||||
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
||||
"extends": [
|
||||
"config:best-practices",
|
||||
":disableDependencyDashboard",
|
||||
":maintainLockFilesMonthly",
|
||||
":pinVersions",
|
||||
":separateMultipleMajorReleases"
|
||||
],
|
||||
"packageRules": [
|
||||
{
|
||||
"matchDepNames": ["python"],
|
||||
"groupName": "Python",
|
||||
"separateMinorPatch": true,
|
||||
"separateMultipleMinor": true
|
||||
}
|
||||
]
|
||||
}
|
Loading…
Reference in New Issue
Block a user