<%= format_date(process.debate_start_date) %> - <%= format_date(process.debate_end_date) %>
<% end %> @@ -18,7 +18,7 @@ <% if process.draft_publication.enabled? %><%= format_date(process.draft_publication_date) %>
<% end %> @@ -27,7 +27,7 @@ <% if process.allegations_phase.enabled? %><%= format_date(process.allegations_start_date) %> - <%= format_date(process.allegations_end_date) %>
<% end %> @@ -36,7 +36,7 @@ <% if process.result_publication.enabled? %><%= format_date(process.result_publication_date) %>
<% end %> diff --git a/config/routes.rb b/config/routes.rb index ef476cf28..dbf3e4709 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -109,10 +109,12 @@ Rails.application.routes.draw do namespace :legislation do resources :processes, only: [:index, :show] do - get :debate - get :draft_publication - get :allegations - get :result_publication + member do + get :debate + get :draft_publication + get :allegations + get :result_publication + end resources :questions, only: [:show] do resources :answers, only: [:create] end diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index 35257931a..c0655bfe7 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -651,7 +651,8 @@ print "Creating legislation processes" debate_phase_enabled: true, allegations_phase_enabled: true, draft_publication_enabled: true, - result_publication_enabled: true + result_publication_enabled: true, + published: true ) end diff --git a/db/migrate/20170626081337_add_published_to_legislation_processes.rb b/db/migrate/20170626081337_add_published_to_legislation_processes.rb new file mode 100644 index 000000000..abb03f2f8 --- /dev/null +++ b/db/migrate/20170626081337_add_published_to_legislation_processes.rb @@ -0,0 +1,5 @@ +class AddPublishedToLegislationProcesses < ActiveRecord::Migration + def change + add_column :legislation_processes, :published, :boolean, default: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 3c21882e9..042bec7dd 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20170623141655) do +ActiveRecord::Schema.define(version: 20170626081337) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -429,6 +429,7 @@ ActiveRecord::Schema.define(version: 20170623141655) do t.boolean "allegations_phase_enabled", default: false t.boolean "draft_publication_enabled", default: false t.boolean "result_publication_enabled", default: false + t.boolean "published", default: true end add_index "legislation_processes", ["allegations_end_date"], name: "index_legislation_processes_on_allegations_end_date", using: :btree diff --git a/spec/factories.rb b/spec/factories.rb index 8ada920b8..c0cbd1cc1 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -629,6 +629,7 @@ FactoryGirl.define do allegations_phase_enabled true draft_publication_enabled true result_publication_enabled true + published true trait :next do start_date Date.current + 2.days @@ -662,6 +663,11 @@ FactoryGirl.define do allegations_end_date Date.current + 3.days result_publication_date Date.current + 5.days end + + trait :not_published do + published false + end + end factory :legislation_draft_version, class: 'Legislation::DraftVersion' do diff --git a/spec/features/admin/legislation/processes_spec.rb b/spec/features/admin/legislation/processes_spec.rb index e945f6ce8..8ad2fa456 100644 --- a/spec/features/admin/legislation/processes_spec.rb +++ b/spec/features/admin/legislation/processes_spec.rb @@ -88,6 +88,7 @@ feature 'Admin legislation processes' do expect(page).to have_selector("h2", text: "An example legislation process") expect(find("#legislation_process_debate_phase_enabled")).to be_checked + expect(find("#legislation_process_published")).to be_checked fill_in 'legislation_process_summary', with: '' click_button "Save changes" diff --git a/spec/features/legislation/processes_spec.rb b/spec/features/legislation/processes_spec.rb index 3ed4ccb74..0ef5e0c7c 100644 --- a/spec/features/legislation/processes_spec.rb +++ b/spec/features/legislation/processes_spec.rb @@ -2,6 +2,27 @@ require 'rails_helper' feature 'Legislation' do + let!(:administrator) { create(:administrator).user } + shared_examples "not published permissions" do |path| + + let(:not_published_process) { create(:legislation_process, :not_published, title: "Process not published") } + let!(:not_permission_message) { "You do not have permission to carry out the action" } + + it "is forbidden for a normal user" do + visit send(path, not_published_process) + + expect(page).to have_content not_permission_message + expect(page).to_not have_content("Process not published") + end + + it "is available for an administrator user" do + login_as(administrator) + visit send(path, not_published_process) + + expect(page).to have_content("Process not published") + end + end + context 'processes home page' do scenario 'Processes can be listed' do @@ -45,9 +66,57 @@ feature 'Legislation' do expect(page).to_not have_content('Process next') expect(page).to have_content('Process past') end + + context "not published processes" do + before do + create(:legislation_process, title: "published") + create(:legislation_process, :not_published, title: "not published") + [:next, :past].each do |trait| + create(:legislation_process, trait, title: "#{trait} published") + create(:legislation_process, :not_published, trait, title: "#{trait} not published") + end + end + + it "aren't listed" do + visit legislation_processes_path + expect(page).to_not have_content('not published') + expect(page).to have_content('published') + + login_as(administrator) + visit legislation_processes_path + expect(page).to_not have_content('not published') + expect(page).to have_content('published') + end + + it "aren't listed with next filter" do + visit legislation_processes_path(filter: 'next') + expect(page).to_not have_content('not published') + expect(page).to have_content('next published') + + login_as(administrator) + visit legislation_processes_path(filter: 'next') + expect(page).to_not have_content('not published') + expect(page).to have_content('next published') + end + + it "aren't listed with past filter" do + visit legislation_processes_path(filter: 'past') + expect(page).to_not have_content('not published') + expect(page).to have_content('past published') + + login_as(administrator) + visit legislation_processes_path(filter: 'past') + expect(page).to_not have_content('not published') + expect(page).to have_content('past published') + end + end end context 'process page' do + context "show" do + include_examples "not published permissions", :legislation_process_path + end + context 'debate phase' do scenario 'not open' do process = create(:legislation_process, debate_start_date: Date.current + 1.day, debate_end_date: Date.current + 2.days) @@ -64,13 +133,15 @@ feature 'Legislation' do expect(page).to have_content("Participate in the debate") end + + include_examples "not published permissions", :debate_legislation_process_path end context 'draft publication phase' do scenario 'not open' do process = create(:legislation_process, draft_publication_date: Date.current + 1.day) - visit legislation_process_draft_publication_path(process) + visit draft_publication_legislation_process_path(process) expect(page).to have_content("This phase is not open yet") end @@ -78,17 +149,19 @@ feature 'Legislation' do scenario 'open' do process = create(:legislation_process, draft_publication_date: Date.current) - visit legislation_process_draft_publication_path(process) + visit draft_publication_legislation_process_path(process) expect(page).to have_content("Nothing published yet") end + + include_examples "not published permissions", :draft_publication_legislation_process_path end context 'allegations phase' do scenario 'not open' do process = create(:legislation_process, allegations_start_date: Date.current + 1.day, allegations_end_date: Date.current + 2.days) - visit legislation_process_allegations_path(process) + visit allegations_legislation_process_path(process) expect(page).to have_content("This phase is not open yet") end @@ -96,17 +169,19 @@ feature 'Legislation' do scenario 'open' do process = create(:legislation_process, allegations_start_date: Date.current - 1.day, allegations_end_date: Date.current + 2.days) - visit legislation_process_allegations_path(process) + visit allegations_legislation_process_path(process) expect(page).to have_content("Nothing published yet") end + + include_examples "not published permissions", :allegations_legislation_process_path end context 'final version publication phase' do scenario 'not open' do process = create(:legislation_process, result_publication_date: Date.current + 1.day) - visit legislation_process_result_publication_path(process) + visit result_publication_legislation_process_path(process) expect(page).to have_content("This phase is not open yet") end @@ -114,10 +189,12 @@ feature 'Legislation' do scenario 'open' do process = create(:legislation_process, result_publication_date: Date.current) - visit legislation_process_result_publication_path(process) + visit result_publication_legislation_process_path(process) expect(page).to have_content("Nothing published yet") end + + include_examples "not published permissions", :result_publication_legislation_process_path end end end