diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-07-07 05:23:52 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-07-07 05:23:52 +0000 |
| commit | 5981aee06de058dcbb4ffc0a898c80aea6835f2a (patch) | |
| tree | a6047059a1a2a959c7df710f8b22551f2f18846e /test/functional/issues_controller_transaction_test.rb | |
| parent | 232edc62372730de6045e958821c16dee14ac65f (diff) | |
| download | redmine-5981aee06de058dcbb4ffc0a898c80aea6835f2a.tar.gz redmine-5981aee06de058dcbb4ffc0a898c80aea6835f2a.zip | |
Fixed: escaped link in conflict resolution form (#11341).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9925 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/functional/issues_controller_transaction_test.rb')
| -rw-r--r-- | test/functional/issues_controller_transaction_test.rb | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/test/functional/issues_controller_transaction_test.rb b/test/functional/issues_controller_transaction_test.rb index 966953160..84f9adc91 100644 --- a/test/functional/issues_controller_transaction_test.rb +++ b/test/functional/issues_controller_transaction_test.rb @@ -71,10 +71,14 @@ class IssuesControllerTransactionTest < ActionController::TestCase assert_response :success assert_template 'edit' - assert_tag 'div', :attributes => {:class => 'conflict'} - assert_tag 'input', :attributes => {:name => 'conflict_resolution', :value => 'overwrite'} - assert_tag 'input', :attributes => {:name => 'conflict_resolution', :value => 'add_notes'} - assert_tag 'input', :attributes => {:name => 'conflict_resolution', :value => 'cancel'} + + assert_select 'div.conflict' + assert_select 'input[name=?][value=?]', 'conflict_resolution', 'overwrite' + assert_select 'input[name=?][value=?]', 'conflict_resolution', 'add_notes' + assert_select 'label' do + assert_select 'input[name=?][value=?]', 'conflict_resolution', 'cancel' + assert_select 'a[href=/issues/2]' + end end def test_update_stale_issue_should_save_attachments |