diff --git a/app/controllers/legislation/processes_controller.rb b/app/controllers/legislation/processes_controller.rb index 7aff709d0..a10bb5637 100644 --- a/app/controllers/legislation/processes_controller.rb +++ b/app/controllers/legislation/processes_controller.rb @@ -55,8 +55,8 @@ class Legislation::ProcessesController < Legislation::BaseController end end - def final_version_publication - phase :final_version_publication + def result_publication + phase :result_publication if @process.show_phase?(@phase) if final_version = @process.final_draft_version diff --git a/app/models/abilities/everyone.rb b/app/models/abilities/everyone.rb index c22a3f7e4..eaa971016 100644 --- a/app/models/abilities/everyone.rb +++ b/app/models/abilities/everyone.rb @@ -19,7 +19,7 @@ module Abilities can [:read, :print], Budget::Investment can :read_results, Budget, phase: "finished" can :new, DirectMessage - can [:read, :debate, :draft_publication, :allegations, :final_version_publication], Legislation::Process + can [:read, :debate, :draft_publication, :allegations, :result_publication], Legislation::Process can [:read, :changes, :go_to_version], Legislation::DraftVersion can [:read], Legislation::Question can [:create], Legislation::Answer diff --git a/app/models/legislation/process.rb b/app/models/legislation/process.rb index 32468b834..c63d5ef1b 100644 --- a/app/models/legislation/process.rb +++ b/app/models/legislation/process.rb @@ -29,8 +29,8 @@ class Legislation::Process < ActiveRecord::Base active_phase?(:draft_publication) && today >= draft_publication_date when :allegations active_phase?(:allegations) && today >= allegations_start_date && today <= allegations_end_date - when :final_version_publication - active_phase?(:final_version_publication) && today >= final_publication_date + when :result_publication + active_phase?(:result_publication) && today >= final_publication_date end end @@ -45,8 +45,8 @@ class Legislation::Process < ActiveRecord::Base active_phase?(:draft_publication) && today >= draft_publication_date when :allegations active_phase?(:allegations) && today >= allegations_start_date - when :final_version_publication - active_phase?(:final_version_publication) && today >= final_publication_date + when :result_publication + active_phase?(:result_publication) && today >= final_publication_date end end @@ -58,7 +58,7 @@ class Legislation::Process < ActiveRecord::Base draft_publication_date.present? when :allegations allegations_start_date.present? && allegations_end_date.present? - when :final_version_publication + when :result_publication final_publication_date.present? end end diff --git a/app/views/admin/legislation/processes/_form.html.erb b/app/views/admin/legislation/processes/_form.html.erb index 9d877a3da..88cb6560b 100644 --- a/app/views/admin/legislation/processes/_form.html.erb +++ b/app/views/admin/legislation/processes/_form.html.erb @@ -145,8 +145,8 @@ id: "result_publication_date" %>
<%= format_date(process.result_publication_date) %>
<% end %> diff --git a/config/routes.rb b/config/routes.rb index 6cbd69c3a..05d58ffab 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -112,7 +112,7 @@ Rails.application.routes.draw do get :debate get :draft_publication get :allegations - get :final_version_publication + get :result_publication resources :questions, only: [:show] do resources :answers, only: [:create] end diff --git a/spec/features/legislation/processes_spec.rb b/spec/features/legislation/processes_spec.rb index caae66490..3ed4ccb74 100644 --- a/spec/features/legislation/processes_spec.rb +++ b/spec/features/legislation/processes_spec.rb @@ -106,7 +106,7 @@ feature 'Legislation' do scenario 'not open' do process = create(:legislation_process, result_publication_date: Date.current + 1.day) - visit legislation_process_final_version_publication_path(process) + visit legislation_process_result_publication_path(process) expect(page).to have_content("This phase is not open yet") end @@ -114,7 +114,7 @@ feature 'Legislation' do scenario 'open' do process = create(:legislation_process, result_publication_date: Date.current) - visit legislation_process_final_version_publication_path(process) + visit legislation_process_result_publication_path(process) expect(page).to have_content("Nothing published yet") end diff --git a/spec/models/legislation/process_spec.rb b/spec/models/legislation/process_spec.rb index 239abad1b..1f831aee8 100644 --- a/spec/models/legislation/process_spec.rb +++ b/spec/models/legislation/process_spec.rb @@ -155,15 +155,15 @@ RSpec.describe Legislation::Process, type: :model do it "checks final version publication phase" do # future process.update_attributes(result_publication_date: Date.current + 2.days) - expect(process.open_phase?(:final_version_publication)).to be false + expect(process.open_phase?(:result_publication)).to be false # past process.update_attributes(result_publication_date: Date.current - 2.days) - expect(process.open_phase?(:final_version_publication)).to be true + expect(process.open_phase?(:result_publication)).to be true # starts today process.update_attributes(result_publication_date: Date.current) - expect(process.open_phase?(:final_version_publication)).to be true + expect(process.open_phase?(:result_publication)).to be true end end @@ -221,15 +221,15 @@ RSpec.describe Legislation::Process, type: :model do it "checks final version publication phase" do # future process.update_attributes(result_publication_date: Date.current + 2.days) - expect(process.show_phase?(:final_version_publication)).to be false + expect(process.show_phase?(:result_publication)).to be false # past process.update_attributes(result_publication_date: Date.current - 2.days) - expect(process.show_phase?(:final_version_publication)).to be true + expect(process.show_phase?(:result_publication)).to be true # starts today process.update_attributes(result_publication_date: Date.current) - expect(process.show_phase?(:final_version_publication)).to be true + expect(process.show_phase?(:result_publication)).to be true end end