thohlt/archtika
1
0
Fork 0
mirror of https://github.com/thiloho/archtika.git synced 2025-11-22 02:41:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18 from archtika/devel

Browse Source 
Update tests and deploy action workflow
This commit is contained in:
Thilo Hohlt
2024-10-26 23:36:59 +02:00
committed by GitHub
parent adaa56d5b4 e923c499cc
commit 2ded46f9c0
7 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.github/workflows/deploy.yml vendored
View File

@@ -5,15 +5,13 @@ on:
workflows: [ 'Playwright tests' ]
types: [ completed ]
branches: [ devel, main ]
env:
SERVER_USER: root
QS_SERVER_IP: 128.140.75.240
PROD_SERVER_IP: 116.203.122.75
jobs:
deploy:
runs-on: ubuntu-latest
if: ${{ github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event == 'push' }}
environment: ${{ github.event.workflow_run.head_branch == 'devel' && 'qs' || 'prod' }}
steps:
- uses: actions/checkout@v4
with:
@@ -27,14 +25,14 @@ jobs:
- name: Install SSH Key
uses: shimataro/ssh-key-action@v2
with:
key: ${{ github.event.workflow_run.head_branch == 'devel' && secrets.QS_SSH_KEY || secrets.PROD_SSH_KEY }}
known_hosts: ${{ github.event.workflow_run.head_branch == 'devel' && secrets.QS_KNOWN_HOSTS || secrets.PROD_KNOWN_HOSTS }}
key: ${{ secrets.SSH_KEY }}
known_hosts: ${{ vars.KNOWN_HOSTS }}
- name: Deploy to demo server
run: |
nix run nixpkgs#nixos-rebuild -- switch \
--flake .#${{ github.event.workflow_run.head_branch == 'devel' && 'qs' || 'prod' }} \
--flake .#${{ vars.FLAKE_CONFIGURATION_NAME }} \
--fast \
--build-host ${{ env.SERVER_USER }}@${{ github.event.workflow_run.head_branch == 'devel' && env.QS_SERVER_IP || env.PROD_SERVER_IP }} \
--target-host ${{ env.SERVER_USER }}@${{ github.event.workflow_run.head_branch == 'devel' && env.QS_SERVER_IP || env.PROD_SERVER_IP }} \
--build-host ${{ vars.SERVER_DEPLOY_USER }}@${{ vars.PUBLIC_SERVER_IP }} \
--target-host ${{ vars.SERVER_DEPLOY_USER }}@${{ vars.PUBLIC_SERVER_IP }} \
--use-remote-sudo

1
web-app/playwright.config.ts
View File

@@ -11,6 +11,7 @@ const config: PlaywrightTestConfig = {
},
testDir: "./tests",
testMatch: /(.+\.)?(test|spec)\.ts/,
retries: 3,
// https://github.com/NixOS/nixpkgs/issues/288826
projects: [
{

4
web-app/src/routes/(authenticated)/manage/+page.svelte
View File

@@ -39,7 +39,7 @@
</tr>
</thead>
<tbody>
{#each data.usersWithWebsites as { id, created_at, username, max_number_websites, website }}
{#each data.usersWithWebsites as { id, created_at, username, max_number_websites, website } (id)}
<tr>
<td>
<DateTime date={created_at} />
@@ -73,7 +73,7 @@
{#if website.length > 0}
<h4>Websites</h4>
{#each website as { id, title, max_storage_size }}
{#each website as { id, title, max_storage_size } (id)}
<details>
<summary>{title}</summary>
<div>

2
web-app/src/routes/(authenticated)/website/[websiteId]/categories/+page.svelte
View File

@@ -56,7 +56,7 @@
</h2>
<ul class="unpadded">
{#each data.categories as { id, website_id, user_id, category_name, category_weight } (`${website_id}-${id}`)}
{#each data.categories as { id, user_id, category_name, category_weight } (id)}
<li class="category-card">
<p>
<strong>{category_name} ({category_weight})</strong>

2
web-app/src/routes/(authenticated)/website/[websiteId]/collaborators/+page.svelte
View File

@@ -65,7 +65,7 @@
</h2>
<ul class="unpadded">
{#each data.collaborators as { website_id, user_id, permission_level, user } (`${website_id}-${user_id}`)}
{#each data.collaborators as { user_id, permission_level, user } (user_id)}
<li class="collaborator-card">
<p>
<strong>{user?.username} ({permission_level})</strong>

2
web-app/src/routes/(authenticated)/website/[websiteId]/logs/+page.svelte
View File

@@ -111,7 +111,7 @@
</tr>
</thead>
<tbody>
{#each data.changeLog as { id, table_name, operation, tstamp, old_value, new_value, user_id, username }}
{#each data.changeLog as { id, table_name, operation, tstamp, old_value, new_value, user_id, username } (id)}
<tr>
<td>
<span style:text-decoration={user_id ? "" : "line-through"}>

16
web-app/tests/global-teardown.ts
View File

@@ -1,21 +1,25 @@
import { test } from "@playwright/test";
import { test, expect } from "@playwright/test";
import { password, authenticate, userOwner } from "./shared";
test.beforeEach(async ({ page }) => {
await authenticate(userOwner, page);
});
/* test("Delete all regular users", async ({ page }) => {
test("Delete all regular users", async ({ page }) => {
await page.getByRole("link", { name: "Manage" }).click();
await page.waitForSelector("tbody");
const userRows = await page.locator("tbody > tr").filter({ hasNotText: userOwner }).all();
const userRows = page.locator("tbody > tr").filter({ hasNotText: userOwner });
for (const row of userRows) {
await row.getByRole("button", { name: "Manage" }).click();
while ((await userRows.count()) > 0) {
const currentCount = await userRows.count();
await userRows.first().getByRole("button", { name: "Manage" }).click();
const modalName = page.url().split("#")[1];
await page.locator(`#${modalName}`).locator('summary:has-text("Delete")').click();
await page.locator(`#${modalName}`).getByRole("button", { name: "Delete user" }).click();
await expect(userRows).toHaveCount(currentCount - 1);
}
});
@@ -28,4 +32,4 @@ test("Delete admin account", async ({ page }) => {
.locator("#delete-account-modal")
.getByRole("button", { name: "Delete account" })
.click();
}); */
});