Merge pull request #14 from github/test-6.0

test against Rails 6

Author: joelhawksley

.github/workflows/ruby_on_rails.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        rails_version: ["5.2.3", "6.0.0.rc2", "master"]
+        rails_version: ["5.2.3", "6.0.0", "master"]
         ruby_version: ["2.5.x", "2.6.x"]
     steps:
     - uses: actions/checkout@master

Gemfile.lock

@@ -53,23 +53,11 @@ GEM
     concurrent-ruby (1.1.5)
     crass (1.0.4)
     erubi (1.8.0)
-    erubis (2.7.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     haml (5.1.2)
       temple (>= 0.8.0)
       tilt
-    haml-rails (2.0.1)
-      actionpack (>= 5.1)
-      activesupport (>= 5.1)
-      haml (>= 4.0.6, < 6.0)
-      html2haml (>= 1.0.1)
-      railties (>= 5.1)
-    html2haml (2.2.0)
-      erubis (~> 2.7.0)
-      haml (>= 4.0, < 6)
-      nokogiri (>= 1.6.0)
-      ruby_parser (~> 3.5)
     i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.3)
@@ -133,9 +121,6 @@ GEM
     rubocop-performance (1.3.0)
       rubocop (>= 0.68.0)
     ruby-progressbar (1.10.1)
-    ruby_parser (3.13.1)
-      sexp_processor (~> 4.9)
-    sexp_processor (4.12.1)
     slim (4.0.1)
       temple (>= 0.7.6, < 0.9)
       tilt (>= 2.0.6, < 2.1)
@@ -163,7 +148,7 @@ PLATFORMS
 DEPENDENCIES
   actionview-component!
   bundler (>= 1.14)
-  haml-rails (~> 2.0)
+  haml (~> 5)
   minitest (~> 5.0)
   rails (= 5.2.3)
   rake (~> 10.0)

README.md

@@ -11,7 +11,7 @@ Preliminary support for rendering components was merged into Rails `6.1.0.alpha`
 
 ## Compatibility
 
-`actionview-component` is tested for compatibility with all combinations of Ruby `2.5`/`2.6` and Rails `5.2.3`/`6.0.0.rc2`/`6.1.0.alpha`.
+`actionview-component` is tested for compatibility with all combinations of Ruby `2.5`/`2.6` and Rails `5.2.3`/`6.0.0`/`6.1.0.alpha`.
 
 ## Installation
 Add this line to your application's Gemfile:
@@ -156,7 +156,7 @@ require "action_view/component_test_helpers"
 
 class MyComponentTest < Minitest::Test
   include ActionView::ComponentTestHelpers
-  
+
   def test_render_component
     assert_equal(
       %(<span title="my title">Hello, World!</span>),

actionview-component.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", ">= 1.14"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "haml-rails", "~> 2.0"
+  spec.add_development_dependency "haml", "~> 5"
   spec.add_development_dependency "slim", "~> 4.0"
   spec.add_development_dependency "rubocop", "~> 0.59"
   spec.add_development_dependency "rubocop-github", "~> 0.13.0"