dinislage/redmine_contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#4178] Fixed some more tests from the UI changes.

Browse Source
This commit is contained in:
Eric Davis
2010-08-09 12:47:45 -07:00
parent cb8fd95f29
commit 61270c60d5
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/helpers/contracts_helper.rb
+6 -4
View File
@@ -6,12 +6,14 @@ module ContractsHelper
end
end
def format_budget_for_deliverable(deliverable, spent, total)
def format_budget_for_deliverable(deliverable, spent, total, options={})
extra_css_class = options[:class] || ''
if total > 0 || spent > 0
content_tag(:td, h(number_to_currency(spent, :unit => '')), :class => 'spent-amount') +
content_tag(:td, h(number_to_currency(total, :unit => '')), :class => 'total-amount white')
content_tag(:td, h(number_to_currency(spent, :unit => '')), :class => 'spent-amount ' + extra_css_class) +
content_tag(:td, h(number_to_currency(total, :unit => '')), :class => 'total-amount white ' + extra_css_class)
else
content_tag(:td, '----', :colspan => '2', :class => 'no-value')
content_tag(:td, '----', :colspan => '2', :class => 'no-value ' + extra_css_class)
end
end
app/views/contracts/show.html.erb
+2 -2
View File
@@ -102,8 +102,8 @@
<td width="25%" class="title"><%= h deliverable.title %></td>
<td width="15%">TODO: Release 5</td>
<td width="15%" class="manager"><%= h deliverable.manager.try(:name) %></td>
<%= format_budget_for_deliverable(deliverable, deliverable.labor_budget_spent, deliverable.labor_budget_total) %>
<%= format_budget_for_deliverable(deliverable, deliverable.overhead_spent, deliverable.overhead_budget_total) %>
<%= format_budget_for_deliverable(deliverable, deliverable.labor_budget_spent, deliverable.labor_budget_total, :class => 'labor') %>
<%= format_budget_for_deliverable(deliverable, deliverable.overhead_spent, deliverable.overhead_budget_total, :class => 'overhead') %>
<%= format_budget_for_deliverable(deliverable, 0, 0) %><%# TODO: Release 2, Fixed Budgets %>
<% end %>
test/integration/deliverables_edit_test.rb
+1 -1
View File
@@ -45,7 +45,7 @@ class DeliverablesEditTest < ActionController::IntegrationTest
should "allow any user to edit the Hourly deliverable" do
visit_contract_page(@contract)
click_link_within "#hourly_deliverable_#{@hourly_deliverable.id}", 'Edit'
click_link_within "#deliverable_details_#{@hourly_deliverable.id}", 'Edit'
assert_response :success
assert_template 'deliverables/edit'