From b5f06e06c14f440d3c014b348149fe9ec1b67657 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 1 Mar 2022 22:55:10 +0000 Subject: [PATCH] Fix rubocop Rails/TimeZone warnings --- .rubocop_todo.yml | 7 ------- app/controllers/api/changesets_controller.rb | 8 ++++---- app/controllers/api/notes_controller.rb | 8 ++++---- app/controllers/api/traces_controller.rb | 2 +- app/controllers/friendships_controller.rb | 2 +- app/controllers/messages_controller.rb | 4 ++-- app/controllers/traces_controller.rb | 4 ++-- app/controllers/user_blocks_controller.rb | 6 +++--- app/controllers/users_controller.rb | 8 ++++---- app/helpers/changesets_helper.rb | 2 +- app/helpers/user_blocks_helper.rb | 2 +- app/models/access_token.rb | 2 +- app/models/changeset.rb | 8 ++++---- app/models/issue.rb | 2 +- app/models/node.rb | 2 +- app/models/note.rb | 2 +- app/models/oauth2_verifier.rb | 2 +- app/models/oauth_token.rb | 2 +- app/models/relation.rb | 2 +- app/models/request_token.rb | 2 +- app/models/user_block.rb | 6 +++--- app/models/user_token.rb | 2 +- app/models/way.rb | 2 +- lib/gpx.rb | 2 +- script/statistics | 4 ++-- script/update-spam-blocks | 2 +- .../api/changeset_comments_controller_test.rb | 4 ++-- test/controllers/api/changesets_controller_test.rb | 2 +- test/controllers/api/notes_controller_test.rb | 10 +++++----- test/controllers/browse_controller_test.rb | 2 +- test/controllers/messages_controller_test.rb | 2 +- test/controllers/user_blocks_controller_test.rb | 12 ++++++------ test/factories/messages.rb | 2 +- test/factories/node.rb | 2 +- test/factories/old_node.rb | 2 +- test/factories/old_relation.rb | 2 +- test/factories/old_way.rb | 2 +- test/factories/relation.rb | 2 +- test/factories/tracepoints.rb | 2 +- test/factories/traces.rb | 2 +- test/factories/user.rb | 2 +- test/factories/user_blocks.rb | 4 ++-- test/factories/way.rb | 2 +- test/helpers/application_helper_test.rb | 10 +++++----- test/helpers/user_blocks_helper_test.rb | 6 +++--- test/integration/user_blocks_test.rb | 4 ++-- test/models/message_test.rb | 10 +++++----- test/models/note_test.rb | 4 ++-- 48 files changed, 89 insertions(+), 96 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 0cdd004a0..779b3a8fa 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -183,13 +183,6 @@ Rails/OutputSafety: - 'lib/rich_text.rb' - 'test/helpers/application_helper_test.rb' -# Offense count: 90 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle. -# SupportedStyles: strict, flexible -Rails/TimeZone: - Enabled: false - # Offense count: 6 # Cop supports --auto-correct. Rake/Desc: diff --git a/app/controllers/api/changesets_controller.rb b/app/controllers/api/changesets_controller.rb index 63fda31bd..df27ab5ca 100644 --- a/app/controllers/api/changesets_controller.rb +++ b/app/controllers/api/changesets_controller.rb @@ -307,11 +307,11 @@ module Api times = time.split(",") raise OSM::APIBadUserInput, "bad time range" if times.size != 2 - from, to = times.collect { |t| Time.parse(t) } + from, to = times.collect { |t| Time.parse(t).utc } changesets.where("closed_at >= ? and created_at <= ?", from, to) else # if there is no comma, assume its a lower limit on time - changesets.where("closed_at >= ?", Time.parse(time)) + changesets.where("closed_at >= ?", Time.parse(time).utc) end # stupid Time seems to throw both of these for bad parsing, so # we have to catch both and ensure the correct code path is taken. @@ -329,7 +329,7 @@ module Api changesets else changesets.where("closed_at >= ? and num_changes <= ?", - Time.now.getutc, Changeset::MAX_ELEMENTS) + Time.now.utc, Changeset::MAX_ELEMENTS) end end @@ -341,7 +341,7 @@ module Api changesets else changesets.where("closed_at < ? or num_changes > ?", - Time.now.getutc, Changeset::MAX_ELEMENTS) + Time.now.utc, Changeset::MAX_ELEMENTS) end end diff --git a/app/controllers/api/notes_controller.rb b/app/controllers/api/notes_controller.rb index f480b9706..8a41d5db8 100644 --- a/app/controllers/api/notes_controller.rb +++ b/app/controllers/api/notes_controller.rb @@ -277,16 +277,16 @@ module Api # Add any date filter if params[:from] begin - from = Time.parse(params[:from]) + from = Time.parse(params[:from]).utc rescue ArgumentError raise OSM::APIBadUserInput, "Date #{params[:from]} is in a wrong format" end begin to = if params[:to] - Time.parse(params[:to]) + Time.parse(params[:to]).utc else - Time.now + Time.now.utc end rescue ArgumentError raise OSM::APIBadUserInput, "Date #{params[:to]} is in a wrong format" @@ -361,7 +361,7 @@ module Api elsif closed_since.positive? notes.where(:status => "open") .or(notes.where(:status => "closed") - .where(notes.arel_table[:closed_at].gt(Time.now - closed_since.days))) + .where(notes.arel_table[:closed_at].gt(Time.now.utc - closed_since.days))) else notes.where(:status => "open") end diff --git a/app/controllers/api/traces_controller.rb b/app/controllers/api/traces_controller.rb index aa8a06000..6a0ec81ec 100644 --- a/app/controllers/api/traces_controller.rb +++ b/app/controllers/api/traces_controller.rb @@ -108,7 +108,7 @@ module Api :visibility => visibility, :inserted => false, :user => current_user, - :timestamp => Time.now.getutc, + :timestamp => Time.now.utc, :file => file ) diff --git a/app/controllers/friendships_controller.rb b/app/controllers/friendships_controller.rb index 93dffb4a3..a08ce0b69 100644 --- a/app/controllers/friendships_controller.rb +++ b/app/controllers/friendships_controller.rb @@ -19,7 +19,7 @@ class FriendshipsController < ApplicationController friendship.befriendee = @new_friend if current_user.is_friends_with?(@new_friend) flash[:warning] = t "friendships.make_friend.already_a_friend", :name => @new_friend.display_name - elsif current_user.friendships.where("created_at >= ?", Time.now.getutc - 1.hour).count >= current_user.max_friends_per_hour + elsif current_user.friendships.where("created_at >= ?", Time.now.utc - 1.hour).count >= current_user.max_friends_per_hour flash.now[:error] = t "friendships.make_friend.limit_exceeded" elsif friendship.save flash[:notice] = t "friendships.make_friend.success", :name => @new_friend.display_name diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index a95e2e587..e801915d6 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -24,9 +24,9 @@ class MessagesController < ApplicationController @message = Message.new(message_params) @message.recipient = @user @message.sender = current_user - @message.sent_on = Time.now.getutc + @message.sent_on = Time.now.utc - if current_user.sent_messages.where("sent_on >= ?", Time.now.getutc - 1.hour).count >= current_user.max_messages_per_hour + if current_user.sent_messages.where("sent_on >= ?", Time.now.utc - 1.hour).count >= current_user.max_messages_per_hour flash.now[:error] = t ".limit_exceeded" render :action => "new" elsif @message.save diff --git a/app/controllers/traces_controller.rb b/app/controllers/traces_controller.rb index a9dbc8539..741819f65 100644 --- a/app/controllers/traces_controller.rb +++ b/app/controllers/traces_controller.rb @@ -119,7 +119,7 @@ class TracesController < ApplicationController :description => params[:trace][:description], :visibility => params[:trace][:visibility], :inserted => false, :user => current_user, - :timestamp => Time.now.getutc) + :timestamp => Time.now.utc) @trace.valid? @trace.errors.add(:gpx_file, "can't be blank") @@ -266,7 +266,7 @@ class TracesController < ApplicationController :visibility => visibility, :inserted => false, :user => current_user, - :timestamp => Time.now.getutc, + :timestamp => Time.now.utc, :file => file ) diff --git a/app/controllers/user_blocks_controller.rb b/app/controllers/user_blocks_controller.rb index 63fca6557..63ebdad71 100644 --- a/app/controllers/user_blocks_controller.rb +++ b/app/controllers/user_blocks_controller.rb @@ -32,7 +32,7 @@ class UserBlocksController < ApplicationController end def edit - params[:user_block_period] = ((@user_block.ends_at - Time.now.getutc) / 1.hour).ceil.to_s + params[:user_block_period] = ((@user_block.ends_at - Time.now.utc) / 1.hour).ceil.to_s end def create @@ -41,7 +41,7 @@ class UserBlocksController < ApplicationController :user => @user, :creator => current_user, :reason => params[:user_block][:reason], - :ends_at => Time.now.getutc + @block_period.hours, + :ends_at => Time.now.utc + @block_period.hours, :needs_view => params[:user_block][:needs_view] ) @@ -62,7 +62,7 @@ class UserBlocksController < ApplicationController flash[:error] = t(".only_creator_can_edit") redirect_to :action => "edit" elsif @user_block.update( - :ends_at => Time.now.getutc + @block_period.hours, + :ends_at => Time.now.utc + @block_period.hours, :reason => params[:user_block][:reason], :needs_view => params[:user_block][:needs_view] ) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 39a191d84..3489b4eda 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -55,8 +55,8 @@ class UsersController < ApplicationController elsif current_user unless current_user.terms_agreed? current_user.consider_pd = params[:user][:consider_pd] - current_user.tou_agreed = Time.now.getutc - current_user.terms_agreed = Time.now.getutc + current_user.tou_agreed = Time.now.utc + current_user.terms_agreed = Time.now.utc current_user.terms_seen = true flash[:notice] = t "users.new.terms accepted" if current_user.save @@ -73,8 +73,8 @@ class UsersController < ApplicationController current_user.description = "" if current_user.description.nil? current_user.creation_ip = request.remote_ip current_user.languages = http_accept_language.user_preferred_languages - current_user.terms_agreed = Time.now.getutc - current_user.tou_agreed = Time.now.getutc + current_user.terms_agreed = Time.now.utc + current_user.tou_agreed = Time.now.utc current_user.terms_seen = true if current_user.auth_uid.blank? diff --git a/app/helpers/changesets_helper.rb b/app/helpers/changesets_helper.rb index 4c0236b6b..5773240ff 100644 --- a/app/helpers/changesets_helper.rb +++ b/app/helpers/changesets_helper.rb @@ -10,7 +10,7 @@ module ChangesetsHelper end def changeset_details(changeset) - if changeset.closed_at > Time.now + if changeset.closed_at > Time.now.utc action = :created time = time_ago_in_words(changeset.created_at, :scope => :"datetime.distance_in_words_ago") title = l(changeset.created_at) diff --git a/app/helpers/user_blocks_helper.rb b/app/helpers/user_blocks_helper.rb index 95b6cb600..3a55e1cde 100644 --- a/app/helpers/user_blocks_helper.rb +++ b/app/helpers/user_blocks_helper.rb @@ -8,7 +8,7 @@ module UserBlocksHelper if block.active? # if the block hasn't expired yet show the date, if the user just needs to login show that if block.needs_view? - if block.ends_at > Time.now.getutc + if block.ends_at > Time.now.utc t("user_blocks.helper.time_future_and_until_login_html", :time => friendly_date(block.ends_at)) else t("user_blocks.helper.until_login") diff --git a/app/models/access_token.rb b/app/models/access_token.rb index 53590a594..d2c0dba1c 100644 --- a/app/models/access_token.rb +++ b/app/models/access_token.rb @@ -52,6 +52,6 @@ class AccessToken < OauthToken protected def set_authorized_at - self.authorized_at = Time.now + self.authorized_at = Time.now.utc end end diff --git a/app/models/changeset.rb b/app/models/changeset.rb index 9ed22ee94..2659eaeea 100644 --- a/app/models/changeset.rb +++ b/app/models/changeset.rb @@ -71,11 +71,11 @@ class Changeset < ApplicationRecord # note that this may not be a hard limit - due to timing changes and # concurrency it is possible that some changesets may be slightly # longer than strictly allowed or have slightly more changes in them. - ((closed_at > Time.now.getutc) && (num_changes <= MAX_ELEMENTS)) + ((closed_at > Time.now.utc) && (num_changes <= MAX_ELEMENTS)) end def set_closed_time_now - self.closed_at = Time.now.getutc if is_open? + self.closed_at = Time.now.utc if is_open? end def self.from_xml(xml, create: false) @@ -95,7 +95,7 @@ class Changeset < ApplicationRecord def self.from_xml_node(pt, create: false) cs = Changeset.new if create - cs.created_at = Time.now.getutc + cs.created_at = Time.now.utc # initial close time is 1h ahead, but will be increased on each # modification. cs.closed_at = cs.created_at + IDLE_TIMEOUT @@ -191,7 +191,7 @@ class Changeset < ApplicationRecord self.closed_at = if (closed_at - created_at) > (MAX_TIME_OPEN - IDLE_TIMEOUT) created_at + MAX_TIME_OPEN else - Time.now.getutc + IDLE_TIMEOUT + Time.now.utc + IDLE_TIMEOUT end end end diff --git a/app/models/issue.rb b/app/models/issue.rb index 207af63c4..54947be30 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -70,7 +70,7 @@ class Issue < ApplicationRecord event :resolve do transitions :from => :open, :to => :resolved after do - self.resolved_at = Time.now.getutc + self.resolved_at = Time.now.utc end end diff --git a/app/models/node.rb b/app/models/node.rb index 2ae62d684..c2443974d 100644 --- a/app/models/node.rb +++ b/app/models/node.rb @@ -236,7 +236,7 @@ class Node < ApplicationRecord private def save_with_history! - t = Time.now.getutc + t = Time.now.utc self.version += 1 self.timestamp = t diff --git a/app/models/note.rb b/app/models/note.rb index ea88599a4..aeea0de0d 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -45,7 +45,7 @@ class Note < ApplicationRecord # Close a note def close self.status = "closed" - self.closed_at = Time.now.getutc + self.closed_at = Time.now.utc save end diff --git a/app/models/oauth2_verifier.rb b/app/models/oauth2_verifier.rb index 3eca1038c..1613eabeb 100644 --- a/app/models/oauth2_verifier.rb +++ b/app/models/oauth2_verifier.rb @@ -67,6 +67,6 @@ class Oauth2Verifier < OauthToken def generate_keys self.token = OAuth::Helper.generate_key(20)[0, 20] self.expires_at = 10.minutes.from_now - self.authorized_at = Time.now + self.authorized_at = Time.now.utc end end diff --git a/app/models/oauth_token.rb b/app/models/oauth_token.rb index b4519efe2..ae15dc658 100644 --- a/app/models/oauth_token.rb +++ b/app/models/oauth_token.rb @@ -52,7 +52,7 @@ class OauthToken < ApplicationRecord end def invalidate! - update(:invalidated_at => Time.now) + update(:invalidated_at => Time.now.utc) end def authorized? diff --git a/app/models/relation.rb b/app/models/relation.rb index 0adf1012d..021082eda 100644 --- a/app/models/relation.rb +++ b/app/models/relation.rb @@ -263,7 +263,7 @@ class Relation < ApplicationRecord private def save_with_history! - t = Time.now.getutc + t = Time.now.utc self.version += 1 self.timestamp = t diff --git a/app/models/request_token.rb b/app/models/request_token.rb index f7c9501b5..adeabb184 100644 --- a/app/models/request_token.rb +++ b/app/models/request_token.rb @@ -42,7 +42,7 @@ class RequestToken < OauthToken return false if authorized? self.user = user - self.authorized_at = Time.now + self.authorized_at = Time.now.utc self.verifier = OAuth::Helper.generate_key(20)[0, 20] unless oauth10? save end diff --git a/app/models/user_block.rb b/app/models/user_block.rb index 46a8c282b..7af1f9bdc 100644 --- a/app/models/user_block.rb +++ b/app/models/user_block.rb @@ -37,7 +37,7 @@ class UserBlock < ApplicationRecord ## # scope to match active blocks def self.active - where("needs_view or ends_at > ?", Time.now.getutc) + where("needs_view or ends_at > ?", Time.now.utc) end ## @@ -50,7 +50,7 @@ class UserBlock < ApplicationRecord # returns true if the block is currently active (i.e: the user can't # use the API). def active? - needs_view || ends_at > Time.now.getutc + needs_view || ends_at > Time.now.utc end ## @@ -65,7 +65,7 @@ class UserBlock < ApplicationRecord # is the user object who is revoking the ban. def revoke!(revoker) update( - :ends_at => Time.now.getutc, + :ends_at => Time.now.utc, :revoker_id => revoker.id, :needs_view => false ) diff --git a/app/models/user_token.rb b/app/models/user_token.rb index 8c9bf4aeb..f927563a9 100644 --- a/app/models/user_token.rb +++ b/app/models/user_token.rb @@ -24,7 +24,7 @@ class UserToken < ApplicationRecord after_initialize :set_defaults def expired? - expiry < Time.now + expiry < Time.now.utc end private diff --git a/app/models/way.rb b/app/models/way.rb index 767289d58..08dc5ed30 100644 --- a/app/models/way.rb +++ b/app/models/way.rb @@ -227,7 +227,7 @@ class Way < ApplicationRecord private def save_with_history! - t = Time.now.getutc + t = Time.now.utc self.version += 1 self.timestamp = t diff --git a/lib/gpx.rb b/lib/gpx.rb index 3dc448e46..274ece7d9 100644 --- a/lib/gpx.rb +++ b/lib/gpx.rb @@ -22,7 +22,7 @@ module GPX elsif reader.name == "ele" && point point.altitude = reader.read_string.to_f elsif reader.name == "time" && point - point.timestamp = Time.parse(reader.read_string) + point.timestamp = Time.parse(reader.read_string).utc end when XML::Reader::TYPE_END_ELEMENT if reader.name == "trkpt" && point && point.valid? diff --git a/script/statistics b/script/statistics index ffc672b0b..05ed637a8 100755 --- a/script/statistics +++ b/script/statistics @@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), "..", "config", "environment") -start_time = Time.now +start_time = Time.now.utc puts "" puts "" @@ -87,7 +87,7 @@ rescue StandardError => e puts "

