From: Tom Hughes <tom@compton.nu>
Date: Thu, 9 Mar 2017 18:35:57 +0000 (+0000)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1483'
X-Git-Tag: live~3538
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/685df702ef6f3e8feac2dca08808cd9ace066a0d?hp=8b9ad9bf4b46dcf92ba788467207de04c467491d

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

diff --git a/test/controllers/trace_controller_test.rb b/test/controllers/trace_controller_test.rb
index 9ef79d1fa..bbd26bf27 100644
--- a/test/controllers/trace_controller_test.rb
+++ b/test/controllers/trace_controller_test.rb
@@ -2,8 +2,6 @@ require "test_helper"
 require "minitest/mock"
 
 class TraceControllerTest < ActionController::TestCase
-  fixtures :users
-
   def setup
     @gpx_trace_dir = Object.send("remove_const", "GPX_TRACE_DIR")
     Object.const_set("GPX_TRACE_DIR", Rails.root.join("test", "gpx", "traces"))
@@ -171,6 +169,7 @@ class TraceControllerTest < ActionController::TestCase
 
   # Check that the list of traces is displayed
   def test_list
+    user = create(:user)
     # The fourth test below is surpisingly sensitive to timestamp ordering when the timestamps are equal.
     trace_a = create(:trace, :visibility => "public", :timestamp => 4.seconds.ago) do |trace|
       create(:tracetag, :trace => trace, :tag => "London")
@@ -178,10 +177,10 @@ class TraceControllerTest < ActionController::TestCase
     trace_b = create(:trace, :visibility => "public", :timestamp => 3.seconds.ago) do |trace|
       create(:tracetag, :trace => trace, :tag => "Birmingham")
     end
-    trace_c = create(:trace, :visibility => "private", :user => users(:public_user), :timestamp => 2.seconds.ago) do |trace|
+    trace_c = create(:trace, :visibility => "private", :user => user, :timestamp => 2.seconds.ago) do |trace|
       create(:tracetag, :trace => trace, :tag => "London")
     end
-    trace_d = create(:trace, :visibility => "private", :user => users(:public_user), :timestamp => 1.second.ago) do |trace|
+    trace_d = create(:trace, :visibility => "private", :user => user, :timestamp => 1.second.ago) do |trace|
       create(:tracetag, :trace => trace, :tag => "Birmingham")
     end
 
@@ -194,20 +193,21 @@ class TraceControllerTest < ActionController::TestCase
     check_trace_list [trace_a]
 
     # Should see more when we are logged in
-    get :list, {}, { :user => users(:public_user) }
+    get :list, {}, { :user => user }
     check_trace_list [trace_d, trace_c, trace_b, trace_a]
 
     # Again, we should see more when we are logged in
-    get :list, { :tag => "London" }, { :user => users(:public_user) }
+    get :list, { :tag => "London" }, { :user => user }
     check_trace_list [trace_c, trace_a]
   end
 
   # Check that I can get mine
   def test_list_mine
+    user = create(:user)
     create(:trace, :visibility => "public") do |trace|
       create(:tracetag, :trace => trace, :tag => "Birmingham")
     end
-    trace_b = create(:trace, :visibility => "private", :user => users(:public_user)) do |trace|
+    trace_b = create(:trace, :visibility => "private", :user => user) do |trace|
       create(:tracetag, :trace => trace, :tag => "London")
     end
 
@@ -216,40 +216,43 @@ class TraceControllerTest < ActionController::TestCase
     assert_redirected_to :controller => "user", :action => "login", :referer => "/traces/mine"
 
     # Now try when logged in
-    get :mine, {}, { :user => users(:public_user) }
-    assert_redirected_to :controller => "trace", :action => "list", :display_name => users(:public_user).display_name
+    get :mine, {}, { :user => user }
+    assert_redirected_to :controller => "trace", :action => "list", :display_name => user.display_name
 
     # Fetch the actual list
-    get :list, { :display_name => users(:public_user).display_name }, { :user => users(:public_user) }
+    get :list, { :display_name => user.display_name }, { :user => user }
     check_trace_list [trace_b]
   end
 
   # Check the list of traces for a specific user
   def test_list_user
+    user = create(:user)
+    second_user = create(:user)
+    third_user = create(:user)
     create(:trace)
-    trace_b = create(:trace, :visibility => "public", :user => users(:public_user))
-    trace_c = create(:trace, :visibility => "private", :user => users(:public_user)) do |trace|
+    trace_b = create(:trace, :visibility => "public", :user => user)
+    trace_c = create(:trace, :visibility => "private", :user => user) do |trace|
       create(:tracetag, :trace => trace, :tag => "London")
     end
 
     # Test a user with no traces
-    get :list, :display_name => users(:second_public_user).display_name
+    get :list, :display_name => second_user.display_name
     check_trace_list []
 
-    # Test a user with some traces - should see only public ones
-    get :list, :display_name => users(:public_user).display_name
+    # Test the user with the traces - should see only public ones
+    get :list, :display_name => user.display_name
     check_trace_list [trace_b]
 
     # Should still see only public ones when authenticated as another user
-    get :list, { :display_name => users(:public_user).display_name }, { :user => users(:normal_user) }
+    get :list, { :display_name => user.display_name }, { :user => third_user }
     check_trace_list [trace_b]
 
     # Should see all traces when authenticated as the target user
-    get :list, { :display_name => users(:public_user).display_name }, { :user => users(:public_user) }
+    get :list, { :display_name => user.display_name }, { :user => user }
     check_trace_list [trace_c, trace_b]
 
     # Should only see traces with the correct tag when a tag is specified
-    get :list, { :display_name => users(:public_user).display_name, :tag => "London" }, { :user => users(:public_user) }
+    get :list, { :display_name => user.display_name, :tag => "London" }, { :user => user }
     check_trace_list [trace_c]
 
     # Should get an error if the user does not exist
@@ -260,6 +263,8 @@ class TraceControllerTest < ActionController::TestCase
 
   # Check that the rss loads
   def test_rss
+    user = create(:user)
+
     # First with the public feed
     get :georss, :format => :rss
     check_trace_feed Trace.visible_to_all
@@ -269,12 +274,12 @@ class TraceControllerTest < ActionController::TestCase
     check_trace_feed Trace.tagged("London").visible_to_all
 
     # Restrict traces to those for a given user
-    get :georss, :display_name => users(:public_user).display_name, :format => :rss
-    check_trace_feed users(:public_user).traces.visible_to_all
+    get :georss, :display_name => user.display_name, :format => :rss
+    check_trace_feed user.traces.visible_to_all
 
     # Restrict traces to those for a given user with a tiven tag
-    get :georss, :display_name => users(:public_user).display_name, :tag => "Birmingham", :format => :rss
-    check_trace_feed users(:public_user).traces.tagged("Birmingham").visible_to_all
+    get :georss, :display_name => user.display_name, :tag => "Birmingham", :format => :rss
+    check_trace_feed user.traces.tagged("Birmingham").visible_to_all
   end
 
   # Test viewing a trace
