X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/f02729fa9a29089224502fecc7bf347fa73db0dd..6bc488a98397c00b9c6d07480cfb78c2aea729a6:/test/test_helper.rb diff --git a/test/test_helper.rb b/test/test_helper.rb index 419ea1806..7624c0b34 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -4,6 +4,7 @@ Coveralls.wear!("rails") ENV["RAILS_ENV"] = "test" require File.expand_path("../../config/environment", __FILE__) require "rails/test_help" +require "webmock/minitest" load "composite_primary_keys/fixtures.rb" module ActiveSupport @@ -13,8 +14,8 @@ module ActiveSupport # Load standard fixtures needed to test API methods def self.api_fixtures # print "setting up the api_fixtures" - fixtures :users, :user_roles, :user_blocks - fixtures :changesets, :changeset_tags, :changeset_comments + fixtures :users, :user_roles + fixtures :changesets, :changeset_tags fixtures :current_nodes, :nodes set_fixture_class :current_nodes => Node @@ -60,8 +61,6 @@ module ActiveSupport fixtures :client_applications fixtures :redactions - - fixtures :notes, :note_comments end ##