aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2018-04-13 16:23:04 -0700
committerDavid Heinemeier Hansson <david@loudthinking.com>2018-04-13 16:23:04 -0700
commitf1d74871e7f00e8bbde3501a759487ac8cc4c3fc (patch)
tree2f1fa680bd1e6a356256fdc59cab5a6af8d74da7 /test
parent3bc244abc1800c7617cbfbbe1dd2597053a638c9 (diff)
downloadrails-f1d74871e7f00e8bbde3501a759487ac8cc4c3fc.tar.gz
rails-f1d74871e7f00e8bbde3501a759487ac8cc4c3fc.tar.bz2
rails-f1d74871e7f00e8bbde3501a759487ac8cc4c3fc.zip
Rename from Active Text to Action Text
This is more like Action View than Active Model.
Diffstat (limited to 'test')
-rw-r--r--test/dummy/app/controllers/application_controller.rb6
-rw-r--r--test/dummy/config/application.rb2
-rw-r--r--test/unit/content_test.rb2
3 files changed, 5 insertions, 5 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
diff --git a/test/unit/content_test.rb b/test/unit/content_test.rb
index 5299ae3f8f..e5773361e4 100644
--- a/test/unit/content_test.rb
+++ b/test/unit/content_test.rb
@@ -1,6 +1,6 @@
require_relative '../test_helper'
-module ActiveText
+module ActionText
class ContentTest < ActiveSupport::TestCase
test "plain text conversion" do
message = Message.create!(subject: "Greetings", content: "<h1>Hello world</h1>")