Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
b2038120
Commit
b2038120
authored
Nov 01, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
karma spec updates
parent
7c331ac9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
10 deletions
+14
-10
app/assets/javascripts/notes/components/issue_note.vue
app/assets/javascripts/notes/components/issue_note.vue
+3
-1
app/assets/javascripts/profile/account/components/delete_account_modal.vue
...ripts/profile/account/components/delete_account_modal.vue
+1
-1
spec/javascripts/groups/components/app_spec.js
spec/javascripts/groups/components/app_spec.js
+2
-2
spec/javascripts/vue_shared/components/markdown/field_spec.js
.../javascripts/vue_shared/components/markdown/field_spec.js
+8
-6
No files found.
app/assets/javascripts/notes/components/issue_note.vue
View file @
b2038120
...
@@ -122,7 +122,9 @@
...
@@ -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
()
{
...
...
app/assets/javascripts/profile/account/components/delete_account_modal.vue
View file @
b2038120
...
@@ -98,7 +98,7 @@ Once you confirm %{deleteAccount}, it cannot be undone or recovered.`),
...
@@ -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"
s
lot-s
cope=
"props"
>
<p
v-html=
"props.text"
></p>
<p
v-html=
"props.text"
></p>
<form
<form
...
...
spec/javascripts/groups/components/app_spec.js
View file @
b2038120
...
@@ -431,9 +431,9 @@ describe('AppComponent', () => {
...
@@ -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
();
...
...
spec/javascripts/vue_shared/components/markdown/field_spec.js
View file @
b2038120
...
@@ -42,12 +42,14 @@ describe('Markdown field component', () => {
...
@@ -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>
'
,
},
};
},
});
});
});
}));
}));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment