Merge pull request #1361 from nextcloud/fix/cypress

fix(cypress): Make sure cypress tests work with upcoming Nextcloud 28
nextcloud · Oct 12, 2023 · 73348f6 · 73348f6
2 parents 585cd6b + ab9c080
commit 73348f6
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 17 deletions.
diff --git a/cypress.config.ts b/cypress.config.ts
@@ -46,6 +46,8 @@ export default defineConfig({
 		async setupNodeEvents(on, config) {
 			// Fix browserslist extend https://github.com/cypress-io/cypress/issues/2983#issuecomment-570616682
 			on('file:preprocessor', browserify({ typescript: require.resolve('typescript') }))
+
+			// Enable the snapshot compare plugin
 			getCompareSnapshotsPlugin(on, config)
 
 			// Disable spell checking to prevent rendering differences

diff --git a/cypress/dockerNode.ts b/cypress/dockerNode.ts
@@ -92,7 +92,7 @@ export const startNextcloud = async function(branch: string = 'master'): Promise
 			HostConfig: {
 				Binds: [
 					// TODO: improve local app directory detection
-					`${APP_PATH}/:/var/www/html/apps/${APP_NAME}`,
+					`${APP_PATH}/:/var/www/html/apps/${APP_NAME}:ro`,
 				],
 			},
 			Env: [

diff --git a/cypress/e2e/filesUtils.ts b/cypress/e2e/filesUtils.ts
@@ -53,4 +53,5 @@ export function moveFile (fileName: string, dirName: string) {
 
 export function toggleMenuAction(fileName: string) {
 	cy.get(`[data-cy-files-list] [data-cy-files-list-row-name="${fileName}"] [data-cy-files-list-row-actions] .action-item__menutoggle`).click()
+	cy.get('[data-cy-files-list-row-action]').should('be.visible')
 }
diff --git a/cypress/e2e/settings.cy.ts b/cypress/e2e/settings.cy.ts
@@ -93,27 +93,28 @@ describe('Check that user\'s settings survive a reload', () => {
 	it('Activity summary survive a reload', () => {
 		cy.intercept({ method: 'POST', url: '**/activity/settings' }).as('apiCall')
 
-		cy.get('#app-content')
-			.contains('Send daily activity summary in the morning')
+		cy.contains('[data-cy-checkbox]', 'Send daily activity summary in the morning')
 			.find('input')
 			.check({ force: true })
-		cy.get('#app-content')
-			.contains('Send daily activity summary in the morning')
+		cy.contains('[data-cy-checkbox]', 'Send daily activity summary in the morning')
 			.find('input')
 			.should('be.checked')
 		cy.wait('@apiCall')
 			.reload()
 
-		cy.get('#app-content')
-			.contains('Send daily activity summary in the morning')
+		cy.contains('[data-cy-checkbox]', 'Send daily activity summary in the morning')
+			.scrollIntoView()
 			.find('input')
 			.should('be.checked')
+
+		cy.contains('[data-cy-checkbox]', 'Send daily activity summary in the morning')
+			.find('input')
 			.uncheck({ force: true })
 		cy.wait('@apiCall')
 			.reload()
 
-		cy.get('#app-content')
-			.contains('Send daily activity summary in the morning')
+		cy.contains('[data-cy-checkbox]', 'Send daily activity summary in the morning')
+			.scrollIntoView()
 			.find('input')
 			.should('not.be.checked')
 	})

diff --git a/cypress/e2e/sidebarUtils.ts b/cypress/e2e/sidebarUtils.ts
@@ -25,7 +25,7 @@ import { toggleMenuAction } from "./filesUtils"
 function showSidebarForFile(fileName: string) {
 	closeSidebar()
 	toggleMenuAction(fileName)
-	cy.contains('Open details').click()
+	cy.get('[data-cy-files-list-row-action="details"]').click()
 	cy.get('#app-sidebar-vue').contains('Activity').click()
 }
 
@@ -45,13 +45,13 @@ export function showActivityTab(fileName: string) {
 
 export function addToFavorites(fileName: string) {
 	toggleMenuAction(fileName)
-	cy.contains('Add to favorites').click()
+	cy.get('[data-cy-files-list-row-action="favorite"]').should('contain', 'Add to favorites').click()
 	cy.get('.toast-close').click()
 }
 
 export function removeFromFavorites(fileName: string) {
 	toggleMenuAction(fileName)
-	cy.contains('Remove from favorites').click()
+	cy.get('[data-cy-files-list-row-action="favorite"]').should('contain', 'Remove from favorites').click()
 	cy.get('.toast-close').click()
 }
 

diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
@@ -25,4 +25,3 @@ import { addCommands } from '@nextcloud/cypress'
 // Add custom commands
 import 'cypress-wait-until'
 addCommands()
-
diff --git a/cypress/support/e2e.ts b/cypress/support/e2e.ts
@@ -20,3 +20,6 @@
  *
  */
 import './commands'
+
+// Ignore resize observer errors of Chrome, they are unrelated and save to ignore
+Cypress.on('uncaught:exception', err => !err.message.includes('ResizeObserver'))
diff --git a/js/activity-personalSettings.js b/js/activity-personalSettings.js
diff --git a/js/activity-personalSettings.js.map b/js/activity-personalSettings.js.map
diff --git a/src/views/DailySummary.vue b/src/views/DailySummary.vue
@@ -1,6 +1,8 @@
 <template>
 	<NcSettingsSection :title="t('activity', 'Daily activity summary')">
-		<NcCheckboxRadioSwitch :checked="activityDigestEnabled" @update:checked="toggleActivityDigestEnabled({activityDigestEnabled: $event})">
+		<NcCheckboxRadioSwitch data-cy-checkbox
+			:checked="activityDigestEnabled"
+			@update:checked="toggleActivityDigestEnabled({activityDigestEnabled: $event})">
 			{{ t('activity', 'Send daily activity summary in the morning') }}
 		</NcCheckboxRadioSwitch>
 	</NcSettingsSection>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -25,4 +25,3 @@ import { addCommands } from '@nextcloud/cypress'
		// Add custom commands
		import 'cypress-wait-until'
		addCommands()