Permalink
Browse files

Move abstract's controller tests to AV

The ones that were actually testing AV functionality and should belong in there
  • Loading branch information...
1 parent 7620ab0 commit e10a25310f0fd7fb210b31124d6ea262a90b4717 @lukaszx0 lukaszx0 committed Aug 13, 2013
Showing with 28 additions and 2 deletions.
  1. 0 {actionpack/test → actionview/test/actionpack}/abstract/abstract_controller_test.rb
  2. +2 −2 {actionpack/test → actionview/test/actionpack}/abstract/helper_test.rb
  3. 0 {actionpack/test → actionview/test/actionpack}/abstract/layouts_test.rb
  4. 0 {actionpack/test → actionview/test/actionpack}/abstract/render_test.rb
  5. 0 ...t → actionview/test/actionpack}/abstract/views/abstract_controller/testing/me3/formatted.html.erb
  6. 0 ...npack/test → actionview/test/actionpack}/abstract/views/abstract_controller/testing/me3/index.erb
  7. 0 ...npack/test → actionview/test/actionpack}/abstract/views/abstract_controller/testing/me4/index.erb
  8. 0 ...npack/test → actionview/test/actionpack}/abstract/views/abstract_controller/testing/me5/index.erb
  9. 0 {actionpack/test → actionview/test/actionpack}/abstract/views/action_with_ivars.erb
  10. 0 {actionpack/test → actionview/test/actionpack}/abstract/views/helper_test.erb
  11. 0 {actionpack/test → actionview/test/actionpack}/abstract/views/index.erb
  12. 0 ...ack/test → actionview/test/actionpack}/abstract/views/layouts/abstract_controller/testing/me4.erb
  13. 0 {actionpack/test → actionview/test/actionpack}/abstract/views/layouts/application.erb
  14. 0 {actionpack/test → actionview/test/actionpack}/abstract/views/naked_render.erb
  15. +5 −0 actionview/test/fixtures/helpers/abc_helper.rb
  16. +5 −0 actionview/test/fixtures/helpers/fun/games_helper.rb
  17. +5 −0 actionview/test/fixtures/helpers/fun/pdf_helper.rb
  18. +5 −0 actionview/test/fixtures/helpers/helpery_test_helper.rb
  19. +3 −0 actionview/test/fixtures/helpers/just_me_helper.rb
  20. +3 −0 actionview/test/fixtures/helpers/me_too_helper.rb
  21. 0 {actionpack → actionview}/test/fixtures/helpers_missing/invalid_require_helper.rb
@@ -1,6 +1,6 @@
require 'abstract_unit'
-ActionController::Base.helpers_path = File.expand_path('../../fixtures/helpers', __FILE__)
+ActionController::Base.helpers_path = File.expand_path('../../../fixtures/helpers', __FILE__)
module AbstractController
module Testing
@@ -52,7 +52,7 @@ class AbstractHelpersBlock < ControllerWithHelpers
class AbstractInvalidHelpers < AbstractHelpers
include ActionController::Helpers
- path = File.join(File.expand_path('../../fixtures', __FILE__), "helpers_missing")
+ path = File.join(File.expand_path('../../../fixtures', __FILE__), "helpers_missing")
$:.unshift(path)
self.helpers_path = path
end
@@ -0,0 +1,5 @@
+module AbcHelper
+ def bare_a() end
+ def bare_b() end
+ def bare_c() end
+end
@@ -0,0 +1,5 @@
+module Fun
+ module GamesHelper
+ def stratego() "Iz guuut!" end
+ end
+end
@@ -0,0 +1,5 @@
+module Fun
+ module PdfHelper
+ def foobar() 'baz' end
+ end
+end
@@ -0,0 +1,5 @@
+module HelperyTestHelper
+ def helpery_test
+ "Default"
+ end
+end
@@ -0,0 +1,3 @@
+module JustMeHelper
+ def me() "mine!" end
+end
@@ -0,0 +1,3 @@
+module MeTooHelper
+ def me() "me too!" end
+end

0 comments on commit e10a253

Please sign in to comment.