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

karma spec updates

Browse source
This commit is contained in:
Phil Hughes 2017-11-01 09:26:16 +00:00
parent 7c331ac951
commit b20381204a
No known key found for this signature in database
GPG key ID: 32245528C52E0F9F
4 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/notes/components/issue_note.vue
View file

@ -122,7 +122,9 @@
// we need to do this to prevent noteForm inconsistent content warning // we need to do this to prevent noteForm inconsistent content warning
// this is something we intentionally do so we need to recover the content // this is something we intentionally do so we need to recover the content
this.note.note = noteText; this.note.note = noteText;
this.$refs.noteBody.$refs.noteForm.note = noteText; // TODO: This could be better if (this.$refs.noteBody) {
this.$refs.noteBody.$refs.noteForm.note = noteText; // TODO: This could be better
}
}, },
}, },
created() { created() {

2
app/assets/javascripts/profile/account/components/delete_account_modal.vue
View file

@ -98,7 +98,7 @@ Once you confirm %{deleteAccount}, it cannot be undone or recovered.`),
@toggle="toggleOpen" @toggle="toggleOpen"
@submit="onSubmit"> @submit="onSubmit">
<template slot="body" scope="props"> <template slot="body" slot-scope="props">
<p v-html="props.text"></p> <p v-html="props.text"></p>
<form <form

4
spec/javascripts/groups/components/app_spec.js
View file

@ -431,9 +431,9 @@ describe('AppComponent', () => {
}); });
it('should render groups tree', (done) => { it('should render groups tree', (done) => {
vm.groups = [mockParentGroupItem]; vm.store.state.groups = [mockParentGroupItem];
vm.isLoading = false; vm.isLoading = false;
vm.pageInfo = mockPageInfo; vm.store.state.pageInfo = mockPageInfo;
Vue.nextTick(() => { Vue.nextTick(() => {
expect(vm.$el.querySelector('.groups-list-tree-container')).toBeDefined(); expect(vm.$el.querySelector('.groups-list-tree-container')).toBeDefined();
done(); done();

14
spec/javascripts/vue_shared/components/markdown/field_spec.js
View file

@ -42,12 +42,14 @@ describe('Markdown field component', () => {
beforeEach(() => { beforeEach(() => {
spyOn(Vue.http, 'post').and.callFake(() => new Promise((resolve) => { spyOn(Vue.http, 'post').and.callFake(() => new Promise((resolve) => {
resolve({ setTimeout(() => {
json() { resolve({
return { json() {
body: '<p>markdown preview</p>', return {
}; body: '<p>markdown preview</p>',
}, };
},
});
}); });
})); }));