Merge remote-tracking branch 'openstreetmap/pull/1521'

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

diff --git a/test/integration/user_blocks_test.rb b/test/integration/user_blocks_test.rb
index 1b2515cc720abad2bb4e6b6ef0c4e8f5ce7a97b2..38bb3338a6c15a455de3ce1229ba6a59d47d577d 100644 (file)
--- a/test/integration/user_blocks_test.rb
+++ b/test/integration/user_blocks_test.rb
@@ -1,14 +1,12 @@
-require 'test_helper'
+require "test_helper"
 
 class UserBlocksTest < ActionDispatch::IntegrationTest
-  fixtures :users, :user_blocks, :user_roles
-
   def auth_header(user, pass)
-    { "HTTP_AUTHORIZATION" => "Basic %s" % Base64.encode64("#{user}:#{pass}") }
+    { "HTTP_AUTHORIZATION" => format("Basic %s", Base64.encode64("#{user}:#{pass}")) }
   end
 
   def test_api_blocked
-    blocked_user = users(:public_user)
+    blocked_user = create(:user)
 
     get "/api/#{API_VERSION}/user/details"
     assert_response :unauthorized
@@ -19,7 +17,7 @@ class UserBlocksTest < ActionDispatch::IntegrationTest
     # now block the user
     UserBlock.create(
       :user_id => blocked_user.id,
-      :creator_id => users(:moderator_user).id,
+      :creator_id => create(:moderator_user).id,
       :reason => "testing",
       :ends_at => Time.now.getutc + 5.minutes
     )
@@ -28,8 +26,8 @@ class UserBlocksTest < ActionDispatch::IntegrationTest
   end
 
   def test_api_revoke
-    blocked_user = users(:public_user)
-    moderator = users(:moderator_user)
+    blocked_user = create(:user)
+    moderator = create(:moderator_user)
 
     block = UserBlock.create(
       :user_id => blocked_user.id,
@@ -41,18 +39,18 @@ class UserBlocksTest < ActionDispatch::IntegrationTest
     assert_response :forbidden
 
     # revoke the ban
-    get '/login'
+    get "/login"
     assert_response :success
-    post '/login', 'username' => moderator.email, 'password' => "test", :referer => "/blocks/#{block.id}/revoke"
+    post "/login", "username" => moderator.email, "password" => "test", :referer => "/blocks/#{block.id}/revoke"
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template 'user_blocks/revoke'
-    post "/blocks/#{block.id}/revoke", 'confirm' => "yes"
+    assert_template "user_blocks/revoke"
+    post "/blocks/#{block.id}/revoke", "confirm" => "yes"
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template 'user_blocks/show'
+    assert_template "user_blocks/show"
     reset!
 
     # access the API again. this time it should work