fix(cypress): Adjust cypress tests for changed theming

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
pull/43405/head
Ferdinand Thiessen 4 months ago
parent 7b4914bce5
commit d247e237b6
No known key found for this signature in database
GPG Key ID: 45FAE7268762B400

@ -21,8 +21,8 @@
*/ */
import { colord } from 'colord' import { colord } from 'colord'
export const defaultPrimary = '#0082c9' const defaultNextcloudBlue = '#0082c9'
export const defaultAccessiblePrimary = '#00679e' export const defaultPrimary = '#00679e'
export const defaultBackground = 'kamil-porembinski-clouds.jpg' export const defaultBackground = 'kamil-porembinski-clouds.jpg'
/** /**
@ -60,14 +60,19 @@ export const validateUserThemingDefaultCss = function(expectedColor = defaultPri
const defaultOptionBackground = defaultSelectButton.css('background-image') const defaultOptionBackground = defaultSelectButton.css('background-image')
const colorPickerOptionColor = defaultSelectButton.css('background-color') const colorPickerOptionColor = defaultSelectButton.css('background-color')
const isNextcloudBlue = colord(colorPickerOptionColor).isEqual('#0082c9')
const isValidBackgroundImage = !expectedBackground const isValidBackgroundImage = !expectedBackground
? defaultOptionBackground === 'none' ? defaultOptionBackground === 'none'
: defaultOptionBackground.includes(expectedBackground) : defaultOptionBackground.includes(expectedBackground)
console.debug({ colorPickerOptionColor: colord(colorPickerOptionColor).toHex(), expectedColor, isValidBackgroundImage }) console.debug({ colorPickerOptionColor: colord(colorPickerOptionColor).toHex(), expectedColor, isValidBackgroundImage, isNextcloudBlue })
return isValidBackgroundImage && colord(colorPickerOptionColor).isEqual(expectedColor) return isValidBackgroundImage && (
colord(colorPickerOptionColor).isEqual(expectedColor)
// we replace nextcloud blue with the the default rpimary (apps/theming/lib/Themes/DefaultTheme.php line 76)
|| (isNextcloudBlue && colord(expectedColor).isEqual(defaultPrimary))
)
} }
export const pickRandomColor = function(): Cypress.Chainable<string> { export const pickRandomColor = function(): Cypress.Chainable<string> {

@ -95,7 +95,7 @@ describe('User select shipped backgrounds and remove background', function() {
// Validate changed background and primary // Validate changed background and primary
cy.wait('@setBackground') cy.wait('@setBackground')
cy.waitUntil(() => validateBodyThemingCss('#56633d', background)) cy.waitUntil(() => validateBodyThemingCss('#869171', background))
}) })
it('Remove background', function() { it('Remove background', function() {
@ -109,7 +109,7 @@ describe('User select shipped backgrounds and remove background', function() {
// Validate clear background // Validate clear background
cy.wait('@clearBackground') cy.wait('@clearBackground')
cy.waitUntil(() => validateBodyThemingCss('#56633d', null)) cy.waitUntil(() => validateBodyThemingCss('#869171', null))
}) })
}) })

Loading…
Cancel
Save