test/unit/router_tests.rb in deas-0.38.0 vs test/unit/router_tests.rb in deas-0.39.0

@@ -1,12 +1,12 @@
 require 'assert'
 require 'deas/router'
 
 require 'deas/exceptions'
 require 'deas/route'
-require 'deas/test_helpers'
-require 'test/support/view_handlers'
+require 'deas/view_handler'
+require 'test/support/empty_view_handler'
 
 class Deas::Router
 
   class UnitTests < Assert::Context
     desc "Deas::Router"
@@ -20,11 +20,11 @@
     end
 
   end
 
   class InitTests < UnitTests
-    include Deas::TestHelpers
+    include Deas::ViewHandler::TestHelpers
 
     desc "when init"
     setup do
       @base_url = a_base_url = [Factory.url, nil].choice
       @router = @router_class.new{ base_url a_base_url }
@@ -221,11 +221,11 @@
       assert_equal exp, redirect.path
 
       proxy = redirect.handler_proxies[subject.default_request_type_name]
       handler = test_handler(proxy.handler_class)
       exp = subject.prepend_base_url(path2)
-      assert_equal exp, handler.redirect_path
+      assert_equal exp, handler.redirect_location
     end
 
     should "prepend the base url when adding not founds" do
       url = Factory.url
       subject.base_url url
@@ -341,10 +341,10 @@
       assert_kind_of Deas::RedirectProxy, proxy
       assert_equal 'Deas::RedirectHandler', proxy.handler_class_name
 
       handler = test_handler(proxy.handler_class)
       exp = subject.prepend_base_url(@path2)
-      assert_equal exp, handler.redirect_path
+      assert_equal exp, handler.redirect_location
     end
 
     should "add not found routes" do
       subject.not_found(@path1); subject.apply_definitions!