From 1a38e9b3153db74626671b6727c7c139a249bf09 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 25 Apr 2014 00:22:43 +0100 Subject: [PATCH] Don't pass strings to set_fixture_class --- test/controllers/trace_controller_test.rb | 2 +- test/test_helper.rb | 38 +++++++++++------------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/test/controllers/trace_controller_test.rb b/test/controllers/trace_controller_test.rb index 01c81a1aa..8cbc14b31 100644 --- a/test/controllers/trace_controller_test.rb +++ b/test/controllers/trace_controller_test.rb @@ -2,7 +2,7 @@ require 'test_helper' class TraceControllerTest < ActionController::TestCase fixtures :users, :gpx_files - set_fixture_class :gpx_files => 'Trace' + set_fixture_class :gpx_files => Trace def setup @gpx_trace_dir = Object.send("remove_const", "GPX_TRACE_DIR") diff --git a/test/test_helper.rb b/test/test_helper.rb index 4e95bb7a8..9464d6623 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -10,45 +10,45 @@ class ActiveSupport::TestCase fixtures :users, :user_roles, :changesets, :changeset_tags fixtures :current_nodes, :nodes - set_fixture_class :current_nodes => 'Node' - set_fixture_class :nodes => 'OldNode' + set_fixture_class :current_nodes => Node + set_fixture_class :nodes => OldNode fixtures :current_node_tags,:node_tags - set_fixture_class :current_node_tags => 'NodeTag' - set_fixture_class :node_tags => 'OldNodeTag' + set_fixture_class :current_node_tags => NodeTag + set_fixture_class :node_tags => OldNodeTag fixtures :current_ways - set_fixture_class :current_ways => 'Way' + set_fixture_class :current_ways => Way fixtures :current_way_nodes, :current_way_tags - set_fixture_class :current_way_nodes => 'WayNode' - set_fixture_class :current_way_tags => 'WayTag' + set_fixture_class :current_way_nodes => WayNode + set_fixture_class :current_way_tags => WayTag fixtures :ways - set_fixture_class :ways => 'OldWay' + set_fixture_class :ways => OldWay fixtures :way_nodes, :way_tags - set_fixture_class :way_nodes => 'OldWayNode' - set_fixture_class :way_tags => 'OldWayTag' + set_fixture_class :way_nodes => OldWayNode + set_fixture_class :way_tags => OldWayTag fixtures :current_relations - set_fixture_class :current_relations => 'Relation' + set_fixture_class :current_relations => Relation fixtures :current_relation_members, :current_relation_tags - set_fixture_class :current_relation_members => 'RelationMember' - set_fixture_class :current_relation_tags => 'RelationTag' + set_fixture_class :current_relation_members => RelationMember + set_fixture_class :current_relation_tags => RelationTag fixtures :relations - set_fixture_class :relations => 'OldRelation' + set_fixture_class :relations => OldRelation fixtures :relation_members, :relation_tags - set_fixture_class :relation_members => 'OldRelationMember' - set_fixture_class :relation_tags => 'OldRelationTag' + set_fixture_class :relation_members => OldRelationMember + set_fixture_class :relation_tags => OldRelationTag 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' + set_fixture_class :gpx_files => Trace + set_fixture_class :gps_points => Tracepoint + set_fixture_class :gpx_file_tags => Tracetag fixtures :client_applications -- 2.39.5