From: Tom Hughes <tom@compton.nu>
Date: Sun, 5 Feb 2017 15:56:04 +0000 (+0000)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1347' into master
X-Git-Tag: live~3647
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/0814b4096c443e2ab3c09baa058aa81a00d205d1

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

0814b4096c443e2ab3c09baa058aa81a00d205d1
diff --cc Gemfile
index 34768095f,039216f93..c2578d6f5
--- a/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 a8c91f460,f4573658b..1fade149c
--- a/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/integration/oauth_test.rb
index ceee95892,ad3d5383d..8971b7a2b
--- a/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 10a4eb397,77674147f..dba005145
--- a/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