From: Tom Hughes <tom@compton.nu>
Date: Mon, 5 Jun 2017 22:04:50 +0000 (+0100)
Subject: Remove deprecated get_via_direct and post_via_redirect methods
X-Git-Tag: live~3326
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/07673278f13c87fd2e073b041970bbdd45eebe86

Remove deprecated get_via_direct and post_via_redirect methods
---

diff --git a/test/integration/oauth_test.rb b/test/integration/oauth_test.rb
index 9eedd1ff4..91bad005a 100644
--- a/test/integration/oauth_test.rb
+++ b/test/integration/oauth_test.rb
@@ -10,7 +10,9 @@ class OAuthTest < ActionDispatch::IntegrationTest
   def test_oauth10_web_app
     client = create(:client_application, :callback_url => "http://some.web.app.example.org/callback", :allow_read_prefs => true, :allow_write_api => true, :allow_read_gpx => true)
 
-    post_via_redirect "/login", :username => client.user.email, :password => "test"
+    post "/login", :username => client.user.email, :password => "test"
+    follow_redirect!
+    follow_redirect!
     assert_response :success
 
     oauth10_without_callback(client)
@@ -21,7 +23,9 @@ class OAuthTest < ActionDispatch::IntegrationTest
   def test_oauth10_desktop_app
     client = create(:client_application, :allow_read_prefs => true, :allow_write_api => true, :allow_read_gpx => true)
 
-    post_via_redirect "/login", :username => client.user.email, :password => "test"
+    post "/login", :username => client.user.email, :password => "test"
+    follow_redirect!
+    follow_redirect!
     assert_response :success
 
     oauth10_without_callback(client)
@@ -31,7 +35,9 @@ class OAuthTest < ActionDispatch::IntegrationTest
   def test_oauth10a_web_app
     client = create(:client_application, :callback_url => "http://some.web.app.example.org/callback", :allow_read_prefs => true, :allow_write_api => true, :allow_read_gpx => true)
 
-    post_via_redirect "/login", :username => client.user.email, :password => "test"
+    post "/login", :username => client.user.email, :password => "test"
+    follow_redirect!
+    follow_redirect!
     assert_response :success
 
     oauth10a_without_callback(client)
@@ -42,7 +48,9 @@ class OAuthTest < ActionDispatch::IntegrationTest
   def test_oauth10a_desktop_app
     client = create(:client_application, :allow_read_prefs => true, :allow_write_api => true, :allow_read_gpx => true)
 
-    post_via_redirect "/login", :username => client.user.email, :password => "test"
+    post "/login", :username => client.user.email, :password => "test"
+    follow_redirect!
+    follow_redirect!
     assert_response :success
 
     oauth10a_without_callback(client)
diff --git a/test/integration/page_locale_test.rb b/test/integration/page_locale_test.rb
index c5e0d0ae3..ac34274a4 100644
--- a/test/integration/page_locale_test.rb
+++ b/test/integration/page_locale_test.rb
@@ -13,7 +13,8 @@ class PageLocaleTest < ActionDispatch::IntegrationTest
   def test_defaulting
     user = create(:user, :languages => [])
 
-    post_via_redirect "/login", :username => user.email, :password => "test"
+    post "/login", :username => user.email, :password => "test"
+    follow_redirect!
 
     get "/diary/new", {}
     assert_equal [], User.find(user.id).languages
@@ -33,7 +34,8 @@ class PageLocaleTest < ActionDispatch::IntegrationTest
     get "/diary", :locale => "es"
     assert_select "html[lang=?]", "es"
 
-    post_via_redirect "/login", :username => user.email, :password => "test"
+    post "/login", :username => user.email, :password => "test"
+    follow_redirect!
 
     get "/diary"
     assert_select "html[lang=?]", "de"
diff --git a/test/integration/user_changeset_comments_test.rb b/test/integration/user_changeset_comments_test.rb
index bedb1c69f..3667db5ca 100644
--- a/test/integration/user_changeset_comments_test.rb
+++ b/test/integration/user_changeset_comments_test.rb
@@ -24,7 +24,8 @@ class UserChangesetCommentsTest < ActionDispatch::IntegrationTest
     user = create(:user)
     changeset = create(:changeset, :closed)
 
-    get_via_redirect "/login"
+    get "/login"
+    follow_redirect!
     # We should now be at the login page
     assert_response :success
     assert_template "user/login"
diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb
index 600c65a54..db42b22a7 100644
--- a/test/integration/user_creation_test.rb
+++ b/test/integration/user_creation_test.rb
@@ -23,7 +23,9 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
   def test_create_user_form
     I18n.available_locales.each do |locale|
