moved duplicated code to helper
This commit is contained in:
@@ -1,5 +1,12 @@
|
||||
module BudgetsHelper
|
||||
|
||||
def heading_name_and_price_html(heading, budget)
|
||||
content_tag :div do
|
||||
concat(heading.name + ' ')
|
||||
concat(content_tag(:span, budget.formatted_heading_price(heading)))
|
||||
end
|
||||
end
|
||||
|
||||
def csv_params
|
||||
csv_params = params.clone.merge(format: :csv).symbolize_keys
|
||||
csv_params.delete(:page)
|
||||
|
||||
@@ -69,13 +69,11 @@
|
||||
<li class="heading small-12 medium-4 large-2">
|
||||
<% unless @budget.informing? %>
|
||||
<%= link_to budget_investments_path(@budget.id, heading_id: heading.id) do %>
|
||||
<%= heading.name %>
|
||||
<span><%= @budget.formatted_heading_price(heading) %></span>
|
||||
<%= heading_name_and_price_html(heading, @budget) %>
|
||||
<% end %>
|
||||
<% else %>
|
||||
<div>
|
||||
<%= heading.name %>
|
||||
<span><%= @budget.formatted_heading_price(heading) %></span>
|
||||
<%= heading_name_and_price_html(heading, @budget) %>
|
||||
</div>
|
||||
<% end %>
|
||||
</li>
|
||||
|
||||
@@ -30,7 +30,7 @@ en:
|
||||
unselected: See investments not selected for balloting phase
|
||||
phase:
|
||||
drafting: Draft (Not visible to the public)
|
||||
informing: Informating
|
||||
informing: Informing
|
||||
accepting: Accepting projects
|
||||
reviewing: Reviewing projects
|
||||
selecting: Selecting projects
|
||||
|
||||
@@ -16,22 +16,26 @@ feature 'Budgets' do
|
||||
heading1 = create(:budget_heading, group: group1)
|
||||
heading2 = create(:budget_heading, group: group2)
|
||||
|
||||
last_budget.update_attributes(phase: 'informing')
|
||||
|
||||
visit budgets_path
|
||||
|
||||
|
||||
within("#budget_heading") do
|
||||
expect(page).to have_content(last_budget.name)
|
||||
expect(page).to have_content(last_budget.description)
|
||||
expect(page).to have_content("Actual phase (2/9)")
|
||||
expect(page).to have_content("Accepting projects")
|
||||
expect(page).to have_content(I18n.t('budgets.phase.informing'))
|
||||
expect(page).to have_link 'Help about participatory budgets'
|
||||
expect(page).to have_link 'See all phases'
|
||||
end
|
||||
|
||||
expect(page).to have_content("Accepting projects")
|
||||
|
||||
last_budget.update_attributes(phase: 'publishing_prices')
|
||||
visit budgets_path
|
||||
|
||||
within("#budget_heading") do
|
||||
expect(page).to have_content("Actual phase (6/9)")
|
||||
expect(page).to have_content(I18n.t('budgets.phase.publishing_prices'))
|
||||
end
|
||||
|
||||
within('#budget_info') do
|
||||
|
||||
Reference in New Issue
Block a user