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
Boxiang Sun
gitlab-ce
Commits
95efe5b3
Commit
95efe5b3
authored
May 22, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added test to check if warning is not visible
[ci skip]
parent
59db8b2f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletion
+10
-1
app/assets/javascripts/issue_show/components/locked_warning.vue
...sets/javascripts/issue_show/components/locked_warning.vue
+2
-1
spec/javascripts/issue_show/components/form_spec.js
spec/javascripts/issue_show/components/form_spec.js
+8
-0
No files found.
app/assets/javascripts/issue_show/components/locked_warning.vue
View file @
95efe5b3
...
@@ -13,7 +13,8 @@
...
@@ -13,7 +13,8 @@
Someone edited the issue at the same time you did. Please check out
Someone edited the issue at the same time you did. Please check out
<a
<a
:href=
"currentPath"
:href=
"currentPath"
target=
"_blank"
>
the issue
</a>
target=
"_blank"
rel=
"nofollow"
>
the issue
</a>
and make sure your changes will not unintentionally remove theirs.
and make sure your changes will not unintentionally remove theirs.
</div>
</div>
</
template
>
</
template
>
spec/javascripts/issue_show/components/form_spec.js
View file @
95efe5b3
...
@@ -10,6 +10,7 @@ describe('Inline edit form component', () => {
...
@@ -10,6 +10,7 @@ describe('Inline edit form component', () => {
vm
=
new
Component
({
vm
=
new
Component
({
propsData
:
{
propsData
:
{
canDestroy
:
true
,
canDestroy
:
true
,
canMove
:
true
,
formState
:
{
formState
:
{
title
:
'
b
'
,
title
:
'
b
'
,
description
:
'
a
'
,
description
:
'
a
'
,
...
@@ -17,12 +18,19 @@ describe('Inline edit form component', () => {
...
@@ -17,12 +18,19 @@ describe('Inline edit form component', () => {
},
},
markdownPreviewUrl
:
'
/
'
,
markdownPreviewUrl
:
'
/
'
,
markdownDocs
:
'
/
'
,
markdownDocs
:
'
/
'
,
projectsAutocompleteUrl
:
'
/
'
,
},
},
}).
$mount
();
}).
$mount
();
Vue
.
nextTick
(
done
);
Vue
.
nextTick
(
done
);
});
});
it
(
'
hides locked warning by default
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.alert
'
),
).
toBeNull
();
});
it
(
'
shows locked warning if formState is different
'
,
(
done
)
=>
{
it
(
'
shows locked warning if formState is different
'
,
(
done
)
=>
{
vm
.
formState
.
lockedWarningVisible
=
true
;
vm
.
formState
.
lockedWarningVisible
=
true
;
...
...
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