aboutsummaryrefslogtreecommitdiffstats
path: root/test/dummy
diff options
context:
space:
mode:
Diffstat (limited to 'test/dummy')
-rw-r--r--test/dummy/app/controllers/application_controller.rb6
-rw-r--r--test/dummy/config/application.rb2
2 files changed, 4 insertions, 4 deletions
diff --git a/test/dummy/app/controllers/application_controller.rb b/test/dummy/app/controllers/application_controller.rb
index baaa725746..c774981e25 100644
--- a/test/dummy/app/controllers/application_controller.rb
+++ b/test/dummy/app/controllers/application_controller.rb
@@ -1,8 +1,8 @@
class ApplicationController < ActionController::Base
- before_action :set_active_text_renderer
+ before_action :set_action_text_renderer
private
- def set_active_text_renderer
- ActiveText.renderer = self.class.renderer.new(request.env)
+ def set_action_text_renderer
+ ActionText.renderer = self.class.renderer.new(request.env)
end
end
diff --git a/test/dummy/config/application.rb b/test/dummy/config/application.rb
index 7f41fce8d0..ddee05a4db 100644
--- a/test/dummy/config/application.rb
+++ b/test/dummy/config/application.rb
@@ -3,7 +3,7 @@ require_relative 'boot'
require 'rails/all'
Bundler.require(*Rails.groups)
-require "active_text"
+require "action_text"
module Dummy
class Application < Rails::Application