From 8f03596d7b7f8fc2e642798bd8a34baa51034fd9 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino and Adrian Mugnolo <santiago+adrian@wyeworks.com>
Date: Mon, 30 Dec 2013 11:30:23 -0200
Subject: [PATCH] Use railtie + initialize on tests

Use Rails::Application#initialize! instead of Rails::Engine#load_generators in
integration tests.
---
 test/integration/generators/resource_generator_test.rb         | 3 +--
 .../generators/scaffold_controller_generator_test.rb           | 2 +-
 test/integration/generators/serializer_generator_test.rb       | 2 +-
 test/test_app.rb                                               | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/test/integration/generators/resource_generator_test.rb b/test/integration/generators/resource_generator_test.rb
index aa9eed13..82ec88fd 100644
--- a/test/integration/generators/resource_generator_test.rb
+++ b/test/integration/generators/resource_generator_test.rb
@@ -1,8 +1,7 @@
 require 'test_helper'
 require 'rails'
+require 'active_model/serializer/railtie'
 require 'test_app'
-require 'rails/generators/rails/resource/resource_generator'
-require 'active_model/serializer/generators/resource_override'
 
 class ResourceGeneratorTest < Rails::Generators::TestCase
   destination File.expand_path('../../../tmp', __FILE__)
diff --git a/test/integration/generators/scaffold_controller_generator_test.rb b/test/integration/generators/scaffold_controller_generator_test.rb
index ff88021b..52c8319f 100644
--- a/test/integration/generators/scaffold_controller_generator_test.rb
+++ b/test/integration/generators/scaffold_controller_generator_test.rb
@@ -1,7 +1,7 @@
 require 'test_helper'
 require 'rails'
+require 'active_model/serializer/railtie'
 require 'test_app'
-require 'active_model/serializer/generators/serializer/scaffold_controller_generator'
 
 class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
   destination File.expand_path('../../../tmp', __FILE__)
diff --git a/test/integration/generators/serializer_generator_test.rb b/test/integration/generators/serializer_generator_test.rb
index ff75e772..3aa48836 100644
--- a/test/integration/generators/serializer_generator_test.rb
+++ b/test/integration/generators/serializer_generator_test.rb
@@ -1,7 +1,7 @@
 require 'test_helper'
 require 'rails'
+require 'active_model/serializer/railtie'
 require 'test_app'
-require 'active_model/serializer/generators/serializer/serializer_generator'
 
 class SerializerGeneratorTest < Rails::Generators::TestCase
   destination File.expand_path('../../../tmp', __FILE__)
diff --git a/test/test_app.rb b/test/test_app.rb
index 8b702e51..1c89c459 100644
--- a/test/test_app.rb
+++ b/test/test_app.rb
@@ -5,4 +5,4 @@ class TestApp < Rails::Application
   end
 end
 
-TestApp.load_generators
+TestApp.initialize!