diff --git a/app/views/shared/_recommended_index.html.erb b/app/views/shared/_recommended_index.html.erb
deleted file mode 100644
index eb3783d58..000000000
--- a/app/views/shared/_recommended_index.html.erb
+++ /dev/null
@@ -1,34 +0,0 @@
-
diff --git a/app/views/welcome/_recommended_carousel.html.erb b/app/views/welcome/_recommended_carousel.html.erb
index da2ac25f5..def55377d 100644
--- a/app/views/welcome/_recommended_carousel.html.erb
+++ b/app/views/welcome/_recommended_carousel.html.erb
@@ -13,7 +13,7 @@
<%= render_recommendation_image(recommended) %>
- <%= link_to recommended_path(recommended) do %>
+ <%= link_to polymorphic_path(recommended) do %>
<%= recommended.title %>
<% end %>
<%= wysiwyg(recommended.description) %>
diff --git a/spec/components/dashboard/poll_component_spec.rb b/spec/components/dashboard/poll_component_spec.rb
new file mode 100644
index 000000000..f31c7fd15
--- /dev/null
+++ b/spec/components/dashboard/poll_component_spec.rb
@@ -0,0 +1,51 @@
+require "rails_helper"
+
+describe Dashboard::PollComponent do
+ include Rails.application.routes.url_helpers
+
+ let(:proposal) { create(:proposal, :draft) }
+
+ before { sign_in(proposal.author) }
+
+ describe "Poll card content" do
+ describe "actions visibility" do
+ it "shows results link for current polls" do
+ current = create(:poll, related: proposal)
+
+ render_inline Dashboard::PollComponent.new(current)
+
+ expect(page).not_to have_link "Edit survey"
+ expect(page).to have_link "View results", href: results_proposal_poll_path(proposal, current)
+ end
+
+ it "shows results link for expired polls" do
+ expired = create(:poll, :expired, related: proposal)
+
+ render_inline Dashboard::PollComponent.new(expired)
+
+ expect(page).not_to have_link "Edit survey"
+ expect(page).to have_link "View results", href: results_proposal_poll_path(proposal, expired)
+ end
+
+ it "shows edit link for upcoming polls" do
+ upcoming = create(:poll, related: proposal, starts_at: 1.week.from_now)
+
+ render_inline Dashboard::PollComponent.new(upcoming)
+
+ expect(page).to have_link "Edit survey", href: edit_proposal_dashboard_poll_path(proposal, upcoming)
+ expect(page).not_to have_link "View results"
+ end
+ end
+
+ it "renders poll title and dates" do
+ expired = create(:poll, :expired, related: proposal)
+
+ render_inline Dashboard::PollComponent.new(expired)
+
+ expect(page).to have_content I18n.l(expired.starts_at.to_date)
+ expect(page).to have_content I18n.l(expired.ends_at.to_date)
+ expect(page).to have_link expired.title
+ expect(page).to have_link expired.title, href: proposal_poll_path(proposal, expired)
+ end
+ end
+end
diff --git a/spec/components/dashboard/polls_component_spec.rb b/spec/components/dashboard/polls_component_spec.rb
new file mode 100644
index 000000000..2ac73f65a
--- /dev/null
+++ b/spec/components/dashboard/polls_component_spec.rb
@@ -0,0 +1,9 @@
+require "rails_helper"
+
+describe Dashboard::PollsComponent do
+ it "is not rendered when there aren't any polls" do
+ render_inline Dashboard::PollsComponent.new(Poll.none)
+
+ expect(page).not_to be_rendered
+ end
+end
diff --git a/spec/components/dashboard/resources_component_spec.rb b/spec/components/dashboard/resources_component_spec.rb
new file mode 100644
index 000000000..00978ecb4
--- /dev/null
+++ b/spec/components/dashboard/resources_component_spec.rb
@@ -0,0 +1,131 @@
+require "rails_helper"
+
+describe Dashboard::ResourcesComponent do
+ let(:proposal) { create(:proposal, :draft) }
+ before { sign_in(proposal.author) }
+
+ describe "Available resources section" do
+ let!(:available) { create(:dashboard_action, :resource, :active, title: "Available!") }
+ let(:requested) { create(:dashboard_action, :resource, :admin_request, :active, title: "Requested!") }
+ let(:executed_action) do
+ create(
+ :dashboard_executed_action,
+ action: requested,
+ proposal: proposal,
+ executed_at: Time.current
+ )
+ end
+ let(:solved) { create(:dashboard_action, :resource, :admin_request, :active, title: "Solved!") }
+ let(:executed_solved_action) do
+ create(
+ :dashboard_executed_action,
+ action: solved,
+ proposal: proposal,
+ executed_at: Time.current
+ )
+ end
+ let!(:unavailable) do
+ create(
+ :dashboard_action,
+ :resource,
+ :active,
+ required_supports: proposal.votes_for.size + 1_000,
+ title: "Unavailable!"
+ )
+ end
+
+ before do
+ create(:dashboard_administrator_task, :pending, source: executed_action)
+ create(:dashboard_administrator_task, :done, source: executed_solved_action)
+ end
+
+ it "shows available resources for proposal drafts" do
+ render_inline Dashboard::ResourcesComponent.new(proposal)
+
+ expect(page).to have_content "Polls"
+ expect(page).to have_content "E-mail"
+ expect(page).to have_content "Poster"
+ expect(page).to have_content available.title
+ expect(page).to have_content unavailable.title
+ expect(page).to have_content requested.title
+ expect(page).to have_content solved.title
+
+ page.find(".resource-card", text: "Available!") do |dashboard_action_available|
+ expect(dashboard_action_available).to have_link "See resource"
+ end
+
+ page.find(".resource-card", text: "Requested!") do |dashboard_action_requested|
+ expect(dashboard_action_requested).to have_content "Resource already requested"
+ end
+
+ page.find(".resource-card", text: "Unavailable!") do |dashboard_action_unavailable|
+ expect(dashboard_action_unavailable).to have_content "1.000 supports required"
+ end
+
+ page.find(".resource-card", text: "Solved!") do |dashboard_action_solved|
+ expect(dashboard_action_solved).to have_link "See resource"
+ end
+ end
+
+ it "shows available resources for published proposals" do
+ proposal.update!(published_at: Date.current)
+
+ render_inline Dashboard::ResourcesComponent.new(proposal)
+
+ expect(page).to have_content "Polls"
+ expect(page).to have_content "E-mail"
+ expect(page).to have_content "Poster"
+ expect(page).to have_content available.title
+ expect(page).to have_content unavailable.title
+ expect(page).to have_content requested.title
+ expect(page).to have_content solved.title
+
+ page.find(".resource-card", text: "Available!") do |dashboard_action_available|
+ expect(dashboard_action_available).to have_link "See resource"
+ end
+
+ page.find(".resource-card", text: "Requested!") do |dashboard_action_requested|
+ expect(dashboard_action_requested).to have_content "Resource already requested"
+ end
+
+ page.find(".resource-card", text: "Unavailable!") do |dashboard_action_unavailable|
+ expect(dashboard_action_unavailable).to have_content "1.000 supports required"
+ end
+
+ page.find(".resource-card", text: "Solved!") do |dashboard_action_solved|
+ expect(dashboard_action_solved).to have_link "See resource"
+ end
+ end
+
+ it "does not show resources with published_proposal: true" do
+ available.update!(published_proposal: true)
+ unavailable.update!(published_proposal: true)
+
+ render_inline Dashboard::ResourcesComponent.new(proposal)
+
+ expect(page).to have_content "Polls"
+ expect(page).to have_content "E-mail"
+ expect(page).to have_content "Poster"
+ expect(page).not_to have_content available.title
+ expect(page).not_to have_content unavailable.title
+ end
+ end
+
+ describe "Tags for new actions" do
+ it "displays tag 'new' only when resource is detected like new action" do
+ create(:dashboard_action, :resource, :active, title: "Old!")
+ new_resource = create(:dashboard_action, :resource, :active, title: "Recent!")
+ new_actions_since_last_login = [new_resource.id]
+
+ render_inline Dashboard::ResourcesComponent.new(proposal, new_actions_since_last_login)
+
+ page.find(".resource-card", text: "Recent!") do |dashboard_action_new_resource|
+ expect(dashboard_action_new_resource).to have_content "New"
+ end
+
+ page.find(".resource-card", text: "Old!") do |dashboard_action_old_resource|
+ expect(dashboard_action_old_resource).not_to have_content "New"
+ end
+ end
+ end
+end
diff --git a/spec/components/polls/access_status_component_spec.rb b/spec/components/polls/access_status_component_spec.rb
new file mode 100644
index 000000000..9ac1b77cc
--- /dev/null
+++ b/spec/components/polls/access_status_component_spec.rb
@@ -0,0 +1,48 @@
+require "rails_helper"
+
+describe Polls::AccessStatusComponent do
+ it "asks anonymous users to sign in" do
+ render_inline Polls::AccessStatusComponent.new(create(:poll))
+
+ expect(page).to have_css ".not-logged-in", count: 1
+ expect(page).to have_content "You must sign in or sign up to participate"
+ end
+
+ it "asks unverified users to verify their account" do
+ sign_in(create(:user))
+
+ render_inline Polls::AccessStatusComponent.new(create(:poll))
+
+ expect(page).to have_css ".unverified", count: 1
+ expect(page).to have_content "You must verify your account to participate"
+ end
+
+ it "tell users from different geozones that the poll isn't available" do
+ sign_in(create(:user, :level_two))
+
+ render_inline Polls::AccessStatusComponent.new(create(:poll, geozone_restricted: true))
+
+ expect(page).to have_css ".cant-answer", count: 1
+ expect(page).to have_content "This poll is not available on your geozone"
+ end
+
+ it "informs users when they've already participated" do
+ user = create(:user, :level_two)
+ poll = create(:poll)
+ create(:poll_voter, user: user, poll: poll)
+
+ sign_in(user)
+ render_inline Polls::AccessStatusComponent.new(poll)
+
+ expect(page).to have_css ".already-answer", count: 1
+ expect(page).to have_content "You already have participated in this poll"
+ end
+
+ it "is not rendered when users can vote" do
+ sign_in(create(:user, :level_two))
+
+ render_inline Polls::AccessStatusComponent.new(create(:poll))
+
+ expect(page).not_to be_rendered
+ end
+end
diff --git a/spec/components/polls/poll_component_spec.rb b/spec/components/polls/poll_component_spec.rb
index a12041ff8..4317ad2a8 100644
--- a/spec/components/polls/poll_component_spec.rb
+++ b/spec/components/polls/poll_component_spec.rb
@@ -3,45 +3,6 @@ require "rails_helper"
describe Polls::PollComponent do
include Rails.application.routes.url_helpers
- describe "status message" do
- it "asks anonymous users to sign in" do
- render_inline Polls::PollComponent.new(create(:poll))
-
- expect(page).to have_css ".not-logged-in", count: 1
- expect(page).to have_content "You must sign in or sign up to participate"
- end
-
- it "asks unverified users to verify their account" do
- sign_in(create(:user))
-
- render_inline Polls::PollComponent.new(create(:poll))
-
- expect(page).to have_css ".unverified", count: 1
- expect(page).to have_content "You must verify your account to participate"
- end
-
- it "tell users from different geozones that the poll isn't available" do
- sign_in(create(:user, :level_two))
-
- render_inline Polls::PollComponent.new(create(:poll, geozone_restricted: true))
-
- expect(page).to have_css ".cant-answer", count: 1
- expect(page).to have_content "This poll is not available on your geozone"
- end
-
- it "informs users when they've already participated" do
- user = create(:user, :level_two)
- poll = create(:poll)
- create(:poll_voter, user: user, poll: poll)
-
- sign_in(user)
- render_inline Polls::PollComponent.new(poll)
-
- expect(page).to have_css ".already-answer", count: 1
- expect(page).to have_content "You already have participated in this poll"
- end
- end
-
describe "dates" do
it "renders the dates inside an HTML tag" do
poll = create(:poll, starts_at: "2015-07-15", ends_at: "2015-07-22")
diff --git a/spec/system/dashboard/dashboard_spec.rb b/spec/system/dashboard/dashboard_spec.rb
index 379478cec..64154806f 100644
--- a/spec/system/dashboard/dashboard_spec.rb
+++ b/spec/system/dashboard/dashboard_spec.rb
@@ -138,116 +138,6 @@ describe "Proposal's dashboard" do
expect(page).not_to have_content(action.title)
end
- scenario "Dashboard progress show available resources for proposal draft" do
- available = create(:dashboard_action, :resource, :active)
-
- requested = create(:dashboard_action, :resource, :admin_request, :active)
- executed_action = create(:dashboard_executed_action, action: requested,
- proposal: proposal,
- executed_at: Time.current)
- _task = create(:dashboard_administrator_task, :pending, source: executed_action)
-
- solved = create(:dashboard_action, :resource, :admin_request, :active)
- executed_solved_action = create(:dashboard_executed_action, action: solved,
- proposal: proposal,
- executed_at: Time.current)
- _solved_task = create(:dashboard_administrator_task, :done, source: executed_solved_action)
-
- unavailable = create(:dashboard_action, :resource, :active,
- required_supports: proposal.votes_for.size + 1_000)
-
- visit progress_proposal_dashboard_path(proposal)
- within "div#available-resources-section" do
- expect(page).to have_content("Polls")
- expect(page).to have_content("E-mail")
- expect(page).to have_content("Poster")
- expect(page).to have_content(available.title)
- expect(page).to have_content(unavailable.title)
- expect(page).to have_content(requested.title)
- expect(page).to have_content(solved.title)
-
- within "div#dashboard_action_#{available.id}" do
- expect(page).to have_link "See resource"
- end
-
- within "div#dashboard_action_#{requested.id}" do
- expect(page).to have_content("Resource already requested")
- end
-
- within "div#dashboard_action_#{unavailable.id}" do
- expect(page).to have_content("1.000 supports required")
- end
-
- within "div#dashboard_action_#{solved.id}" do
- expect(page).to have_link("See resource")
- end
- end
- end
-
- scenario "Dashboard progress show available resources for published proposal" do
- proposal.update!(published_at: Date.current)
- available = create(:dashboard_action, :resource, :active)
-
- requested = create(:dashboard_action, :resource, :admin_request, :active)
- executed_action = create(:dashboard_executed_action, action: requested,
- proposal: proposal,
- executed_at: Time.current)
- _task = create(:dashboard_administrator_task, :pending, source: executed_action)
-
- solved = create(:dashboard_action, :resource, :admin_request, :active)
- executed_solved_action = create(:dashboard_executed_action, action: solved,
- proposal: proposal,
- executed_at: Time.current)
- _solved_task = create(:dashboard_administrator_task, :done, source: executed_solved_action)
-
- unavailable = create(:dashboard_action, :resource, :active,
- required_supports: proposal.votes_for.size + 1_000)
-
- visit progress_proposal_dashboard_path(proposal)
- within "div#available-resources-section" do
- expect(page).to have_content("Polls")
- expect(page).to have_content("E-mail")
- expect(page).to have_content("Poster")
- expect(page).to have_content(available.title)
- expect(page).to have_content(unavailable.title)
- expect(page).to have_content(requested.title)
- expect(page).to have_content(solved.title)
-
- within "div#dashboard_action_#{available.id}" do
- expect(page).to have_link "See resource"
- end
-
- within "div#dashboard_action_#{requested.id}" do
- expect(page).to have_content("Resource already requested")
- end
-
- within "div#dashboard_action_#{unavailable.id}" do
- expect(page).to have_content("1.000 supports required")
- end
-
- within "div#dashboard_action_#{solved.id}" do
- expect(page).to have_link("See resource")
- end
- end
- end
-
- scenario "Dashboard progress dont show resources with published_proposal: true" do
- available = create(:dashboard_action, :resource, :active, published_proposal: true)
- unavailable = create(:dashboard_action, :resource, :active,
- required_supports: proposal.votes_for.size + 1_000,
- published_proposal: true)
-
- visit progress_proposal_dashboard_path(proposal)
-
- within "div#available-resources-section" do
- expect(page).to have_content("Polls")
- expect(page).to have_content("E-mail")
- expect(page).to have_content("Poster")
- expect(page).not_to have_content(available.title)
- expect(page).not_to have_content(unavailable.title)
- end
- end
-
scenario "Dashboard has a link to resources on main menu" do
feature = create(:dashboard_action, :resource, :active)
@@ -480,29 +370,6 @@ describe "Proposal's dashboard" do
describe "detect_new_actions_after_last_login" do
before { proposal.author.update!(current_sign_in_at: 1.day.ago) }
- scenario "Display tag 'new' on resouce when it is new for author since last login" do
- resource = create(:dashboard_action, :resource, :active, day_offset: 0,
- published_proposal: false)
-
- visit progress_proposal_dashboard_path(proposal)
-
- within "#dashboard_action_#{resource.id}" do
- expect(page).to have_content("New")
- end
- end
-
- scenario "Not display tag 'new' on resouce when there is not new resources since last login" do
- resource = create(:dashboard_action, :resource, :active, day_offset: 0,
- published_proposal: false)
- proposal.author.update!(current_sign_in_at: Date.current)
-
- visit progress_proposal_dashboard_path(proposal)
-
- within "#dashboard_action_#{resource.id}" do
- expect(page).not_to have_content("New")
- end
- end
-
scenario "Display tag 'new' on proposed_action when it is new for author since last login" do
proposed_action = create(:dashboard_action, :proposed_action, :active, day_offset: 0,
published_proposal: false)
diff --git a/spec/system/dashboard/polls_spec.rb b/spec/system/dashboard/polls_spec.rb
index cb9ed5821..2ef729541 100644
--- a/spec/system/dashboard/polls_spec.rb
+++ b/spec/system/dashboard/polls_spec.rb
@@ -123,26 +123,6 @@ describe "Polls" do
expect(page).to have_content("Edit poll")
end
- scenario "Edit poll is not allowed for current polls" do
- poll = create(:poll, related: proposal)
-
- visit proposal_dashboard_polls_path(proposal)
-
- within "div#poll_#{poll.id}" do
- expect(page).not_to have_content("Edit survey")
- end
- end
-
- scenario "Edit poll is not allowed for expired polls" do
- poll = create(:poll, :expired, related: proposal)
-
- visit proposal_dashboard_polls_path(proposal)
-
- within "div#poll_#{poll.id}" do
- expect(page).not_to have_content("Edit survey")
- end
- end
-
scenario "Edit poll should allow to remove questions" do
poll = create(:poll, related: proposal, starts_at: 1.week.from_now)
create(:poll_question, poll: poll)
@@ -224,36 +204,6 @@ describe "Polls" do
expect(page).to have_content(poll.name)
end
- scenario "View results not available for upcoming polls" do
- poll = create(:poll, related: proposal, starts_at: 1.week.from_now)
-
- visit proposal_dashboard_polls_path(proposal)
-
- within "div#poll_#{poll.id}" do
- expect(page).not_to have_content("View results")
- end
- end
-
- scenario "View results available for current polls" do
- poll = create(:poll, related: proposal)
-
- visit proposal_dashboard_polls_path(proposal)
-
- within "div#poll_#{poll.id}" do
- expect(page).to have_content("View results")
- end
- end
-
- scenario "View results available for expired polls" do
- poll = create(:poll, :expired, related: proposal)
-
- visit proposal_dashboard_polls_path(proposal)
-
- within "div#poll_#{poll.id}" do
- expect(page).to have_content("View results")
- end
- end
-
scenario "View results redirects to results in public zone" do
poll = create(:poll, :expired, related: proposal)
@@ -276,18 +226,4 @@ describe "Polls" do
expect(find_field("Show results")).not_to be_checked
end
-
- scenario "Poll card" do
- poll = create(:poll, :expired, related: proposal)
-
- visit proposal_dashboard_polls_path(proposal)
-
- within "div#poll_#{poll.id}" do
- expect(page).to have_content(I18n.l(poll.starts_at.to_date))
- expect(page).to have_content(I18n.l(poll.ends_at.to_date))
- expect(page).to have_link(poll.title)
- expect(page).to have_link(poll.title, href: proposal_poll_path(proposal, poll))
- expect(page).to have_link("View results", href: results_proposal_poll_path(proposal, poll))
- end
- end
end