Invert header if primary is bright and background disabled #35666
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,20 +23,8 @@ import type { User } from '@nextcloud/cypress' | |
|
|
||
| const defaultPrimary = '#006aa3' | ||
| const defaultBackground = 'kamil-porembinski-clouds.jpg' | ||
|
|
||
| import { pickRandomColor, validateBodyThemingCss } from './themingUtils' | ||
|
|
||
| describe('User default background settings', function() { | ||
| before(function() { | ||
|
|
@@ -61,7 +49,7 @@ describe('User default background settings', function() { | |
| }) | ||
| }) | ||
|
|
||
| describe('User select shipped backgrounds and remove background', function() { | ||
| before(function() { | ||
| cy.createRandomUser().then((user: User) => { | ||
| cy.login(user) | ||
|
|
@@ -82,7 +70,7 @@ describe('User select shipped backgrounds', function() { | |
|
|
||
| // Validate changed background and primary | ||
| cy.wait('@setBackground') | ||
| cy.waitUntil(() => validateBodyThemingCss('#a53c17', background)) | ||
| }) | ||
|
|
||
| it('Select a bright shipped background', function() { | ||
|
|
@@ -94,7 +82,7 @@ describe('User select shipped backgrounds', function() { | |
|
|
||
| // Validate changed background and primary | ||
| cy.wait('@setBackground') | ||
| cy.waitUntil(() => validateBodyThemingCss('#56633d', background, true)) | ||
| }) | ||
|
|
||
| it('Remove background', function() { | ||
|
|
@@ -105,7 +93,7 @@ describe('User select shipped backgrounds', function() { | |
|
|
||
| // Validate clear background | ||
| cy.wait('@clearBackground') | ||
| cy.waitUntil(() => validateBodyThemingCss('#56633d', '')) | ||
| }) | ||
| }) | ||
|
|
||
|
|
@@ -124,10 +112,9 @@ describe('User select a custom color', function() { | |
| it('Select a custom color', function() { | ||
| cy.intercept('*/apps/theming/background/color').as('setColor') | ||
|
|
||
| pickRandomColor('[data-user-theming-background-color]') | ||
|
|
||
| // Validate custom colour change | ||
| cy.wait('@setColor') | ||
| cy.waitUntil(() => cy.window().then((win) => { | ||
| const primary = getComputedStyle(win.document.body).getPropertyValue('--color-primary') | ||
|
|
@@ -136,6 +123,73 @@ describe('User select a custom color', function() { | |
| }) | ||
| }) | ||
|
|
||
| describe('User select a bright custom color and remove background', function() { | ||
| before(function() { | ||
| cy.createRandomUser().then((user: User) => { | ||
| cy.login(user) | ||
| }) | ||
| }) | ||
|
|
||
| it('See the user background settings', function() { | ||
| cy.visit('/settings/user/theming') | ||
| cy.get('[data-user-theming-background-settings]').scrollIntoView().should('be.visible') | ||
| }) | ||
|
|
||
| it('Remove background', function() { | ||
| cy.intercept('*/apps/theming/background/custom').as('clearBackground') | ||
|
|
||
| // Clear background | ||
| cy.get('[data-user-theming-background-clear]').click() | ||
|
|
||
| // Validate clear background | ||
| cy.wait('@clearBackground') | ||
| cy.waitUntil(() => validateBodyThemingCss(undefined, '')) | ||
| }) | ||
|
|
||
| it('Select a custom color', function() { | ||
| cy.intercept('*/apps/theming/background/color').as('setColor') | ||
|
|
||
| // Pick one of the bright color preset | ||
| cy.get('[data-user-theming-background-color]').click() | ||
| cy.get('.color-picker__simple-color-circle:eq(4)').click() | ||
|
|
||
| // Validate custom colour change | ||
| cy.wait('@setColor') | ||
| }) | ||
|
|
||
| it('See the header being inverted', function() { | ||
| cy.waitUntil(() => cy.window().then((win) => { | ||
| const firstEntry = win.document.querySelector('.app-menu-main li') | ||
| if (!firstEntry) { | ||
| return false | ||
| } | ||
| return getComputedStyle(firstEntry).filter === 'invert(1)' | ||
| })) | ||
| }) | ||
|
|
||
| it('Select a shipped background', function() { | ||
| const background = 'anatoly-mikhaltsov-butterfly-wing-scale.jpg' | ||
| cy.intercept('*/apps/theming/background/shipped').as('setBackground') | ||
|
|
||
| // Select background | ||
| cy.get(`[data-user-theming-background-shipped="${background}"]`).click() | ||
|
|
||
| // Validate changed background and primary | ||
| cy.wait('@setBackground') | ||
| cy.waitUntil(() => validateBodyThemingCss('#a53c17', background)) | ||
| }) | ||
|
|
||
| it('See the header NOT being inverted', function() { | ||
| cy.waitUntil(() => cy.window().then((win) => { | ||
| const firstEntry = win.document.querySelector('.app-menu-main li') | ||
| if (!firstEntry) { | ||
| return false | ||
| } | ||
| return getComputedStyle(firstEntry).filter === 'none' | ||
| })) | ||
| }) | ||
| }) | ||
|
|
||
| describe('User select a custom background', function() { | ||
| const image = 'image.jpg' | ||
| before(function() { | ||
|
|
@@ -160,7 +214,7 @@ describe('User select a custom background', function() { | |
|
|
||
| // Wait for background to be set | ||
| cy.wait('@setBackground') | ||
| cy.waitUntil(() => validateBodyThemingCss('#4c0c04', 'apps/theming/background?v=')) | ||
| }) | ||
| }) | ||
|
|
||
|
|
@@ -192,7 +246,7 @@ describe('User changes settings and reload the page', function() { | |
|
|
||
| // Wait for background to be set | ||
| cy.wait('@setBackground') | ||
| cy.waitUntil(() => validateBodyThemingCss(primaryFromImage, 'apps/theming/background?v=')) | ||
| }) | ||
|
|
||
| it('Select a custom color', function() { | ||
|
|
@@ -211,6 +265,6 @@ describe('User changes settings and reload the page', function() { | |
|
|
||
| it('Reload the page and validate persistent changes', function() { | ||
| cy.reload() | ||
| cy.waitUntil(() => validateBodyThemingCss(selectedColor, 'apps/theming/background?v=')) | ||
| }) | ||
| }) | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change is intentional.
We're in the admin section, we should use
defaultPrimaryColorinstead ofprimaryColorIf logged in, this var will be overruled below in the user section
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you explain their differences ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
defaultPrimaryColor= admin defined, instance-wideprimaryColor= user, active for current session