-      get_via_redirect "/user/new", {}, { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }
+      reset!
+      get "/user/new", {}, { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }
+      follow_redirect!
       assert_response :success
       assert_template "user/new"
     end
@@ -82,8 +84,9 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
       assert_difference("User.count") do
         assert_difference("ActionMailer::Base.deliveries.size", 1) do
-          post_via_redirect "/user/save", {},
-                            { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }
+          post "/user/save", {},
+               { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }
+          follow_redirect!
         end
       end
 
@@ -122,8 +125,9 @@ class UserCreationTest < ActionDispatch::IntegrationTest
         post "/user/new",
              :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => password, :pass_crypt_confirmation => password }, :referer => referer
         assert_redirected_to "/user/terms"
-        post_via_redirect "/user/save",
-                          :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => password, :pass_crypt_confirmation => password }
+        post "/user/save",
+             :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => password, :pass_crypt_confirmation => password }
+        follow_redirect!
       end
     end
 
@@ -235,8 +239,9 @@ class UserCreationTest < ActionDispatch::IntegrationTest
         follow_redirect!
         assert_response :redirect
         assert_redirected_to "/user/terms"
-        post_via_redirect "/user/save",
-                          :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "openid", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" }
+        post "/user/save",
+             :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "openid", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" }
+        follow_redirect!
       end
     end
 
@@ -352,8 +357,9 @@ class UserCreationTest < ActionDispatch::IntegrationTest
         follow_redirect!
         assert_response :redirect
         assert_redirected_to "/user/terms"
-        post_via_redirect "/user/save",
-                          :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "google", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" }
+        post "/user/save",
+             :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "google", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" }
+        follow_redirect!
       end
     end
 
@@ -465,8 +471,9 @@ class UserCreationTest < ActionDispatch::IntegrationTest
         follow_redirect!
         assert_response :redirect
         assert_redirected_to "/user/terms"
-        post_via_redirect "/user/save",
-                          :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "facebook", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" }
+        post "/user/save",
+             :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "facebook", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" }
+        follow_redirect!
       end
     end
 
@@ -578,8 +585,9 @@ class UserCreationTest < ActionDispatch::IntegrationTest
         follow_redirect!
         assert_response :redirect
         assert_redirected_to "/user/terms"
-        post_via_redirect "/user/save",
-                          :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "windowslive", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" }
+        post "/user/save",
+             :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "windowslive", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" }
+        follow_redirect!
       end
     end
 
@@ -691,8 +699,9 @@ class UserCreationTest < ActionDispatch::IntegrationTest
         follow_redirect!
         assert_response :redirect
         assert_redirected_to "/user/terms"
-        post_via_redirect "/user/save",
-                          :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "github", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" }
+        post "/user/save",
+             :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "github", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" }
+        follow_redirect!
       end
     end
 
@@ -804,8 +813,9 @@ class UserCreationTest < ActionDispatch::IntegrationTest
         follow_redirect!
         assert_response :redirect
         assert_redirected_to "/user/terms"
-        post_via_redirect "/user/save",
-                          :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "wikipedia", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" }
+        post "/user/save",
+             :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "wikipedia", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" }
+        follow_redirect!
       end
     end
 
diff --git a/test/integration/user_diaries_test.rb b/test/integration/user_diaries_test.rb
index e6d4327fd..df070dd37 100644
--- a/test/integration/user_diaries_test.rb
+++ b/test/integration/user_diaries_test.rb
@@ -6,7 +6,9 @@ class UserDiariesTest < ActionDispatch::IntegrationTest
   def test_showing_create_diary_entry
     user = create(:user)
 
-    get_via_redirect "/diary/new"
+    get "/diary/new"
+    follow_redirect!
+    follow_redirect!
     # We should now be at the login page
     assert_response :success
     assert_template "user/login"
diff --git a/test/integration/user_terms_seen_test.rb b/test/integration/user_terms_seen_test.rb
index ad0c3b211..f1cabfc60 100644
--- a/test/integration/user_terms_seen_test.rb
+++ b/test/integration/user_terms_seen_test.rb
@@ -26,7 +26,8 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest
       user = create(:user, :terms_seen => false)
 
       # try to log in
-      get_via_redirect "/login"
+      get "/login"
+      follow_redirect!
       assert_response :success
       assert_template "user/login"
       post "/login", :username => user.email, :password => "test", :referer => "/diary/new"
@@ -52,7 +53,8 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest
       user = create(:user, :terms_seen => false)
 
       # try to log in
-      get_via_redirect "/login"
+      get "/login"
+      follow_redirect!
       assert_response :success
       assert_template "user/login"
       post "/login", :username => user.email, :password => "test", :referer => "/diary/new"