pkp/pkp-lib#9870 Adjust cypress tests for modal chnages

pkp · Apr 10, 2024 · 40506a6 · 40506a6
1 parent e2046c3
commit 40506a6
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 33 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -1,3 +1,4 @@
 cypress/tests/**/*
 lib/pkp/cypress/**/*
+cypress/support/**/*
 package.json
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
@@ -23,11 +23,11 @@ Cypress.Commands.add('addSubmissionGalleys', (files) => {
 	files.forEach(file => {
 		cy.get('a:contains("Add File")').click();
 		cy.wait(2000); // Avoid occasional failure due to form init taking time
-		cy.get('div.pkp_modal_panel').then($modalDiv => {
+		cy.get('[role="dialog"]').then(($modalDiv) => {
 			cy.wait(3000);
 			$modalDiv.find('div.header:contains("Add File")');
-			cy.get('div.pkp_modal_panel input[id^="label-"]').type('PDF', {delay: 0});
-			cy.get('div.pkp_modal_panel button:contains("Save")').click();
+			cy.get('[role="dialog"] input[id^="label-"]').type('PDF', {delay: 0});
+			cy.get('[role="dialog"] button:contains("Save")').click();
 			cy.wait(2000); // Avoid occasional failure due to form init taking time
 		});
 		cy.get('select[id=genreId]').select(file.genre);

diff --git a/lib/pkp b/lib/pkp
diff --git a/lib/ui-library b/lib/ui-library
diff --git a/plugins/generic/preprintToJournal b/plugins/generic/preprintToJournal
diff --git a/vite.config.js b/vite.config.js
@@ -50,35 +50,35 @@ export default defineConfig(({mode}) => {
 				// use vue version with template compiler
 				vue: 'vue/dist/vue.esm-bundler.js',
 			},
+			// https://github.com/vitejs/vite/discussions/15906
+			dedupe: [
+				'@headlessui/vue',
+				'@lk77/vue3-color',
+				'tinymce/tinymce-vue',
+				'@vue-a11y/announcer',
+				'@vueuse/core',
+				'chart.js',
+				'clone-deep',
+				'copyfiles',
+				'debounce',
+				'dropzone-vue3',
+				'element-resize-event',
+				'floating-vue',
+				'highlight.js',
+				'moment',
+				'ofetch',
+				'pinia',
+				'swiper',
+				'tiny-emitter',
+				'tinymce',
+				'uuid',
+				'vue',
+				'vue-chartjs',
+				'vue-draggable-plus',
+				'vue-scrollto',
+				'vue3-highlightjs',
+			],
 		},
-		// https://github.com/vitejs/vite/discussions/15906
-		dedupe: [
-			'@headlessui/vue',
-			'@lk77/vue3-color',
-			'tinymce/tinymce-vue',
-			'@vue-a11y/announcer',
-			'@vueuse/core',
-			'chart.js',
-			'clone-deep',
-			'copyfiles',
-			'debounce',
-			'dropzone-vue3',
-			'element-resize-event',
-			'floating-vue',
-			'highlight.js',
-			'moment',
-			'ofetch',
-			'pinia',
-			'swiper',
-			'tiny-emitter',
-			'tinymce',
-			'uuid',
-			'vue',
-			'vue-chartjs',
-			'vue-draggable-plus',
-			'vue-scrollto',
-			'vue3-highlightjs',
-		],
 		build: {
 			sourcemap: mode === 'development' ? 'inline' : false,
 			target: ['chrome64', 'edge79', 'firefox67', 'safari12'],
+3 −3		classes/announcement/Repository.php
+3 −3		classes/highlight/Repository.php
+5 −1		classes/submission/Repository.php
+11 −5		classes/submission/maps/Schema.php
+1 −4		classes/task/PKPUsageStatsLoader.php
+34 −8		classes/template/PKPTemplateManager.php
+3 −0		js/classes/Handler.js
+6 −2		js/controllers/modal/AjaxModalHandler.js
+35 −33		js/controllers/modal/ConfirmationModalHandler.js
+9 −86		js/controllers/modal/ModalHandler.js
+0 −1		js/controllers/modal/RemoteActionConfirmationModalHandler.js
+9 −0		locale/en/common.po
+75 −0		locale/en/submission.po
+1 −1		locale/pt_BR/submission.po
+122 −46		pages/dashboard/DashboardHandlerNext.php
+29 −0		pages/dashboard/index.php
+1 −4		pages/login/LoginHandler.php
+2 −3		pages/submissions/index.php
+1 −1		templates/layouts/backend.tpl
+4 −1		tools/i18nExtractKeys.vite.js