X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7cc1cc618d1512314a5942188db58f03113fe56e..6fae46122e103048f1d8308d5403f443296965a3:/test/test_helper.rb diff --git a/test/test_helper.rb b/test/test_helper.rb index 420512e74..88cfe4831 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -15,7 +15,7 @@ module ActiveSupport def self.api_fixtures # print "setting up the api_fixtures" fixtures :users, :user_roles - fixtures :changesets, :changeset_tags + fixtures :changesets fixtures :current_nodes, :nodes set_fixture_class :current_nodes => Node @@ -175,7 +175,7 @@ module ActiveSupport stub_request(:get, url).and_return(:status => status, :body => body) end - def stub_signup_requests + def stub_hostip_requests # Controller tests and integration tests use different IPs stub_request(:get, "http://api.hostip.info/country.php?ip=0.0.0.0") stub_request(:get, "http://api.hostip.info/country.php?ip=127.0.0.1")