X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/98e2884f77c4b5ada7fea0e8fddbc4312006bbf4..df721bc653b4e120b35ff822b4e55573319ae628:/test/controllers/site_controller_test.rb

diff --git a/test/controllers/site_controller_test.rb b/test/controllers/site_controller_test.rb
index 453af4550..a4388ef6c 100644
--- a/test/controllers/site_controller_test.rb
+++ b/test/controllers/site_controller_test.rb
@@ -6,8 +6,10 @@ class SiteControllerTest < ActionController::TestCase
   ##
   # setup oauth keys
   def setup
-    Object.const_set("ID_KEY", client_applications(:oauth_web_app).key)
-    Object.const_set("POTLATCH2_KEY", client_applications(:oauth_web_app).key)
+    Object.const_set("ID_KEY", create(:client_application).key)
+    Object.const_set("POTLATCH2_KEY", create(:client_application).key)
+
+    stub_hostip_requests
   end
 
   ##
@@ -170,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).id
+    get :edit, nil, :user => create(:user)
     assert_response :success
     assert_template "edit"
     assert_template :partial => "_#{DEFAULT_EDITOR}", :count => 1
@@ -178,70 +180,70 @@ 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!
 
-    get :edit, nil, :user => user.id
+    get :edit, nil, :user => user
     assert_response :success
     assert_template "edit"
     assert_template :partial => "_id", :count => 1
 
-    user = users(:public_user)
+    user = create(:user)
     user.preferred_editor = "potlatch2"
     user.save!
 
-    get :edit, nil, :user => user.id
+    get :edit, nil, :user => user
     assert_response :success
     assert_template "edit"
     assert_template :partial => "_potlatch2", :count => 1
 
-    user = users(:public_user)
+    user = create(:user)
     user.preferred_editor = "potlatch"
     user.save!
 
-    get :edit, nil, :user => user.id
+    get :edit, nil, :user => user
     assert_response :success
     assert_template "edit"
     assert_template :partial => "_potlatch", :count => 1
 
-    user = users(:public_user)
+    user = create(:user)
     user.preferred_editor = "remote"
     user.save!
 
-    get :edit, nil, :user => user.id
+    get :edit, nil, :user => user
     assert_response :success
     assert_template "index"
   end
 
   # 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).id }
+    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).id }
+    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).id }
+    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).id }
+    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.id }
+    get :edit, { :node => node.id }, { :user => user }
     assert_response :success
     assert_template "edit"
     assert_equal 1.0, assigns(:lat)
@@ -251,10 +253,10 @@ class SiteControllerTest < ActionController::TestCase
 
   # Test editing a specific way
   def test_edit_with_way
-    user = users(:public_user)
+    user = create(:user)
     way  = current_ways(:visible_way)
 
-    get :edit, { :way => way.id }, { :user => user.id }
+    get :edit, { :way => way.id }, { :user => user }
     assert_response :success
     assert_template "edit"
     assert_equal 3.0, assigns(:lat)
@@ -264,10 +266,12 @@ class SiteControllerTest < ActionController::TestCase
 
   # Test editing a specific note
   def test_edit_with_note
-    user = users(:public_user)
-    note = notes(:open_note)
+    user = create(:user)
+    note = create(:note) do |n|
+      n.comments.create(:author_id => user.id)
+    end
 
-    get :edit, { :note => note.id }, { :user => user.id }
+    get :edit, { :note => note.id }, { :user => user }
     assert_response :success
     assert_template "edit"
     assert_equal 1.0, assigns(:lat)
@@ -277,10 +281,10 @@ class SiteControllerTest < ActionController::TestCase
 
   # Test editing a specific GPX trace
   def test_edit_with_gpx
-    user = users(:public_user)
-    gpx  = gpx_files(:public_trace_file)
+    user = create(:user)
+    gpx  = create(:trace, :latitude => 1, :longitude => 1)
 
-    get :edit, { :gpx => gpx.id }, { :user => user.id }
+    get :edit, { :gpx => gpx.id }, { :user => user }
     assert_response :success
     assert_template "edit"
     assert_equal 1.0, assigns(:lat)
@@ -313,7 +317,7 @@ class SiteControllerTest < ActionController::TestCase
     assert_response :redirect
     assert_redirected_to :controller => :user, :action => :login, :referer => "/welcome"
 
-    get :welcome, nil, :user => users(:public_user).id
+    get :welcome, nil, :user => create(:user)
     assert_response :success
     assert_template "welcome"
   end
@@ -373,7 +377,7 @@ class SiteControllerTest < ActionController::TestCase
 
   # Test the id frame
   def test_id
-    get :id, nil, :user => users(:public_user).id
+    get :id, nil, :user => create(:user)
     assert_response :success
     assert_template "id"
     assert_template :layout => false