Update bundle

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index ed2e02f63b0cc3b8044798fac342514a6dc4924b..e535d1645bb5f269231d076db3ede273b7ed6643 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,61 +1,56 @@
+require "coveralls"
+Coveralls.wear!("rails")
+

 ENV["RAILS_ENV"] = "test"
 require File.expand_path("../../config/environment", __FILE__)
 require "rails/test_help"
 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
 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"
     # Load standard fixtures needed to test API methods
     def self.api_fixtures
       # print "setting up the api_fixtures"

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

 
       fixtures :current_nodes, :nodes
       set_fixture_class :current_nodes => Node
       set_fixture_class :nodes => OldNode
 
 
       fixtures :current_nodes, :nodes
       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
-

       fixtures :current_ways
       set_fixture_class :current_ways => Way
 
       fixtures :current_ways
       set_fixture_class :current_ways => Way
 

-      fixtures :current_way_nodes, :current_way_tags
+      fixtures :current_way_nodes

       set_fixture_class :current_way_nodes => WayNode
       set_fixture_class :current_way_nodes => WayNode

-      set_fixture_class :current_way_tags => WayTag

 
       fixtures :ways
       set_fixture_class :ways => OldWay
 
 
       fixtures :ways
       set_fixture_class :ways => OldWay
 

-      fixtures :way_nodes, :way_tags
+      fixtures :way_nodes

       set_fixture_class :way_nodes => OldWayNode
       set_fixture_class :way_nodes => OldWayNode

-      set_fixture_class :way_tags => OldWayTag

 
       fixtures :current_relations
       set_fixture_class :current_relations => Relation
 
 
       fixtures :current_relations
       set_fixture_class :current_relations => Relation
 

-      fixtures :current_relation_members, :current_relation_tags
+      fixtures :current_relation_members

       set_fixture_class :current_relation_members => RelationMember
       set_fixture_class :current_relation_members => RelationMember

-      set_fixture_class :current_relation_tags => RelationTag

 
       fixtures :relations
       set_fixture_class :relations => OldRelation
 
 
       fixtures :relations
       set_fixture_class :relations => OldRelation
 

-      fixtures :relation_members, :relation_tags
+      fixtures :relation_members

       set_fixture_class :relation_members => OldRelationMember
       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
 
 
       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
       fixtures :redactions

-
-      fixtures :notes, :note_comments

     end
 
     ##
     end
 
     ##


@@ -72,6 +67,19 @@ module ActiveSupport
       end
     end
 
       end
     end
 

+    ##
+    # work round minitest insanity that causes it to tell you
+    # to use assert_nil to test for nil, which is fine if you're
+    # comparing to a nil constant but not if you're comparing
+    # an expression that might be nil sometimes
+    def assert_equal_allowing_nil(exp, act, msg = nil)
+      if exp.nil?
+        assert_nil act, msg
+      else
+        assert_equal exp, act, msg
+      end
+    end
+

     ##
     # for some reason assert_equal a, b fails when the relations are
     # actually equal, so this method manually checks the fields...
     ##
     # for some reason assert_equal a, b fails when the relations are
     # actually equal, so this method manually checks the fields...


@@ -114,18 +122,25 @@ module ActiveSupport
       assert_equal a.tags, b.tags, "tags on node #{a.id}"
     end
 
       assert_equal a.tags, b.tags, "tags on node #{a.id}"
     end
 

+    ##
+    # set request headers for HTTP basic authentication

     def basic_authorization(user, pass)
       @request.env["HTTP_AUTHORIZATION"] = format("Basic %s", Base64.encode64("#{user}:#{pass}"))
     end
 
     def basic_authorization(user, pass)
       @request.env["HTTP_AUTHORIZATION"] = format("Basic %s", Base64.encode64("#{user}:#{pass}"))
     end
 

+    ##
+    # set request readers to ask for a particular error format

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

+    ##
+    # set the raw body to be sent with a POST request

     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")
     # 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")


@@ -133,51 +148,40 @@ module ActiveSupport
       assert_equal @response.headers["Error"], "You must make your edits public to upload new data", "Wrong error message"
     end
 
       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
 

+    ##
+    # Check for missing translations in an HTML response

     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
-      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
-      1.upto(30).each do
-        begin
-          sleep 1
-          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
-          next
-        end
+    ##
+    # execute a block with a given set of HTTP responses stubbed
+    def with_http_stubs(stubs_file)
+      stubs = YAML.load_file(File.expand_path("../http/#{stubs_file}.yml", __FILE__))
+      stubs.each do |url, response|
+        stub_request(:get, Regexp.new(Regexp.quote(url))).to_return(:status => response["code"], :body => response["body"])

       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
+      yield

     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)
-
-      openid_response_qs
+    def stub_gravatar_request(email, status = 200, body = nil)
+      hash = Digest::MD5.hexdigest(email.downcase)
+      url = "https://www.gravatar.com/avatar/#{hash}?d=404"
+      stub_request(:get, url).and_return(:status => status, :body => body)

     end
 
     end
 

-    # Add more helper methods to be used by all tests here...
+    def stub_hostip_requests
+      # Controller tests and integration tests use different IPs
+      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

   end
 end
   end
 end