chore: merge main into feat/tzaware

chore: merge main into feat/tzaware

Author: jennifer-richards

.github/workflows/build.yml

@@ -173,42 +173,46 @@ jobs:
         name: coverage
         path: coverage.json
 
-  tests-cypress-modern:
-    name: Run Tests (Cypress - Modern)
+  tests-playwright:
+    name: Run Tests (Playwright)
     if: ${{ github.event.inputs.skiptests == 'false' }}
     needs: [prepare]
     runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        project: [chromium, firefox]
 
     steps:
     - uses: actions/checkout@v3
 
+    - uses: actions/setup-node@v2
+      with:
+        node-version: '18'
+
     - name: Run all tests
       run: |
         echo "Installing dependencies..."
         yarn
-        echo "Start Vite Preview..."
-        yarn preview &>/dev/null &
+        echo "Installing Playwright..."
+        cd playwright
+        mkdir test-results
+        npm ci
+        npx playwright install --with-deps ${{ matrix.project }}
         echo "Running tests..."
-        yarn cypress
-        
-    - name: Upload Video Recordings
-      uses: actions/upload-artifact@v3.0.0
-      if: ${{ always() }}
-      continue-on-error: true
-      with:
-        name: videos-modern
-        path: cypress/videos/
+        npx playwright test --project=${{ matrix.project }}
         
-    - name: Upload Screenshots
+    - name: Upload Report
       uses: actions/upload-artifact@v3.0.0
       if: ${{ always() }}
       continue-on-error: true
       with:
-        name: screenshots-modern
-        path: cypress/screenshots/
+        name: playwright-results-${{ matrix.project }}
+        path: playwright/test-results/
+        if-no-files-found: ignore
 
-  tests-cypress-legacy:
-    name: Run Tests (Cypress - Legacy)
+  tests-cypress:
+    name: Run Tests (Cypress)
     if: ${{ github.event.inputs.skiptests == 'false' }}
     needs: [prepare]
     runs-on: ubuntu-latest
@@ -258,6 +262,7 @@ jobs:
       with:
         name: videos-legacy
         path: cypress/videos/
+        if-no-files-found: ignore
 
     - name: Upload Screenshots
       uses: actions/upload-artifact@v3.0.0
@@ -266,14 +271,15 @@ jobs:
       with:
         name: screenshots-modern
         path: cypress/screenshots/
+        if-no-files-found: ignore
 
   # -----------------------------------------------------------------
   # RELEASE
   # -----------------------------------------------------------------
   release:
     name: Make Release
     if: ${{ always() }}
-    needs: [tests-python, tests-cypress-modern, tests-cypress-legacy, prepare]
+    needs: [tests-python, tests-playwright, tests-cypress, prepare]
     runs-on: ubuntu-latest
     env:
       SHOULD_DEPLOY: ${{needs.prepare.outputs.should_deploy}}

.github/workflows/ci-run-tests.yml

@@ -10,8 +10,8 @@ on:
       - 'package.json'
 
 jobs:
-  tests:
-    name: Run Tests
+  tests-python:
+    name: Run Tests (Python)
     runs-on: ubuntu-latest
     container: ghcr.io/ietf-tools/datatracker-app-base:latest
 
@@ -69,3 +69,39 @@ jobs:
       with:
         name: coverage
         path: coverage.json
+        
+  tests-playwright:
+    name: Run Tests (Playwright)
+    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        project: [chromium, firefox]
+    
+    steps:
+    - uses: actions/checkout@v3
+
+    - uses: actions/setup-node@v2
+      with:
+        node-version: '18'
+
+    - name: Run all tests
+      run: |
+        echo "Installing dependencies..."
+        yarn
+        echo "Installing Playwright..."
+        cd playwright
+        mkdir test-results
+        npm ci
+        npx playwright install --with-deps ${{ matrix.project }}
+        echo "Running tests..."
+        npx playwright test --project=${{ matrix.project }}
+        
+    - name: Upload Report
+      uses: actions/upload-artifact@v3.0.0
+      if: ${{ always() }}
+      continue-on-error: true
+      with:
+        name: playwright-results-${{ matrix.project }}
+        path: playwright/test-results/
+        if-no-files-found: ignore

.pnp.cjs

@@ -24,10 +24,6 @@ const agendaStore = useAgendaStore()
 
 const appContainer = ref(null)
 
-// INIT
-
-agendaStore.fetch()
-
 // --------------------------------------------------------------------
 // Handle browser resize
 // --------------------------------------------------------------------

.yarn/cache/builtins-npm-5.0.1-6d4820dd76-66d204657f.zip

@@ -227,8 +227,8 @@ const titleExtra = computed(() => {
   return title
 })
 const meetingDate = computed(() => {
-  const start = DateTime.fromISO(agendaStore.meeting.startDate).setZone(agendaStore.timezone)
-  const end = DateTime.fromISO(agendaStore.meeting.endDate).setZone(agendaStore.timezone)
+  const start = DateTime.fromISO(agendaStore.meeting.startDate, { zone: agendaStore.meeting.timezone }).setZone(agendaStore.timezone)
+  const end = DateTime.fromISO(agendaStore.meeting.endDate, { zone: agendaStore.meeting.timezone }).setZone(agendaStore.timezone)
   if (start.month === end.month) {
     return `${start.toFormat('MMMM d')} - ${end.toFormat('d, y')}`
   } else {
@@ -353,6 +353,8 @@ onBeforeUnmount(() => {
 // MOUNTED
 
 onMounted(() => {
+  agendaStore.fetch(route.params.meetingNumber)
+  
   handleCurrentMeetingRedirect()
 
   // -> Hide Loading Screen