consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2431 from consul/fix_milestones_order

Browse Source 
Fix milestones order
This commit is contained in:
BertoCQ
2018-02-05 15:35:00 +01:00
committed by GitHub
parent e1d6d4a8f8 770086779e
commit 4829b97cb6
4 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/budget/investment/milestone.rb
View File

@@ -14,6 +14,9 @@ class Budget
validates :investment, presence: true
validates :publication_date, presence: true
scope :order_by_publication_date, -> { order(publication_date: :asc) }
def self.title_max_length
80
end

2
app/views/admin/budget_investments/_milestones.html.erb
View File

@@ -12,7 +12,7 @@
</tr>
</thead>
<tbody>
<% @investment.milestones.each do |milestone| %>
<% @investment.milestones.order_by_publication_date.each do |milestone| %>
<tr id="<%= dom_id(milestone) %>" class="milestone">
<td class="text-center"><%= milestone.id %></td>
<td>

2
app/views/budgets/investments/_milestones.html.erb
View File

@@ -8,7 +8,7 @@
<% end %>
<section class="timeline">
<ul class="no-bullet">
<% @investment.milestones.each do |milestone| %>
<% @investment.milestones.order_by_publication_date.each do |milestone| %>
<li>
<div class="milestone-content">
<% if milestone.publication_date.present? %>

21
spec/features/budgets/investments_spec.rb
View File

@@ -910,9 +910,14 @@ feature 'Budget Investments' do
scenario "Show milestones", :js do
user = create(:user)
investment = create(:budget_investment)
milestone = create(:budget_investment_milestone, investment: investment, title: "New text to show")
image = create(:image, imageable: milestone)
document = create(:document, documentable: milestone)
create(:budget_investment_milestone, investment: investment,
description: "Last milestone",
publication_date: Date.tomorrow)
first_milestone = create(:budget_investment_milestone, investment: investment,
description: "First milestone",
publication_date: Date.yesterday)
image = create(:image, imageable: first_milestone)
document = create(:document, documentable: first_milestone)
login_as(user)
visit budget_investment_path(budget_id: investment.budget.id, id: investment.id)
@@ -920,10 +925,12 @@ feature 'Budget Investments' do
find("#tab-milestones-label").trigger('click')
within("#tab-milestones") do
expect(page).to have_content(milestone.description)
expect(page).to have_content(Date.current)
expect(page.find("#image_#{milestone.id}")['alt']).to have_content image.title
expect(page).to have_link document.title
expect(first_milestone.description).to appear_before('Last milestone')
expect(page).to have_content(Date.tomorrow)
expect(page).to have_content(Date.yesterday)
expect(page).not_to have_content(Date.current)
expect(page.find("#image_#{first_milestone.id}")['alt']).to have_content(image.title)
expect(page).to have_link(document.title)
end
end