consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix version chooser for annotations page

Browse Source
This commit is contained in:
Amaia Castro
2017-01-11 20:14:20 +01:00
parent 306e3fa59f
commit a56898fed7
3 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/legislation/annotations_controller.rb
View File

@@ -10,6 +10,7 @@ class Legislation::AnnotationsController < ApplicationController
has_orders %w{most_voted newest oldest}, only: :show
def index
@annotations = @draft_version.annotations
end
def show

2
app/controllers/legislation/draft_versions_controller.rb
View File

@@ -20,6 +20,8 @@ class Legislation::DraftVersionsController < Legislation::BaseController
if params[:redirect_action] == 'changes'
redirect_to legislation_process_draft_version_changes_path(@process, version)
elsif params[:redirect_action] == 'annotations'
redirect_to legislation_process_draft_version_annotations_path(@process, version)
else
redirect_to legislation_process_draft_version_path(@process, version)
end

40
spec/features/legislation/draft_versions_spec.rb
View File

@@ -178,6 +178,7 @@ feature 'Legislation Draft Versions' do
@annotation_1 = create(:legislation_annotation, draft_version: @draft_version, text: "my annotation", quote: "first quote")
@annotation_2 = create(:legislation_annotation, draft_version: @draft_version, text: "my other annotation", quote: "second quote")
end
scenario "See all annotations for a draft version" do
visit legislation_process_draft_version_annotations_path(@draft_version.process, @draft_version)
@@ -185,6 +186,45 @@ feature 'Legislation Draft Versions' do
expect(page).to have_content "second quote"
end
context "switching versions" do
background do
@process = create(:legislation_process)
@draft_version_1 = create(:legislation_draft_version, :published, process: @process, title: "Version 1", body: Faker::Lorem.paragraph)
@annotation_1 = create(:legislation_annotation, draft_version: @draft_version_1, text: "annotation for version 1", quote: "quote for version 1")
@draft_version_2 = create(:legislation_draft_version, :published, process: @process, title: "Version 2", body: Faker::Lorem.paragraph)
@annotation_1 = create(:legislation_annotation, draft_version: @draft_version_2, text: "annotation for version 2", quote: "quote for version 2")
end
scenario "without js" do
visit legislation_process_draft_version_annotations_path(@process, @draft_version_1)
expect(page).to have_content("quote for version 1")
select("Version 2")
click_button "see"
expect(page).to_not have_content("quote for version 1")
expect(page).to have_content("quote for version 2")
end
scenario "with js", :js do
visit legislation_process_draft_version_annotations_path(@process, @draft_version_1)
expect(page).to have_content("quote for version 1")
select("Version 2")
expect(page).to_not have_content("quote for version 1")
expect(page).to have_content("quote for version 2")
end
end
end
context "Annotation comments page" do
background do
@draft_version = create(:legislation_draft_version, :published, body: Faker::Lorem.paragraph)
@annotation_1 = create(:legislation_annotation, draft_version: @draft_version, text: "my annotation", quote: "first quote")
@annotation_2 = create(:legislation_annotation, draft_version: @draft_version, text: "my other annotation", quote: "second quote")
end
scenario "See one annotation with replies for a draft version" do
visit legislation_process_draft_version_annotation_path(@draft_version.process, @draft_version, @annotation_2)