X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e59d6c567b2af5d6bc7f5f8d4512d7bd11a3e257..bc10bc87586f43e1ec9ca542524f7b8798b29029:/test/test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 68b4a5018..d41a369f8 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -5,56 +5,11 @@ ENV["RAILS_ENV"] = "test"
 require File.expand_path("../../config/environment", __FILE__)
 require "rails/test_help"
 require "webmock/minitest"
-load "composite_primary_keys/fixtures.rb"
 
 module ActiveSupport
   class TestCase
     include FactoryGirl::Syntax::Methods
 
-    # Load standard fixtures needed to test API methods
-    def self.api_fixtures
-      # print "setting up the api_fixtures"
-      fixtures :users, :user_roles
-      fixtures :changesets
-
-      fixtures :current_nodes, :nodes
-      set_fixture_class :current_nodes => Node
-      set_fixture_class :nodes => OldNode
-
-      fixtures :current_ways
-      set_fixture_class :current_ways => Way
-
-      fixtures :current_way_nodes
-      set_fixture_class :current_way_nodes => WayNode
-
-      fixtures :ways
-      set_fixture_class :ways => OldWay
-
-      fixtures :way_nodes
-      set_fixture_class :way_nodes => OldWayNode
-
-      fixtures :current_relations
-      set_fixture_class :current_relations => Relation
-
-      fixtures :current_relation_members
-      set_fixture_class :current_relation_members => RelationMember
-
-      fixtures :relations
-      set_fixture_class :relations => OldRelation
-
-      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
-
     ##
     # takes a block which is executed in the context of a different
     # ActionController instance. this is used so that code can call methods
@@ -187,15 +142,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