Factor out loading of the various fixtures needed to test API calls

into a shared method.

diff --git a/test/functional/node_controller_test.rb b/test/functional/node_controller_test.rb
index 8d6d9b03531cc80826a3ee9fe3ef4e6309bd07cc..bd1be9e69931b9cf75fc253da28c9cdd2ff5a344 100644 (file)
--- a/test/functional/node_controller_test.rb
+++ b/test/functional/node_controller_test.rb
@@ -5,11 +5,7 @@ require 'node_controller'
 class NodeController; def rescue_action(e) raise e end; end
 
 class NodeControllerTest < Test::Unit::TestCase
-  fixtures :current_nodes, :nodes, :users, :current_segments, :segments
-  set_fixture_class :current_nodes => :Node
-  set_fixture_class :nodes => :OldNode
-  set_fixture_class :current_segments => :Segment
-  set_fixture_class :segments => :OldSegment
+  api_fixtures
 
   def setup
     @controller = NodeController.new

diff --git a/test/functional/segment_controller_test.rb b/test/functional/segment_controller_test.rb
index f320dac394ac9fe8a776c22dfef9321eb6764fdc..1ff26eff0a1fabdf59f11688be43dfa758bd666f 100644 (file)
--- a/test/functional/segment_controller_test.rb
+++ b/test/functional/segment_controller_test.rb
@@ -5,15 +5,7 @@ require 'segment_controller'
 class SegmentController; def rescue_action(e) raise e end; end
 
 class SegmentControllerTest < Test::Unit::TestCase
-  fixtures :current_nodes, :nodes, :users, :current_segments, :segments, :current_ways, :ways, :current_way_segments, :way_segments
-  set_fixture_class :current_nodes => :Node
-  set_fixture_class :nodes => :OldNode
-  set_fixture_class :current_segments => :Segment
-  set_fixture_class :segments => :OldSegment
-  set_fixture_class :current_ways => :Way
-  set_fixture_class :ways => :OldWay
-  set_fixture_class :current_way_segments => :WaySegment
-  set_fixture_class :way_segments => :OldWaySegment
+  api_fixtures
 
   def setup
     @controller = SegmentController.new

diff --git a/test/test_helper.rb b/test/test_helper.rb
index d7bb9f15ee41609b22aead8052d0de57eda7fc9d..a441122ab931d869f3a456ce2ae6762388c74f6a 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -24,5 +24,28 @@ class Test::Unit::TestCase
   # then set this back to true.
   self.use_instantiated_fixtures  = false
 
+  # Load standard fixtures needed to test API methods
+  def self.api_fixtures
+    fixtures :users
+
+    fixtures :current_nodes, :nodes
+    set_fixture_class :current_nodes => :Node
+    set_fixture_class :nodes => :OldNode
+
+    fixtures :current_segments, :segments
+    set_fixture_class :current_segments => :Segment
+    set_fixture_class :segments => :OldSegment
+
+    fixtures :current_ways, :current_way_segments, :current_way_tags
+    set_fixture_class :current_ways => :Way
+    set_fixture_class :current_way_segments => :WaySegment
+    set_fixture_class :current_way_tags => :WayTag
+
+    fixtures :ways, :way_segments, :way_tags
+    set_fixture_class :ways => :OldWay
+    set_fixture_class :way_segments => :OldWaySegment
+    set_fixture_class :way_tags => :OldWayTag
+  end
+
   # Add more helper methods to be used by all tests here...
 end