test_helper.rb in josevalim-inherited_resources-0.7.0

- old
+ new

@@ -1,7 +1,8 @@
 require 'test/unit'
 require 'rubygems'
+require 'ruby-debug'
 require 'mocha'
 
 ENV["RAILS_ENV"] = "test"
 
 require 'active_support'
@@ -10,21 +11,16 @@
 require 'action_controller/test_process'
 
 I18n.load_path << File.join(File.dirname(__FILE__), 'locales', 'en.yml')
 I18n.reload!
 
-# Load respond_to before defining ApplicationController
-require File.dirname(__FILE__) + '/../lib/inherited_resources/respond_to.rb'
+# Add IR to load path and load the main file
+ActiveSupport::Dependencies.load_paths << File.expand_path(File.dirname(__FILE__) + '/../lib')
+require_dependency 'inherited_resources'
 
-# Define ApplicationController
 class ApplicationController < ActionController::Base; end
 
-# Load InheritedResources::Base after defining ApplicationController
-require File.dirname(__FILE__) + '/../lib/inherited_resources/base.rb'
-
-# Define view_paths
 ActionController::Base.view_paths = File.join(File.dirname(__FILE__), 'views')
 
-# Define default routes
 ActionController::Routing::Routes.draw do |map|
   map.connect ':controller/:action/:id'
 end