Fix new rubocop warnings
This commit is contained in:
parent
5ea7425edd
commit
2dc50b4431
2 changed files with 4 additions and 4 deletions
|
@ -180,13 +180,13 @@ module Potlatch
|
|||
# StringIO.open(txt) do |file|
|
||||
File.open(Rails.root.join("config/potlatch/presets.txt")) do |file|
|
||||
file.each_line do |line|
|
||||
t = line.chomp
|
||||
if t =~ %r{(\w+)/(\w+)}
|
||||
case line.chomp
|
||||
when %r{(\w+)/(\w+)}
|
||||
presettype = Regexp.last_match(1)
|
||||
presetcategory = Regexp.last_match(2)
|
||||
presetmenus[presettype].push(presetcategory)
|
||||
presetnames[presettype][presetcategory] = ["(no preset)"]
|
||||
elsif t =~ /^([\w\s]+):\s?(.+)$/
|
||||
when /^([\w\s]+):\s?(.+)$/
|
||||
pre = Regexp.last_match(1)
|
||||
kv = Regexp.last_match(2)
|
||||
presetnames[presettype][presetcategory].push(pre)
|
||||
|
|
|
@ -71,7 +71,7 @@ module Api
|
|||
duration = cs.closed_at - cs.created_at
|
||||
# the difference can either be a rational, or a floating point number
|
||||
# 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})"
|
||||
else
|
||||
# must be number of seconds...
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue