diff --git a/cypress/integration/event_date.js b/cypress/integration/event_date.js index 547006e..50c1ea9 100644 --- a/cypress/integration/event_date.js +++ b/cypress/integration/event_date.js @@ -3,8 +3,6 @@ describe("Event Date", () => { cy.login(); cy.createAdminUnit().then(function (adminUnitId) { cy.createEvent(adminUnitId).then(function (eventId) { - cy.visit("/eventdatesearch"); - cy.visit("/eventdates"); cy.get("#toggle-search-btn").click(); cy.screenshot("search-form"); diff --git a/package-lock.json b/package-lock.json index b311077..6628045 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "ISC", "devDependencies": { - "cypress": "^8.3.1", + "cypress": "^8.5.0", "cypress-fail-on-console-error": "^2.1.2" } }, @@ -568,9 +568,9 @@ } }, "node_modules/cypress": { - "version": "8.3.1", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-8.3.1.tgz", - "integrity": "sha512-1v6pfx+/5cXhaT5T6QKOvnkawmEHWHLiVzm3MYMoQN1fkX2Ma1C32STd3jBStE9qT5qPSTILjGzypVRxCBi40g==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-8.5.0.tgz", + "integrity": "sha512-MMkXIS+Ro2KETn4gAlG3tIc/7FiljuuCZP0zpd9QsRG6MZSyZW/l1J3D4iQM6WHsVxuX4rFChn5jPFlC2tNSvQ==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -608,6 +608,7 @@ "minimist": "^1.2.5", "ospath": "^1.2.2", "pretty-bytes": "^5.6.0", + "proxy-from-env": "1.0.0", "ramda": "~0.27.1", "request-progress": "^3.0.0", "supports-color": "^8.1.1", @@ -1546,6 +1547,12 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/proxy-from-env": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz", + "integrity": "sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4=", + "dev": true + }, "node_modules/psl": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", @@ -2468,9 +2475,9 @@ } }, "cypress": { - "version": "8.3.1", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-8.3.1.tgz", - "integrity": "sha512-1v6pfx+/5cXhaT5T6QKOvnkawmEHWHLiVzm3MYMoQN1fkX2Ma1C32STd3jBStE9qT5qPSTILjGzypVRxCBi40g==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-8.5.0.tgz", + "integrity": "sha512-MMkXIS+Ro2KETn4gAlG3tIc/7FiljuuCZP0zpd9QsRG6MZSyZW/l1J3D4iQM6WHsVxuX4rFChn5jPFlC2tNSvQ==", "dev": true, "requires": { "@cypress/request": "^2.88.6", @@ -2507,6 +2514,7 @@ "minimist": "^1.2.5", "ospath": "^1.2.2", "pretty-bytes": "^5.6.0", + "proxy-from-env": "1.0.0", "ramda": "~0.27.1", "request-progress": "^3.0.0", "supports-color": "^8.1.1", @@ -3226,6 +3234,12 @@ "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==", "dev": true }, + "proxy-from-env": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz", + "integrity": "sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4=", + "dev": true + }, "psl": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", diff --git a/package.json b/package.json index 34f85d8..4f0ffa5 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ }, "homepage": "https://github.com/DanielGrams/gsevpt#readme", "devDependencies": { - "cypress": "^8.3.1", + "cypress": "^8.5.0", "cypress-fail-on-console-error": "^2.1.2" } } diff --git a/project/cli/test.py b/project/cli/test.py index 64843b3..e1e96f6 100644 --- a/project/cli/test.py +++ b/project/cli/test.py @@ -109,7 +109,25 @@ def seed(): click.echo("Seed done.") -def _create_admin_unit(user_id, name): +def _verify_admin_unit(admin_unit_id): + from project.services.admin_unit import get_admin_unit_by_name + + other_admin_unit = get_admin_unit_by_name("Oveda") + + if other_admin_unit: + other_admin_unit_id = other_admin_unit.id + else: + other_user_id = _create_user("unverified@test.de") + other_admin_unit_id = _create_admin_unit(other_user_id, "Oveda") + + _create_admin_unit_relation( + other_admin_unit_id, + admin_unit_id, + verify=True, + ) + + +def _create_admin_unit(user_id, name, verified=False): user = get_user(user_id) admin_unit = AdminUnit() @@ -125,6 +143,9 @@ def _create_admin_unit(user_id, name): insert_admin_unit_for_user(admin_unit, user) db.session.commit() + if verified: + _verify_admin_unit(admin_unit.id) + return admin_unit.id @@ -133,7 +154,7 @@ def _create_admin_unit(user_id, name): @click.argument("name", default="Meine Crew") def create_admin_unit(user_email, name): user = find_user_by_email(user_email) - admin_unit_id = _create_admin_unit(user.id, name) + admin_unit_id = _create_admin_unit(user.id, name, verified=True) result = {"admin_unit_id": admin_unit_id} click.echo(json.dumps(result)) @@ -323,9 +344,11 @@ def _create_admin_unit_relation( admin_unit_id, target_admin_unit_id, auto_verify_event_reference_requests=False, + verify=False, ): relation = upsert_admin_unit_relation(admin_unit_id, target_admin_unit_id) relation.auto_verify_event_reference_requests = auto_verify_event_reference_requests + relation.verify = verify db.session.commit() return relation.id diff --git a/tests/seeder.py b/tests/seeder.py index 3376a52..c82fb32 100644 --- a/tests/seeder.py +++ b/tests/seeder.py @@ -88,6 +88,7 @@ class Seeder(object): other_admin_unit_id = self.create_admin_unit( other_user_id, "Oveda", can_verify_other=True ) + self.create_admin_unit_relation( other_admin_unit_id, admin_unit_id,