diff options
| -rw-r--r-- | test/functional/projects_controller_test.rb | 3 | ||||
| -rw-r--r-- | vendor/plugins/acts_as_event/lib/acts_as_event.rb | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb index c23bc17b2..ded7b8b1b 100644 --- a/test/functional/projects_controller_test.rb +++ b/test/functional/projects_controller_test.rb @@ -447,6 +447,9 @@ class ProjectsControllerTest < ActionController::TestCase get :activity, :format => 'atom' assert_response :success assert_template 'common/feed.atom.rxml' + assert_tag :tag => 'entry', :child => { + :tag => 'link', + :attributes => {:href => 'http://test.host/issues/11'}} end def test_archive diff --git a/vendor/plugins/acts_as_event/lib/acts_as_event.rb b/vendor/plugins/acts_as_event/lib/acts_as_event.rb index 364bb8cef..07d1dab96 100644 --- a/vendor/plugins/acts_as_event/lib/acts_as_event.rb +++ b/vendor/plugins/acts_as_event/lib/acts_as_event.rb @@ -66,11 +66,11 @@ module Redmine def event_url(options = {}) option = event_options[:url] if option.is_a?(Proc) - option.call(self) + option.call(self).merge(options) elsif option.is_a?(Hash) option.merge(options) elsif option.is_a?(Symbol) - send(option) + send(option).merge(options) else option end |