Skip to content

Commit

Permalink
Merge branch 'develop' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@christof-wittreich
christof-wittreich authored Jan 22, 2025
2 parents 683662a + c27a5b5 commit ac04138
Show file tree
Hide file tree
Showing 80 changed files with 657 additions and 641 deletions.
4 changes: 2 additions & 2 deletions e2e/features/animation/animation-test.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ test('Disable playback when max frames exceeded', async () => {
const { playButton, yearStartInput } = selectors
await page.goto(animationGeostationary)
await closeModal(page)
const animateYearDown = page.locator('.wv-date-range-selector > div > div > div:nth-child(3) > svg.downarrow').first()
const animateYearUp = page.locator('.wv-date-range-selector > div > div > div > svg.uparrow').first()
const animateYearDown = page.locator('.wv-date-range-selector > div > div > button:nth-child(3) > svg.downarrow').first()
const animateYearUp = page.locator('.wv-date-range-selector > div > div > button > svg.uparrow').first()
await animateYearDown.click()
await expect(playButton).toHaveClass(/disabled/)
// Playback re-enabled when frames within the max
Expand Down
10 changes: 5 additions & 5 deletions e2e/features/compare/compare-mobile-test.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ test.afterAll(async () => {
test('Mobile comparison A|B toggle buttons are visible and only A is selected by default', async () => {
await page.goto(swipeAndAIsActive)
await closeModal(page)
const aMobileCompareButton = page.locator('.comparison-mobile-select-toggle > div:nth-child(1)')
const bMobileCompareButton = page.locator('.comparison-mobile-select-toggle > div:nth-child(2)')
const aMobileCompareButton = page.locator('#compare-toggle-selected-A')
const bMobileCompareButton = page.locator('#compare-toggle-selected-B')
await expect(aMobileCompareButton).toHaveClass(/compare-btn-selected/)
await expect(bMobileCompareButton).not.toHaveClass(/compare-btn-selected/)
})

// toggle select B change compare mode date to B
test('Toggling to B compare side changes mobile date picker date', async () => {
const { mobileDatePickerSelectButton } = selectors
const bMobileCompareButton = page.locator('.comparison-mobile-select-toggle > div:nth-child(2)')
const bMobileCompareButton = page.locator('#compare-toggle-selected-B')
// confirm initial A mobile date picker date
await expect(mobileDatePickerSelectButton).toHaveText('2018 AUG 17')
// click B compare toggle button and confirm B mobile date picker date
Expand Down Expand Up @@ -63,8 +63,8 @@ test('Expand mobile layer list and confirm comparison mode button is present and
// B compare button toggle is selected on B permalink load and A is not selected
test('B compare button toggle is only selected on B permalink load', async () => {
await page.goto(spyAndBIsActive)
const aMobileCompareButton = page.locator('.comparison-mobile-select-toggle > div:nth-child(1)')
const bMobileCompareButton = page.locator('.comparison-mobile-select-toggle > div:nth-child(2)')
const aMobileCompareButton = page.locator('#compare-toggle-selected-A')
const bMobileCompareButton = page.locator('#compare-toggle-selected-B')
await expect(aMobileCompareButton).not.toHaveClass(/compare-btn-selected/)
await expect(bMobileCompareButton).toHaveClass(/compare-btn-selected/)
})
Expand Down
6 changes: 3 additions & 3 deletions e2e/features/timeline/timeline-test.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ test('Interval defaults to 1 DAY', async () => {
})

test('Change to month zoom level and axis changes', async () => {
await page.locator('.zoom-level-change div.date-arrows.date-arrow-up').click()
await page.locator('.zoom-level-change button.date-arrows.date-arrow-up').click()
const axisGridDay = await page.locator('.axis-grid-text-day').first()
const axisGridMonth = await page.locator('.axis-grid-text-month').first()
const currentZoom = await page.locator('#current-zoom')
Expand All @@ -61,8 +61,8 @@ test('Change to month zoom level and axis changes', async () => {
})

test('Change to year zoom level and axis changes', async () => {
await page.locator('.zoom-level-change div.date-arrows.date-arrow-up').click()
await page.locator('.zoom-level-change div.date-arrows.date-arrow-up').click()
await page.locator('.zoom-level-change button.date-arrows.date-arrow-up').click()
await page.locator('.zoom-level-change button.date-arrows.date-arrow-up').click()
const axisGridDay = await page.locator('.axis-grid-text-day').first()
const axisGridYear = await page.locator('.axis-grid-text-year').first()
const currentZoom = await page.locator('#current-zoom')
Expand Down
16 changes: 8 additions & 8 deletions e2e/test-utils/global-variables/selectors.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ module.exports = (page) => ({
animationButtonCase: page.locator('#timeline-header .animate-button'),
animationButton: page.locator('.animate-button'),
playButton: page.locator('#play-button'),
animateYearUp: page.locator('.wv-date-range-selector > div > div:nth-child(2) > div > svg.uparrow'),
animateYearDown: page.locator('.wv-date-range-selector > div > div > div:nth-child(3) > svg.downarrow'),
animateYearUp: page.locator('.wv-date-range-selector > div > div:nth-child(2) > button > svg.uparrow'),
animateYearDown: page.locator('.wv-date-range-selector > div > div > button:nth-child(3) > svg.downarrow'),
yearStartInput: page.locator('#year-animation-widget-start'),
monthStartInput: page.locator('#month-animation-widget-start'),
dayStartInput: page.locator('#day-animation-widget-start'),
Expand Down Expand Up @@ -112,12 +112,12 @@ module.exports = (page) => ({
dragger: page.locator('.timeline-dragger'),
draggerA: page.locator('.timeline-dragger.draggerA'),
draggerB: page.locator('.timeline-dragger.draggerB'),
dayDown: page.locator('.input-wrapper-day > div.date-arrows.date-arrow-down'),
dayUp: page.locator('.input-wrapper-day > div.date-arrows.date-arrow-up'),
monthDown: page.locator('.input-wrapper-month > div.date-arrows.date-arrow-down'),
monthUp: page.locator('.input-wrapper-month > div.date-arrows.date-arrow-up'),
yearDown: page.locator('.input-wrapper-year > div.date-arrows.date-arrow-down'),
yearUp: page.locator('.input-wrapper-year > div.date-arrows.date-arrow-up'),
dayDown: page.locator('.input-wrapper-day > button.date-arrows.date-arrow-down'),
dayUp: page.locator('.input-wrapper-day > button.date-arrows.date-arrow-up'),
monthDown: page.locator('.input-wrapper-month > button.date-arrows.date-arrow-down'),
monthUp: page.locator('.input-wrapper-month > button.date-arrows.date-arrow-up'),
yearDown: page.locator('.input-wrapper-year > button.date-arrows.date-arrow-down'),
yearUp: page.locator('.input-wrapper-year > button.date-arrows.date-arrow-up'),
datePickerWheel: page.locator('.datepicker-modal .datepicker-wheel'),
dateSelectorDayInput: page.locator('#date-selector-main .input-wrapper-day input'),
dateSelectorMonthInput: page.locator('#date-selector-main .input-wrapper-month input'),
Expand Down
100 changes: 53 additions & 47 deletions package-lock.json
View file

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

Loading

0 comments on commit ac04138

Please sign in to comment.