From 4506524ea5eb0b51e253fc7f6702907d04da79d9 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Wed, 6 Mar 2024 14:09:21 +0000 Subject: [PATCH] Revert r22764 (#33829). It breaks activities_controller_test.rb. git-svn-id: https://svn.redmine.org/redmine/trunk@22770 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/issue.rb | 1 - test/functional/issues_controller_test.rb | 10 ---------- 2 files changed, 11 deletions(-) diff --git a/app/models/issue.rb b/app/models/issue.rb index b6d0b6a74..ad4728444 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -48,7 +48,6 @@ class Issue < ApplicationRecord :scope => lambda {|options| options[:open_issues] ? self.open : self.all} acts_as_event :title => Proc.new {|o| "#{o.tracker.name} ##{o.id} (#{o.status}): #{o.subject}"}, - :datetime => Proc.new {|o| o.updated_on}, :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.id}}, :type => Proc.new {|o| 'issue' + (o.closed? ? '-closed' : '')} diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index 00661827e..cce8ddc62 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -1246,16 +1246,6 @@ class IssuesControllerTest < Redmine::ControllerTest assert_select 'link[rel=self][href=?]', 'http://test.host/projects/ecookbook/issues.atom' assert_select 'link[rel=alternate][href=?]', 'http://test.host/projects/ecookbook/issues' assert_select 'entry link[href=?]', 'http://test.host/issues/1' - - assert_select 'entry' do |entries| - entries.each do |entry| - issue_id = entry.at('id').text.split('/').last.to_i - issue = Issue.find(issue_id) - formatted_updated_on = issue.updated_on.utc.iso8601 - # element should use the value of `Issue#updated_on` - assert_select entry, 'updated', text: formatted_updated_on - end - end end end -- 2.39.5