Update to rails 6.0.1

[rails.git] / test / controllers / site_controller_test.rb

diff --git a/test/controllers/site_controller_test.rb b/test/controllers/site_controller_test.rb
index b8941ed30f1a4a24c1f474ab33e6bfb27d2b5f4a..c7826062ba52ba7aca177f3b4412df75c5135510 100644 (file)
--- a/test/controllers/site_controller_test.rb
+++ b/test/controllers/site_controller_test.rb
@@ -4,8 +4,10 @@ class SiteControllerTest < ActionController::TestCase
   ##
   # setup oauth keys
   def setup
   ##
   # setup oauth keys
   def setup

-    Object.const_set("ID_KEY", create(:client_application).key)
-    Object.const_set("POTLATCH2_KEY", create(:client_application).key)
+    super
+
+    Settings.id_key = create(:client_application).key
+    Settings.potlatch2_key = create(:client_application).key

 
     stub_hostip_requests
   end
 
     stub_hostip_requests
   end


@@ -13,8 +15,8 @@ class SiteControllerTest < ActionController::TestCase
   ##
   # clear oauth keys
   def teardown
   ##
   # clear oauth keys
   def teardown

-    Object.send("remove_const", "ID_KEY")
-    Object.send("remove_const", "POTLATCH2_KEY")
+    Settings.id_key = nil
+    Settings.potlatch2_key = nil

   end
 
   ##
   end
 
   ##


@@ -165,7 +167,7 @@ class SiteControllerTest < ActionController::TestCase
   def test_edit
     get :edit
     assert_response :redirect
   def test_edit
     get :edit
     assert_response :redirect

-    assert_redirected_to :controller => :user, :action => :login, :referer => "/edit"
+    assert_redirected_to :controller => :users, :action => :login, :referer => "/edit"

   end
 
   # Test the right editor gets used when the user hasn't set a preference
   end
 
   # Test the right editor gets used when the user hasn't set a preference


@@ -173,7 +175,7 @@ class SiteControllerTest < ActionController::TestCase
     get :edit, :session => { :user => create(:user) }
     assert_response :success
     assert_template "edit"
     get :edit, :session => { :user => create(:user) }
     assert_response :success
     assert_template "edit"

-    assert_template :partial => "_#{DEFAULT_EDITOR}", :count => 1
+    assert_template :partial => "_#{Settings.default_editor}", :count => 1

   end
 
   # Test the right editor gets used when the user has set a preference
   end
 
   # Test the right editor gets used when the user has set a preference


@@ -315,7 +317,7 @@ class SiteControllerTest < ActionController::TestCase
   def test_welcome
     get :welcome
     assert_response :redirect
   def test_welcome
     get :welcome
     assert_response :redirect

-    assert_redirected_to :controller => :user, :action => :login, :referer => "/welcome"
+    assert_redirected_to :controller => :users, :action => :login, :referer => "/welcome"

 
     get :welcome, :session => { :user => create(:user) }
     assert_response :success
 
     get :welcome, :session => { :user => create(:user) }
     assert_response :success