@@ -282,34 +287,34 @@ class TraceControllerTest < ActionController::TestCase
     public_trace_file = create(:trace, :visibility => "public")
 
     # First with no auth, which should work since the trace is public
-    get :view, :display_name => users(:normal_user).display_name, :id => public_trace_file.id
+    get :view, :display_name => public_trace_file.user.display_name, :id => public_trace_file.id
     check_trace_view public_trace_file
 
     # Now with some other user, which should work since the trace is public
-    get :view, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:public_user) }
+    get :view, { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, { :user => create(:user) }
     check_trace_view public_trace_file
 
     # And finally we should be able to do it with the owner of the trace
-    get :view, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:normal_user) }
+    get :view, { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, { :user => public_trace_file.user }
     check_trace_view public_trace_file
   end
 
   # Check an anonymous trace can't be viewed by another user
   def test_view_anon
-    anon_trace_file = create(:trace, :visibility => "private", :user => users(:public_user))
+    anon_trace_file = create(:trace, :visibility => "private")
 
     # First with no auth
-    get :view, :display_name => users(:public_user).display_name, :id => anon_trace_file.id
+    get :view, :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id
     assert_response :redirect
     assert_redirected_to :action => :list
 
     # Now with some other user, which should not work since the trace is anon
-    get :view, { :display_name => users(:public_user).display_name, :id => anon_trace_file.id }, { :user => users(:normal_user) }
+    get :view, { :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id }, { :user => create(:user) }
     assert_response :redirect
     assert_redirected_to :action => :list
 
     # And finally we should be able to do it with the owner of the trace
-    get :view, { :display_name => users(:public_user).display_name, :id => anon_trace_file.id }, { :user => users(:public_user) }
+    get :view, { :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id }, { :user => anon_trace_file.user }
     check_trace_view anon_trace_file
   end
 
@@ -317,36 +322,31 @@ class TraceControllerTest < ActionController::TestCase
   def test_view_not_found
     deleted_trace_file = create(:trace, :deleted)
 
-    # First with no auth
-    get :view, :display_name => users(:public_user).display_name, :id => 0
-    assert_response :redirect
-    assert_redirected_to :action => :list
-
-    # Now with some other user
-    get :view, { :display_name => users(:public_user).display_name, :id => 0 }, { :user => users(:public_user) }
+    # First with a trace that has never existed
+    get :view, :display_name => create(:user).display_name, :id => 0
     assert_response :redirect
     assert_redirected_to :action => :list
 
-    # And finally we should not be able to view a deleted trace
-    get :view, { :display_name => users(:public_user).display_name, :id => deleted_trace_file.id }, { :user => users(:public_user) }
+    # Now with a trace that has been deleted
+    get :view, { :display_name => deleted_trace_file.user.display_name, :id => deleted_trace_file.id }, { :user => deleted_trace_file.user }
     assert_response :redirect
     assert_redirected_to :action => :list
   end
 
   # Test downloading a trace
   def test_data
-    public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user), :fixture => "a")
+    public_trace_file = create(:trace, :visibility => "public", :fixture => "a")
 
     # First with no auth, which should work since the trace is public
-    get :data, :display_name => users(:normal_user).display_name, :id => public_trace_file.id
+    get :data, :display_name => public_trace_file.user.display_name, :id => public_trace_file.id
     check_trace_data public_trace_file
 
     # Now with some other user, which should work since the trace is public
-    get :data, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:public_user) }
+    get :data, { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, { :user => create(:user) }
     check_trace_data public_trace_file
 
     # And finally we should be able to do it with the owner of the trace
-    get :data, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:normal_user) }
+    get :data, { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, { :user => public_trace_file.user }
     check_trace_data public_trace_file
   end
 
@@ -355,32 +355,32 @@ class TraceControllerTest < ActionController::TestCase
     identifiable_trace_file = create(:trace, :visibility => "identifiable", :fixture => "d")
 
     # First get the data as is
-    get :data, :display_name => users(:public_user).display_name, :id => identifiable_trace_file.id
+    get :data, :display_name => identifiable_trace_file.user.display_name, :id => identifiable_trace_file.id
     check_trace_data identifiable_trace_file, "application/x-gzip", "gpx.gz"
 
     # Now ask explicitly for XML format
-    get :data, :display_name => users(:public_user).display_name, :id => identifiable_trace_file.id, :format => "xml"
+    get :data, :display_name => identifiable_trace_file.user.display_name, :id => identifiable_trace_file.id, :format => "xml"
     check_trace_data identifiable_trace_file, "application/xml", "xml"
 
     # Now ask explicitly for GPX format
-    get :data, :display_name => users(:public_user).display_name, :id => identifiable_trace_file.id, :format => "gpx"
+    get :data, :display_name => identifiable_trace_file.user.display_name, :id => identifiable_trace_file.id, :format => "gpx"
     check_trace_data identifiable_trace_file
   end
 
   # Check an anonymous trace can't be downloaded by another user
   def test_data_anon
-    anon_trace_file = create(:trace, :visibility => "private", :user => users(:public_user), :fixture => "b")
+    anon_trace_file = create(:trace, :visibility => "private", :fixture => "b")
 
     # First with no auth
-    get :data, :display_name => users(:public_user).display_name, :id => anon_trace_file.id
+    get :data, :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id
     assert_response :not_found
 
     # Now with some other user, which shouldn't work since the trace is anon
-    get :data, { :display_name => users(:public_user).display_name, :id => anon_trace_file.id }, { :user => users(:normal_user) }
+    get :data, { :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id }, { :user => create(:user) }
     assert_response :not_found
 
     # And finally we should be able to do it with the owner of the trace
-    get :data, { :display_name => users(:public_user).display_name, :id => anon_trace_file.id }, { :user => users(:public_user) }
+    get :data, { :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id }, { :user => anon_trace_file.user }
     check_trace_data anon_trace_file
   end
 
@@ -388,116 +388,106 @@ class TraceControllerTest < ActionController::TestCase
   def test_data_not_found
     deleted_trace_file = create(:trace, :deleted)
 
-    # First with no auth and a trace that has never existed
-    get :data, :display_name => users(:public_user).display_name, :id => 0
-    assert_response :not_found
-
-    # Now with a trace that has never existed
-    get :data, { :display_name => users(:public_user).display_name, :id => 0 }, { :user => users(:public_user) }
+    # First with a trace that has never existed
+    get :data, :display_name => create(:user).display_name, :id => 0
     assert_response :not_found
 
     # Now with a trace that has been deleted
-    get :data, { :display_name => users(:public_user).display_name, :id => deleted_trace_file.id }, { :user => users(:public_user) }
+    get :data, { :display_name => deleted_trace_file.user.display_name, :id => deleted_trace_file.id }, { :user => deleted_trace_file.user }
     assert_response :not_found
   end
 
   # Test downloading the picture for a trace
   def test_picture
-    public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user), :fixture => "a")
+    public_trace_file = create(:trace, :visibility => "public", :fixture => "a")
 
     # First with no auth, which should work since the trace is public
