Upgrade rubocop

This commit is contained in:
Mike Angell
2019-08-27 17:46:09 +10:00
parent 831355dfbd
commit da9051eb18
121 changed files with 2736 additions and 1872 deletions
+12 -11
View File
@@ -1,6 +1,7 @@
#!/usr/bin/env ruby
# frozen_string_literal: true
ENV["MT_NO_EXPECTATIONS"] = "1"
ENV['MT_NO_EXPECTATIONS'] = '1'
require 'minitest/autorun'
$LOAD_PATH.unshift(File.join(File.expand_path(__dir__), '..', 'lib'))
@@ -8,14 +9,14 @@ require 'liquid.rb'
require 'liquid/profiler'
mode = :strict
if env_mode = ENV['LIQUID_PARSER_MODE']
if (env_mode = ENV['LIQUID_PARSER_MODE'])
puts "-- #{env_mode.upcase} ERROR MODE"
mode = env_mode.to_sym
end
Liquid::Template.error_mode = mode
if ENV['LIQUID-C'] == '1'
puts "-- LIQUID C"
if ENV['LIQUID_C'] == '1'
puts '-- LIQUID C'
require 'liquid/c'
end
@@ -29,7 +30,7 @@ end
module Minitest
class Test
def fixture(name)
File.join(File.expand_path(__dir__), "fixtures", name)
File.join(File.expand_path(__dir__), 'fixtures', name)
end
end
@@ -41,7 +42,7 @@ module Minitest
end
def assert_template_result_matches(expected, template, assigns = {}, message = nil)
return assert_template_result(expected, template, assigns, message) unless expected.is_a? Regexp
return assert_template_result(expected, template, assigns, message) unless expected.is_a?(Regexp)
assert_match expected, Template.parse(template).render!(assigns), message
end
@@ -54,19 +55,19 @@ module Minitest
end
def with_global_filter(*globals)
original_global_strainer = Liquid::Strainer.class_variable_get(:@@global_strainer)
Liquid::Strainer.class_variable_set(:@@global_strainer, Class.new(Liquid::Strainer) do
original_global_strainer = Liquid::Strainer.instance_variable_get(:@global_strainer)
Liquid::Strainer.instance_variable_set(:@global_strainer, Class.new(Liquid::Strainer) do
@filter_methods = Set.new
end)
Liquid::Strainer.class_variable_get(:@@strainer_class_cache).clear
Liquid::Strainer.instance_variable_get(:@strainer_class_cache).clear
globals.each do |global|
Liquid::Template.register_filter(global)
end
yield
ensure
Liquid::Strainer.class_variable_get(:@@strainer_class_cache).clear
Liquid::Strainer.class_variable_set(:@@global_strainer, original_global_strainer)
Liquid::Strainer.instance_variable_get(:@strainer_class_cache).clear
Liquid::Strainer.instance_variable_set(:@global_strainer, original_global_strainer)
end
def with_taint_mode(mode)