Exception: #{e}
#{e.backtrace.join('
')}

" end -puts "

Report took #{Time.new - start_time} seconds to run

" +puts "

Report took #{Time.now.utc - start_time} seconds to run

" puts "" puts "" diff --git a/script/update-spam-blocks b/script/update-spam-blocks index 40f2cb03c..b5656f6ac 100755 --- a/script/update-spam-blocks +++ b/script/update-spam-blocks @@ -6,7 +6,7 @@ require "generator" addresses = User.count( :conditions => { :status => %w[suspended deleted], - :creation_time => Time.now - 28.days..Time.now + :creation_time => Time.now.utc - 28.days..Time.now.utc }, :group => :creation_ip ) diff --git a/test/controllers/api/changeset_comments_controller_test.rb b/test/controllers/api/changeset_comments_controller_test.rb index 64871baa3..ce7c08a65 100644 --- a/test/controllers/api/changeset_comments_controller_test.rb +++ b/test/controllers/api/changeset_comments_controller_test.rb @@ -214,7 +214,7 @@ module Api assert_response :forbidden # Try again, after agreement with the terms - user.terms_agreed = Time.now + user.terms_agreed = Time.now.utc user.save! assert_difference "ChangesetComment.count", 1 do @@ -237,7 +237,7 @@ module Api assert_response :forbidden # Try again, after agreement with the terms - user.terms_agreed = Time.now + user.terms_agreed = Time.now.utc user.save! assert_difference "ChangesetComment.count", 1 do diff --git a/test/controllers/api/changesets_controller_test.rb b/test/controllers/api/changesets_controller_test.rb index f3de0682b..e61831fbd 100644 --- a/test/controllers/api/changesets_controller_test.rb +++ b/test/controllers/api/changesets_controller_test.rb @@ -206,7 +206,7 @@ module Api # test that it really is closed now cs = Changeset.find(changeset.id) assert_not(cs.is_open?, - "changeset should be closed now (#{cs.closed_at} > #{Time.now.getutc}.") + "changeset should be closed now (#{cs.closed_at} > #{Time.now.utc}.") end ## diff --git a/test/controllers/api/notes_controller_test.rb b/test/controllers/api/notes_controller_test.rb index fe9127029..7dbcdc816 100644 --- a/test/controllers/api/notes_controller_test.rb +++ b/test/controllers/api/notes_controller_test.rb @@ -345,7 +345,7 @@ module Api end assert_response :gone - closed_note_with_comment = create(:note_with_comments, :status => "closed", :closed_at => Time.now) + closed_note_with_comment = create(:note_with_comments, :status => "closed", :closed_at => Time.now.utc) assert_no_difference "NoteComment.count" do post comment_note_path(:id => closed_note_with_comment, :text => "This is an additional comment"), :headers => auth_header @@ -406,14 +406,14 @@ module Api post close_note_path(:id => hidden_note_with_comment), :headers => auth_header assert_response :gone - closed_note_with_comment = create(:note_with_comments, :status => "closed", :closed_at => Time.now) + closed_note_with_comment = create(:note_with_comments, :status => "closed", :closed_at => Time.now.utc) post close_note_path(:id => closed_note_with_comment), :headers => auth_header assert_response :conflict end def test_reopen_success - closed_note_with_comment = create(:note_with_comments, :status => "closed", :closed_at => Time.now) + closed_note_with_comment = create(:note_with_comments, :status => "closed", :closed_at => Time.now.utc) user = create(:user) post reopen_note_path(:id => closed_note_with_comment, :text => "This is a reopen comment", :format => "json") @@ -748,8 +748,8 @@ module Api end def test_index_closed - create(:note_with_comments, :status => "closed", :closed_at => Time.now - 5.days) - create(:note_with_comments, :status => "closed", :closed_at => Time.now - 100.days) + create(:note_with_comments, :status => "closed", :closed_at => Time.now.utc - 5.days) + create(:note_with_comments, :status => "closed", :closed_at => Time.now.utc - 100.days) create(:note_with_comments, :status => "hidden") create(:note_with_comments) diff --git a/test/controllers/browse_controller_test.rb b/test/controllers/browse_controller_test.rb index 9a77e8034..7ad16dcd9 100644 --- a/test/controllers/browse_controller_test.rb +++ b/test/controllers/browse_controller_test.rb @@ -153,7 +153,7 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest def test_read_closed_note user = create(:user) - closed_note = create(:note_with_comments, :status => "closed", :closed_at => Time.now, :comments_count => 2) do |note| + closed_note = create(:note_with_comments, :status => "closed", :closed_at => Time.now.utc, :comments_count => 2) do |note| create(:note_comment, :event => "closed", :note => note, :author => user) end diff --git a/test/controllers/messages_controller_test.rb b/test/controllers/messages_controller_test.rb index c3d764578..1193d3b25 100644 --- a/test/controllers/messages_controller_test.rb +++ b/test/controllers/messages_controller_test.rb @@ -191,7 +191,7 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest m = Message.last assert_equal user.id, m.from_user_id assert_equal recipient_user.id, m.to_user_id - assert_in_delta Time.now, m.sent_on, 2 + assert_in_delta Time.now.utc, m.sent_on, 2 assert_equal "Test Message", m.title assert_equal "Test message body", m.body assert_equal "markdown", m.body_format diff --git a/test/controllers/user_blocks_controller_test.rb b/test/controllers/user_blocks_controller_test.rb index 3e2be801d..16a77624c 100644 --- a/test/controllers/user_blocks_controller_test.rb +++ b/test/controllers/user_blocks_controller_test.rb @@ -240,9 +240,9 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest assert_redirected_to user_block_path(:id => id) assert_equal "Created a block on user #{target_user.display_name}.", flash[:notice] b = UserBlock.find(id) - assert_in_delta Time.now, b.created_at, 1 - assert_in_delta Time.now, b.updated_at, 1 - assert_in_delta Time.now + 12.hours, b.ends_at, 1 + assert_in_delta Time.now.utc, b.created_at, 1 + assert_in_delta Time.now.utc, b.updated_at, 1 + assert_in_delta Time.now.utc + 12.hours, b.ends_at, 1 assert_not b.needs_view assert_equal "Vandalism", b.reason assert_equal "markdown", b.reason_format @@ -311,7 +311,7 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest assert_redirected_to user_block_path(active_block) assert_equal "Block updated.", flash[:notice] b = UserBlock.find(active_block.id) - assert_in_delta Time.now, b.updated_at, 1 + assert_in_delta Time.now.utc, b.updated_at, 1 assert b.needs_view assert_equal "Vandalism", b.reason @@ -356,13 +356,13 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest assert_response :success assert_template "revoke" b = UserBlock.find(active_block.id) - assert b.ends_at - Time.now > 100 + assert b.ends_at - Time.now.utc > 100 # Check that revoking a block works using POST post revoke_user_block_path(:id => active_block, :confirm => true) assert_redirected_to user_block_path(active_block) b = UserBlock.find(active_block.id) - assert_in_delta Time.now, b.ends_at, 1 + assert_in_delta Time.now.utc, b.ends_at, 1 # We should get an error if the block doesn't exist get revoke_user_block_path(:id => 99999) diff --git a/test/factories/messages.rb b/test/factories/messages.rb index 57a434fa1..cd148c789 100644 --- a/test/factories/messages.rb +++ b/test/factories/messages.rb @@ -2,7 +2,7 @@ FactoryBot.define do factory :message do sequence(:title) { |n| "Message #{n}" } sequence(:body) { |n| "Body text for message #{n}" } - sent_on { Time.now } + sent_on { Time.now.utc } association :sender, :factory => :user association :recipient, :factory => :user diff --git a/test/factories/node.rb b/test/factories/node.rb index ae32926cd..392d67a84 100644 --- a/test/factories/node.rb +++ b/test/factories/node.rb @@ -6,7 +6,7 @@ FactoryBot.define do changeset visible { true } - timestamp { Time.now } + timestamp { Time.now.utc } version { 1 } trait :deleted do diff --git a/test/factories/old_node.rb b/test/factories/old_node.rb index e129b62f7..a2ca0a2ee 100644 --- a/test/factories/old_node.rb +++ b/test/factories/old_node.rb @@ -7,7 +7,7 @@ FactoryBot.define do association :current_node, :factory => :node visible { true } - timestamp { Time.now } + timestamp { Time.now.utc } version { 1 } end end diff --git a/test/factories/old_relation.rb b/test/factories/old_relation.rb index 8fdb23f58..1bc1b36cf 100644 --- a/test/factories/old_relation.rb +++ b/test/factories/old_relation.rb @@ -1,6 +1,6 @@ FactoryBot.define do factory :old_relation do - timestamp { Time.now } + timestamp { Time.now.utc } visible { true } version { 1 } diff --git a/test/factories/old_way.rb b/test/factories/old_way.rb index 4fc0721d7..265a477d3 100644 --- a/test/factories/old_way.rb +++ b/test/factories/old_way.rb @@ -1,6 +1,6 @@ FactoryBot.define do factory :old_way do - timestamp { Time.now } + timestamp { Time.now.utc } visible { true } version { 1 } diff --git a/test/factories/relation.rb b/test/factories/relation.rb index 8bb00e287..6d43df0a3 100644 --- a/test/factories/relation.rb +++ b/test/factories/relation.rb @@ -1,6 +1,6 @@ FactoryBot.define do factory :relation do - timestamp { Time.now } + timestamp { Time.now.utc } visible { true } version { 1 } diff --git a/test/factories/tracepoints.rb b/test/factories/tracepoints.rb index 4ba152f6e..86d2aea57 100644 --- a/test/factories/tracepoints.rb +++ b/test/factories/tracepoints.rb @@ -4,7 +4,7 @@ FactoryBot.define do latitude { 1 * GeoRecord::SCALE } longitude { 1 * GeoRecord::SCALE } # tile { QuadTile.tile_for_point(1,1) } - timestamp { Time.now } + timestamp { Time.now.utc } trace end diff --git a/test/factories/traces.rb b/test/factories/traces.rb index 687339e7f..88c57745b 100644 --- a/test/factories/traces.rb +++ b/test/factories/traces.rb @@ -5,7 +5,7 @@ FactoryBot.define do user - timestamp { Time.now } + timestamp { Time.now.utc } inserted { true } size { 10 } diff --git a/test/factories/user.rb b/test/factories/user.rb index 07f1ef679..cdc606cf1 100644 --- a/test/factories/user.rb +++ b/test/factories/user.rb @@ -11,7 +11,7 @@ FactoryBot.define do end terms_seen { true } - terms_agreed { Time.now.getutc } + terms_agreed { Time.now.utc } data_public { true } trait :with_home_location do diff --git a/test/factories/user_blocks.rb b/test/factories/user_blocks.rb index 53864bb0e..fefbba45a 100644 --- a/test/factories/user_blocks.rb +++ b/test/factories/user_blocks.rb @@ -1,7 +1,7 @@ FactoryBot.define do factory :user_block do sequence(:reason) { |n| "User Block #{n}" } - ends_at { Time.now + 1.day } + ends_at { Time.now.utc + 1.day } user association :creator, :factory => :moderator_user @@ -11,7 +11,7 @@ FactoryBot.define do end trait :expired do - ends_at { Time.now - 1.day } + ends_at { Time.now.utc - 1.day } end trait :revoked do diff --git a/test/factories/way.rb b/test/factories/way.rb index 1b6b18dc9..f2093e305 100644 --- a/test/factories/way.rb +++ b/test/factories/way.rb @@ -1,6 +1,6 @@ FactoryBot.define do factory :way do - timestamp { Time.now } + timestamp { Time.now.utc } visible { true } version { 1 } diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb index 43e27c529..d3e4d4f07 100644 --- a/test/helpers/application_helper_test.rb +++ b/test/helpers/application_helper_test.rb @@ -56,19 +56,19 @@ class ApplicationHelperTest < ActionView::TestCase end def test_friendly_date - date = friendly_date(Time.new(2014, 3, 5, 18, 58, 23)) + date = friendly_date(Time.new(2014, 3, 5, 18, 58, 23).utc) assert_match %r{^.*$}, date - date = friendly_date(Time.now - 1.hour) + date = friendly_date(Time.now.utc - 1.hour) assert_match %r{^about 1 hour$}, date - date = friendly_date(Time.now - 2.days) + date = friendly_date(Time.now.utc - 2.days) assert_match %r{^2 days$}, date - date = friendly_date(Time.now - 3.weeks) + date = friendly_date(Time.now.utc - 3.weeks) assert_match %r{^21 days$}, date - date = friendly_date(Time.now - 4.months) + date = friendly_date(Time.now.utc - 4.months) assert_match %r{^4 months$}, date end diff --git a/test/helpers/user_blocks_helper_test.rb b/test/helpers/user_blocks_helper_test.rb index c4afa6c83..0c2ab42b5 100644 --- a/test/helpers/user_blocks_helper_test.rb +++ b/test/helpers/user_blocks_helper_test.rb @@ -4,13 +4,13 @@ class UserBlocksHelperTest < ActionView::TestCase include ApplicationHelper def test_block_status - block = create(:user_block, :needs_view, :ends_at => Time.now.getutc) + block = create(:user_block, :needs_view, :ends_at => Time.now.utc) assert_equal "Active until the user logs in.", block_status(block) - block = create(:user_block, :needs_view, :ends_at => Time.now.getutc + 1.hour) + block = create(:user_block, :needs_view, :ends_at => Time.now.utc + 1.hour) assert_match %r{^Ends in about 1 hour and after the user has logged in\.$}, block_status(block) - block = create(:user_block, :ends_at => Time.now.getutc + 1.hour) + block = create(:user_block, :ends_at => Time.now.utc + 1.hour) assert_match %r{^Ends in about 1 hour\.$}, block_status(block) end diff --git a/test/integration/user_blocks_test.rb b/test/integration/user_blocks_test.rb index ecadaad53..96dd879ee 100644 --- a/test/integration/user_blocks_test.rb +++ b/test/integration/user_blocks_test.rb @@ -15,7 +15,7 @@ class UserBlocksTest < ActionDispatch::IntegrationTest :user_id => blocked_user.id, :creator_id => create(:moderator_user).id, :reason => "testing", - :ends_at => Time.now.getutc + 5.minutes + :ends_at => Time.now.utc + 5.minutes ) get "/api/#{Settings.api_version}/user/details", :headers => basic_authorization_header(blocked_user.display_name, "test") assert_response :forbidden @@ -29,7 +29,7 @@ class UserBlocksTest < ActionDispatch::IntegrationTest :user_id => blocked_user.id, :creator_id => moderator.id, :reason => "testing", - :ends_at => Time.now.getutc + 5.minutes + :ends_at => Time.now.utc + 5.minutes ) get "/api/#{Settings.api_version}/user/details", :headers => basic_authorization_header(blocked_user.display_name, "test") assert_response :forbidden diff --git a/test/models/message_test.rb b/test/models/message_test.rb index 3a25c1a4b..1a1241091 100644 --- a/test/models/message_test.rb +++ b/test/models/message_test.rb @@ -75,7 +75,7 @@ class MessageTest < ActiveSupport::TestCase from "from@example.com" to "to@example.com" subject "Test message" - date Time.now + date Time.now.utc content_type "text/plain; charset=utf-8" body "This is a test & a message" end @@ -95,7 +95,7 @@ class MessageTest < ActiveSupport::TestCase from "from@example.com" to "to@example.com" subject "Test message" - date Time.now + date Time.now.utc content_type "text/html; charset=utf-8" body "

This is a test & a message

" end @@ -115,7 +115,7 @@ class MessageTest < ActiveSupport::TestCase from "from@example.com" to "to@example.com" subject "Test message" - date Time.now + date Time.now.utc text_part do content_type "text/plain; charset=utf-8" @@ -139,7 +139,7 @@ class MessageTest < ActiveSupport::TestCase from "from@example.com" to "to@example.com" subject "Test message" - date Time.now + date Time.now.utc html_part do content_type "text/html; charset=utf-8" @@ -162,7 +162,7 @@ class MessageTest < ActiveSupport::TestCase from "from@example.com" to "to@example.com" subject "[OpenStreetMap] Test message" - date Time.now + date Time.now.utc content_type "text/plain; charset=utf-8" body "This is a test & a message" end diff --git a/test/models/note_test.rb b/test/models/note_test.rb index 2385125b5..b74cebcc4 100644 --- a/test/models/note_test.rb +++ b/test/models/note_test.rb @@ -28,7 +28,7 @@ class NoteTest < ActiveSupport::TestCase end def test_reopen - note = create(:note, :status => "closed", :closed_at => Time.now) + note = create(:note, :status => "closed", :closed_at => Time.now.utc) assert_equal "closed", note.status assert_not_nil note.closed_at note.reopen @@ -43,7 +43,7 @@ class NoteTest < ActiveSupport::TestCase end def test_closed? - assert create(:note, :status => "closed", :closed_at => Time.now).closed? + assert create(:note, :status => "closed", :closed_at => Time.now.utc).closed? assert_not create(:note, :status => "open", :closed_at => nil).closed? end -- 2.39.5