-    get :picture, :display_name => users(:normal_user).display_name, :id => public_trace_file.id
+    get :picture, :display_name => public_trace_file.user.display_name, :id => public_trace_file.id
     check_trace_picture public_trace_file
 
     # Now with some other user, which should work since the trace is public
-    get :picture, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:public_user) }
+    get :picture, { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, { :user => create(:user) }
     check_trace_picture public_trace_file
 
     # And finally we should be able to do it with the owner of the trace
-    get :picture, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:normal_user) }
+    get :picture, { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, { :user => public_trace_file.user }
     check_trace_picture public_trace_file
   end
 
   # Check the picture for an anonymous trace can't be downloaded by another user
   def test_picture_anon
-    anon_trace_file = create(:trace, :visibility => "private", :user => users(:public_user), :fixture => "b")
+    anon_trace_file = create(:trace, :visibility => "private", :fixture => "b")
 
     # First with no auth
-    get :picture, :display_name => users(:public_user).display_name, :id => anon_trace_file.id
+    get :picture, :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id
     assert_response :forbidden
 
     # Now with some other user, which shouldn't work since the trace is anon
-    get :picture, { :display_name => users(:public_user).display_name, :id => anon_trace_file.id }, { :user => users(:normal_user) }
+    get :picture, { :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id }, { :user => create(:user) }
     assert_response :forbidden
 
     # And finally we should be able to do it with the owner of the trace
-    get :picture, { :display_name => users(:public_user).display_name, :id => anon_trace_file.id }, { :user => users(:public_user) }
+    get :picture, { :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id }, { :user => anon_trace_file.user }
     check_trace_picture anon_trace_file
   end
 
   # Test downloading the picture for a trace that doesn't exist
   def test_picture_not_found
-    # First with no auth, which should work since the trace is public
-    get :picture, :display_name => users(:public_user).display_name, :id => 0
-    assert_response :not_found
+    deleted_trace_file = create(:trace, :deleted)
 
-    # Now with some other user, which should work since the trace is public
-    get :picture, { :display_name => users(:public_user).display_name, :id => 0 }, { :user => users(:public_user) }
+    # First with a trace that has never existed
+    get :picture, :display_name => create(:user).display_name, :id => 0
     assert_response :not_found
 
-    # And finally we should not be able to do it with a deleted trace
-    deleted_trace_file = create(:trace, :deleted)
-    get :picture, { :display_name => users(:public_user).display_name, :id => deleted_trace_file.id }, { :user => users(:public_user) }
+    # Now with a trace that has been deleted
+    get :picture, { :display_name => deleted_trace_file.user.display_name, :id => deleted_trace_file.id }, { :user => deleted_trace_file.user }
     assert_response :not_found
   end
 
   # Test downloading the icon for a trace
   def test_icon
-    public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user), :fixture => "a")
+    public_trace_file = create(:trace, :visibility => "public", :fixture => "a")
 
     # First with no auth, which should work since the trace is public
-    get :icon, :display_name => users(:normal_user).display_name, :id => public_trace_file.id
+    get :icon, :display_name => public_trace_file.user.display_name, :id => public_trace_file.id
     check_trace_icon public_trace_file
 
     # Now with some other user, which should work since the trace is public
-    get :icon, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:public_user) }
+    get :icon, { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, { :user => create(:user) }
     check_trace_icon public_trace_file
 
     # And finally we should be able to do it with the owner of the trace
-    get :icon, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:normal_user) }
+    get :icon, { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, { :user => public_trace_file.user }
     check_trace_icon public_trace_file
   end
 
   # Check the icon for an anonymous trace can't be downloaded by another user
   def test_icon_anon
-    anon_trace_file = create(:trace, :visibility => "private", :user => users(:public_user), :fixture => "b")
+    anon_trace_file = create(:trace, :visibility => "private", :fixture => "b")
 
     # First with no auth
-    get :icon, :display_name => users(:public_user).display_name, :id => anon_trace_file.id
+    get :icon, :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id
     assert_response :forbidden
 
     # Now with some other user, which shouldn't work since the trace is anon
-    get :icon, { :display_name => users(:public_user).display_name, :id => anon_trace_file.id }, { :user => users(:normal_user) }
+    get :icon, { :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id }, { :user => create(:user) }
     assert_response :forbidden
 
     # And finally we should be able to do it with the owner of the trace
-    get :icon, { :display_name => users(:public_user).display_name, :id => anon_trace_file.id }, { :user => users(:public_user) }
+    get :icon, { :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id }, { :user => anon_trace_file.user }
     check_trace_icon anon_trace_file
   end
 
   # Test downloading the icon for a trace that doesn't exist
   def test_icon_not_found
-    # First with no auth
-    get :icon, :display_name => users(:public_user).display_name, :id => 0
-    assert_response :not_found
+    deleted_trace_file = create(:trace, :deleted)
 
-    # Now with some other user
-    get :icon, { :display_name => users(:public_user).display_name, :id => 0 }, { :user => users(:public_user) }
+    # First with a trace that has never existed
+    get :icon, :display_name => create(:user).display_name, :id => 0
     assert_response :not_found
 
-    # And finally we should not be able to do it with a deleted trace
-    deleted_trace_file = create(:trace, :deleted)
-    get :icon, { :display_name => users(:public_user).display_name, :id => deleted_trace_file.id }, { :user => users(:public_user) }
+    # Now with a trace that has been deleted
+    get :icon, { :display_name => deleted_trace_file.user.display_name, :id => deleted_trace_file.id }, { :user => deleted_trace_file.user }
     assert_response :not_found
   end
 
@@ -509,21 +499,24 @@ class TraceControllerTest < ActionController::TestCase
     assert_redirected_to :controller => :user, :action => :login, :referer => trace_create_path
 
     # Now authenticated as a user with gps.trace.visibility set
-    create(:user_preference, :user => users(:public_user), :k => "gps.trace.visibility", :v => "identifiable")
-    get :create, {}, { :user => users(:public_user) }
+    user = create(:user)
+    create(:user_preference, :user => user, :k => "gps.trace.visibility", :v => "identifiable")
+    get :create, {}, { :user => user }
     assert_response :success
     assert_template :create
     assert_select "select#trace_visibility option[value=identifiable][selected]", 1
 
     # Now authenticated as a user with gps.trace.public set
-    create(:user_preference, :user => users(:second_public_user), :k => "gps.trace.public", :v => "default")
-    get :create, {}, { :user => users(:second_public_user) }
+    second_user = create(:user)
+    create(:user_preference, :user => second_user, :k => "gps.trace.public", :v => "default")
+    get :create, {}, { :user => second_user }
     assert_response :success
     assert_template :create
     assert_select "select#trace_visibility option[value=public][selected]", 1
 
     # Now authenticated as a user with no preferences
-    get :create, {}, { :user => users(:normal_user) }
+    third_user = create(:user)
+    get :create, {}, { :user => third_user }
     assert_response :success
     assert_template :create
     assert_select "select#trace_visibility option[value=private][selected]", 1
@@ -534,17 +527,18 @@ class TraceControllerTest < ActionController::TestCase
     # Get file to use
     fixture = Rails.root.join("test", "gpx", "fixtures", "a.gpx")
     file = Rack::Test::UploadedFile.new(fixture, "application/gpx+xml")
+    user = create(:user)
 
     # First with no auth
     post :create, :trace => { :gpx_file => file, :description => "New Trace", :tagstring => "new,trace", :visibility => "trackable" }
     assert_response :forbidden
 
     # Now authenticated
-    create(:user_preference, :user => users(:public_user), :k => "gps.trace.visibility", :v => "identifiable")
-    assert_not_equal "trackable", users(:public_user).preferences.where(:k => "gps.trace.visibility").first.v
-    post :create, { :trace => { :gpx_file => file, :description => "New Trace", :tagstring => "new,trace", :visibility => "trackable" } }, { :user => users(:public_user) }
+    create(:user_preference, :user => user, :k => "gps.trace.visibility", :v => "identifiable")
+    assert_not_equal "trackable", user.preferences.where(:k => "gps.trace.visibility").first.v
+    post :create, { :trace => { :gpx_file => file, :description => "New Trace", :tagstring => "new,trace", :visibility => "trackable" } }, { :user => user }
     assert_response :redirect
-    assert_redirected_to :action => :list, :display_name => users(:public_user).display_name
+    assert_redirected_to :action => :list, :display_name => user.display_name
     assert_match /file has been uploaded/, flash[:notice]
     trace = Trace.order(:id => :desc).first
     assert_equal "a.gpx", trace.name
@@ -554,90 +548,90 @@ class TraceControllerTest < ActionController::TestCase
     assert_equal false, trace.inserted
     assert_equal File.new(fixture).read, File.new(trace.trace_name).read
     trace.destroy
-    assert_equal "trackable", users(:public_user).preferences.where(:k => "gps.trace.visibility").first.v
+    assert_equal "trackable", user.preferences.where(:k => "gps.trace.visibility").first.v
   end
 
   # Test fetching the edit page for a trace using GET
   def test_edit_get
-    public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user))
-    deleted_trace_file = create(:trace, :deleted, :user => users(:public_user))
+    public_trace_file = create(:trace, :visibility => "public")
+    deleted_trace_file = create(:trace, :deleted)
 
     # First with no auth
