From 490f72147e6229f2ea67462488eb7bc33f4b0111 Mon Sep 17 00:00:00 2001 From: Brian Hogg Date: Mon, 16 Dec 2024 14:10:37 -0500 Subject: [PATCH 1/7] Load setup wizard on init to avoid translation errors. --- includes/admin/class.llms.admin.setup.wizard.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/includes/admin/class.llms.admin.setup.wizard.php b/includes/admin/class.llms.admin.setup.wizard.php index 8431f728ca..a454293fd7 100644 --- a/includes/admin/class.llms.admin.setup.wizard.php +++ b/includes/admin/class.llms.admin.setup.wizard.php @@ -118,7 +118,6 @@ public function output_before_importable_course( array $course ): void { get_generated_courses(); - } - } -return new LLMS_Admin_Setup_Wizard(); +function llms_load_admin_setup_wizard() { + return new LLMS_Admin_Setup_Wizard(); +} +add_action( 'init', 'llms_load_admin_setup_wizard' ); From c94ad6d27534b30855e3c61da68a0b96eaf4e7d0 Mon Sep 17 00:00:00 2001 From: Brian Hogg Date: Tue, 17 Dec 2024 11:33:48 -0500 Subject: [PATCH 2/7] Changelog. --- .changelogs/fix_setup-wizard-translations.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changelogs/fix_setup-wizard-translations.yml diff --git a/.changelogs/fix_setup-wizard-translations.yml b/.changelogs/fix_setup-wizard-translations.yml new file mode 100644 index 0000000000..49824c22ef --- /dev/null +++ b/.changelogs/fix_setup-wizard-translations.yml @@ -0,0 +1,5 @@ +significance: patch +type: fixed +links: + - "#2835" +entry: Fix translation error during the setup wizard. From 0d91c1161bc5f3384665b213de22bbdfaa79d797 Mon Sep 17 00:00:00 2001 From: Brian Hogg Date: Tue, 17 Dec 2024 12:05:14 -0500 Subject: [PATCH 3/7] Trying to fix E2E error. --- .../llms-e2e-test-utils/src/import-course.js | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/packages/llms-e2e-test-utils/src/import-course.js b/packages/llms-e2e-test-utils/src/import-course.js index 691fee1864..386668ca78 100644 --- a/packages/llms-e2e-test-utils/src/import-course.js +++ b/packages/llms-e2e-test-utils/src/import-course.js @@ -28,7 +28,7 @@ export async function importCourse( await visitAdminPage( 'admin.php', 'page=llms-import' ); // Upload button - await clickButton('Upload'); + await clickButton( 'Upload' ); const inputSelector = 'input[name="llms_import"]'; await page.waitForSelector( inputSelector ); @@ -37,9 +37,24 @@ export async function importCourse( fileUpload.uploadFile( file ); await page.waitForTimeout( 1000 ); + await page.screenshot({ + path: 'screenshots/before-import.jpg' + }); + await clickButton( 'Import' ); + await page.screenshot({ + path: 'screenshots/after-import.jpg' + }); + + if ( navigate ) { - await clickAndWait( '.llms-admin-notice.notice-success a' ); + await page.screenshot({ + path: 'screenshots/before-click-notice.jpg' + }); + await clickButton( 'Dismiss' ); + await page.screenshot({ + path: 'screenshots/after-click-notice.jpg' + }); } } From aa33f758a60169878f77a375e6390b20b1219996 Mon Sep 17 00:00:00 2001 From: Brian Hogg Date: Tue, 17 Dec 2024 13:00:57 -0500 Subject: [PATCH 4/7] Trying to fix E2E error. --- packages/llms-e2e-test-utils/src/import-course.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/llms-e2e-test-utils/src/import-course.js b/packages/llms-e2e-test-utils/src/import-course.js index 386668ca78..31db2c699a 100644 --- a/packages/llms-e2e-test-utils/src/import-course.js +++ b/packages/llms-e2e-test-utils/src/import-course.js @@ -49,10 +49,12 @@ export async function importCourse( if ( navigate ) { + // Navigate to the first course in the list of imported courses. The first link is the link to the course. await page.screenshot({ path: 'screenshots/before-click-notice.jpg' }); - await clickButton( 'Dismiss' ); + await page.waitForSelector( '.llms-admin-notice.notice-success a:first' ); + await clickAndWait( '.llms-admin-notice.notice-success a:first' ); await page.screenshot({ path: 'screenshots/after-click-notice.jpg' }); From d33dd23147fc52a67cf7aef67b3ec4c2f8d4f07d Mon Sep 17 00:00:00 2001 From: Brian Hogg Date: Tue, 17 Dec 2024 13:01:45 -0500 Subject: [PATCH 5/7] Import notice wait screenshot. --- packages/llms-e2e-test-utils/src/import-course.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/llms-e2e-test-utils/src/import-course.js b/packages/llms-e2e-test-utils/src/import-course.js index 31db2c699a..d3d3c8eaa1 100644 --- a/packages/llms-e2e-test-utils/src/import-course.js +++ b/packages/llms-e2e-test-utils/src/import-course.js @@ -51,9 +51,12 @@ export async function importCourse( if ( navigate ) { // Navigate to the first course in the list of imported courses. The first link is the link to the course. await page.screenshot({ - path: 'screenshots/before-click-notice.jpg' + path: 'screenshots/before-import-notice-wait.jpg' }); await page.waitForSelector( '.llms-admin-notice.notice-success a:first' ); + await page.screenshot({ + path: 'screenshots/before-click-notice.jpg' + }); await clickAndWait( '.llms-admin-notice.notice-success a:first' ); await page.screenshot({ path: 'screenshots/after-click-notice.jpg' From 99359b342ab2108687359d123efcebbdccaa3e06 Mon Sep 17 00:00:00 2001 From: Brian Hogg Date: Tue, 17 Dec 2024 13:09:31 -0500 Subject: [PATCH 6/7] Fixing selector. --- packages/llms-e2e-test-utils/src/import-course.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/llms-e2e-test-utils/src/import-course.js b/packages/llms-e2e-test-utils/src/import-course.js index d3d3c8eaa1..8050f8dc1e 100644 --- a/packages/llms-e2e-test-utils/src/import-course.js +++ b/packages/llms-e2e-test-utils/src/import-course.js @@ -53,11 +53,11 @@ export async function importCourse( await page.screenshot({ path: 'screenshots/before-import-notice-wait.jpg' }); - await page.waitForSelector( '.llms-admin-notice.notice-success a:first' ); + await page.waitForSelector( '.llms-admin-notice.notice-success a' ); await page.screenshot({ path: 'screenshots/before-click-notice.jpg' }); - await clickAndWait( '.llms-admin-notice.notice-success a:first' ); + await clickAndWait( '.llms-admin-notice.notice-success a' ); await page.screenshot({ path: 'screenshots/after-click-notice.jpg' }); From 8d8621ce08cdf8e92442d02ae2ef46f1bbee97d3 Mon Sep 17 00:00:00 2001 From: Brian Hogg Date: Tue, 17 Dec 2024 13:20:55 -0500 Subject: [PATCH 7/7] Removing screenshots. --- .../llms-e2e-test-utils/src/import-course.js | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/packages/llms-e2e-test-utils/src/import-course.js b/packages/llms-e2e-test-utils/src/import-course.js index 8050f8dc1e..b2455bc7fd 100644 --- a/packages/llms-e2e-test-utils/src/import-course.js +++ b/packages/llms-e2e-test-utils/src/import-course.js @@ -28,7 +28,7 @@ export async function importCourse( await visitAdminPage( 'admin.php', 'page=llms-import' ); // Upload button - await clickButton( 'Upload' ); + await clickButton('Upload'); const inputSelector = 'input[name="llms_import"]'; await page.waitForSelector( inputSelector ); @@ -37,29 +37,10 @@ export async function importCourse( fileUpload.uploadFile( file ); await page.waitForTimeout( 1000 ); - await page.screenshot({ - path: 'screenshots/before-import.jpg' - }); - await clickButton( 'Import' ); - await page.screenshot({ - path: 'screenshots/after-import.jpg' - }); - - if ( navigate ) { - // Navigate to the first course in the list of imported courses. The first link is the link to the course. - await page.screenshot({ - path: 'screenshots/before-import-notice-wait.jpg' - }); await page.waitForSelector( '.llms-admin-notice.notice-success a' ); - await page.screenshot({ - path: 'screenshots/before-click-notice.jpg' - }); await clickAndWait( '.llms-admin-notice.notice-success a' ); - await page.screenshot({ - path: 'screenshots/after-click-notice.jpg' - }); } }