Merge pull request #130 from Shopify/fix-annotate_rendered_view_with_…

…filenames-config

Make sure annotate_rendered_view_with_filenames is configured

.gitignore

@@ -2,10 +2,8 @@
 *.rbc
 capybara-*.html
 .rspec
-/log
 /tmp
-/db/*.sqlite3
-/db/*.sqlite3-journal
+test/dummy/log
 /public/system
 /coverage/
 /spec/tmp

Gemfile

@@ -5,6 +5,7 @@ source "https://rubygems.org"
 gemspec
 
 gem "actionview"
+gem "railties"
 gem "minitest"
 gem "mocha"
 gem "rake"

Gemfile.lock

@@ -12,6 +12,16 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    actionpack (7.1.3.2)
+      actionview (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
+      nokogiri (>= 1.8.5)
+      racc
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
     actionview (7.1.3.2)
       activesupport (= 7.1.3.2)
       builder (~> 3.1)
@@ -41,6 +51,10 @@ GEM
     erubi (1.12.0)
     i18n (1.14.4)
       concurrent-ruby (~> 1.0)
+    io-console (0.7.2)
+    irb (1.12.0)
+      rdoc
+      reline (>= 0.4.2)
     json (2.7.1)
     language_server-protocol (3.17.0.3)
     loofah (2.22.0)
@@ -65,19 +79,41 @@ GEM
     pry-byebug (3.10.1)
       byebug (~> 11.0)
       pry (>= 0.13, < 0.15)
+    psych (5.1.2)
+      stringio
     racc (1.7.3)
+    rack (3.0.9.1)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rackup (2.1.0)
+      rack (>= 3)
+      webrick (~> 1.8)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
+    railties (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
+      irb
+      rackup (>= 1.0.0)
+      rake (>= 12.2)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.1.0)
     rake-compiler (1.2.7)
       rake
+    rdoc (6.6.2)
+      psych (>= 4.0.0)
     regexp_parser (2.9.0)
+    reline (0.4.3)
+      io-console (~> 0.5)
     rexml (3.2.6)
     rubocop (1.62.1)
       json (~> 2.3)
@@ -99,9 +135,13 @@ GEM
     ruby_memcheck (2.3.0)
       nokogiri
     smart_properties (1.17.0)
+    stringio (3.1.0)
+    thor (1.3.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
+    webrick (1.8.1)
+    zeitwerk (2.6.13)
 
 PLATFORMS
   ruby
@@ -112,6 +152,7 @@ DEPENDENCIES
   minitest
   mocha
   pry-byebug
+  railties
   rake
   rake-compiler
   rubocop-shopify

gemfiles/Gemfile-rails-6-0

@@ -5,7 +5,7 @@ source "https://rubygems.org"
 gemspec path: ".."
 
 gem "actionview", "~> 6.0.0"
-gem "rake"
+gem "railties"
 gem "rake-compiler"
 gem "minitest"
 gem "mocha"

gemfiles/Gemfile-rails-6-1

@@ -5,7 +5,7 @@ source "https://rubygems.org"
 gemspec path: ".."
 
 gem "actionview", "~> 6.1.0"
-gem "rake"
+gem "railties"
 gem "rake-compiler"
 gem "minitest"
 gem "mocha"

lib/better_html/railtie.rb

@@ -6,8 +6,12 @@ module BetterHtml
   class Railtie < Rails::Railtie
     initializer "better_html.better_erb.initialization" do
       BetterHtml::BetterErb.prepend!
+    end
 
+    config.after_initialize do
       ActiveSupport.on_load(:action_view) do
+        next unless ActionView::Base.respond_to?(:annotate_rendered_view_with_filenames)
+
         BetterHtml.config.annotate_rendered_view_with_filenames = ActionView::Base.annotate_rendered_view_with_filenames
       end
     end

test/better_html/railtie_test.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require "test_helper"
+# setup dummy app
+ENV["RAILS_ENV"] ||= "test"
+require_relative "../dummy/config/environment"
+# load railtie
+require "better_html/railtie"
+
+module BetterHtml
+  class RailtieTest < ActiveSupport::TestCase
+    if Rails::VERSION::STRING >= "6.1"
+      test "configuration is copied from ActionView" do
+        _ = ActionView::Base
+        assert BetterHtml.config.annotate_rendered_view_with_filenames
+      end
+    end
+  end
+end

test/dummy/config/application.rb

@@ -21,7 +21,8 @@ class Application < Rails::Application
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
 
-    # Do not swallow errors in after_commit/after_rollback callbacks.
-    config.active_record.raise_in_transactional_callbacks = true
+    if Rails::VERSION::STRING >= "6.1"
+      config.action_view.annotate_rendered_view_with_filenames = true
+    end
   end
 end

test/dummy/config/environments/test.rb

@@ -28,11 +28,6 @@
   # Disable request forgery protection in test environment.
   config.action_controller.allow_forgery_protection = false
 
-  # Tell Action Mailer not to deliver emails to the real world.
-  # The :test delivery method accumulates sent emails in the
-  # ActionMailer::Base.deliveries array.
-  config.action_mailer.delivery_method = :test
-
   # Randomize the order test cases are executed.
   config.active_support.test_order = :random