-    get :edit, :display_name => users(:normal_user).display_name, :id => public_trace_file.id
+    get :edit, :display_name => public_trace_file.user.display_name, :id => public_trace_file.id
     assert_response :redirect
-    assert_redirected_to :controller => :user, :action => :login, :referer => trace_edit_path(:display_name => users(:normal_user).display_name, :id => public_trace_file.id)
+    assert_redirected_to :controller => :user, :action => :login, :referer => trace_edit_path(:display_name => public_trace_file.user.display_name, :id => public_trace_file.id)
 
     # Now with some other user, which should fail
-    get :edit, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:public_user) }
+    get :edit, { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, { :user => create(:user) }
     assert_response :forbidden
 
     # Now with a trace which doesn't exist
-    get :edit, { :display_name => users(:public_user).display_name, :id => 0 }, { :user => users(:public_user) }
+    get :edit, { :display_name => create(:user).display_name, :id => 0 }, { :user => create(:user) }
     assert_response :not_found
 
     # Now with a trace which has been deleted
-    get :edit, { :display_name => users(:public_user).display_name, :id => deleted_trace_file.id }, { :user => users(:public_user) }
+    get :edit, { :display_name => deleted_trace_file.user.display_name, :id => deleted_trace_file.id }, { :user => deleted_trace_file.user }
     assert_response :not_found
 
     # Finally with a trace that we are allowed to edit
-    get :edit, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:normal_user) }
+    get :edit, { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, { :user => public_trace_file.user }
     assert_response :success
   end
 
   # Test fetching the edit page for a trace using POST
   def test_edit_post_no_details
-    public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user))
-    deleted_trace_file = create(:trace, :deleted, :user => users(:public_user))
+    public_trace_file = create(:trace, :visibility => "public")
+    deleted_trace_file = create(:trace, :deleted)
 
     # First with no auth
-    post :edit, :display_name => users(:normal_user).display_name, :id => public_trace_file.id
+    post :edit, :display_name => public_trace_file.user.display_name, :id => public_trace_file.id
     assert_response :forbidden
 
     # Now with some other user, which should fail
-    post :edit, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:public_user) }
+    post :edit, { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, { :user => create(:user) }
     assert_response :forbidden
 
     # Now with a trace which doesn't exist
-    post :edit, { :display_name => users(:public_user).display_name, :id => 0 }, { :user => users(:public_user) }
+    post :edit, { :display_name => create(:user).display_name, :id => 0 }, { :user => create(:user) }
     assert_response :not_found
 
     # Now with a trace which has been deleted
-    post :edit, { :display_name => users(:public_user).display_name, :id => deleted_trace_file.id }, { :user => users(:public_user) }
+    post :edit, { :display_name => deleted_trace_file.user.display_name, :id => deleted_trace_file.id }, { :user => deleted_trace_file.user }
     assert_response :not_found
 
     # Finally with a trace that we are allowed to edit
-    post :edit, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:normal_user) }
+    post :edit, { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, { :user => public_trace_file.user }
     assert_response :success
   end
 
   # Test saving edits to a trace
   def test_edit_post_with_details
-    public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user))
-    deleted_trace_file = create(:trace, :deleted, :user => users(:public_user))
+    public_trace_file = create(:trace, :visibility => "public")
+    deleted_trace_file = create(:trace, :deleted)
 
     # New details
     new_details = { :description => "Changed description", :tagstring => "new_tag", :visibility => "private" }
 
     # First with no auth
-    post :edit, :display_name => users(:normal_user).display_name, :id => public_trace_file.id, :trace => new_details
+    post :edit, :display_name => public_trace_file.user.display_name, :id => public_trace_file.id, :trace => new_details
     assert_response :forbidden
 
     # Now with some other user, which should fail
-    post :edit, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id, :trace => new_details }, { :user => users(:public_user) }
+    post :edit, { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id, :trace => new_details }, { :user => create(:user) }
     assert_response :forbidden
 
     # Now with a trace which doesn't exist
-    post :edit, { :display_name => users(:public_user).display_name, :id => 0 }, { :user => users(:public_user), :trace => new_details }
+    post :edit, { :display_name => create(:user).display_name, :id => 0 }, { :user => create(:user), :trace => new_details }
     assert_response :not_found
 
     # Now with a trace which has been deleted
