From a7f17b336385be8ade7d76f32de1c5d627ccddb2 Mon Sep 17 00:00:00 2001 From: HannahZhuSWE Date: Wed, 15 Mar 2023 11:36:10 -0700 Subject: [PATCH 1/2] remove files related to nightly integration project --- .github/workflows/playwright-latest.yml | 42 ---------- .github/workflows/playwright-onDemand.yml | 94 ---------------------- .github/workflows/playwright-scheduled.yml | 84 ------------------- .gitignore | 2 - README.md | 1 - package.json | 2 - playwright.config.ts | 19 ----- tests/Test.README.md | 3 - tests/playwright.spec.ts | 7 -- 9 files changed, 254 deletions(-) delete mode 100644 .github/workflows/playwright-latest.yml delete mode 100644 .github/workflows/playwright-onDemand.yml delete mode 100644 .github/workflows/playwright-scheduled.yml delete mode 100644 playwright.config.ts delete mode 100644 tests/Test.README.md delete mode 100644 tests/playwright.spec.ts diff --git a/.github/workflows/playwright-latest.yml b/.github/workflows/playwright-latest.yml deleted file mode 100644 index cfb8cec..0000000 --- a/.github/workflows/playwright-latest.yml +++ /dev/null @@ -1,42 +0,0 @@ -# This action runs playwright tests nightly and on push to main to give the latest status of the main branch - -name: Latest Playwright test - -# Controls when the workflow will run -on: - # Triggers the workflow nightly and on push to the main branch - push: - branches: [ "main" ] - schedule: - # nightly - - cron: '0 0 * * *' - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - # This workflow builds and runs the playwright tests - test: - # The type of runner that the job will run on - runs-on: ubuntu-latest - - strategy: - matrix: - node-version: [14.x, 16.x, 18.x] - # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ - - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - - name: Install dependencies - run: npm ci --legacy-peer-deps - - name: Install Playwright - run: npx playwright install --with-deps - - name: Build production build - run: npm run build - - name: Run your tests - run: npm run playwright_test - - name: Upload HTML report as Artifact - uses: actions/upload-artifact@v2 - if: always() - with: - name: run-report - path: pw-report/ \ No newline at end of file diff --git a/.github/workflows/playwright-onDemand.yml b/.github/workflows/playwright-onDemand.yml deleted file mode 100644 index caba1b0..0000000 --- a/.github/workflows/playwright-onDemand.yml +++ /dev/null @@ -1,94 +0,0 @@ - -# This is a basic workflow to help you get started with Actions - -name: Playwright tests - -# Controls when the workflow will run -on: - # Triggers the workflow on push or pull request events but only for the "main" branch - push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] - schedule: - # nightly - - cron: '0 0 * * *' - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - test: - # Runs on an ubuntu runner - runs-on: ubuntu-latest - - strategy: - matrix: - node-version: [14.x, 16.x, 18.x] - # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ - - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - - name: Install dependencies - run: npm ci --legacy-peer-deps - - name: Install Playwright - run: npx playwright install --with-deps - - name: Build production build - run: npm run build - - name: Run your tests - run: npm run playwright_test - - name: Get current date - id: date - run: echo "::set-output name=date::$(date +'%Y-%m-%d')" - - name: Upload HTML report as Artifact - uses: actions/upload-artifact@v2 - env: - TAG_NAME: test-report-${{ steps.date.outputs.date }} - if: always() - with: - name: onDemand - path: pw-report/ - - storeReports: - name: Store reports - if: ${{ always() }} - needs: test - runs-on: ubuntu-latest - steps: - - name: Download all workflow run artifacts - uses: actions/download-artifact@v3 - id: download - - name: Publish to external repo - if: always() - uses: peaceiris/actions-gh-pages@v3.7.3 - with: - external_repository: mspnp/intern-js-pipeline - publish_branch: gh-pages - personal_token: ${{ secrets.PAT_TOKEN }} - publish_dir: ${{steps.download.outputs.download-path}} - destination_dir: test-reports/${{ github.repository }} - keep_files: true - user_name: "github-actions[bot]" - user_email: "github-actions[bot]@users.noreply.github.com" - - notify-dashboard: - name: Notify Dashboard - if: ${{ always() }} - needs: [test, storeReports] - # The type of runner that the job will run on - runs-on: ubuntu-latest - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v3 - - # Runs a single command using the runners shell - - name: Notify docusaurus repo - env: - GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }} - run: | - gh api repos/mspnp/intern-js-pipeline/dispatches \ - --raw-field event_type=rebuild-site diff --git a/.github/workflows/playwright-scheduled.yml b/.github/workflows/playwright-scheduled.yml deleted file mode 100644 index 20a3ee8..0000000 --- a/.github/workflows/playwright-scheduled.yml +++ /dev/null @@ -1,84 +0,0 @@ -name: Scheduled Playwright tests - -# Controls when the workflow will run -on: - # Triggers the workflow nightly - schedule: - # nightly - - cron: '0 0 * * *' - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - test: - # Runs on an ubuntu runner - runs-on: ubuntu-latest - - strategy: - matrix: - node-version: [14.x, 16.x, 18.x] - # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ - - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - - name: Install dependencies - run: npm ci --legacy-peer-deps - - name: Install Playwright - run: npx playwright install --with-deps - - name: Build production build - run: npm run build - - name: Run your tests - run: npm run playwright_test - - name: Get current date - id: date - run: echo "::set-output name=date::$(date +'%Y-%m-%d')" - - name: Upload HTML report as Artifact - uses: actions/upload-artifact@v2 - env: - TAG_NAME: test-report-${{ steps.date.outputs.date }} - if: always() - with: - name: ${{ steps.date.outputs.date }} - path: pw-report/ - - storeReports: - name: Store reports - if: ${{ always() }} - needs: test - runs-on: ubuntu-latest - steps: - - name: Download all workflow run artifacts - uses: actions/download-artifact@v3 - id: download - - name: Publish to external repo - if: always() - uses: peaceiris/actions-gh-pages@v3.7.3 - with: - external_repository: mspnp/intern-js-pipeline - publish_branch: gh-pages - personal_token: ${{ secrets.PAT_TOKEN }} - publish_dir: ${{steps.download.outputs.download-path}} - destination_dir: test-reports/${{ github.repository }} - keep_files: true - user_name: "github-actions[bot]" - user_email: "github-actions[bot]@users.noreply.github.com" - - notify-dashboard: - name: Notify Dashboard - if: ${{ always() }} - needs: [test, storeReports] - # The type of runner that the job will run on - runs-on: ubuntu-latest - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v3 - - # Runs a single command using the runners shell - - name: Notify dashboard repo - env: - GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }} - run: | - gh api repos/mspnp/intern-js-pipeline/dispatches \ - --raw-field event_type=rebuild-site \ No newline at end of file diff --git a/.gitignore b/.gitignore index 47b9931..0d6dcac 100644 --- a/.gitignore +++ b/.gitignore @@ -95,5 +95,3 @@ obj appsettings.json local.settings.json /test-results/ -/playwright-report/ -/playwright/.cache/ diff --git a/README.md b/README.md index 682b0a5..36f79a8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ # Startup Adventurer -[![Playwright tests](https://github.com/staticwebdev/StartupAdventurer/actions/workflows/playwright-latest.yml/badge.svg)](https://github.com/staticwebdev/StartupAdventurer/actions/workflows/playwright-latest.yml) Welcome to Startup Adventurer a character creator allowing you to build your own avatar and imbue it with skills which line up with your own startup adventurer. diff --git a/package.json b/package.json index ee29a53..36c92fe 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,6 @@ "emulate": "swa start http://localhost:3000 --api http://localhost:7071", "build": "react-app-rewired build", "test": "react-app-rewired test", - "playwright_test": "playwright test", "eject": "react-scripts eject" }, "eslintConfig": { @@ -57,7 +56,6 @@ }, "devDependencies": { "@azure/static-web-apps-cli": "^0.1.0", - "@playwright/test": "^1.24.1", "@types/file-saver": "^2.0.2", "@types/styled-components": "^5.1.7", "typescript": "^4.2.2" diff --git a/playwright.config.ts b/playwright.config.ts deleted file mode 100644 index c62ef26..0000000 --- a/playwright.config.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { PlaywrightTestConfig } from '@playwright/test'; -const config: PlaywrightTestConfig = { - testDir: "./tests", - use: { - baseURL: "http://localhost:3000/", - trace: 'on' - }, - reporter: [ - ['html', { outputFolder: 'pw-report' }], - ['json', { outputFolder: 'pw-report', outputFile: 'report.json' }] - ], - webServer: { - command: 'npm run start', - port: 3000, - timeout: 120 * 1000, - reuseExistingServer: !process.env.CI, - }, -}; -export default config; \ No newline at end of file diff --git a/tests/Test.README.md b/tests/Test.README.md deleted file mode 100644 index 8180916..0000000 --- a/tests/Test.README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Testing - -To run react-app-rewired tests use the command `npm run test`. To run playwright tests run `npm run playwright_test`. In order to run tests npm install had to be changed to `npm install --legacy-peer-deps`, sample no longer works with `npm install` because react-compound-slider uses an outdated version of react. \ No newline at end of file diff --git a/tests/playwright.spec.ts b/tests/playwright.spec.ts deleted file mode 100644 index 1766c73..0000000 --- a/tests/playwright.spec.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { test, expect } from '@playwright/test'; - -test('basic test', async ({ page }) => { - await page.goto('/'); - await page.waitForSelector('h2'); - await expect(page.locator('h2')).toContainText('Create your own'); -}) \ No newline at end of file From 748a7e94bacb1c1d0cb09bd0f644a0725ba6b45f Mon Sep 17 00:00:00 2001 From: HannahZhuSWE Date: Wed, 15 Mar 2023 12:04:30 -0700 Subject: [PATCH 2/2] remove folder from gitignore --- .gitignore | 3 +-- README.md | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0d6dcac..6f5a9df 100644 --- a/.gitignore +++ b/.gitignore @@ -93,5 +93,4 @@ build /backend/**/bin obj appsettings.json -local.settings.json -/test-results/ +local.settings.json \ No newline at end of file diff --git a/README.md b/README.md index 36f79a8..8c29c99 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ # Startup Adventurer - Welcome to Startup Adventurer a character creator allowing you to build your own avatar and imbue it with skills which line up with your own startup adventurer. Startup Adventurer demonstrates how you can create an application that can be deployed to [Azure Static Web Apps](https://docs.microsoft.com/azure/static-web-apps/?WT.mc_id=startup-18441-aapowell).