2014-12-04 19:49:19 +00:00
|
|
|
require 'spec_helper'
|
|
|
|
|
|
|
|
describe "User Feed", feature: true do
|
|
|
|
describe "GET /" do
|
|
|
|
let!(:user) { create(:user) }
|
|
|
|
|
2015-02-12 18:53:23 +00:00
|
|
|
context 'user atom feed via private token' do
|
2014-12-04 19:49:19 +00:00
|
|
|
it "should render user atom feed" do
|
|
|
|
visit user_path(user, :atom, private_token: user.private_token)
|
2015-02-12 18:53:23 +00:00
|
|
|
expect(body).to have_selector('feed title')
|
2014-12-04 19:49:19 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'feed content' do
|
|
|
|
let(:project) { create(:project) }
|
2015-02-12 18:53:23 +00:00
|
|
|
let(:issue) do
|
|
|
|
create(:issue, project: project,
|
Fix invalid Atom feeds when using emoji, horizontal rules, or images.
Fixes issues #880, #723, #1113: Markdown must be rendered to XHTML, not HTML, when generating summary content for Atom feeds. Otherwise, content-less tags like <img> and <hr>, generated when issue descriptions, merge request descriptions, comments, or commit messages use emoji, horizontal rules, or images, are not terminated and make the Atom XML invalid.
2015-02-21 21:12:13 +00:00
|
|
|
author: user, description: "Houston, we have a bug!\n\n***\n\nI guess.")
|
2015-02-12 18:53:23 +00:00
|
|
|
end
|
|
|
|
let(:note) do
|
|
|
|
create(:note, noteable: issue, author: user,
|
Fix invalid Atom feeds when using emoji, horizontal rules, or images.
Fixes issues #880, #723, #1113: Markdown must be rendered to XHTML, not HTML, when generating summary content for Atom feeds. Otherwise, content-less tags like <img> and <hr>, generated when issue descriptions, merge request descriptions, comments, or commit messages use emoji, horizontal rules, or images, are not terminated and make the Atom XML invalid.
2015-02-21 21:12:13 +00:00
|
|
|
note: 'Bug confirmed :+1:', project: project)
|
|
|
|
end
|
|
|
|
let(:merge_request) do
|
|
|
|
create(:merge_request,
|
|
|
|
title: 'Fix bug', author: user,
|
|
|
|
source_project: project, target_project: project,
|
|
|
|
description: "Here is the fix: ![an image](image.png)")
|
2015-02-12 18:53:23 +00:00
|
|
|
end
|
2014-12-04 19:49:19 +00:00
|
|
|
|
|
|
|
before do
|
|
|
|
project.team << [user, :master]
|
|
|
|
issue_event(issue, user)
|
|
|
|
note_event(note, user)
|
Fix invalid Atom feeds when using emoji, horizontal rules, or images.
Fixes issues #880, #723, #1113: Markdown must be rendered to XHTML, not HTML, when generating summary content for Atom feeds. Otherwise, content-less tags like <img> and <hr>, generated when issue descriptions, merge request descriptions, comments, or commit messages use emoji, horizontal rules, or images, are not terminated and make the Atom XML invalid.
2015-02-21 21:12:13 +00:00
|
|
|
merge_request_event(merge_request, user)
|
2014-12-04 19:49:19 +00:00
|
|
|
visit user_path(user, :atom, private_token: user.private_token)
|
|
|
|
end
|
|
|
|
|
2015-02-12 18:53:23 +00:00
|
|
|
it 'should have issue opened event' do
|
2015-01-04 13:02:31 +00:00
|
|
|
expect(body).to have_content("#{safe_name} opened issue ##{issue.iid}")
|
2014-12-04 19:49:19 +00:00
|
|
|
end
|
|
|
|
|
2015-02-12 18:53:23 +00:00
|
|
|
it 'should have issue comment event' do
|
2015-01-04 13:02:31 +00:00
|
|
|
expect(body).
|
|
|
|
to have_content("#{safe_name} commented on issue ##{issue.iid}")
|
2014-12-04 19:49:19 +00:00
|
|
|
end
|
Fix invalid Atom feeds when using emoji, horizontal rules, or images.
Fixes issues #880, #723, #1113: Markdown must be rendered to XHTML, not HTML, when generating summary content for Atom feeds. Otherwise, content-less tags like <img> and <hr>, generated when issue descriptions, merge request descriptions, comments, or commit messages use emoji, horizontal rules, or images, are not terminated and make the Atom XML invalid.
2015-02-21 21:12:13 +00:00
|
|
|
|
|
|
|
it 'should have XHTML summaries in issue descriptions' do
|
|
|
|
expect(body).to match /we have a bug!<\/p>\n\n<hr ?\/>\n\n<p>I guess/
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'should have XHTML summaries in notes' do
|
|
|
|
expect(body).to match /Bug confirmed <img[^>]*\/>/
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'should have XHTML summaries in merge request descriptions' do
|
|
|
|
expect(body).to match /Here is the fix: <img[^>]*\/>/
|
|
|
|
end
|
2014-12-04 19:49:19 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def issue_event(issue, user)
|
|
|
|
EventCreateService.new.open_issue(issue, user)
|
|
|
|
end
|
|
|
|
|
|
|
|
def note_event(note, user)
|
|
|
|
EventCreateService.new.leave_note(note, user)
|
|
|
|
end
|
2015-01-04 13:02:31 +00:00
|
|
|
|
Fix invalid Atom feeds when using emoji, horizontal rules, or images.
Fixes issues #880, #723, #1113: Markdown must be rendered to XHTML, not HTML, when generating summary content for Atom feeds. Otherwise, content-less tags like <img> and <hr>, generated when issue descriptions, merge request descriptions, comments, or commit messages use emoji, horizontal rules, or images, are not terminated and make the Atom XML invalid.
2015-02-21 21:12:13 +00:00
|
|
|
def merge_request_event(request, user)
|
|
|
|
EventCreateService.new.open_mr(request, user)
|
|
|
|
end
|
|
|
|
|
2015-01-04 13:02:31 +00:00
|
|
|
def safe_name
|
|
|
|
html_escape(user.name)
|
|
|
|
end
|
2014-12-04 19:49:19 +00:00
|
|
|
end
|