Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Link results to custom controller #52

Merged
merged 2 commits into from
Oct 14, 2020
Merged

Link results to custom controller #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccbbd86
Simplify responses title in spec
sauloperez Oct 14, 2020
cf22080
Point results link to our custom controller action
sauloperez Oct 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions app/views/layouts/decidim/admin/consultation.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<% content_for :secondary_nav do %>
<div class="secondary-nav secondary-nav--subnav">
<ul>
<%= public_page_link decidim_consultations.consultation_path(current_consultation) %>
<% if allowed_to? :update, :consultation, consultation: current_consultation %>
<li <% if is_active_link?(decidim_admin_consultations.edit_consultation_path(current_consultation)) %> class="is-active" <% end %>>
<%= aria_selected_link_to t("info", scope: "decidim.admin.menu.consultations_submenu"),
decidim_admin_consultations.edit_consultation_path(current_consultation) %>
</li>
<% end %>

<% if allowed_to? :read, :question %>
<li <% if is_active_link?(decidim_admin_consultations.consultation_questions_path(current_consultation)) %> class="is-active" <% end %>>
<%= aria_selected_link_to t("questions", scope: "decidim.admin.menu.consultations_submenu"),
decidim_admin_consultations.consultation_questions_path(current_consultation) %>
</li>
<li <% if is_active_link?(decidim_admin_action_delegator.results_consultation_path(current_consultation)) %> class="is-active" <% end %>>
<%= aria_selected_link_to t("results", scope: "decidim.admin.menu.consultations_submenu"),
decidim_admin_action_delegator.results_consultation_path(current_consultation) %>
</li>
<% end %>
</ul>
</div>
<% end %>

<%= render "layouts/decidim/admin/application" do %>
<div class="process-title">
<div class="process-title-content">
<%= link_to translated_attribute(current_consultation.title), decidim_consultations.consultation_path(current_consultation), target: "_blank" %>
</div>
</div>

<div class="process-content">
<%= yield %>
</div>
<% end %>
16 changes: 2 additions & 14 deletions spec/jobs/decidim/action_delegator/export_consultation_results_job_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,8 @@ module Decidim::ActionDelegator

let!(:consultation) { create(:consultation, :finished, :published_results, organization: organization) }
let!(:question) { create(:question, consultation: consultation) }
let!(:response) do
create(
:response,
question: question,
title: { "en" => "A", "ca" => "A", "es" => "A" }
)
end
let!(:other_response) do
create(
:response,
question: question,
title: { "en" => "B", "ca" => "B", "es" => "B" }
)
end
let!(:response) { create(:response, question: question, title: { "ca" => "A" }) }
let!(:other_response) { create(:response, question: question, title: { "ca" => "B" }) }

let!(:other_user) { create(:user, :admin, :confirmed, organization: organization) }
let!(:another_user) { create(:user, :admin, :confirmed, organization: organization) }
Expand Down
1 change: 1 addition & 0 deletions spec/lib/overrides_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ module Decidim::ActionDelegator
"/app/views/decidim/consultations/questions/_vote_modal.html.erb" => "b23948e4ed7e0360a09faef326bc3664",
"/app/views/decidim/consultations/questions/_vote_modal_confirm.html.erb" => "7eb753c457e9a5adc6c16efd155ba434",
"/app/views/decidim/consultations/admin/consultations/results.html.erb" => "1a2f7afd79b20b1fcf66bdece660e8ae",
"/app/views/layouts/decidim/admin/consultation.html.erb" => "7f70f790cf474389f327528136d366a3",

# monkeypatches
"/app/commands/decidim/consultations/vote_question.rb" => "8d89031039a1ba2972437d13687a72b5",
Expand Down
4 changes: 2 additions & 2 deletions spec/serializers/decidim/action_delegator/consultation_results_serializer_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module Decidim::ActionDelegator
let(:result) do
double(
:result,
title: { "en" => "A", "ca" => "A", "es" => "A" },
title: { "ca" => "A" },
membership_type: "consumer",
membership_weight: 2,
votes_count: 2
Expand All @@ -18,7 +18,7 @@ module Decidim::ActionDelegator
describe "#serialize" do
it "includes all attributes" do
expect(subject.serialize).to eq(
title: translated(result.title),
title: "A",
membership_type: "consumer",
votes_count: 2,
membership_weight: 2
Expand Down
28 changes: 14 additions & 14 deletions spec/system/decidim/action_delegator/admin/admin_manages_consultation_results_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,8 @@
let(:total_votes) { I18n.t("decidim.admin.consultations.results.total_votes", count: votes) }

let!(:question) { create(:question, consultation: consultation) }
let!(:response) do
create(
:response,
question: question,
title: { "en" => "A", "ca" => "A", "es" => "A" }
)
end
let!(:other_response) do
create(
:response,
question: question,
title: { "en" => "B", "ca" => "B", "es" => "B" }
)
end
let!(:response) { create(:response, question: question, title: { "ca" => "A" }) }
let!(:other_response) { create(:response, question: question, title: { "ca" => "B" }) }

let!(:other_user) { create(:user, :admin, :confirmed, organization: organization) }
let!(:another_user) { create(:user, :admin, :confirmed, organization: organization) }
Expand All @@ -46,6 +34,18 @@
login_as user, scope: :user
end

context "when in the consultation page" do
let!(:consultation) { create(:consultation, :finished, :published_results, organization: organization) }

before { visit decidim_admin_consultations.edit_consultation_path(consultation) }

it "enables navigating to the results page" do
click_link I18n.t("decidim.admin.menu.consultations_submenu.results")

expect(page).to have_current_path(decidim_admin_action_delegator.results_consultation_path(consultation))
end
end

context "when viewing a finished consultation with votes" do
let!(:consultation) { create(:consultation, :finished, :published_results, organization: organization) }

Expand Down