X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/aa1fb6dbb8c2e71b8ce8c231ae1272a2dfebd75a..26777c44648f908b723c0c74b65972f75ac5fd3d:/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 dcc7fa7e9..03e8c6f54 100644
--- a/test/integration/user_terms_seen_test.rb
+++ b/test/integration/user_terms_seen_test.rb
@@ -29,11 +29,11 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest
       get "/login"
       follow_redirect!
       assert_response :success
-      assert_template "user/login"
+      assert_template "users/login"
       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_redirected_to :controller => :users, :action => :terms, :referer => "/diary/new"
       follow_redirect!
       assert_response :success
 
@@ -44,7 +44,7 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest
 
       # should be carried through to a normal login with a message
       assert_response :success
-      assert !flash[:notice].nil?
+      assert_not flash[:notice].nil?
     end
   end
 
@@ -56,25 +56,25 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest
       get "/login"
       follow_redirect!
       assert_response :success
-      assert_template "user/login"
+      assert_template "users/login"
       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_redirected_to :controller => :users, :action => :terms, :referer => "/diary/new"
 
       # check that if we go somewhere else now, it redirects
       # back to the terms page.
       get "/traces/mine"
-      assert_redirected_to :controller => :user, :action => :terms, :referer => "/traces/mine"
+      assert_redirected_to :controller => :users, :action => :terms, :referer => "/traces/mine"
       get "/traces/mine", :params => { :referer => "/diary/new" }
-      assert_redirected_to :controller => :user, :action => :terms, :referer => "/diary/new"
+      assert_redirected_to :controller => :users, :action => :terms, :referer => "/diary/new"
     end
   end
 
   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)