Merge pull request #1781 from AyuntamientoMadrid/processes-custom-docs

Removes Legislation process custom documents
AyuntamientoMadrid · Dec 28, 2018 · 1b92dd3 · 1b92dd3
2 parents c47d1d0 + a242c8f
commit 1b92dd3
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 165 deletions.
diff --git a/app/models/legislation/process.rb b/app/models/legislation/process.rb
@@ -3,7 +3,7 @@ class Legislation::Process < ActiveRecord::Base
   include Taggable
   include Milestoneable
   include Documentable
-  documentable max_documents_allowed: 4,
+  documentable max_documents_allowed: 5,
                max_file_size: 3.megabytes,
                accepted_content_types: [ "application/pdf" ]
 

diff --git a/app/views/custom/legislation/processes/proposals.html.erb b/app/views/custom/legislation/processes/proposals.html.erb
@@ -2,10 +2,10 @@
 
 <%= render 'legislation/processes/header', process: @process, header: :full %>
 
-<%= render 'custom_documents' %>
-
 <%= render 'custom_results' %>
 
+<%= render 'documents/additional_documents', documents: @process.documents %>
+
 <%= render 'key_dates', process: @process, phase: :proposals %>
 
 <%= render 'proposals_content', process: @process, proposals: @proposals %>
diff --git a/app/views/legislation/processes/_custom_documents.html.erb b/app/views/legislation/processes/_custom_documents.html.erb
diff --git a/app/views/legislation/processes/_documents_process_25.html.erb b/app/views/legislation/processes/_documents_process_25.html.erb
diff --git a/app/views/legislation/processes/_documents_process_26.html.erb b/app/views/legislation/processes/_documents_process_26.html.erb
diff --git a/app/views/legislation/processes/_documents_process_28.html.erb b/app/views/legislation/processes/_documents_process_28.html.erb
diff --git a/app/views/legislation/processes/_documents_process_29.html.erb b/app/views/legislation/processes/_documents_process_29.html.erb
diff --git a/app/views/legislation/processes/_documents_process_30.html.erb b/app/views/legislation/processes/_documents_process_30.html.erb
diff --git a/app/views/legislation/processes/debate.html.erb b/app/views/legislation/processes/debate.html.erb
@@ -2,8 +2,6 @@
 
 <%= render 'legislation/processes/header', process: @process, header: :full %>
 
-<%= render 'custom_documents' %>
-
 <%= render 'custom_results' %>
 
 <%= render 'documents/additional_documents', documents: @process.documents %>

diff --git a/app/views/legislation/processes/phase_empty.html.erb b/app/views/legislation/processes/phase_empty.html.erb
@@ -2,8 +2,6 @@
 
 <%= render 'legislation/processes/header', process: @process, header: :full %>
 
-<%= render 'custom_documents' %>
-
 <%= render 'custom_results' %>
 
 <%= render 'documents/additional_documents', documents: @process.documents %>

diff --git a/app/views/legislation/processes/phase_not_open.html.erb b/app/views/legislation/processes/phase_not_open.html.erb
@@ -2,8 +2,6 @@
 
 <%= render 'legislation/processes/header', process: @process, header: :full %>
 
-<%= render 'custom_documents' %>
-
 <%= render 'custom_results' %>
 
 <%= render 'documents/additional_documents', documents: @process.documents %>

diff --git a/app/views/legislation/processes/proposals.html.erb b/app/views/legislation/processes/proposals.html.erb
@@ -2,6 +2,8 @@
 
 <%= render 'legislation/processes/header', process: @process, header: :full %>
 
+<%= render 'documents/additional_documents', documents: @process.documents %>
+
 <%= render 'key_dates', process: @process, phase: :proposals %>
 
 <%= render 'proposals_content', process: @process, proposals: @proposals %>
diff --git a/spec/features/legislation/processes_spec.rb b/spec/features/legislation/processes_spec.rb
@@ -131,12 +131,21 @@
     context "show" do
       include_examples "not published permissions", :legislation_process_path
 
-      scenario '#show view has document present' do
+      scenario 'show view has document present on all phases' do
         process = create(:legislation_process)
         document = create(:document, documentable: process)
+        phases = ["Debate", "Proposals", "Draft publication",
+                  "Comments", "Final result publication"]
+
         visit legislation_process_path(process)
 
-        expect(page).to have_content(document.title)
+        phases.each do |phase|
+          within(".legislation-process-list") do
+            find('li', :text => "#{phase}").click_link
+          end
+
+          expect(page).to have_content(document.title)
+        end
       end
 
       scenario 'show additional info button' do