X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/1891efef06872740184a2abc9ecfdb9f263c9ba5..6b7ebf6dc40da609267ad38df981cd31d99e1538:/test/test_helper.rb diff --git a/test/test_helper.rb b/test/test_helper.rb index 4bd228f14..419ea1806 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -8,10 +8,13 @@ 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" - fixtures :users, :user_roles, :user_blocks, :changesets, :changeset_tags + fixtures :users, :user_roles, :user_blocks + fixtures :changesets, :changeset_tags, :changeset_comments fixtures :current_nodes, :nodes set_fixture_class :current_nodes => Node @@ -166,8 +169,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