Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Make test suite run again.

  • Loading branch information...
commit 57b2f290d6a5f28c421a81d1b69d9e7279715fa5 1 parent 3ef233a
@josevalim authored
Showing with 5 additions and 1 deletion.
  1. +1 −0  lib/inherited_resources.rb
  2. +4 −1 test/test_helper.rb
View
1  lib/inherited_resources.rb
@@ -1,3 +1,4 @@
+require 'rails/engine'
require 'responders'
require 'inherited_resources/blank_slate'
require 'inherited_resources/responder'
View
5 test/test_helper.rb
@@ -12,7 +12,6 @@
require "active_support"
require "active_model"
require "action_controller"
-require "rails/railtie"
I18n.load_path << File.join(File.dirname(__FILE__), 'locales', 'en.yml')
I18n.reload!
@@ -23,6 +22,10 @@ class ApplicationController < ActionController::Base; end
$:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
require 'inherited_resources'
+# Add app base to load path
+$:.unshift File.expand_path(File.dirname(__FILE__) + '/../app/controllers')
+require 'inherited_resources/base'
+
ActionController::Base.view_paths = File.join(File.dirname(__FILE__), 'views')
InheritedResources::Routes = ActionDispatch::Routing::RouteSet.new
Please sign in to comment.
Something went wrong with that request. Please try again.