Merge remote-tracking branch 'upstream/pull/1960'

[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 dcc7fa7e995e8395081544e6861c3842e0260097..811883f5fb8d17554c415ee3e507210ffec4b281 100644 (file)
--- a/test/integration/user_terms_seen_test.rb
+++ b/test/integration/user_terms_seen_test.rb
@@ -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
 
@@ -74,7 +74,7 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest
   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)