From b599ee9b81492b796c6931fb785f60360badbd4b Mon Sep 17 00:00:00 2001 From: qlrd Date: Fri, 8 Mar 2024 17:03:40 -0300 Subject: [PATCH 01/15] added yahboom and cube to devices list --- lib/app.ts | 4 ++-- lib/check-if-it-will-flash.ts | 4 ++-- lib/flash.ts | 12 +++++++++++- package.json | 6 +++--- src/pages/SelectDevice.vue | 5 ++++- src/pages/SelectVersion.vue | 2 +- test/e2e/specs/002.app-startup.spec.mts | 2 +- 7 files changed, 24 insertions(+), 11 deletions(-) diff --git a/lib/app.ts b/lib/app.ts index f590696c..176f0bad 100644 --- a/lib/app.ts +++ b/lib/app.ts @@ -234,8 +234,8 @@ export default class App extends Base { this.log('Creating Browser Window') this.win = new BrowserWindow({ - width: 840, - height: 640, + width: 880, + height: 880, title: this.title, icon: icon, show: false, diff --git a/lib/check-if-it-will-flash.ts b/lib/check-if-it-will-flash.ts index 5f03e6a4..4c537045 100644 --- a/lib/check-if-it-will-flash.ts +++ b/lib/check-if-it-will-flash.ts @@ -43,7 +43,7 @@ export default class CheckIfItWillFlashHandler extends Handler { const os = this.storage.get('os') as string const isMac10 = this.storage.get('isMac10') as boolean - if (device.match(/maixpy_(m5stickv|amigo_ips|amigo_tft|bit|dock)/g)) { + if (device.match(/maixpy_(m5stickv|amigo|amigo_ips|amigo_tft|bit|dock|yahboom|cube)/g)) { if (version.match(/selfcustody\/.*/g)) { const __version__ = version.split('tag/')[1] const destinationResourceZip = join(resources, __version__, `krux-${__version__}.zip`) @@ -89,4 +89,4 @@ export default class CheckIfItWillFlashHandler extends Handler { } }) } -} \ No newline at end of file +} diff --git a/lib/flash.ts b/lib/flash.ts index 675604a2..359a9851 100644 --- a/lib/flash.ts +++ b/lib/flash.ts @@ -70,7 +70,17 @@ export default class FlashHandler extends Handler { // SEE https://github.com/odudex/krux_binaries#flash-instructions if (device.match(/maixpy_dock/g)) { flash.args = ['--verbose', '-B', 'dan', '-b', '1500000', kboot] - } else { + } else if (device.match(/maixpy_yahboom/g)){ + flash.args = ['--verbose', '-B', 'goE', '-b', '1500000', kboot] + if (os === 'linux') { + flash.args.push('-p'), + flash.args.push('/dev/ttyUSB0') + } + if (os === 'win32') { + flash.args.push('-p') + flash.args.push('COM0') + } + }else { flash.args = ['--verbose', '-B', 'goE', '-b', '1500000', kboot] } diff --git a/package.json b/package.json index 2802ff56..b49db27b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "krux-installer", - "version": "0.0.11", + "version": "0.0.12", "main": "dist-electron/main/index.js", "description": "Graphical User Interface to download, verify and flash Krux´s firmware on Kendryte K210 hardwares as bitcoin signature devices", "author": "qlrd <106913782+qlrd@users.noreply.github.com>", @@ -73,7 +73,7 @@ "vite-plugin-electron-renderer": "^0.14.1", "vite-plugin-html": "^3.2.0", "vue": "^3.3.13", - "vue-tsc": "^1.8.26", + "vue-tsc": "^2.0.6", "wdio-electron-service": "^6.0.2" }, "dependencies": { @@ -86,6 +86,6 @@ "vite-plugin-vuetify": "^2.0.1", "vue-asciimorph": "^0.0.3", "vuetify": "^3.4.8", - "yauzl": "^2.10.0" + "yauzl": "^3.1.2" } } diff --git a/src/pages/SelectDevice.vue b/src/pages/SelectDevice.vue index f082021c..6ce5ad79 100644 --- a/src/pages/SelectDevice.vue +++ b/src/pages/SelectDevice.vue @@ -46,10 +46,13 @@ import { Ref, ref } from 'vue' const devices: Ref = ref([ 'maixpy_m5stickv', + 'maixpy_amigo', 'maixpy_amigo_ips', 'maixpy_amigo_tft', 'maixpy_bit', - 'maixpy_dock' + 'maixpy_dock', + 'maixpy_yahboom', + 'maixpy_cube' ]) async function selectDevice (device: string) { diff --git a/src/pages/SelectVersion.vue b/src/pages/SelectVersion.vue index 2b909238..4a5040d8 100644 --- a/src/pages/SelectVersion.vue +++ b/src/pages/SelectVersion.vue @@ -59,4 +59,4 @@ function transformVersion (version: string): string { return version.replace(/[\/\_\.]/g, '-') } - \ No newline at end of file + diff --git a/test/e2e/specs/002.app-startup.spec.mts b/test/e2e/specs/002.app-startup.spec.mts index 3cd2590b..24212c5b 100644 --- a/test/e2e/specs/002.app-startup.spec.mts +++ b/test/e2e/specs/002.app-startup.spec.mts @@ -22,7 +22,7 @@ describe('KruxInstaller start up', () => { const version = await browser.electron.execute(function (electron) { return electron.app.getVersion() }) - expect(version).to.be.equal('0.0.11') + expect(version).to.be.equal('0.0.12') }) }) From db431ba0654ab071c560be1a629920395c99a0ff Mon Sep 17 00:00:00 2001 From: qlrd Date: Mon, 11 Mar 2024 10:28:04 -0300 Subject: [PATCH 02/15] added warning for cube and maixpy_amigo_ips/tft before flash added serialport listing on yahboom flash arguments --- lib/change-page.ts | 2 +- lib/flash.ts | 22 +++++++++++++++------- lib/unzip-resource.ts | 11 +++++++++++ package.json | 1 + 4 files changed, 28 insertions(+), 8 deletions(-) diff --git a/lib/change-page.ts b/lib/change-page.ts index fbd07db1..5914fb35 100644 --- a/lib/change-page.ts +++ b/lib/change-page.ts @@ -44,4 +44,4 @@ export default class ChangePageHandler extends Handler { } }) } -} \ No newline at end of file +} diff --git a/lib/flash.ts b/lib/flash.ts index 359a9851..78bb9460 100644 --- a/lib/flash.ts +++ b/lib/flash.ts @@ -5,6 +5,7 @@ import { join } from 'path' import { SudoerLinux, SudoerDarwin } from '@o/electron-sudo/src/sudoer' import ElectronStore from 'electron-store' import Handler from './handler' +import { SerialPort } from 'serialport' export default class FlashHandler extends Handler { @@ -72,13 +73,20 @@ export default class FlashHandler extends Handler { flash.args = ['--verbose', '-B', 'dan', '-b', '1500000', kboot] } else if (device.match(/maixpy_yahboom/g)){ flash.args = ['--verbose', '-B', 'goE', '-b', '1500000', kboot] - if (os === 'linux') { - flash.args.push('-p'), - flash.args.push('/dev/ttyUSB0') - } - if (os === 'win32') { - flash.args.push('-p') - flash.args.push('COM0') + try { + ports = await SerialPort.list() + ports.forEach(function(port) { + if (product.vendorId == "7523") { + flash.args.push("-p") + if (os === 'linux') { + flash.args.push(port.path) + } else if (os === 'win32') { + flash.args.push(port.comName) + } + } + }) + } catch (error) { + this.send(`${this.name}:error`, { done: false, name: error.name, message: error.message, stack: error.stack }) } }else { flash.args = ['--verbose', '-B', 'goE', '-b', '1500000', kboot] diff --git a/lib/unzip-resource.ts b/lib/unzip-resource.ts index 17ff4926..d707b296 100644 --- a/lib/unzip-resource.ts +++ b/lib/unzip-resource.ts @@ -70,6 +70,17 @@ export default class UnzipResourceHandler extends Handler { const isMac10 = this.storage.get('isMac10') as boolean; version = version.split('tag/')[1]; const zipFilePath = join(resources, version, `krux-${version}.zip`) + + if (version.match(/24\.\d+\.\d+/)) { + if (device.match(/maixpy_amigo_(tft|ips)/g)) { + const error = new Error(`Device '${device}' not used anymore in version ${version}. Use 'maixpy_amigo' instead`) + this.send(`${this.name}:error`, { name: error.name, message: error.message, stack: error.stack}) + } + if (device.match(/maixpy_cube/g)) { + const error = new Error(`Device '${device}' not implemented for version '${version}'`) + this.send(`${this.name}:error`, { name: error.name, message: error.message, stack: error.stack}) + } + } this.send(`${this.name}:data`, `Extracting ${zipFilePath}

`) diff --git a/package.json b/package.json index b49db27b..ee1359fb 100644 --- a/package.json +++ b/package.json @@ -83,6 +83,7 @@ "command-exists": "^1.2.9", "debug": "^4.3.4", "electron-store": "^8.1.0", + "serialport": "^12.0.0", "vite-plugin-vuetify": "^2.0.1", "vue-asciimorph": "^0.0.3", "vuetify": "^3.4.8", From 92e51db1e2dd56d3e4b0ed921c7e3cb783d17b6f Mon Sep 17 00:00:00 2001 From: qlrddev Date: Mon, 11 Mar 2024 17:40:06 -0300 Subject: [PATCH 03/15] fixed hash verification fixed yahboom flashing process with official firmware --- lib/flash.ts | 6 +++--- lib/verify-official-releases-hash.ts | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/flash.ts b/lib/flash.ts index 78bb9460..412de88f 100644 --- a/lib/flash.ts +++ b/lib/flash.ts @@ -74,9 +74,9 @@ export default class FlashHandler extends Handler { } else if (device.match(/maixpy_yahboom/g)){ flash.args = ['--verbose', '-B', 'goE', '-b', '1500000', kboot] try { - ports = await SerialPort.list() + const ports = await SerialPort.list() ports.forEach(function(port) { - if (product.vendorId == "7523") { + if (port.productId == "7523") { flash.args.push("-p") if (os === 'linux') { flash.args.push(port.path) @@ -88,7 +88,7 @@ export default class FlashHandler extends Handler { } catch (error) { this.send(`${this.name}:error`, { done: false, name: error.name, message: error.message, stack: error.stack }) } - }else { + } else { flash.args = ['--verbose', '-B', 'goE', '-b', '1500000', kboot] } diff --git a/lib/verify-official-releases-hash.ts b/lib/verify-official-releases-hash.ts index 91d96921..72846a5c 100644 --- a/lib/verify-official-releases-hash.ts +++ b/lib/verify-official-releases-hash.ts @@ -60,7 +60,8 @@ export default class VerifyOfficialReleasesHashHandler extends Handler { try { const exists = await existsAsync(p) const sha256buffer = await readFileAsync(shaFilePath, null) - const sha256txt = sha256buffer.toString() + const sha256txt = sha256buffer.toString().split(" ")[0] + if (exists && sha256txt !== '') { result.push({ name: shaFileRelPath, @@ -75,7 +76,7 @@ export default class VerifyOfficialReleasesHashHandler extends Handler { name: zipFileRelPath, value: hashSum.digest('hex') }) - + const isMatch = result[0].value === result[1].value if (isMatch) { @@ -106,4 +107,4 @@ export default class VerifyOfficialReleasesHashHandler extends Handler { const interval = setInterval(verify, 1000, shaFilePath) }) } -} \ No newline at end of file +} From eab783778a488313a022f0582660d82098cd5b30 Mon Sep 17 00:00:00 2001 From: qlrddev Date: Mon, 11 Mar 2024 18:22:34 -0300 Subject: [PATCH 04/15] fixing tests for release v24.03.0 --- test/e2e/pageobjects/app.page.ts | 26 +++++++++---------- .../013.select-version-show-only.spec.mts | 2 +- .../039-verified-official-release.spec.mts | 12 ++++----- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/test/e2e/pageobjects/app.page.ts b/test/e2e/pageobjects/app.page.ts index 6341734c..2232d1bf 100644 --- a/test/e2e/pageobjects/app.page.ts +++ b/test/e2e/pageobjects/app.page.ts @@ -148,10 +148,10 @@ class App { this.__select_device_page_maixpy_back_text__ = 'div#select-device-page-back-text' this.__select_version_page__ = 'div#select-version-page'; - this.__select_version_page_selfcustody_button__ = 'div#select-version-page-selfcustody-krux-releases-tag-v23-09-1-button' + this.__select_version_page_selfcustody_button__ = 'div#select-version-page-selfcustody-krux-releases-tag-v24.03.0-button' this.__select_version_page_back_button__ = 'div#select-version-page-back-button' this.__select_version_page_odudex_button__ = 'div#select-version-page-odudex-krux-binaries-button' - this.__select_version_page_selfcustody_text__ = 'div#select-version-page-selfcustody-krux-releases-tag-v23-09-1-text' + this.__select_version_page_selfcustody_text__ = 'div#select-version-page-selfcustody-krux-releases-tag-v24.03.0-text' this.__select_version_page_odudex_text__ = 'div#select-version-page-odudex-krux-binaries-text' this.__select_version_page_back_text__ = 'div#select-version-page-back-text' @@ -162,22 +162,22 @@ class App { this.__download_official_release_zip_subtitle__ = 'div#download-official-release-zip-page-subtitle' this.__download_official_release_zip_progress__ = 'div#download-official-release-zip-page-progress' - this.__checking_release_zip_msg__ = 'pre#checking-v23-09-1-krux-v23-09-1-zip' - this.__not_found_release_zip_msg__ = 'pre#v23-09-1-krux-v23-09-1-zip-not-found' - this.__found_release_zip_msg__ = 'pre#v23-09-1-krux-v23-09-1-zip-found' + this.__checking_release_zip_msg__ = 'pre#checking-v24.03.0-krux-v24.03.0-zip' + this.__not_found_release_zip_msg__ = 'pre#v24.03.0-krux-v24.03.0-zip-not-found' + this.__found_release_zip_msg__ = 'pre#v24.03.0-krux-v24.03.0-zip-found' - this.__checking_release_zip_sha256_txt_msg__ = 'pre#checking-v23-09-1-krux-v23-09-1-zip-sha256-txt' - this.__not_found_release_zip_sha256_txt_msg__ = 'pre#v23-09-1-krux-v23-09-1-zip-sha256-txt-not-found' - this.__found_release_zip_sha256_txt_msg__ = 'pre#v23-09-1-krux-v23-09-1-zip-sha256-txt-found' + this.__checking_release_zip_sha256_txt_msg__ = 'pre#checking-v24.03.0-krux-v24.03.0-zip-sha256-txt' + this.__not_found_release_zip_sha256_txt_msg__ = 'pre#v24.03.0-krux-v24.03.0-zip-sha256-txt-not-found' + this.__found_release_zip_sha256_txt_msg__ = 'pre#v24.03.0-krux-v24.03.0-zip-sha256-txt-found' this.__download_official_release_zip_sha256_txt_page__ = 'div#download-official-release-zip-sha256-txt-page' this.__download_official_release_zip_sha256_txt_page_title__ = 'div#download-official-release-zip-sha256-txt-page-title' this.__download_official_release_zip_sha256_txt_page_subtitle__ = 'div#download-official-release-zip-sha256-txt-page-subtitle' this.__download_official_release_zip_sha256_txt_page_progress__ = 'div#download-official-release-zip-sha256-txt-page-progress' - this.__checking_release_zip_sig_msg__ = 'pre#checking-v23-09-1-krux-v23-09-1-zip-sig' - this.__not_found_release_zip_sig_msg__ = 'pre#v23-09-1-krux-v23-09-1-zip-sig-not-found' - this.__found_release_zip_sig_msg__ = 'pre#v23-09-1-krux-v23-09-1-zip-sig-found' + this.__checking_release_zip_sig_msg__ = 'pre#checking-v24.03.0-krux-v24.03.0-zip-sig' + this.__not_found_release_zip_sig_msg__ = 'pre#v24.03.0-krux-v24.03.0-zip-sig-not-found' + this.__found_release_zip_sig_msg__ = 'pre#v24.03.0-krux-v24.03.0-zip-sig-found' this.__download_official_release_zip_sig_page__ = 'div#download-official-release-zip-sig-page' this.__download_official_release_zip_sig_title__ = 'div#download-official-release-zip-sig-page-title' @@ -216,8 +216,8 @@ class App { this.__verified_official_release_page__ = 'div#verified-official-release-page' this.__verified_official_release_page_sha256_integrity_title__ = 'div#verified-official-release-page-sha256-integrity-title' - this.__verified_official_release_page_sha256_integrity_txt__ = 'div#verified-official-release-page-sha256-integrity-v23-09-1-krux-v23-09-1-zip-sha256-txt' - this.__verified_official_release_page_sha256_integrity__ = 'div#verified-official-release-page-sha256-integrity-v23-09-1-krux-v23-09-1-zip' + this.__verified_official_release_page_sha256_integrity_txt__ = 'div#verified-official-release-page-sha256-integrity-v24.03.0-krux-v24.03.0-zip-sha256-txt' + this.__verified_official_release_page_sha256_integrity__ = 'div#verified-official-release-page-sha256-integrity-v24.03.0-krux-v24.03.0-zip' this.__verified_official_release_page_signature_title__ = 'div#verified-official-release-page-signature-title' this.__verified_official_release_page_signature_command__ = 'span#verified-official-release-page-signature-command' this.__verified_official_release_page_signature_result__ = 'span#verified-official-release-page-signature-result' diff --git a/test/e2e/specs/013.select-version-show-only.spec.mts b/test/e2e/specs/013.select-version-show-only.spec.mts index fd793e80..9d12954d 100644 --- a/test/e2e/specs/013.select-version-show-only.spec.mts +++ b/test/e2e/specs/013.select-version-show-only.spec.mts @@ -87,7 +87,7 @@ describe('KruxInstaller SelectVersion page (show only)', () => { await expect(instance.selectVersionOdudexButton).toBeDisplayed() }) - it('should \'selfcustody/krux/releases/tag/v23.09.1\' button have \'selfcustody/krux/releases/tag/v23.09.1\' text', async () => { + it('should \'odudex\/krux_binaries\' button have \'odudex\/krux_binaries\' text', async () => { await instance.selectVersionOdudexText.waitForExist() await expect(instance.selectVersionOdudexText).toHaveText('odudex/krux_binaries') }) diff --git a/test/e2e/specs/039-verified-official-release.spec.mts b/test/e2e/specs/039-verified-official-release.spec.mts index 7f35111b..d85e9d2d 100644 --- a/test/e2e/specs/039-verified-official-release.spec.mts +++ b/test/e2e/specs/039-verified-official-release.spec.mts @@ -7,8 +7,8 @@ import { createRequire } from 'module' const App = createRequire(import.meta.url)('../pageobjects/app.page') -const SHA256 = "4d 58 39 27 a7 22 06 e0 2a 8e 58 13 48 94 37 7c 94 e2 cc 9b 65 1f 16 11 bd de 1f bf 29 4c 78 26" - +// const SHA256 = "4d 58 39 27 a7 22 06 e0 2a 8e 58 13 48 94 37 7c 94 e2 cc 9b 65 1f 16 11 bd de 1f bf 29 4c 78 26" +const SHA256 = "7c af 10 c5 37 45 f8 29 e0 81 30 48 22 10 a0 5f 40 1b e9 91 75 7c 81 58 68 88 53 e1 75 7e fd 5d" describe('KruxInstaller VerifiedOfficialRelease page (show and click back button)', () => { let instance: any; @@ -100,13 +100,13 @@ describe('KruxInstaller VerifiedOfficialRelease page (show and click back button await instance.verifiedOfficialReleasePageSha2256IntegritySha256txt.waitForExist() await expect(instance.verifiedOfficialReleasePageSha2256IntegritySha256txt).toBeDisplayed() - await expect(instance.verifiedOfficialReleasePageSha2256IntegritySha256txt).toHaveText(`Expected result from file v23.09.1/krux-v23.09.1.zip.sha256.txt\n${SHA256}`) + await expect(instance.verifiedOfficialReleasePageSha2256IntegritySha256txt).toHaveText(`Expected result from file v24.03.0/krux-v24.03.0.zip.sha256.txt\n${SHA256}`) }) it('should show sha256sum intergrity sha256 summed result', async () => { await instance.verifiedOfficialReleasePageSha2256IntegritySha256.waitForExist() await expect(instance.verifiedOfficialReleasePageSha2256IntegritySha256).toBeDisplayed() - await expect(instance.verifiedOfficialReleasePageSha2256IntegritySha256).toHaveText(`Summed result of file v23.09.1/krux-v23.09.1.zip\n${SHA256}`) + await expect(instance.verifiedOfficialReleasePageSha2256IntegritySha256).toHaveText(`Summed result of file v24.03.0/krux-v24.03.0.zip\n${SHA256}`) }) it('should show openssl authenticity title', async () => { @@ -149,9 +149,9 @@ describe('KruxInstaller VerifiedOfficialRelease page (show and click back button } } - const resourceZip = join(resources, 'v23.09.1', 'krux-v23.09.1.zip') + const resourceZip = join(resources, 'v24.03.0', 'krux-v24.03.0.zip') const resourcePem = join(resources, 'main', 'selfcustody.pem') - const resourceSig = join(resources, 'v23.09.1', 'krux-v23.09.1.zip.sig') + const resourceSig = join(resources, 'v24.03.0', 'krux-v24.03.0.zip.sig') const command = [ '$>', `${openssl} sha256 <${resourceZip}`, From 5bd50dbe6dcc959e7dcfc708941ebcfa105ced69 Mon Sep 17 00:00:00 2001 From: qlrddev Date: Mon, 11 Mar 2024 18:24:38 -0300 Subject: [PATCH 05/15] fixing tests for release v24.03.0 II --- test/e2e/specs/013.select-version-show-only.spec.mts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/e2e/specs/013.select-version-show-only.spec.mts b/test/e2e/specs/013.select-version-show-only.spec.mts index 9d12954d..992a7715 100644 --- a/test/e2e/specs/013.select-version-show-only.spec.mts +++ b/test/e2e/specs/013.select-version-show-only.spec.mts @@ -72,14 +72,14 @@ describe('KruxInstaller SelectVersion page (show only)', () => { await expect(instance.selectVersionPage).toBeDisplayed() }) - it('should \'selfcustody/krux/releases/tag/v23.09.1\' button appear', async () => { + it('should \'selfcustody/krux/releases/tag/v24.03.0\' button appear', async () => { await instance.selectVersionSelfcustodyButton.waitForExist() await expect(instance.selectVersionSelfcustodyButton).toBeDisplayed() }) - it('should \'selfcustody/krux/releases/tag/v23.09.1\' button have \'selfcustody/krux/releases/tag/v23.09.1\' text', async () => { + it('should \'selfcustody/krux/releases/tag/v24.03.0\' button have \'selfcustody/krux/releases/tag/v24.03.0\' text', async () => { await instance.selectVersionSelfcustodyText.waitForExist() - await expect(instance.selectVersionSelfcustodyText).toHaveText('selfcustody/krux/releases/tag/v23.09.1') + await expect(instance.selectVersionSelfcustodyText).toHaveText('selfcustody/krux/releases/tag/v24.03.0') }) it('should \'odudex/krux_binaries\' button appear', async () => { From 807842a4136c827b69042f4c604e93d57dafa4fe Mon Sep 17 00:00:00 2001 From: qlrddev Date: Mon, 11 Mar 2024 18:35:57 -0300 Subject: [PATCH 06/15] fixing tests for release v24.03.0 III --- test/e2e/pageobjects/app.page.ts | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/test/e2e/pageobjects/app.page.ts b/test/e2e/pageobjects/app.page.ts index 2232d1bf..233a4882 100644 --- a/test/e2e/pageobjects/app.page.ts +++ b/test/e2e/pageobjects/app.page.ts @@ -148,10 +148,10 @@ class App { this.__select_device_page_maixpy_back_text__ = 'div#select-device-page-back-text' this.__select_version_page__ = 'div#select-version-page'; - this.__select_version_page_selfcustody_button__ = 'div#select-version-page-selfcustody-krux-releases-tag-v24.03.0-button' + this.__select_version_page_selfcustody_button__ = 'div#select-version-page-selfcustody-krux-releases-tag-v24-03-0-button' this.__select_version_page_back_button__ = 'div#select-version-page-back-button' this.__select_version_page_odudex_button__ = 'div#select-version-page-odudex-krux-binaries-button' - this.__select_version_page_selfcustody_text__ = 'div#select-version-page-selfcustody-krux-releases-tag-v24.03.0-text' + this.__select_version_page_selfcustody_text__ = 'div#select-version-page-selfcustody-krux-releases-tag-v24-03-0-text' this.__select_version_page_odudex_text__ = 'div#select-version-page-odudex-krux-binaries-text' this.__select_version_page_back_text__ = 'div#select-version-page-back-text' @@ -162,22 +162,22 @@ class App { this.__download_official_release_zip_subtitle__ = 'div#download-official-release-zip-page-subtitle' this.__download_official_release_zip_progress__ = 'div#download-official-release-zip-page-progress' - this.__checking_release_zip_msg__ = 'pre#checking-v24.03.0-krux-v24.03.0-zip' - this.__not_found_release_zip_msg__ = 'pre#v24.03.0-krux-v24.03.0-zip-not-found' - this.__found_release_zip_msg__ = 'pre#v24.03.0-krux-v24.03.0-zip-found' + this.__checking_release_zip_msg__ = 'pre#checking-v24-03-0-krux-v24-03-0-zip' + this.__not_found_release_zip_msg__ = 'pre#v24-03-0-krux-v24-03-0-zip-not-found' + this.__found_release_zip_msg__ = 'pre#v24-03-0-krux-v24-03-0-zip-found' - this.__checking_release_zip_sha256_txt_msg__ = 'pre#checking-v24.03.0-krux-v24.03.0-zip-sha256-txt' - this.__not_found_release_zip_sha256_txt_msg__ = 'pre#v24.03.0-krux-v24.03.0-zip-sha256-txt-not-found' - this.__found_release_zip_sha256_txt_msg__ = 'pre#v24.03.0-krux-v24.03.0-zip-sha256-txt-found' + this.__checking_release_zip_sha256_txt_msg__ = 'pre#checking-v24-03-0-krux-v24-03-0-zip-sha256-txt' + this.__not_found_release_zip_sha256_txt_msg__ = 'pre#v24-03-0-krux-v24-03-0-zip-sha256-txt-not-found' + this.__found_release_zip_sha256_txt_msg__ = 'pre#v24-03-0-krux-v24-03-0-zip-sha256-txt-found' this.__download_official_release_zip_sha256_txt_page__ = 'div#download-official-release-zip-sha256-txt-page' this.__download_official_release_zip_sha256_txt_page_title__ = 'div#download-official-release-zip-sha256-txt-page-title' this.__download_official_release_zip_sha256_txt_page_subtitle__ = 'div#download-official-release-zip-sha256-txt-page-subtitle' this.__download_official_release_zip_sha256_txt_page_progress__ = 'div#download-official-release-zip-sha256-txt-page-progress' - this.__checking_release_zip_sig_msg__ = 'pre#checking-v24.03.0-krux-v24.03.0-zip-sig' - this.__not_found_release_zip_sig_msg__ = 'pre#v24.03.0-krux-v24.03.0-zip-sig-not-found' - this.__found_release_zip_sig_msg__ = 'pre#v24.03.0-krux-v24.03.0-zip-sig-found' + this.__checking_release_zip_sig_msg__ = 'pre#checking-v24-03-0-krux-v24-03-0-zip-sig' + this.__not_found_release_zip_sig_msg__ = 'pre#v24-03-0-krux-v24-03-0-zip-sig-not-found' + this.__found_release_zip_sig_msg__ = 'pre#v24-03-0-krux-v24-03-0-zip-sig-found' this.__download_official_release_zip_sig_page__ = 'div#download-official-release-zip-sig-page' this.__download_official_release_zip_sig_title__ = 'div#download-official-release-zip-sig-page-title' @@ -216,8 +216,8 @@ class App { this.__verified_official_release_page__ = 'div#verified-official-release-page' this.__verified_official_release_page_sha256_integrity_title__ = 'div#verified-official-release-page-sha256-integrity-title' - this.__verified_official_release_page_sha256_integrity_txt__ = 'div#verified-official-release-page-sha256-integrity-v24.03.0-krux-v24.03.0-zip-sha256-txt' - this.__verified_official_release_page_sha256_integrity__ = 'div#verified-official-release-page-sha256-integrity-v24.03.0-krux-v24.03.0-zip' + this.__verified_official_release_page_sha256_integrity_txt__ = 'div#verified-official-release-page-sha256-integrity-v24-03-0-krux-v24-03-0-zip-sha256-txt' + this.__verified_official_release_page_sha256_integrity__ = 'div#verified-official-release-page-sha256-integrity-v24-03-0-krux-v24-03-0-zip' this.__verified_official_release_page_signature_title__ = 'div#verified-official-release-page-signature-title' this.__verified_official_release_page_signature_command__ = 'span#verified-official-release-page-signature-command' this.__verified_official_release_page_signature_result__ = 'span#verified-official-release-page-signature-result' From b7a5efac3ac478c71a5be76ec22b4aeb57033cf1 Mon Sep 17 00:00:00 2001 From: qlrddev Date: Mon, 11 Mar 2024 18:44:22 -0300 Subject: [PATCH 07/15] fixing tests for release v24.03.0 IV --- ...lect-version-selfcustody-release-zip.spec.mts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/e2e/specs/014.select-version-selfcustody-release-zip.spec.mts b/test/e2e/specs/014.select-version-selfcustody-release-zip.spec.mts index 943c8825..8b534dfe 100644 --- a/test/e2e/specs/014.select-version-selfcustody-release-zip.spec.mts +++ b/test/e2e/specs/014.select-version-selfcustody-release-zip.spec.mts @@ -39,25 +39,25 @@ describe('KruxInstaller SelectVersion page (download release)', () => { await instance.selectVersionOdudexText.waitForExist() }) - it('should click on \'selfcustody/krux/tags/v23.09.1\' and go to ConsoleLoad page', async () => { + it('should click on \'selfcustody/krux/tags/v24.03.0\' and go to ConsoleLoad page', async () => { await instance.selectVersionSelfcustodyButton.click() await instance.selectVersionPage.waitForExist({ reverse: true }) await expect(instance.selectVersionPage).not.toBeDisplayed() }) - it('should \'Checking v23.09.1/krux-v23.09.1.zip\' message appears', async () => { + it('should \'Checking v24.03.0/krux-v24.03.0.zip\' message appears', async () => { await instance.checkingReleaseZipMsg.waitForExist() await expect(instance.checkingReleaseZipMsg).toBeDisplayed() - await expect(instance.checkingReleaseZipMsg).toHaveText('Checking v23.09.1/krux-v23.09.1.zip') + await expect(instance.checkingReleaseZipMsg).toHaveText('Checking v24.03.0/krux-v24.03.0.zip') }) - it('should \'v23.09.1/krux-v23.09.1.zip not found\' message appears', async () => { + it('should \'v24.03.0/krux-v24.03.0.zip not found\' message appears', async () => { await instance.notFoundReleaseZipMsg.waitForExist() await expect(instance.notFoundReleaseZipMsg).toBeDisplayed() if (process.platform === 'linux' || process.platform === 'darwin') { - await expect(instance.notFoundReleaseZipMsg).toHaveText('v23.09.1/krux-v23.09.1.zip not found') + await expect(instance.notFoundReleaseZipMsg).toHaveText('v24.03.0/krux-v24.03.0.zip not found') } else if (process.platform === 'win32') { - await expect(instance.notFoundReleaseZipMsg).toHaveText('v23.09.1\\krux-v23.09.1.zip not found') + await expect(instance.notFoundReleaseZipMsg).toHaveText('v24.03.0\\krux-v24.03.0.zip not found') } }) @@ -72,10 +72,10 @@ describe('KruxInstaller SelectVersion page (download release)', () => { await expect(instance.downloadOfficialReleaseZipTitle).toHaveText('Downloading') }) - it('should DownloadOfficialReleaseZip page have \'https://github.com/selfcustody/krux/releases/download/v23.09.1/krux-v23.09.1.zip\' subtitle', async () => { + it('should DownloadOfficialReleaseZip page have \'https://github.com/selfcustody/krux/releases/download/v24.03.0/krux-v24.03.0.zip\' subtitle', async () => { await instance.downloadOfficialReleaseZipTitle.waitForExist() await expect(instance.downloadOfficialReleaseZipSubtitle).toBeDisplayed() - await expect(instance.downloadOfficialReleaseZipSubtitle).toHaveText('https://github.com/selfcustody/krux/releases/download/v23.09.1/krux-v23.09.1.zip') + await expect(instance.downloadOfficialReleaseZipSubtitle).toHaveText('https://github.com/selfcustody/krux/releases/download/v24.03.0/krux-v24.03.0.zip') }) it('should DownloadOfficialReleaseZip page progress until 100%', async () => { From bc036bb83cac84e82d5d32c6991cf560789a9f6b Mon Sep 17 00:00:00 2001 From: qlrddev Date: Mon, 11 Mar 2024 18:52:44 -0300 Subject: [PATCH 08/15] fixing tests for release v24.03.0 V --- ...ready-downloaded-selfcustody-release-zip.spec.mts | 12 ++++++------ ...elfcustody-release-zip-click-back-button.spec.mts | 4 ++-- ...dy-release-zip-click-show-details-button.spec.mts | 10 +++++----- ...e-zip-sha256-click-download-again-button.spec.mts | 4 ++-- ...lect-version-selfcustody-release-zip-sig.spec.mts | 8 ++++---- ...y-downloaded-selfcustody-release-zip-sig.spec.mts | 12 ++++++------ ...ustody-release-zip-sig-click-back-button.spec.mts | 4 ++-- ...tody-release-zip-sig-show-details-button.spec.mts | 10 +++++----- ...dy-release-zip-sig-download-again-button.spec.mts | 4 ++-- ...loaded-selfcustody-pem-click-back-button.spec.mts | 4 ++-- 10 files changed, 36 insertions(+), 36 deletions(-) diff --git a/test/e2e/specs/015.already-downloaded-selfcustody-release-zip.spec.mts b/test/e2e/specs/015.already-downloaded-selfcustody-release-zip.spec.mts index 15f8e1cc..264bb685 100644 --- a/test/e2e/specs/015.already-downloaded-selfcustody-release-zip.spec.mts +++ b/test/e2e/specs/015.already-downloaded-selfcustody-release-zip.spec.mts @@ -42,13 +42,13 @@ describe('KruxInstaller SelectVersion page (already downloaded release - show on await instance.checkingReleaseZipMsg.waitForExist() }) - it('should \'v23.09.1/krux-v23.09.1.zip found\' message appears', async () => { + it('should \'v24.03.0/krux-v24.03.0.zip found\' message appears', async () => { await instance.foundReleaseZipMsg.waitForExist() await expect(instance.foundReleaseZipMsg).toBeDisplayed() if (process.platform === 'linux' || process.platform === 'darwin') { - await expect(instance.foundReleaseZipMsg).toHaveText('v23.09.1/krux-v23.09.1.zip found') + await expect(instance.foundReleaseZipMsg).toHaveText('v24.03.0/krux-v24.03.0.zip found') } else if (process.platform === 'win32') { - await expect(instance.foundReleaseZipMsg).toHaveText('v23.09.1\\krux-v23.09.1.zip found') + await expect(instance.foundReleaseZipMsg).toHaveText('v24.03.0\\krux-v24.03.0.zip found') } }) @@ -57,13 +57,13 @@ describe('KruxInstaller SelectVersion page (already downloaded release - show on await expect(instance.warningDownloadPage).toBeDisplayed() }) - it('should \'v23.09.1/krux-v23.09.1.zip already downloaded\' message be displayed', async () => { + it('should \'v24.03.0/krux-v24.03.0.zip already downloaded\' message be displayed', async () => { await instance.warningAlreadyDownloadedText.waitForExist() await expect(instance.warningAlreadyDownloadedText).toBeDisplayed() if (process.platform === 'linux' || process.platform === 'darwin') { - await expect(instance.warningAlreadyDownloadedText).toHaveText('v23.09.1/krux-v23.09.1.zip already downloaded') + await expect(instance.warningAlreadyDownloadedText).toHaveText('v24.03.0/krux-v24.03.0.zip already downloaded') } else if (process.platform === 'win32') { - await expect(instance.warningAlreadyDownloadedText).toHaveText('v23.09.1\\krux-v23.09.1.zip already downloaded') + await expect(instance.warningAlreadyDownloadedText).toHaveText('v24.03.0\\krux-v24.03.0.zip already downloaded') } }) diff --git a/test/e2e/specs/016.already-downloaded-selfcustody-release-zip-click-back-button.spec.mts b/test/e2e/specs/016.already-downloaded-selfcustody-release-zip-click-back-button.spec.mts index dfe008d4..60f1af86 100644 --- a/test/e2e/specs/016.already-downloaded-selfcustody-release-zip-click-back-button.spec.mts +++ b/test/e2e/specs/016.already-downloaded-selfcustody-release-zip-click-back-button.spec.mts @@ -64,9 +64,9 @@ describe('KruxInstaller SelectVersion page (already downloaded release - click b await expect(instance.mainPage).toBeDisplayed() }) - it('should \'Select version\' button changed to \'Version: selfcustody/krux/releases/tag/v23.09.1\'', async () => { + it('should \'Select version\' button changed to \'Version: selfcustody/krux/releases/tag/v24.03.0\'', async () => { await instance.mainSelectVersionText.waitForExist() await expect(instance.mainSelectVersionText).toBeDisplayed() - await expect(instance.mainSelectVersionText).toHaveText('Version: selfcustody/krux/releases/tag/v23.09.1') + await expect(instance.mainSelectVersionText).toHaveText('Version: selfcustody/krux/releases/tag/v24.03.0') }) }) diff --git a/test/e2e/specs/017.already-downloaded-selfcustody-release-zip-click-show-details-button.spec.mts b/test/e2e/specs/017.already-downloaded-selfcustody-release-zip-click-show-details-button.spec.mts index f669d605..953ee725 100644 --- a/test/e2e/specs/017.already-downloaded-selfcustody-release-zip-click-show-details-button.spec.mts +++ b/test/e2e/specs/017.already-downloaded-selfcustody-release-zip-click-show-details-button.spec.mts @@ -72,16 +72,16 @@ describe('KruxInstaller SelectVersion page (already downloaded release - click s await expect(instance.warningAlreadyDownloadedOverlayTitle).toHaveText('Resource details') }) - it ('should overlay subtitle be \'v23.09.1/krux-v23.09.1.zip\'', async () => { + it ('should overlay subtitle be \'v24.03.0/krux-v24.03.0.zip\'', async () => { await instance.warningAlreadyDownloadedOverlayTitle.waitForExist() await expect(instance.warningAlreadyDownloadedOverlaySubtitle).toBeDisplayed() - await expect(instance.warningAlreadyDownloadedOverlaySubtitle).toHaveText('v23.09.1/krux-v23.09.1.zip') + await expect(instance.warningAlreadyDownloadedOverlaySubtitle).toHaveText('v24.03.0/krux-v24.03.0.zip') }) - it ('should a overlay text have \'Remote: https://github.com/selfcustody/krux/releases/download/v23.09.1/krux-v23.09.1.zip\'', async () => { + it ('should a overlay text have \'Remote: https://github.com/selfcustody/krux/releases/download/v24.03.0/krux-v24.03.0.zip\'', async () => { await instance.warningAlreadyDownloadedOverlayTextRemote.waitForExist() await expect(instance.warningAlreadyDownloadedOverlayTextRemote).toBeDisplayed() - await expect(instance.warningAlreadyDownloadedOverlayTextRemote).toHaveText('Remote:\nhttps://github.com/selfcustody/krux/releases/download/v23.09.1/krux-v23.09.1.zip') + await expect(instance.warningAlreadyDownloadedOverlayTextRemote).toHaveText('Remote:\nhttps://github.com/selfcustody/krux/releases/download/v24.03.0/krux-v24.03.0.zip') }) it ('should a overlay text have properly local resource', async () => { @@ -109,7 +109,7 @@ describe('KruxInstaller SelectVersion page (already downloaded release - click s } } - const resource = join(resources, 'v23.09.1', 'krux-v23.09.1.zip') + const resource = join(resources, 'v24.03.0', 'krux-v24.03.0.zip') await expect(instance.warningAlreadyDownloadedOverlayTextLocal).toHaveText(`Local:\n${resource}`) }) diff --git a/test/e2e/specs/024.already-downloaded-selfcustody-release-zip-sha256-click-download-again-button.spec.mts b/test/e2e/specs/024.already-downloaded-selfcustody-release-zip-sha256-click-download-again-button.spec.mts index 5007eb3a..a8712c7e 100644 --- a/test/e2e/specs/024.already-downloaded-selfcustody-release-zip-sha256-click-download-again-button.spec.mts +++ b/test/e2e/specs/024.already-downloaded-selfcustody-release-zip-sha256-click-download-again-button.spec.mts @@ -77,10 +77,10 @@ describe('KruxInstaller SelectVersion page (already downloaded release sha256.tx await expect(instance.downloadOfficialReleaseZipSha256txtPageTitle).toHaveText('Downloading') }) - it('should DownloadOfficialReleaseZipSha256 page have \'https://github.com/selfcustody/krux/releases/download/v23.09.1/krux-v23.09.1.zip.sha256.txt\' subtitle', async () => { + it('should DownloadOfficialReleaseZipSha256 page have \'https://github.com/selfcustody/krux/releases/download/v24.03.1/krux-v24.03.1.zip.sha256.txt\' subtitle', async () => { await instance.downloadOfficialReleaseZipSha256txtPageSubtitle.waitForExist() await expect(instance.downloadOfficialReleaseZipSha256txtPageSubtitle).toBeDisplayed() - await expect(instance.downloadOfficialReleaseZipSha256txtPageSubtitle).toHaveText('https://github.com/selfcustody/krux/releases/download/v23.09.1/krux-v23.09.1.zip.sha256.txt') + await expect(instance.downloadOfficialReleaseZipSha256txtPageSubtitle).toHaveText('https://github.com/selfcustody/krux/releases/download/v24.03.1/krux-v24.03.1.zip.sha256.txt') }) it('should DownloadOfficialReleaseZipSha256 page progress until 100%', async () => { diff --git a/test/e2e/specs/026.select-version-selfcustody-release-zip-sig.spec.mts b/test/e2e/specs/026.select-version-selfcustody-release-zip-sig.spec.mts index 2706f0d1..ae3d7a32 100644 --- a/test/e2e/specs/026.select-version-selfcustody-release-zip-sig.spec.mts +++ b/test/e2e/specs/026.select-version-selfcustody-release-zip-sig.spec.mts @@ -62,12 +62,12 @@ describe('KruxInstaller SelectVersion page (download release signature)', () => await instance.warningDownloadPage.waitForExist({ reverse: true }) }) - it ('should \'checking v23.09.1/krux-v23.09.1.zip.sig\' message appears', async () => { + it ('should \'checking v24.03.0/krux-v24.03.0.zip.sig\' message appears', async () => { await instance.checkingReleaseZipSigMsg.waitForExist() await expect(instance.checkingReleaseZipSigMsg).toBeDisplayed() }) - it ('should \'v23.09.1/krux-v23.09.1.zip.sig not found\' message appears', async () => { + it ('should \'v24.03.0/krux-v24.03.0.zip.sig not found\' message appears', async () => { await instance.notFoundReleaseZipSigMsg.waitForExist() await expect(instance.notFoundReleaseZipSigMsg).toBeDisplayed() }) @@ -83,10 +83,10 @@ describe('KruxInstaller SelectVersion page (download release signature)', () => await expect(instance.downloadOfficialReleaseZipSigTitle).toHaveText('Downloading') }) - it('should DownloadOfficialReleaseZipSig page have \'https://github.com/selfcustody/krux/releases/download/v23.09.1/krux-v23.09.1.zip.sig\' subtitle', async () => { + it('should DownloadOfficialReleaseZipSig page have \'https://github.com/selfcustody/krux/releases/download/v24.03.0/krux-v24.03.0.zip.sig\' subtitle', async () => { await instance.downloadOfficialReleaseZipSigSubtitle.waitForExist() await expect(instance.downloadOfficialReleaseZipSigSubtitle).toBeDisplayed() - await expect(instance.downloadOfficialReleaseZipSigSubtitle).toHaveText('https://github.com/selfcustody/krux/releases/download/v23.09.1/krux-v23.09.1.zip.sig') + await expect(instance.downloadOfficialReleaseZipSigSubtitle).toHaveText('https://github.com/selfcustody/krux/releases/download/v24.03.0/krux-v24.03.0.zip.sig') }) it('should DownloadOfficialReleaseZipSig page progress until 100%', async () => { diff --git a/test/e2e/specs/027.already-downloaded-selfcustody-release-zip-sig.spec.mts b/test/e2e/specs/027.already-downloaded-selfcustody-release-zip-sig.spec.mts index 8599c843..c8008cf8 100644 --- a/test/e2e/specs/027.already-downloaded-selfcustody-release-zip-sig.spec.mts +++ b/test/e2e/specs/027.already-downloaded-selfcustody-release-zip-sig.spec.mts @@ -62,13 +62,13 @@ describe('KruxInstaller SelectVersion page (already downloaded release signatur await instance.warningDownloadPage.waitForExist({ reverse: true }) }) - it ('should \'v23.09.1/krux-v23.09.1.zip.sig found\' message appears', async () => { + it ('should \'v24.03.0/krux-v24.03.0.zip.sig found\' message appears', async () => { await instance.checkingReleaseZipSigMsg.waitForExist() await expect(instance.foundReleaseZipSigMsg).toBeDisplayed() if (process.platform === 'linux' || process.platform === 'darwin') { - await expect(instance.foundReleaseZipSigMsg).toHaveText('v23.09.1/krux-v23.09.1.zip.sig found') + await expect(instance.foundReleaseZipSigMsg).toHaveText('v24.03.0/krux-v24.03.0.zip.sig found') } else if (process.platform === 'win32') { - await expect(instance.foundReleaseZipSigMsg).toHaveText('v23.09.1\\krux-v23.09.1.zip.sig found') + await expect(instance.foundReleaseZipSigMsg).toHaveText('v24.03.0\\krux-v24.03.0.zip.sig found') } }) @@ -77,13 +77,13 @@ describe('KruxInstaller SelectVersion page (already downloaded release signatur await expect(instance.warningDownloadPage).toBeDisplayed() }) - it('should \'v23.09.1/krux-v23.09.1.zip.sig already downloaded\' message be displayed', async () => { + it('should \'v24.03.0/krux-v24.03.0.zip.sig already downloaded\' message be displayed', async () => { await instance.warningAlreadyDownloadedText.waitForExist() await expect(instance.warningAlreadyDownloadedText).toBeDisplayed() if (process.platform === 'linux' || process.platform === 'darwin') { - await expect(instance.warningAlreadyDownloadedText).toHaveText('v23.09.1/krux-v23.09.1.zip.sig already downloaded') + await expect(instance.warningAlreadyDownloadedText).toHaveText('v24.03.0/krux-v24.03.0.zip.sig already downloaded') } else if (process.platform === 'win32') { - await expect(instance.warningAlreadyDownloadedText).toHaveText('v23.09.1\\krux-v23.09.1.zip.sig already downloaded') + await expect(instance.warningAlreadyDownloadedText).toHaveText('v24.03.0\\krux-v24.03.0.zip.sig already downloaded') } }) diff --git a/test/e2e/specs/028.already-downloaded-selfcustody-release-zip-sig-click-back-button.spec.mts b/test/e2e/specs/028.already-downloaded-selfcustody-release-zip-sig-click-back-button.spec.mts index e5879859..77c9db50 100644 --- a/test/e2e/specs/028.already-downloaded-selfcustody-release-zip-sig-click-back-button.spec.mts +++ b/test/e2e/specs/028.already-downloaded-selfcustody-release-zip-sig-click-back-button.spec.mts @@ -77,10 +77,10 @@ describe('KruxInstaller SelectVersion page (already downloaded release signatur await expect(instance.mainPage).toBeDisplayed() }) - it('should \'Select version\' button changed to \'Version: selfcustody/krux/releases/tag/v23.09.1\'', async () => { + it('should \'Select version\' button changed to \'Version: selfcustody/krux/releases/tag/v24.03.0\'', async () => { await instance.mainSelectVersionText.waitForExist() await expect(instance.mainSelectVersionText).toBeDisplayed() - await expect(instance.mainSelectVersionText).toHaveText('Version: selfcustody/krux/releases/tag/v23.09.1') + await expect(instance.mainSelectVersionText).toHaveText('Version: selfcustody/krux/releases/tag/v24.03.0') }) }) diff --git a/test/e2e/specs/029.already-downloaded-selfcustody-release-zip-sig-show-details-button.spec.mts b/test/e2e/specs/029.already-downloaded-selfcustody-release-zip-sig-show-details-button.spec.mts index b91a4b25..517c4287 100644 --- a/test/e2e/specs/029.already-downloaded-selfcustody-release-zip-sig-show-details-button.spec.mts +++ b/test/e2e/specs/029.already-downloaded-selfcustody-release-zip-sig-show-details-button.spec.mts @@ -85,16 +85,16 @@ describe('KruxInstaller SelectVersion page (already downloaded release signature await expect(instance.warningAlreadyDownloadedOverlayTitle).toHaveText('Resource details') }) - it ('should overlay subtitle be \'v23.09.1/krux-v23.09.1.zip.sig\'', async () => { + it ('should overlay subtitle be \'v24.03.0/krux-v24.03.0.zip.sig\'', async () => { await instance.warningAlreadyDownloadedOverlayTitle.waitForExist() await expect(instance.warningAlreadyDownloadedOverlaySubtitle).toBeDisplayed() - await expect(instance.warningAlreadyDownloadedOverlaySubtitle).toHaveText('v23.09.1/krux-v23.09.1.zip.sig') + await expect(instance.warningAlreadyDownloadedOverlaySubtitle).toHaveText('v24.03.0/krux-v24.03.0.zip.sig') }) - it ('should a overlay text have \'Remote: https://github.com/selfcustody/krux/releases/download/v23.09.1/krux-v23.09.1.zip.sig\'', async () => { + it ('should a overlay text have \'Remote: https://github.com/selfcustody/krux/releases/download/v24.03.0/krux-v24.03.0.zip.sig\'', async () => { await instance.warningAlreadyDownloadedOverlayTextRemote.waitForExist() await expect(instance.warningAlreadyDownloadedOverlayTextRemote).toBeDisplayed() - await expect(instance.warningAlreadyDownloadedOverlayTextRemote).toHaveText('Remote:\nhttps://github.com/selfcustody/krux/releases/download/v23.09.1/krux-v23.09.1.zip.sig') + await expect(instance.warningAlreadyDownloadedOverlayTextRemote).toHaveText('Remote:\nhttps://github.com/selfcustody/krux/releases/download/v24.03.0/krux-v24.03.0.zip.sig') }) it ('should a overlay text have properly local resource', async () => { @@ -122,7 +122,7 @@ describe('KruxInstaller SelectVersion page (already downloaded release signature } } - const resource = join(resources, 'v23.09.1', 'krux-v23.09.1.zip.sig') + const resource = join(resources, 'v24.03.0', 'krux-v24.03.0.zip.sig') await expect(instance.warningAlreadyDownloadedOverlayTextLocal).toHaveText(`Local:\n${resource}`) }) diff --git a/test/e2e/specs/030.already-downloaded-selfcustody-release-zip-sig-download-again-button.spec.mts b/test/e2e/specs/030.already-downloaded-selfcustody-release-zip-sig-download-again-button.spec.mts index edd74988..91ed947a 100644 --- a/test/e2e/specs/030.already-downloaded-selfcustody-release-zip-sig-download-again-button.spec.mts +++ b/test/e2e/specs/030.already-downloaded-selfcustody-release-zip-sig-download-again-button.spec.mts @@ -84,10 +84,10 @@ describe('KruxInstaller SelectVersion page (already downloaded release signatur await expect(instance.downloadOfficialReleaseZipSigTitle).toHaveText('Downloading') }) - it('should DownloadOfficialReleaseSig page have \'https://github.com/selfcustody/krux/releases/download/v23.09.1/krux-v23.09.1.zip.sig\' subtitle', async () => { + it('should DownloadOfficialReleaseSig page have \'https://github.com/selfcustody/krux/releases/download/v24.03.0/krux-v24.03.0.zip.sig\' subtitle', async () => { await instance.downloadOfficialReleaseZipSigSubtitle.waitForExist() await expect(instance.downloadOfficialReleaseZipSigSubtitle).toBeDisplayed() - await expect(instance.downloadOfficialReleaseZipSigSubtitle).toHaveText('https://github.com/selfcustody/krux/releases/download/v23.09.1/krux-v23.09.1.zip.sig') + await expect(instance.downloadOfficialReleaseZipSigSubtitle).toHaveText('https://github.com/selfcustody/krux/releases/download/v24.03.0/krux-v24.03.0.zip.sig') }) it('should DownloadOfficialReleaseSig page progress until 100%', async () => { diff --git a/test/e2e/specs/034.already-downloaded-selfcustody-pem-click-back-button.spec.mts b/test/e2e/specs/034.already-downloaded-selfcustody-pem-click-back-button.spec.mts index 22464f82..830679b8 100644 --- a/test/e2e/specs/034.already-downloaded-selfcustody-pem-click-back-button.spec.mts +++ b/test/e2e/specs/034.already-downloaded-selfcustody-pem-click-back-button.spec.mts @@ -83,9 +83,9 @@ describe('KruxInstaller SelectVersion page (already downloaded public key certif await expect(instance.mainPage).toBeDisplayed() }) - it('should \'Select version\' button changed to \'Version: selfcustody/krux/releases/tag/v23.09.1\'', async () => { + it('should \'Select version\' button changed to \'Version: selfcustody/krux/releases/tag/v24.03.0\'', async () => { await instance.mainSelectVersionText.waitForExist() await expect(instance.mainSelectVersionText).toBeDisplayed() - await expect(instance.mainSelectVersionText).toHaveText('Version: selfcustody/krux/releases/tag/v23.09.1') + await expect(instance.mainSelectVersionText).toHaveText('Version: selfcustody/krux/releases/tag/v24.03.0') }) }) From cfb9f9ef0f37db102c6bdf0cd2fbe23b5f51a480 Mon Sep 17 00:00:00 2001 From: qlrddev Date: Mon, 11 Mar 2024 19:02:11 -0300 Subject: [PATCH 09/15] fixing tests for release v24.03.0 VI --- ...ed-selfcustody-release-zip-click-download-again.spec.mts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/e2e/specs/018.already-downloaded-selfcustody-release-zip-click-download-again.spec.mts b/test/e2e/specs/018.already-downloaded-selfcustody-release-zip-click-download-again.spec.mts index e14752fa..22b382f5 100644 --- a/test/e2e/specs/018.already-downloaded-selfcustody-release-zip-click-download-again.spec.mts +++ b/test/e2e/specs/018.already-downloaded-selfcustody-release-zip-click-download-again.spec.mts @@ -70,10 +70,10 @@ describe('KruxInstaller SelectVersion page (already downloaded release - click d await expect(instance.downloadOfficialReleaseZipTitle).toHaveText('Downloading') }) - it('should DownloadOfficialReleaseZip page have \'https://github.com/selfcustody/krux/releases/download/v23.09.1/krux-v23.09.1.zip\' subtitle', async () => { + it('should DownloadOfficialReleaseZip page have \'https://github.com/selfcustody/krux/releases/download/v24.03.0/krux-v24.03.0.zip\' subtitle', async () => { await instance.downloadOfficialReleaseZipTitle.waitForExist() await expect(instance.downloadOfficialReleaseZipSubtitle).toBeDisplayed() - await expect(instance.downloadOfficialReleaseZipSubtitle).toHaveText('https://github.com/selfcustody/krux/releases/download/v23.09.1/krux-v23.09.1.zip') + await expect(instance.downloadOfficialReleaseZipSubtitle).toHaveText('https://github.com/selfcustody/krux/releases/download/v24.03.0/krux-v24.03.0.zip') }) it('should DownloadOfficialReleaseZip page progress until 100%', async () => { @@ -89,4 +89,4 @@ describe('KruxInstaller SelectVersion page (already downloaded release - click d }) }) -}) \ No newline at end of file +}) From a7e0fc58812e2c0587590c7bcb2879a9e0498748 Mon Sep 17 00:00:00 2001 From: qlrddev Date: Mon, 11 Mar 2024 19:08:03 -0300 Subject: [PATCH 10/15] fixing tests for release v24.03.0 VII --- ...t-version-selfcustody-release-zip-sha256.spec.mts | 8 ++++---- ...ownloaded-selfcustody-release-zip-sha256.spec.mts | 12 ++++++------ ...ody-release-zip-sha256-click-back-button.spec.mts | 4 ++-- ...ase-zip-sha256-click-show-details-button.spec.mts | 10 +++++----- ...e-zip-sha256-click-download-again-button.spec.mts | 4 ++-- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/test/e2e/specs/020.select-version-selfcustody-release-zip-sha256.spec.mts b/test/e2e/specs/020.select-version-selfcustody-release-zip-sha256.spec.mts index 59b8d795..ab54f52e 100644 --- a/test/e2e/specs/020.select-version-selfcustody-release-zip-sha256.spec.mts +++ b/test/e2e/specs/020.select-version-selfcustody-release-zip-sha256.spec.mts @@ -56,12 +56,12 @@ describe('KruxInstaller SelectVersion page (download release sha256.txt)', () => await instance.warningDownloadPage.waitForExist({ reverse: true }) }) - it ('should \'checking v23.09.1/krux-v23.09.1.zip.sha256.txt\' message appears', async () => { + it ('should \'checking v24.03.0/krux-v24.03.0.zip.sha256.txt\' message appears', async () => { await instance.checkingReleaseZipSha256txtMsg.waitForExist() await expect(instance.checkingReleaseZipSha256txtMsg).toBeDisplayed() }) - it ('should \'v23.09.1/krux-v23.09.1.zip.sha256.txt not found\' message appears', async () => { + it ('should \'v24.03.0/krux-v24.03.0.zip.sha256.txt not found\' message appears', async () => { await instance.notFoundReleaseZipSha256txtMsg.waitForExist() await expect(instance.notFoundReleaseZipSha256txtMsg).toBeDisplayed() }) @@ -77,10 +77,10 @@ describe('KruxInstaller SelectVersion page (download release sha256.txt)', () => await expect(instance.downloadOfficialReleaseZipSha256txtPageTitle).toHaveText('Downloading') }) - it('should DownloadOfficialReleaseZipSha256 page have \'https://github.com/selfcustody/krux/releases/download/v23.09.1/krux-v23.09.1.zip.sha256.txt\' subtitle', async () => { + it('should DownloadOfficialReleaseZipSha256 page have \'https://github.com/selfcustody/krux/releases/download/v24.03.0/krux-v24.03.0.zip.sha256.txt\' subtitle', async () => { await instance.downloadOfficialReleaseZipSha256txtPageSubtitle.waitForExist() await expect(instance.downloadOfficialReleaseZipSha256txtPageSubtitle).toBeDisplayed() - await expect(instance.downloadOfficialReleaseZipSha256txtPageSubtitle).toHaveText('https://github.com/selfcustody/krux/releases/download/v23.09.1/krux-v23.09.1.zip.sha256.txt') + await expect(instance.downloadOfficialReleaseZipSha256txtPageSubtitle).toHaveText('https://github.com/selfcustody/krux/releases/download/v24.03.0/krux-v24.03.0.zip.sha256.txt') }) it('should DownloadOfficialReleaseZipSha256 page progress until 100%', async () => { diff --git a/test/e2e/specs/021.already-downloaded-selfcustody-release-zip-sha256.spec.mts b/test/e2e/specs/021.already-downloaded-selfcustody-release-zip-sha256.spec.mts index dee1e59d..8c6950fc 100644 --- a/test/e2e/specs/021.already-downloaded-selfcustody-release-zip-sha256.spec.mts +++ b/test/e2e/specs/021.already-downloaded-selfcustody-release-zip-sha256.spec.mts @@ -54,13 +54,13 @@ describe('KruxInstaller SelectVersion page (already downloaded release sha256.tx await instance.warningDownloadPage.waitForExist({ reverse: true }) }) - it ('should \'v23.09.1/krux-v23.09.1.zip.sha256.txt found\' message appears', async () => { + it ('should \'v24.03.0/krux-v24.03.0.zip.sha256.txt found\' message appears', async () => { await instance.checkingReleaseZipSha256txtMsg.waitForExist() await expect(instance.checkingReleaseZipSha256txtMsg).toBeDisplayed() if (process.platform === 'linux' || process.platform === 'darwin') { - await expect(instance.foundReleaseZipSha256txtMsg).toHaveText('v23.09.1/krux-v23.09.1.zip.sha256.txt found') + await expect(instance.foundReleaseZipSha256txtMsg).toHaveText('v24.03.0/krux-v24.03.0.zip.sha256.txt found') } else if (process.platform === 'win32') { - await expect(instance.foundReleaseZipSha256txtMsg).toHaveText('v23.09.1\\krux-v23.09.1.zip.sha256.txt found') + await expect(instance.foundReleaseZipSha256txtMsg).toHaveText('v24.03.0\\krux-v24.03.0.zip.sha256.txt found') } }) @@ -69,13 +69,13 @@ describe('KruxInstaller SelectVersion page (already downloaded release sha256.tx await expect(instance.warningDownloadPage).toBeDisplayed() }) - it('should \'v23.09.1/krux-v23.09.1.zip.sha256.txt already downloaded\' message be displayed', async () => { + it('should \'v24.03.0/krux-v24.03.0.zip.sha256.txt already downloaded\' message be displayed', async () => { await instance.warningAlreadyDownloadedText.waitForExist() await expect(instance.warningAlreadyDownloadedText).toBeDisplayed() if (process.platform === 'linux' || process.platform === 'darwin') { - await expect(instance.warningAlreadyDownloadedText).toHaveText('v23.09.1/krux-v23.09.1.zip.sha256.txt already downloaded') + await expect(instance.warningAlreadyDownloadedText).toHaveText('v24.03.0/krux-v24.03.0.zip.sha256.txt already downloaded') } else if (process.platform === 'win32') { - await expect(instance.warningAlreadyDownloadedText).toHaveText('v23.09.1\\krux-v23.09.1.zip.sha256.txt already downloaded') + await expect(instance.warningAlreadyDownloadedText).toHaveText('v24.03.0\\krux-v24.03.0.zip.sha256.txt already downloaded') } }) diff --git a/test/e2e/specs/022.already-downloaded-selfcustody-release-zip-sha256-click-back-button.spec.mts b/test/e2e/specs/022.already-downloaded-selfcustody-release-zip-sha256-click-back-button.spec.mts index 88de791f..8296f1ac 100644 --- a/test/e2e/specs/022.already-downloaded-selfcustody-release-zip-sha256-click-back-button.spec.mts +++ b/test/e2e/specs/022.already-downloaded-selfcustody-release-zip-sha256-click-back-button.spec.mts @@ -70,10 +70,10 @@ describe('KruxInstaller SelectVersion page (already downloaded release sha256.tx await expect(instance.mainPage).toBeDisplayed() }) - it('should \'Select version\' button changed to \'Version: selfcustody/krux/releases/tag/v23.09.1\'', async () => { + it('should \'Select version\' button changed to \'Version: selfcustody/krux/releases/tag/v24.03.0\'', async () => { await instance.mainSelectVersionText.waitForExist() await expect(instance.mainSelectVersionText).toBeDisplayed() - await expect(instance.mainSelectVersionText).toHaveText('Version: selfcustody/krux/releases/tag/v23.09.1') + await expect(instance.mainSelectVersionText).toHaveText('Version: selfcustody/krux/releases/tag/v24.03.0') }) }) diff --git a/test/e2e/specs/023.already-downloaded-selfcustody-release-zip-sha256-click-show-details-button.spec.mts b/test/e2e/specs/023.already-downloaded-selfcustody-release-zip-sha256-click-show-details-button.spec.mts index 1e0a771a..84860547 100644 --- a/test/e2e/specs/023.already-downloaded-selfcustody-release-zip-sha256-click-show-details-button.spec.mts +++ b/test/e2e/specs/023.already-downloaded-selfcustody-release-zip-sha256-click-show-details-button.spec.mts @@ -78,16 +78,16 @@ describe('KruxInstaller SelectVersion page (already downloaded release sha256.tx await expect(instance.warningAlreadyDownloadedOverlayTitle).toHaveText('Resource details') }) - it ('should overlay subtitle be \'v23.09.1/krux-v23.09.1.zip.sha256.txt\'', async () => { + it ('should overlay subtitle be \'v24.03.0/krux-v24.03.0.zip.sha256.txt\'', async () => { await instance.warningAlreadyDownloadedOverlayTitle.waitForExist() await expect(instance.warningAlreadyDownloadedOverlaySubtitle).toBeDisplayed() - await expect(instance.warningAlreadyDownloadedOverlaySubtitle).toHaveText('v23.09.1/krux-v23.09.1.zip.sha256.txt') + await expect(instance.warningAlreadyDownloadedOverlaySubtitle).toHaveText('v24.03.0/krux-v24.03.0.zip.sha256.txt') }) - it ('should a overlay text have \'Remote: https://github.com/selfcustody/krux/releases/download/v23.09.1/krux-v23.09.1.zip.sha256.txt\'', async () => { + it ('should a overlay text have \'Remote: https://github.com/selfcustody/krux/releases/download/v24.03.0/krux-v24.03.0.zip.sha256.txt\'', async () => { await instance.warningAlreadyDownloadedOverlayTextRemote.waitForExist() await expect(instance.warningAlreadyDownloadedOverlayTextRemote).toBeDisplayed() - await expect(instance.warningAlreadyDownloadedOverlayTextRemote).toHaveText('Remote:\nhttps://github.com/selfcustody/krux/releases/download/v23.09.1/krux-v23.09.1.zip.sha256.txt') + await expect(instance.warningAlreadyDownloadedOverlayTextRemote).toHaveText('Remote:\nhttps://github.com/selfcustody/krux/releases/download/v24.03.0/krux-v24.03.0.zip.sha256.txt') }) it ('should a overlay text have properly local resource', async () => { @@ -115,7 +115,7 @@ describe('KruxInstaller SelectVersion page (already downloaded release sha256.tx } } - const resource = join(resources, 'v23.09.1', 'krux-v23.09.1.zip.sha256.txt') + const resource = join(resources, 'v24.03.0', 'krux-v24.03.0.zip.sha256.txt') await expect(instance.warningAlreadyDownloadedOverlayTextLocal).toHaveText(`Local:\n${resource}`) }) diff --git a/test/e2e/specs/024.already-downloaded-selfcustody-release-zip-sha256-click-download-again-button.spec.mts b/test/e2e/specs/024.already-downloaded-selfcustody-release-zip-sha256-click-download-again-button.spec.mts index a8712c7e..41283836 100644 --- a/test/e2e/specs/024.already-downloaded-selfcustody-release-zip-sha256-click-download-again-button.spec.mts +++ b/test/e2e/specs/024.already-downloaded-selfcustody-release-zip-sha256-click-download-again-button.spec.mts @@ -77,10 +77,10 @@ describe('KruxInstaller SelectVersion page (already downloaded release sha256.tx await expect(instance.downloadOfficialReleaseZipSha256txtPageTitle).toHaveText('Downloading') }) - it('should DownloadOfficialReleaseZipSha256 page have \'https://github.com/selfcustody/krux/releases/download/v24.03.1/krux-v24.03.1.zip.sha256.txt\' subtitle', async () => { + it('should DownloadOfficialReleaseZipSha256 page have \'https://github.com/selfcustody/krux/releases/download/v24.03.0/krux-v24.03.0.zip.sha256.txt\' subtitle', async () => { await instance.downloadOfficialReleaseZipSha256txtPageSubtitle.waitForExist() await expect(instance.downloadOfficialReleaseZipSha256txtPageSubtitle).toBeDisplayed() - await expect(instance.downloadOfficialReleaseZipSha256txtPageSubtitle).toHaveText('https://github.com/selfcustody/krux/releases/download/v24.03.1/krux-v24.03.1.zip.sha256.txt') + await expect(instance.downloadOfficialReleaseZipSha256txtPageSubtitle).toHaveText('https://github.com/selfcustody/krux/releases/download/v24.03.0/krux-v24.03.0.zip.sha256.txt') }) it('should DownloadOfficialReleaseZipSha256 page progress until 100%', async () => { From 3424ee8666110e41f2b43a2e2ce821681d852078 Mon Sep 17 00:00:00 2001 From: qlrddev Date: Mon, 11 Mar 2024 19:44:32 -0300 Subject: [PATCH 11/15] adjusted check if will flash for cube adding serialport listing for cube --- lib/check-if-it-will-flash.ts | 29 ++++++++++++++++------------- lib/flash.ts | 16 ++++++++++++++++ 2 files changed, 32 insertions(+), 13 deletions(-) diff --git a/lib/check-if-it-will-flash.ts b/lib/check-if-it-will-flash.ts index 4c537045..8f4a1168 100644 --- a/lib/check-if-it-will-flash.ts +++ b/lib/check-if-it-will-flash.ts @@ -45,20 +45,23 @@ export default class CheckIfItWillFlashHandler extends Handler { if (device.match(/maixpy_(m5stickv|amigo|amigo_ips|amigo_tft|bit|dock|yahboom|cube)/g)) { if (version.match(/selfcustody\/.*/g)) { - const __version__ = version.split('tag/')[1] - const destinationResourceZip = join(resources, __version__, `krux-${__version__}.zip`) - const destinationResourceSha = join(resources, __version__, `krux-${__version__}.zip.sha256.txt`) - const destinationResourceSig = join(resources, __version__, `krux-${__version__}.zip.sig`) - - if ( - await existsAsync(destinationResourceZip) && - await existsAsync(destinationResourceSha) && - await existsAsync(destinationResourceSig) - ) { - this.send(`${this.name}:success`, { showFlash: true }) - } else { - + if (device === 'maixpy_cube') { this.send(`${this.name}:success`, { showFlash: false }) + } else { + const __version__ = version.split('tag/')[1] + const destinationResourceZip = join(resources, __version__, `krux-${__version__}.zip`) + const destinationResourceSha = join(resources, __version__, `krux-${__version__}.zip.sha256.txt`) + const destinationResourceSig = join(resources, __version__, `krux-${__version__}.zip.sig`) + + if ( + await existsAsync(destinationResourceZip) && + await existsAsync(destinationResourceSha) && + await existsAsync(destinationResourceSig) + ) { + this.send(`${this.name}:success`, { showFlash: true }) + } else { + this.send(`${this.name}:success`, { showFlash: false }) + } } } else if (version.match(/odudex\/krux_binaries/g)) { const destinationResourceFirmware = join(resources, version, 'main', device, 'firmware.bin') diff --git a/lib/flash.ts b/lib/flash.ts index 412de88f..aec2cac2 100644 --- a/lib/flash.ts +++ b/lib/flash.ts @@ -88,6 +88,22 @@ export default class FlashHandler extends Handler { } catch (error) { this.send(`${this.name}:error`, { done: false, name: error.name, message: error.message, stack: error.stack }) } + } else if (device.match(/maixpy_cube/g)) { + try { + const ports = await SerialPort.list() + ports.forEach(function(port) { + if (port.productId == "0403") { + flash.args.push("-p") + if (os === 'linux') { + flash.args.push(port.path) + } else if (os === 'win32') { + flash.args.push(port.comName) + } + } + }) + } catch (error) { + this.send(`${this.name}:error`, { done: false, name: error.name, message: error.message, stack: error.stack }) + } } else { flash.args = ['--verbose', '-B', 'goE', '-b', '1500000', kboot] } From 503bf405c12af3895ce11326ef33b5a9342985a5 Mon Sep 17 00:00:00 2001 From: qlrddev Date: Mon, 11 Mar 2024 22:42:10 -0300 Subject: [PATCH 12/15] cube fix II --- lib/flash.ts | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/lib/flash.ts b/lib/flash.ts index aec2cac2..0d1781ee 100644 --- a/lib/flash.ts +++ b/lib/flash.ts @@ -78,11 +78,7 @@ export default class FlashHandler extends Handler { ports.forEach(function(port) { if (port.productId == "7523") { flash.args.push("-p") - if (os === 'linux') { - flash.args.push(port.path) - } else if (os === 'win32') { - flash.args.push(port.comName) - } + flash.args.push(port.path) } }) } catch (error) { @@ -94,11 +90,7 @@ export default class FlashHandler extends Handler { ports.forEach(function(port) { if (port.productId == "0403") { flash.args.push("-p") - if (os === 'linux') { - flash.args.push(port.path) - } else if (os === 'win32') { - flash.args.push(port.comName) - } + flash.args.push(port.path) } }) } catch (error) { From 1ef20adce7827c7f32ea0102c87605d26b7551f2 Mon Sep 17 00:00:00 2001 From: qlrddev Date: Mon, 11 Mar 2024 23:16:07 -0300 Subject: [PATCH 13/15] cube fix III --- lib/flash.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/flash.ts b/lib/flash.ts index 0d1781ee..2a117800 100644 --- a/lib/flash.ts +++ b/lib/flash.ts @@ -85,6 +85,7 @@ export default class FlashHandler extends Handler { this.send(`${this.name}:error`, { done: false, name: error.name, message: error.message, stack: error.stack }) } } else if (device.match(/maixpy_cube/g)) { + flash.args = ['--verbose', '-B', 'goE', '-b', '1500000', kboot] try { const ports = await SerialPort.list() ports.forEach(function(port) { From bf7e4cd604c45ef6cf1a737351b912eeeb6dff4d Mon Sep 17 00:00:00 2001 From: qlrd Date: Tue, 12 Mar 2024 07:52:09 -0300 Subject: [PATCH 14/15] changed sha256sum from pre-release 24.03.0 --- test/e2e/specs/039-verified-official-release.spec.mts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/e2e/specs/039-verified-official-release.spec.mts b/test/e2e/specs/039-verified-official-release.spec.mts index d85e9d2d..1387635b 100644 --- a/test/e2e/specs/039-verified-official-release.spec.mts +++ b/test/e2e/specs/039-verified-official-release.spec.mts @@ -7,8 +7,7 @@ import { createRequire } from 'module' const App = createRequire(import.meta.url)('../pageobjects/app.page') -// const SHA256 = "4d 58 39 27 a7 22 06 e0 2a 8e 58 13 48 94 37 7c 94 e2 cc 9b 65 1f 16 11 bd de 1f bf 29 4c 78 26" -const SHA256 = "7c af 10 c5 37 45 f8 29 e0 81 30 48 22 10 a0 5f 40 1b e9 91 75 7c 81 58 68 88 53 e1 75 7e fd 5d" +const SHA256 = "e9 b1 56 d4 d0 1e 80 17 ed 4f 2f ad ac 01 cb 07 fe b2 7e 8a 01 e3 c9 7e 01 9c f2 f9 03 86 e6 b2" describe('KruxInstaller VerifiedOfficialRelease page (show and click back button)', () => { let instance: any; From 4a53e688f60e5e28e6dcde14be64e831b69d5432 Mon Sep 17 00:00:00 2001 From: qlrd Date: Tue, 12 Mar 2024 10:18:31 -0300 Subject: [PATCH 15/15] removed amigo_ips and amigo_tft from devices list --- src/pages/SelectDevice.vue | 2 - test/e2e/pageobjects/app.page.ts | 28 +++------- .../006.select-device-show-only.spec.mts | 22 +++----- ...c.mts => 008.select-device-amigo.spec.mts} | 10 ++-- .../009.select-device-amigo-tft.spec.mts | 51 ------------------- ...pec.mts => 009.select-device-bit.spec.mts} | 0 ...ec.mts => 010.select-device-dock.spec.mts} | 0 ...ec.mts => 011.select-device-back.spec.mts} | 0 ... => 012.select-version-show-only.spec.mts} | 0 ...-version-selfcustody-release-zip.spec.mts} | 0 ...wnloaded-selfcustody-release-zip.spec.mts} | 0 ...dy-release-zip-click-back-button.spec.mts} | 0 ...se-zip-click-show-details-button.spec.mts} | 0 ...release-zip-click-download-again.spec.mts} | 0 ...release-zip-click-proceed-button.spec.mts} | 0 ...n-selfcustody-release-zip-sha256.spec.mts} | 0 ...d-selfcustody-release-zip-sha256.spec.mts} | 0 ...ase-zip-sha256-click-back-button.spec.mts} | 0 ...sha256-click-show-details-button.spec.mts} | 0 ...a256-click-download-again-button.spec.mts} | 0 ...-zip-sha256-click-proceed-button.spec.mts} | 0 ...sion-selfcustody-release-zip-sig.spec.mts} | 0 ...aded-selfcustody-release-zip-sig.spec.mts} | 0 ...elease-zip-sig-click-back-button.spec.mts} | 0 ...ease-zip-sig-show-details-button.spec.mts} | 0 ...se-zip-sig-download-again-button.spec.mts} | 0 ...ase-zip-sig-click-proceed-button.spec.mts} | 0 ...1-select-version-selfcustody-pem.spec.mts} | 0 ...ready-downloaded-selfcustody-pem.spec.mts} | 0 ...elfcustody-pem-click-back-button.spec.mts} | 0 ...fcustody-pem-show-details-button.spec.mts} | 0 ...ustody-pem-download-again-button.spec.mts} | 0 ...custody-pem-click-proceed-button.spec.mts} | 0 ...37-check-verify-official-release.spec.mts} | 0 ...=> 038-verified-official-release.spec.mts} | 0 35 files changed, 19 insertions(+), 94 deletions(-) rename test/e2e/specs/{008.select-device-amigo-ips.spec.mts => 008.select-device-amigo.spec.mts} (90%) delete mode 100644 test/e2e/specs/009.select-device-amigo-tft.spec.mts rename test/e2e/specs/{010.select-device-bit.spec.mts => 009.select-device-bit.spec.mts} (100%) rename test/e2e/specs/{011.select-device-dock.spec.mts => 010.select-device-dock.spec.mts} (100%) rename test/e2e/specs/{012.select-device-back.spec.mts => 011.select-device-back.spec.mts} (100%) rename test/e2e/specs/{013.select-version-show-only.spec.mts => 012.select-version-show-only.spec.mts} (100%) rename test/e2e/specs/{014.select-version-selfcustody-release-zip.spec.mts => 013.select-version-selfcustody-release-zip.spec.mts} (100%) rename test/e2e/specs/{015.already-downloaded-selfcustody-release-zip.spec.mts => 014.already-downloaded-selfcustody-release-zip.spec.mts} (100%) rename test/e2e/specs/{016.already-downloaded-selfcustody-release-zip-click-back-button.spec.mts => 015.already-downloaded-selfcustody-release-zip-click-back-button.spec.mts} (100%) rename test/e2e/specs/{017.already-downloaded-selfcustody-release-zip-click-show-details-button.spec.mts => 016.already-downloaded-selfcustody-release-zip-click-show-details-button.spec.mts} (100%) rename test/e2e/specs/{018.already-downloaded-selfcustody-release-zip-click-download-again.spec.mts => 017.already-downloaded-selfcustody-release-zip-click-download-again.spec.mts} (100%) rename test/e2e/specs/{019.already-downloaded-selfcustody-release-zip-click-proceed-button.spec.mts => 018.already-downloaded-selfcustody-release-zip-click-proceed-button.spec.mts} (100%) rename test/e2e/specs/{020.select-version-selfcustody-release-zip-sha256.spec.mts => 019.select-version-selfcustody-release-zip-sha256.spec.mts} (100%) rename test/e2e/specs/{021.already-downloaded-selfcustody-release-zip-sha256.spec.mts => 020.already-downloaded-selfcustody-release-zip-sha256.spec.mts} (100%) rename test/e2e/specs/{022.already-downloaded-selfcustody-release-zip-sha256-click-back-button.spec.mts => 021.already-downloaded-selfcustody-release-zip-sha256-click-back-button.spec.mts} (100%) rename test/e2e/specs/{023.already-downloaded-selfcustody-release-zip-sha256-click-show-details-button.spec.mts => 022.already-downloaded-selfcustody-release-zip-sha256-click-show-details-button.spec.mts} (100%) rename test/e2e/specs/{024.already-downloaded-selfcustody-release-zip-sha256-click-download-again-button.spec.mts => 023.already-downloaded-selfcustody-release-zip-sha256-click-download-again-button.spec.mts} (100%) rename test/e2e/specs/{025.already-downloaded-selfcustody-release-zip-sha256-click-proceed-button.spec.mts => 024.already-downloaded-selfcustody-release-zip-sha256-click-proceed-button.spec.mts} (100%) rename test/e2e/specs/{026.select-version-selfcustody-release-zip-sig.spec.mts => 025.select-version-selfcustody-release-zip-sig.spec.mts} (100%) rename test/e2e/specs/{027.already-downloaded-selfcustody-release-zip-sig.spec.mts => 026.already-downloaded-selfcustody-release-zip-sig.spec.mts} (100%) rename test/e2e/specs/{028.already-downloaded-selfcustody-release-zip-sig-click-back-button.spec.mts => 027.already-downloaded-selfcustody-release-zip-sig-click-back-button.spec.mts} (100%) rename test/e2e/specs/{029.already-downloaded-selfcustody-release-zip-sig-show-details-button.spec.mts => 028.already-downloaded-selfcustody-release-zip-sig-show-details-button.spec.mts} (100%) rename test/e2e/specs/{030.already-downloaded-selfcustody-release-zip-sig-download-again-button.spec.mts => 029.already-downloaded-selfcustody-release-zip-sig-download-again-button.spec.mts} (100%) rename test/e2e/specs/{031.already-downloaded-selfcustody-release-zip-sig-click-proceed-button.spec.mts => 030.already-downloaded-selfcustody-release-zip-sig-click-proceed-button.spec.mts} (100%) rename test/e2e/specs/{032-select-version-selfcustody-pem.spec.mts => 031-select-version-selfcustody-pem.spec.mts} (100%) rename test/e2e/specs/{033.already-downloaded-selfcustody-pem.spec.mts => 032.already-downloaded-selfcustody-pem.spec.mts} (100%) rename test/e2e/specs/{034.already-downloaded-selfcustody-pem-click-back-button.spec.mts => 033.already-downloaded-selfcustody-pem-click-back-button.spec.mts} (100%) rename test/e2e/specs/{035.already-downloaded-selfcustody-pem-show-details-button.spec.mts => 034.already-downloaded-selfcustody-pem-show-details-button.spec.mts} (100%) rename test/e2e/specs/{036.already-downloaded-selfcustody-pem-download-again-button.spec.mts => 035.already-downloaded-selfcustody-pem-download-again-button.spec.mts} (100%) rename test/e2e/specs/{037.already-downloaded-selfcustody-pem-click-proceed-button.spec.mts => 036.already-downloaded-selfcustody-pem-click-proceed-button.spec.mts} (100%) rename test/e2e/specs/{038-check-verify-official-release.spec.mts => 037-check-verify-official-release.spec.mts} (100%) rename test/e2e/specs/{039-verified-official-release.spec.mts => 038-verified-official-release.spec.mts} (100%) diff --git a/src/pages/SelectDevice.vue b/src/pages/SelectDevice.vue index 6ce5ad79..b27e3725 100644 --- a/src/pages/SelectDevice.vue +++ b/src/pages/SelectDevice.vue @@ -47,8 +47,6 @@ import { Ref, ref } from 'vue' const devices: Ref = ref([ 'maixpy_m5stickv', 'maixpy_amigo', - 'maixpy_amigo_ips', - 'maixpy_amigo_tft', 'maixpy_bit', 'maixpy_dock', 'maixpy_yahboom', diff --git a/test/e2e/pageobjects/app.page.ts b/test/e2e/pageobjects/app.page.ts index 233a4882..9e355700 100644 --- a/test/e2e/pageobjects/app.page.ts +++ b/test/e2e/pageobjects/app.page.ts @@ -23,14 +23,12 @@ class App { private __select_device_page__: string; private __select_device_page_maixpy_m5stickv_button__: string; - private __select_device_page_maixpy_amigo_ips_button__: string; - private __select_device_page_maixpy_amigo_tft_button__: string; + private __select_device_page_maixpy_amigo_button__: string; private __select_device_page_maixpy_bit_button__: string; private __select_device_page_maixpy_dock_button__: string; private __select_device_page_maixpy_back_button__: string; private __select_device_page_maixpy_m5stickv_text__: string; - private __select_device_page_maixpy_amigo_ips_text__: string; - private __select_device_page_maixpy_amigo_tft_text__: string; + private __select_device_page_maixpy_amigo_text__: string; private __select_device_page_maixpy_bit_text__: string; private __select_device_page_maixpy_dock_text__: string; private __select_device_page_maixpy_back_text__: string; @@ -135,14 +133,12 @@ class App { this.__select_device_page__ = 'div#select-device-page'; this.__select_device_page_maixpy_m5stickv_button__ = 'div#select-device-page-maixpy_m5stickv-button' - this.__select_device_page_maixpy_amigo_ips_button__ = 'div#select-device-page-maixpy_amigo_ips-button' - this.__select_device_page_maixpy_amigo_tft_button__ = 'div#select-device-page-maixpy_amigo_tft-button' + this.__select_device_page_maixpy_amigo_button__ = 'div#select-device-page-maixpy_amigo-button' this.__select_device_page_maixpy_bit_button__ = 'div#select-device-page-maixpy_bit-button' this.__select_device_page_maixpy_dock_button__ = 'div#select-device-page-maixpy_dock-button' this.__select_device_page_maixpy_back_button__ = 'div#select-device-page-back-button' this.__select_device_page_maixpy_m5stickv_text__ = 'div#select-device-page-maixpy_m5stickv-text' - this.__select_device_page_maixpy_amigo_ips_text__ = 'div#select-device-page-maixpy_amigo_ips-text' - this.__select_device_page_maixpy_amigo_tft_text__ = 'div#select-device-page-maixpy_amigo_tft-text' + this.__select_device_page_maixpy_amigo_text__ = 'div#select-device-page-maixpy_amigo-text' this.__select_device_page_maixpy_bit_text__ = 'div#select-device-page-maixpy_bit-text' this.__select_device_page_maixpy_dock_text__ = 'div#select-device-page-maixpy_dock-text' this.__select_device_page_maixpy_back_text__ = 'div#select-device-page-back-text' @@ -300,12 +296,8 @@ class App { return $(this.__select_device_page_maixpy_m5stickv_button__) } - get selectMaixpyAmigoIpsButton () { - return $(this.__select_device_page_maixpy_amigo_ips_button__) - } - - get selectMaixpyAmigoTftButton () { - return $(this.__select_device_page_maixpy_amigo_tft_button__) + get selectMaixpyAmigoButton () { + return $(this.__select_device_page_maixpy_amigo_button__) } get selectMaixpyBitButton () { @@ -324,12 +316,8 @@ class App { return $(this.__select_device_page_maixpy_m5stickv_text__) } - get selectMaixpyAmigoIpsText () { - return $(this.__select_device_page_maixpy_amigo_ips_text__) - } - - get selectMaixpyAmigoTftText () { - return $(this.__select_device_page_maixpy_amigo_tft_text__) + get selectMaixpyAmigoText () { + return $(this.__select_device_page_maixpy_amigo_text__) } get selectMaixpyBitText () { diff --git a/test/e2e/specs/006.select-device-show-only.spec.mts b/test/e2e/specs/006.select-device-show-only.spec.mts index e5be4f51..83619a39 100644 --- a/test/e2e/specs/006.select-device-show-only.spec.mts +++ b/test/e2e/specs/006.select-device-show-only.spec.mts @@ -48,24 +48,14 @@ describe('KruxInstaller SelectDevice page (show only)', () => { await expect(instance.selectMaixpyM5StickVText).toHaveText('maixpy_m5stickv') }) - it('should \'maixpy_amigo_ips\' button be displayed', async () => { - await instance.selectMaixpyAmigoIpsButton.waitForExist() - await expect(instance.selectMaixpyAmigoIpsButton).toBeDisplayed() + it('should \'maixpy_amigo\' button be displayed', async () => { + await instance.selectMaixpyAmigoButton.waitForExist() + await expect(instance.selectMaixpyAmigoButton).toBeDisplayed() }) - it('should \'maixpy_amigo_ips\' button have \'maixpy_amigo_ips\' text', async () => { - await instance.selectMaixpyAmigoIpsText.waitForExist() - await expect(instance.selectMaixpyAmigoIpsText).toHaveText('maixpy_amigo_ips') - }) - - it('should \'maixpy_amigo_tft\' button be displayed', async () => { - await instance.selectMaixpyAmigoTftButton.waitForExist() - await expect(instance.selectMaixpyAmigoTftButton).toBeDisplayed() - }) - - it('should \'maixpy_amigo_tft\' button have \'maixpy_amigo_tft\' text', async () => { - await instance.selectMaixpyAmigoTftText.waitForExist() - await expect(instance.selectMaixpyAmigoTftText).toHaveText('maixpy_amigo_tft') + it('should \'maixpy_amigo\' button have \'maixpy_amigo\' text', async () => { + await instance.selectMaixpyAmigoText.waitForExist() + await expect(instance.selectMaixpyAmigoText).toHaveText('maixpy_amigo') }) it('should \'maixpy_bit\' button be displayed', async () => { diff --git a/test/e2e/specs/008.select-device-amigo-ips.spec.mts b/test/e2e/specs/008.select-device-amigo.spec.mts similarity index 90% rename from test/e2e/specs/008.select-device-amigo-ips.spec.mts rename to test/e2e/specs/008.select-device-amigo.spec.mts index 1e50fcff..b5aadbbe 100644 --- a/test/e2e/specs/008.select-device-amigo-ips.spec.mts +++ b/test/e2e/specs/008.select-device-amigo.spec.mts @@ -4,7 +4,7 @@ import { createRequire } from 'module' const App = createRequire(import.meta.url)('../pageobjects/app.page') -describe('KruxInstaller SelectDevice page selects \'maixpy_amigo_ips\' device', () => { +describe('KruxInstaller SelectDevice page selects \'maixpy_amigo\' device', () => { let instance: any; @@ -32,8 +32,8 @@ describe('KruxInstaller SelectDevice page selects \'maixpy_amigo_ips\' device', await instance.mainSelectDeviceButton.click() await instance.mainPage.waitForExist({ reverse: true }) await instance.selectDevicePage.waitForExist() - await instance.selectMaixpyAmigoIpsButton.waitForExist() - await instance.selectMaixpyAmigoIpsButton.click() + await instance.selectMaixpyAmigoButton.waitForExist() + await instance.selectMaixpyAmigoButton.click() }) it('should change to Main page', async () => { @@ -43,8 +43,8 @@ describe('KruxInstaller SelectDevice page selects \'maixpy_amigo_ips\' device', await expect(instance.mainPage).toBeDisplayed() }) - it('should \'Select device\' button changed its text to \'Device: maixpy_amigo_ips\'', async () => { - await expect(instance.mainSelectDeviceText).toHaveText('Device: maixpy_amigo_ips') + it('should \'Select device\' button changed its text to \'Device: maixpy_amigo\'', async () => { + await expect(instance.mainSelectDeviceText).toHaveText('Device: maixpy_amigo') }) }) diff --git a/test/e2e/specs/009.select-device-amigo-tft.spec.mts b/test/e2e/specs/009.select-device-amigo-tft.spec.mts deleted file mode 100644 index 19c6a8d0..00000000 --- a/test/e2e/specs/009.select-device-amigo-tft.spec.mts +++ /dev/null @@ -1,51 +0,0 @@ -import { expect } from '@wdio/globals' -import { describe, it } from 'mocha' -import { createRequire } from 'module' - -const App = createRequire(import.meta.url)('../pageobjects/app.page') - - -describe('KruxInstaller SelectDevice page selects \'maixpy_amigo_tft\' device', () => { - - let instance: any; - - before(async function () { - instance = new App() - await instance.app.waitForExist() - await instance.main.waitForExist() - await instance.logo.waitForExist() - await instance.logo.waitForExist({ reverse: true }) - await instance.loadingDataMsg.waitForExist() - await instance.verifyingOpensslMsg.waitForExist() - if (process.platform === 'linux') { - await instance.opensslForLinuxFound.waitForExist() - } else if (process.platform === 'darwin') { - await instance.opensslForDarwinFound.waitForExist() - } else if (process.platform === 'win32') { - await instance.opensslForWin32Found.waitForExist() - } - await instance.loadingDataMsg.waitForExist({ reverse: true }) - await instance.verifyingOpensslMsg.waitForExist({ reverse: true }) - await instance.opensslForLinuxFound.waitForExist({ reverse: true }) - await instance.mainPage.waitForExist() - await instance.mainSelectDeviceButton.waitForExist() - await instance.mainSelectVersionButton.waitForExist() - await instance.mainSelectDeviceButton.click() - await instance.mainPage.waitForExist({ reverse: true }) - await instance.selectDevicePage.waitForExist() - await instance.selectMaixpyAmigoTftButton.waitForExist() - await instance.selectMaixpyAmigoTftButton.click() - }) - - it('should change to Main page', async () => { - await instance.selectDevicePage.waitForExist({ reverse: true }) - await expect(instance.selectDevicePage).not.toBeDisplayed() - await instance.mainPage.waitForExist() - await expect(instance.mainPage).toBeDisplayed() - }) - - it('should \'Select device\' button changed its text to \'Device: maixpy_amigo_tft\'', async () => { - await expect(instance.mainSelectDeviceText).toHaveText('Device: maixpy_amigo_tft') - }) - -}) diff --git a/test/e2e/specs/010.select-device-bit.spec.mts b/test/e2e/specs/009.select-device-bit.spec.mts similarity index 100% rename from test/e2e/specs/010.select-device-bit.spec.mts rename to test/e2e/specs/009.select-device-bit.spec.mts diff --git a/test/e2e/specs/011.select-device-dock.spec.mts b/test/e2e/specs/010.select-device-dock.spec.mts similarity index 100% rename from test/e2e/specs/011.select-device-dock.spec.mts rename to test/e2e/specs/010.select-device-dock.spec.mts diff --git a/test/e2e/specs/012.select-device-back.spec.mts b/test/e2e/specs/011.select-device-back.spec.mts similarity index 100% rename from test/e2e/specs/012.select-device-back.spec.mts rename to test/e2e/specs/011.select-device-back.spec.mts diff --git a/test/e2e/specs/013.select-version-show-only.spec.mts b/test/e2e/specs/012.select-version-show-only.spec.mts similarity index 100% rename from test/e2e/specs/013.select-version-show-only.spec.mts rename to test/e2e/specs/012.select-version-show-only.spec.mts diff --git a/test/e2e/specs/014.select-version-selfcustody-release-zip.spec.mts b/test/e2e/specs/013.select-version-selfcustody-release-zip.spec.mts similarity index 100% rename from test/e2e/specs/014.select-version-selfcustody-release-zip.spec.mts rename to test/e2e/specs/013.select-version-selfcustody-release-zip.spec.mts diff --git a/test/e2e/specs/015.already-downloaded-selfcustody-release-zip.spec.mts b/test/e2e/specs/014.already-downloaded-selfcustody-release-zip.spec.mts similarity index 100% rename from test/e2e/specs/015.already-downloaded-selfcustody-release-zip.spec.mts rename to test/e2e/specs/014.already-downloaded-selfcustody-release-zip.spec.mts diff --git a/test/e2e/specs/016.already-downloaded-selfcustody-release-zip-click-back-button.spec.mts b/test/e2e/specs/015.already-downloaded-selfcustody-release-zip-click-back-button.spec.mts similarity index 100% rename from test/e2e/specs/016.already-downloaded-selfcustody-release-zip-click-back-button.spec.mts rename to test/e2e/specs/015.already-downloaded-selfcustody-release-zip-click-back-button.spec.mts diff --git a/test/e2e/specs/017.already-downloaded-selfcustody-release-zip-click-show-details-button.spec.mts b/test/e2e/specs/016.already-downloaded-selfcustody-release-zip-click-show-details-button.spec.mts similarity index 100% rename from test/e2e/specs/017.already-downloaded-selfcustody-release-zip-click-show-details-button.spec.mts rename to test/e2e/specs/016.already-downloaded-selfcustody-release-zip-click-show-details-button.spec.mts diff --git a/test/e2e/specs/018.already-downloaded-selfcustody-release-zip-click-download-again.spec.mts b/test/e2e/specs/017.already-downloaded-selfcustody-release-zip-click-download-again.spec.mts similarity index 100% rename from test/e2e/specs/018.already-downloaded-selfcustody-release-zip-click-download-again.spec.mts rename to test/e2e/specs/017.already-downloaded-selfcustody-release-zip-click-download-again.spec.mts diff --git a/test/e2e/specs/019.already-downloaded-selfcustody-release-zip-click-proceed-button.spec.mts b/test/e2e/specs/018.already-downloaded-selfcustody-release-zip-click-proceed-button.spec.mts similarity index 100% rename from test/e2e/specs/019.already-downloaded-selfcustody-release-zip-click-proceed-button.spec.mts rename to test/e2e/specs/018.already-downloaded-selfcustody-release-zip-click-proceed-button.spec.mts diff --git a/test/e2e/specs/020.select-version-selfcustody-release-zip-sha256.spec.mts b/test/e2e/specs/019.select-version-selfcustody-release-zip-sha256.spec.mts similarity index 100% rename from test/e2e/specs/020.select-version-selfcustody-release-zip-sha256.spec.mts rename to test/e2e/specs/019.select-version-selfcustody-release-zip-sha256.spec.mts diff --git a/test/e2e/specs/021.already-downloaded-selfcustody-release-zip-sha256.spec.mts b/test/e2e/specs/020.already-downloaded-selfcustody-release-zip-sha256.spec.mts similarity index 100% rename from test/e2e/specs/021.already-downloaded-selfcustody-release-zip-sha256.spec.mts rename to test/e2e/specs/020.already-downloaded-selfcustody-release-zip-sha256.spec.mts diff --git a/test/e2e/specs/022.already-downloaded-selfcustody-release-zip-sha256-click-back-button.spec.mts b/test/e2e/specs/021.already-downloaded-selfcustody-release-zip-sha256-click-back-button.spec.mts similarity index 100% rename from test/e2e/specs/022.already-downloaded-selfcustody-release-zip-sha256-click-back-button.spec.mts rename to test/e2e/specs/021.already-downloaded-selfcustody-release-zip-sha256-click-back-button.spec.mts diff --git a/test/e2e/specs/023.already-downloaded-selfcustody-release-zip-sha256-click-show-details-button.spec.mts b/test/e2e/specs/022.already-downloaded-selfcustody-release-zip-sha256-click-show-details-button.spec.mts similarity index 100% rename from test/e2e/specs/023.already-downloaded-selfcustody-release-zip-sha256-click-show-details-button.spec.mts rename to test/e2e/specs/022.already-downloaded-selfcustody-release-zip-sha256-click-show-details-button.spec.mts diff --git a/test/e2e/specs/024.already-downloaded-selfcustody-release-zip-sha256-click-download-again-button.spec.mts b/test/e2e/specs/023.already-downloaded-selfcustody-release-zip-sha256-click-download-again-button.spec.mts similarity index 100% rename from test/e2e/specs/024.already-downloaded-selfcustody-release-zip-sha256-click-download-again-button.spec.mts rename to test/e2e/specs/023.already-downloaded-selfcustody-release-zip-sha256-click-download-again-button.spec.mts diff --git a/test/e2e/specs/025.already-downloaded-selfcustody-release-zip-sha256-click-proceed-button.spec.mts b/test/e2e/specs/024.already-downloaded-selfcustody-release-zip-sha256-click-proceed-button.spec.mts similarity index 100% rename from test/e2e/specs/025.already-downloaded-selfcustody-release-zip-sha256-click-proceed-button.spec.mts rename to test/e2e/specs/024.already-downloaded-selfcustody-release-zip-sha256-click-proceed-button.spec.mts diff --git a/test/e2e/specs/026.select-version-selfcustody-release-zip-sig.spec.mts b/test/e2e/specs/025.select-version-selfcustody-release-zip-sig.spec.mts similarity index 100% rename from test/e2e/specs/026.select-version-selfcustody-release-zip-sig.spec.mts rename to test/e2e/specs/025.select-version-selfcustody-release-zip-sig.spec.mts diff --git a/test/e2e/specs/027.already-downloaded-selfcustody-release-zip-sig.spec.mts b/test/e2e/specs/026.already-downloaded-selfcustody-release-zip-sig.spec.mts similarity index 100% rename from test/e2e/specs/027.already-downloaded-selfcustody-release-zip-sig.spec.mts rename to test/e2e/specs/026.already-downloaded-selfcustody-release-zip-sig.spec.mts diff --git a/test/e2e/specs/028.already-downloaded-selfcustody-release-zip-sig-click-back-button.spec.mts b/test/e2e/specs/027.already-downloaded-selfcustody-release-zip-sig-click-back-button.spec.mts similarity index 100% rename from test/e2e/specs/028.already-downloaded-selfcustody-release-zip-sig-click-back-button.spec.mts rename to test/e2e/specs/027.already-downloaded-selfcustody-release-zip-sig-click-back-button.spec.mts diff --git a/test/e2e/specs/029.already-downloaded-selfcustody-release-zip-sig-show-details-button.spec.mts b/test/e2e/specs/028.already-downloaded-selfcustody-release-zip-sig-show-details-button.spec.mts similarity index 100% rename from test/e2e/specs/029.already-downloaded-selfcustody-release-zip-sig-show-details-button.spec.mts rename to test/e2e/specs/028.already-downloaded-selfcustody-release-zip-sig-show-details-button.spec.mts diff --git a/test/e2e/specs/030.already-downloaded-selfcustody-release-zip-sig-download-again-button.spec.mts b/test/e2e/specs/029.already-downloaded-selfcustody-release-zip-sig-download-again-button.spec.mts similarity index 100% rename from test/e2e/specs/030.already-downloaded-selfcustody-release-zip-sig-download-again-button.spec.mts rename to test/e2e/specs/029.already-downloaded-selfcustody-release-zip-sig-download-again-button.spec.mts diff --git a/test/e2e/specs/031.already-downloaded-selfcustody-release-zip-sig-click-proceed-button.spec.mts b/test/e2e/specs/030.already-downloaded-selfcustody-release-zip-sig-click-proceed-button.spec.mts similarity index 100% rename from test/e2e/specs/031.already-downloaded-selfcustody-release-zip-sig-click-proceed-button.spec.mts rename to test/e2e/specs/030.already-downloaded-selfcustody-release-zip-sig-click-proceed-button.spec.mts diff --git a/test/e2e/specs/032-select-version-selfcustody-pem.spec.mts b/test/e2e/specs/031-select-version-selfcustody-pem.spec.mts similarity index 100% rename from test/e2e/specs/032-select-version-selfcustody-pem.spec.mts rename to test/e2e/specs/031-select-version-selfcustody-pem.spec.mts diff --git a/test/e2e/specs/033.already-downloaded-selfcustody-pem.spec.mts b/test/e2e/specs/032.already-downloaded-selfcustody-pem.spec.mts similarity index 100% rename from test/e2e/specs/033.already-downloaded-selfcustody-pem.spec.mts rename to test/e2e/specs/032.already-downloaded-selfcustody-pem.spec.mts diff --git a/test/e2e/specs/034.already-downloaded-selfcustody-pem-click-back-button.spec.mts b/test/e2e/specs/033.already-downloaded-selfcustody-pem-click-back-button.spec.mts similarity index 100% rename from test/e2e/specs/034.already-downloaded-selfcustody-pem-click-back-button.spec.mts rename to test/e2e/specs/033.already-downloaded-selfcustody-pem-click-back-button.spec.mts diff --git a/test/e2e/specs/035.already-downloaded-selfcustody-pem-show-details-button.spec.mts b/test/e2e/specs/034.already-downloaded-selfcustody-pem-show-details-button.spec.mts similarity index 100% rename from test/e2e/specs/035.already-downloaded-selfcustody-pem-show-details-button.spec.mts rename to test/e2e/specs/034.already-downloaded-selfcustody-pem-show-details-button.spec.mts diff --git a/test/e2e/specs/036.already-downloaded-selfcustody-pem-download-again-button.spec.mts b/test/e2e/specs/035.already-downloaded-selfcustody-pem-download-again-button.spec.mts similarity index 100% rename from test/e2e/specs/036.already-downloaded-selfcustody-pem-download-again-button.spec.mts rename to test/e2e/specs/035.already-downloaded-selfcustody-pem-download-again-button.spec.mts diff --git a/test/e2e/specs/037.already-downloaded-selfcustody-pem-click-proceed-button.spec.mts b/test/e2e/specs/036.already-downloaded-selfcustody-pem-click-proceed-button.spec.mts similarity index 100% rename from test/e2e/specs/037.already-downloaded-selfcustody-pem-click-proceed-button.spec.mts rename to test/e2e/specs/036.already-downloaded-selfcustody-pem-click-proceed-button.spec.mts diff --git a/test/e2e/specs/038-check-verify-official-release.spec.mts b/test/e2e/specs/037-check-verify-official-release.spec.mts similarity index 100% rename from test/e2e/specs/038-check-verify-official-release.spec.mts rename to test/e2e/specs/037-check-verify-official-release.spec.mts diff --git a/test/e2e/specs/039-verified-official-release.spec.mts b/test/e2e/specs/038-verified-official-release.spec.mts similarity index 100% rename from test/e2e/specs/039-verified-official-release.spec.mts rename to test/e2e/specs/038-verified-official-release.spec.mts