From 0887c3e013975d803acf73a0da25252bbfb57b83 Mon Sep 17 00:00:00 2001 From: Binyamin Yawitz <316103+byawitz@users.noreply.github.com> Date: Sun, 10 Mar 2024 23:24:32 -0400 Subject: [PATCH 1/6] =?UTF-8?q?[=E2=9A=A1=EF=B8=8F]=20-=20Tests,=20and=20r?= =?UTF-8?q?elease.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Binyamin Yawitz <316103+byawitz@users.noreply.github.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cac3ddc..5f31cad 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Fully featured Open-source URL Shortener > > | 🏗️ Current | 👉 Next | > |-------------|---------| -> | Pre-alpha | Alpha | +> | Alpha | Beta | ## Architecture From cf9bfd15965465f4ea9a134314b7fce57dfff5b1 Mon Sep 17 00:00:00 2001 From: Binyamin Yawitz <316103+byawitz@users.noreply.github.com> Date: Sun, 10 Mar 2024 23:40:13 -0400 Subject: [PATCH 2/6] =?UTF-8?q?[=E2=9A=A1=EF=B8=8F]=20-=20Increasing=20see?= =?UTF-8?q?ding=20timeout?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Binyamin Yawitz <316103+byawitz@users.noreply.github.com> --- e2e/tests/api.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/tests/api.spec.ts b/e2e/tests/api.spec.ts index 9dea3d6..03c6d6d 100644 --- a/e2e/tests/api.spec.ts +++ b/e2e/tests/api.spec.ts @@ -49,7 +49,7 @@ describe('Installing & Seeding', () => { const output = await new Response(proc.stdout).text(); expect(output).toContain('Finished seeding') - }, 60000); + }, 80000); }); describe('All endpoints logged in', () => { From 9c8496228db151ed70d4c61432430f725c2909ef Mon Sep 17 00:00:00 2001 From: Binyamin Yawitz <316103+byawitz@users.noreply.github.com> Date: Sun, 10 Mar 2024 23:40:13 -0400 Subject: [PATCH 3/6] =?UTF-8?q?[=E2=9A=A1=EF=B8=8F]=20-=20Updating=20api?= =?UTF-8?q?=20port=20`8080`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Binyamin Yawitz <316103+byawitz@users.noreply.github.com> --- e2e/tests/api.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/tests/api.spec.ts b/e2e/tests/api.spec.ts index 9dea3d6..03c6d6d 100644 --- a/e2e/tests/api.spec.ts +++ b/e2e/tests/api.spec.ts @@ -49,7 +49,7 @@ describe('Installing & Seeding', () => { const output = await new Response(proc.stdout).text(); expect(output).toContain('Finished seeding') - }, 60000); + }, 80000); }); describe('All endpoints logged in', () => { From e4652a502f7f129b6ddea1c4caae9586e5bcea4f Mon Sep 17 00:00:00 2001 From: Binyamin Yawitz <316103+byawitz@users.noreply.github.com> Date: Sun, 10 Mar 2024 23:52:16 -0400 Subject: [PATCH 4/6] =?UTF-8?q?[=E2=9A=A1=EF=B8=8F]=20-=20Updating=20api?= =?UTF-8?q?=20port=20`8080`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Binyamin Yawitz <316103+byawitz@users.noreply.github.com> --- e2e/tests/api.spec.ts | 2 +- e2e/tests/links.spec.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e/tests/api.spec.ts b/e2e/tests/api.spec.ts index 03c6d6d..4c8eb31 100644 --- a/e2e/tests/api.spec.ts +++ b/e2e/tests/api.spec.ts @@ -1,6 +1,6 @@ import {expect, test, describe, beforeAll} from "bun:test"; -const apiEndpoint = 'http://127.0.0.1/v1/api' +const apiEndpoint = 'http://127.0.0.1:8080/v1/api' interface response { success: boolean, diff --git a/e2e/tests/links.spec.ts b/e2e/tests/links.spec.ts index 3dde559..e649084 100644 --- a/e2e/tests/links.spec.ts +++ b/e2e/tests/links.spec.ts @@ -1,6 +1,6 @@ import {expect, test, describe, beforeAll} from "bun:test"; -const endpoint = 'http://127.0.0.1/' +const endpoint = 'http://127.0.0.1:8080/' interface response { success: boolean, From ee145bf9b57fbac1b4ed3e9aa1c4bfbcb5fc903e Mon Sep 17 00:00:00 2001 From: Binyamin Yawitz <316103+byawitz@users.noreply.github.com> Date: Sun, 10 Mar 2024 23:57:17 -0400 Subject: [PATCH 5/6] =?UTF-8?q?[=E2=9A=A1=EF=B8=8F]=20-=20Updating=20api?= =?UTF-8?q?=20domain?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Binyamin Yawitz <316103+byawitz@users.noreply.github.com> --- e2e/tests/api.spec.ts | 2 +- e2e/tests/links.spec.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e/tests/api.spec.ts b/e2e/tests/api.spec.ts index 4c8eb31..b9acfdd 100644 --- a/e2e/tests/api.spec.ts +++ b/e2e/tests/api.spec.ts @@ -1,6 +1,6 @@ import {expect, test, describe, beforeAll} from "bun:test"; -const apiEndpoint = 'http://127.0.0.1:8080/v1/api' +const apiEndpoint = 'http://traefik:8080/v1/api' interface response { success: boolean, diff --git a/e2e/tests/links.spec.ts b/e2e/tests/links.spec.ts index e649084..28b9b54 100644 --- a/e2e/tests/links.spec.ts +++ b/e2e/tests/links.spec.ts @@ -1,6 +1,6 @@ import {expect, test, describe, beforeAll} from "bun:test"; -const endpoint = 'http://127.0.0.1:8080/' +const endpoint = 'http://traefik:8080/' interface response { success: boolean, From f62847e574af9679353014ab14d2aa1fb5c55753 Mon Sep 17 00:00:00 2001 From: Binyamin Yawitz <316103+byawitz@users.noreply.github.com> Date: Mon, 11 Mar 2024 00:01:02 -0400 Subject: [PATCH 6/6] =?UTF-8?q?[=E2=9A=A1=EF=B8=8F]=20-=20Updating=20api?= =?UTF-8?q?=20domain=20to=20`localhost`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Binyamin Yawitz <316103+byawitz@users.noreply.github.com> --- docker-compose.ci.yml | 2 +- e2e/tests/api.spec.ts | 2 +- e2e/tests/links.spec.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml index dea2a5a..b715ec6 100644 --- a/docker-compose.ci.yml +++ b/docker-compose.ci.yml @@ -23,7 +23,7 @@ services: depends_on: - linkos ports: - - "80:80" + - "8080:80" volumes: - /var/run/docker.sock:/var/run/docker.sock networks: diff --git a/e2e/tests/api.spec.ts b/e2e/tests/api.spec.ts index b9acfdd..129ea66 100644 --- a/e2e/tests/api.spec.ts +++ b/e2e/tests/api.spec.ts @@ -1,6 +1,6 @@ import {expect, test, describe, beforeAll} from "bun:test"; -const apiEndpoint = 'http://traefik:8080/v1/api' +const apiEndpoint = 'http://localhost:8080/v1/api' interface response { success: boolean, diff --git a/e2e/tests/links.spec.ts b/e2e/tests/links.spec.ts index 28b9b54..ee55ef6 100644 --- a/e2e/tests/links.spec.ts +++ b/e2e/tests/links.spec.ts @@ -1,6 +1,6 @@ import {expect, test, describe, beforeAll} from "bun:test"; -const endpoint = 'http://traefik:8080/' +const endpoint = 'http://localhost:8080/' interface response { success: boolean,