-    post :edit, { :display_name => users(:public_user).display_name, :id => deleted_trace_file.id, :trace => new_details }, { :user => users(:public_user) }
+    post :edit, { :display_name => deleted_trace_file.user.display_name, :id => deleted_trace_file.id, :trace => new_details }, { :user => deleted_trace_file.user }
     assert_response :not_found
 
     # Finally with a trace that we are allowed to edit
-    post :edit, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id, :trace => new_details }, { :user => users(:normal_user) }
+    post :edit, { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id, :trace => new_details }, { :user => public_trace_file.user }
     assert_response :redirect
-    assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name
+    assert_redirected_to :action => :view, :display_name => public_trace_file.user.display_name
     trace = Trace.find(public_trace_file.id)
     assert_equal new_details[:description], trace.description
     assert_equal new_details[:tagstring], trace.tagstring
@@ -646,163 +640,164 @@ class TraceControllerTest < ActionController::TestCase
 
   # Test deleting a trace
   def test_delete
-    public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user))
-    deleted_trace_file = create(:trace, :deleted, :user => users(:public_user))
+    public_trace_file = create(:trace, :visibility => "public")
+    deleted_trace_file = create(:trace, :deleted)
 
     # First with no auth
-    post :delete, :display_name => users(:normal_user).display_name, :id => public_trace_file.id
+    post :delete, :display_name => public_trace_file.user.display_name, :id => public_trace_file.id
     assert_response :forbidden
 
     # Now with some other user, which should fail
-    post :delete, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:public_user) }
+    post :delete, { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, { :user => create(:user) }
     assert_response :forbidden
 
     # Now with a trace which doesn't exist
-    post :delete, { :display_name => users(:public_user).display_name, :id => 0 }, { :user => users(:public_user) }
+    post :delete, { :display_name => create(:user).display_name, :id => 0 }, { :user => create(:user) }
     assert_response :not_found
 
     # Now with a trace has already been deleted
-    post :delete, { :display_name => users(:public_user).display_name, :id => deleted_trace_file.id }, { :user => users(:public_user) }
+    post :delete, { :display_name => deleted_trace_file.user.display_name, :id => deleted_trace_file.id }, { :user => deleted_trace_file.user }
     assert_response :not_found
 
     # Finally with a trace that we are allowed to delete
-    post :delete, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:normal_user) }
+    post :delete, { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, { :user => public_trace_file.user }
     assert_response :redirect
-    assert_redirected_to :action => :list, :display_name => users(:normal_user).display_name
+    assert_redirected_to :action => :list, :display_name => public_trace_file.user.display_name
     trace = Trace.find(public_trace_file.id)
     assert_equal false, trace.visible
   end
 
   # Check getting a specific trace through the api
   def test_api_read
-    public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user))
+    public_trace_file = create(:trace, :visibility => "public")
 
     # First with no auth
     get :api_read, :id => public_trace_file.id
     assert_response :unauthorized
 
     # Now with some other user, which should work since the trace is public
-    basic_authorization(users(:public_user).display_name, "test")
+    basic_authorization(create(:user).display_name, "test")
     get :api_read, :id => public_trace_file.id
     assert_response :success
 
     # And finally we should be able to do it with the owner of the trace
-    basic_authorization(users(:normal_user).display_name, "test")
+    basic_authorization(public_trace_file.user.display_name, "test")
     get :api_read, :id => public_trace_file.id
     assert_response :success
   end
 
   # Check an anoymous trace can't be specifically fetched by another user
   def test_api_read_anon
-    anon_trace_file = create(:trace, :visibility => "private", :user => users(:public_user))
+    anon_trace_file = create(:trace, :visibility => "private")
 
     # First with no auth
     get :api_read, :id => anon_trace_file.id
     assert_response :unauthorized
 
     # Now try with another user, which shouldn't work since the trace is anon
-    basic_authorization(users(:normal_user).display_name, "test")
+    basic_authorization(create(:user).display_name, "test")
     get :api_read, :id => anon_trace_file.id
     assert_response :forbidden
 
     # And finally we should be able to get the trace details with the trace owner
-    basic_authorization(users(:public_user).display_name, "test")
+    basic_authorization(anon_trace_file.user.display_name, "test")
     get :api_read, :id => anon_trace_file.id
     assert_response :success
   end
 
   # Check the api details for a trace that doesn't exist
   def test_api_read_not_found
-    deleted_trace_file = create(:trace, :deleted, :user => users(:public_user))
+    deleted_trace_file = create(:trace, :deleted)
 
     # Try first with no auth, as it should require it
     get :api_read, :id => 0
     assert_response :unauthorized
 
     # Login, and try again
-    basic_authorization(users(:public_user).display_name, "test")
+    basic_authorization(deleted_trace_file.user.display_name, "test")
     get :api_read, :id => 0
     assert_response :not_found
 
     # Now try a trace which did exist but has been deleted
-    basic_authorization(users(:public_user).display_name, "test")
+    basic_authorization(deleted_trace_file.user.display_name, "test")
     get :api_read, :id => deleted_trace_file.id
     assert_response :not_found
   end
 
   # Test downloading a trace through the api
   def test_api_data
-    public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user), :fixture => "a")
+    public_trace_file = create(:trace, :visibility => "public", :fixture => "a")
 
     # First with no auth
-    get :api_data, :display_name => users(:normal_user).display_name, :id => public_trace_file.id
+    get :api_data, :id => public_trace_file.id
     assert_response :unauthorized
 
     # Now with some other user, which should work since the trace is public
-    basic_authorization(users(:public_user).display_name, "test")
-    get :api_data, :display_name => users(:normal_user).display_name, :id => public_trace_file.id
+    basic_authorization(create(:user).display_name, "test")
+    get :api_data, :id => public_trace_file.id
     check_trace_data public_trace_file
 
     # And finally we should be able to do it with the owner of the trace
-    basic_authorization(users(:normal_user).display_name, "test")
-    get :api_data, :display_name => users(:normal_user).display_name, :id => public_trace_file.id
+    basic_authorization(public_trace_file.user.display_name, "test")
+    get :api_data, :id => public_trace_file.id
     check_trace_data public_trace_file
   end
 
   # Test downloading a compressed trace through the api
   def test_api_data_compressed
-    identifiable_trace_file = create(:trace, :visibility => "identifiable", :user => users(:public_user), :fixture => "d")
+    identifiable_trace_file = create(:trace, :visibility => "identifiable", :fixture => "d")
 
     # Authenticate as the owner of the trace we will be using
-    basic_authorization(users(:public_user).display_name, "test")
+    basic_authorization(identifiable_trace_file.user.display_name, "test")
 
     # First get the data as is
-    get :api_data, :display_name => users(:public_user).display_name, :id => identifiable_trace_file.id
+    get :api_data, :id => identifiable_trace_file.id
     check_trace_data identifiable_trace_file, "application/x-gzip", "gpx.gz"
 
     # Now ask explicitly for XML format
-    get :api_data, :display_name => users(:public_user).display_name, :id => identifiable_trace_file.id, :format => "xml"
+    get :api_data, :id => identifiable_trace_file.id, :format => "xml"
     check_trace_data identifiable_trace_file, "application/xml", "xml"
 
     # Now ask explicitly for GPX format
