lib/makers/railtie.rb in makers-0.1.3 vs lib/makers/railtie.rb in makers-0.2.0

@@ -1,33 +1,22 @@
 module Makers
   class Railtie < Rails::Railtie
 
-    initializer 'makers' do
+    initializer :makers do
       config.app_generators.test_framework(
         config.app_generators.options[:rails][:test_framework],
-        fixture: false,
-        fixture_replacement: :makers
+        fixture: false
       )
-      if defined? RSpec
-        require 'rspec/rails'
-        RSpec.configure do |config|
-          config.include Makers::Methods
-          config.after(:each) do
-            Makers.clean
-          end
-        end
+      if Dir.exist?(Rails.root.join('spec'))
+        directory = 'spec'
       else
-        class ActiveSupport::TestCase
-          include Makers::Methods
-          teardown do
-            Makers.clean
-          end
-        end
+        directory = 'test'
       end
-    end
-
-    config.after_initialize do
-      Makers.load
+      path = Rails.root.join("#{directory}/makers.rb")
+      if File.exist?(path)
+        load path
+      end
+      ActiveSupport::TestCase.include Makers::Extensions::ActiveSupport::TestCase
     end
 
   end
 end