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

[rails.git] / test / controllers / site_controller_test.rb

diff --git a/test/controllers/site_controller_test.rb b/test/controllers/site_controller_test.rb
index 7935b4b2aed4f078de439a8038c4f12e6f99f50b..5efddd52e0914d7afa59ea54dfc80ab287ccbe5d 100644 (file)
--- 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
 
   ##
@@ -236,33 +238,6 @@ class SiteControllerTest < ActionController::TestCase
     assert_template "index"
   end
 
-  # Test the right editor gets used when the browser is IE
-  def test_edit_with_ie
-    @request.env["HTTP_USER_AGENT"] = "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.1; Trident/7.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0; .NET4.0C; .NET4.0E)"
-
-    get :edit, {}, { :user => users(:public_user).id }
-    assert_response :success
-    assert_template "edit"
-    assert_template :partial => "_potlatch2", :count => 1
-
-    get :edit, { :editor => "id" }, { :user => users(:public_user).id }
-    assert_response :success
-    assert_template "edit"
-    assert_template :partial => "_potlatch2", :count => 1
-
-    @request.env["HTTP_USER_AGENT"] = "Mozilla/5.0 (Windows NT 6.3; WOW64; Trident/7.0; rv:11.0) like Gecko"
-
-    get :edit, {}, { :user => users(:public_user).id }
-    assert_response :success
-    assert_template "edit"
-    assert_template :partial => "_potlatch2", :count => 1
-
-    get :edit, { :editor => "id" }, { :user => users(:public_user).id }
-    assert_response :success
-    assert_template "edit"
-    assert_template :partial => "_potlatch2", :count => 1
-  end
-
   # Test editing a specific node
   def test_edit_with_node
     user = users(:public_user)
@@ -292,7 +267,9 @@ class SiteControllerTest < ActionController::TestCase
   # Test editing a specific note
   def test_edit_with_note
     user = users(:public_user)
-    note = notes(:open_note)
+    note = create(:note) do |n|
+      n.comments.create(:author_id => user.id)
+    end
 
     get :edit, { :note => note.id }, { :user => user.id }
     assert_response :success