Localisation updates from https://translatewiki.net.

[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 596cccc43d79ed9222343898e1376a6bcc23a413..ad0c3b211da494073470e3b648a3cb436c2bd162 100644 (file)
--- a/test/integration/user_terms_seen_test.rb
+++ b/test/integration/user_terms_seen_test.rb
@@ -1,15 +1,13 @@
 require "test_helper"
 
 class UserTermsSeenTest < ActionDispatch::IntegrationTest
 require "test_helper"
 
 class UserTermsSeenTest < ActionDispatch::IntegrationTest

-  fixtures :users
-
-  setup do
-    stub_request(:get, "http://api.hostip.info/country.php?ip=127.0.0.1")
+  def setup
+    stub_hostip_requests

   end
 
   def test_api_blocked
     with_terms_seen(true) do
   end
 
   def test_api_blocked
     with_terms_seen(true) do

-      user = users(:terms_not_seen_user)
+      user = create(:user, :terms_seen => false)

 
       get "/api/#{API_VERSION}/user/preferences", nil, auth_header(user.display_name, "test")
       assert_response :forbidden
 
       get "/api/#{API_VERSION}/user/preferences", nil, auth_header(user.display_name, "test")
       assert_response :forbidden


@@ -25,7 +23,7 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest
 
   def test_terms_presented_at_login
     with_terms_seen(true) do
 
   def test_terms_presented_at_login
     with_terms_seen(true) do

-      user = users(:terms_not_seen_user)
+      user = create(:user, :terms_seen => false)

 
       # try to log in
       get_via_redirect "/login"
 
       # try to log in
       get_via_redirect "/login"


@@ -51,7 +49,7 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest
 
   def test_terms_cant_be_circumvented
     with_terms_seen(true) do
 
   def test_terms_cant_be_circumvented
     with_terms_seen(true) do

-      user = users(:terms_not_seen_user)
+      user = create(:user, :terms_seen => false)

 
       # try to log in
       get_via_redirect "/login"
 
       # try to log in
       get_via_redirect "/login"