Merge pull request #576 from opf/fix/forum_atom_feed

[FIX] Forum atom feed
pull/594/head
Christian Rijke 11 years ago
commit df6fcf5917
  1. 2
      doc/CHANGELOG.md
  2. 31
      spec/controllers/activities_controller_spec.rb

@ -32,6 +32,8 @@ See doc/COPYRIGHT.rdoc for more details.
* `#2593` Work Package Summary missing
* `#1749` Prevent JSON Hijacking
* `#2281` The context menu is not correctly displayed
* `#2525` Project Settings: Forums: Move up/down result in 404
* `#2535` [Forum] Atom feed on the forum's overview-page doesn't work
* `#2348` [Timelines] Using planning element filter and filtering for status "New" leads always to plus-sign in front of work packages
* `#2357` [Timelines] Change API v2 serialization to minimize redundant data
* `#2363` When all wiki pages have been deleted new wiki pages cannot be created

@ -74,14 +74,35 @@ describe ActivitiesController do
let!(:wp_2) { FactoryGirl.create(:work_package,
project: project,
author: user) }
let(:params) { { project_id: project.id,
format: :atom } }
before { get :index, params }
context :work_package do
let(:params) { { project_id: project.id,
format: :atom } }
it { expect(assigns(:items).count).to eq(2) }
before { get :index, params }
it { expect(response).to render_template("common/feed") }
it { expect(assigns(:items).count).to eq(2) }
it { expect(response).to render_template("common/feed") }
end
context :boards do
let(:board) { FactoryGirl.create(:board,
project: project) }
let!(:message_1) { FactoryGirl.create(:message,
board: board) }
let!(:message_2) { FactoryGirl.create(:message,
board: board) }
let(:params) { { project_id: project.id,
show_messages: 1,
format: :atom } }
before { get :index, params }
it { expect(assigns(:items).count).to eq(2) }
it { expect(response).to render_template("common/feed") }
end
end
end
end

Loading…
Cancel
Save