-    get :api_data, :display_name => users(:public_user).display_name, :id => identifiable_trace_file.id, :format => "gpx"
+    get :api_data, :id => identifiable_trace_file.id, :format => "gpx"
     check_trace_data identifiable_trace_file
   end
 
   # Check an anonymous trace can't be downloaded by another user through the api
   def test_api_data_anon
-    anon_trace_file = create(:trace, :visibility => "private", :user => users(:public_user), :fixture => "b")
+    anon_trace_file = create(:trace, :visibility => "private", :fixture => "b")
 
     # First with no auth
-    get :api_data, :display_name => users(:public_user).display_name, :id => anon_trace_file.id
+    get :api_data, :id => anon_trace_file.id
     assert_response :unauthorized
 
     # Now with some other user, which shouldn't work since the trace is anon
-    basic_authorization(users(:normal_user).display_name, "test")
-    get :api_data, :display_name => users(:public_user).display_name, :id => anon_trace_file.id
+    basic_authorization(create(:user).display_name, "test")
+    get :api_data, :id => anon_trace_file.id
     assert_response :forbidden
 
     # And finally we should be able to do it with the owner of the trace
-    basic_authorization(users(:public_user).display_name, "test")
-    get :api_data, :display_name => users(:public_user).display_name, :id => anon_trace_file.id
+    basic_authorization(anon_trace_file.user.display_name, "test")
+    get :api_data, :id => anon_trace_file.id
     check_trace_data anon_trace_file
   end
 
   # Test downloading a trace that doesn't exist through the api
   def test_api_data_not_found
-    # First with no auth
-    get :api_data, :display_name => users(:public_user).display_name, :id => 0
+    deleted_trace_file = create(:trace, :deleted)
+
+    # Try first with no auth, as it should require it
+    get :api_data, :id => 0
     assert_response :unauthorized
 
-    # Now with a trace that has never existed
-    basic_authorization(users(:public_user).display_name, "test")
-    get :api_data, :display_name => users(:public_user).display_name, :id => 0
+    # Login, and try again
+    basic_authorization(create(:user).display_name, "test")
+    get :api_data, :id => 0
     assert_response :not_found
 
-    # Now with a trace that has been deleted
-    deleted_trace_file = create(:trace, :deleted)
-    basic_authorization(users(:public_user).display_name, "test")
-    get :api_data, :display_name => users(:public_user).display_name, :id => deleted_trace_file.id
+    # Now try a trace which did exist but has been deleted
+    basic_authorization(deleted_trace_file.user.display_name, "test")
+    get :api_data, :id => deleted_trace_file.id
     assert_response :not_found
   end
 
@@ -811,15 +806,16 @@ class TraceControllerTest < ActionController::TestCase
     # Get file to use
     fixture = Rails.root.join("test", "gpx", "fixtures", "a.gpx")
     file = Rack::Test::UploadedFile.new(fixture, "application/gpx+xml")
+    user = create(:user)
 
     # First with no auth
     post :api_create, :file => file, :description => "New Trace", :tags => "new,trace", :visibility => "trackable"
     assert_response :unauthorized
 
     # Now authenticated
-    create(:user_preference, :user => users(:public_user), :k => "gps.trace.visibility", :v => "identifiable")
-    assert_not_equal "trackable", users(:public_user).preferences.where(:k => "gps.trace.visibility").first.v
-    basic_authorization(users(:public_user).display_name, "test")
+    create(:user_preference, :user => user, :k => "gps.trace.visibility", :v => "identifiable")
+    assert_not_equal "trackable", user.preferences.where(:k => "gps.trace.visibility").first.v
+    basic_authorization(user.display_name, "test")
     post :api_create, :file => file, :description => "New Trace", :tags => "new,trace", :visibility => "trackable"
     assert_response :success
     trace = Trace.find(response.body.to_i)
@@ -830,14 +826,14 @@ class TraceControllerTest < ActionController::TestCase
     assert_equal false, trace.inserted
     assert_equal File.new(fixture).read, File.new(trace.trace_name).read
     trace.destroy
-    assert_equal "trackable", users(:public_user).preferences.where(:k => "gps.trace.visibility").first.v
+    assert_equal "trackable", user.preferences.where(:k => "gps.trace.visibility").first.v
 
     # Rewind the file
     file.rewind
 
     # Now authenticated, with the legacy public flag
-    assert_not_equal "public", users(:public_user).preferences.where(:k => "gps.trace.visibility").first.v
-    basic_authorization(users(:public_user).display_name, "test")
+    assert_not_equal "public", user.preferences.where(:k => "gps.trace.visibility").first.v
+    basic_authorization(user.display_name, "test")
     post :api_create, :file => file, :description => "New Trace", :tags => "new,trace", :public => 1
     assert_response :success
     trace = Trace.find(response.body.to_i)
@@ -848,14 +844,15 @@ class TraceControllerTest < ActionController::TestCase
     assert_equal false, trace.inserted
     assert_equal File.new(fixture).read, File.new(trace.trace_name).read
     trace.destroy
-    assert_equal "public", users(:public_user).preferences.where(:k => "gps.trace.visibility").first.v
+    assert_equal "public", user.preferences.where(:k => "gps.trace.visibility").first.v
 
     # Rewind the file
     file.rewind
 
     # Now authenticated, with the legacy private flag
-    assert_nil users(:second_public_user).preferences.where(:k => "gps.trace.visibility").first
-    basic_authorization(users(:second_public_user).display_name, "test")
+    second_user = create(:user)
+    assert_nil second_user.preferences.where(:k => "gps.trace.visibility").first
+    basic_authorization(second_user.display_name, "test")
     post :api_create, :file => file, :description => "New Trace", :tags => "new,trace", :public => 0
     assert_response :success
     trace = Trace.find(response.body.to_i)
@@ -866,14 +863,14 @@ class TraceControllerTest < ActionController::TestCase
     assert_equal false, trace.inserted
     assert_equal File.new(fixture).read, File.new(trace.trace_name).read
     trace.destroy
-    assert_equal "private", users(:second_public_user).preferences.where(:k => "gps.trace.visibility").first.v
+    assert_equal "private", second_user.preferences.where(:k => "gps.trace.visibility").first.v
   end
 
   # Check updating a trace through the api
   def test_api_update
-    public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user), :fixture => "a")
-    deleted_trace_file = create(:trace, :deleted, :user => users(:public_user))
-    anon_trace_file = create(:trace, :visibility => "private", :user => users(:public_user))
+    public_trace_file = create(:trace, :visibility => "public", :fixture => "a")
+    deleted_trace_file = create(:trace, :deleted)
+    anon_trace_file = create(:trace, :visibility => "private")
 
     # First with no auth
     content public_trace_file.to_xml
@@ -881,32 +878,32 @@ class TraceControllerTest < ActionController::TestCase
     assert_response :unauthorized
 
     # Now with some other user, which should fail
