diff --git a/app/views/shared/_subnavigation.html.erb b/app/views/shared/_subnavigation.html.erb
index f68367077..186d84487 100644
--- a/app/views/shared/_subnavigation.html.erb
+++ b/app/views/shared/_subnavigation.html.erb
@@ -15,7 +15,7 @@
<%= layout_menu_link_to t("layouts.header.proposals"),
proposals_path,
- controller_name == 'proposals',
+ controller.class == ProposalsController,
accesskey: "2",
title: t("shared.go_to_page") + t("layouts.header.proposals") %>
diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb
index 7b7af9342..cae8eb2b2 100644
--- a/db/dev_seeds.rb
+++ b/db/dev_seeds.rb
@@ -35,5 +35,6 @@ require_relative 'dev_seeds/newsletters'
require_relative 'dev_seeds/notifications'
require_relative 'dev_seeds/widgets'
require_relative 'dev_seeds/admin_notifications'
+require_relative 'dev_seeds/legislation_proposals'
log "All dev seeds created successfuly 👍"
diff --git a/db/dev_seeds/legislation_processes.rb b/db/dev_seeds/legislation_processes.rb
index 33fe7a7f5..932f93fd8 100644
--- a/db/dev_seeds/legislation_processes.rb
+++ b/db/dev_seeds/legislation_processes.rb
@@ -1,28 +1,32 @@
section "Creating legislation processes" do
5.times do
- process = ::Legislation::Process.create!(title: Faker::Lorem.sentence(3).truncate(60),
- description: Faker::Lorem.paragraphs.join("\n\n"),
- summary: Faker::Lorem.paragraph,
- additional_info: Faker::Lorem.paragraphs.join("\n\n"),
- start_date: Date.current - 3.days,
- end_date: Date.current + 3.days,
- debate_start_date: Date.current - 3.days,
- debate_end_date: Date.current - 1.day,
- draft_publication_date: Date.current + 1.day,
- allegations_start_date: Date.current + 2.days,
- allegations_end_date: Date.current + 3.days,
- result_publication_date: Date.current + 4.days,
- debate_phase_enabled: true,
- allegations_phase_enabled: true,
- draft_publication_enabled: true,
- result_publication_enabled: true,
- published: true)
+ Legislation::Process.create!(title: Faker::Lorem.sentence(3).truncate(60),
+ description: Faker::Lorem.paragraphs.join("\n\n"),
+ summary: Faker::Lorem.paragraph,
+ additional_info: Faker::Lorem.paragraphs.join("\n\n"),
+ proposals_description: Faker::Lorem.paragraph,
+ start_date: Date.current - 3.days,
+ end_date: Date.current + 3.days,
+ debate_start_date: Date.current - 3.days,
+ debate_end_date: Date.current - 1.day,
+ proposals_phase_start_date: Date.current - 3.days,
+ proposals_phase_end_date: Date.current - 1.day,
+ draft_publication_date: Date.current + 1.day,
+ allegations_start_date: Date.current + 2.days,
+ allegations_end_date: Date.current + 3.days,
+ result_publication_date: Date.current + 4.days,
+ debate_phase_enabled: true,
+ allegations_phase_enabled: true,
+ draft_publication_enabled: true,
+ result_publication_enabled: true,
+ proposals_phase_enabled: true,
+ published: true)
end
- ::Legislation::Process.all.each do |process|
+ Legislation::Process.all.each do |process|
(1..3).each do |i|
- version = process.draft_versions.create!(title: "Version #{i}",
- body: Faker::Lorem.paragraphs.join("\n\n"))
+ process.draft_versions.create!(title: "Version #{i}",
+ body: Faker::Lorem.paragraphs.join("\n\n"))
end
end
end
diff --git a/db/dev_seeds/legislation_proposals.rb b/db/dev_seeds/legislation_proposals.rb
new file mode 100644
index 000000000..ec6427395
--- /dev/null
+++ b/db/dev_seeds/legislation_proposals.rb
@@ -0,0 +1,11 @@
+section "Creating legislation proposals" do
+ 10.times do
+ Legislation::Proposal.create!(title: Faker::Lorem.sentence(3).truncate(60),
+ description: Faker::Lorem.paragraphs.join("\n\n"),
+ question: Faker::Lorem.sentence(3),
+ summary: Faker::Lorem.paragraph,
+ author: User.all.sample,
+ process: Legislation::Process.all.sample,
+ terms_of_service: '1')
+ end
+end
diff --git a/spec/features/legislation/proposals_spec.rb b/spec/features/legislation/proposals_spec.rb
index 79eb9c386..8d42f2e14 100644
--- a/spec/features/legislation/proposals_spec.rb
+++ b/spec/features/legislation/proposals_spec.rb
@@ -2,8 +2,18 @@ require 'rails_helper'
feature 'Legislation Proposals' do
+ let(:proposal) { create(:legislation_proposal) }
+
context "Concerns" do
it_behaves_like 'notifiable in-app', Legislation::Proposal
end
+ scenario "Only one menu element has 'active' CSS selector" do
+ visit legislation_process_proposal_path(proposal.process, proposal)
+
+ within('#navigation_bar') do
+ expect(page).to have_css('.is-active', count: 1)
+ end
+ end
+
end