diff --git a/.github/workflows/task1.yaml b/.github/workflows/task1.yaml new file mode 100644 index 0000000..4815a6f --- /dev/null +++ b/.github/workflows/task1.yaml @@ -0,0 +1,14 @@ +name: task 1 workflow +on: + push: + # event - https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows +jobs: + example-job: + runs-on: ubuntu-latest + # system - https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories + steps: + - run: echo "GITHUB REF ${GITHUB_REF}" + - run: echo "GITHUB Branch ${GITHUB_REF_NAME}" + - run: echo "COMMIT REF ${GITHUB_SHA}" + - uses: actions/checkout@v4 + - run: ls -R diff --git a/.github/workflows/task2.yaml b/.github/workflows/task2.yaml new file mode 100644 index 0000000..86f5dc3 --- /dev/null +++ b/.github/workflows/task2.yaml @@ -0,0 +1,27 @@ +name: task 2 workflow +on: + push: + # event - https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows +jobs: + example-job: + runs-on: ubuntu-latest + defaults: + run: + working-directory: ./desktop-app + + # system - https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories + steps: + - uses: actions/checkout@v4 + - name: Use Node.js + uses: actions/setup-node@v4 + with: + node-version: 'latest' + cache: 'npm' + cache-dependency-path: desktop-app/package-lock.json + + - run: npm ci + - run: npm run build --if-present + - run: npm test + + + diff --git a/.github/workflows/task3.yaml b/.github/workflows/task3.yaml new file mode 100644 index 0000000..cc827e5 --- /dev/null +++ b/.github/workflows/task3.yaml @@ -0,0 +1,30 @@ +name: task 3 workflow +on: + push: + paths: + - desktop-app/**.ts + # event - https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows +jobs: + example-job: + runs-on: ubuntu-latest + defaults: + run: + working-directory: ./desktop-app + + # system - https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories + steps: + - uses: actions/checkout@v4 + - name: Use Node.js + uses: actions/setup-node@v4 + with: + node-version: 'latest' + cache: 'npm' + cache-dependency-path: desktop-app/package-lock.json + + - run: npm ci + + - run: npm run build --if-present + - run: npm test + + + diff --git a/.github/workflows/task4.yaml b/.github/workflows/task4.yaml new file mode 100644 index 0000000..bdf3bb4 --- /dev/null +++ b/.github/workflows/task4.yaml @@ -0,0 +1,37 @@ +name: task 4 workflow +on: + push: + paths: + - desktop-app/**.ts + # event - https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows +jobs: + example-job: + runs-on: ubuntu-latest + defaults: + run: + working-directory: ./desktop-app + + # system - https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories + steps: + - uses: actions/checkout@v4 + - name: Use Node.js + uses: actions/setup-node@v4 + with: + node-version: 'latest' + cache: 'npm' + cache-dependency-path: desktop-app/package-lock.json + + - run: npm ci + + - run: npm run build + - run: npm test + - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run e2e + - uses: actions/upload-artifact@v4 + if: ${{ failure() }} + with: + name: failed-tests + path: | + desktop-app/test-results/** + + + diff --git a/desktop-app/src/constants.ts b/desktop-app/src/constants.ts index d1dbaac..780472b 100644 --- a/desktop-app/src/constants.ts +++ b/desktop-app/src/constants.ts @@ -5,4 +5,4 @@ export const AMAZONS = [ { name: "Włochy", url: "https://www.amazon.it" }, { name: "Francja", url: "https://www.amazon.fr" }, { name: "Hiszpania", url: "https://www.amazon.es" }, -]; +]; \ No newline at end of file diff --git a/desktop-app/src/e2e/basic.test.ts b/desktop-app/src/e2e/basic.test.ts index 8850336..bbc269d 100644 --- a/desktop-app/src/e2e/basic.test.ts +++ b/desktop-app/src/e2e/basic.test.ts @@ -8,5 +8,5 @@ electronTest("Window has correct title", async ({ page }) => { const title = await page.title(); - expect(title).toBe("Vite + React + TS"); + expect(title).toBe("React + TS"); }) \ No newline at end of file diff --git a/desktop-app/src/utils/index.ts b/desktop-app/src/utils/index.ts index e168c95..36dbdf5 100644 --- a/desktop-app/src/utils/index.ts +++ b/desktop-app/src/utils/index.ts @@ -1,4 +1,7 @@ // @ts-ignore export function sum(a: number, b: number, c: number | undefined = undefined) { - return a + b; + if(c) + return a+ b +c; + else + return a + b; }