-    basic_authorization(users(:public_user).display_name, "test")
+    basic_authorization(create(:user).display_name, "test")
     content public_trace_file.to_xml
     put :api_update, :id => public_trace_file.id
     assert_response :forbidden
 
     # Now with a trace which doesn't exist
-    basic_authorization(users(:public_user).display_name, "test")
+    basic_authorization(create(:user).display_name, "test")
     content public_trace_file.to_xml
     put :api_update, :id => 0
     assert_response :not_found
 
     # Now with a trace which did exist but has been deleted
-    basic_authorization(users(:public_user).display_name, "test")
+    basic_authorization(deleted_trace_file.user.display_name, "test")
     content deleted_trace_file.to_xml
     put :api_update, :id => deleted_trace_file.id
     assert_response :not_found
 
     # Now try an update with the wrong ID
-    basic_authorization(users(:normal_user).display_name, "test")
+    basic_authorization(public_trace_file.user.display_name, "test")
     content anon_trace_file.to_xml
     put :api_update, :id => public_trace_file.id
     assert_response :bad_request,
                     "should not be able to update a trace with a different ID from the XML"
 
     # And finally try an update that should work
-    basic_authorization(users(:normal_user).display_name, "test")
+    basic_authorization(public_trace_file.user.display_name, "test")
     t = public_trace_file
     t.description = "Changed description"
     t.visibility = "private"
@@ -920,29 +917,29 @@ class TraceControllerTest < ActionController::TestCase
 
   # Check deleting a trace through the api
   def test_api_delete
-    public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user))
+    public_trace_file = create(:trace, :visibility => "public")
 
     # First with no auth
     delete :api_delete, :id => public_trace_file.id
     assert_response :unauthorized
 
     # Now with some other user, which should fail
-    basic_authorization(users(:public_user).display_name, "test")
+    basic_authorization(create(:user).display_name, "test")
     delete :api_delete, :id => public_trace_file.id
     assert_response :forbidden
 
     # Now with a trace which doesn't exist
-    basic_authorization(users(:public_user).display_name, "test")
+    basic_authorization(create(:user).display_name, "test")
     delete :api_delete, :id => 0
     assert_response :not_found
 
     # And finally we should be able to do it with the owner of the trace
-    basic_authorization(users(:normal_user).display_name, "test")
+    basic_authorization(public_trace_file.user.display_name, "test")
     delete :api_delete, :id => public_trace_file.id
     assert_response :success
 
     # Try it a second time, which should fail
-    basic_authorization(users(:normal_user).display_name, "test")
+    basic_authorization(public_trace_file.user.display_name, "test")
     delete :api_delete, :id => public_trace_file.id
     assert_response :not_found
   end
diff --git a/test/models/message_test.rb b/test/models/message_test.rb
index 4f8c4b8e2..e2d87136e 100644
--- a/test/models/message_test.rb
+++ b/test/models/message_test.rb
@@ -76,6 +76,8 @@ class MessageTest < ActiveSupport::TestCase
   end
 
   def test_from_mail_plain
+    sender_user = create(:user)
+    recipient_user = create(:user)
     mail = Mail.new do
       from "from@example.com"
       to "to@example.com"
@@ -84,9 +86,9 @@ class MessageTest < ActiveSupport::TestCase
       content_type "text/plain; charset=utf-8"
       body "This is a test & a message"
     end
-    message = Message.from_mail(mail, users(:normal_user), users(:public_user))
-    assert_equal users(:normal_user), message.sender
-    assert_equal users(:public_user), message.recipient
+    message = Message.from_mail(mail, sender_user, recipient_user)
+    assert_equal sender_user, message.sender
+    assert_equal recipient_user, message.recipient
     assert_equal mail.date, message.sent_on
     assert_equal "Test message", message.title
     assert_equal "This is a test & a message", message.body
@@ -94,6 +96,8 @@ class MessageTest < ActiveSupport::TestCase
   end
 
   def test_from_mail_html
+    sender_user = create(:user)
+    recipient_user = create(:user)
     mail = Mail.new do
       from "from@example.com"
       to "to@example.com"
@@ -102,9 +106,9 @@ class MessageTest < ActiveSupport::TestCase
       content_type "text/html; charset=utf-8"
       body "<p>This is a <b>test</b> &amp; a message</p>"
     end
-    message = Message.from_mail(mail, users(:normal_user), users(:public_user))
-    assert_equal users(:normal_user), message.sender
-    assert_equal users(:public_user), message.recipient
+    message = Message.from_mail(mail, sender_user, recipient_user)
+    assert_equal sender_user, message.sender
+    assert_equal recipient_user, message.recipient
     assert_equal mail.date, message.sent_on
     assert_equal "Test message", message.title
     assert_match /^ *This is a test & a message *$/, message.body
@@ -112,6 +116,8 @@ class MessageTest < ActiveSupport::TestCase
   end
 
   def test_from_mail_multipart
+    sender_user = create(:user)
+    recipient_user = create(:user)
     mail = Mail.new do
       from "from@example.com"
       to "to@example.com"
@@ -128,9 +134,9 @@ class MessageTest < ActiveSupport::TestCase
         body "<p>This is a <b>test</b> &amp; a message in HTML format</p>"
       end
     end
-    message = Message.from_mail(mail, users(:normal_user), users(:public_user))
-    assert_equal users(:normal_user), message.sender
-    assert_equal users(:public_user), message.recipient
+    message = Message.from_mail(mail, sender_user, recipient_user)
+    assert_equal sender_user, message.sender
+    assert_equal recipient_user, message.recipient
     assert_equal mail.date, message.sent_on
     assert_equal "Test message", message.title
     assert_equal "This is a test & a message in text format", message.body
@@ -147,9 +153,9 @@ class MessageTest < ActiveSupport::TestCase
         body "<p>This is a <b>test</b> &amp; a message in HTML format</p>"
       end
     end
-    message = Message.from_mail(mail, users(:normal_user), users(:public_user))
-    assert_equal users(:normal_user), message.sender
-    assert_equal users(:public_user), message.recipient
+    message = Message.from_mail(mail, sender_user, recipient_user)
+    assert_equal sender_user, message.sender
+    assert_equal recipient_user, message.recipient
     assert_equal mail.date, message.sent_on
     assert_equal "Test message", message.title
     assert_match /^ *This is a test & a message in HTML format *$/, message.body
@@ -157,6 +163,8 @@ class MessageTest < ActiveSupport::TestCase
   end
 
   def test_from_mail_prefix
+    sender_user = create(:user)
+    recipient_user = create(:user)
     mail = Mail.new do
       from "from@example.com"
       to "to@example.com"
@@ -165,9 +173,9 @@ class MessageTest < ActiveSupport::TestCase
       content_type "text/plain; charset=utf-8"
       body "This is a test & a message"
     end
