]> git.openstreetmap.org Git - rails.git/commitdiff
Use user factory for user_terms_seen integration test.
authorAndy Allan <git@gravitystorm.co.uk>
Wed, 15 Mar 2017 15:53:47 +0000 (15:53 +0000)
committerAndy Allan <git@gravitystorm.co.uk>
Wed, 15 Mar 2017 15:53:47 +0000 (15:53 +0000)
test/integration/user_terms_seen_test.rb

index e8d3df07a5618f5812c5d110190ff33ca638f84b..ad0c3b211da494073470e3b648a3cb436c2bd162 100644 (file)
@@ -1,15 +1,13 @@
 require "test_helper"
 
 class UserTermsSeenTest < ActionDispatch::IntegrationTest
 require "test_helper"
 
 class UserTermsSeenTest < ActionDispatch::IntegrationTest
-  fixtures :users
-
   def setup
     stub_hostip_requests
   end
 
   def test_api_blocked
     with_terms_seen(true) do
   def setup
     stub_hostip_requests
   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"