fixup! dapp: export user settings to own store module

raiden-network · May 10, 2021 · 7b72b31 · 7b72b31
1 parent 0c02876
commit 7b72b31
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 16 deletions.
diff --git a/raiden-dapp/src/store/user-settings/mutations.ts b/raiden-dapp/src/store/user-settings/mutations.ts
@@ -5,10 +5,10 @@ import type { EthereumConnectionOptions } from '@/services/ethereum-connection';
 import type { UserSettingsState } from './types';
 
 export const mutations: MutationTree<UserSettingsState> = {
-  enableRaidenAccountUsage(state) {
+  enableRaidenAccount(state) {
     state.useRaidenAccount = true;
   },
-  disableRaidenAccountUsage(state) {
+  disableRaidenAccount(state) {
     state.useRaidenAccount = false;
   },
   saveEthereumConnectionOptions(

diff --git a/raiden-dapp/src/views/account/Settings.vue b/raiden-dapp/src/views/account/Settings.vue
@@ -27,17 +27,17 @@ const { mapState, mapMutations } = createNamespacedHelpers('userSettings');
 @Component({
   computed: {
     ...mapState(['useRaidenAccount']),
-    ...mapMutations(['enableRaidenAccountUsage', 'disableRaidenAccountUsage']),
+    ...mapMutations(['enableRaidenAccount', 'disableRaidenAccount']),
   },
 })
 export default class RaidenSettings extends Vue {
   useRaidenAccount!: boolean;
 
-  enableRaidenAccountUsage!: () => void;
-  disableRaidenAccountUsage!: () => void;
+  enableRaidenAccount!: () => void;
+  disableRaidenAccount!: () => void;
 
   toggleRaidenAccountUsage(value: boolean): void {
-    value ? this.enableRaidenAccountUsage() : this.disableRaidenAccountUsage();
+    value ? this.enableRaidenAccount() : this.disableRaidenAccount();
   }
 }
 </script>

diff --git a/raiden-dapp/tests/unit/store/user-settings/mutations.spec.ts b/raiden-dapp/tests/unit/store/user-settings/mutations.spec.ts
@@ -6,7 +6,7 @@ describe('user setttings store mutations', () => {
     const state = defaultState();
     state.useRaidenAccount = false;
 
-    mutations.enableRaidenAccountUsage(state);
+    mutations.enableRaidenAccount(state);
 
     expect(state.useRaidenAccount).toBe(true);
   });
@@ -15,7 +15,7 @@ describe('user setttings store mutations', () => {
     const state = defaultState();
     expect(state.useRaidenAccount).toBe(true);
 
-    mutations.disableRaidenAccountUsage(state);
+    mutations.disableRaidenAccount(state);
 
     expect(state.useRaidenAccount).toBe(false);
   });

diff --git a/raiden-dapp/tests/unit/views/account/settings.spec.ts b/raiden-dapp/tests/unit/views/account/settings.spec.ts
@@ -11,8 +11,8 @@ jest.mock('vue-router');
 Vue.use(Vuetify);
 Vue.use(Vuex);
 
-const enableRaidenAccountUsage = jest.fn();
-const disableRaidenAccountUsage = jest.fn();
+const enableRaidenAccount = jest.fn();
+const disableRaidenAccount = jest.fn();
 
 function createWrapper(options?: { useRaidenAccount?: boolean }): Wrapper<Settings> {
   const vuetify = new Vuetify();
@@ -21,8 +21,8 @@ function createWrapper(options?: { useRaidenAccount?: boolean }): Wrapper<Settin
   };
 
   const mutations = {
-    enableRaidenAccountUsage,
-    disableRaidenAccountUsage,
+    enableRaidenAccount,
+    disableRaidenAccount,
   };
 
   const userSettingsModule = {
@@ -61,7 +61,7 @@ describe('Settings.vue', () => {
     toggleInput.trigger('click');
     await wrapper.vm.$nextTick();
 
-    expect(enableRaidenAccountUsage).toHaveBeenCalledTimes(1);
+    expect(enableRaidenAccount).toHaveBeenCalledTimes(1);
     expect((toggleInput.element as HTMLInputElement).checked).toBe(true);
   });
 
@@ -72,7 +72,7 @@ describe('Settings.vue', () => {
     toggleInput.trigger('click');
     await wrapper.vm.$nextTick();
 
-    expect(disableRaidenAccountUsage).toHaveBeenCalledTimes(1);
+    expect(disableRaidenAccount).toHaveBeenCalledTimes(1);
     expect((toggleInput.element as HTMLInputElement).checked).toBe(false);
   });
 });
diff --git a/raiden-dapp/tests/unit/views/home.spec.ts b/raiden-dapp/tests/unit/views/home.spec.ts
@@ -57,8 +57,8 @@ describe('Home.vue', () => {
   async function connect(settings?: { useRaidenAccount?: boolean }): Promise<void> {
     const useRaidenAccount = settings?.useRaidenAccount ?? true;
     const mutation = useRaidenAccount
-      ? 'userSettings/enableRaidenAccountUsage'
-      : 'userSettings/disableRaidenAccountUsage';
+      ? 'userSettings/enableRaidenAccount'
+      : 'userSettings/disableRaidenAccount';
     store.commit(mutation);
 
     await (wrapper.vm as any).connect();
@@ -78,6 +78,7 @@ describe('Home.vue', () => {
   test('successful connect navigates to redirect target if given in query', async () => {
     const redirectTo = 'connect/0x5Fc523e13fBAc2140F056AD7A96De2cC0C4Cc63A';
     wrapper.vm.$route.query = { redirectTo };
+    await wrapper.vm.$nextTick();
 
     await connect();
 
@@ -86,7 +87,10 @@ describe('Home.vue', () => {
 
   test('connect can be called without displaying error after failing initially', async () => {
     (wrapper.vm as any).connectionError = ErrorCode.UNSUPPORTED_NETWORK;
+    await wrapper.vm.$nextTick();
+
     await connect();
+
     expect((wrapper.vm as any).connectionError).toBe(null);
   });