Commit 433ad2d0 authored by Phil Hughes's avatar Phil Hughes

karma fixes

parent 0531631c
...@@ -49,8 +49,8 @@ export default { ...@@ -49,8 +49,8 @@ export default {
:title="$options.currentBranchPermissionsTooltip" :title="$options.currentBranchPermissionsTooltip"
> >
<span <span
v-html="commitToCurrentBranchText"
class="ide-radio-label" class="ide-radio-label"
v-html="commitToCurrentBranchText"
> >
</span> </span>
</radio-group> </radio-group>
......
...@@ -16,6 +16,7 @@ describe('IDE commit form', () => { ...@@ -16,6 +16,7 @@ describe('IDE commit form', () => {
store.state.changedFiles.push('test'); store.state.changedFiles.push('test');
store.state.currentProjectId = 'abcproject'; store.state.currentProjectId = 'abcproject';
store.state.currentBranchId = 'master';
Vue.set(store.state.projects, 'abcproject', { ...projectData }); Vue.set(store.state.projects, 'abcproject', { ...projectData });
vm = createComponentWithStore(Component, store).$mount(); vm = createComponentWithStore(Component, store).$mount();
......
...@@ -13,6 +13,7 @@ describe('IDE commit message field', () => { ...@@ -13,6 +13,7 @@ describe('IDE commit message field', () => {
Component, Component,
{ {
text: '', text: '',
placeholder: 'testing',
}, },
'#app', '#app',
); );
......
...@@ -8,6 +8,7 @@ export const projectData = { ...@@ -8,6 +8,7 @@ export const projectData = {
branches: { branches: {
master: { master: {
treeId: 'abcproject/master', treeId: 'abcproject/master',
can_push: true,
}, },
}, },
mergeRequests: {}, mergeRequests: {},
......
...@@ -146,15 +146,11 @@ describe('IDE store getters', () => { ...@@ -146,15 +146,11 @@ describe('IDE store getters', () => {
it('returns the last commit of the current branch on the current project', () => { it('returns the last commit of the current branch on the current project', () => {
const commitTitle = 'Example commit title'; const commitTitle = 'Example commit title';
const localGetters = { const localGetters = {
currentProject: { currentBranch: {
branches: {
'example-branch': {
commit: { commit: {
title: commitTitle, title: commitTitle,
}, },
}, },
},
},
}; };
localState.currentBranchId = 'example-branch'; localState.currentBranchId = 'example-branch';
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment