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
Léo-Paul Géneau
gitlab-ce
Commits
2b577551
Commit
2b577551
authored
Dec 03, 2015
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add feature test for emoji-only diff notes
This specs is related to bug described in #3734 (award-emojis).
parent
554f4684
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
0 deletions
+23
-0
features/project/commits/diff_comments.feature
features/project/commits/diff_comments.feature
+6
-0
features/steps/shared/diff_note.rb
features/steps/shared/diff_note.rb
+17
-0
No files found.
features/project/commits/diff_comments.feature
View file @
2b577551
...
@@ -13,6 +13,12 @@ Feature: Project Commits Diff Comments
...
@@ -13,6 +13,12 @@ Feature: Project Commits Diff Comments
Given
I leave a diff comment like
"Typo, please fix"
Given
I leave a diff comment like
"Typo, please fix"
Then
I should see a diff comment saying
"Typo, please fix"
Then
I should see a diff comment saying
"Typo, please fix"
@javascript
Scenario
:
I
can add a diff comment with a single emoji
Given
I open a diff comment form
And I write a diff comment like "
:
smile
:
"
Then
I should see a diff comment with an emoji image
@javascript
@javascript
Scenario
:
I
get a temporary form for the first comment on a diff line
Scenario
:
I
get a temporary form for the first comment on a diff line
Given
I open a diff comment form
Given
I open a diff comment form
...
...
features/steps/shared/diff_note.rb
View file @
2b577551
...
@@ -87,6 +87,17 @@ module SharedDiffNote
...
@@ -87,6 +87,17 @@ module SharedDiffNote
end
end
end
end
step
'I write a diff comment like ":smile:"'
do
page
.
within
(
diff_file_selector
)
do
click_diff_line
(
sample_commit
.
line_code
)
page
.
within
(
"form[rel$='
#{
sample_commit
.
line_code
}
']"
)
do
fill_in
'note[note]'
,
with:
':smile:'
click_button
(
'Add Comment'
)
end
end
end
step
'I submit the diff comment'
do
step
'I submit the diff comment'
do
page
.
within
(
diff_file_selector
)
do
page
.
within
(
diff_file_selector
)
do
click_button
(
"Add Comment"
)
click_button
(
"Add Comment"
)
...
@@ -197,6 +208,12 @@ module SharedDiffNote
...
@@ -197,6 +208,12 @@ module SharedDiffNote
end
end
end
end
step
'I should see a diff comment with an emoji image'
do
page
.
within
(
"
#{
diff_file_selector
}
.note"
)
do
expect
(
page
).
to
have_xpath
(
"//img[@alt=':smile:']"
)
end
end
step
'I click side-by-side diff button'
do
step
'I click side-by-side diff button'
do
find
(
'#parallel-diff-btn'
).
trigger
(
'click'
)
find
(
'#parallel-diff-btn'
).
trigger
(
'click'
)
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