X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/392b68a65fd6ffa521b89e079b234bb0241380d3..4cd2d22788cbc8acf411c9f9436eee85a4590c5f:/test/controllers/site_controller_test.rb

diff --git a/test/controllers/site_controller_test.rb b/test/controllers/site_controller_test.rb
index 37f457523..681df7945 100644
--- a/test/controllers/site_controller_test.rb
+++ b/test/controllers/site_controller_test.rb
@@ -172,7 +172,7 @@ class SiteControllerTest < ActionController::TestCase
 
   # Test the right editor gets used when the user hasn't set a preference
   def test_edit_without_preference
-    get :edit, nil, :user => users(:public_user)
+    get :edit, nil, :user => create(:user)
     assert_response :success
     assert_template "edit"
     assert_template :partial => "_#{DEFAULT_EDITOR}", :count => 1
@@ -180,7 +180,7 @@ class SiteControllerTest < ActionController::TestCase
 
   # Test the right editor gets used when the user has set a preference
   def test_edit_with_preference
-    user = users(:public_user)
+    user = create(:user)
     user.preferred_editor = "id"
     user.save!
 
@@ -189,7 +189,7 @@ class SiteControllerTest < ActionController::TestCase
     assert_template "edit"
     assert_template :partial => "_id", :count => 1
 
-    user = users(:public_user)
+    user = create(:user)
     user.preferred_editor = "potlatch2"
     user.save!
 
@@ -198,7 +198,7 @@ class SiteControllerTest < ActionController::TestCase
     assert_template "edit"
     assert_template :partial => "_potlatch2", :count => 1
 
-    user = users(:public_user)
+    user = create(:user)
     user.preferred_editor = "potlatch"
     user.save!
 
@@ -207,7 +207,7 @@ class SiteControllerTest < ActionController::TestCase
     assert_template "edit"
     assert_template :partial => "_potlatch", :count => 1
 
-    user = users(:public_user)
+    user = create(:user)
     user.preferred_editor = "remote"
     user.save!
 
@@ -218,30 +218,30 @@ class SiteControllerTest < ActionController::TestCase
 
   # Test the right editor gets used when the URL has an override
   def test_edit_with_override
-    get :edit, { :editor => "id" }, { :user => users(:public_user) }
+    get :edit, { :editor => "id" }, { :user => create(:user) }
     assert_response :success
     assert_template "edit"
     assert_template :partial => "_id", :count => 1
 
-    get :edit, { :editor => "potlatch2" }, { :user => users(:public_user) }
+    get :edit, { :editor => "potlatch2" }, { :user => create(:user) }
     assert_response :success
     assert_template "edit"
     assert_template :partial => "_potlatch2", :count => 1
 
-    get :edit, { :editor => "potlatch" }, { :user => users(:public_user) }
+    get :edit, { :editor => "potlatch" }, { :user => create(:user) }
     assert_response :success
     assert_template "edit"
     assert_template :partial => "_potlatch", :count => 1
 
-    get :edit, { :editor => "remote" }, { :user => users(:public_user) }
+    get :edit, { :editor => "remote" }, { :user => create(:user) }
     assert_response :success
     assert_template "index"
   end
 
   # Test editing a specific node
   def test_edit_with_node
-    user = users(:public_user)
-    node = current_nodes(:visible_node)
+    user = create(:user)
+    node = create(:node, :lat => 1.0, :lon => 1.0)
 
     get :edit, { :node => node.id }, { :user => user }
     assert_response :success
@@ -253,8 +253,10 @@ class SiteControllerTest < ActionController::TestCase
 
   # Test editing a specific way
   def test_edit_with_way
-    user = users(:public_user)
-    way  = current_ways(:visible_way)
+    user = create(:user)
+    node = create(:node, :lat => 3, :lon => 3)
+    way  = create(:way)
+    create(:way_node, :node => node, :way => way)
 
     get :edit, { :way => way.id }, { :user => user }
     assert_response :success
@@ -266,7 +268,7 @@ class SiteControllerTest < ActionController::TestCase
 
   # Test editing a specific note
   def test_edit_with_note
-    user = users(:public_user)
+    user = create(:user)
     note = create(:note) do |n|
       n.comments.create(:author_id => user.id)
     end
@@ -281,7 +283,7 @@ class SiteControllerTest < ActionController::TestCase
 
   # Test editing a specific GPX trace
   def test_edit_with_gpx
-    user = users(:public_user)
+    user = create(:user)
     gpx  = create(:trace, :latitude => 1, :longitude => 1)
 
     get :edit, { :gpx => gpx.id }, { :user => user }
@@ -317,7 +319,7 @@ class SiteControllerTest < ActionController::TestCase
     assert_response :redirect
     assert_redirected_to :controller => :user, :action => :login, :referer => "/welcome"
 
-    get :welcome, nil, :user => users(:public_user)
+    get :welcome, nil, :user => create(:user)
     assert_response :success
     assert_template "welcome"
   end
@@ -377,7 +379,7 @@ class SiteControllerTest < ActionController::TestCase
 
   # Test the id frame
   def test_id
-    get :id, nil, :user => users(:public_user)
+    get :id, nil, :user => create(:user)
     assert_response :success
     assert_template "id"
     assert_template :layout => false