Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
1b00615
test: agenda-neue - separate timezone controls assertions to allow re…
NGPixel Sep 12, 2022
6d4b131
test: agenda-neue - use dom query selectors instead of first() / eq()
NGPixel Sep 12, 2022
05ae9cb
test: agenda-neue - playwright
NGPixel Sep 13, 2022
72ff98e
test: fix playwright setup for ci
NGPixel Sep 13, 2022
99868dd
test: playwright - remove safari + fix timezone local
NGPixel Sep 13, 2022
3f7ce23
test: upload playwright report
NGPixel Sep 13, 2022
52d120f
test: playwright - fix trace upload
NGPixel Sep 13, 2022
3ca4e1b
test
NGPixel Sep 13, 2022
aeed5eb
test: playwright - agenda search
NGPixel Sep 13, 2022
a30d063
test: fix startdate timezone
NGPixel Sep 13, 2022
d9a2283
test: playwright - agenda table events
NGPixel Sep 13, 2022
04d8e67
test: playwright - remove only filter
NGPixel Sep 13, 2022
b946cdf
test: remove exit early flag
NGPixel Sep 13, 2022
980a533
test: allow longer tests
NGPixel Sep 13, 2022
d317b8a
test: agenda materials dialog
NGPixel Sep 14, 2022
2aa30e4
test: agenda filter by area/group
NGPixel Sep 15, 2022
df96ef4
test: agenda calendar view
NGPixel Sep 15, 2022
e210acf
test: agenda settings
NGPixel Sep 15, 2022
467bd2e
test: jump to day
NGPixel Sep 16, 2022
7432c2a
test: fix agenda jump to day timezone parse
NGPixel Sep 16, 2022
2ebdcce
test: increase test timeout
NGPixel Sep 16, 2022
bc28787
test: remove fail fast
NGPixel Sep 16, 2022
d14e287
test: test sharding + increase delay
NGPixel Sep 16, 2022
cb1b9b4
test: fixes
NGPixel Sep 16, 2022
4d8bf39
test: use macos image
NGPixel Sep 16, 2022
b09db09
test: fixes
NGPixel Sep 16, 2022
1584b5a
test: agenda color assign + future + live meeting tests
NGPixel Sep 17, 2022
df1622b
test: agenda mobile tests
NGPixel Sep 17, 2022
baa2b4d
test: remainder of tests for playwright + optimizations
NGPixel Sep 17, 2022
8683add
test: red line intersection accept close value
NGPixel Sep 17, 2022
6b21da1
test: add delay for agenda search tests
NGPixel Sep 17, 2022
a6118db
chore: cleanup old tests + adapt build workflow
NGPixel Sep 17, 2022
cc9bee1
Merge branch 'ietf-tools:main' into main
NGPixel Sep 17, 2022
755f566
ci: fix build workflow
NGPixel Sep 17, 2022
7978324
ci: fix build workflow order
NGPixel Sep 17, 2022
5af8246
fix: point to playwright floor plan images + readme
NGPixel Sep 17, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 25 additions & 19 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -171,42 +171,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
Expand Down Expand Up @@ -256,6 +260,7 @@ jobs:
with:
name: videos-legacy
path: cypress/videos/
if-no-files-found: ignore

- name: Upload Screenshots
uses: actions/upload-artifact@v3.0.0
Expand All @@ -264,14 +269,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}}
Expand Down
63 changes: 42 additions & 21 deletions .pnp.cjs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 0 additions & 4 deletions client/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@ const agendaStore = useAgendaStore()

const appContainer = ref(null)

// INIT

agendaStore.fetch()

