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
Tatuya Kamada
gitlab-ce
Commits
6c8a17d0
Commit
6c8a17d0
authored
Feb 24, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix diff tests
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
8290c9a6
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
21 deletions
+21
-21
features/steps/shared/diff_note.rb
features/steps/shared/diff_note.rb
+21
-21
No files found.
features/steps/shared/diff_note.rb
View file @
6c8a17d0
...
@@ -2,7 +2,7 @@ module SharedDiffNote
...
@@ -2,7 +2,7 @@ module SharedDiffNote
include
Spinach
::
DSL
include
Spinach
::
DSL
Given
'I cancel the diff comment'
do
Given
'I cancel the diff comment'
do
within
(
".file"
)
do
within
(
".
diff-
file"
)
do
find
(
".js-close-discussion-note-form"
).
click
find
(
".js-close-discussion-note-form"
).
click
end
end
end
end
...
@@ -13,14 +13,14 @@ module SharedDiffNote
...
@@ -13,14 +13,14 @@ module SharedDiffNote
end
end
Given
'I haven\'t written any diff comment text'
do
Given
'I haven\'t written any diff comment text'
do
within
(
".file"
)
do
within
(
".
diff-
file"
)
do
fill_in
"note[note]"
,
with:
""
fill_in
"note[note]"
,
with:
""
end
end
end
end
Given
'I leave a diff comment like "Typo, please fix"'
do
Given
'I leave a diff comment like "Typo, please fix"'
do
find
(
'a[data-line-code="586fb7c4e1add2d4d24e27566ed7064680098646_29_14"]'
).
click
find
(
'a[data-line-code="586fb7c4e1add2d4d24e27566ed7064680098646_29_14"]'
).
click
within
(
".file form[rel$='586fb7c4e1add2d4d24e27566ed7064680098646_29_14']"
)
do
within
(
".
diff-
file form[rel$='586fb7c4e1add2d4d24e27566ed7064680098646_29_14']"
)
do
fill_in
"note[note]"
,
with:
"Typo, please fix"
fill_in
"note[note]"
,
with:
"Typo, please fix"
find
(
".js-comment-button"
).
trigger
(
"click"
)
find
(
".js-comment-button"
).
trigger
(
"click"
)
sleep
0.05
sleep
0.05
...
@@ -29,7 +29,7 @@ module SharedDiffNote
...
@@ -29,7 +29,7 @@ module SharedDiffNote
Given
'I preview a diff comment text like "Should fix it :smile:"'
do
Given
'I preview a diff comment text like "Should fix it :smile:"'
do
find
(
'a[data-line-code="586fb7c4e1add2d4d24e27566ed7064680098646_29_14"]'
).
click
find
(
'a[data-line-code="586fb7c4e1add2d4d24e27566ed7064680098646_29_14"]'
).
click
within
(
".file form[rel$='586fb7c4e1add2d4d24e27566ed7064680098646_29_14']"
)
do
within
(
".
diff-
file form[rel$='586fb7c4e1add2d4d24e27566ed7064680098646_29_14']"
)
do
fill_in
"note[note]"
,
with:
"Should fix it :smile:"
fill_in
"note[note]"
,
with:
"Should fix it :smile:"
find
(
".js-note-preview-button"
).
trigger
(
"click"
)
find
(
".js-note-preview-button"
).
trigger
(
"click"
)
end
end
...
@@ -38,7 +38,7 @@ module SharedDiffNote
...
@@ -38,7 +38,7 @@ module SharedDiffNote
Given
'I preview another diff comment text like "DRY this up"'
do
Given
'I preview another diff comment text like "DRY this up"'
do
find
(
'a[data-line-code="586fb7c4e1add2d4d24e27566ed7064680098646_57_41"]'
).
click
find
(
'a[data-line-code="586fb7c4e1add2d4d24e27566ed7064680098646_57_41"]'
).
click
within
(
".file form[rel$='586fb7c4e1add2d4d24e27566ed7064680098646_57_41']"
)
do
within
(
".
diff-
file form[rel$='586fb7c4e1add2d4d24e27566ed7064680098646_57_41']"
)
do
fill_in
"note[note]"
,
with:
"DRY this up"
fill_in
"note[note]"
,
with:
"DRY this up"
find
(
".js-note-preview-button"
).
trigger
(
"click"
)
find
(
".js-note-preview-button"
).
trigger
(
"click"
)
end
end
...
@@ -53,13 +53,13 @@ module SharedDiffNote
...
@@ -53,13 +53,13 @@ module SharedDiffNote
end
end
Given
'I write a diff comment like ":-1: I don\'t like this"'
do
Given
'I write a diff comment like ":-1: I don\'t like this"'
do
within
(
".file"
)
do
within
(
".
diff-
file"
)
do
fill_in
"note[note]"
,
with:
":-1: I don
\'
t like this"
fill_in
"note[note]"
,
with:
":-1: I don
\'
t like this"
end
end
end
end
Given
'I submit the diff comment'
do
Given
'I submit the diff comment'
do
within
(
".file"
)
do
within
(
".
diff-
file"
)
do
click_button
(
"Add Comment"
)
click_button
(
"Add Comment"
)
end
end
end
end
...
@@ -67,49 +67,49 @@ module SharedDiffNote
...
@@ -67,49 +67,49 @@ module SharedDiffNote
Then
'I should not see the diff comment form'
do
Then
'I should not see the diff comment form'
do
within
(
".file"
)
do
within
(
".
diff-
file"
)
do
page
.
should_not
have_css
(
"form.new_note"
)
page
.
should_not
have_css
(
"form.new_note"
)
end
end
end
end
Then
'I should not see the diff comment preview button'
do
Then
'I should not see the diff comment preview button'
do
within
(
".file"
)
do
within
(
".
diff-
file"
)
do
page
.
should
have_css
(
".js-note-preview-button"
,
visible:
false
)
page
.
should
have_css
(
".js-note-preview-button"
,
visible:
false
)
end
end
end
end
Then
'I should not see the diff comment text field'
do
Then
'I should not see the diff comment text field'
do
within
(
".file"
)
do
within
(
".
diff-
file"
)
do
page
.
should
have_css
(
".js-note-text"
,
visible:
false
)
page
.
should
have_css
(
".js-note-text"
,
visible:
false
)
end
end
end
end
Then
'I should only see one diff form'
do
Then
'I should only see one diff form'
do
within
(
".file"
)
do
within
(
".
diff-
file"
)
do
page
.
should
have_css
(
"form.new_note"
,
count:
1
)
page
.
should
have_css
(
"form.new_note"
,
count:
1
)
end
end
end
end
Then
'I should see a diff comment form with ":-1: I don\'t like this"'
do
Then
'I should see a diff comment form with ":-1: I don\'t like this"'
do
within
(
".file"
)
do
within
(
".
diff-
file"
)
do
page
.
should
have_field
(
"note[note]"
,
with:
":-1: I don
\'
t like this"
)
page
.
should
have_field
(
"note[note]"
,
with:
":-1: I don
\'
t like this"
)
end
end
end
end
Then
'I should see a diff comment saying "Typo, please fix"'
do
Then
'I should see a diff comment saying "Typo, please fix"'
do
within
(
".file .note"
)
do
within
(
".
diff-
file .note"
)
do
page
.
should
have_content
(
"Typo, please fix"
)
page
.
should
have_content
(
"Typo, please fix"
)
end
end
end
end
Then
'I should see a discussion reply button'
do
Then
'I should see a discussion reply button'
do
within
(
".file"
)
do
within
(
".
diff-
file"
)
do
page
.
should
have_link
(
"Reply"
)
page
.
should
have_link
(
"Reply"
)
end
end
end
end
Then
'I should see a temporary diff comment form'
do
Then
'I should see a temporary diff comment form'
do
within
(
".file"
)
do
within
(
".
diff-
file"
)
do
page
.
should
have_css
(
".js-temp-notes-holder form.new_note"
)
page
.
should
have_css
(
".js-temp-notes-holder form.new_note"
)
end
end
end
end
...
@@ -119,37 +119,37 @@ module SharedDiffNote
...
@@ -119,37 +119,37 @@ module SharedDiffNote
end
end
Then
'I should see an empty diff comment form'
do
Then
'I should see an empty diff comment form'
do
within
(
".file"
)
do
within
(
".
diff-
file"
)
do
page
.
should
have_field
(
"note[note]"
,
with:
""
)
page
.
should
have_field
(
"note[note]"
,
with:
""
)
end
end
end
end
Then
'I should see the cancel comment button'
do
Then
'I should see the cancel comment button'
do
within
(
".file form"
)
do
within
(
".
diff-
file form"
)
do
page
.
should
have_css
(
".js-close-discussion-note-form"
,
text:
"Cancel"
)
page
.
should
have_css
(
".js-close-discussion-note-form"
,
text:
"Cancel"
)
end
end
end
end
Then
'I should see the diff comment preview'
do
Then
'I should see the diff comment preview'
do
within
(
".file form"
)
do
within
(
".
diff-
file form"
)
do
page
.
should
have_css
(
".js-note-preview"
,
visible:
false
)
page
.
should
have_css
(
".js-note-preview"
,
visible:
false
)
end
end
end
end
Then
'I should see the diff comment edit button'
do
Then
'I should see the diff comment edit button'
do
within
(
".file"
)
do
within
(
".
diff-
file"
)
do
page
.
should
have_css
(
".js-note-edit-button"
,
visible:
true
)
page
.
should
have_css
(
".js-note-edit-button"
,
visible:
true
)
end
end
end
end
Then
'I should see the diff comment preview button'
do
Then
'I should see the diff comment preview button'
do
within
(
".file"
)
do
within
(
".
diff-
file"
)
do
page
.
should
have_css
(
".js-note-preview-button"
,
visible:
true
)
page
.
should
have_css
(
".js-note-preview-button"
,
visible:
true
)
end
end
end
end
Then
'I should see two separate previews'
do
Then
'I should see two separate previews'
do
within
(
".file"
)
do
within
(
".
diff-
file"
)
do
page
.
should
have_css
(
".js-note-preview"
,
visible:
true
,
count:
2
)
page
.
should
have_css
(
".js-note-preview"
,
visible:
true
,
count:
2
)
page
.
should
have_content
(
"Should fix it"
)
page
.
should
have_content
(
"Should fix it"
)
page
.
should
have_content
(
"DRY this up"
)
page
.
should
have_content
(
"DRY this up"
)
...
...
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