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

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 9633989cda4d109278d828b049688545b832159b..10a4eb3971d6de1b74a0411803c982cb169626e4 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -50,8 +50,6 @@ module ActiveSupport
       set_fixture_class :gps_points => Tracepoint
       set_fixture_class :gpx_file_tags => Tracetag
 
-      fixtures :client_applications
-
       fixtures :redactions
     end
 
@@ -185,5 +183,15 @@ module ActiveSupport
       stub_request(:get, "http://api.hostip.info/country.php?ip=0.0.0.0")
       stub_request(:get, "http://api.hostip.info/country.php?ip=127.0.0.1")
     end
+
+    def email_text_parts(message)
+      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
+    end
   end
 end