Merge remote-tracking branch 'openstreetmap/pull/1347' into master

diff --cc Gemfile
index 34768095f3ca07c2c7037df8fff3d531b992f8d5,039216f93e74a34b9778edd38a75d137384bfefd..c2578d6f597a484be19baec0197f3e67bc39a440
--- 1/Gemfile
--- 2/Gemfile
+++ b/Gemfile
@@@ -102,10 -98,10 +102,11 @@@ en
  
  # Gems needed for running tests
  group :test do
 -  gem "rubocop"
 -  gem "timecop"
    gem "minitest", "~> 5.1", :platforms => [:ruby_19, :ruby_20]
+   gem "minitest-stub_any_instance"
 +  gem "rubocop"
 +  gem "timecop"
 +  gem "webmock"
  end
  
  # Needed in development as well so rake can see konacha tasks

diff --cc Gemfile.lock
index a8c91f460cffcc1d140e492f806bd5c64541a473,f4573658b3c60cb70111debab56721ba27256e1a..1fade149c7bf3f241373929eb609449faaa41403
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -156,13 -149,14 +156,14 @@@ GE
      mime-types-data (3.2016.0521)
      mimemagic (0.3.0)
      mini_portile2 (2.1.0)
 -    minitest (5.9.1)
 +    minitest (5.10.1)
+     minitest-stub_any_instance (1.0.1)
      multi_json (1.12.1)
 -    multi_xml (0.5.5)
 +    multi_xml (0.6.0)
      multipart-post (2.0.0)
 -    nokogiri (1.6.8.1)
 +    nokogiri (1.7.0.1)
        mini_portile2 (~> 2.1.0)
 -    nokogumbo (1.4.9)
 +    nokogumbo (1.4.10)
        nokogiri
      oauth (0.4.7)
      oauth-plugin (0.5.1)

diff --cc test/controllers/amf_controller_test.rb
Simple merge

diff --cc test/controllers/api_controller_test.rb
Simple merge

diff --cc test/controllers/site_controller_test.rb
Simple merge

diff --cc test/controllers/user_controller_test.rb
Simple merge

diff --cc test/integration/oauth_test.rb
index ceee95892f966d672a4508e11d0a18692cf2c361,ad3d5383dba05ee151c6e27a0cd4658a38acfc31..8971b7a2b3b12984aa0ee980c73a91c9f5e42768
--- 1/test/integration/oauth_test.rb
--- 2/test/integration/oauth_test.rb
+++ b/test/integration/oauth_test.rb
@@@ -1,8 -1,7 +1,7 @@@
  require "test_helper"
  
  class OAuthTest < ActionDispatch::IntegrationTest
-   fixtures :users, :gpx_files
-   set_fixture_class :gpx_files => Trace
 -  fixtures :users, :client_applications
++  fixtures :users
  
    include OAuth::Helper
  

diff --cc test/test_helper.rb
index 10a4eb3971d6de1b74a0411803c982cb169626e4,77674147f6c346a7c6349aef27aca890fba1f01e..dba005145483604835b45f477f22388604dee6b7
--- 1/test/test_helper.rb
--- 2/test/test_helper.rb
+++ b/test/test_helper.rb
@@@ -42,14 -48,12 +42,9 @@@ module ActiveSuppor
        fixtures :relations
        set_fixture_class :relations => OldRelation
  
 -      fixtures :relation_members, :relation_tags
 +      fixtures :relation_members
        set_fixture_class :relation_members => OldRelationMember
 -      set_fixture_class :relation_tags => OldRelationTag
 -
 -      fixtures :client_applications
  
-       fixtures :gpx_files, :gps_points, :gpx_file_tags
-       set_fixture_class :gpx_files => Trace
-       set_fixture_class :gps_points => Tracepoint
-       set_fixture_class :gpx_file_tags => Tracetag
- 
        fixtures :redactions
      end