kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

added spec to ide_side_bar

Browse source
This commit is contained in:
Phil Hughes 2018-04-19 16:54:54 +01:00
parent 949160e382
commit 913c607030
No known key found for this signature in database
GPG key ID: 32245528C52E0F9F
3 changed files with 27 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/assets/javascripts/ide/components/ide_side_bar.vue
View file

@ -1,9 +1,9 @@
<script> <script>
import { mapState, mapGetters } from 'vuex'; import { mapState, mapGetters } from 'vuex';
import ProjectAvatarImage from '~/vue_shared/components/project_avatar/image.vue'; import ProjectAvatarImage from '~/vue_shared/components/project_avatar/image.vue';
import icon from '~/vue_shared/components/icon.vue'; import Icon from '~/vue_shared/components/icon.vue';
import panelResizer from '~/vue_shared/components/panel_resizer.vue'; import PanelResizer from '~/vue_shared/components/panel_resizer.vue';
import skeletonLoadingContainer from '~/vue_shared/components/skeleton_loading_container.vue'; import SkeletonLoadingContainer from '~/vue_shared/components/skeleton_loading_container.vue';
import Identicon from '../../vue_shared/components/identicon.vue'; import Identicon from '../../vue_shared/components/identicon.vue';
import IdeTree from './ide_tree.vue'; import IdeTree from './ide_tree.vue';
import ResizablePanel from './resizable_panel.vue'; import ResizablePanel from './resizable_panel.vue';
@ -12,9 +12,9 @@ import CommitSection from './repo_commit_section.vue';
export default { export default {
components: { components: {
icon, Icon,
panelResizer, PanelResizer,
skeletonLoadingContainer, SkeletonLoadingContainer,
ResizablePanel, ResizablePanel,
ActivityBar, ActivityBar,
ProjectAvatarImage, ProjectAvatarImage,
@ -87,11 +87,9 @@ export default {
</a> </a>
</div> </div>
<div class="multi-file-commit-panel-inner-scroll"> <div class="multi-file-commit-panel-inner-scroll">
<keep-alive> <component
<component :is="activityBarComponent"
:is="activityBarComponent" />
/>
</keep-alive>
</div> </div>
</template> </template>
</div> </div>

3
app/assets/javascripts/ide/components/ide_tree.vue
View file

@ -21,10 +21,9 @@ export default {
<template> <template>
<div <div
v-if="currentTree"
class="ide-file-list" class="ide-file-list"
> >
<template v-if="currentTree.loading"> <template v-if="!currentTree || currentTree.loading">
<div <div
class="multi-file-loading-container" class="multi-file-loading-container"
v-for="n in 3" v-for="n in 3"

18
spec/javascripts/ide/components/ide_side_bar_spec.js
View file

@ -1,6 +1,7 @@
import Vue from 'vue'; import Vue from 'vue';
import store from '~/ide/stores'; import store from '~/ide/stores';
import ideSidebar from '~/ide/components/ide_side_bar.vue'; import ideSidebar from '~/ide/components/ide_side_bar.vue';
import { ActivityBarViews } from '~/ide/stores/state';
import { createComponentWithStore } from 'spec/helpers/vue_mount_component_helper'; import { createComponentWithStore } from 'spec/helpers/vue_mount_component_helper';
import { resetStore } from '../helpers'; import { resetStore } from '../helpers';
import { projectData } from '../mock_data'; import { projectData } from '../mock_data';
@ -13,7 +14,6 @@ describe('IdeSidebar', () => {
store.state.currentProjectId = 'abcproject'; store.state.currentProjectId = 'abcproject';
store.state.projects.abcproject = projectData; store.state.projects.abcproject = projectData;
store.state.currentActivityView = null;
vm = createComponentWithStore(Component, store).$mount(); vm = createComponentWithStore(Component, store).$mount();
}); });
@ -38,4 +38,20 @@ describe('IdeSidebar', () => {
done(); done();
}); });
}); });
describe('activityBarComponent', () => {
it('renders tree component', () => {
expect(vm.$el.querySelector('.ide-file-list')).not.toBeNull();
});
it('renders commit component', done => {
vm.$store.state.currentActivityView = ActivityBarViews.commit;
vm.$nextTick(() => {
expect(vm.$el.querySelector('.multi-file-commit-panel-section')).not.toBeNull();
done();
});
});
});
}); });