-    message = Message.from_mail(mail, users(:normal_user), users(:public_user))
-    assert_equal users(:normal_user), message.sender
-    assert_equal users(:public_user), message.recipient
+    message = Message.from_mail(mail, sender_user, recipient_user)
+    assert_equal sender_user, message.sender
+    assert_equal recipient_user, message.recipient
     assert_equal mail.date, message.sent_on
     assert_equal "Test message", message.title
     assert_equal "This is a test & a message", message.body
diff --git a/test/models/node_test.rb b/test/models/node_test.rb
index 7d43362d2..85bdfc995 100644
--- a/test/models/node_test.rb
+++ b/test/models/node_test.rb
@@ -84,7 +84,7 @@ class NodeTest < ActiveSupport::TestCase
       :visible => 1,
       :version => 1
     )
-    assert node_template.create_with_history(users(:normal_user))
+    assert node_template.create_with_history(changesets(:normal_user_first_change).user)
 
     node = Node.find(node_template.id)
     assert_not_nil node
@@ -116,7 +116,7 @@ class NodeTest < ActiveSupport::TestCase
     node_template.latitude = 12.3456
     node_template.longitude = 65.4321
     # node_template.tags = "updated=yes"
-    assert node.update_from(node_template, users(:normal_user))
+    assert node.update_from(node_template, current_nodes(:visible_node).changeset.user)
 
     node = Node.find(node_template.id)
     assert_not_nil node
@@ -144,7 +144,7 @@ class NodeTest < ActiveSupport::TestCase
     node = Node.find(node_template.id)
     assert_not_nil node
 
-    assert node.delete_with_history!(node_template, users(:normal_user))
+    assert node.delete_with_history!(node_template, current_nodes(:visible_node).changeset.user)
 
     node = Node.find(node_template.id)
     assert_not_nil node
diff --git a/test/models/note_test.rb b/test/models/note_test.rb
index d4bd36e74..e3831b2c0 100644
--- a/test/models/note_test.rb
+++ b/test/models/note_test.rb
@@ -54,8 +54,9 @@ class NoteTest < ActiveSupport::TestCase
     comment = create(:note_comment)
     assert_nil comment.note.author
 
-    comment = create(:note_comment, :author => users(:normal_user))
-    assert_equal users(:normal_user), comment.note.author
+    user = create(:user)
+    comment = create(:note_comment, :author => user)
+    assert_equal user, comment.note.author
   end
 
   def test_author_ip
diff --git a/test/models/oauth_token_test.rb b/test/models/oauth_token_test.rb
index c2df0d131..4b0e39e9a 100644
--- a/test/models/oauth_token_test.rb
+++ b/test/models/oauth_token_test.rb
@@ -1,8 +1,6 @@
 require "test_helper"
 
 class OauthTokenTest < ActiveSupport::TestCase
-  api_fixtures
-
   ##
   # check that after calling invalidate! on a token, it is invalid.
   def test_token_invalidation
@@ -17,7 +15,7 @@ class OauthTokenTest < ActiveSupport::TestCase
   def test_token_authorisation
     tok = RequestToken.create(:client_application => create(:client_application))
     assert_equal false, tok.authorized?, "Token should be created unauthorised."
-    tok.authorize!(users(:public_user))
+    tok.authorize!(create(:user))
     assert_equal true, tok.authorized?, "Token should now be authorised."
     tok.invalidate!
     assert_equal false, tok.authorized?, "Token should now be invalid."
diff --git a/test/models/trace_test.rb b/test/models/trace_test.rb
index bc5122c13..4a6ac109d 100644
--- a/test/models/trace_test.rb
+++ b/test/models/trace_test.rb
@@ -3,8 +3,6 @@ require "digest"
 require "minitest/mock"
 
 class TraceTest < ActiveSupport::TestCase
-  fixtures :users
-
   def setup
     @gpx_trace_dir = Object.send("remove_const", "GPX_TRACE_DIR")
     Object.const_set("GPX_TRACE_DIR", Rails.root.join("test", "gpx", "traces"))
@@ -31,21 +29,25 @@ class TraceTest < ActiveSupport::TestCase
   end
 
   def test_visible_to
-    public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user))
-    anon_trace_file = create(:trace, :visibility => "private", :user => users(:public_user))
-    identifiable_trace_file = create(:trace, :visibility => "identifiable", :user => users(:normal_user))
-    pending_trace_file = create(:trace, :visibility => "public", :user => users(:public_user), :inserted => false)
-    trackable_trace_file = create(:trace, :visibility => "trackable", :user => users(:public_user))
-    _other_trace_file = create(:trace, :visibility => "private", :user => users(:second_public_user))
-
-    check_query(Trace.visible_to(users(:normal_user).id), [
+    first_user = create(:user)
+    second_user = create(:user)
+    third_user = create(:user)
+    fourth_user = create(:user)
+    public_trace_file = create(:trace, :visibility => "public", :user => first_user)
+    anon_trace_file = create(:trace, :visibility => "private", :user => second_user)
+    identifiable_trace_file = create(:trace, :visibility => "identifiable", :user => first_user)
+    pending_trace_file = create(:trace, :visibility => "public", :user => second_user, :inserted => false)
+    trackable_trace_file = create(:trace, :visibility => "trackable", :user => second_user)
+    _other_trace_file = create(:trace, :visibility => "private", :user => third_user)
+
+    check_query(Trace.visible_to(first_user), [
                   public_trace_file, identifiable_trace_file, pending_trace_file
                 ])
-    check_query(Trace.visible_to(users(:public_user)), [
+    check_query(Trace.visible_to(second_user), [
                   public_trace_file, anon_trace_file, trackable_trace_file,
                   identifiable_trace_file, pending_trace_file
                 ])
-    check_query(Trace.visible_to(users(:inactive_user)), [
+    check_query(Trace.visible_to(fourth_user), [
                   public_trace_file, identifiable_trace_file, pending_trace_file
                 ])
   end
diff --git a/test/models/user_preference_test.rb b/test/models/user_preference_test.rb
index 6f09d21c4..bceec0719 100644
--- a/test/models/user_preference_test.rb
+++ b/test/models/user_preference_test.rb
@@ -1,8 +1,6 @@
 require "test_helper"
 
 class UserPreferenceTest < ActiveSupport::TestCase
-  api_fixtures
-
   # Checks that you cannot add a new preference, that is a duplicate
   def test_add_duplicate_preference
     up = create(:user_preference)
@@ -19,7 +17,7 @@ class UserPreferenceTest < ActiveSupport::TestCase
     val = "v"
     (1..255).each do |i|
       up = UserPreference.new
-      up.user = users(:normal_user)
+      up.user = create(:user)
       up.k = key * i
       up.v = val * i
       assert up.valid?
@@ -35,7 +33,7 @@ class UserPreferenceTest < ActiveSupport::TestCase
     val = "v"
     [0, 256].each do |i|
       up = UserPreference.new
-      up.user = users(:normal_user)
+      up.user = create(:user)
       up.k = key * i
       up.v = val * i
       assert_equal false, up.valid?