KumiSystems/Chatwoot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bug: Fix account_id in URLs (#894)

Browse source 
* Bug: Fix account_id in URLs
* Fix accountMixin specs
This commit is contained in:
Pranav Raj S 2020-05-26 23:36:42 +05:30 • committed by GitHub
parent b7a583b2c4
commit efc59bb43f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 43 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/javascript/dashboard/mixins/account.js
View file

@ -1,10 +1,10 @@
import auth from '../api/auth';
import { mapGetters } from 'vuex';
export default {
computed: {
accountId() {
return auth.getCurrentUser().account_id;
},
...mapGetters({
accountId: 'getCurrentAccountId',
}),
},
methods: {
addAccountScoping(url) {

33
app/javascript/dashboard/mixins/specs/account.spec.js
View file

@ -1,33 +1,40 @@
import { createWrapper } from '@vue/test-utils';
import { shallowMount, createLocalVue } from '@vue/test-utils';
import accountMixin from '../account';
import Vue from 'vue';
import Vuex from 'vuex';
jest.mock('../../api/auth', () => ({
getCurrentUser: () => ({ account_id: 1 }),
}));
const localVue = createLocalVue();
localVue.use(Vuex);
describe('accountMixin', () => {
test('set accountId properly', () => {
let getters;
let store;
beforeEach(() => {
getters = {
getCurrentAccountId: () => 1,
};
store = new Vuex.Store({ getters });
});
it('set accountId properly', () => {
const Component = {
render() {},
title: 'TestComponent',
mixins: [accountMixin],
};
const Constructor = Vue.extend(Component);
const vm = new Constructor().$mount();
const wrapper = createWrapper(vm);
const wrapper = shallowMount(Component, { store, localVue });
expect(wrapper.vm.accountId).toBe(1);
});
test('returns current url', () => {
it('returns current url', () => {
const Component = {
render() {},
title: 'TestComponent',
mixins: [accountMixin],
};
const Constructor = Vue.extend(Component);
const vm = new Constructor().$mount();
const wrapper = createWrapper(vm);
const wrapper = shallowMount(Component, { store, localVue });
expect(wrapper.vm.addAccountScoping('settings/inboxes/new')).toBe(
'/app/accounts/1/settings/inboxes/new'
);