fix: core tests (#5282)

Co-authored-by: Sven <fr.sven.fr@gmail.com>

Author: 0xmkh

apps/laboratory/tests/core-sign-client.spec.ts

@@ -4,12 +4,14 @@ import { BASE_URL, WalletPage, WalletValidator } from '@reown/appkit-testing'
 
 import { expect } from './shared/fixtures/w3m-fixture'
 import { ModalPage } from './shared/pages/ModalPage'
+import { ModalWalletValidator } from './shared/validators/ModalWalletValidator'
 
 /* eslint-disable init-declarations */
 let modalPage: ModalPage
 let walletPage: WalletPage
 let walletValidator: WalletValidator
 let context: BrowserContext
+let validator: ModalWalletValidator
 /* eslint-enable init-declarations */
 
 // -- Setup --------------------------------------------------------------------
@@ -29,6 +31,7 @@ signClientTest.beforeAll(async ({ browser }) => {
   modalPage = new ModalPage(browserPage, 'library', 'core-sign-client')
   walletPage = new WalletPage(await context.newPage())
   walletValidator = new WalletValidator(walletPage.page)
+  validator = new ModalWalletValidator(browserPage)
 
   await walletPage.load()
 
@@ -68,7 +71,7 @@ signClientTest('it should sign message with sign client', async () => {
   await modalPage.page.getByTestId('sign-message-button').click()
   await walletValidator.expectReceivedSign({ chainName: 'Ethereum' })
   await walletPage.handleRequest({ accept: true })
-  await expect(modalPage.page.getByText('Signing Succeeded')).toBeVisible()
+  await validator.expectAcceptedSign()
 })
 
 signClientTest('it should switch networks with sign client', async () => {
@@ -83,7 +86,7 @@ signClientTest('it should sign message after network switch with sign client', a
   await modalPage.page.getByTestId('sign-message-button').click()
   await walletValidator.expectReceivedSign({ chainName: 'Polygon' })
   await walletPage.handleRequest({ accept: true })
-  await expect(modalPage.page.getByText('Signing Succeeded')).toBeVisible()
+  await validator.expectAcceptedSign()
 })
 
 signClientTest('it should stay connected after page refresh with sign client', async () => {
@@ -96,7 +99,7 @@ signClientTest('it should reject sign message with sign client', async () => {
   await modalPage.page.getByTestId('sign-message-button').click()
   await walletValidator.expectReceivedSign({ chainName: 'Ethereum' })
   await walletPage.handleRequest({ accept: false })
-  await expect(modalPage.page.getByText('Failed to sign')).toBeVisible()
+  await validator.expectRejectedSign()
 })
 
 signClientTest('it should switch between various networks with sign client', async () => {

apps/laboratory/tests/core-universal-provider.spec.ts

@@ -4,12 +4,14 @@ import { BASE_URL, WalletPage, WalletValidator } from '@reown/appkit-testing'
 
 import { expect } from './shared/fixtures/w3m-fixture'
 import { ModalPage } from './shared/pages/ModalPage'
+import { ModalWalletValidator } from './shared/validators/ModalWalletValidator'
 
 /* eslint-disable init-declarations */
 let modalPage: ModalPage
 let walletPage: WalletPage
 let walletValidator: WalletValidator
 let context: BrowserContext
+let validator: ModalWalletValidator
 /* eslint-enable init-declarations */
 
 // -- Setup --------------------------------------------------------------------
@@ -29,6 +31,7 @@ universalProviderTest.beforeAll(async ({ browser }) => {
   modalPage = new ModalPage(browserPage, 'library', 'core-universal-provider')
   walletPage = new WalletPage(await context.newPage())
   walletValidator = new WalletValidator(walletPage.page)
+  validator = new ModalWalletValidator(browserPage)
 
   await walletPage.load()
 
@@ -68,7 +71,7 @@ universalProviderTest('it should sign message with universal provider', async ()
   await modalPage.page.getByTestId('sign-message-button').click()
   await walletValidator.expectReceivedSign({ chainName: 'Ethereum' })
   await walletPage.handleRequest({ accept: true })
-  await expect(modalPage.page.getByText('Signing Succeeded')).toBeVisible()
+  await validator.expectAcceptedSign()
 })
 
 universalProviderTest('it should switch networks with universal provider', async () => {
@@ -83,7 +86,7 @@ universalProviderTest('it should sign message after network switch with UP', asy
   await modalPage.page.getByTestId('sign-message-button').click()
   await walletValidator.expectReceivedSign({ chainName: 'Polygon' })
   await walletPage.handleRequest({ accept: true })
-  await expect(modalPage.page.getByText('Signing Succeeded')).toBeVisible()
+  await validator.expectAcceptedSign()
 })
 
 universalProviderTest('it should stay connected after page refresh with UP', async () => {
@@ -96,7 +99,7 @@ universalProviderTest('it should reject sign message with UP', async () => {
   await modalPage.page.getByTestId('sign-message-button').click()
   await walletValidator.expectReceivedSign({ chainName: 'Ethereum' })
   await walletPage.handleRequest({ accept: false })
-  await expect(modalPage.page.getByText('Failed to sign')).toBeVisible()
+  await validator.expectRejectedSign()
 })
 
 universalProviderTest('it should switch between various networks with UP', async () => {

apps/laboratory/tests/core.spec.ts

@@ -4,12 +4,15 @@ import { BASE_URL, WalletPage, WalletValidator } from '@reown/appkit-testing'
 
 import { expect } from './shared/fixtures/w3m-fixture'
 import { ModalPage } from './shared/pages/ModalPage'
+import { ModalWalletValidator } from './shared/validators/ModalWalletValidator'
 
 /* eslint-disable init-declarations */
 let modalPage: ModalPage
 let walletPage: WalletPage
 let walletValidator: WalletValidator
 let context: BrowserContext
+let validator: ModalWalletValidator
+
 /* eslint-enable init-declarations */
 
 // -- Setup --------------------------------------------------------------------
@@ -29,6 +32,7 @@ coreTest.beforeAll(async ({ browser }) => {
   modalPage = new ModalPage(browserPage, 'library', 'core')
   walletPage = new WalletPage(await context.newPage())
   walletValidator = new WalletValidator(walletPage.page)
+  validator = new ModalWalletValidator(browserPage)
 
   await walletPage.load()
 
@@ -66,7 +70,7 @@ coreTest('it should sign message', async () => {
   await modalPage.page.getByTestId('sign-message-button').click()
   await walletValidator.expectReceivedSign({ chainName: 'Ethereum' })
   await walletPage.handleRequest({ accept: true })
-  await expect(modalPage.page.getByText('Signing Succeeded')).toBeVisible()
+  await validator.expectAcceptedSign()
 })
 
 coreTest('it should switch networks', async () => {
@@ -82,7 +86,7 @@ coreTest('it should sign message after network switch', async () => {
   await modalPage.page.getByTestId('sign-message-button').click()
   await walletValidator.expectReceivedSign({ chainName: 'Polygon' })
   await walletPage.handleRequest({ accept: true })
-  await expect(modalPage.page.getByText('Signing Succeeded')).toBeVisible()
+  await validator.expectAcceptedSign()
 })
 
 coreTest('it should stay connected after page refresh', async () => {
@@ -94,7 +98,7 @@ coreTest('it should reject sign message', async () => {
   await modalPage.page.getByTestId('sign-message-button').click()
   await walletValidator.expectReceivedSign({ chainName: 'Polygon' })
   await walletPage.handleRequest({ accept: false })
-  await expect(modalPage.page.getByText('Signing Failed')).toBeVisible()
+  await validator.expectRejectedSign()
 })
 
 coreTest('it should switch between various networks', async () => {

packages/appkit/src/client/appkit-base-client.ts

@@ -1791,7 +1791,27 @@ export abstract class AppKitBaseClient {
     OptionsController.setManualWCControl(Boolean(this.options?.manualWCControl))
     this.universalProvider =
       this.options.universalProvider ?? (await UniversalProvider.init(universalProviderOptions))
-    // Clear the session if we don't want to reconnect on init
+
+    const originalDisconnect = this.universalProvider.disconnect.bind(this.universalProvider)
+
+    this.universalProvider.disconnect = async () => {
+      try {
+        return await originalDisconnect()
+      } catch (error) {
+        if (error instanceof Error) {
+          const isAlreadyDisconnected = error.message.includes(
+            'Missing or invalid. Record was recently deleted'
+          )
+
+          if (isAlreadyDisconnected) {
+            return undefined
+          }
+        }
+
+        throw error
+      }
+    }
+
     if (OptionsController.state.enableReconnect === false && this.universalProvider.session) {
       await this.universalProvider.disconnect()
     }

packages/appkit/tests/mocks/Providers.ts

@@ -42,7 +42,11 @@ export const mockAuthProvider = {
   syncTheme: vi.fn()
 }
 
-export const mockUniversalProvider: Mocked<Pick<UniversalProvider, 'on' | 'off'>> = {
+export const mockUniversalProvider: Mocked<
+  Pick<UniversalProvider, 'on' | 'off' | 'disconnect' | 'connect'>
+> = {
   off: vi.fn(),
-  on: vi.fn()
+  on: vi.fn(),
+  disconnect: vi.fn().mockResolvedValue(undefined),
+  connect: vi.fn().mockResolvedValue(undefined)
 }