| @@ -21,6 +21,6 | |||||
| 21 | <% if @notes.present? %> |
|
21 | <% if @notes.present? %> | |
| 22 | <label><%= radio_button_tag 'conflict_resolution', 'add_notes' %> <%= l(:text_issue_conflict_resolution_add_notes) %></label><br /> |
|
22 | <label><%= radio_button_tag 'conflict_resolution', 'add_notes' %> <%= l(:text_issue_conflict_resolution_add_notes) %></label><br /> | |
| 23 | <% end %> |
|
23 | <% end %> | |
| 24 | <label><%= radio_button_tag 'conflict_resolution', 'cancel' %> <%= l(:text_issue_conflict_resolution_cancel, :link => link_to_issue(@issue, :subject => false)) %></label> |
|
24 | <label><%= radio_button_tag 'conflict_resolution', 'cancel' %> <%= l(:text_issue_conflict_resolution_cancel, :link => link_to_issue(@issue, :subject => false)).html_safe %></label> | |
| 25 | </p> |
|
25 | </p> | |
| 26 | <p><%= submit_tag l(:button_submit) %></p> |
|
26 | <p><%= submit_tag l(:button_submit) %></p> | |
| @@ -71,10 +71,14 class IssuesControllerTransactionTest < ActionController::TestCase | |||||
| 71 |
|
71 | |||
| 72 | assert_response :success |
|
72 | assert_response :success | |
| 73 | assert_template 'edit' |
|
73 | assert_template 'edit' | |
| 74 | assert_tag 'div', :attributes => {:class => 'conflict'} |
|
74 | ||
| 75 | assert_tag 'input', :attributes => {:name => 'conflict_resolution', :value => 'overwrite'} |
|
75 | assert_select 'div.conflict' | |
| 76 |
assert_t |
|
76 | assert_select 'input[name=?][value=?]', 'conflict_resolution', 'overwrite' | |
| 77 |
assert_t |
|
77 | assert_select 'input[name=?][value=?]', 'conflict_resolution', 'add_notes' | |
|
|
78 | assert_select 'label' do | |||
|
|
79 | assert_select 'input[name=?][value=?]', 'conflict_resolution', 'cancel' | |||
|
|
80 | assert_select 'a[href=/issues/2]' | |||
|
|
81 | end | |||
| 78 | end |
|
82 | end | |
| 79 |
|
83 | |||
| 80 | def test_update_stale_issue_should_save_attachments |
|
84 | def test_update_stale_issue_should_save_attachments | |
General Comments 0
You need to be logged in to leave comments.
Login now