// --------------------------------------------------------------------
// Handle browser resize
// --------------------------------------------------------------------
Expand Down
6 changes: 4 additions & 2 deletions client/agenda/Agenda.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -353,6 +353,8 @@ onBeforeUnmount(() => {
// MOUNTED

onMounted(() => {
agendaStore.fetch(route.params.meetingNumber)

handleCurrentMeetingRedirect()

// -> Hide Loading Screen
Expand Down
20 changes: 10 additions & 10 deletions client/agenda/AgendaSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ n-drawer(v-model:show='isShown', placement='right', :width='panelWidth')
n-divider(title-placement='left')
i.bi.bi-globe.me-2
small Timezone
n-button-group.mt-2(style='justify-content: stretch; width: 100%;')
n-button-group.mt-2#agenda-settings-tz-btn(style='justify-content: stretch; width: 100%;')
n-button(
style='flex-grow: 1;'
:type='agendaStore.isTimezoneMeeting ? `primary` : `default`'
Expand All @@ -47,7 +47,7 @@ n-drawer(v-model:show='isShown', placement='right', :width='panelWidth')
:type='agendaStore.timezone === `UTC` ? `primary` : `default`'
@click='setTimezone(`UTC`)'
) UTC
n-select.mt-2(
n-select.mt-2#agenda-settings-tz-ddn(
v-model:value='agendaStore.timezone'
:options='timezones'
placeholder='Select Time Zone'
Expand All @@ -61,7 +61,7 @@ n-drawer(v-model:show='isShown', placement='right', :width='panelWidth')
//- .d-flex.align-items-center.mt-3
//- n-switch.me-3(v-model:value='agendaStore.listDayCollapse', disabled)
//- span.small Collapse Days by Default
.d-flex.align-items-center.mt-3
#agenda-settings-tgl-colorlgd.d-flex.align-items-center.mt-3
n-switch.me-3(
v-model:value='agendaStore.colorLegendShown'
aria-label='Display Color Legend'
Expand All @@ -71,7 +71,7 @@ n-drawer(v-model:show='isShown', placement='right', :width='panelWidth')
template(#trigger)
i.bi.bi-info-circle
span Only displayed when a color is assigned to at least 1 event.
.d-flex.align-items-center.mt-3
#agenda-settings-tgl-infonote.d-flex.align-items-center.mt-3
n-switch.me-3(
v-model:value='agendaStore.infoNoteShown'
aria-label='Display Current Meeting Info Note'
Expand All @@ -81,19 +81,19 @@ n-drawer(v-model:show='isShown', placement='right', :width='panelWidth')
template(#trigger)
i.bi.bi-info-circle
span Any update to the note will result in this setting being turned back on.
.d-flex.align-items-center.mt-3
#agenda-settings-tgl-eventicons.d-flex.align-items-center.mt-3
n-switch.me-3(
v-model:value='agendaStore.eventIconsShown'
aria-label='Display Event Icons'
)
span.small Display Event Icons
.d-flex.align-items-center.mt-3
#agenda-settings-tgl-floorind.d-flex.align-items-center.mt-3
n-switch.me-3(
v-model:value='agendaStore.floorIndicatorsShown'
aria-label='Display Floor Indicators'
)
span.small Display Floor Indicators
.d-flex.align-items-center.mt-3
#agenda-settings-tgl-groupind.d-flex.align-items-center.mt-3
n-switch.me-3(
v-model:value='agendaStore.areaIndicatorsShown'
aria-label='Display Group Area Indicators'
Expand All @@ -103,7 +103,7 @@ n-drawer(v-model:show='isShown', placement='right', :width='panelWidth')
template(#trigger)
i.bi.bi-info-circle
span Will not be shown on smaller screens, regardless of this setting.
.d-flex.align-items-center.mt-3
#agenda-settings-tgl-redline.d-flex.align-items-center.mt-3
n-switch.me-3(
v-model:value='agendaStore.redhandShown'
aria-label='Display Realtime Red Line'
Expand All @@ -113,7 +113,7 @@ n-drawer(v-model:show='isShown', placement='right', :width='panelWidth')
template(#trigger)
i.bi.bi-info-circle
span Only shown during live events. Updated every 5 seconds.
.d-flex.align-items-center.mt-3
#agenda-settings-tgl-boldertxt.d-flex.align-items-center.mt-3
n-switch.me-3(
v-model:value='agendaStore.bolderText'
aria-label='Use Bolder Text'
Expand All @@ -140,7 +140,7 @@ n-drawer(v-model:show='isShown', placement='right', :width='panelWidth')
n-divider#agenda-settings-colors-header(title-placement='left')
i.bi.bi-palette.me-2
small Custom Colors / Tags
.d-flex.align-items-center.mt-3(v-for='(cl, idx) of state.colors')
.agenda-settings-colors-row.d-flex.align-items-center.mt-3(v-for='(cl, idx) of state.colors')
n-color-picker.me-3(
:modes='[`hex`]'
:render-label='() => {}'
Expand Down
Loading