From e879fddba49b3e7e7a9815f1b1a23365dd39bda3 Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 4 Jun 2019 16:33:46 +0200 Subject: [PATCH 1/5] Hide view mode on selected proposals list --- app/assets/stylesheets/participation.scss | 1 + app/views/proposals/index.html.erb | 10 ++++++---- spec/features/proposals_spec.rb | 9 +++++++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index a31978cee..c578b63ac 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -444,6 +444,7 @@ } blockquote { + clear: both; color: #4c4c4c; margin-top: rem-calc(12); padding-top: 0; diff --git a/app/views/proposals/index.html.erb b/app/views/proposals/index.html.erb index 4515fa2e5..a83da2fc5 100644 --- a/app/views/proposals/index.html.erb +++ b/app/views/proposals/index.html.erb @@ -71,11 +71,13 @@ <% end %> -
-
- <%= render "view_mode" %> + <% unless params[:selected].present? %> +
+
+ <%= render "view_mode" %> +
-
+ <% end %> <% unless params[:retired].present? || params[:selected].present? %> <%= render "shared/advanced_search", diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb index 42b764a31..7e329683d 100644 --- a/spec/features/proposals_spec.rb +++ b/spec/features/proposals_spec.rb @@ -100,6 +100,15 @@ describe "Proposals" do end end + scenario "Index view mode is not shown with selected filter" do + visit proposals_path + + click_link "View selected proposals" + + expect(page).not_to have_selector(".view-mode") + expect(page).not_to have_button("View mode") + end + scenario "Pagination" do per_page = Kaminari.config.default_per_page (per_page + 5).times { create(:proposal) } From b15048ec7db45949128fae88462b75439fe24599 Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 4 Jun 2019 16:35:03 +0200 Subject: [PATCH 2/5] Hide proposal code on selected proposals --- app/views/proposals/_info.html.erb | 10 ++++++---- spec/features/proposals_spec.rb | 8 ++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/app/views/proposals/_info.html.erb b/app/views/proposals/_info.html.erb index da1eb3435..aea05f24e 100644 --- a/app/views/proposals/_info.html.erb +++ b/app/views/proposals/_info.html.erb @@ -19,10 +19,12 @@ <%= render_image(@proposal.image, :large, true) if @proposal.image.present? %>
-

- <%= t("proposals.show.code") %> - <%= @proposal.code %> -

+<% unless @proposal.selected? %> +

+ <%= t("proposals.show.code") %> + <%= @proposal.code %> +

+<% end %>
<%= @proposal.summary %>
diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb index 7e329683d..3f0476dfa 100644 --- a/spec/features/proposals_spec.rb +++ b/spec/features/proposals_spec.rb @@ -203,6 +203,14 @@ describe "Proposals" do visit proposal_path(proposal) expect(page).not_to have_content "Access the community" end + + scenario "Selected proposals does not show proposal code" do + proposal = create(:proposal, :selected) + + visit proposal_path(proposal) + expect(page).not_to have_content proposal.code + expect(page).not_to have_content("Proposal code:") + end end context "Show on mobile screens" do From 1a0f0215a70ed2c34155cbb5321dbf4c5ebacfff Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 4 Jun 2019 16:57:18 +0200 Subject: [PATCH 3/5] Hide related content on selected proposals --- app/views/proposals/show.html.erb | 5 ++++- spec/features/proposals_spec.rb | 9 +++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb index 93f59236a..ccd0e1a90 100644 --- a/app/views/proposals/show.html.erb +++ b/app/views/proposals/show.html.erb @@ -40,7 +40,10 @@ <%= render "proposals/info", proposal: @proposal %> <%= render "shared/geozone", geozonable: @proposal %> - <%= render "relationable/related_content", relationable: @proposal %> + + <% unless @proposal.selected? %> + <%= render "relationable/related_content", relationable: @proposal %> + <% end %>
<%= render "proposals/actions", proposal: @proposal %> diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb index 3f0476dfa..44407e625 100644 --- a/spec/features/proposals_spec.rb +++ b/spec/features/proposals_spec.rb @@ -211,6 +211,15 @@ describe "Proposals" do expect(page).not_to have_content proposal.code expect(page).not_to have_content("Proposal code:") end + + scenario "Selected proposals does not show related content section" do + proposal = create(:proposal, :selected) + login_as(create(:user)) + + visit proposal_path(proposal) + expect(page).not_to have_content("Related content") + expect(page).not_to have_button("Add related content") + end end context "Show on mobile screens" do From 844020859737f5a3b1ee2cc44aac6908ab08407a Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 4 Jun 2019 17:17:16 +0200 Subject: [PATCH 4/5] Hide comments count on selected proposals --- app/views/proposals/_info.html.erb | 9 ++++++--- spec/features/proposals_spec.rb | 10 ++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/app/views/proposals/_info.html.erb b/app/views/proposals/_info.html.erb index aea05f24e..35607e6ec 100644 --- a/app/views/proposals/_info.html.erb +++ b/app/views/proposals/_info.html.erb @@ -3,9 +3,12 @@  •  <%= l @proposal.created_at.to_date %> -  •  -   - <%= link_to t("proposals.show.comments", count: @proposal.comments_count), "#comments" %> + + <% unless @proposal.selected? %> +  •  +   + <%= link_to t("proposals.show.comments", count: @proposal.comments_count), "#comments" %> + <% end %> <% if current_user %>  •  diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb index 44407e625..f6d3fddfe 100644 --- a/spec/features/proposals_spec.rb +++ b/spec/features/proposals_spec.rb @@ -220,6 +220,16 @@ describe "Proposals" do expect(page).not_to have_content("Related content") expect(page).not_to have_button("Add related content") end + + scenario "Selected proposals does not show comments count" do + proposal = create(:proposal, :selected) + + visit proposal_path(proposal) + + within(".proposal-info") do + expect(page).not_to have_link("No comments", href: "#comments") + end + end end context "Show on mobile screens" do From 0ff7a327b712e7abee9890de68cafcaefbaaec2f Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 4 Jun 2019 17:23:53 +0200 Subject: [PATCH 5/5] Refactor selected proposals specs --- spec/features/proposals_spec.rb | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb index f6d3fddfe..54295dc8e 100644 --- a/spec/features/proposals_spec.rb +++ b/spec/features/proposals_spec.rb @@ -204,27 +204,16 @@ describe "Proposals" do expect(page).not_to have_content "Access the community" end - scenario "Selected proposals does not show proposal code" do - proposal = create(:proposal, :selected) - - visit proposal_path(proposal) - expect(page).not_to have_content proposal.code - expect(page).not_to have_content("Proposal code:") - end - - scenario "Selected proposals does not show related content section" do + scenario "Selected proposals does not show all information" do proposal = create(:proposal, :selected) login_as(create(:user)) visit proposal_path(proposal) + expect(page).not_to have_content proposal.code + expect(page).not_to have_content("Proposal code:") + expect(page).not_to have_content("Related content") expect(page).not_to have_button("Add related content") - end - - scenario "Selected proposals does not show comments count" do - proposal = create(:proposal, :selected) - - visit proposal_path(proposal) within(".proposal-info") do expect(page).not_to have_link("No comments", href: "#comments")