diff --git a/lib/active_model/array_serializer.rb b/lib/active_model/array_serializer.rb index a078d0c6..2ff339b5 100644 --- a/lib/active_model/array_serializer.rb +++ b/lib/active_model/array_serializer.rb @@ -1,3 +1,5 @@ +require 'active_model/serializer' + module ActiveModel class ArraySerializer class << self diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb index 940d59fa..b2b852cc 100644 --- a/lib/active_model/serializer.rb +++ b/lib/active_model/serializer.rb @@ -1,3 +1,4 @@ +require 'active_model/array_serializer' require 'active_model/serializer/associations' module ActiveModel diff --git a/lib/active_model/serializer/associations.rb b/lib/active_model/serializer/associations.rb index f255b674..5b6365e2 100644 --- a/lib/active_model/serializer/associations.rb +++ b/lib/active_model/serializer/associations.rb @@ -1,3 +1,5 @@ +require 'active_model/serializer' + module ActiveModel class Serializer class Association diff --git a/lib/active_model_serializers.rb b/lib/active_model_serializers.rb index 5ecc1b06..c3e40c4b 100644 --- a/lib/active_model_serializers.rb +++ b/lib/active_model_serializers.rb @@ -1,6 +1,6 @@ require 'active_model' require 'active_model/serializer' -require 'active_model/array_serializer' +require 'active_model/serializer/version' begin require 'action_controller' diff --git a/test/integration/action_controller/serialization_test.rb b/test/integration/action_controller/serialization_test.rb index b79330f0..fe356cbc 100644 --- a/test/integration/action_controller/serialization_test.rb +++ b/test/integration/action_controller/serialization_test.rb @@ -1,5 +1,4 @@ require 'test_helper' -require 'active_model_serializers' module ActionController module Serialization diff --git a/test/integration/active_record/active_record_test.rb b/test/integration/active_record/active_record_test.rb index 9529da1e..cfd04410 100644 --- a/test/integration/active_record/active_record_test.rb +++ b/test/integration/active_record/active_record_test.rb @@ -1,6 +1,5 @@ require 'test_helper' require 'fixtures/active_record' -require 'active_model/serializer' module ActiveModel class Serializer diff --git a/test/test_helper.rb b/test/test_helper.rb index bb2eb5dc..f5c6d8f9 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,6 +1,6 @@ require 'bundler/setup' -require 'active_model_serializers' require 'test/unit' +require 'active_model_serializers' require 'fixtures/poro' module TestHelper diff --git a/test/unit/active_model/array_serializer/root_test.rb b/test/unit/active_model/array_serializer/root_test.rb index 372d1833..01aebf3d 100644 --- a/test/unit/active_model/array_serializer/root_test.rb +++ b/test/unit/active_model/array_serializer/root_test.rb @@ -1,5 +1,4 @@ require 'test_helper' -require 'active_model/serializer' module ActiveModel class ArraySerializer diff --git a/test/unit/active_model/array_serializer/serialize_test.rb b/test/unit/active_model/array_serializer/serialize_test.rb index ad7a935a..33d3c0f8 100644 --- a/test/unit/active_model/array_serializer/serialize_test.rb +++ b/test/unit/active_model/array_serializer/serialize_test.rb @@ -1,5 +1,4 @@ require 'test_helper' -require 'active_model/serializer' module ActiveModel class ArraySerializer diff --git a/test/unit/active_model/serializer/attributes_test.rb b/test/unit/active_model/serializer/attributes_test.rb index bc02f714..10bad2b7 100644 --- a/test/unit/active_model/serializer/attributes_test.rb +++ b/test/unit/active_model/serializer/attributes_test.rb @@ -1,5 +1,4 @@ require 'test_helper' -require 'active_model/serializer' module ActiveModel class Serializer diff --git a/test/unit/active_model/serializer/has_many_test.rb b/test/unit/active_model/serializer/has_many_test.rb index 63195cce..cc70338a 100644 --- a/test/unit/active_model/serializer/has_many_test.rb +++ b/test/unit/active_model/serializer/has_many_test.rb @@ -1,5 +1,4 @@ require 'test_helper' -require 'active_model/serializer' module ActiveModel class Serializer diff --git a/test/unit/active_model/serializer/has_one_test.rb b/test/unit/active_model/serializer/has_one_test.rb index 05ba59f3..bbec3967 100644 --- a/test/unit/active_model/serializer/has_one_test.rb +++ b/test/unit/active_model/serializer/has_one_test.rb @@ -1,5 +1,4 @@ require 'test_helper' -require 'active_model/serializer' module ActiveModel class Serializer diff --git a/test/unit/active_model/serializer/meta_test.rb b/test/unit/active_model/serializer/meta_test.rb index 73f843de..a006bf1e 100644 --- a/test/unit/active_model/serializer/meta_test.rb +++ b/test/unit/active_model/serializer/meta_test.rb @@ -1,5 +1,4 @@ require 'test_helper' -require 'active_model/serializer' module ActiveModel class Serializer diff --git a/test/unit/active_model/serializer/root_test.rb b/test/unit/active_model/serializer/root_test.rb index cad83cc7..53a1658e 100644 --- a/test/unit/active_model/serializer/root_test.rb +++ b/test/unit/active_model/serializer/root_test.rb @@ -1,5 +1,4 @@ require 'test_helper' -require 'active_model/serializer' module ActiveModel class Serializer diff --git a/test/unit/active_model/serializer/scope_test.rb b/test/unit/active_model/serializer/scope_test.rb index 4b67190c..78c1b8d7 100644 --- a/test/unit/active_model/serializer/scope_test.rb +++ b/test/unit/active_model/serializer/scope_test.rb @@ -1,5 +1,4 @@ require 'test_helper' -require 'active_model/serializer' module ActiveModel class Serializer