| @@ -447,6 +447,9 class ProjectsControllerTest < ActionController::TestCase | |||||
| 447 | get :activity, :format => 'atom' |
|
447 | get :activity, :format => 'atom' | |
| 448 | assert_response :success |
|
448 | assert_response :success | |
| 449 | assert_template 'common/feed.atom.rxml' |
|
449 | assert_template 'common/feed.atom.rxml' | |
|
|
450 | assert_tag :tag => 'entry', :child => { | |||
|
|
451 | :tag => 'link', | |||
|
|
452 | :attributes => {:href => 'http://test.host/issues/11'}} | |||
| 450 | end |
|
453 | end | |
| 451 |
|
454 | |||
| 452 | def test_archive |
|
455 | def test_archive | |
| @@ -66,11 +66,11 module Redmine | |||||
| 66 | def event_url(options = {}) |
|
66 | def event_url(options = {}) | |
| 67 | option = event_options[:url] |
|
67 | option = event_options[:url] | |
| 68 | if option.is_a?(Proc) |
|
68 | if option.is_a?(Proc) | |
| 69 | option.call(self) |
|
69 | option.call(self).merge(options) | |
| 70 | elsif option.is_a?(Hash) |
|
70 | elsif option.is_a?(Hash) | |
| 71 | option.merge(options) |
|
71 | option.merge(options) | |
| 72 | elsif option.is_a?(Symbol) |
|
72 | elsif option.is_a?(Symbol) | |
| 73 | send(option) |
|
73 | send(option).merge(options) | |
| 74 | else |
|
74 | else | |
| 75 | option |
|
75 | option | |
| 76 | end |
|
76 | end | |
General Comments 0
You need to be logged in to leave comments.
Login now