cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix new rubocop warnings

Browse source
This commit is contained in:
Tom Hughes 2020-10-09 08:26:38 +01:00
parent 5ea7425edd
commit 2dc50b4431
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/potlatch.rb
View file

@ -180,13 +180,13 @@ module Potlatch
# StringIO.open(txt) do |file| # StringIO.open(txt) do |file|
File.open(Rails.root.join("config/potlatch/presets.txt")) do |file| File.open(Rails.root.join("config/potlatch/presets.txt")) do |file|
file.each_line do |line| file.each_line do |line|
t = line.chomp case line.chomp
if t =~ %r{(\w+)/(\w+)} when %r{(\w+)/(\w+)}
presettype = Regexp.last_match(1) presettype = Regexp.last_match(1)
presetcategory = Regexp.last_match(2) presetcategory = Regexp.last_match(2)
presetmenus[presettype].push(presetcategory) presetmenus[presettype].push(presetcategory)
presetnames[presettype][presetcategory] = ["(no preset)"] presetnames[presettype][presetcategory] = ["(no preset)"]
elsif t =~ /^([\w\s]+):\s?(.+)$/ when /^([\w\s]+):\s?(.+)$/
pre = Regexp.last_match(1) pre = Regexp.last_match(1)
kv = Regexp.last_match(2) kv = Regexp.last_match(2)
presetnames[presettype][presetcategory].push(pre) presetnames[presettype][presetcategory].push(pre)

2
test/controllers/api/changesets_controller_test.rb
View file

@ -71,7 +71,7 @@ module Api
duration = cs.closed_at - cs.created_at duration = cs.closed_at - cs.created_at
# the difference can either be a rational, or a floating point number # the difference can either be a rational, or a floating point number
# of seconds, depending on the code path taken :-( # of seconds, depending on the code path taken :-(
if duration.class == Rational if duration.instance_of?(Rational)
assert_equal Rational(1, 24), duration, "initial idle timeout should be an hour (#{cs.created_at} -> #{cs.closed_at})" assert_equal Rational(1, 24), duration, "initial idle timeout should be an hour (#{cs.created_at} -> #{cs.closed_at})"
else else
# must be number of seconds... # must be number of seconds...