Update wiki_pages.yml, fix http url in update script

[rails.git] / test / integration / user_terms_seen_test.rb

diff --git a/test/integration/user_terms_seen_test.rb b/test/integration/user_terms_seen_test.rb
index f1cabfc60e6a1e1cd38f5326d977606845a87e30..7ec7fa7307248e038f47bfa118c5dcd27cfd4297 100644 (file)
--- a/test/integration/user_terms_seen_test.rb
+++ b/test/integration/user_terms_seen_test.rb
@@ -9,14 +9,14 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest
     with_terms_seen(true) do
       user = create(:user, :terms_seen => false)
 
     with_terms_seen(true) do
       user = create(:user, :terms_seen => false)
 

-      get "/api/#{API_VERSION}/user/preferences", nil, auth_header(user.display_name, "test")
+      get "/api/#{API_VERSION}/user/preferences", :headers => auth_header(user.display_name, "test")

       assert_response :forbidden
 
       # touch it so that the user has seen the terms
       user.terms_seen = true
       user.save
 
       assert_response :forbidden
 
       # touch it so that the user has seen the terms
       user.terms_seen = true
       user.save
 

-      get "/api/#{API_VERSION}/user/preferences", nil, auth_header(user.display_name, "test")
+      get "/api/#{API_VERSION}/user/preferences", :headers => auth_header(user.display_name, "test")

       assert_response :success
     end
   end
       assert_response :success
     end
   end


@@ -30,7 +30,7 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest
       follow_redirect!
       assert_response :success
       assert_template "user/login"
       follow_redirect!
       assert_response :success
       assert_template "user/login"

-      post "/login", :username => user.email, :password => "test", :referer => "/diary/new"
+      post "/login", :params => { :username => user.email, :password => "test", :referer => "/diary/new" }

       assert_response :redirect
       # but now we need to look at the terms
       assert_redirected_to :controller => :user, :action => :terms, :referer => "/diary/new"
       assert_response :redirect
       # but now we need to look at the terms
       assert_redirected_to :controller => :user, :action => :terms, :referer => "/diary/new"


@@ -38,7 +38,7 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest
       assert_response :success
 
       # don't agree to the terms, but hit decline
       assert_response :success
 
       # don't agree to the terms, but hit decline

-      post "/user/save", :decline => true, :referer => "/diary/new"
+      post "/user/save", :params => { :decline => true, :referer => "/diary/new" }

       assert_redirected_to "/diary/new"
       follow_redirect!
 
       assert_redirected_to "/diary/new"
       follow_redirect!
 


@@ -57,7 +57,7 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest
       follow_redirect!
       assert_response :success
       assert_template "user/login"
       follow_redirect!
       assert_response :success
       assert_template "user/login"

-      post "/login", :username => user.email, :password => "test", :referer => "/diary/new"
+      post "/login", :params => { :username => user.email, :password => "test", :referer => "/diary/new" }

       assert_response :redirect
       # but now we need to look at the terms
       assert_redirected_to :controller => :user, :action => :terms, :referer => "/diary/new"
       assert_response :redirect
       # but now we need to look at the terms
       assert_redirected_to :controller => :user, :action => :terms, :referer => "/diary/new"


@@ -66,7 +66,7 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest
       # back to the terms page.
       get "/traces/mine"
       assert_redirected_to :controller => :user, :action => :terms, :referer => "/traces/mine"
       # back to the terms page.
       get "/traces/mine"
       assert_redirected_to :controller => :user, :action => :terms, :referer => "/traces/mine"

-      get "/traces/mine", :referer => "/diary/new"
+      get "/traces/mine", :params => { :referer => "/diary/new" }

       assert_redirected_to :controller => :user, :action => :terms, :referer => "/diary/new"
     end
   end
       assert_redirected_to :controller => :user, :action => :terms, :referer => "/diary/new"
     end
   end


@@ -74,7 +74,7 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest
   private
 
   def auth_header(user, pass)
   private
 
   def auth_header(user, pass)

-    { "HTTP_AUTHORIZATION" => format("Basic %s", Base64.encode64("#{user}:#{pass}")) }
+    { "HTTP_AUTHORIZATION" => format("Basic %{auth}", :auth => Base64.encode64("#{user}:#{pass}")) }

   end
 
   def with_terms_seen(value)
   end
 
   def with_terms_seen(value)