X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3123822bba5865e81e8c10be16452a0a8b5362f9..d3d6e9902c8b03fcd31df253cf395f06f757880a:/test/controllers/site_controller_test.rb diff --git a/test/controllers/site_controller_test.rb b/test/controllers/site_controller_test.rb index f385ccff0..71ccc4e51 100644 --- a/test/controllers/site_controller_test.rb +++ b/test/controllers/site_controller_test.rb @@ -8,6 +8,8 @@ class SiteControllerTest < ActionController::TestCase def setup Object.const_set("ID_KEY", client_applications(:oauth_web_app).key) Object.const_set("POTLATCH2_KEY", client_applications(:oauth_web_app).key) + + stub_request(:get, "http://api.hostip.info/country.php?ip=0.0.0.0") end ## @@ -265,8 +267,9 @@ class SiteControllerTest < ActionController::TestCase # Test editing a specific note def test_edit_with_note user = users(:public_user) - note = create(:note) - create(:note_comment, :author_id => user.id) + note = create(:note) do |n| + n.comments.create(:author_id => user.id) + end get :edit, { :note => note.id }, { :user => user.id } assert_response :success