From: Tom Hughes <tom@compton.nu>
Date: Wed, 29 Nov 2017 20:35:17 +0000 (+0000)
Subject: Update rack-test and patch test issues
X-Git-Tag: live~4094
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/2ef803b9dfa0490d23984c326087c3a757c723e7

Update rack-test and patch test issues
---

diff --git a/Gemfile.lock b/Gemfile.lock
index 645610cf7..1cff44151 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -236,7 +236,7 @@ GEM
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
-    rack-test (0.7.0)
+    rack-test (0.8.2)
       rack (>= 1.0, < 3)
     rack-uri_sanitizer (0.0.2)
     rails (5.1.4)
diff --git a/test/controllers/trace_controller_test.rb b/test/controllers/trace_controller_test.rb
index 182fe8c02..2dafa5394 100644
--- a/test/controllers/trace_controller_test.rb
+++ b/test/controllers/trace_controller_test.rb
@@ -550,6 +550,9 @@ class TraceControllerTest < ActionController::TestCase
     post :create, :params => { :trace => { :gpx_file => file, :description => "New Trace", :tagstring => "new,trace", :visibility => "trackable" } }
     assert_response :forbidden
 
+    # Rewind the file
+    file.rewind
+
     # Now authenticated
     create(:user_preference, :user => user, :k => "gps.trace.visibility", :v => "identifiable")
     assert_not_equal "trackable", user.preferences.where(:k => "gps.trace.visibility").first.v
@@ -829,6 +832,9 @@ class TraceControllerTest < ActionController::TestCase
     post :api_create, :params => { :file => file, :description => "New Trace", :tags => "new,trace", :visibility => "trackable" }
     assert_response :unauthorized
 
+    # Rewind the file
+    file.rewind
+
     # Now authenticated
     create(:user_preference, :user => user, :k => "gps.trace.visibility", :v => "identifiable")
     assert_not_equal "trackable", user.preferences.where(:k => "gps.trace.visibility").first.v