mirror of
https://github.com/ditkrg/active_model_serializers.git
synced 2026-01-22 22:06:50 +00:00
Remove railtie
This commit is contained in:
parent
fffce85c5d
commit
73ecb94d24
@ -25,8 +25,12 @@ end
|
||||
|
||||
begin
|
||||
require 'action_controller'
|
||||
require 'rails'
|
||||
require 'railtie'
|
||||
require 'action_controller/serialization'
|
||||
|
||||
ActiveSupport.on_load(:action_controller) do
|
||||
include ::ActionController::Serialization
|
||||
end
|
||||
rescue LoadError => ex
|
||||
puts ex
|
||||
# rails on installed, continuing
|
||||
end
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
require 'active_model_serializers'
|
||||
require 'action_controller/serialization'
|
||||
|
||||
module ActiveModel
|
||||
module Serialization
|
||||
class Railtie < ::Rails::Railtie
|
||||
initializer "active_model.serialization.action_controller" do
|
||||
ActiveSupport.on_load(:action_controller) do
|
||||
include ::ActionController::Serilization
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -39,8 +39,6 @@ class RenderJsonTest < ActionController::TestCase
|
||||
end
|
||||
|
||||
class TestController < ActionController::Base
|
||||
include ActionController::Serialization
|
||||
|
||||
protect_from_forgery
|
||||
|
||||
serialization_scope :current_user
|
||||
|
||||
@ -7,6 +7,8 @@ require "active_model_serializers"
|
||||
require "active_support/json"
|
||||
require "test/unit"
|
||||
|
||||
require 'rails'
|
||||
|
||||
module TestHelper
|
||||
Routes = ActionDispatch::Routing::RouteSet.new
|
||||
Routes.draw do
|
||||
|
||||
Loading…
Reference in New Issue
Block a user