fixup! test(web-extension): use behaviour subject to update store state between assertions

Author: greatertomi

packages/web-extension/test/walletManager/WalletRepository.test.ts

@@ -191,11 +191,9 @@ describe('WalletRepository', () => {
   });
 
   describe('addAccount', () => {
+    const accountIndex = storedLedgerWallet.accounts[storedLedgerWallet.accounts.length - 1].accountIndex + 1;
     it('adds account to an existing wallet and returns AccountId that also contains walletId', async () => {
-      const accountProps = createAccount(
-        0,
-        storedLedgerWallet.accounts[storedLedgerWallet.accounts.length - 1].accountIndex + 1
-      );
+      const accountProps = createAccount(0, accountIndex);
       const props = {
         ...accountProps,
         walletId: storedLedgerWallet.walletId
@@ -213,41 +211,28 @@ describe('WalletRepository', () => {
       const storeSubject = new BehaviorSubject([storedLedgerWallet]);
       store.observeAll.mockReturnValue(storeSubject.asObservable());
 
-      const standardAccountProps = createAccount(
-        0,
-        storedLedgerWallet.accounts[storedLedgerWallet.accounts.length - 1].accountIndex + 1,
-        KeyPurpose.STANDARD
-      );
+      const standardAccountProps = createAccount(0, accountIndex, KeyPurpose.STANDARD);
       const standardProps = {
         ...standardAccountProps,
         walletId: storedLedgerWallet.walletId
       };
+      const walletWithStandardAccount = [
+        {
+          ...storedLedgerWallet,
+          accounts: [...storedLedgerWallet.accounts, standardAccountProps]
+        }
+      ];
 
-      const multiSigAccountProps = createAccount(
-        0,
-        storedLedgerWallet.accounts[storedLedgerWallet.accounts.length - 1].accountIndex + 1,
-        KeyPurpose.MULTI_SIG
-      );
-
+      const multiSigAccountProps = createAccount(0, accountIndex, KeyPurpose.MULTI_SIG);
       const multiSigProps = {
         ...multiSigAccountProps,
         walletId: storedLedgerWallet.walletId
       };
 
       await expect(repository.addAccount(standardProps)).resolves.toEqual(standardProps);
-      expect(store.setAll).toBeCalledWith([
-        {
-          ...storedLedgerWallet,
-          accounts: [...storedLedgerWallet.accounts, standardAccountProps]
-        }
-      ]);
+      expect(store.setAll).toBeCalledWith(walletWithStandardAccount);
 
-      storeSubject.next([
-        {
-          ...storedLedgerWallet,
-          accounts: [...storedLedgerWallet.accounts, standardAccountProps]
-        }
-      ]);
+      storeSubject.next(walletWithStandardAccount);
 
       await expect(repository.addAccount(multiSigProps)).resolves.toEqual(multiSigProps);
       expect(store.setAll).toBeCalledWith([
@@ -345,7 +330,7 @@ describe('WalletRepository', () => {
     it('does not update 1852 account metadata when updating 1854 account', async () => {
       const storedAccount = storedLedgerWallet.accounts[0];
       const newAccount = createAccount(0, storedAccount.accountIndex, KeyPurpose.MULTI_SIG);
-      const accounts = [storedLedgerWallet.accounts[0], newAccount];
+      const accounts = [storedAccount, newAccount];
       store.observeAll.mockReturnValueOnce(of([{ ...storedLedgerWallet, accounts }]));
 
       const props: UpdateAccountMetadataProps<WalletMetadata> = {
@@ -360,7 +345,7 @@ describe('WalletRepository', () => {
         {
           ...storedLedgerWallet,
           accounts: [
-            storedLedgerWallet.accounts[0],
+            storedAccount,
             {
               ...newAccount,
               metadata: newMetadata
@@ -425,8 +410,9 @@ describe('WalletRepository', () => {
     });
 
     it('does not remove 1852 account when removing 1854 account', async () => {
-      const newAccount = createAccount(0, 1, KeyPurpose.MULTI_SIG);
-      const accounts = [storedLedgerWallet.accounts[0], newAccount];
+      const storedAccount = storedLedgerWallet.accounts[0];
+      const newAccount = createAccount(0, storedAccount.accountIndex, KeyPurpose.MULTI_SIG);
+      const accounts = [storedAccount, newAccount];
       store.observeAll.mockReturnValueOnce(of([{ ...storedLedgerWallet, accounts }]));
 
       const props = {
@@ -438,7 +424,7 @@ describe('WalletRepository', () => {
       expect(store.setAll).toBeCalledWith([
         {
           ...storedLedgerWallet,
-          accounts: [storedLedgerWallet.accounts[0]]
+          accounts: [storedAccount]
         }
       ]);
     });