Merge remote-tracking branch 'openstreetmap/pull/1496'

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 68b4a5018ffe5c2ee47d40d1832c39589501afdd..dba005145483604835b45f477f22388604dee6b7 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -45,13 +45,6 @@ module ActiveSupport
       fixtures :relation_members
       set_fixture_class :relation_members => OldRelationMember
 
-      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 :client_applications
-
       fixtures :redactions
     end
 
@@ -187,15 +180,13 @@ module ActiveSupport
     end
 
     def email_text_parts(message)
-      text_parts = []
-      message.parts.each do |part|
+      message.parts.each_with_object([]) do |part, text_parts|
         if part.content_type.start_with?("text/")
           text_parts.push(part)
         elsif part.multipart?
           text_parts.concat(email_text_parts(part))
         end
       end
-      text_parts
     end
   end
 end