From 3e0a1a47c0eafb7f9b79e5f2765ea33ce1ad159b Mon Sep 17 00:00:00 2001 From: Azul Date: Wed, 24 Oct 2012 20:35:52 +0200 Subject: basic admin controller methods and helpers + tests --- test/dummy/app/controllers/application_controller.rb | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 test/dummy/app/controllers/application_controller.rb (limited to 'test') diff --git a/test/dummy/app/controllers/application_controller.rb b/test/dummy/app/controllers/application_controller.rb deleted file mode 100644 index e8065d9..0000000 --- a/test/dummy/app/controllers/application_controller.rb +++ /dev/null @@ -1,3 +0,0 @@ -class ApplicationController < ActionController::Base - protect_from_forgery -end -- cgit v1.2.3 From 5c6395d8b1a8c7cf540dae9fdd37f3e68554215c Mon Sep 17 00:00:00 2001 From: Azul Date: Sun, 4 Nov 2012 16:24:35 +0100 Subject: fixing tests, including support files from all engines --- test/dummy/app/controllers/application_controller.rb | 5 +++++ test/test_helper.rb | 3 +++ 2 files changed, 8 insertions(+) create mode 100644 test/dummy/app/controllers/application_controller.rb (limited to 'test') diff --git a/test/dummy/app/controllers/application_controller.rb b/test/dummy/app/controllers/application_controller.rb new file mode 100644 index 0000000..be7aa1f --- /dev/null +++ b/test/dummy/app/controllers/application_controller.rb @@ -0,0 +1,5 @@ +class ApplicationController < ActionController::Base + protect_from_forgery + + ActiveSupport.run_load_hooks(:application_controller, self) +end diff --git a/test/test_helper.rb b/test/test_helper.rb index f7d48ec..50d5159 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -4,6 +4,9 @@ require 'rails/test_help' require 'mocha' +# Load support files from all engines +Dir["#{File.dirname(__FILE__)}/../*/test/support/**/*.rb"].each { |f| require f } + class ActiveSupport::TestCase # Add more helper methods to be used by all tests here... end -- cgit v1.2.3 From 9810d5b66ca7f81df402e9b05957466a947bdf9b Mon Sep 17 00:00:00 2001 From: Azul Date: Mon, 19 Nov 2012 14:46:40 +0100 Subject: use latest mocha version without monkey patching :) --- test/test_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test') diff --git a/test/test_helper.rb b/test/test_helper.rb index 50d5159..0016771 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -2,7 +2,7 @@ ENV["RAILS_ENV"] = "test" require File.expand_path('../../config/environment', __FILE__) require 'rails/test_help' -require 'mocha' +require 'mocha/setup' # Load support files from all engines Dir["#{File.dirname(__FILE__)}/../*/test/support/**/*.rb"].each { |f| require f } -- cgit v1.2.3