Cleanup trailing whitespace

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 4972ee6d6e6b90b1d7fb14c8f2e54ed687fdf9e0..2787ed83fb17534f74f401cdedc68a38f80c367b 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,82 +1,64 @@
 ENV["RAILS_ENV"] = "test"
 ENV["RAILS_ENV"] = "test"

-require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
-require 'test_help'
+require File.expand_path('../../config/environment', __FILE__)
+require 'rails/test_help'

 load 'composite_primary_keys/fixtures.rb'
 
 class ActiveSupport::TestCase
 load 'composite_primary_keys/fixtures.rb'
 
 class ActiveSupport::TestCase

-  # Transactional fixtures accelerate your tests by wrapping each test method
-  # in a transaction that's rolled back on completion.  This ensures that the
-  # test database remains unchanged so your fixtures don't have to be reloaded
-  # between every test method.  Fewer database queries means faster tests.
-  #
-  # Read Mike Clark's excellent walkthrough at
-  #   http://clarkware.com/cgi/blosxom/2005/10/24#Rails10FastTesting
-  #
-  # Every Active Record database supports transactions except MyISAM tables
-  # in MySQL.  Turn off transactional fixtures in this case; however, if you
-  # don't care one way or the other, switching from MyISAM to InnoDB tables
-  # is recommended.
-  self.use_transactional_fixtures = false
-
-  # Instantiated fixtures are slow, but give you @david where otherwise you
-  # would need people(:david).  If you don't want to migrate your existing
-  # test cases which use the @david style and don't mind the speed hit (each
-  # instantiated fixtures translates to a database query per test method),
-  # then set this back to true.
-  self.use_instantiated_fixtures  = false
-
-

   # Load standard fixtures needed to test API methods
   def self.api_fixtures
     #print "setting up the api_fixtures"
   # Load standard fixtures needed to test API methods
   def self.api_fixtures
     #print "setting up the api_fixtures"

-    fixtures :users, :changesets, :changeset_tags
+    fixtures :users, :user_roles, :changesets, :changeset_tags

 
     fixtures :current_nodes, :nodes
 
     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
 
     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
 
     fixtures :current_ways

-    set_fixture_class :current_ways => 'Way'
+    set_fixture_class :current_ways => Way

 
     fixtures :current_way_nodes, :current_way_tags
 
     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
 
     fixtures :ways

-    set_fixture_class :ways => 'OldWay'
+    set_fixture_class :ways => OldWay

 
     fixtures :way_nodes, :way_tags
 
     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
 
     fixtures :current_relations

-    set_fixture_class :current_relations => 'Relation'
+    set_fixture_class :current_relations => Relation

 
     fixtures :current_relation_members, :current_relation_tags
 
     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
 
     fixtures :relations

-    set_fixture_class :relations => 'OldRelation'
+    set_fixture_class :relations => OldRelation

 
     fixtures :relation_members, :relation_tags
 
     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
     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
 
     fixtures :client_applications

+
+    fixtures :redactions
+
+    fixtures :notes, :note_comments

   end
 
   ##
   end
 
   ##

-  # takes a block which is executed in the context of a different 
+  # takes a block which is executed in the context of a different

   # ActionController instance. this is used so that code can call methods
   # on the node controller whilst testing the old_node controller.
   def with_controller(new_controller)
   # ActionController instance. this is used so that code can call methods
   # on the node controller whilst testing the old_node controller.
   def with_controller(new_controller)


@@ -104,8 +86,8 @@ class ActiveSupport::TestCase
   end
 
   ##
   end
 
   ##

-  # for some reason a==b is false, but there doesn't seem to be any 
-  # difference between the nodes, so i'm checking all the attributes 
+  # for some reason a==b is false, but there doesn't seem to be any
+  # difference between the nodes, so i'm checking all the attributes

   # manually and blaming it on ActiveRecord
   def assert_nodes_are_equal(a, b)
     assert_equal a.id, b.id, "node IDs"
   # manually and blaming it on ActiveRecord
   def assert_nodes_are_equal(a, b)
     assert_equal a.id, b.id, "node IDs"


@@ -121,26 +103,68 @@ class ActiveSupport::TestCase
     @request.env["HTTP_AUTHORIZATION"] = "Basic %s" % Base64.encode64("#{user}:#{pass}")
   end
 
     @request.env["HTTP_AUTHORIZATION"] = "Basic %s" % Base64.encode64("#{user}:#{pass}")
   end
 

+  def error_format(format)
+    @request.env["HTTP_X_ERROR_FORMAT"] = format
+  end
+

   def content(c)
     @request.env["RAW_POST_DATA"] = c.to_s
   end
   def content(c)
     @request.env["RAW_POST_DATA"] = c.to_s
   end

-  
+

   # Used to check that the error header and the forbidden responses are given
   # when the owner of the changset has their data not marked as public
   def assert_require_public_data(msg = "Shouldn't be able to use API when the user's data is not public")
     assert_response :forbidden, msg
     assert_equal @response.headers['Error'], "You must make your edits public to upload new data", "Wrong error message"
   end
   # Used to check that the error header and the forbidden responses are given
   # when the owner of the changset has their data not marked as public
   def assert_require_public_data(msg = "Shouldn't be able to use API when the user's data is not public")
     assert_response :forbidden, msg
     assert_equal @response.headers['Error'], "You must make your edits public to upload new data", "Wrong error message"
   end

-  
+

   # Not sure this is the best response we could give
   def assert_inactive_user(msg = "an inactive user shouldn't be able to access the API")
     assert_response :unauthorized, msg
     #assert_equal @response.headers['Error'], ""
   end
   # Not sure this is the best response we could give
   def assert_inactive_user(msg = "an inactive user shouldn't be able to access the API")
     assert_response :unauthorized, msg
     #assert_equal @response.headers['Error'], ""
   end

-  
+

   def assert_no_missing_translations(msg="")
     assert_select "span[class=translation_missing]", false, "Missing translation #{msg}"
   end
   def assert_no_missing_translations(msg="")
     assert_select "span[class=translation_missing]", false, "Missing translation #{msg}"
   end

-  
+
+  # Set things up for OpenID testing
+  def openid_setup
+    begin
+      # Test if the ROTS (Ruby OpenID Test Server) is already running
+      rots_response = Net::HTTP.get_response(URI.parse("http://localhost:1123/"))
+    rescue
+      # It isn't, so start a new instance.
+      rots = IO.popen("#{Rails.root}/vendor/gems/rots-0.2.1/bin/rots --silent")
+
+      # Wait for up to 30 seconds for the server to start and respond before continuing
+      for i in (1 .. 30)
+       begin
+         sleep 1
+         rots_response = Net::HTTP.get_response(URI.parse("http://localhost:1123/"))
+         # If the rescue block doesn't fire, ROTS is up and running and we can continue
+         break
+       rescue
+         # If the connection failed, do nothing and repeat the loop
+       end
+      end
+
+      # Arrange to kill the process when we exit - note that we need
+      # to kill it really har due to a bug in ROTS
+      Kernel.at_exit do
+        Process.kill("KILL", rots.pid)
+      end
+    end
+  end
+
+  def openid_request(openid_request_uri)
+    openid_response = Net::HTTP.get_response(URI.parse(openid_request_uri))
+    openid_response_uri = URI(openid_response['Location'])
+    openid_response_qs = Rack::Utils.parse_query(openid_response_uri.query)
+
+    return openid_response_qs
+  end
+
+

   # Add more helper methods to be used by all tests here...
 end
   # Add more helper methods to be used by all tests here...
 end