Fix Haml tests for Rails 6.1

hamlit.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'haml', '>= 5'
   spec.add_development_dependency 'less'
   spec.add_development_dependency 'minitest-reporters', '~> 1.1'
-  spec.add_development_dependency 'rails', '>= 4.0', '< 6.1'
+  spec.add_development_dependency 'rails', '>= 4.0'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rake-compiler'
   spec.add_development_dependency 'sass'

test/haml/helper_test.rb

@@ -34,8 +34,7 @@ class HelperTest < Haml::TestCase
       def compiled_method_container
         self.class
       end
-    end.new(ActionView::LookupContext.new(''))
-    @base.controller = ActionController::Base.new
+    end.new(ActionView::LookupContext.new(''), {}, ActionController::Base.new)
     @base.view_paths << File.expand_path("../templates", __FILE__)
     @base.instance_variable_set(:@post, Post.new("Foo bar\nbaz", nil, PostErrors.new))
   end

test/haml/template_test.rb

@@ -71,7 +71,7 @@ class TemplateTest < Haml::TestCase
     vars = { 'article' => Article.new, 'foo' => 'value one' }
 
     context = ActionView::LookupContext.new(TEMPLATE_PATH)
-    base = ActionView::Base.new(context, vars)
+    base = ActionView::Base.new(context, vars, ActionController::Base.new)
 
     # This is needed by RJS in (at least) Rails 3
     base.instance_variable_set(:@template, base)
@@ -100,7 +100,7 @@ class TemplateTest < Haml::TestCase
   def assert_renders_correctly(name, &render_method)
     old_options = Haml::Template.options.dup
     Haml::Template.options[:escape_html] = false
-    render_method ||= proc { |n| @base.render(:file => n) }
+    render_method ||= proc { |n| @base.render(template: n) }
 
     silence_warnings do
       load_result(name).split("\n").zip(render_method[name].split("\n")).each_with_index do |pair, line|

test/hamlit/rails_template_test.rb

@@ -8,7 +8,7 @@ describe Hamlit::RailsTemplate do
       def compiled_method_container
         self.class
       end
-    end.new(ActionView::LookupContext.new(''))
+    end.new(ActionView::LookupContext.new(''), {}, ActionController::Base.new)
     base.render(inline: haml, type: :haml)
   end
 

test/test_helper.rb

@@ -110,7 +110,7 @@ class Haml::TestCase < BASE_TEST_CLASS
       def compiled_method_container
         self.class
       end
-    end.new(ActionView::LookupContext.new(''))
+    end.new(ActionView::LookupContext.new(''), {}, ActionController::Base.new)
   end
 
   def self.error(*args)