More whitespace fixes. Attempting to get tests to pass.

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index ed2e02f63b0cc3b8044798fac342514a6dc4924b..0baf922704d24af5c7f3ecf7a32ef443868a479e 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,3 +1,6 @@
+require "coveralls"
+Coveralls.wear!("rails")
+
 ENV["RAILS_ENV"] = "test"
 require File.expand_path("../../config/environment", __FILE__)
 require "rails/test_help"
@@ -8,7 +11,8 @@ module ActiveSupport
     # 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, :user_blocks
+      fixtures :changesets, :changeset_tags, :changeset_comments
 
       fixtures :current_nodes, :nodes
       set_fixture_class :current_nodes => Node
@@ -114,18 +118,25 @@ module ActiveSupport
       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
 
+    ##
+    # set request readers to ask for a particular error format
     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
 
+    ##
     # 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 +144,39 @@ module ActiveSupport
       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
 
+    ##
+    # 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
 
-    # 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
+    ##
+    # execute a block with a given set of HTTP responses stubbed
+    def with_http_stubs(stubs_file)
+      http_client_save = OSM.http_client
+
+      begin
+        stubs = YAML.load_file(File.expand_path("../http/#{stubs_file}.yml", __FILE__))
+
+        OSM.http_client = Faraday.new do |builder|
+          builder.adapter :test do |stub|
+            stubs.each do |url, response|
+              stub.get(url) { |_env| [response["code"], {}, response["body"]] }
+            end
+          end
         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)
+        yield
+      ensure
+        OSM.http_client = http_client_save
       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
-    end
-
-    # Add more helper methods to be used by all tests here...
   end
 end