X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9a9b045372a6f48420a9a6dacfde52c34ab7abce..c2e12ed77d8223737fe8f8e2e2b21a0822153fa1:/test/test_helper.rb diff --git a/test/test_helper.rb b/test/test_helper.rb index 15b03b4da..42b7cc498 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -8,6 +8,8 @@ load "composite_primary_keys/fixtures.rb" module ActiveSupport class TestCase + include FactoryGirl::Syntax::Methods + # Load standard fixtures needed to test API methods def self.api_fixtures # print "setting up the api_fixtures" @@ -58,8 +60,6 @@ module ActiveSupport fixtures :client_applications fixtures :redactions - - fixtures :notes, :note_comments end ## @@ -167,8 +167,8 @@ module ActiveSupport OSM.http_client = Faraday.new do |builder| builder.adapter :test do |stub| - stubs.each do |url, body| - stub.get(url) { |_env| [200, {}, body] } + stubs.each do |url, response| + stub.get(url) { |_env| [response["code"], {}, response["body"]] } end end end