- <%= link_to t('.see_comments'), legislation_process_draft_version_annotations_path(@process, @draft_version), title: t('.see_comments'), class: "button strong" %>
-
+
+ <% unless @draft_version.final_version? %>
+
+ <%= link_to t('.see_comments'), legislation_process_draft_version_annotations_path(@process, @draft_version), title: t('.see_comments'), class: "button strong" %>
+
+ <% end %>
+
-
+
">
<%= t('.text_toc') %>
@@ -44,34 +48,25 @@
<%= t('.text_body') %>
+ <% if @draft_version.final_version? %>
+
+ <% else %>
+ <% end %>
<%= @draft_version.body_html.html_safe %>
-
diff --git a/spec/controllers/legislation/annotations_controller_spec.rb b/spec/controllers/legislation/annotations_controller_spec.rb
new file mode 100644
index 000000000..2713fc273
--- /dev/null
+++ b/spec/controllers/legislation/annotations_controller_spec.rb
@@ -0,0 +1,70 @@
+require 'rails_helper'
+
+describe Legislation::AnnotationsController do
+
+ describe 'POST create' do
+ before(:each) do
+ @process = create(:legislation_process, allegations_start_date: Date.current - 3.day, allegations_end_date: Date.current + 2.days)
+ @draft_version = create(:legislation_draft_version, :published, process: @process, title: "Version 1")
+ @final_version = create(:legislation_draft_version, :published, :final_version, process: @process, title: "Final version")
+ @user = create(:user, :level_two)
+ end
+
+ it 'should create an ahoy event' do
+ sign_in @user
+
+ post :create, process_id: @process.id,
+ draft_version_id: @draft_version.id,
+ annotation: {
+ "quote"=>"Ordenación Territorial",
+ "ranges"=>[{"start"=>"/p[1]", "startOffset"=>1, "end"=>"/p[1]", "endOffset"=>3}],
+ "text": "una anotacion"
+ }
+ expect(Ahoy::Event.where(name: :legislation_annotation_created).count).to eq 1
+ expect(Ahoy::Event.last.properties['legislation_annotation_id']).to eq Legislation::Annotation.last.id
+ end
+
+ it 'should not create an annotation if the draft version is a final version' do
+ sign_in @user
+
+ post :create, process_id: @process.id,
+ draft_version_id: @final_version.id,
+ annotation: {
+ "quote"=>"Ordenación Territorial",
+ "ranges"=>[{"start"=>"/p[1]", "startOffset"=>1, "end"=>"/p[1]", "endOffset"=>3}],
+ "text": "una anotacion"
+ }
+
+ expect(response).to have_http_status(:not_found)
+ end
+
+ it 'should create an annotation if the process allegations phase is open' do
+ sign_in @user
+
+ expect do
+ xhr :post, :create, process_id: @process.id,
+ draft_version_id: @draft_version.id,
+ annotation: {
+ "quote"=>"Ordenación Territorial",
+ "ranges"=>[{"start"=>"/p[1]", "startOffset"=>1, "end"=>"/p[1]", "endOffset"=>3}],
+ "text": "una anotacion"
+ }
+ end.to change { @draft_version.annotations.count }.by(1)
+ end
+
+ it 'should not create an annotation if the process allegations phase is not open' do
+ sign_in @user
+ @process.update_attribute(:allegations_end_date, Date.current - 1.day)
+
+ expect do
+ xhr :post, :create, process_id: @process.id,
+ draft_version_id: @draft_version.id,
+ annotation: {
+ "quote"=>"Ordenación Territorial",
+ "ranges"=>[{"start"=>"/p[1]", "startOffset"=>1, "end"=>"/p[1]", "endOffset"=>3}],
+ "text": "una anotacion"
+ }
+ end.to_not change { @draft_version.annotations.count }
+ end
+ end
+end
diff --git a/spec/controllers/legislation/answers_controller_spec.rb b/spec/controllers/legislation/answers_controller_spec.rb
index 99efcef67..77d037478 100644
--- a/spec/controllers/legislation/answers_controller_spec.rb
+++ b/spec/controllers/legislation/answers_controller_spec.rb
@@ -4,17 +4,12 @@ describe Legislation::AnswersController do
describe 'POST create' do
before(:each) do
- InvisibleCaptcha.timestamp_enabled = false
@process = create(:legislation_process, debate_start_date: Date.current - 3.day, debate_end_date: Date.current + 2.days)
@question = create(:legislation_question, process: @process, title: "Question 1")
@question_option = create(:legislation_question_option, question: @question, value: "Yes")
@user = create(:user, :level_two)
end
- after(:each) do
- InvisibleCaptcha.timestamp_enabled = true
- end
-
it 'should create an ahoy event' do
sign_in @user
diff --git a/spec/factories.rb b/spec/factories.rb
index a7ee19610..5ed16fc30 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -499,6 +499,10 @@ FactoryGirl.define do
trait :published do
status "published"
end
+
+ trait :final_version do
+ final_version true
+ end
end
factory :legislation_annotation, class: 'Legislation::Annotation' do
diff --git a/spec/features/legislation/draft_versions_spec.rb b/spec/features/legislation/draft_versions_spec.rb
index c7f761669..6c39d11ce 100644
--- a/spec/features/legislation/draft_versions_spec.rb
+++ b/spec/features/legislation/draft_versions_spec.rb
@@ -61,6 +61,18 @@ feature 'Legislation Draft Versions' do
expect(page).to_not have_content("Body of the first version")
expect(page).to have_content("Body of the second version")
end
+
+ context "for final versions" do
+ it "does not show the comments panel" do
+ final_version = create(:legislation_draft_version, process: @process, title: "Final version", body: "Final body", status: "published", final_version: true)
+
+ visit legislation_process_draft_version_path(@process, final_version)
+
+ expect(page).to have_content("Final body")
+ expect(page).to_not have_content("See all comments")
+ expect(page).to_not have_content("Comments")
+ end
+ end
end
context "See changes page" do
@@ -166,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)
@@ -173,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)