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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
10f45cf3
Commit
10f45cf3
authored
Jan 15, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix specs
parent
cad685e7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
10 deletions
+5
-10
spec/features/notes_on_merge_requests_spec.rb
spec/features/notes_on_merge_requests_spec.rb
+5
-10
No files found.
spec/features/notes_on_merge_requests_spec.rb
View file @
10f45cf3
...
@@ -72,16 +72,14 @@ describe 'Comments' do
...
@@ -72,16 +72,14 @@ describe 'Comments' do
it
"should show the note edit form and hide the note body"
do
it
"should show the note edit form and hide the note body"
do
within
(
"#note_
#{
note
.
id
}
"
)
do
within
(
"#note_
#{
note
.
id
}
"
)
do
find
(
".current-note-edit-form"
,
visible:
true
).
should
be_visible
find
(
".note-edit-form"
,
visible:
true
).
should
be_visible
find
(
".note-edit-form"
,
visible:
true
).
should
be_visible
find
(
".note-text"
,
visible:
false
).
should_not
be_visible
find
(
:css
,
".note-text"
,
visible:
false
).
should_not
be_visible
end
end
end
end
it
"should reset the edit note form textarea with the original content of the note if cancelled"
do
it
"should reset the edit note form textarea with the original content of the note if cancelled"
do
find
(
'.note'
).
hover
within
(
".current-note-edit-form"
)
do
find
(
".js-note-edit"
).
click
within
(
".note-edit-form"
)
do
fill_in
"note[note]"
,
with:
"Some new content"
fill_in
"note[note]"
,
with:
"Some new content"
find
(
".btn-cancel"
).
click
find
(
".btn-cancel"
).
click
find
(
".js-note-text"
,
visible:
false
).
text
.
should
==
note
.
note
find
(
".js-note-text"
,
visible:
false
).
text
.
should
==
note
.
note
...
@@ -89,10 +87,7 @@ describe 'Comments' do
...
@@ -89,10 +87,7 @@ describe 'Comments' do
end
end
it
"appends the edited at time to the note"
do
it
"appends the edited at time to the note"
do
find
(
'.note'
).
hover
within
(
".current-note-edit-form"
)
do
find
(
".js-note-edit"
).
click
within
(
".note-edit-form"
)
do
fill_in
"note[note]"
,
with:
"Some new content"
fill_in
"note[note]"
,
with:
"Some new content"
find
(
".btn-save"
).
click
find
(
".btn-save"
).
click
end
end
...
@@ -119,7 +114,7 @@ describe 'Comments' do
...
@@ -119,7 +114,7 @@ describe 'Comments' do
it
"removes the attachment div and resets the edit form"
do
it
"removes the attachment div and resets the edit form"
do
find
(
".js-note-attachment-delete"
).
click
find
(
".js-note-attachment-delete"
).
click
should_not
have_css
(
".note-attachment"
)
should_not
have_css
(
".note-attachment"
)
find
(
".note-edit-form"
,
visible:
false
).
should_not
be_visible
find
(
".
current-
note-edit-form"
,
visible:
false
).
should_not
be_visible
end
end
end
end
end
end
...
...
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