Move app and config into test

MikeSofaer · Sep 24, 2010 · eac033b · eac033b
1 parent f14188f
commit eac033b
Show file tree

Hide file tree

Showing 15 changed files with 22 additions and 17 deletions.
diff --git a/app/controllers/application_controller.rb → ...app/controllers/application_controller.rb b/app/controllers/application_controller.rb → ...app/controllers/application_controller.rb
diff --git a/app/controllers/personas_controller.rb → test/app/controllers/personas_controller.rb b/app/controllers/personas_controller.rb → test/app/controllers/personas_controller.rb
diff --git a/app/controllers/welcome_controller.rb → test/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb → test/app/controllers/welcome_controller.rb
diff --git a/app/models/persona.rb → test/app/models/persona.rb b/app/models/persona.rb → test/app/models/persona.rb
diff --git a/app/views/layouts/application.html.erb → test/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb → test/app/views/layouts/application.html.erb
diff --git a/app/views/personas/index.html.erb → test/app/views/personas/index.html.erb b/app/views/personas/index.html.erb → test/app/views/personas/index.html.erb
diff --git a/app/views/personas/show.html.erb → test/app/views/personas/show.html.erb b/app/views/personas/show.html.erb → test/app/views/personas/show.html.erb
diff --git a/app/views/welcome/index.html.erb → test/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb → test/app/views/welcome/index.html.erb
diff --git a/test/basic_test.rb b/test/basic_test.rb
@@ -1,11 +1,6 @@
-require "rack/test"
 require './test/test_helper'
-require 'json'
-require 'wrong'
-require 'wrong/adapters/test_unit'
-require "wrong/message/string_diff"
-Wrong.config[:color] = true
-
+require 'welcome_controller'
+WelcomeController.append_view_path "test/app/views"
 
 class BasicTest < Test::Unit::TestCase
   include Rack::Test::Methods

diff --git a/config/application.rb → test/config/application.rb b/config/application.rb → test/config/application.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../boot', __FILE__)
+require 'config/boot'
 
 require "action_controller/railtie"
 require "rails/test_unit/railtie"
@@ -9,8 +9,11 @@
 
 module ActionPresenter
   class Application < Rails::Application
-    config.filter_parameters += [:password]
     config.active_support.deprecation = :stdout
     config.secret_token = '8b9708cd5d4a96f541e04326467fc9c4b0c0a44c4d77b19632db2145fd1cf686d739f7d34a3ecce551c53dc8d31730e816cd332b3eececd95cc539b52e1aadde'
+    routes.draw do
+      root :to => "welcome#index"
+      match ':controller(/:action(/:id(.:format)))'
+    end
   end
 end
diff --git a/config/boot.rb → test/config/boot.rb b/config/boot.rb → test/config/boot.rb
diff --git a/config/environment.rb → test/config/environment.rb b/config/environment.rb → test/config/environment.rb
diff --git a/config/routes.rb → test/config/routes.rb b/config/routes.rb → test/config/routes.rb
diff --git a/test/personas_test.rb b/test/personas_test.rb
@@ -1,11 +1,7 @@
-require "rack/test"
 require './test/test_helper'
-require 'json'
-require 'wrong'
-require 'wrong/adapters/test_unit'
-require "wrong/message/string_diff"
-Wrong.config[:color] = true
-
+require 'personas_controller'
+require 'app/models/persona'
+PersonasController.append_view_path "test/app/views"
 
 class BasicTest < Test::Unit::TestCase
   include Rack::Test::Methods

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -1,3 +1,14 @@
 ENV["RAILS_ENV"] = "test"
-require File.expand_path('../../config/environment', __FILE__)
+$LOAD_PATH.unshift './test'
+$LOAD_PATH.unshift './test/app/controllers'
+require 'config/application'
 require 'rails/test_help'
+require 'json'
+require 'wrong'
+require 'wrong/adapters/test_unit'
+require "wrong/message/string_diff"
+require "rack/test"
+Wrong.config[:color] = true
+ActionPresenter::Application.initialize!
+require 'application_controller'
+ApplicationController.append_view_path "test/app/views"