Fix typo

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index b1219b76506ef28bd178fbc532d43980ae2da700..04deabe9db9727d7b32b7137b77c6d444fe3b2e0 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,7 +1,10 @@
+require "coveralls"
+Coveralls.wear!("rails")
+
 ENV["RAILS_ENV"] = "test"
-require File.expand_path('../../config/environment', __FILE__)
-require 'rails/test_help'
-load 'composite_primary_keys/fixtures.rb'
+require File.expand_path("../../config/environment", __FILE__)
+require "rails/test_help"
+load "composite_primary_keys/fixtures.rb"
 
 module ActiveSupport
   class TestCase
@@ -115,7 +118,7 @@ module ActiveSupport
     end
 
     def basic_authorization(user, pass)
-      @request.env["HTTP_AUTHORIZATION"] = "Basic %s" % Base64.encode64("#{user}:#{pass}")
+      @request.env["HTTP_AUTHORIZATION"] = format("Basic %s", Base64.encode64("#{user}:#{pass}"))
     end
 
     def error_format(format)
@@ -130,7 +133,7 @@ module ActiveSupport
     # 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"
+      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
@@ -142,42 +145,5 @@ module ActiveSupport
     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
-      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
-
-    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