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
78754cb1
Commit
78754cb1
authored
Jan 18, 2016
by
Rubén Dávila
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update Issues/MRs updated_at when user leaves comments.
parent
9f03ae8c
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
50 additions
and
1 deletion
+50
-1
app/services/notes/create_service.rb
app/services/notes/create_service.rb
+3
-1
features/project/issues/issues.feature
features/project/issues/issues.feature
+8
-0
features/project/merge_requests.feature
features/project/merge_requests.feature
+19
-0
features/steps/project/issues/issues.rb
features/steps/project/issues/issues.rb
+5
-0
features/steps/project/merge_requests.rb
features/steps/project/merge_requests.rb
+8
-0
features/steps/shared/note.rb
features/steps/shared/note.rb
+7
-0
No files found.
app/services/notes/create_service.rb
View file @
78754cb1
...
@@ -10,7 +10,9 @@ module Notes
...
@@ -10,7 +10,9 @@ module Notes
# Skip system notes, like status changes and cross-references and awards
# Skip system notes, like status changes and cross-references and awards
unless
note
.
system
||
note
.
is_award
unless
note
.
system
||
note
.
is_award
event_service
.
leave_note
(
note
,
note
.
author
)
event
=
event_service
.
leave_note
(
note
,
note
.
author
)
note
.
noteable
.
touch
if
event
.
commented?
note
.
create_cross_references!
note
.
create_cross_references!
execute_hooks
(
note
)
execute_hooks
(
note
)
end
end
...
...
features/project/issues/issues.feature
View file @
78754cb1
...
@@ -51,6 +51,14 @@ Feature: Project Issues
...
@@ -51,6 +51,14 @@ Feature: Project Issues
Then
I should see comment
"XML attached"
Then
I should see comment
"XML attached"
And
I should see an error alert section within the comment form
And
I should see an error alert section within the comment form
@javascript
Scenario
:
Visiting Issues after leaving a comment
Given
I visit issue page
"Release 0.4"
And
I leave a comment like
"XML attached"
And
I visit project
"Shop"
issues page
And
I sort the list by
"Last updated"
Then
I should see
"Release 0.4"
at the top
@javascript
@javascript
Scenario
:
I
search issue
Scenario
:
I
search issue
Given
I fill in issue search with
"Re"
Given
I fill in issue search with
"Re"
...
...
features/project/merge_requests.feature
View file @
78754cb1
...
@@ -75,6 +75,25 @@ Feature: Project Merge Requests
...
@@ -75,6 +75,25 @@ Feature: Project Merge Requests
And
I leave a comment like
"XML attached"
And
I leave a comment like
"XML attached"
Then
I should see comment
"XML attached"
Then
I should see comment
"XML attached"
@javascript
Scenario
:
Visiting Merge Requests after leaving a comment
Given
project
"Shop"
have
"Bug NS-05"
open merge request with diffs inside
And
I visit merge request page
"Bug NS-04"
And
I leave a comment like
"XML attached"
And
I visit project
"Shop"
merge requests page
And
I sort the list by
"Last updated"
Then
I should see
"Bug NS-04"
at the top
@javascript
Scenario
:
Visiting Merge Requests after commenting on diffs
Given
project
"Shop"
have
"Bug NS-05"
open merge request with diffs inside
And
I visit merge request page
"Bug NS-05"
And
I click on the Changes tab
And
I leave a comment like
"Line is wrong"
on diff
And
I visit project
"Shop"
merge requests page
And
I sort the list by
"Last updated"
Then
I should see
"Bug NS-05"
at the top
@javascript
@javascript
Scenario
:
I
comment on a merge request diff
Scenario
:
I
comment on a merge request diff
Given
project
"Shop"
have
"Bug NS-05"
open merge request with diffs inside
Given
project
"Shop"
have
"Bug NS-05"
open merge request with diffs inside
...
...
features/steps/project/issues/issues.rb
View file @
78754cb1
...
@@ -293,6 +293,11 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
...
@@ -293,6 +293,11 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
expect
(
page
).
to
have_content
(
'Yay!'
)
expect
(
page
).
to
have_content
(
'Yay!'
)
end
end
end
end
step
'I should see "Release 0.4" at the top'
do
expect
(
page
.
find
(
'ul.content-list.issues-list li.issue:first-child'
)).
to
have_content
(
"Release 0.4"
)
end
def
filter_issue
(
text
)
def
filter_issue
(
text
)
fill_in
'issue_search'
,
with:
text
fill_in
'issue_search'
,
with:
text
end
end
...
...
features/steps/project/merge_requests.rb
View file @
78754cb1
...
@@ -415,6 +415,14 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
...
@@ -415,6 +415,14 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
end
end
end
end
step
'I should see "Bug NS-05" at the top'
do
expect
(
page
.
find
(
'ul.content-list.mr-list li.merge-request:first-child'
)).
to
have_content
(
"Bug NS-05"
)
end
step
'I should see "Bug NS-04" at the top'
do
expect
(
page
.
find
(
'ul.content-list.mr-list li.merge-request:first-child'
)).
to
have_content
(
"Bug NS-04"
)
end
def
merge_request
def
merge_request
@merge_request
||=
MergeRequest
.
find_by!
(
title:
"Bug NS-05"
)
@merge_request
||=
MergeRequest
.
find_by!
(
title:
"Bug NS-05"
)
end
end
...
...
features/steps/shared/note.rb
View file @
78754cb1
...
@@ -144,4 +144,11 @@ module SharedNote
...
@@ -144,4 +144,11 @@ module SharedNote
expect
(
page
).
to
have_content
(
"+1 Awesome!"
)
expect
(
page
).
to
have_content
(
"+1 Awesome!"
)
end
end
end
end
step
'I sort the list by "Last updated"'
do
find
(
'button.dropdown-toggle.btn'
).
click
page
.
within
(
'ul.dropdown-menu.dropdown-menu-align-right li'
)
do
click_link
"Last updated"
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