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
79b8323d
Commit
79b8323d
authored
May 05, 2017
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Multiple issue assignees] Fix issue atom feed
parent
34be1835
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
4 deletions
+13
-4
app/views/issues/_issue.atom.builder
app/views/issues/_issue.atom.builder
+9
-2
spec/features/atom/issues_spec.rb
spec/features/atom/issues_spec.rb
+4
-2
No files found.
app/views/issues/_issue.atom.builder
View file @
79b8323d
...
@@ -26,9 +26,16 @@ xml.entry do
...
@@ -26,9 +26,16 @@ xml.entry do
if issue.assignees.any?
if issue.assignees.any?
xml.assignees do
xml.assignees do
issue.assignees.each do |assignee|
issue.assignees.each do |assignee|
xml.assignee do
xml.name assignee.name
xml.name assignee.name
xml.email assignee.public_email
xml.email assignee.public_email
end
end
end
end
end
end
xml.assignee do
xml.name issue.assignees.first.name
xml.email issue.assignees.first.public_email
end
end
end
end
spec/features/atom/issues_spec.rb
View file @
79b8323d
...
@@ -22,7 +22,8 @@ describe 'Issues Feed', feature: true do
...
@@ -22,7 +22,8 @@ describe 'Issues Feed', feature: true do
to
have_content
(
'application/atom+xml'
)
to
have_content
(
'application/atom+xml'
)
expect
(
body
).
to
have_selector
(
'title'
,
text:
"
#{
project
.
name
}
issues"
)
expect
(
body
).
to
have_selector
(
'title'
,
text:
"
#{
project
.
name
}
issues"
)
expect
(
body
).
to
have_selector
(
'author email'
,
text:
issue
.
author_public_email
)
expect
(
body
).
to
have_selector
(
'author email'
,
text:
issue
.
author_public_email
)
expect
(
body
).
to
have_selector
(
'assignees email'
,
text:
issue
.
author_public_email
)
expect
(
body
).
to
have_selector
(
'assignees assignee email'
,
text:
issue
.
assignees
.
first
.
public_email
)
expect
(
body
).
to
have_selector
(
'assignee email'
,
text:
issue
.
assignees
.
first
.
public_email
)
expect
(
body
).
to
have_selector
(
'entry summary'
,
text:
issue
.
title
)
expect
(
body
).
to
have_selector
(
'entry summary'
,
text:
issue
.
title
)
end
end
end
end
...
@@ -36,7 +37,8 @@ describe 'Issues Feed', feature: true do
...
@@ -36,7 +37,8 @@ describe 'Issues Feed', feature: true do
to
have_content
(
'application/atom+xml'
)
to
have_content
(
'application/atom+xml'
)
expect
(
body
).
to
have_selector
(
'title'
,
text:
"
#{
project
.
name
}
issues"
)
expect
(
body
).
to
have_selector
(
'title'
,
text:
"
#{
project
.
name
}
issues"
)
expect
(
body
).
to
have_selector
(
'author email'
,
text:
issue
.
author_public_email
)
expect
(
body
).
to
have_selector
(
'author email'
,
text:
issue
.
author_public_email
)
expect
(
body
).
to
have_selector
(
'assignees email'
,
text:
issue
.
author_public_email
)
expect
(
body
).
to
have_selector
(
'assignees assignee email'
,
text:
issue
.
assignees
.
first
.
public_email
)
expect
(
body
).
to
have_selector
(
'assignee email'
,
text:
issue
.
assignees
.
first
.
public_email
)
expect
(
body
).
to
have_selector
(
'entry summary'
,
text:
issue
.
title
)
expect
(
body
).
to
have_selector
(
'entry summary'
,
text:
issue
.
title
)
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